NT: new rules for determining whether transaction can be submitted (not quite finished)

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / activity / NewTransactionItemHolder.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemHolder.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemHolder.java
index d7017e21a6816056c18a7fc104eff8639b2ac97a..53e97e826c0092cb23ec1eb4136b69a6944bdcd5 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemHolder.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemHolder.java
@@ -353,16 +353,21 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder
                 tvAmount.setKeyListener(DigitsKeyListener.getInstance(locale, true, true));
         };
 
-        currencyObserver = this::setCurrency;
+        currencyObserver = currency -> {
+            setCurrency(currency);
+            adapter.model.checkTransactionSubmittable(adapter);
+        };
 
         showCurrencyObserver = showCurrency -> {
-              if (showCurrency) {
-                  tvCurrency.setVisibility(View.VISIBLE);
-              }
-            else {
-                tvCurrency.setVisibility(View.GONE);
-                setCurrencyString(null);
-              }
+            if (item.getType() == ItemType.transactionRow) {
+                if (showCurrency) {
+                    tvCurrency.setVisibility(View.VISIBLE);
+                }
+                else {
+                    tvCurrency.setVisibility(View.GONE);
+                    item.setCurrency(null);
+                }
+            }
         };
     }
     private void updateCurrencyPositionAndPadding(Currency.Position position, boolean hasGap) {
@@ -500,7 +505,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder
 
                     if (amount.isEmpty()) {
                         account.resetAmount();
-                        account.setCurrency(null);
+//                        account.setCurrency(null);
                     }
                     else {
                         try {