X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fpatterns%2FPatternDetailsAdapter.java;h=4fd35a520173f9df5d5b14bca5401a240a85430d;hb=1688588d70ab1f75c0369080087af46958aacbbe;hp=e98a28f7596393447dc479518eff01b40505c84d;hpb=b0404689e0dbb2b08f02deca7ee5d14636a3baa6;p=mobile-ledger.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/patterns/PatternDetailsAdapter.java b/app/src/main/java/net/ktnx/mobileledger/ui/patterns/PatternDetailsAdapter.java
index e98a28f7..4fd35a52 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/patterns/PatternDetailsAdapter.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/patterns/PatternDetailsAdapter.java
@@ -36,12 +36,13 @@ 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;
 
 import org.jetbrains.annotations.NotNull;
 
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -330,7 +331,9 @@ class PatternDetailsAdapter extends RecyclerView.Adapter<PatternDetailsAdapter.V
 
             if (header.hasLiteralDateYear()) {
                 b.patternDetailsYearSource.setText(R.string.pattern_details_source_literal);
-                b.patternDetailsDateYear.setText(String.valueOf(header.getDateYear()));
+                final Integer dateYear = header.getDateYear();
+                b.patternDetailsDateYear.setText(
+                        (dateYear == null) ? null : String.valueOf(dateYear));
                 b.patternDetailsDateYearLayout.setVisibility(View.VISIBLE);
             }
             else {
@@ -346,7 +349,9 @@ class PatternDetailsAdapter extends RecyclerView.Adapter<PatternDetailsAdapter.V
 
             if (header.hasLiteralDateMonth()) {
                 b.patternDetailsMonthSource.setText(R.string.pattern_details_source_literal);
-                b.patternDetailsDateMonth.setText(String.valueOf(header.getDateMonth()));
+                final Integer dateMonth = header.getDateMonth();
+                b.patternDetailsDateMonth.setText(
+                        (dateMonth == null) ? null : String.valueOf(dateMonth));
                 b.patternDetailsDateMonthLayout.setVisibility(View.VISIBLE);
             }
             else {
@@ -362,7 +367,8 @@ class PatternDetailsAdapter extends RecyclerView.Adapter<PatternDetailsAdapter.V
 
             if (header.hasLiteralDateDay()) {
                 b.patternDetailsDaySource.setText(R.string.pattern_details_source_literal);
-                b.patternDetailsDateDay.setText(String.valueOf(header.getDateDay()));
+                final Integer dateDay = header.getDateDay();
+                b.patternDetailsDateDay.setText((dateDay == null) ? null : String.valueOf(dateDay));
                 b.patternDetailsDateDayLayout.setVisibility(View.VISIBLE);
             }
             else {
@@ -416,7 +422,7 @@ class PatternDetailsAdapter extends RecyclerView.Adapter<PatternDetailsAdapter.V
 
         }
         private void scanTestQR(View view) {
-            QRScanAbleFragment.triggerQRScan();
+            QRScanCapableFragment.triggerQRScan();
         }
     }
 
@@ -454,6 +460,56 @@ class PatternDetailsAdapter extends RecyclerView.Adapter<PatternDetailsAdapter.V
                 }
             };
             b.patternDetailsAccountComment.addTextChangedListener(accountCommentWatcher);
+
+            b.patternDetailsAccountAmount.addTextChangedListener(new TextWatcher() {
+                @Override
+                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+                }
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+                }
+                @Override
+                public void afterTextChanged(Editable s) {
+                    PatternDetailsItem.AccountRow accRow = getItem();
+
+                    String str = String.valueOf(s);
+                    if (Misc.emptyIsNull(str) == null) {
+                        accRow.setAmount(null);
+                    }
+                    else {
+                        try {
+                            final float amount = Data.parseNumber(str);
+                            accRow.setAmount(amount);
+                            b.patternDetailsAccountAmountLayout.setError(null);
+
+                            Logger.debug(D_PATTERN_UI, String.format(Locale.US,
+                                    "Storing changed account amount %s [%4.2f]; accRow=%s", s,
+                                    amount, accRow));
+                        }
+                        catch (NumberFormatException | ParseException e) {
+                            b.patternDetailsAccountAmountLayout.setError("!");
+                        }
+                    }
+                }
+            });
+            b.patternDetailsAccountAmount.setOnFocusChangeListener((v, hasFocus) -> {
+                if (hasFocus)
+                    return;
+
+                PatternDetailsItem.AccountRow accRow = getItem();
+                if (!accRow.hasLiteralAmount())
+                    return;
+                Float amt = accRow.getAmount();
+                if (amt == null)
+                    return;
+
+                b.patternDetailsAccountAmount.setText(Data.formatNumber(amt));
+            });
+
+            b.negateAmountSwitch.setOnCheckedChangeListener(
+                    (buttonView, isChecked) -> getItem().setNegateAmount(isChecked));
         }
         @Override
         void bind(PatternDetailsItem item) {
@@ -488,13 +544,18 @@ class PatternDetailsAdapter extends RecyclerView.Adapter<PatternDetailsAdapter.V
                 b.patternDetailsAccountAmountSource.setText(
                         R.string.pattern_details_source_literal);
                 b.patternDetailsAccountAmount.setVisibility(View.VISIBLE);
-                b.patternDetailsAccountAmount.setText(Data.formatNumber(accRow.getAmount()));
+                Float amt = accRow.getAmount();
+                b.patternDetailsAccountAmount.setText((amt == null) ? null : String.format(
+                        Data.locale.getValue(), "%,4.2f", (accRow.getAmount())));
+                b.negateAmountSwitch.setVisibility(View.GONE);
             }
             else {
                 b.patternDetailsAccountAmountSource.setText(
                         String.format(Locale.US, "Group %d (%s)", accRow.getAmountMatchGroup(),
                                 getMatchGroupText(accRow.getAmountMatchGroup())));
                 b.patternDetailsAccountAmountLayout.setVisibility(View.GONE);
+                b.negateAmountSwitch.setVisibility(View.VISIBLE);
+                b.negateAmountSwitch.setChecked(accRow.isNegateAmount());
             }
 
             b.patternAccountNameSourceLabel.setOnClickListener(