X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fnew_transaction%2FNewTransactionFragment.java;h=4932f9de12f2d31e4c9a3305f25ac1ee013db26e;hb=adf69118b53d51145ad6cd59ffe9a654f1305662;hp=aa44c72ff8f2d3f9674904cf7125e0566170a0b8;hpb=9fad5003ac30c3e4f9d073e04f4569aeb31779b2;p=mobile-ledger-staging.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionFragment.java
index aa44c72f..4932f9de 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionFragment.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionFragment.java
@@ -17,9 +17,7 @@
 
 package net.ktnx.mobileledger.ui.new_transaction;
 
-import android.app.Activity;
 import android.content.Context;
-import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.renderscript.RSInvalidStateException;
@@ -31,8 +29,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ProgressBar;
 
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContract;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
@@ -51,6 +47,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.utils.Logger;
 import net.ktnx.mobileledger.utils.Misc;
 import net.ktnx.mobileledger.utils.SimpleDate;
@@ -69,25 +66,9 @@ import java.util.regex.Pattern;
 
 // TODO: offer to undo account remove-on-swipe
 
-public class NewTransactionFragment extends Fragment {
+public class NewTransactionFragment extends QRScanAbleFragment {
     private NewTransactionItemsAdapter listAdapter;
     private NewTransactionModel viewModel;
-    final ActivityResultLauncher<Void> scanQrLauncher =
-            registerForActivityResult(new ActivityResultContract<Void, String>() {
-                @NonNull
-                @Override
-                public Intent createIntent(@NonNull Context context, Void input) {
-                    final Intent intent = new Intent("com.google.zxing.client.android.SCAN");
-                    intent.putExtra("SCAN_MODE", "QR_CODE_MODE");
-                    return intent;
-                }
-                @Override
-                public String parseResult(int resultCode, @Nullable Intent intent) {
-                    if (resultCode == Activity.RESULT_CANCELED)
-                        return null;
-                    return intent.getStringExtra("SCAN_RESULT");
-                }
-            }, this::onQrScanned);
     private FloatingActionButton fab;
     private OnNewTransactionFragmentInteractionListener mListener;
     private MobileLedgerProfile mProfile;
@@ -95,7 +76,7 @@ public class NewTransactionFragment extends Fragment {
         // Required empty public constructor
         setHasOptionsMenu(true);
     }
-    private void onQrScanned(String text) {
+    protected void onQrScanned(String text) {
         Logger.debug("qr", String.format("Got QR scan result [%s]", text));
         Pattern p =
                 Pattern.compile("^(\\d+)\\*(\\d+)\\*(\\d+)-(\\d+)-(\\d+)\\*([:\\d]+)\\*([\\d.]+)$");
@@ -231,7 +212,7 @@ public class NewTransactionFragment extends Fragment {
                  });
 //        viewModel.checkTransactionSubmittable(listAdapter);
 
-        fab = activity.findViewById(R.id.fab);
+        fab = activity.findViewById(R.id.fabAdd);
         fab.setOnClickListener(v -> onFabPressed());
 
         boolean keep = false;