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=6709b7d9e566af4acceb203c54e6df951b8f83cc;hp=fe2a14b2f176fb7b8a35eb01acb62e641c9c5a15;hb=df4148e4f3dbfeb798455e33b96838c386ab6797;hpb=5c608c57d46b9fd2e77b4a4c65800662f7c56aff diff --git a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java index fe2a14b2..6709b7d9 100644 --- a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java @@ -1,11 +1,15 @@ package net.ktnx.mobileledger; +import android.animation.AnimatorInflater; +import android.animation.AnimatorSet; 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; @@ -22,14 +26,38 @@ 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; + private ProgressBar progress; + private TextView text_date; + private TextView text_descr; + private static SaveTransactionTask saver; @Override protected void onCreate(Bundle savedInstanceState) { @@ -38,14 +66,22 @@ 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++) { @@ -55,6 +91,29 @@ public class NewTransactionActivity extends AppCompatActivity { } } + public void new_transaction_save_clicked(View view) { + fab.setEnabled(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 hook_swipe_listener(final TableRow row) { row.getChildAt(0).setOnTouchListener(new OnSwipeTouchListener(this) { public void onSwipeLeft() { @@ -132,13 +191,12 @@ 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 int dp2px(float dp) { return Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, getResources().getDisplayMetrics())); } + public void addTransactionAccountFromMenu(MenuItem item) { final AutoCompleteTextView acc = new AutoCompleteTextView(this); acc.setLayoutParams(new TableRow.LayoutParams(TableRow.LayoutParams.MATCH_PARENT, TableRow.LayoutParams.WRAP_CONTENT, 9f)); @@ -165,4 +223,46 @@ public class NewTransactionActivity extends AppCompatActivity { hook_autocompletion_adapter(row); } + @Override + public void done() { + fab.setImageResource(R.drawable.ic_check_white_24dp); + fab.setEnabled(true); + + AnimatorSet set = (AnimatorSet) AnimatorInflater.loadAnimator(this, R.animator.new_trans_animation); + set.setTarget(fab); + set.start(); + final Handler at_fade_out = new Handler(); + at_fade_out.postDelayed(new Runnable() { + @Override + public void run() { + + final Handler at_fade_in = new Handler(); + at_fade_in.postDelayed(new Runnable() { + @Override + public void run() { + fab.setImageResource(R.drawable.ic_save_white_24dp); + } + }, 1000); + } + }, 500); + progress.setVisibility(View.INVISIBLE); + reset_form(); + } + + 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(); + } }