drop unneeded object-level field

[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 a72de5d09d12cc5b9ccb1d36aab98e91ab05fa90..f1dc196a55c05f184fbe7264175454a906595a8d 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
@@ -46,7 +46,6 @@ import net.ktnx.mobileledger.model.LedgerTransactionAccount;
 import net.ktnx.mobileledger.model.MobileLedgerProfile;
 import net.ktnx.mobileledger.ui.CurrencySelectorFragment;
 import net.ktnx.mobileledger.ui.DatePickerFragment;
-import net.ktnx.mobileledger.ui.OnCurrencySelectedListener;
 import net.ktnx.mobileledger.ui.TextViewClearHelper;
 import net.ktnx.mobileledger.utils.Colors;
 import net.ktnx.mobileledger.utils.DimensionUtils;
@@ -54,6 +53,8 @@ import net.ktnx.mobileledger.utils.Logger;
 import net.ktnx.mobileledger.utils.MLDB;
 import net.ktnx.mobileledger.utils.Misc;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.text.DecimalFormatSymbols;
 import java.util.Calendar;
 import java.util.Date;
@@ -63,8 +64,7 @@ import java.util.Locale;
 import static net.ktnx.mobileledger.ui.activity.NewTransactionModel.ItemType;
 
 class NewTransactionItemHolder extends RecyclerView.ViewHolder
-        implements DatePickerFragment.DatePickedListener, DescriptionSelectedCallback,
-        OnCurrencySelectedListener {
+        implements DatePickerFragment.DatePickedListener, DescriptionSelectedCallback {
     private final String decimalSeparator;
     private final String decimalDot;
     private final TextView tvCurrency;
@@ -95,11 +95,9 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder
     private boolean inUpdate = false;
     private boolean syncingData = false;
     private View commentButton;
-    private NewTransactionItemsAdapter adapter;
     //TODO multiple amounts with different currencies per posting
     NewTransactionItemHolder(@NonNull View itemView, NewTransactionItemsAdapter adapter) {
         super(itemView);
-        this.adapter = adapter;
         tvAccount = itemView.findViewById(R.id.account_row_acc_name);
         tvComment = itemView.findViewById(R.id.comment);
         new TextViewClearHelper().attachToTextView((EditText) tvComment);
@@ -185,7 +183,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder
                 syncData();
                 Logger.debug("textWatcher",
                         "syncData() returned, checking if transaction is submittable");
-                adapter.model.checkTransactionSubmittable(adapter);
+                adapter.checkTransactionSubmittable();
                 Logger.debug("textWatcher", "done");
             }
         };
@@ -215,7 +213,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder
                 }
 
                 if (syncData())
-                    adapter.model.checkTransactionSubmittable(adapter);
+                    adapter.checkTransactionSubmittable();
             }
         };
         tvDescription.addTextChangedListener(tw);
@@ -225,7 +223,8 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder
 
         tvCurrency.setOnClickListener(v -> {
             CurrencySelectorFragment cpf = new CurrencySelectorFragment();
-            cpf.setOnCurrencySelectedListener(this);
+            cpf.showPositionAndPadding();
+            cpf.setOnCurrencySelectedListener(c -> item.setCurrency(c));
             final AppCompatActivity activity = (AppCompatActivity) v.getContext();
             cpf.show(activity.getSupportFragmentManager(), "currency-selector");
         });
@@ -346,7 +345,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder
 
         currencyObserver = currency -> {
             setCurrency(currency);
-            adapter.model.checkTransactionSubmittable(adapter);
+            adapter.checkTransactionSubmittable();
         };
 
         currencyGapObserver = hasGap -> {
@@ -431,7 +430,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder
         tvAccount.setEnabled(editable);
         tvAmount.setEnabled(editable);
     }
-    private void setCommentVisible(Boolean visible) {
+    private void setCommentVisible(@NotNull Boolean visible) {
         if (visible) {
             // showing; show the comment view and align the comment button to it
             tvComment.setVisibility(View.VISIBLE);
@@ -443,11 +442,11 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder
             commentButton.setLayoutParams(lp);
         }
         else {
-            // hiding; hide the comment comment view and align amounts layout under it
+            // hiding; hide the comment view and align the comment bottom to the amount
             tvComment.setVisibility(View.GONE);
             ConstraintLayout.LayoutParams lp =
                     (ConstraintLayout.LayoutParams) commentButton.getLayoutParams();
-            lp.bottomToBottom = R.id.ntr_account;   // R.id.parent doesn't work here
+            lp.bottomToBottom = R.id.amount_layout;   // R.id.parent doesn't work here
 
             commentButton.setLayoutParams(lp);
         }
@@ -652,10 +651,6 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder
 
     }
     @Override
-    public void onCurrencySelected(Currency currency) {
-        adapter.model.setItemCurrency(this.item, currency, adapter);
-    }
-    @Override
     public void descriptionSelected(String description) {
         tvAccount.setText(description);
         tvAmount.requestFocus(View.FOCUS_FORWARD);