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=8ec820241caf42657295e189a385651f73a2ba77;hp=dca8d463263623469af193670079199f072b44c6;hb=0272b2095a6c19cd4ff779b63751c05c98459423;hpb=7e41ae1d0d50379d8f96f5687a2633a62e34ae8b diff --git a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java index dca8d463..8ec82024 100644 --- a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java @@ -1,5 +1,6 @@ package net.ktnx.mobileledger; +import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.database.Cursor; import android.database.MatrixCursor; @@ -8,6 +9,7 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.FontsContract; +import android.support.design.widget.BaseTransientBottomBar; import android.support.design.widget.Snackbar; import android.support.v4.app.DialogFragment; import android.support.v7.app.AppCompatActivity; @@ -17,6 +19,7 @@ import android.text.InputType; import android.text.TextWatcher; import android.util.Log; import android.util.TypedValue; +import android.view.Gravity; import android.view.Menu; import android.view.MenuItem; import android.view.MotionEvent; @@ -36,15 +39,12 @@ import java.util.Objects; * TODO: auto-fill of transaction description * if Android O's implementation won't work, add a custom one * TODO: nicer progress while transaction is submitted - * TODO: periodic and manual refresh of available accounts - * (now done forcibly each time the main activity is started) * TODO: latest transactions, maybe with browsing further in the past? * TODO: reports * TODO: get rid of the custom session/cookie and auth code? * (the last problem with the POST was the missing content-length header) * TODO: app icon * TODO: nicer swiping removal with visual feedback - * TODO: activity with current balance * TODO: setup wizard * TODO: update accounts/check settings upon change of backend settings * */ @@ -53,7 +53,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal private TableLayout table; private ProgressBar progress; private TextView text_date; - private TextView text_descr; + private AutoCompleteTextView text_descr; private static SaveTransactionTask saver; private MenuItem mSave; @@ -65,30 +65,43 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal setSupportActionBar(toolbar); text_date = findViewById(R.id.new_transaction_date); + text_date.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public + void onFocusChange(View v, boolean hasFocus) { + if (hasFocus) pickTransactionDate(v); + } + }); text_descr = findViewById(R.id.new_transaction_description); - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - text_descr.setAutofillHints(""); - } + hook_autocompletion_adapter(text_descr, MobileLedgerDB.DESCRIPTION_HISTORY_TABLE, "description"); progress = findViewById(R.id.save_transaction_progress); 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); - TextView acc_name_view = (TextView) row.getChildAt(0); - TextView amount_view = (TextView) row.getChildAt(1); - hook_swipe_listener(row); - hook_autocompletion_adapter(row); - hook_text_change_listener(acc_name_view); - hook_text_change_listener(amount_view); -// Log.d("swipe", "hooked to row "+i); + table.removeAllViews(); + do_add_account_row(false); + do_add_account_row(false); + } + + @Override + public void finish() { + super.finish(); + overridePendingTransition(R.anim.dummy, R.anim.slide_out_right); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case android.R.id.home: + finish(); + return true; } + return super.onOptionsItemSelected(item); } public void save_transaction() { - mSave.setVisible(false); + if (mSave != null) mSave.setVisible(false); toggle_all_editing(false); progress.setVisibility(View.VISIBLE); @@ -167,12 +180,11 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal } @TargetApi(Build.VERSION_CODES.N) - private void hook_autocompletion_adapter(final TableRow row) { - String[] from = {"name"}; + private void hook_autocompletion_adapter(final AutoCompleteTextView view, final String table, final String field) { + String[] from = {field}; int[] to = {android.R.id.text1}; SQLiteDatabase db = MobileLedgerDB.db; - AutoCompleteTextView acc = (AutoCompleteTextView) row.getChildAt(0); SimpleCursorAdapter adapter = new SimpleCursorAdapter(this, android.R.layout.simple_dropdown_item_1line, null, from, to, 0); adapter.setStringConversionColumn(1); @@ -183,17 +195,24 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal String str = constraint.toString().toUpperCase(); Log.d("autocompletion", "Looking for "+str); - String[] col_names = {FontsContract.Columns._ID, "name"}; + String[] col_names = {FontsContract.Columns._ID, field}; MatrixCursor c = new MatrixCursor(col_names); - Cursor matches = db.rawQuery("SELECT name FROM accounts WHERE UPPER(name) LIKE '%'||?||'%' ORDER BY name;", new String[]{str}); + Cursor matches = db.rawQuery(String.format( + "SELECT %s as a, case when %s_upper LIKE ?||'%%' then 1 " + + "WHEN %s_upper LIKE '%%:'||?||'%%' then 2 " + + "WHEN %s_upper LIKE '%% '||?||'%%' then 3 " + "else 9 end " + + "FROM %s " + "WHERE %s_upper LIKE '%%'||?||'%%' " + + "ORDER BY 2, 1;", field, field, field, field, table, field), + new String[]{str, str, str, str}); try { int i = 0; while (matches.moveToNext()) { - String name = matches.getString(0); - Log.d("autocompletion-match", name); - c.newRow().add(i++).add(name); + String match = matches.getString(0); + int order = matches.getInt(1); + Log.d("autocompletion", String.format("match: %s |%d", match, order)); + c.newRow().add(i++).add(match); } } finally { @@ -207,14 +226,16 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal adapter.setFilterQueryProvider(provider); - acc.setAdapter(adapter); + view.setAdapter(adapter); } public boolean onCreateOptionsMenu(Menu menu) { // Inflate the menu; this adds items to the action bar if it is present. getMenuInflater().inflate(R.menu.new_transaction, menu); mSave = menu.findItem(R.id.action_submit_transaction); - assert mSave != null; + if (mSave == null) throw new AssertionError(); + + check_transaction_submittable(); return true; } @@ -235,7 +256,8 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal acc.setWidth(0); final EditText amt = new EditText(this); - amt.setLayoutParams(new TableRow.LayoutParams(TableRow.LayoutParams.WRAP_CONTENT, TableRow.LayoutParams.WRAP_CONTENT, 1f)); + amt.setLayoutParams(new TableRow.LayoutParams(TableRow.LayoutParams.WRAP_CONTENT, + TableRow.LayoutParams.MATCH_PARENT, 1f)); amt.setHint(R.string.new_transaction_amount_hint); amt.setWidth(0); amt.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_SIGNED | InputType.TYPE_NUMBER_FLAG_DECIMAL ); @@ -244,6 +266,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal final TableRow row = new TableRow(this); row.setLayoutParams(new TableRow.LayoutParams(TableRow.LayoutParams.MATCH_PARENT, TableRow.LayoutParams.MATCH_PARENT)); + row.setGravity(Gravity.BOTTOM); row.addView(acc); row.addView(amt); table.addView(row); @@ -251,7 +274,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal if (focus) acc.requestFocus(); hook_swipe_listener(row); - hook_autocompletion_adapter(row); + hook_autocompletion_adapter(acc, MobileLedgerDB.ACCOUNTS_TABLE, "name"); hook_text_change_listener(acc); hook_text_change_listener(amt); } @@ -264,46 +287,101 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal save_transaction(); } + // rules: + // 1) at least two account names + // 2) each amount must have account name + // 3) amounts must balance to 0, or + // 3a) there must be exactly one empty amount + // 4) empty accounts with empty amounts are ignored + // 5) a row with an empty account name or empty amount is guaranteed to exist + @SuppressLint("DefaultLocale") private void check_transaction_submittable() { TableLayout table = findViewById(R.id.new_transaction_accounts_table); int accounts = 0; int accounts_with_values = 0; + int amounts = 0; + int amounts_with_accounts = 0; int empty_rows = 0; - for(int i = 0; i < table.getChildCount(); i++ ) { - TableRow row = (TableRow) table.getChildAt(i); + TextView empty_amount = null; + boolean single_empty_amount = false; + float running_total = 0f; + boolean have_description = + !((TextView) findViewById(R.id.new_transaction_description)).getText().toString() + .isEmpty(); + + try { + for (int i = 0; i < table.getChildCount(); i++) { + TableRow row = (TableRow) table.getChildAt(i); + + TextView acc_name_v = (TextView) row.getChildAt(0); + TextView amount_v = (TextView) row.getChildAt(1); + String amt = String.valueOf(amount_v.getText()); + String acc_name = String.valueOf(acc_name_v.getText()); + acc_name = acc_name.trim(); - TextView acc_name_v = (TextView) row.getChildAt(0); + if (!acc_name.isEmpty()) { + accounts++; - String acc_name = String.valueOf(acc_name_v.getText()); - acc_name = acc_name.trim(); - if (!acc_name.isEmpty()) { - accounts++; + if (!amt.isEmpty()) { + accounts_with_values++; + } + } + else empty_rows++; - TextView amount_v = (TextView) row.getChildAt(1); - String amt = String.valueOf(amount_v.getText()); + if (amt.isEmpty()) { + amount_v.setHint(String.format("%1.2f", 0f)); + if (empty_amount == null) { + empty_amount = amount_v; + single_empty_amount = true; + } + else if (!acc_name.isEmpty()) single_empty_amount = false; + } + else { + amounts++; + if (!acc_name.isEmpty()) amounts_with_accounts++; + running_total += Float.valueOf(amt); + } + } - if (!amt.isEmpty()) accounts_with_values++; - } else empty_rows++; - } + if ((empty_rows == 0) && ((table.getChildCount() == accounts) || (table.getChildCount() + == amounts))) + { + do_add_account_row(false); + } - if (accounts_with_values == accounts && empty_rows == 0) { - do_add_account_row(false); - } + if (have_description && (accounts >= 2) && (accounts_with_values >= (accounts - 1)) && ( + amounts_with_accounts == amounts)) + { + if (mSave != null) mSave.setVisible(true); + } + else if (mSave != null) mSave.setVisible(false); - if ((accounts >= 2) && (accounts_with_values >= (accounts - 1))) { - mSave.setVisible(true); - } else { - mSave.setVisible(false); + if (single_empty_amount) { + empty_amount + .setHint(String.format("%1.2f", (running_total > 0) ? -running_total : 0f)); + } + } + catch (NumberFormatException e) { + if (mSave != null) mSave.setVisible(false); + } + catch (Exception e) { + e.printStackTrace(); + if (mSave != null) mSave.setVisible(false); } } @Override - public void done() { + public + void done(String error) { progress.setVisibility(View.INVISIBLE); Log.d("visuals", "hiding progress"); - reset_form(); + if (error == null) reset_form(); + else Snackbar.make(findViewById(R.id.new_transaction_accounts_table), error, + BaseTransientBottomBar.LENGTH_LONG).show(); + toggle_all_editing(true); + check_transaction_submittable(); } private void reset_form() {