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=90ce60b174bc6c10a2cf70e8d9ca6178c9fa60df;hp=a9d74727bd2d51f0a1056195490cb9a7059b84f4;hb=3a371d308aa8e164622cd71ffb09f2222972e1f1;hpb=2db4df9d7ee357f0b167d22d77a52059235f97f2 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 a9d74727..90ce60b1 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 @@ -27,7 +27,6 @@ import android.widget.ProgressBar; 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; @@ -127,19 +126,16 @@ public class NewTransactionActivity extends ProfileThemedActivity implements Tas }).attachToRecyclerView(list); viewModel.isSubmittable() - .observe(this, new Observer() { - @Override - public void onChanged(Boolean isSubmittable) { - if (isSubmittable) { - if (fab != null) { - fab.show(); - fab.setEnabled(true); - } + .observe(this, isSubmittable -> { + if (isSubmittable) { + if (fab != null) { + fab.show(); + fab.setEnabled(true); } - else { - if (fab != null) { - fab.hide(); - } + } + else { + if (fab != null) { + fab.hide(); } } }); @@ -151,10 +147,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 +174,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 +192,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 +214,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) { @@ -248,10 +249,12 @@ public class NewTransactionActivity extends ProfileThemedActivity implements Tas if (error == null) listAdapter.reset(); - else Snackbar.make(list, error, BaseTransientBottomBar.LENGTH_LONG) - .show(); + else + Snackbar.make(list, error, BaseTransientBottomBar.LENGTH_LONG) + .show(); listAdapter.toggleAllEditing(true); + viewModel.checkTransactionSubmittable(listAdapter); }