focus away when removing the row with the focus

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / NewTransactionActivity.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
index 2c6c3a585f040add4b2d75ab98ce6fb10bf8229a..d6e2b8338b54c42425152b901ad152d49ac486ee 100644 (file)
--- 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,7 +179,13 @@ 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();
                 }
                 else {