X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionItemHolder.java;h=e4d1d503d4ebc2ceb43d7a7fcdafb374b75495cf;hb=9636e8ab222678637a0bac3c7f6dd7d43f8768e9;hp=507055ff0eda9eac0dcc9e74d824a06c3db2d8cd;hpb=7cb9091315c4adf9bb278995469c0bb401c33939;p=mobile-ledger-staging.git

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 507055ff..e4d1d503 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
@@ -23,6 +23,7 @@ import android.text.Editable;
 import android.text.TextWatcher;
 import android.text.method.DigitsKeyListener;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.widget.AutoCompleteTextView;
 import android.widget.FrameLayout;
@@ -30,7 +31,6 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.widget.LinearLayoutCompat;
 import androidx.lifecycle.Observer;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -39,6 +39,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;
@@ -59,8 +60,8 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder
     private AutoCompleteTextView tvDescription;
     private AutoCompleteTextView tvAccount;
     private TextView tvAmount;
-    private LinearLayoutCompat lHead;
-    private LinearLayout lAccount;
+    private LinearLayout lHead;
+    private ViewGroup lAccount;
     private FrameLayout lPadding;
     private MobileLedgerProfile mProfile;
     private Date date;
@@ -97,7 +98,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;
@@ -234,10 +242,16 @@ 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;
@@ -346,6 +360,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder
     }
     private void pickTransactionDate() {
         DatePickerFragment picker = new DatePickerFragment();
+        picker.setFutureDates(mProfile.getFutureDates());
         picker.setOnDatePickedListener(this);
         picker.show(((NewTransactionActivity) tvDate.getContext()).getSupportFragmentManager(),
                 "datePicker");