]> git.ktnx.net Git - mobile-ledger.git/commitdiff
Rename QEScanAbleFragment to QRScanCapableFragment
authorDamyan Ivanov <dam+mobileledger@ktnx.net>
Sun, 31 Jan 2021 11:38:41 +0000 (11:38 +0000)
committerDamyan Ivanov <dam+mobileledger@ktnx.net>
Sun, 31 Jan 2021 11:38:41 +0000 (11:38 +0000)
app/src/main/java/net/ktnx/mobileledger/ui/QRScanAbleFragment.java [deleted file]
app/src/main/java/net/ktnx/mobileledger/ui/QRScanCapableFragment.java [new file with mode: 0644]
app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionFragment.java
app/src/main/java/net/ktnx/mobileledger/ui/patterns/PatternDetailsAdapter.java
app/src/main/java/net/ktnx/mobileledger/ui/patterns/PatternDetailsFragment.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/QRScanAbleFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/QRScanAbleFragment.java
deleted file mode 100644 (file)
index 6acb449..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright © 2021 Damyan Ivanov.
- * This file is part of MoLe.
- * MoLe is free software: you can distribute it and/or modify it
- * under the term of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your opinion), any later version.
- *
- * MoLe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License terms for details.
- *
- * You should have received a copy of the GNU General Public License
- * along with MoLe. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package net.ktnx.mobileledger.ui;
-
-import android.content.Context;
-
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.lifecycle.MutableLiveData;
-
-public abstract class QRScanAbleFragment extends Fragment {
-    private static final MutableLiveData<Integer> qrScanTrigger = new MutableLiveData<>();
-    protected final ActivityResultLauncher<Void> scanQrLauncher = QR.registerLauncher(this, this::onQrScanned);
-    public static void triggerQRScan() {
-        qrScanTrigger.setValue(1);
-    }
-    protected abstract void onQrScanned(String text);
-    @Override
-    public void onAttach(@NonNull Context context) {
-        super.onAttach(context);
-        qrScanTrigger.observe(this, ignored -> {
-            scanQrLauncher.launch(null);
-        });
-    }
-}
diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/QRScanCapableFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/QRScanCapableFragment.java
new file mode 100644 (file)
index 0000000..a23a402
--- /dev/null
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2021 Damyan Ivanov.
+ * This file is part of MoLe.
+ * MoLe is free software: you can distribute it and/or modify it
+ * under the term of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your opinion), any later version.
+ *
+ * MoLe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License terms for details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MoLe. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package net.ktnx.mobileledger.ui;
+
+import android.content.Context;
+
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.MutableLiveData;
+
+public abstract class QRScanCapableFragment extends Fragment {
+    private static final MutableLiveData<Integer> qrScanTrigger = new MutableLiveData<>();
+    protected final ActivityResultLauncher<Void> scanQrLauncher = QR.registerLauncher(this, this::onQrScanned);
+    public static void triggerQRScan() {
+        qrScanTrigger.setValue(1);
+    }
+    protected abstract void onQrScanned(String text);
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        qrScanTrigger.observe(this, ignored -> {
+            scanQrLauncher.launch(null);
+        });
+    }
+}
index 9a2226f3acb5c776af9f2a99a4738bbd26b9871b..0b82c27ba5c87b7c2365cb1d144f5c5aaaf19a7a 100644 (file)
@@ -56,7 +56,7 @@ import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.LedgerTransaction;
 import net.ktnx.mobileledger.model.LedgerTransactionAccount;
 import net.ktnx.mobileledger.model.MobileLedgerProfile;
-import net.ktnx.mobileledger.ui.QRScanAbleFragment;
+import net.ktnx.mobileledger.ui.QRScanCapableFragment;
 import net.ktnx.mobileledger.ui.patterns.PatternsActivity;
 import net.ktnx.mobileledger.utils.Logger;
 import net.ktnx.mobileledger.utils.Misc;
@@ -79,7 +79,7 @@ import java.util.regex.Pattern;
 
 // TODO: offer to undo account remove-on-swipe
 
-public class NewTransactionFragment extends QRScanAbleFragment {
+public class NewTransactionFragment extends QRScanCapableFragment {
     private NewTransactionItemsAdapter listAdapter;
     private NewTransactionModel viewModel;
     private FloatingActionButton fab;
index 25083fac4848dfceed67139662c79a2d264b2927..1484eab7925a7afd755dc664b65a771b09b4c338 100644 (file)
@@ -36,7 +36,7 @@ import net.ktnx.mobileledger.db.PatternBase;
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.PatternDetailsItem;
 import net.ktnx.mobileledger.ui.PatternDetailSourceSelectorFragment;
-import net.ktnx.mobileledger.ui.QRScanAbleFragment;
+import net.ktnx.mobileledger.ui.QRScanCapableFragment;
 import net.ktnx.mobileledger.utils.Logger;
 import net.ktnx.mobileledger.utils.Misc;
 
@@ -417,7 +417,7 @@ class PatternDetailsAdapter extends RecyclerView.Adapter<PatternDetailsAdapter.V
 
         }
         private void scanTestQR(View view) {
-            QRScanAbleFragment.triggerQRScan();
+            QRScanCapableFragment.triggerQRScan();
         }
     }
 
index 8b5ed04b47b0e7b3fab74c3b73cd234f4dafac86..63bbe9d91716d2df0f369782aab9f0f8f0082ae9 100644 (file)
@@ -35,10 +35,10 @@ import com.google.android.material.snackbar.Snackbar;
 
 import net.ktnx.mobileledger.R;
 import net.ktnx.mobileledger.databinding.PatternDetailsFragmentBinding;
-import net.ktnx.mobileledger.ui.QRScanAbleFragment;
+import net.ktnx.mobileledger.ui.QRScanCapableFragment;
 import net.ktnx.mobileledger.utils.Logger;
 
-public class PatternDetailsFragment extends QRScanAbleFragment {
+public class PatternDetailsFragment extends QRScanCapableFragment {
     static final String ARG_PATTERN_ID = "pattern-id";
     private static final String ARG_COLUMN_COUNT = "column-count";
     PatternDetailsFragmentBinding b;