X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2FNewTransactionActivity.java;h=d6e2b8338b54c42425152b901ad152d49ac486ee;hp=a97a706b4626dd76eba6fc7cc57390363b83682c;hb=b04a1d6a50727376977a86a968b5ad0621f5a6a2;hpb=a7f501f08383239c8618dfdf4a1760551ebb616c

diff --git a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
index a97a706b..d6e2b833 100644
--- a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
@@ -94,6 +94,13 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
         }
     }
 
+    @Override
+    protected
+    void onStart() {
+        super.onStart();
+        if (text_descr.getText().toString().isEmpty()) text_descr.requestFocus();
+    }
+
     @Override
     public void finish() {
         super.finish();
@@ -138,6 +145,8 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
     }
 
     private void toggle_all_editing(boolean enabled) {
+        text_date.setEnabled(enabled);
+        text_descr.setEnabled(enabled);
         TableLayout table = findViewById(R.id.new_transaction_accounts_table);
         for (int i = 0; i < table.getChildCount(); i++) {
             TableRow row = (TableRow) table.getChildAt(i);
@@ -170,6 +179,11 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
                         prev_amt.setImeOptions(EditorInfo.IME_ACTION_NEXT);
                     }
 
+                    if (row.hasFocus()) {
+                        if (next_acc != null) next_acc.requestFocus();
+                        else prev_amt.requestFocus();
+                    }
+
                     table.removeView(row);
                     check_transaction_submittable();
 //                    Toast.makeText(NewTransactionActivity.this, "LEFT", Toast.LENGTH_LONG).show();