package net.ktnx.mobileledger.ui.activity;
-import android.annotation.SuppressLint;
-import android.database.Cursor;
import android.os.Bundle;
-import android.support.design.widget.BaseTransientBottomBar;
-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.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 android.widget.Toast;
+import androidx.appcompat.widget.Toolbar;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.navigation.NavController;
+import androidx.navigation.Navigation;
+
+import net.ktnx.mobileledger.BuildConfig;
import net.ktnx.mobileledger.R;
-import net.ktnx.mobileledger.async.DescriptionSelectedCallback;
-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.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.List;
-import java.util.Locale;
import java.util.Objects;
-/*
- * 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: nicer swiping removal with visual feedback
- * TODO: setup wizard
- * TODO: update accounts/check settings upon change of backend settings
- * */
+import static net.ktnx.mobileledger.utils.Logger.debug;
-public class NewTransactionActivity extends AppCompatActivity
- implements TaskCallback, DescriptionSelectedCallback {
- private static SaveTransactionTask saver;
- private TableLayout table;
- private ProgressBar progress;
- private FloatingActionButton fab;
- private TextView tvDate;
- private AutoCompleteTextView tvDescription;
- private static boolean isZero(float f) {
- return (f < 0.005) && (f > -0.005);
- }
+public class NewTransactionActivity extends ProfileThemedActivity implements TaskCallback,
+ NewTransactionFragment.OnNewTransactionFragmentInteractionListener {
+ private NavController navController;
+ private NewTransactionModel model;
@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(Data.profile.get().getName());
+ Data.profile.observe(this,
+ mobileLedgerProfile -> toolbar.setSubtitle(mobileLedgerProfile.getName()));
- tvDate = findViewById(R.id.new_transaction_date);
- tvDate.setOnFocusChangeListener((v, hasFocus) -> {
- if (hasFocus) pickTransactionDate(v);
- });
- 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);
- hookTextChangeListener(tvDescription);
+ navController = Navigation.findNavController(this, R.id.new_transaction_nav);
- progress = findViewById(R.id.save_transaction_progress);
- fab = findViewById(R.id.fab);
- fab.setOnClickListener(v -> saveTransaction());
+ Objects.requireNonNull(getSupportActionBar())
+ .setDisplayHomeAsUpEnabled(true);
- 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 tvAccountName = (AutoCompleteTextView) row.getChildAt(0);
- TextView tvAmount = (TextView) row.getChildAt(1);
- hookSwipeListener(row);
- MLDB.hookAutocompletionAdapter(this, tvAccountName, MLDB.ACCOUNTS_TABLE, "name", true,
- tvAmount, null);
- hookTextChangeListener(tvAccountName);
- hookTextChangeListener(tvAmount);
-// Log.d("swipe", "hooked to row "+i);
- }
+ model = new ViewModelProvider(this).get(NewTransactionModel.class);
}
+ @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);
+ overridePendingTransition(R.anim.dummy, R.anim.slide_out_down);
}
-
@Override
public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case android.R.id.home:
- finish();
- return true;
+ if (item.getItemId() == android.R.id.home) {
+ finish();
+ return true;
}
return super.onOptionsItemSelected(item);
}
- @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);
+ public void onTransactionSave(LedgerTransaction tr) {
+ navController.navigate(R.id.action_newTransactionFragment_to_newTransactionSavingFragment);
try {
- saver = new SaveTransactionTask(this);
-
- String dateString = tvDate.getText().toString();
- Date date;
- if (dateString.isEmpty()) date = new Date();
- else date = Globals.parseLedgerDate(dateString);
- LedgerTransaction tr = new LedgerTransaction(date, tvDescription.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);
- }
+ SendTransactionTask saver =
+ new SendTransactionTask(this, mProfile, model.getSimulateSave());
saver.execute(tr);
}
- catch (ParseException e) {
- Log.d("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) {
- Log.d("new-transaction", "Unknown error", e);
+ debug("new-transaction", "Unknown error", e);
- progress.setVisibility(View.GONE);
- toggleAllEditing(true);
- if (fab != null) fab.setEnabled(true);
+ Bundle b = new Bundle();
+ b.putString("error", "unknown error");
+ navController.navigate(R.id.newTransactionFragment, b);
}
}
- 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);
- for (int j = 0; j < row.getChildCount(); j++) {
- row.getChildAt(j).setEnabled(enabled);
- }
- }
+ public void simulateCrash(MenuItem item) {
+ debug("crash", "Will crash intentionally");
+ new AsyncCrasher().execute();
}
- private void hookSwipeListener(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) : tvDescription;
- 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);
- }
-
- if (row.hasFocus()) {
- if (next_acc != null) next_acc.requestFocus();
- else prev_amt.requestFocus();
- }
-
- table.removeView(row);
- check_transaction_submittable();
-// Toast.makeText(NewTransactionActivity.this, "LEFT", Toast.LENGTH_LONG).show();
- }
- else {
- Snackbar.make(table, R.string.msg_at_least_two_accounts_are_required,
- Snackbar.LENGTH_LONG).setAction("Action", null).show();
- }
- }
- // @Override
-// public boolean performClick(View view, MotionEvent m) {
-// return true;
-// }
- public boolean onTouch(View view, MotionEvent m) {
- return gestureDetector.onTouchEvent(m);
- }
- });
- }
-
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);
- check_transaction_submittable();
+ if (BuildConfig.DEBUG) {
+ menu.findItem(R.id.action_simulate_crash)
+ .setVisible(true);
+ menu.findItem(R.id.action_simulate_save)
+ .setVisible(true);
+ }
+
+ model.observeSimulateSave(this, state -> {
+ menu.findItem(R.id.action_simulate_save)
+ .setChecked(state);
+ findViewById(R.id.simulationLabel).setVisibility(state ? View.VISIBLE : View.GONE);
+ });
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 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) {
-// Log.d("input", "text changed");
- check_transaction_submittable();
- }
- });
-
- }
- 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));
- 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();
-
- hookSwipeListener(row);
- MLDB.hookAutocompletionAdapter(this, acc, MLDB.ACCOUNTS_TABLE, "name", true, amt, null);
- hookTextChangeListener(acc);
- hookTextChangeListener(amt);
-
- return row;
- }
- public void addTransactionAccountFromMenu(MenuItem item) {
- doAddAccountRow(true);
- }
- public void resetTransactionFromMenu(MenuItem item) {
- resetForm();
- }
- public void saveTransactionFromMenu(MenuItem item) {
- saveTransaction();
- }
- // 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)))
- {
- doAddAccountRow(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 || isZero(running_total)))
- {
- if (fab != null) {
- fab.show();
- fab.setEnabled(true);
- }
- }
- else {
- if (fab != null) fab.hide();
- }
-
- if (single_empty_amount) {
- empty_amount.setHint(String.format("%1.2f",
- (Math.abs(running_total) > 0.005) ? -running_total : 0f));
- }
-
- }
- catch (NumberFormatException e) {
- if (fab != null) fab.hide();
- }
- catch (Exception e) {
- e.printStackTrace();
- if (fab != null) fab.hide();
- }
- }
-
@Override
public void done(String error) {
- progress.setVisibility(View.INVISIBLE);
- Log.d("visuals", "hiding progress");
-
- if (error == null) resetForm();
- else Snackbar.make(findViewById(R.id.new_transaction_accounts_table), error,
- BaseTransientBottomBar.LENGTH_LONG).show();
-
- toggleAllEditing(true);
- check_transaction_submittable();
- }
-
- private void resetForm() {
- tvDate.setText("");
- tvDescription.setText("");
-
- tvDescription.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("");
+ Bundle b = new Bundle();
+ if (error != null) {
+ b.putString("error", error);
+ navController.navigate(R.id.action_newTransactionSavingFragment_Failure, b);
}
+ else
+ navController.navigate(R.id.action_newTransactionSavingFragment_Success, b);
}
- @Override
- public void descriptionSelected(String description) {
- Log.d("descr selected", description);
- if (!inputStateIsInitial()) return;
-
- try (Cursor c = MLDB.getReadableDatabase().rawQuery(
- "select profile, id from transactions where description=? order by date desc " +
- "limit 1", new String[]{description}))
- {
- if (!c.moveToNext()) return;
-
- String profileUUID = c.getString(0);
- int transactionId = c.getInt(1);
- List<MobileLedgerProfile> profiles = Data.profiles.getList();
- MobileLedgerProfile profile = null;
- for (int i = 0; i < profiles.size(); i++) {
- MobileLedgerProfile p = profiles.get(i);
- if (p.getUuid().equals(profileUUID)) {
- profile = p;
- break;
- }
- }
- 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));
-
- LedgerTransaction tr = profile.loadTransaction(transactionId);
- int i = 0;
- table = findViewById(R.id.new_transaction_accounts_table);
- ArrayList<LedgerTransactionAccount> accounts = tr.getAccounts();
- for (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()));
- }
-
- check_transaction_submittable();
-
- ((TableRow) table.getChildAt(table.getChildCount() - 1)).getChildAt(0).requestFocus();
- }
-
+ public void toggleSimulateSave(MenuItem item) {
+ model.toggleSimulateSave();
}
- 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;
- }
}
projects / mobile-ledger.git / blobdiff