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=c0c902eb1734a16f0415e0f9d966372f6a2e56b0;hp=6a6fb4194c5139e0e0187abee725e8fc3d09469d;hb=8c39affe99dc23ed494f3b70fe29ea4c3e00c2f4;hpb=d7696d0ac9da7ac5271c92b94498ebbef334cc50 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 6a6fb419..c0c902eb 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 @@ -151,10 +151,12 @@ public class NewTransactionActivity extends ProfileThemedActivity implements Tas if (profileUUID != null) { mProfile = Data.getProfile(profileUUID); - if (mProfile == null) finish(); + if (mProfile == null) + finish(); Data.setCurrentProfile(mProfile); } - else super.initProfile(); + else + super.initProfile(); } @Override public void finish() { @@ -176,7 +178,8 @@ public class NewTransactionActivity extends ProfileThemedActivity implements Tas // FIXME if (tvDescription.getText().toString().isEmpty()) tvDescription.requestFocus(); } public void saveTransaction() { - if (fab != null) fab.setEnabled(false); + if (fab != null) + fab.setEnabled(false); listAdapter.toggleAllEditing(false); progress.setVisibility(View.VISIBLE); try { @@ -193,7 +196,8 @@ public class NewTransactionActivity extends ProfileThemedActivity implements Tas LedgerTransactionAccount acc = viewModel.getAccount(i); if (acc.getAccountName() .trim() - .isEmpty()) continue; + .isEmpty()) + continue; if (acc.isAmountSet()) { emptyAmountAccountBalance += acc.getAmount(); @@ -214,7 +218,8 @@ public class NewTransactionActivity extends ProfileThemedActivity implements Tas progress.setVisibility(View.GONE); listAdapter.toggleAllEditing(true); - if (fab != null) fab.setEnabled(true); + if (fab != null) + fab.setEnabled(true); } } public void simulateCrash(MenuItem item) { @@ -239,24 +244,24 @@ public class NewTransactionActivity extends ProfileThemedActivity implements Tas getResources().getDisplayMetrics())); } public void resetTransactionFromMenu(MenuItem item) { - resetForm(); + listAdapter.reset(); } @Override public void done(String error) { progress.setVisibility(View.INVISIBLE); debug("visuals", "hiding progress"); - if (error == null) resetForm(); - else Snackbar.make(list, error, BaseTransientBottomBar.LENGTH_LONG) - .show(); + if (error == null) + listAdapter.reset(); + else + Snackbar.make(list, error, BaseTransientBottomBar.LENGTH_LONG) + .show(); listAdapter.toggleAllEditing(true); + viewModel.checkTransactionSubmittable(listAdapter); } - private void resetForm() { - listAdapter.reset(); - } private class AsyncCrasher extends AsyncTask { @Override protected Void doInBackground(Void... voids) {