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=d7ce8b5560cf2354a02b5672a7ada6cee432e17b;hp=1ff9431b8f8cd2e25364dd3112097585e2fef98d;hb=6af1356a5a0fc255784f2cd3b5ccdbcbd534251e;hpb=0ebd3063793b5951b3c651f23b289762df798439 diff --git a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java index 1ff9431b..d7ce8b55 100644 --- a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java @@ -1,25 +1,103 @@ package net.ktnx.mobileledger; +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.os.Handler; +import android.preference.PreferenceManager; +import android.provider.FontsContract; import android.support.design.widget.FloatingActionButton; import android.support.design.widget.Snackbar; import android.support.v4.app.DialogFragment; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; +import android.text.Editable; import android.text.InputType; +import android.text.TextWatcher; +import android.util.Log; +import android.util.TypedValue; import android.view.Menu; import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; 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 java.util.Objects; -public class NewTransactionActivity extends AppCompatActivity { +/* + * 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 + * */ + +public class NewTransactionActivity extends AppCompatActivity implements TaskCallback { private TableLayout table; + private FloatingActionButton fab; + boolean fab_should_be_visible; + private ProgressBar progress; + private TextView text_date; + private TextView text_descr; + private static SaveTransactionTask saver; + FloatingActionButton.OnVisibilityChangedListener fab_visibility_changed_listener = new FloatingActionButton.OnVisibilityChangedListener() { + @Override + public void onShown(FloatingActionButton fab) { + Log.d("visuals", "FAB shown"); + super.onShown(fab); + if (!fab_should_be_visible) fab.hide(); + } + + @Override + public void onHidden(FloatingActionButton fab) { + Log.d("visuals", "FAB hidden"); + fab.setImageResource(R.drawable.ic_save_white_24dp); + fab.setEnabled(true); +// super.onHidden(fab); + if (fab_should_be_visible) fab.show(); + } + }; + + private void hide_fab() { + hide_fab(false); + } + + private void hide_fab(boolean force) { + if (!fab_should_be_visible && !force) return; + + fab_should_be_visible = false; + fab.hide(fab_visibility_changed_listener); + } + + private void show_fab() { + show_fab(false); + } + + private void show_fab(boolean force) { + if (fab_should_be_visible && !force) return; + + fab_should_be_visible = true; + fab.show(fab_visibility_changed_listener); + } @Override protected void onCreate(Bundle savedInstanceState) { @@ -28,22 +106,71 @@ public class NewTransactionActivity extends AppCompatActivity { Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); - FloatingActionButton fab = findViewById(R.id.fab); + 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(""); + } + + fab = findViewById(R.id.fab); fab.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) - .setAction("Action", null).show(); + new_transaction_save_clicked(view); } }); + 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++) { - hook_swipe_listener((TableRow)table.getChildAt(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); } } + public void new_transaction_save_clicked(View view) { + fab.setEnabled(false); + toggle_all_editing(false); + progress.setVisibility(View.VISIBLE); + + saver = new SaveTransactionTask(this); + + saver.setPref(PreferenceManager.getDefaultSharedPreferences(this)); + LedgerTransaction tr = new LedgerTransaction(text_date.getText().toString(), text_descr.getText().toString()); + + TableLayout table = findViewById(R.id.new_transaction_accounts_table); + 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 ); + + tr.add_item(item); + } + saver.execute(tr); + } + + private void toggle_all_editing(boolean enabled) { + TableLayout table = findViewById(R.id.new_transaction_accounts_table); + for (int i = 0; i < table.getChildCount(); i++) { + TableRow row = (TableRow) table.getChildAt(i); + for (int j = 0; j < row.getChildCount(); j++) { + row.getChildAt(j).setEnabled(enabled); + } + } + } + private void hook_swipe_listener(final TableRow row) { row.getChildAt(0).setOnTouchListener(new OnSwipeTouchListener(this) { public void onSwipeLeft() { @@ -67,6 +194,71 @@ public class NewTransactionActivity extends AppCompatActivity { }); } + private void hook_text_change_listener(final TextView view) { + view.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + + } + + @Override + public void afterTextChanged(Editable s) { +// Log.d("input", "text changed"); + check_transaction_submittable(); + } + }); + + } + + @TargetApi(Build.VERSION_CODES.N) + private void hook_autocompletion_adapter(final TableRow row) { + String[] from = {"name"}; + 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); + + 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, "name"}; + MatrixCursor c = new MatrixCursor(col_names); + + Cursor matches = db.rawQuery("SELECT name FROM accounts WHERE UPPER(name) LIKE '%'||?||'%' ORDER BY name;", new String[]{str}); + + try { + int i = 0; + while (matches.moveToNext()) { + String name = matches.getString(0); + Log.d("autocompletion-match", name); + c.newRow().add(i++).add(name); + } + } + finally { + matches.close(); + } + + return c; + + } + }; + + adapter.setFilterQueryProvider(provider); + + acc.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); @@ -77,11 +269,13 @@ public class NewTransactionActivity extends AppCompatActivity { public void pickTransactionDate(View view) { DialogFragment picker = new DatePickerFragment(); picker.show(getSupportFragmentManager(), "datePicker"); -// Snackbar.make(view, "Date editing not yet ready", Snackbar.LENGTH_LONG) -// .setAction("Action", null).show(); } - public void addTransactionAccountFromMenu(MenuItem item) { + public int dp2px(float dp) { + 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.setHint(R.string.new_transaction_account_hint); @@ -92,7 +286,7 @@ public class NewTransactionActivity extends AppCompatActivity { 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.setMinWidth(64); + amt.setMinWidth(dp2px(40)); amt.setTextAlignment(EditText.TEXT_ALIGNMENT_VIEW_END); final TableRow row = new TableRow(this); @@ -101,9 +295,83 @@ public class NewTransactionActivity extends AppCompatActivity { row.addView(amt); table.addView(row); - acc.requestFocus(); + if (focus) acc.requestFocus(); hook_swipe_listener(row); + hook_autocompletion_adapter(row); + hook_text_change_listener(acc); + hook_text_change_listener(amt); } + public void addTransactionAccountFromMenu(MenuItem item) { + do_add_account_row(true); + } + + private void check_transaction_submittable() { + TableLayout table = findViewById(R.id.new_transaction_accounts_table); + int accounts = 0; + int accounts_with_values = 0; + int empty_rows = 0; + for(int i = 0; i < table.getChildCount(); i++ ) { + TableRow row = (TableRow) table.getChildAt(i); + + TextView acc_name_v = (TextView) row.getChildAt(0); + + String acc_name = String.valueOf(acc_name_v.getText()); + acc_name = acc_name.trim(); + if (!acc_name.isEmpty()) { + accounts++; + + TextView amount_v = (TextView) row.getChildAt(1); + String amt = String.valueOf(amount_v.getText()); + + if (!amt.isEmpty()) accounts_with_values++; + } else empty_rows++; + } + + if (accounts_with_values == accounts && empty_rows == 0) { + do_add_account_row(false); + } + + if ((accounts >= 2) && (accounts_with_values >= (accounts - 1))) { + show_fab(); + } else hide_fab(); + } + + @Override + public void done() { + fab.setImageResource(R.drawable.ic_check_white_24dp); + progress.setVisibility(View.INVISIBLE); + Log.d("visuals", "hiding progress"); + + fab_should_be_visible = false; + final Handler fade_out = new Handler(); + fade_out.postDelayed(new Runnable() { + @Override + public void run() { + Log.d("visuals", "hiding FAB"); + + hide_fab(true); + } + }, 1000); + reset_form(); + toggle_all_editing(true); + } + + private void reset_form() { + text_date.setText(""); + text_descr.setText(""); + while(table.getChildCount() > 2) { + table.removeViewAt(2); + } + for( int i = 0; i < 2; i++ ) { + TableRow tr = (TableRow) table.getChildAt(i); + if ( tr == null) break; + + ((TextView)tr.getChildAt(0)).setText(""); + ((TextView)tr.getChildAt(1)).setText(""); + } + + text_descr.requestFocus(); + } }