From a08a6e0d8f07a3d709aa4efa0cce5d8a444a2dfe Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Mon, 25 Nov 2019 23:25:52 +0200
Subject: [PATCH] NT: account/amount focus also survives re-configuration

---
 .../ui/activity/NewTransactionItemHolder.java | 23 +++++++++++++++----
 .../activity/NewTransactionItemsAdapter.java  |  6 +++++
 .../ui/activity/NewTransactionModel.java      | 13 +++++++++++
 3 files changed, 37 insertions(+), 5 deletions(-)

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 fc175606..f83eec8a 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemHolder.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemHolder.java
@@ -38,6 +38,7 @@ import net.ktnx.mobileledger.async.DescriptionSelectedCallback;
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.LedgerTransactionAccount;
 import net.ktnx.mobileledger.model.MobileLedgerProfile;
+import net.ktnx.mobileledger.ui.AutoCompleteTextViewWithClear;
 import net.ktnx.mobileledger.ui.DatePickerFragment;
 import net.ktnx.mobileledger.utils.Logger;
 import net.ktnx.mobileledger.utils.MLDB;
@@ -96,7 +97,14 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder
                 boolean wasSyncing = syncingData;
                 syncingData = true;
                 try {
-                    adapter.updateFocusedItem(getAdapterPosition());
+                    final int pos = getAdapterPosition();
+                    adapter.updateFocusedItem(pos);
+                    if (v instanceof AutoCompleteTextViewWithClear) {
+                        adapter.noteFocusIsOnAccount(pos);
+                    }
+                    else {
+                        adapter.noteFocusIsOnAmount(pos);
+                    }
                 }
                 finally {
                     syncingData = wasSyncing;
@@ -233,10 +241,15 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder
                     case transactionRow:
                         // do nothing if a row element already has the focus
                         if (!itemView.hasFocus()) {
-                            focused = tvAccount.requestFocus();
-                            tvAccount.dismissDropDown();
-                            if (focused)
-                                Misc.showSoftKeyboard((NewTransactionActivity) tvAccount.getContext());
+                            if (item.focusIsOnAmount()) {
+                                tvAmount.requestFocus();
+                            }
+                            else {
+                                focused = tvAccount.requestFocus();
+                                tvAccount.dismissDropDown();
+                                if (focused)
+                                    Misc.showSoftKeyboard((NewTransactionActivity) tvAccount.getContext());
+                            }
                         }
 
                         break;
diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemsAdapter.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemsAdapter.java
index 452e348e..cb03f3d1 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemsAdapter.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemsAdapter.java
@@ -204,4 +204,10 @@ class NewTransactionItemsAdapter extends RecyclerView.Adapter<NewTransactionItem
     public void updateFocusedItem(int position) {
         model.updateFocusedItem(position);
     }
+    public void noteFocusIsOnAccount(int position) {
+        model.noteFocusIsOnAccount(position);
+    }
+    public void noteFocusIsOnAmount(int position) {
+        model.noteFocusIsOnAmount(position);
+    }
 }
diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionModel.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionModel.java
index e1e1166d..90179739 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionModel.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionModel.java
@@ -277,6 +277,12 @@ public class NewTransactionModel extends ViewModel {
     public void updateFocusedItem(int position) {
         focusedItem.setValue(position);
     }
+    public void noteFocusIsOnAccount(int position) {
+        getItem(position).setFocusIsOnAmount(false);
+    }
+    public void noteFocusIsOnAmount(int position) {
+        getItem(position).setFocusIsOnAmount(true);
+    }
     enum ItemType {generalData, transactionRow, bottomFiller}
 
     //==========================================================================================
@@ -289,6 +295,10 @@ public class NewTransactionModel extends ViewModel {
         private MutableLiveData<String> amountHint = new MutableLiveData<>(null);
         private NewTransactionModel model;
         private MutableLiveData<Boolean> editable = new MutableLiveData<>(true);
+        public boolean focusIsOnAmount() {
+            return focusIsOnAmount;
+        }
+        private boolean focusIsOnAmount = false;
         public Item(NewTransactionModel model) {
             this.model = model;
             type = ItemType.bottomFiller;
@@ -467,5 +477,8 @@ public class NewTransactionModel extends ViewModel {
         public void stopObservingEditableFlag(Observer<Boolean> observer) {
             editable.removeObserver(observer);
         }
+        public void setFocusIsOnAmount(boolean flag) {
+            focusIsOnAmount = flag;
+        }
     }
 }
-- 
2.39.5