X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fnew_transaction%2FNewTransactionModel.java;h=311226dacd6ec85504e562bc30bab73bf1697e63;hb=ee517e303eef7ec2ba6ca39dc73252b539bce0da;hp=5ad014f2f71f29d105e9d1993a673d34eee298b5;hpb=aee86347cbc843e454392751c181417945a271f5;p=mobile-ledger.git 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 5ad014f2..311226da 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 @@ -18,8 +18,6 @@ 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; @@ -31,15 +29,17 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModel; import net.ktnx.mobileledger.BuildConfig; +import net.ktnx.mobileledger.db.Currency; import net.ktnx.mobileledger.db.DB; +import net.ktnx.mobileledger.db.Profile; import net.ktnx.mobileledger.db.TemplateAccount; import net.ktnx.mobileledger.db.TemplateHeader; +import net.ktnx.mobileledger.db.TransactionWithAccounts; import net.ktnx.mobileledger.model.Data; import net.ktnx.mobileledger.model.InertMutableLiveData; import net.ktnx.mobileledger.model.LedgerTransaction; import net.ktnx.mobileledger.model.LedgerTransactionAccount; import net.ktnx.mobileledger.model.MatchedTemplate; -import net.ktnx.mobileledger.model.MobileLedgerProfile; import net.ktnx.mobileledger.utils.Globals; import net.ktnx.mobileledger.utils.Logger; import net.ktnx.mobileledger.utils.Misc; @@ -73,7 +73,7 @@ public class NewTransactionModel extends ViewModel { private final MutableLiveData simulateSave = new InertMutableLiveData<>(false); private final AtomicInteger busyCounter = new AtomicInteger(0); private final MutableLiveData busyFlag = new InertMutableLiveData<>(false); - private final Observer profileObserver = profile -> { + private final Observer profileObserver = profile -> { showCurrency.postValue(profile.getShowCommodityByDefault()); showComments.postValue(profile.getShowCommentsByDefault()); }; @@ -92,8 +92,25 @@ public class NewTransactionModel extends ViewModel { checkTransactionSubmittable(newList); setItemsWithoutSubmittableChecks(newList); } + private void replaceItems(@NonNull List newList) { + renumberItems(); + + setItems(newList); + } + /** + * make old items replaceable in-place. makes the new values visually blend in + */ + private void renumberItems() { + final List list = items.getValue(); + if (list == null) { + return; + } + + int id = 0; + for (Item item : list) + item.id = id++; + } 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) @@ -112,14 +129,13 @@ public class NewTransactionModel extends ViewModel { list.set(cnt - 1, replacement); } + if (BuildConfig.DEBUG) + dumpItemList("Before setValue()", list); items.setValue(list); } private List copyList() { - return copyList(null); - } - private List copyList(@Nullable List source) { List copy = new ArrayList<>(); - List oldList = (source == null) ? items.getValue() : source; + List oldList = items.getValue(); if (oldList != null) for (Item item : oldList) { @@ -128,7 +144,7 @@ public class NewTransactionModel extends ViewModel { return copy; } - private List shallowCopyListWithoutItem(int position) { + private List copyListWithoutItem(int position) { List copy = new ArrayList<>(); List oldList = items.getValue(); @@ -137,7 +153,7 @@ public class NewTransactionModel extends ViewModel { for (Item item : oldList) { if (i++ == position) continue; - copy.add(item); + copy.add(Item.from(item)); } } @@ -172,10 +188,12 @@ public class NewTransactionModel extends ViewModel { void reset() { Logger.debug("new-trans", "Resetting model"); List list = new ArrayList<>(); + Item.resetIdDispenser(); list.add(new TransactionHead("")); list.add(new TransactionAccount("")); list.add(new TransactionAccount("")); noteFocusChanged(0, FocusedElement.Description); + renumberItems(); isSubmittable.setValue(false); setItemsWithoutSubmittableChecks(list); } @@ -242,6 +260,7 @@ public class NewTransactionModel extends ViewModel { if (Misc.emptyIsNull(transactionComment) != null) head.setComment(transactionComment); + Item.resetIdDispenser(); List newItems = new ArrayList<>(); newItems.add(head); @@ -272,25 +291,30 @@ public class NewTransactionModel extends ViewModel { if (amount != null && acc.getNegateAmount() != null && acc.getNegateAmount()) amount = -amount; - // TODO currency TransactionAccount accRow = new TransactionAccount(accountName); accRow.setComment(accountComment); if (amount != null) accRow.setAmount(amount); + accRow.setCurrency( + extractCurrencyFromMatches(matchResult, acc.getCurrencyMatchGroup(), + acc.getCurrencyObject())); newItems.add(accRow); } - new Handler(Looper.getMainLooper()).post(() -> setItems(newItems)); + Misc.onMainThread(() -> replaceItems(newItems)); }); } + private String extractCurrencyFromMatches(MatchResult m, Integer group, Currency literal) { + return extractStringFromMatches(m, group, (literal == null) ? "" : literal.getName()); + } private int extractIntFromMatches(MatchResult m, Integer group, Integer literal) { if (literal != null) return literal; if (group != null) { int grp = group; - if (grp > 0 & grp <= m.groupCount()) + if (grp > 0 && grp <= m.groupCount()) try { return Integer.parseInt(m.group(grp)); } @@ -307,7 +331,7 @@ public class NewTransactionModel extends ViewModel { if (group != null) { int grp = group; - if (grp > 0 & grp <= m.groupCount()) + if (grp > 0 && grp <= m.groupCount()) return m.group(grp); } @@ -319,7 +343,7 @@ public class NewTransactionModel extends ViewModel { if (group != null) { int grp = group; - if (grp > 0 & grp <= m.groupCount()) + if (grp > 0 && grp <= m.groupCount()) try { return Float.valueOf(m.group(grp)); } @@ -331,7 +355,11 @@ public class NewTransactionModel extends ViewModel { return null; } void removeItem(int pos) { - List newList = shallowCopyListWithoutItem(pos); + Logger.debug("new-trans", String.format(Locale.US, "Removing item at position %d", pos)); + List newList = copyListWithoutItem(pos); + final FocusInfo fi = focusInfo.getValue(); + if ((fi != null) && (pos < fi.position)) + noteFocusChanged(fi.position - 1, fi.element); setItems(newList); } void noteFocusChanged(int position, FocusedElement element) { @@ -346,6 +374,11 @@ public class NewTransactionModel extends ViewModel { List newList = shallowCopyList(); Item item = newList.remove(fromIndex); newList.add(toIndex, item); + + FocusInfo fi = focusInfo.getValue(); + if (fi != null && fi.position == fromIndex) + noteFocusChanged(toIndex, fi.element); + items.setValue(newList); // same count, same submittable state } void moveItemLast(List list, int index) { @@ -399,7 +432,6 @@ public class NewTransactionModel extends ViewModel { List list = Objects.requireNonNull(items.getValue()); TransactionHead head = list.get(0) .toTransactionHead(); - SimpleDate date = head.getDate(); LedgerTransaction tr = head.asLedgerTransaction(); tr.setComment(head.getComment()); @@ -433,22 +465,23 @@ public class NewTransactionModel extends ViewModel { return tr; } - void loadTransactionIntoModel(String profileUUID, int transactionId) { + void loadTransactionIntoModel(@NonNull TransactionWithAccounts tr) { List newList = new ArrayList<>(); - LedgerTransaction tr; - MobileLedgerProfile profile = Data.getProfile(profileUUID); - if (profile == null) - throw new RuntimeException(String.format( - "Unable to find profile %s, which is supposed to contain transaction %d", - profileUUID, transactionId)); + Item.resetIdDispenser(); - tr = profile.loadTransaction(transactionId); - TransactionHead head = new TransactionHead(tr.getDescription()); - head.setComment(tr.getComment()); + Item currentHead = items.getValue() + .get(0); + TransactionHead head = new TransactionHead(tr.transaction.getDescription()); + head.setComment(tr.transaction.getComment()); + if (currentHead instanceof TransactionHead) + head.setDate(((TransactionHead) currentHead).date); newList.add(head); - List accounts = tr.getAccounts(); + List accounts = new ArrayList<>(); + for (net.ktnx.mobileledger.db.TransactionAccount acc : tr.accounts) { + accounts.add(new LedgerTransactionAccount(acc)); + } TransactionAccount firstNegative = null; TransactionAccount firstPositive = null; @@ -497,9 +530,10 @@ public class NewTransactionModel extends ViewModel { moveItemLast(newList, singlePositiveIndex); } - setItems(newList); - - noteFocusChanged(1, FocusedElement.Amount); + Misc.onMainThread(() -> { + setItems(newList); + noteFocusChanged(1, FocusedElement.Amount); + }); } /** * A transaction is submittable if: @@ -521,14 +555,14 @@ public class NewTransactionModel extends ViewModel { @SuppressLint("DefaultLocale") void checkTransactionSubmittable(@Nullable List list) { boolean workingWithLiveList = false; - boolean liveListCopied = false; if (list == null) { - list = Objects.requireNonNull(items.getValue()); + list = copyList(); workingWithLiveList = true; } if (BuildConfig.DEBUG) - dumpItemList("Before submittable checks", list); + dumpItemList(String.format("Before submittable checks (%s)", + workingWithLiveList ? "LIVE LIST" : "custom list"), list); int accounts = 0; final BalanceForCurrency balance = new BalanceForCurrency(); @@ -627,21 +661,15 @@ public class NewTransactionModel extends ViewModel { if (Misc.equalStrings(acc.getCurrency(), balCurrency)) { if (BuildConfig.DEBUG) Logger.debug("submittable", - String.format("Resetting hint of '%s' [%s]", - Misc.nullIsEmpty(acc.getAccountName()), + String.format(Locale.US, "Resetting hint of %d:'%s' [%s]", + i, Misc.nullIsEmpty(acc.getAccountName()), balCurrency)); // 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; - } - final TransactionAccount newAcc = new TransactionAccount(acc); - newAcc.setAmountHint(null); - list.set(i, newAcc); + acc.setAmountHint(null); listChanged = true; } } @@ -687,18 +715,12 @@ public class NewTransactionModel extends ViewModel { if (item == receiver) { final String hint = String.format("%1.2f", -currencyBalance); if (!acc.isAmountHintSet() || - !TextUtils.equals(acc.getAmountHint(), hint)) + !Misc.equalStrings(acc.getAmountHint(), hint)) { Logger.debug("submittable", String.format("Setting amount hint of {%s} to %s [%s]", acc.toString(), hint, balCurrency)); - if (workingWithLiveList & !liveListCopied) { - list = copyList(list); - liveListCopied = true; - } - final TransactionAccount newAcc = new TransactionAccount(acc); - newAcc.setAmountHint(hint); - list.set(i, newAcc); + acc.setAmountHint(hint); listChanged = true; } } @@ -709,13 +731,7 @@ public class NewTransactionModel extends ViewModel { Misc.nullIsEmpty(acc.getAccountName()), balCurrency)); if (acc.amountHintIsSet && !TextUtils.isEmpty(acc.getAmountHint())) { - if (workingWithLiveList && !liveListCopied) { - list = copyList(list); - liveListCopied = true; - } - final TransactionAccount newAcc = new TransactionAccount(acc); - newAcc.setAmountHint(null); - list.set(i, newAcc); + acc.setAmountHint(null); listChanged = true; } } @@ -750,10 +766,6 @@ public class NewTransactionModel extends ViewModel { // } // // if (!foundIt) - if (workingWithLiveList && !liveListCopied) { - list = copyList(list); - liveListCopied = true; - } final TransactionAccount newAcc = new TransactionAccount("", balCurrency); final float bal = balance.get(balCurrency); if (!Misc.isZero(bal) && currAmounts == currRows) @@ -770,10 +782,6 @@ public class NewTransactionModel extends ViewModel { for (String currName : emptyRowsForCurrency.currencies()) { List emptyItems = emptyRowsForCurrency.getList(currName); while ((list.size() > MIN_ITEMS) && (emptyItems.size() > 1)) { - if (workingWithLiveList && !liveListCopied) { - list = copyList(list); - liveListCopied = true; - } // the list is a copy, so the empty item is no longer present Item itemToRemove = emptyItems.remove(1); removeItemById(list, itemToRemove.id); @@ -785,10 +793,6 @@ public class NewTransactionModel extends ViewModel { List currItems = itemsForCurrency.getList(currName); if (currItems.size() == 1) { - if (workingWithLiveList && !liveListCopied) { - list = copyList(list); - liveListCopied = true; - } // the list is a copy, so the empty item is no longer present removeItemById(list, emptyItems.get(0).id); listChanged = true; @@ -799,15 +803,10 @@ public class NewTransactionModel extends ViewModel { // 6) at least two rows need to be present in the ledger // (the list also contains header and trailer) while (list.size() < MIN_ITEMS) { - if (workingWithLiveList && !liveListCopied) { - list = copyList(list); - liveListCopied = true; - } list.add(new TransactionAccount("")); listChanged = true; } - Logger.debug("submittable", submittable ? "YES" : "NO"); isSubmittable.setValue(submittable); @@ -893,9 +892,15 @@ public class NewTransactionModel extends ViewModel { private static int idDispenser = 0; protected int id; private Item() { - synchronized (Item.class) { - id = ++idDispenser; - } + if (this instanceof TransactionHead) + id = 0; + else + synchronized (Item.class) { + id = ++idDispenser; + } + } + public Item(int id) { + this.id = id; } public static Item from(Item origin) { if (origin instanceof TransactionHead) @@ -904,6 +909,9 @@ public class NewTransactionModel extends ViewModel { return new TransactionAccount((TransactionAccount) origin); throw new RuntimeException("Don't know how to handle " + origin); } + private static void resetIdDispenser() { + idDispenser = 0; + } public int getId() { return id; } @@ -952,7 +960,7 @@ public class NewTransactionModel extends ViewModel { this.description = description; } public TransactionHead(TransactionHead origin) { - id = origin.id; + super(origin.id); date = origin.date; description = origin.description; comment = origin.comment; @@ -1001,7 +1009,7 @@ public class NewTransactionModel extends ViewModel { if (TextUtils.isEmpty(description)) b.append(" «no description»"); else - b.append(String.format(" descr'%s'", description)); + b.append(String.format(" '%s'", description)); if (date != null) b.append(String.format("@%s", date.toString())); @@ -1028,15 +1036,16 @@ public class NewTransactionModel extends ViewModel { return ItemType.generalData; } public LedgerTransaction asLedgerTransaction() { - return new LedgerTransaction(null, date, description, Data.getProfile()); + return new LedgerTransaction(0, (date == null) ? SimpleDate.today() : date, description, + Data.getProfile()); } public boolean equalContents(TransactionHead other) { if (other == null) return false; return Objects.equals(date, other.date) && - TextUtils.equals(description, other.description) && - TextUtils.equals(comment, other.comment); + Misc.equalStrings(description, other.description) && + Misc.equalStrings(comment, other.comment); } } @@ -1053,7 +1062,7 @@ public class NewTransactionModel extends ViewModel { private boolean isLast = false; private int accountNameCursorPosition; public TransactionAccount(TransactionAccount origin) { - id = origin.id; + super(origin.id); accountName = origin.accountName; amount = origin.amount; amountSet = origin.amountSet; @@ -1178,16 +1187,16 @@ public class NewTransactionModel extends ViewModel { if (other == null) return false; - boolean equal = TextUtils.equals(accountName, other.accountName); - equal = equal && TextUtils.equals(comment, other.comment) && + boolean equal = Misc.equalStrings(accountName, other.accountName); + equal = equal && Misc.equalStrings(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) + Misc.equalStrings(amountHint, other.amountHint) : !other.amountHintIsSet); - equal = equal && TextUtils.equals(currency, other.currency) && isLast == other.isLast; + equal = equal && Misc.equalStrings(currency, other.currency) && isLast == other.isLast; Logger.debug("new-trans", String.format("Comparing {%s} and {%s}: %s", this.toString(), other.toString(),