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;
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;
* 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
* */
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;
text_date = findViewById(R.id.new_transaction_date);
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);
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);
+ AutoCompleteTextView acc_name_view = (AutoCompleteTextView) row.getChildAt(0);
TextView amount_view = (TextView) row.getChildAt(1);
hook_swipe_listener(row);
- hook_autocompletion_adapter(row);
+ hook_autocompletion_adapter(acc_name_view, MobileLedgerDB.ACCOUNTS_TABLE, "name");
hook_text_change_listener(acc_name_view);
hook_text_change_listener(amount_view);
// Log.d("swipe", "hooked to row "+i);
}
@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);
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 {
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();
return true;
}
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 );
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);
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);
}
}
@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() {
projects / mobile-ledger.git / blobdiff