]> git.ktnx.net Git - mobile-ledger.git/blobdiff - app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
more check for suitability of the transaction
[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / NewTransactionActivity.java
index 1f259fba008d217d8a80c1f852952fad25903130..f41063d96034d9f754bf7dee3c090182c8d2c6b7 100644 (file)
@@ -24,6 +24,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.inputmethod.EditorInfo;
 import android.widget.AutoCompleteTextView;
 import android.widget.EditText;
 import android.widget.FilterQueryProvider;
@@ -81,9 +82,23 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
 
         Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
         table = findViewById(R.id.new_transaction_accounts_table);
-        table.removeAllViews();
-        do_add_account_row(false);
-        do_add_account_row(false);
+        for (int i = 0; i < table.getChildCount(); i++) {
+            TableRow row = (TableRow) table.getChildAt(i);
+            AutoCompleteTextView acc_name_view = (AutoCompleteTextView) row.getChildAt(0);
+            TextView amount_view = (TextView) row.getChildAt(1);
+            hook_swipe_listener(row);
+            hook_autocompletion_adapter(acc_name_view, MobileLedgerDB.ACCOUNTS_TABLE, "name");
+            hook_text_change_listener(acc_name_view);
+            hook_text_change_listener(amount_view);
+//            Log.d("swipe", "hooked to row "+i);
+        }
+    }
+
+    @Override
+    protected
+    void onStart() {
+        super.onStart();
+        if (text_descr.getText().toString().isEmpty()) text_descr.requestFocus();
     }
 
     @Override
@@ -130,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);
@@ -144,7 +161,31 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
             public void onSwipeLeft() {
 //                Log.d("swipe", "LEFT" + row.getId());
                 if (table.getChildCount() > 2) {
+                    TableRow prev_row = (TableRow) table.getChildAt(table.indexOfChild(row) - 1);
+                    TableRow next_row = (TableRow) table.getChildAt(table.indexOfChild(row) + 1);
+                    TextView prev_amt =
+                            (prev_row != null) ? (TextView) prev_row.getChildAt(1) : text_descr;
+                    TextView next_acc =
+                            (next_row != null) ? (TextView) next_row.getChildAt(0) : null;
+
+                    if (next_acc == null) {
+                        prev_amt.setNextFocusRightId(R.id.none);
+                        prev_amt.setNextFocusForwardId(R.id.none);
+                        prev_amt.setImeOptions(EditorInfo.IME_ACTION_DONE);
+                    }
+                    else {
+                        prev_amt.setNextFocusRightId(next_acc.getId());
+                        prev_amt.setNextFocusForwardId(next_acc.getId());
+                        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 {
@@ -258,6 +299,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
         acc.setLayoutParams(new TableRow.LayoutParams(TableRow.LayoutParams.MATCH_PARENT, TableRow.LayoutParams.WRAP_CONTENT, 9f));
         acc.setHint(R.string.new_transaction_account_hint);
         acc.setWidth(0);
+        acc.setImeOptions(EditorInfo.IME_ACTION_NEXT);
 
         final EditText amt = new EditText(this);
         amt.setLayoutParams(new TableRow.LayoutParams(TableRow.LayoutParams.WRAP_CONTENT,
@@ -267,6 +309,16 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
         amt.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_SIGNED | InputType.TYPE_NUMBER_FLAG_DECIMAL );
         amt.setMinWidth(dp2px(40));
         amt.setTextAlignment(EditText.TEXT_ALIGNMENT_VIEW_END);
+        amt.setImeOptions(EditorInfo.IME_ACTION_DONE);
+
+        // forward navigation support
+        final TableRow last_row = (TableRow) table.getChildAt(table.getChildCount() - 1);
+        final TextView last_amt = (TextView) last_row.getChildAt(1);
+        last_amt.setNextFocusForwardId(acc.getId());
+        last_amt.setNextFocusRightId(acc.getId());
+        last_amt.setImeOptions(EditorInfo.IME_ACTION_NEXT);
+        acc.setNextFocusForwardId(amt.getId());
+        acc.setNextFocusRightId(amt.getId());
 
         final TableRow row = new TableRow(this);
         row.setLayoutParams(new TableRow.LayoutParams(TableRow.LayoutParams.MATCH_PARENT, TableRow.LayoutParams.MATCH_PARENT));
@@ -296,6 +348,11 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
         save_transaction();
     }
 
+    private
+    boolean is_zero(float f) {
+        return (f < 0.005) && (f > -0.005);
+    }
+
     // rules:
     // 1) at least two account names
     // 2) each amount must have account name
@@ -313,6 +370,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
         int empty_rows = 0;
         TextView empty_amount = null;
         boolean single_empty_amount = false;
+        boolean single_empty_amount_has_account = false;
         float running_total = 0f;
         boolean have_description =
                 !((TextView) findViewById(R.id.new_transaction_description)).getText().toString()
@@ -342,6 +400,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
                     if (empty_amount == null) {
                         empty_amount = amount_v;
                         single_empty_amount = true;
+                        single_empty_amount_has_account = !acc_name.isEmpty();
                     }
                     else if (!acc_name.isEmpty()) single_empty_amount = false;
                 }
@@ -358,8 +417,16 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
                 do_add_account_row(false);
             }
 
+            Log.d("submittable", String.format("accounts=%d, accounts_with_values=%s, "
+                            + "amounts_with_accounts=%d, amounts=%d, running_total=%1.2f, "
+                            + "single_empty_with_acc=%s", accounts, accounts_with_values,
+                    amounts_with_accounts, amounts, running_total,
+                    (single_empty_amount && single_empty_amount_has_account) ? "true" : "false"));
+
             if (have_description && (accounts >= 2) && (accounts_with_values >= (accounts - 1)) && (
-                    amounts_with_accounts == amounts))
+                    amounts_with_accounts == amounts) && (
+                    single_empty_amount && single_empty_amount_has_account || is_zero(
+                            running_total)))
             {
                 if (mSave != null) mSave.setVisible(true);
             }
@@ -369,6 +436,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
                 empty_amount
                         .setHint(String.format("%1.2f", (running_total > 0) ? -running_total : 0f));
             }
+
         }
         catch (NumberFormatException e) {
             if (mSave != null) mSave.setVisible(false);
@@ -396,6 +464,9 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
     private void reset_form() {
         text_date.setText("");
         text_descr.setText("");
+
+        text_descr.requestFocus();
+
         while(table.getChildCount() > 2) {
             table.removeViewAt(2);
         }
@@ -406,7 +477,5 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
             ((TextView)tr.getChildAt(0)).setText("");
             ((TextView)tr.getChildAt(1)).setText("");
         }
-
-        text_descr.requestFocus();
     }
 }