From ef5d367b0e34de0bf65409b3b44d686a19d50cec Mon Sep 17 00:00:00 2001 From: Damyan Ivanov Date: Sun, 28 Feb 2021 22:42:00 +0200 Subject: [PATCH] fix IME hints for amount inputs --- .../NewTransactionItemHolder.java | 14 +++----- .../new_transaction/NewTransactionModel.java | 32 +++++++++++++++---- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionItemHolder.java b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionItemHolder.java index 1725f91a..e4afc812 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionItemHolder.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionItemHolder.java @@ -264,16 +264,6 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder ignoreFocusChanges = false; } }); - adapter.model.getAccountCount() - .observe(activity, count -> { - final int adapterPosition = getAdapterPosition(); - final int layoutPosition = getLayoutPosition(); - - if (adapterPosition == count) - b.accountRowAccAmounts.setImeOptions(EditorInfo.IME_ACTION_DONE); - else - b.accountRowAccAmounts.setImeOptions(EditorInfo.IME_ACTION_NEXT); - }); Data.currencyGap.observe(activity, hasGap -> updateCurrencyPositionAndPadding(Data.currencySymbolPosition.getValue(), @@ -606,6 +596,9 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder b.accountRowAccAmounts.setHint(amountHint); } + b.accountRowAccAmounts.setImeOptions( + acc.isLast() ? EditorInfo.IME_ACTION_DONE : EditorInfo.IME_ACTION_NEXT); + setCurrencyString(acc.getCurrency()); b.accountRowAccAmounts.setText( acc.isAmountSet() ? String.format("%4.2f", acc.getAmount()) : null); @@ -616,6 +609,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder b.ntrData.setVisibility(View.GONE); b.ntrAccount.setVisibility(View.VISIBLE); b.ntrPadding.setVisibility(View.GONE); + setEditable(true); } else { diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionModel.java b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionModel.java index ac0cf4b3..a4fe14d2 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionModel.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionModel.java @@ -68,7 +68,6 @@ public class NewTransactionModel extends ViewModel { private final MutableLiveData isSubmittable = new InertMutableLiveData<>(false); private final MutableLiveData showComments = new MutableLiveData<>(true); private final MutableLiveData> items = new MutableLiveData<>(); - private final MutableLiveData accountCount = new InertMutableLiveData<>(0); private final MutableLiveData simulateSave = new InertMutableLiveData<>(false); private final AtomicInteger busyCounter = new AtomicInteger(0); private final MutableLiveData busyFlag = new InertMutableLiveData<>(false); @@ -93,8 +92,25 @@ public class NewTransactionModel extends ViewModel { } private void setItemsWithoutSubmittableChecks(@NonNull List list) { Logger.debug("new-trans", "model: Setting new item list"); + final int cnt = list.size(); + for (int i = 1; i < cnt - 1; i++) { + final TransactionAccount item = list.get(i) + .toTransactionAccount(); + if (item.isLast) { + TransactionAccount replacement = new TransactionAccount(item); + replacement.isLast = false; + list.set(i, replacement); + } + } + final TransactionAccount last = list.get(cnt - 1) + .toTransactionAccount(); + if (!last.isLast) { + TransactionAccount replacement = new TransactionAccount(last); + replacement.isLast = true; + list.set(cnt - 1, replacement); + } + items.setValue(list); - accountCount.setValue(list.size() - 2); } private List copyList() { return copyList(null); @@ -156,7 +172,7 @@ public class NewTransactionModel extends ViewModel { list.add(new TransactionHead("")); list.add(new TransactionAccount("")); list.add(new TransactionAccount("")); - items.setValue(list); + setItemsWithoutSubmittableChecks(list); } boolean accountsInInitialState() { final List list = items.getValue(); @@ -832,9 +848,6 @@ public class NewTransactionModel extends ViewModel { setItems(newList); } - public LiveData getAccountCount() { - return accountCount; - } public boolean accountListIsEmpty() { List items = Objects.requireNonNull(this.items.getValue()); @@ -1019,6 +1032,7 @@ public class NewTransactionModel extends ViewModel { private boolean amountValid = true; private FocusedElement focusedElement = FocusedElement.Account; private boolean amountHintIsSet = false; + private boolean isLast = false; public TransactionAccount(TransactionAccount origin) { id = origin.id; accountName = origin.accountName; @@ -1030,6 +1044,7 @@ public class NewTransactionModel extends ViewModel { currency = origin.currency; amountValid = origin.amountValid; focusedElement = origin.focusedElement; + isLast = origin.isLast; } public TransactionAccount(LedgerTransactionAccount account) { super(); @@ -1045,6 +1060,9 @@ public class NewTransactionModel extends ViewModel { this.accountName = accountName; this.currency = currency; } + public boolean isLast() { + return isLast; + } public boolean isAmountSet() { return amountSet; } @@ -1144,7 +1162,7 @@ public class NewTransactionModel extends ViewModel { (amountHintIsSet ? other.amountHintIsSet && TextUtils.equals(amountHint, other.amountHint) : !other.amountHintIsSet) && - TextUtils.equals(currency, other.currency); + TextUtils.equals(currency, other.currency) && isLast == other.isLast; Logger.debug("new-trans", String.format("Comparing {%s} and {%s}: %s", this.toString(), other.toString(), equal)); -- 2.39.2