package net.ktnx.mobileledger.ui.new_transaction;
import android.annotation.SuppressLint;
+import android.os.Handler;
+import android.os.Looper;
import android.text.TextUtils;
import androidx.annotation.NonNull;
private final MutableLiveData<Boolean> isSubmittable = new InertMutableLiveData<>(false);
private final MutableLiveData<Boolean> showComments = new MutableLiveData<>(true);
private final MutableLiveData<List<Item>> items = new MutableLiveData<>();
- private final MutableLiveData<Integer> accountCount = new InertMutableLiveData<>(0);
private final MutableLiveData<Boolean> simulateSave = new InertMutableLiveData<>(false);
private final AtomicInteger busyCounter = new AtomicInteger(0);
private final MutableLiveData<Boolean> busyFlag = new InertMutableLiveData<>(false);
}
private void setItemsWithoutSubmittableChecks(@NonNull List<Item> 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<Item> copyList() {
return copyList(null);
list.add(new TransactionHead(""));
list.add(new TransactionAccount(""));
list.add(new TransactionAccount(""));
- items.setValue(list);
+ setItemsWithoutSubmittableChecks(list);
}
boolean accountsInInitialState() {
final List<Item> list = items.getValue();
newItems.add(accRow);
}
- items.postValue(newItems);
+ new Handler(Looper.getMainLooper()).post(() -> setItems(newItems));
});
}
private int extractIntFromMatches(MatchResult m, Integer group, Integer literal) {
moveItemLast(newList, singlePositiveIndex);
}
- noteFocusChanged(1, FocusedElement.Description);
-
setItems(newList);
+
+ noteFocusChanged(1, FocusedElement.Amount);
}
/**
* A transaction is submittable if:
String.format("Resetting hint of '%s' [%s]",
Misc.nullIsEmpty(acc.getAccountName()),
balCurrency));
- if (acc.amountHintIsSet && !TextUtils.isEmpty(acc.getAmountHint())) {
+ // skip if the amount is set, in which case the hint is not
+ // important/visible
+ if (!acc.isAmountSet() && acc.amountHintIsSet &&
+ !TextUtils.isEmpty(acc.getAmountHint()))
+ {
if (workingWithLiveList && !liveListCopied) {
list = copyList(list);
liveListCopied = true;
setItems(newList);
}
- public LiveData<Integer> getAccountCount() {
- return accountCount;
- }
public boolean accountListIsEmpty() {
List<Item> items = Objects.requireNonNull(this.items.getValue());
private boolean amountSet;
private boolean amountValid = true;
private FocusedElement focusedElement = FocusedElement.Account;
- private boolean amountHintIsSet = false;
+ private boolean amountHintIsSet = true;
+ private boolean isLast = false;
public TransactionAccount(TransactionAccount origin) {
id = origin.id;
accountName = origin.accountName;
currency = origin.currency;
amountValid = origin.amountValid;
focusedElement = origin.focusedElement;
+ isLast = origin.isLast;
}
public TransactionAccount(LedgerTransactionAccount account) {
super();
this.accountName = accountName;
this.currency = currency;
}
+ public boolean isLast() {
+ return isLast;
+ }
public boolean isAmountSet() {
return amountSet;
}
if (other == null)
return false;
- boolean equal = TextUtils.equals(accountName, other.accountName) &&
- TextUtils.equals(comment, other.comment) &&
- (amountSet ? other.amountSet && amount == other.amount
- : !other.amountSet) &&
- (amountHintIsSet ? other.amountHintIsSet &&
- TextUtils.equals(amountHint, other.amountHint)
- : !other.amountHintIsSet) &&
- TextUtils.equals(currency, other.currency);
+ boolean equal = TextUtils.equals(accountName, other.accountName);
+ equal = equal && TextUtils.equals(comment, other.comment) &&
+ (amountSet ? other.amountSet && amount == other.amount : !other.amountSet);
+
+ // compare amount hint only if there is no amount
+ if (!amountSet)
+ equal = equal && (amountHintIsSet ? other.amountHintIsSet &&
+ TextUtils.equals(amountHint, other.amountHint)
+ : !other.amountHintIsSet);
+ equal = equal && TextUtils.equals(currency, other.currency) && isLast == other.isLast;
+
Logger.debug("new-trans",
String.format("Comparing {%s} and {%s}: %s", this.toString(), other.toString(),
equal));