whitespace

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

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionActivity.java
index 310232d2057a6fc9585d5f29ec0118adfce629b9..cd3576ade95e7eb1dd0385d4f7266aae3ec0fc79 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionActivity.java
@@ -24,7 +24,6 @@ import android.os.Bundle;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.Menu;
@@ -44,6 +43,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.BaseTransientBottomBar;
 import com.google.android.material.snackbar.Snackbar;
 
+import net.ktnx.mobileledger.App;
 import net.ktnx.mobileledger.BuildConfig;
 import net.ktnx.mobileledger.R;
 import net.ktnx.mobileledger.async.DescriptionSelectedCallback;
@@ -53,6 +53,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.ui.AutoCompleteTextViewWithClear;
 import net.ktnx.mobileledger.ui.DatePickerFragment;
 import net.ktnx.mobileledger.ui.OnSwipeTouchListener;
 import net.ktnx.mobileledger.utils.Globals;
@@ -67,6 +68,8 @@ import java.util.Objects;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.DialogFragment;
 
+import static net.ktnx.mobileledger.utils.Logger.debug;
+
 /*
  * TODO: nicer progress while transaction is submitted
  * TODO: reports
@@ -100,7 +103,7 @@ public class NewTransactionActivity extends ProfileThemedActivity
         });
         tvDescription = findViewById(R.id.new_transaction_description);
         MLDB.hookAutocompletionAdapter(this, tvDescription, MLDB.DESCRIPTION_HISTORY_TABLE,
-                "description", false, findViewById(R.id.new_transaction_acc_1), this);
+                "description", false, this, mProfile);
         hookTextChangeListener(tvDescription);
 
         progress = findViewById(R.id.save_transaction_progress);
@@ -109,17 +112,12 @@ public class NewTransactionActivity extends ProfileThemedActivity
 
         Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
         table = findViewById(R.id.new_transaction_accounts_table);
-        for (int i = 0; i < table.getChildCount(); i++) {
-            TableRow row = (TableRow) table.getChildAt(i);
-            AutoCompleteTextView tvAccountName = (AutoCompleteTextView) row.getChildAt(0);
-            TextView tvAmount = (TextView) row.getChildAt(1);
-            hookSwipeListener(row);
-            MLDB.hookAutocompletionAdapter(this, tvAccountName, MLDB.ACCOUNTS_TABLE, "name", true,
-                    tvAmount, null);
-            hookTextChangeListener(tvAccountName);
-            hookTextChangeListener(tvAmount);
-//            Log.d("swipe", "hooked to row "+i);
+
+        while (table.getChildCount() < 2) {
+            doAddAccountRow(false);
         }
+
+        check_transaction_submittable();
     }
     @Override
     protected void initProfile() {
@@ -163,7 +161,8 @@ public class NewTransactionActivity extends ProfileThemedActivity
             Date date;
             if (dateString.isEmpty()) date = new Date();
             else date = Globals.parseLedgerDate(dateString);
-            LedgerTransaction tr = new LedgerTransaction(date, tvDescription.getText().toString());
+            LedgerTransaction tr =
+                    new LedgerTransaction(null, date, tvDescription.getText().toString(), mProfile);
 
             TableLayout table = findViewById(R.id.new_transaction_accounts_table);
             LedgerTransactionAccount emptyAmountAccount = null;
@@ -193,7 +192,7 @@ public class NewTransactionActivity extends ProfileThemedActivity
             saver.execute(tr);
         }
         catch (ParseException e) {
-            Log.d("new-transaction", "Parse error", e);
+            debug("new-transaction", "Parse error", e);
             Toast.makeText(this, getResources().getString(R.string.error_invalid_date),
                     Toast.LENGTH_LONG).show();
             tvDate.requestFocus();
@@ -203,7 +202,7 @@ public class NewTransactionActivity extends ProfileThemedActivity
             if (fab != null) fab.setEnabled(true);
         }
         catch (Exception e) {
-            Log.d("new-transaction", "Unknown error", e);
+            debug("new-transaction", "Unknown error", e);
 
             progress.setVisibility(View.GONE);
             toggleAllEditing(true);
@@ -273,10 +272,9 @@ public class NewTransactionActivity extends ProfileThemedActivity
         });
     }
 
-    public boolean simulateCrash(MenuItem item) {
-        Log.d("crash", "Will crash intentionally");
+    public void simulateCrash(MenuItem item) {
+        debug("crash", "Will crash intentionally");
         new AsyncCrasher().execute();
-        return true;
     }
     public boolean onCreateOptionsMenu(Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.
@@ -313,14 +311,14 @@ public class NewTransactionActivity extends ProfileThemedActivity
 
             @Override
             public void afterTextChanged(Editable s) {
-//                Log.d("input", "text changed");
+//                debug("input", "text changed");
                 check_transaction_submittable();
             }
         });
 
     }
     private TableRow doAddAccountRow(boolean focus) {
-        final AutoCompleteTextView acc = new AutoCompleteTextView(this);
+        final AutoCompleteTextView acc = new AutoCompleteTextViewWithClear(this);
         acc.setLayoutParams(new TableRow.LayoutParams(TableRow.LayoutParams.MATCH_PARENT,
                 TableRow.LayoutParams.WRAP_CONTENT, 9f));
         acc.setHint(R.string.new_transaction_account_hint);
@@ -342,8 +340,15 @@ public class NewTransactionActivity extends ProfileThemedActivity
         amt.setSelectAllOnFocus(true);
 
         // forward navigation support
-        final TableRow last_row = (TableRow) table.getChildAt(table.getChildCount() - 1);
-        final TextView last_amt = (TextView) last_row.getChildAt(1);
+        TextView last_amt;
+        int rows = table.getChildCount();
+        if (rows > 0) {
+            final TableRow last_row = (TableRow) table.getChildAt(rows - 1);
+            last_amt = (TextView) last_row.getChildAt(1);
+        }
+        else {
+            last_amt = tvDescription;
+        }
         last_amt.setNextFocusForwardId(acc.getId());
         last_amt.setNextFocusRightId(acc.getId());
         last_amt.setImeOptions(EditorInfo.IME_ACTION_NEXT);
@@ -361,7 +366,8 @@ public class NewTransactionActivity extends ProfileThemedActivity
         if (focus) acc.requestFocus();
 
         hookSwipeListener(row);
-        MLDB.hookAutocompletionAdapter(this, acc, MLDB.ACCOUNTS_TABLE, "name", true, amt, null);
+        MLDB.hookAutocompletionAdapter(this, acc, MLDB.ACCOUNTS_TABLE, "name", true,
+                description -> amt.requestFocus(), mProfile);
         hookTextChangeListener(acc);
         hookTextChangeListener(amt);
 
@@ -440,7 +446,7 @@ public class NewTransactionActivity extends ProfileThemedActivity
                 doAddAccountRow(false);
             }
 
-            Log.d("submittable", String.format("accounts=%d, accounts_with_values=%s, " +
+            debug("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,
@@ -477,7 +483,7 @@ public class NewTransactionActivity extends ProfileThemedActivity
     @Override
     public void done(String error) {
         progress.setVisibility(View.INVISIBLE);
-        Log.d("visuals", "hiding progress");
+        debug("visuals", "hiding progress");
 
         if (error == null) resetForm();
         else Snackbar.make(findViewById(R.id.new_transaction_accounts_table), error,
@@ -506,7 +512,7 @@ public class NewTransactionActivity extends ProfileThemedActivity
     }
     @Override
     public void descriptionSelected(String description) {
-        Log.d("descr selected", description);
+        debug("descr selected", description);
         if (!inputStateIsInitial()) return;
 
         String accFilter = mProfile.getPreferredAccountsFilter();
@@ -526,10 +532,10 @@ public class NewTransactionActivity extends ProfileThemedActivity
         sb.append(" ORDER BY date desc limit 1");
 
         final String sql = sb.toString();
-        Log.d("descr", sql);
-        Log.d("descr", params.toString());
+        debug("descr", sql);
+        debug("descr", params.toString());
 
-        try (Cursor c = MLDB.getDatabase().rawQuery(sql, params.toArray(new String[]{}))) {
+        try (Cursor c = App.getDatabase().rawQuery(sql, params.toArray(new String[]{}))) {
             if (!c.moveToNext()) return;
 
             String profileUUID = c.getString(0);
@@ -541,7 +547,6 @@ public class NewTransactionActivity extends ProfileThemedActivity
                     "transaction %d with description %s", profileUUID, transactionId, description));
 
             tr = profile.loadTransaction(transactionId);
-            table = findViewById(R.id.new_transaction_accounts_table);
             ArrayList<LedgerTransactionAccount> accounts = tr.getAccounts();
             TableRow firstNegative = null;
             int negativeCount = 0;