X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionFragment.java;h=5b197b0024adfc9a6c9805bccc3c0373cea48f30;hp=5492d81e2f7da9cbf7b74c339614867b8f13029d;hb=b78d85afef509ea029aefe10e179f87a60108218;hpb=ed0b0076b713470b35e3b80219f8d9b231a56ca5

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionFragment.java
index 5492d81e..5b197b00 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionFragment.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionFragment.java
@@ -43,6 +43,7 @@ import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.LedgerTransaction;
 import net.ktnx.mobileledger.model.LedgerTransactionAccount;
 import net.ktnx.mobileledger.model.MobileLedgerProfile;
+import net.ktnx.mobileledger.utils.Misc;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -85,13 +86,13 @@ public class NewTransactionFragment extends Fragment {
     @Override
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        Activity activity = getActivity();
+        FragmentActivity activity = getActivity();
         if (activity == null)
             throw new RSInvalidStateException(
                     "getActivity() returned null within onActivityCreated()");
 
         list = activity.findViewById(R.id.new_transaction_accounts);
-        viewModel = ViewModelProviders.of(this)
+        viewModel = ViewModelProviders.of(activity)
                                       .get(NewTransactionModel.class);
         mProfile = Data.profile.getValue();
         listAdapter = new NewTransactionItemsAdapter(viewModel, mProfile);
@@ -173,15 +174,22 @@ public class NewTransactionFragment extends Fragment {
             boolean keep = savedInstanceState.getBoolean("keep", true);
             if (!keep)
                 viewModel.reset();
+            else {
+                final int focused = savedInstanceState.getInt("focused", 0);
+                viewModel.setFocusedItem(focused);
+            }
         }
     }
     @Override
     public void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putBoolean("keep", true);
+        final int focusedItem = viewModel.getFocusedItem();
+        outState.putInt("focused", focusedItem);
     }
     private void onFabPressed() {
         fab.setEnabled(false);
+        Misc.hideSoftKeyboard(this);
         if (mListener != null) {
             Date date = viewModel.getDate();
             LedgerTransaction tr =