X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionActivity.java;h=cf9a6e46293c14311e29344247733bb4a55b945c;hb=aef08f9dbd6b28d320dec8b1f1a51dc1e2c344d6;hp=c2ca87b920b930f08bdab076b3d1fabfdf89cd27;hpb=91c67b5236491400ead1898a421826adff596987;p=mobile-ledger.git
diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionActivity.java
index c2ca87b9..cf9a6e46 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionActivity.java
@@ -1,33 +1,29 @@
/*
* Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * This file is part of MoLe.
+ * MoLe 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,
+ * MoLe 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 .
+ * along with MoLe. If not, see .
*/
package net.ktnx.mobileledger.ui.activity;
import android.annotation.SuppressLint;
+import android.database.Cursor;
+import android.os.AsyncTask;
import android.os.Bundle;
-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.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.Gravity;
import android.view.Menu;
@@ -41,77 +37,101 @@ import android.widget.ProgressBar;
import android.widget.TableLayout;
import android.widget.TableRow;
import android.widget.TextView;
+import android.widget.Toast;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
+import com.google.android.material.snackbar.Snackbar;
+
+import net.ktnx.mobileledger.BuildConfig;
import net.ktnx.mobileledger.R;
-import net.ktnx.mobileledger.async.SaveTransactionTask;
+import net.ktnx.mobileledger.async.DescriptionSelectedCallback;
+import net.ktnx.mobileledger.async.SendTransactionTask;
import net.ktnx.mobileledger.async.TaskCallback;
+import net.ktnx.mobileledger.model.Data;
import net.ktnx.mobileledger.model.LedgerTransaction;
import net.ktnx.mobileledger.model.LedgerTransactionAccount;
+import net.ktnx.mobileledger.model.MobileLedgerProfile;
import net.ktnx.mobileledger.ui.DatePickerFragment;
import net.ktnx.mobileledger.ui.OnSwipeTouchListener;
+import net.ktnx.mobileledger.utils.Globals;
import net.ktnx.mobileledger.utils.MLDB;
+import java.text.ParseException;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.Locale;
import java.util.Objects;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.DialogFragment;
+
+import static net.ktnx.mobileledger.utils.Logger.debug;
+
/*
* TODO: nicer progress while transaction is submitted
* 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: setup wizard
- * TODO: update accounts/check settings upon change of backend settings
* */
-public class NewTransactionActivity extends AppCompatActivity implements TaskCallback {
- private static SaveTransactionTask saver;
+public class NewTransactionActivity extends ProfileThemedActivity
+ implements TaskCallback, DescriptionSelectedCallback {
+ private static SendTransactionTask saver;
private TableLayout table;
private ProgressBar progress;
- private TextView text_date;
- private AutoCompleteTextView text_descr;
- private MenuItem mSave;
-
+ private FloatingActionButton fab;
+ private TextView tvDate;
+ private AutoCompleteTextView tvDescription;
+ private static boolean isZero(float f) {
+ return (f < 0.005) && (f > -0.005);
+ }
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+
setContentView(R.layout.activity_new_transaction);
Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
+ toolbar.setSubtitle(mProfile.getName());
- text_date = findViewById(R.id.new_transaction_date);
- text_date.setOnFocusChangeListener((v, hasFocus) -> {
+ tvDate = findViewById(R.id.new_transaction_date);
+ tvDate.setOnFocusChangeListener((v, hasFocus) -> {
if (hasFocus) pickTransactionDate(v);
});
- text_descr = findViewById(R.id.new_transaction_description);
- MLDB.hook_autocompletion_adapter(this, text_descr, MLDB.DESCRIPTION_HISTORY_TABLE,
- "description", false, findViewById(R.id.new_transaction_acc_1));
- hook_text_change_listener(text_descr);
+ tvDescription = findViewById(R.id.new_transaction_description);
+ MLDB.hookAutocompletionAdapter(this, tvDescription, MLDB.DESCRIPTION_HISTORY_TABLE,
+ "description", false, findViewById(R.id.new_transaction_acc_1), this, mProfile);
+ hookTextChangeListener(tvDescription);
progress = findViewById(R.id.save_transaction_progress);
+ fab = findViewById(R.id.fab);
+ fab.setOnClickListener(v -> saveTransaction());
Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
table = findViewById(R.id.new_transaction_accounts_table);
for (int i = 0; i < table.getChildCount(); i++) {
TableRow row = (TableRow) table.getChildAt(i);
- AutoCompleteTextView acc_name_view = (AutoCompleteTextView) row.getChildAt(0);
- TextView amount_view = (TextView) row.getChildAt(1);
- hook_swipe_listener(row);
- MLDB.hook_autocompletion_adapter(this, acc_name_view, MLDB.ACCOUNTS_TABLE, "name", true,
- amount_view);
- hook_text_change_listener(acc_name_view);
- hook_text_change_listener(amount_view);
-// Log.d("swipe", "hooked to row "+i);
+ AutoCompleteTextView tvAccountName = (AutoCompleteTextView) row.getChildAt(0);
+ TextView tvAmount = (TextView) row.getChildAt(1);
+ hookSwipeListener(row);
+ MLDB.hookAutocompletionAdapter(this, tvAccountName, MLDB.ACCOUNTS_TABLE, "name", true,
+ tvAmount, null, mProfile);
+ hookTextChangeListener(tvAccountName);
+ hookTextChangeListener(tvAmount);
+// debug("swipe", "hooked to row "+i);
}
}
-
@Override
- protected void onStart() {
- super.onStart();
- if (text_descr.getText().toString().isEmpty()) text_descr.requestFocus();
- }
+ protected void initProfile() {
+ String profileUUID = getIntent().getStringExtra("profile_uuid");
+ if (profileUUID != null) {
+ mProfile = Data.getProfile(profileUUID);
+ if (mProfile == null) finish();
+ }
+ else super.initProfile();
+ }
@Override
public void finish() {
super.finish();
@@ -127,35 +147,73 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
}
return super.onOptionsItemSelected(item);
}
-
- public void save_transaction() {
- if (mSave != null) mSave.setVisible(false);
- toggle_all_editing(false);
+ @Override
+ protected void onStart() {
+ super.onStart();
+ if (tvDescription.getText().toString().isEmpty()) tvDescription.requestFocus();
+ }
+ public void saveTransaction() {
+ if (fab != null) fab.setEnabled(false);
+ toggleAllEditing(false);
progress.setVisibility(View.VISIBLE);
+ try {
- saver = new SaveTransactionTask(this);
+ saver = new SendTransactionTask(this, mProfile);
- String date = text_date.getText().toString();
- if (date.isEmpty()) date = String.valueOf(new Date().getDate());
- LedgerTransaction tr = new LedgerTransaction(date, text_descr.getText().toString());
+ String dateString = tvDate.getText().toString();
+ Date date;
+ if (dateString.isEmpty()) date = new Date();
+ else date = Globals.parseLedgerDate(dateString);
+ LedgerTransaction tr = new LedgerTransaction(null, date, tvDescription.getText().toString(), mProfile);
- 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();
- LedgerTransactionAccount item =
- amt.length() > 0 ? new LedgerTransactionAccount(acc, Float.parseFloat(amt))
- : new LedgerTransactionAccount(acc);
+ TableLayout table = findViewById(R.id.new_transaction_accounts_table);
+ LedgerTransactionAccount emptyAmountAccount = null;
+ float emptyAmountAccountBalance = 0;
+ for (int i = 0; i < table.getChildCount(); i++) {
+ TableRow row = (TableRow) table.getChildAt(i);
+ String acc = ((TextView) row.getChildAt(0)).getText().toString();
+ if (acc.isEmpty()) continue;
+
+ String amt = ((TextView) row.getChildAt(1)).getText().toString();
+ LedgerTransactionAccount item;
+ if (amt.length() > 0) {
+ final float amount = Float.parseFloat(amt);
+ item = new LedgerTransactionAccount(acc, amount);
+ emptyAmountAccountBalance += amount;
+ }
+ else {
+ item = new LedgerTransactionAccount(acc);
+ emptyAmountAccount = item;
+ }
+
+ tr.addAccount(item);
+ }
- tr.addAccount(item);
+ if (emptyAmountAccount != null)
+ emptyAmountAccount.setAmount(-emptyAmountAccountBalance);
+ saver.execute(tr);
}
- saver.execute(tr);
- }
+ catch (ParseException e) {
+ debug("new-transaction", "Parse error", e);
+ Toast.makeText(this, getResources().getString(R.string.error_invalid_date),
+ Toast.LENGTH_LONG).show();
+ tvDate.requestFocus();
+
+ progress.setVisibility(View.GONE);
+ toggleAllEditing(true);
+ if (fab != null) fab.setEnabled(true);
+ }
+ catch (Exception e) {
+ debug("new-transaction", "Unknown error", e);
- private void toggle_all_editing(boolean enabled) {
- text_date.setEnabled(enabled);
- text_descr.setEnabled(enabled);
+ progress.setVisibility(View.GONE);
+ toggleAllEditing(true);
+ if (fab != null) fab.setEnabled(true);
+ }
+ }
+ private void toggleAllEditing(boolean enabled) {
+ tvDate.setEnabled(enabled);
+ tvDescription.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);
@@ -164,16 +222,14 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
}
}
}
-
- private void hook_swipe_listener(final TableRow row) {
+ private void hookSwipeListener(final TableRow row) {
row.getChildAt(0).setOnTouchListener(new OnSwipeTouchListener(this) {
- public void onSwipeLeft() {
-// Log.d("swipe", "LEFT" + row.getId());
+ private void onSwipeAside() {
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;
+ (prev_row != null) ? (TextView) prev_row.getChildAt(1) : tvDescription;
TextView next_acc =
(next_row != null) ? (TextView) next_row.getChildAt(0) : null;
@@ -202,6 +258,12 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
Snackbar.LENGTH_LONG).setAction("Action", null).show();
}
}
+ public void onSwipeLeft() {
+ onSwipeAside();
+ }
+ public void onSwipeRight() {
+ onSwipeAside();
+ }
// @Override
// public boolean performClick(View view, MotionEvent m) {
// return true;
@@ -212,33 +274,18 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
});
}
- 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();
- }
- });
-
+ public boolean simulateCrash(MenuItem item) {
+ debug("crash", "Will crash intentionally");
+ new AsyncCrasher().execute();
+ return true;
}
-
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);
- if (mSave == null) throw new AssertionError();
+ if (BuildConfig.DEBUG) {
+ menu.findItem(R.id.action_simulate_crash).setVisible(true);
+ }
check_transaction_submittable();
return true;
@@ -253,8 +300,27 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
return Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp,
getResources().getDisplayMetrics()));
}
+ private void hookTextChangeListener(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) {
+// debug("input", "text changed");
+ check_transaction_submittable();
+ }
+ });
- private void do_add_account_row(boolean focus) {
+ }
+ private TableRow doAddAccountRow(boolean focus) {
final AutoCompleteTextView acc = new AutoCompleteTextView(this);
acc.setLayoutParams(new TableRow.LayoutParams(TableRow.LayoutParams.MATCH_PARENT,
TableRow.LayoutParams.WRAP_CONTENT, 9f));
@@ -274,6 +340,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
amt.setMinWidth(dp2px(40));
amt.setTextAlignment(EditText.TEXT_ALIGNMENT_VIEW_END);
amt.setImeOptions(EditorInfo.IME_ACTION_DONE);
+ amt.setSelectAllOnFocus(true);
// forward navigation support
final TableRow last_row = (TableRow) table.getChildAt(table.getChildCount() - 1);
@@ -294,28 +361,23 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
if (focus) acc.requestFocus();
- hook_swipe_listener(row);
- MLDB.hook_autocompletion_adapter(this, acc, MLDB.ACCOUNTS_TABLE, "name", true, amt);
- hook_text_change_listener(acc);
- hook_text_change_listener(amt);
- }
+ hookSwipeListener(row);
+ MLDB.hookAutocompletionAdapter(this, acc, MLDB.ACCOUNTS_TABLE, "name", true, amt, null,
+ mProfile);
+ hookTextChangeListener(acc);
+ hookTextChangeListener(amt);
+ return row;
+ }
public void addTransactionAccountFromMenu(MenuItem item) {
- do_add_account_row(true);
+ doAddAccountRow(true);
}
-
public void resetTransactionFromMenu(MenuItem item) {
- reset_form();
+ resetForm();
}
-
public void saveTransactionFromMenu(MenuItem item) {
- save_transaction();
+ saveTransaction();
}
-
- private boolean is_zero(float f) {
- return (f < 0.005) && (f > -0.005);
- }
-
// rules:
// 1) at least two account names
// 2) each amount must have account name
@@ -377,10 +439,10 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
if ((empty_rows == 0) &&
((table.getChildCount() == accounts) || (table.getChildCount() == amounts)))
{
- do_add_account_row(false);
+ doAddAccountRow(false);
}
- Log.d("submittable", String.format("accounts=%d, accounts_with_values=%s, " +
+ debug("submittable", String.format("accounts=%d, accounts_with_values=%s, " +
"amounts_with_accounts=%d, amounts=%d, running_total=%1.2f, " +
"single_empty_with_acc=%s", accounts,
accounts_with_values, amounts_with_accounts, amounts, running_total,
@@ -388,11 +450,16 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
if (have_description && (accounts >= 2) && (accounts_with_values >= (accounts - 1)) &&
(amounts_with_accounts == amounts) &&
- (single_empty_amount && single_empty_amount_has_account || is_zero(running_total)))
+ (single_empty_amount && single_empty_amount_has_account || isZero(running_total)))
{
- if (mSave != null) mSave.setVisible(true);
+ if (fab != null) {
+ fab.show();
+ fab.setEnabled(true);
+ }
+ }
+ else {
+ if (fab != null) fab.hide();
}
- else if (mSave != null) mSave.setVisible(false);
if (single_empty_amount) {
empty_amount.setHint(String.format("%1.2f",
@@ -401,32 +468,32 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
}
catch (NumberFormatException e) {
- if (mSave != null) mSave.setVisible(false);
+ if (fab != null) fab.hide();
}
catch (Exception e) {
e.printStackTrace();
- if (mSave != null) mSave.setVisible(false);
+ if (fab != null) fab.hide();
}
}
@Override
public void done(String error) {
progress.setVisibility(View.INVISIBLE);
- Log.d("visuals", "hiding progress");
+ debug("visuals", "hiding progress");
- if (error == null) reset_form();
+ if (error == null) resetForm();
else Snackbar.make(findViewById(R.id.new_transaction_accounts_table), error,
BaseTransientBottomBar.LENGTH_LONG).show();
- toggle_all_editing(true);
+ toggleAllEditing(true);
check_transaction_submittable();
}
- private void reset_form() {
- text_date.setText("");
- text_descr.setText("");
+ private void resetForm() {
+ tvDate.setText("");
+ tvDescription.setText("");
- text_descr.requestFocus();
+ tvDescription.requestFocus();
while (table.getChildCount() > 2) {
table.removeViewAt(2);
@@ -439,4 +506,92 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
((TextView) tr.getChildAt(1)).setText("");
}
}
+ @Override
+ public void descriptionSelected(String description) {
+ debug("descr selected", description);
+ if (!inputStateIsInitial()) return;
+
+ String accFilter = mProfile.getPreferredAccountsFilter();
+
+ ArrayList params = new ArrayList<>();
+ StringBuilder sb = new StringBuilder(
+ "select t.profile, t.id from transactions t where t.description=?");
+ params.add(description);
+
+ if (accFilter != null) {
+ sb.append(" AND EXISTS (").append("SELECT 1 FROM transaction_accounts ta ")
+ .append("WHERE ta.profile = t.profile").append(" AND ta.transaction_id = t.id")
+ .append(" AND UPPER(ta.account_name) LIKE '%'||?||'%')");
+ params.add(accFilter.toUpperCase());
+ }
+
+ sb.append(" ORDER BY date desc limit 1");
+
+ final String sql = sb.toString();
+ debug("descr", sql);
+ debug("descr", params.toString());
+
+ try (Cursor c = MLDB.getDatabase().rawQuery(sql, params.toArray(new String[]{}))) {
+ if (!c.moveToNext()) return;
+
+ String profileUUID = c.getString(0);
+ int transactionId = c.getInt(1);
+ LedgerTransaction tr;
+ MobileLedgerProfile profile = Data.getProfile(profileUUID);
+ if (profile == null) throw new RuntimeException(String.format(
+ "Unable to find profile %s, which is supposed to contain " +
+ "transaction %d with description %s", profileUUID, transactionId, description));
+
+ tr = profile.loadTransaction(transactionId);
+ table = findViewById(R.id.new_transaction_accounts_table);
+ ArrayList accounts = tr.getAccounts();
+ TableRow firstNegative = null;
+ int negativeCount = 0;
+ for (int i = 0; i < accounts.size(); i++) {
+ LedgerTransactionAccount acc = accounts.get(i);
+ TableRow row = (TableRow) table.getChildAt(i);
+ if (row == null) row = doAddAccountRow(false);
+
+ ((TextView) row.getChildAt(0)).setText(acc.getAccountName());
+ ((TextView) row.getChildAt(1))
+ .setText(String.format(Locale.US, "%1.2f", acc.getAmount()));
+
+ if (acc.getAmount() < 0.005) {
+ if (firstNegative == null) firstNegative = row;
+ negativeCount++;
+ }
+ }
+
+ if (negativeCount == 1) {
+ ((TextView) firstNegative.getChildAt(1)).setText(null);
+ }
+
+ check_transaction_submittable();
+
+ EditText firstAmount = (EditText) ((TableRow) table.getChildAt(0)).getChildAt(1);
+ String amtString = String.valueOf(firstAmount.getText());
+ firstAmount.requestFocus();
+ firstAmount.setSelection(0, amtString.length());
+ }
+
+ }
+ private boolean inputStateIsInitial() {
+ table = findViewById(R.id.new_transaction_accounts_table);
+
+ if (table.getChildCount() != 2) return false;
+
+ for (int i = 0; i < 2; i++) {
+ TableRow row = (TableRow) table.getChildAt(i);
+ if (((TextView) row.getChildAt(0)).getText().length() > 0) return false;
+ if (((TextView) row.getChildAt(1)).getText().length() > 0) return false;
+ }
+
+ return true;
+ }
+ private class AsyncCrasher extends AsyncTask {
+ @Override
+ protected Void doInBackground(Void... voids) {
+ throw new RuntimeException("Simulated crash");
+ }
+ }
}