X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionActivity.java;h=4e6ee19274a795d07100e6ead83c991579d87753;hp=bc904a096f99cce560cd3e0e5213be02fbc56a7c;hb=d4e592c5aed998f3b3e5afcf2150fb051aaf3e6f;hpb=3b365016042215dd73cb4600840aa8199b8322b9
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 bc904a09..4e6ee192 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,127 +1,161 @@
/*
* 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.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;
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.ProgressBar;
-import android.widget.TableLayout;
-import android.widget.TableRow;
-import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.Toolbar;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+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.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.ui.DatePickerFragment;
-import net.ktnx.mobileledger.ui.OnSwipeTouchListener;
-import net.ktnx.mobileledger.utils.MLDB;
import java.util.Date;
import java.util.Objects;
+import static net.ktnx.mobileledger.utils.Logger.debug;
+
/*
* TODO: nicer progress while transaction is submitted
- * 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: setup wizard
- * TODO: update accounts/check settings upon change of backend settings
* */
-public class NewTransactionActivity extends AppCompatActivity implements TaskCallback {
- private static SaveTransactionTask saver;
- private TableLayout table;
+public class NewTransactionActivity extends ProfileThemedActivity implements TaskCallback {
+ private static SendTransactionTask saver;
private ProgressBar progress;
- private TextView text_date;
- private AutoCompleteTextView text_descr;
- private MenuItem mSave;
-
+ private FloatingActionButton fab;
+ private NewTransactionItemsAdapter listAdapter;
+ private NewTransactionModel viewModel;
+ private RecyclerView list;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+
setContentView(R.layout.activity_new_transaction);
Toolbar toolbar = findViewById(R.id.toolbar);
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);
- MLDB.hook_autocompletion_adapter(this, text_descr, MLDB.DESCRIPTION_HISTORY_TABLE,
- "description", false);
- hook_text_change_listener(text_descr);
+ Data.profile.observe(this,
+ mobileLedgerProfile -> toolbar.setSubtitle(mobileLedgerProfile.getName()));
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);
- hook_text_change_listener(acc_name_view);
- hook_text_change_listener(amount_view);
-// Log.d("swipe", "hooked to row "+i);
- }
- }
+ list = findViewById(R.id.new_transaction_accounts);
+ viewModel = ViewModelProviders.of(this).get(NewTransactionModel.class);
+ listAdapter = new NewTransactionItemsAdapter(viewModel, mProfile);
+ list.setAdapter(listAdapter);
+ list.setLayoutManager(new LinearLayoutManager(this));
+ Data.profile.observe(this, profile -> listAdapter.setProfile(profile));
+ listAdapter.notifyDataSetChanged();
+ new ItemTouchHelper(new ItemTouchHelper.Callback() {
+ @Override
+ public int getMovementFlags(@NonNull RecyclerView recyclerView,
+ @NonNull RecyclerView.ViewHolder viewHolder) {
+ int flags = makeFlag(ItemTouchHelper.ACTION_STATE_IDLE, ItemTouchHelper.END);
+ // the top item is always there (date and description)
+ if (viewHolder.getAdapterPosition() > 0) {
+ if (viewModel.getAccountCount() > 2) {
+ flags |= makeFlag(ItemTouchHelper.ACTION_STATE_SWIPE,
+ ItemTouchHelper.START | ItemTouchHelper.END);
+ }
+ }
- @Override
- protected void onStart() {
- super.onStart();
- if (text_descr.getText().toString().isEmpty()) text_descr.requestFocus();
+ return flags;
+ }
+ @Override
+ public boolean onMove(@NonNull RecyclerView recyclerView,
+ @NonNull RecyclerView.ViewHolder viewHolder,
+ @NonNull RecyclerView.ViewHolder target) {
+ return false;
+ }
+ @Override
+ public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction) {
+ if (viewModel.getAccountCount() == 2)
+ Snackbar.make(list, R.string.msg_at_least_two_accounts_are_required,
+ Snackbar.LENGTH_LONG).setAction("Action", null).show();
+ else {
+ int pos = viewHolder.getAdapterPosition();
+ viewModel.removeItem(pos - 1);
+ listAdapter.notifyItemRemoved(pos);
+ viewModel.sendCountNotifications(); // needed after items re-arrangement
+ viewModel.checkTransactionSubmittable(listAdapter);
+ }
+ }
+ }).attachToRecyclerView(list);
+
+ viewModel.isSubmittable().observe(this, new Observer() {
+ @Override
+ public void onChanged(Boolean isSubmittable) {
+ if (isSubmittable) {
+ if (fab != null) {
+ fab.show();
+ fab.setEnabled(true);
+ }
+ }
+ else {
+ if (fab != null) {
+ fab.hide();
+ }
+ }
+ }
+ });
+ viewModel.checkTransactionSubmittable(listAdapter);
}
+ @Override
+ protected void initProfile() {
+ String profileUUID = getIntent().getStringExtra("profile_uuid");
+ if (profileUUID != null) {
+ mProfile = Data.getProfile(profileUUID);
+ if (mProfile == null) finish();
+ Data.setCurrentProfile(mProfile);
+ }
+ else super.initProfile();
+ }
@Override
public void finish() {
super.finish();
overridePendingTransition(R.anim.dummy, R.anim.slide_out_right);
}
-
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
@@ -131,316 +165,95 @@ 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);
- progress.setVisibility(View.VISIBLE);
-
- saver = new SaveTransactionTask(this);
-
- 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++) {
- 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);
-
- tr.addAccount(item);
- }
- saver.execute(tr);
- }
-
- 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);
- for (int j = 0; j < row.getChildCount(); j++) {
- row.getChildAt(j).setEnabled(enabled);
- }
- }
+ @Override
+ protected void onStart() {
+ super.onStart();
+ // FIXME if (tvDescription.getText().toString().isEmpty()) tvDescription.requestFocus();
}
+ public void saveTransaction() {
+ if (fab != null) fab.setEnabled(false);
+ listAdapter.toggleAllEditing(false);
+ progress.setVisibility(View.VISIBLE);
+ try {
- private void hook_swipe_listener(final TableRow row) {
- row.getChildAt(0).setOnTouchListener(new OnSwipeTouchListener(this) {
- 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;
+ saver = new SendTransactionTask(this, mProfile);
- 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);
- }
+ Date date = viewModel.getDate();
+ LedgerTransaction tr =
+ new LedgerTransaction(null, date, viewModel.getDescription(),
+ mProfile);
- if (row.hasFocus()) {
- if (next_acc != null) next_acc.requestFocus();
- else prev_amt.requestFocus();
- }
+ LedgerTransactionAccount emptyAmountAccount = null;
+ float emptyAmountAccountBalance = 0;
+ for (int i = 0; i < viewModel.getAccountCount(); i++) {
+ LedgerTransactionAccount acc = viewModel.getAccount(i);
+ if (acc.getAccountName().trim().isEmpty()) continue;
- table.removeView(row);
- check_transaction_submittable();
-// Toast.makeText(NewTransactionActivity.this, "LEFT", Toast.LENGTH_LONG).show();
+ if (acc.isAmountSet()) {
+ emptyAmountAccountBalance += acc.getAmount();
}
else {
- Snackbar.make(table, R.string.msg_at_least_two_accounts_are_required,
- Snackbar.LENGTH_LONG).setAction("Action", null).show();
+ emptyAmountAccount = acc;
}
- }
- // @Override
-// public boolean performClick(View view, MotionEvent m) {
-// return true;
-// }
- public boolean onTouch(View view, MotionEvent m) {
- return gestureDetector.onTouchEvent(m);
- }
- });
- }
-
- 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) {
+ tr.addAccount(acc);
}
- @Override
- public void afterTextChanged(Editable s) {
-// Log.d("input", "text changed");
- check_transaction_submittable();
- }
- });
+ if (emptyAmountAccount != null)
+ emptyAmountAccount.setAmount(-emptyAmountAccountBalance);
+ saver.execute(tr);
+ }
+ catch (Exception e) {
+ debug("new-transaction", "Unknown error", e);
+ progress.setVisibility(View.GONE);
+ listAdapter.toggleAllEditing(true);
+ if (fab != null) fab.setEnabled(true);
+ }
+ }
+ public void simulateCrash(MenuItem item) {
+ debug("crash", "Will crash intentionally");
+ new AsyncCrasher().execute();
}
-
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();
- check_transaction_submittable();
+ if (BuildConfig.DEBUG) {
+ menu.findItem(R.id.action_simulate_crash).setVisible(true);
+ }
return true;
}
- public void pickTransactionDate(View view) {
- DialogFragment picker = new DatePickerFragment();
- picker.show(getSupportFragmentManager(), "datePicker");
- }
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);
- acc.setWidth(0);
- acc.setImeOptions(EditorInfo.IME_ACTION_NEXT | EditorInfo.IME_FLAG_NO_ENTER_ACTION |
- EditorInfo.IME_FLAG_NAVIGATE_NEXT);
- acc.setSingleLine(true);
-
- final EditText amt = new EditText(this);
- 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);
- 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));
- row.setGravity(Gravity.BOTTOM);
- row.addView(acc);
- row.addView(amt);
- table.addView(row);
-
- if (focus) acc.requestFocus();
-
- hook_swipe_listener(row);
- MLDB.hook_autocompletion_adapter(this, acc, MLDB.ACCOUNTS_TABLE, "name", true);
- hook_text_change_listener(acc);
- hook_text_change_listener(amt);
- }
-
- public void addTransactionAccountFromMenu(MenuItem item) {
- do_add_account_row(true);
- }
-
public void resetTransactionFromMenu(MenuItem item) {
- reset_form();
- }
-
- public void saveTransactionFromMenu(MenuItem item) {
- save_transaction();
- }
-
- private boolean is_zero(float f) {
- return (f < 0.005) && (f > -0.005);
+ resetForm();
}
-
- // 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;
- TextView empty_amount = null;
- boolean single_empty_amount = false;
- boolean single_empty_amount_has_account = 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++;
-
- if (amt.isEmpty()) {
- amount_v.setHint(String.format("%1.2f", 0f));
- if (empty_amount == null) {
- empty_amount = amount_v;
- single_empty_amount = true;
- single_empty_amount_has_account = !acc_name.isEmpty();
- }
- else if (!acc_name.isEmpty()) single_empty_amount = false;
- }
- else {
- amounts++;
- if (!acc_name.isEmpty()) amounts_with_accounts++;
- running_total += Float.valueOf(amt);
- }
- }
-
- if ((empty_rows == 0) &&
- ((table.getChildCount() == accounts) || (table.getChildCount() == amounts)))
- {
- do_add_account_row(false);
- }
-
- Log.d("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,
- (single_empty_amount && single_empty_amount_has_account) ? "true" : "false"));
-
- 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)))
- {
- if (mSave != null) mSave.setVisible(true);
- }
- else if (mSave != null) mSave.setVisible(false);
-
- if (single_empty_amount) {
- empty_amount.setHint(String.format("%1.2f",
- (Math.abs(running_total) > 0.005) ? -running_total : 0f));
- }
-
- }
- catch (NumberFormatException e) {
- if (mSave != null) mSave.setVisible(false);
- }
- catch (Exception e) {
- e.printStackTrace();
- if (mSave != null) mSave.setVisible(false);
- }
- }
-
@Override
public void done(String error) {
progress.setVisibility(View.INVISIBLE);
- Log.d("visuals", "hiding progress");
+ debug("visuals", "hiding progress");
- if (error == null) reset_form();
- else Snackbar.make(findViewById(R.id.new_transaction_accounts_table), error,
- BaseTransientBottomBar.LENGTH_LONG).show();
+ if (error == null) resetForm();
+ else Snackbar.make(list, error, BaseTransientBottomBar.LENGTH_LONG).show();
- toggle_all_editing(true);
- check_transaction_submittable();
+ listAdapter.toggleAllEditing(true);
+ viewModel.checkTransactionSubmittable(listAdapter);
}
- private void reset_form() {
- text_date.setText("");
- text_descr.setText("");
-
- text_descr.requestFocus();
-
- 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("");
+ private void resetForm() {
+ listAdapter.reset();
+ }
+ private class AsyncCrasher extends AsyncTask {
+ @Override
+ protected Void doInBackground(Void... voids) {
+ throw new RuntimeException("Simulated crash");
}
}
+
}