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=4e966e1fb41d3eaadbe7ab60b39e959012161b75;hp=85c512096308567c9f96f85d88c77d33b2448aed;hb=053aca6d22a84b557945109f2c5d3c0120b4ac44;hpb=8b2a83f10265f8c8e8044b8dd990337283834afd diff --git a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java index 85c51209..4e966e1f 100644 --- a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java @@ -18,14 +18,8 @@ package net.ktnx.mobileledger; import android.annotation.SuppressLint; -import android.annotation.TargetApi; -import android.database.Cursor; -import android.database.MatrixCursor; -import android.database.sqlite.SQLiteDatabase; -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; @@ -44,19 +38,22 @@ import android.view.View; import android.view.inputmethod.EditorInfo; import android.widget.AutoCompleteTextView; import android.widget.EditText; -import android.widget.FilterQueryProvider; import android.widget.ProgressBar; -import android.widget.SimpleCursorAdapter; import android.widget.TableLayout; import android.widget.TableRow; import android.widget.TextView; +import net.ktnx.mobileledger.async.SaveTransactionTask; +import net.ktnx.mobileledger.async.TaskCallback; +import net.ktnx.mobileledger.model.LedgerTransaction; +import net.ktnx.mobileledger.model.LedgerTransactionAccount; +import net.ktnx.mobileledger.ui.DatePickerFragment; +import net.ktnx.mobileledger.utils.MLDB; + import java.util.Date; 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: latest transactions, maybe with browsing further in the past? * TODO: reports @@ -69,13 +66,12 @@ import java.util.Objects; * */ public class NewTransactionActivity extends AppCompatActivity implements TaskCallback { + private static SaveTransactionTask saver; private TableLayout table; private ProgressBar progress; private TextView text_date; private AutoCompleteTextView text_descr; - private static SaveTransactionTask saver; private MenuItem mSave; - private MobileLedgerDatabase dbh; @Override protected void onCreate(Bundle savedInstanceState) { @@ -84,19 +80,16 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); - dbh = new MobileLedgerDatabase(this); - text_date = findViewById(R.id.new_transaction_date); text_date.setOnFocusChangeListener(new View.OnFocusChangeListener() { @Override - public - void onFocusChange(View v, boolean hasFocus) { + public void onFocusChange(View v, boolean hasFocus) { if (hasFocus) pickTransactionDate(v); } }); text_descr = findViewById(R.id.new_transaction_description); - hook_autocompletion_adapter(text_descr, MobileLedgerDatabase - .DESCRIPTION_HISTORY_TABLE, "description"); + MLDB.hook_autocompletion_adapter(this, text_descr, MLDB.DESCRIPTION_HISTORY_TABLE, + "description"); hook_text_change_listener(text_descr); progress = findViewById(R.id.save_transaction_progress); @@ -108,7 +101,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal 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, MobileLedgerDatabase.ACCOUNTS_TABLE, "name"); + MLDB.hook_autocompletion_adapter(this, acc_name_view, MLDB.ACCOUNTS_TABLE, "name"); hook_text_change_listener(acc_name_view); hook_text_change_listener(amount_view); // Log.d("swipe", "hooked to row "+i); @@ -116,8 +109,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal } @Override - protected - void onStart() { + protected void onStart() { super.onStart(); if (text_descr.getText().toString().isEmpty()) text_descr.requestFocus(); } @@ -151,16 +143,15 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal LedgerTransaction tr = new LedgerTransaction(date, text_descr.getText().toString()); TableLayout table = findViewById(R.id.new_transaction_accounts_table); - for ( int i = 0; i < table.getChildCount(); i++ ) { + for (int i = 0; i < table.getChildCount(); i++) { TableRow row = (TableRow) table.getChildAt(i); String acc = ((TextView) row.getChildAt(0)).getText().toString(); String amt = ((TextView) row.getChildAt(1)).getText().toString(); - LedgerTransactionItem item = - amt.length() > 0 - ? new LedgerTransactionItem( acc, Float.parseFloat(amt)) - : new LedgerTransactionItem( acc ); + LedgerTransactionAccount item = + amt.length() > 0 ? new LedgerTransactionAccount(acc, Float.parseFloat(amt)) + : new LedgerTransactionAccount(acc); - tr.add_item(item); + tr.addAccount(item); } saver.execute(tr); } @@ -210,11 +201,11 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal // Toast.makeText(NewTransactionActivity.this, "LEFT", Toast.LENGTH_LONG).show(); } else { - Snackbar.make(table, R.string.msg_at_least_two_accounts_are_required, Snackbar.LENGTH_LONG) - .setAction("Action", null).show(); + Snackbar.make(table, R.string.msg_at_least_two_accounts_are_required, + Snackbar.LENGTH_LONG).setAction("Action", null).show(); } } -// @Override + // @Override // public boolean performClick(View view, MotionEvent m) { // return true; // } @@ -245,56 +236,6 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal } - @TargetApi(Build.VERSION_CODES.N) - private void hook_autocompletion_adapter(final AutoCompleteTextView view, final String table, final String field) { - String[] from = {field}; - int[] to = {android.R.id.text1}; - SimpleCursorAdapter adapter = - new SimpleCursorAdapter(this, android.R.layout.simple_dropdown_item_1line, null, - from, to, 0); - adapter.setStringConversionColumn(1); - - FilterQueryProvider provider = new FilterQueryProvider() { - @Override - public - Cursor runQuery(CharSequence constraint) { - if (constraint == null) return null; - - String str = constraint.toString().toUpperCase(); - Log.d("autocompletion", "Looking for " + str); - String[] col_names = {FontsContract.Columns._ID, field}; - MatrixCursor c = new MatrixCursor(col_names); - - try (SQLiteDatabase db = dbh.getReadableDatabase()) { - - try (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})) - { - int i = 0; - while (matches.moveToNext()) { - 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); - } - } - - return c; - } - - } - }; - - adapter.setFilterQueryProvider(provider); - - 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); @@ -312,16 +253,18 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal } public int dp2px(float dp) { - return Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, getResources().getDisplayMetrics())); + return Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, + getResources().getDisplayMetrics())); } private void do_add_account_row(boolean focus) { final AutoCompleteTextView acc = new AutoCompleteTextView(this); - acc.setLayoutParams(new TableRow.LayoutParams(TableRow.LayoutParams.MATCH_PARENT, TableRow.LayoutParams.WRAP_CONTENT, 9f)); + 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 | EditorInfo.IME_FLAG_NO_ENTER_ACTION - | EditorInfo.IME_FLAG_NAVIGATE_NEXT); + acc.setImeOptions(EditorInfo.IME_ACTION_NEXT | EditorInfo.IME_FLAG_NO_ENTER_ACTION | + EditorInfo.IME_FLAG_NAVIGATE_NEXT); acc.setSingleLine(true); final EditText amt = new EditText(this); @@ -329,7 +272,8 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal 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 ); + 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); @@ -344,7 +288,8 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal acc.setNextFocusRightId(amt.getId()); final TableRow row = new TableRow(this); - row.setLayoutParams(new TableRow.LayoutParams(TableRow.LayoutParams.MATCH_PARENT, TableRow.LayoutParams.MATCH_PARENT)); + row.setLayoutParams(new TableRow.LayoutParams(TableRow.LayoutParams.MATCH_PARENT, + TableRow.LayoutParams.MATCH_PARENT)); row.setGravity(Gravity.BOTTOM); row.addView(acc); row.addView(amt); @@ -353,7 +298,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal if (focus) acc.requestFocus(); hook_swipe_listener(row); - hook_autocompletion_adapter(acc, MobileLedgerDatabase.ACCOUNTS_TABLE, "name"); + MLDB.hook_autocompletion_adapter(this, acc, MLDB.ACCOUNTS_TABLE, "name"); hook_text_change_listener(acc); hook_text_change_listener(amt); } @@ -362,8 +307,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal do_add_account_row(true); } - public - void resetTransactionFromMenu(MenuItem item) { + public void resetTransactionFromMenu(MenuItem item) { reset_form(); } @@ -371,8 +315,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal save_transaction(); } - private - boolean is_zero(float f) { + private boolean is_zero(float f) { return (f < 0.005) && (f > -0.005); } @@ -434,22 +377,21 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal } } - if ((empty_rows == 0) && ((table.getChildCount() == accounts) || (table.getChildCount() - == amounts))) + if ((empty_rows == 0) && + ((table.getChildCount() == accounts) || (table.getChildCount() == amounts))) { 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, + 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) && ( - single_empty_amount && single_empty_amount_has_account || is_zero( - running_total))) + if (have_description && (accounts >= 2) && (accounts_with_values >= (accounts - 1)) && + (amounts_with_accounts == amounts) && + (single_empty_amount && single_empty_amount_has_account || is_zero(running_total))) { if (mSave != null) mSave.setVisible(true); } @@ -471,8 +413,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal } @Override - public - void done(String error) { + public void done(String error) { progress.setVisibility(View.INVISIBLE); Log.d("visuals", "hiding progress"); @@ -490,15 +431,15 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal text_descr.requestFocus(); - while(table.getChildCount() > 2) { + while (table.getChildCount() > 2) { table.removeViewAt(2); } - for( int i = 0; i < 2; i++ ) { + for (int i = 0; i < 2; i++) { TableRow tr = (TableRow) table.getChildAt(i); - if ( tr == null) break; + if (tr == null) break; - ((TextView)tr.getChildAt(0)).setText(""); - ((TextView)tr.getChildAt(1)).setText(""); + ((TextView) tr.getChildAt(0)).setText(""); + ((TextView) tr.getChildAt(1)).setText(""); } } }