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=4950a1ef502451443767f186af2c4b642143a64a;hp=d6e2b8338b54c42425152b901ad152d49ac486ee;hb=6b740c280c79b0170321f533747cdbfc3e179a29;hpb=b04a1d6a50727376977a86a968b5ad0621f5a6a2 diff --git a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java index d6e2b833..4950a1ef 100644 --- a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java @@ -1,3 +1,20 @@ +/* + * Copyright © 2018 Damyan Ivanov. + * This file is part of Mobile-Ledger. + * Mobile-Ledger is free software: you can distribute it and/or modify it + * under the term of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your opinion), any later version. + * + * Mobile-Ledger is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License terms for details. + * + * You should have received a copy of the GNU General Public License + * along with Mobile-Ledger. If not, see . + */ + package net.ktnx.mobileledger; import android.annotation.SuppressLint; @@ -34,12 +51,17 @@ 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.LedgerTransactionItem; +import net.ktnx.mobileledger.ui.DatePickerFragment; +import net.ktnx.mobileledger.utils.MobileLedgerDatabase; + 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 @@ -58,6 +80,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal private AutoCompleteTextView text_descr; private static SaveTransactionTask saver; private MenuItem mSave; + private MobileLedgerDatabase dbh; @Override protected void onCreate(Bundle savedInstanceState) { @@ -66,6 +89,8 @@ 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 @@ -75,7 +100,8 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal } }); text_descr = findViewById(R.id.new_transaction_description); - hook_autocompletion_adapter(text_descr, MobileLedgerDB.DESCRIPTION_HISTORY_TABLE, "description"); + hook_autocompletion_adapter(text_descr, MobileLedgerDatabase + .DESCRIPTION_HISTORY_TABLE, "description"); hook_text_change_listener(text_descr); progress = findViewById(R.id.save_transaction_progress); @@ -87,7 +113,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, MobileLedgerDB.ACCOUNTS_TABLE, "name"); + hook_autocompletion_adapter(acc_name_view, MobileLedgerDatabase.ACCOUNTS_TABLE, "name"); hook_text_change_listener(acc_name_view); hook_text_change_listener(amount_view); // Log.d("swipe", "hooked to row "+i); @@ -228,43 +254,43 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal 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; - - SimpleCursorAdapter adapter = new SimpleCursorAdapter(this, android.R.layout.simple_dropdown_item_1line, null, from, to, 0); + 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) { + public + Cursor runQuery(CharSequence constraint) { if (constraint == null) return null; String str = constraint.toString().toUpperCase(); - Log.d("autocompletion", "Looking for "+str); + Log.d("autocompletion", "Looking for " + str); String[] col_names = {FontsContract.Columns._ID, field}; MatrixCursor c = new MatrixCursor(col_names); - 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 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); + 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); + } } - } - finally { - matches.close(); - } - return c; + return c; + } } }; @@ -299,7 +325,9 @@ 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); + 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); amt.setLayoutParams(new TableRow.LayoutParams(TableRow.LayoutParams.WRAP_CONTENT, @@ -330,7 +358,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal if (focus) acc.requestFocus(); hook_swipe_listener(row); - hook_autocompletion_adapter(acc, MobileLedgerDB.ACCOUNTS_TABLE, "name"); + hook_autocompletion_adapter(acc, MobileLedgerDatabase.ACCOUNTS_TABLE, "name"); hook_text_change_listener(acc); hook_text_change_listener(amt); } @@ -348,6 +376,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 @@ -365,6 +398,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() @@ -394,6 +428,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; } @@ -410,8 +445,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); } @@ -421,6 +464,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);