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=53cbc905d62cad18d25aa3abc7e4c2a3958a2882;hp=5ab1af08b2b5a913eaec9db095add5f84e550570;hb=a62fd00f3bc04e39a97817e8eca0421dc962e4fd;hpb=7ec1c4772ff88e23ed826cc19c5a9a32e35ddf7e diff --git a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java index 5ab1af08..53cbc905 100644 --- a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java @@ -1,5 +1,6 @@ package net.ktnx.mobileledger; +import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.database.Cursor; import android.database.MatrixCursor; @@ -23,6 +24,7 @@ import android.view.Menu; import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; +import android.view.inputmethod.EditorInfo; import android.widget.AutoCompleteTextView; import android.widget.EditText; import android.widget.FilterQueryProvider; @@ -32,6 +34,7 @@ import android.widget.TableLayout; import android.widget.TableRow; import android.widget.TextView; +import java.util.Date; import java.util.Objects; /* @@ -64,8 +67,16 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal setSupportActionBar(toolbar); text_date = findViewById(R.id.new_transaction_date); + text_date.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public + void onFocusChange(View v, boolean hasFocus) { + if (hasFocus) pickTransactionDate(v); + } + }); text_descr = findViewById(R.id.new_transaction_description); hook_autocompletion_adapter(text_descr, MobileLedgerDB.DESCRIPTION_HISTORY_TABLE, "description"); + hook_text_change_listener(text_descr); progress = findViewById(R.id.save_transaction_progress); @@ -83,6 +94,13 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal } } + @Override + protected + void onStart() { + super.onStart(); + if (text_descr.getText().toString().isEmpty()) text_descr.requestFocus(); + } + @Override public void finish() { super.finish(); @@ -107,7 +125,9 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal saver = new SaveTransactionTask(this); saver.setPref(PreferenceManager.getDefaultSharedPreferences(this)); - LedgerTransaction tr = new LedgerTransaction(text_date.getText().toString(), text_descr.getText().toString()); + String date = text_date.getText().toString(); + if (date.isEmpty()) date = String.valueOf(new Date().getDate()); + LedgerTransaction tr = new LedgerTransaction(date, text_descr.getText().toString()); TableLayout table = findViewById(R.id.new_transaction_accounts_table); for ( int i = 0; i < table.getChildCount(); i++ ) { @@ -125,6 +145,8 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal } private void toggle_all_editing(boolean enabled) { + text_date.setEnabled(enabled); + text_descr.setEnabled(enabled); TableLayout table = findViewById(R.id.new_transaction_accounts_table); for (int i = 0; i < table.getChildCount(); i++) { TableRow row = (TableRow) table.getChildAt(i); @@ -139,7 +161,26 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal public void onSwipeLeft() { // Log.d("swipe", "LEFT" + row.getId()); if (table.getChildCount() > 2) { + TableRow prev_row = (TableRow) table.getChildAt(table.indexOfChild(row) - 1); + TableRow next_row = (TableRow) table.getChildAt(table.indexOfChild(row) + 1); + TextView prev_amt = + (prev_row != null) ? (TextView) prev_row.getChildAt(1) : text_descr; + TextView next_acc = + (next_row != null) ? (TextView) next_row.getChildAt(0) : null; + + if (next_acc == null) { + prev_amt.setNextFocusRightId(R.id.none); + prev_amt.setNextFocusForwardId(R.id.none); + prev_amt.setImeOptions(EditorInfo.IME_ACTION_DONE); + } + else { + prev_amt.setNextFocusRightId(next_acc.getId()); + prev_amt.setNextFocusForwardId(next_acc.getId()); + prev_amt.setImeOptions(EditorInfo.IME_ACTION_NEXT); + } + table.removeView(row); + check_transaction_submittable(); // Toast.makeText(NewTransactionActivity.this, "LEFT", Toast.LENGTH_LONG).show(); } else { @@ -234,6 +275,8 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal mSave = menu.findItem(R.id.action_submit_transaction); if (mSave == null) throw new AssertionError(); + check_transaction_submittable(); + return true; } @@ -251,6 +294,7 @@ 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); final EditText amt = new EditText(this); amt.setLayoutParams(new TableRow.LayoutParams(TableRow.LayoutParams.WRAP_CONTENT, @@ -260,6 +304,16 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal amt.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_SIGNED | InputType.TYPE_NUMBER_FLAG_DECIMAL ); amt.setMinWidth(dp2px(40)); amt.setTextAlignment(EditText.TEXT_ALIGNMENT_VIEW_END); + amt.setImeOptions(EditorInfo.IME_ACTION_DONE); + + // forward navigation support + final TableRow last_row = (TableRow) table.getChildAt(table.getChildCount() - 1); + final TextView last_amt = (TextView) last_row.getChildAt(1); + last_amt.setNextFocusForwardId(acc.getId()); + last_amt.setNextFocusRightId(acc.getId()); + last_amt.setImeOptions(EditorInfo.IME_ACTION_NEXT); + acc.setNextFocusForwardId(amt.getId()); + acc.setNextFocusRightId(amt.getId()); final TableRow row = new TableRow(this); row.setLayoutParams(new TableRow.LayoutParams(TableRow.LayoutParams.MATCH_PARENT, TableRow.LayoutParams.MATCH_PARENT)); @@ -280,39 +334,94 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal do_add_account_row(true); } + public + void resetTransactionFromMenu(MenuItem item) { + reset_form(); + } + public void saveTransactionFromMenu(MenuItem item) { save_transaction(); } + // rules: + // 1) at least two account names + // 2) each amount must have account name + // 3) amounts must balance to 0, or + // 3a) there must be exactly one empty amount + // 4) empty accounts with empty amounts are ignored + // 5) a row with an empty account name or empty amount is guaranteed to exist + @SuppressLint("DefaultLocale") private void check_transaction_submittable() { TableLayout table = findViewById(R.id.new_transaction_accounts_table); int accounts = 0; int accounts_with_values = 0; + int amounts = 0; + int amounts_with_accounts = 0; int empty_rows = 0; - for(int i = 0; i < table.getChildCount(); i++ ) { - TableRow row = (TableRow) table.getChildAt(i); + TextView empty_amount = null; + boolean single_empty_amount = false; + float running_total = 0f; + boolean have_description = + !((TextView) findViewById(R.id.new_transaction_description)).getText().toString() + .isEmpty(); + + try { + for (int i = 0; i < table.getChildCount(); i++) { + TableRow row = (TableRow) table.getChildAt(i); + + TextView acc_name_v = (TextView) row.getChildAt(0); + TextView amount_v = (TextView) row.getChildAt(1); + String amt = String.valueOf(amount_v.getText()); + String acc_name = String.valueOf(acc_name_v.getText()); + acc_name = acc_name.trim(); + + if (!acc_name.isEmpty()) { + accounts++; + + if (!amt.isEmpty()) { + accounts_with_values++; + } + } + else empty_rows++; - TextView acc_name_v = (TextView) row.getChildAt(0); + if (amt.isEmpty()) { + amount_v.setHint(String.format("%1.2f", 0f)); + if (empty_amount == null) { + empty_amount = amount_v; + single_empty_amount = true; + } + else if (!acc_name.isEmpty()) single_empty_amount = false; + } + else { + amounts++; + if (!acc_name.isEmpty()) amounts_with_accounts++; + running_total += Float.valueOf(amt); + } + } - String acc_name = String.valueOf(acc_name_v.getText()); - acc_name = acc_name.trim(); - if (!acc_name.isEmpty()) { - accounts++; + if ((empty_rows == 0) && ((table.getChildCount() == accounts) || (table.getChildCount() + == amounts))) + { + do_add_account_row(false); + } - TextView amount_v = (TextView) row.getChildAt(1); - String amt = String.valueOf(amount_v.getText()); + if (have_description && (accounts >= 2) && (accounts_with_values >= (accounts - 1)) && ( + amounts_with_accounts == amounts)) + { + if (mSave != null) mSave.setVisible(true); + } + else if (mSave != null) mSave.setVisible(false); - if (!amt.isEmpty()) accounts_with_values++; - } else empty_rows++; + if (single_empty_amount) { + empty_amount + .setHint(String.format("%1.2f", (running_total > 0) ? -running_total : 0f)); + } } - - if (accounts_with_values == accounts && empty_rows == 0) { - do_add_account_row(false); + catch (NumberFormatException e) { + if (mSave != null) mSave.setVisible(false); } - - if ((accounts >= 2) && (accounts_with_values >= (accounts - 1))) { - if (mSave != null) mSave.setVisible(true); - } else { + catch (Exception e) { + e.printStackTrace(); if (mSave != null) mSave.setVisible(false); } } @@ -334,6 +443,9 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal private void reset_form() { text_date.setText(""); text_descr.setText(""); + + text_descr.requestFocus(); + while(table.getChildCount() > 2) { table.removeViewAt(2); } @@ -344,7 +456,5 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal ((TextView)tr.getChildAt(0)).setText(""); ((TextView)tr.getChildAt(1)).setText(""); } - - text_descr.requestFocus(); } }