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=38289020715be1d118a1def9e034a83005ffb259;hp=f41063d96034d9f754bf7dee3c090182c8d2c6b7;hb=6c58c1072c9af6ea0d0f52baeae7f95ba7f7ee2f;hpb=5e7a0e2a76b8d627801a5fbdf05c2dc7c6168b9f diff --git a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java index f41063d9..38289020 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.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 @@ -75,7 +97,7 @@ 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, MLDB.DESCRIPTION_HISTORY_TABLE, "description"); hook_text_change_listener(text_descr); progress = findViewById(R.id.save_transaction_progress); @@ -87,7 +109,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, MLDB.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 +250,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 = MLDB.getReadableDatabase(getApplicationContext())) { + + 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 +321,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 +354,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, MLDB.ACCOUNTS_TABLE, "name"); hook_text_change_listener(acc); hook_text_change_listener(amt); }