X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fnew_transaction%2FNewTransactionModel.java;h=8b96f365fca9ce415d79ff0b1f8a86ba6f478c7e;hb=3775284655ecfc838ae81f722e123fee507d25f7;hp=ad9c75cd87282307581f5679d5825095734e4110;hpb=40d4f7ebb9085a58133cf47eacf989ed35fa0b4e;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 ad9c75cd..8b96f365 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 @@ -29,6 +29,7 @@ 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; @@ -79,7 +80,6 @@ public class NewTransactionModel extends ViewModel { private final MutableLiveData focusInfo = new MutableLiveData<>(); private boolean observingDataProfile; public NewTransactionModel() { - reset(); } public LiveData getShowCurrency() { return showCurrency; @@ -100,7 +100,9 @@ public class NewTransactionModel extends ViewModel { * make old items replaceable in-place. makes the new values visually blend in */ private void renumberItems() { - final List list = items.getValue(); + renumberItems(items.getValue()); + } + private void renumberItems(List list) { if (list == null) { return; } @@ -159,7 +161,7 @@ public class NewTransactionModel extends ViewModel { return copy; } private List shallowCopyList() { - return new ArrayList<>(items.getValue()); + return new ArrayList<>(Objects.requireNonNull(items.getValue())); } LiveData getShowComments() { return showComments; @@ -189,8 +191,10 @@ public class NewTransactionModel extends ViewModel { List list = new ArrayList<>(); Item.resetIdDispenser(); list.add(new TransactionHead("")); - list.add(new TransactionAccount("")); - list.add(new TransactionAccount("")); + final String defaultCurrency = Objects.requireNonNull(Data.getProfile()) + .getDefaultCommodity(); + list.add(new TransactionAccount("", defaultCurrency)); + list.add(new TransactionAccount("", defaultCurrency)); noteFocusChanged(0, FocusedElement.Description); renumberItems(); isSubmittable.setValue(false); @@ -259,7 +263,6 @@ public class NewTransactionModel extends ViewModel { if (Misc.emptyIsNull(transactionComment) != null) head.setComment(transactionComment); - Item.resetIdDispenser(); List newItems = new ArrayList<>(); newItems.add(head); @@ -290,25 +293,33 @@ 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); } + renumberItems(newItems); Misc.onMainThread(() -> replaceItems(newItems)); }); } + @NonNull + private String extractCurrencyFromMatches(MatchResult m, Integer group, Currency literal) { + return Misc.nullIsEmpty( + 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)); } @@ -319,13 +330,14 @@ public class NewTransactionModel extends ViewModel { return 0; } + @Nullable private String extractStringFromMatches(MatchResult m, Integer group, String literal) { if (literal != null) return literal; if (group != null) { int grp = group; - if (grp > 0 & grp <= m.groupCount()) + if (grp > 0 && grp <= m.groupCount()) return m.group(grp); } @@ -337,7 +349,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)); } @@ -395,10 +407,10 @@ public class NewTransactionModel extends ViewModel { // visual changes -- the currency fields will be hidden or reset to default anyway // still, there may be changes in the submittable state final List list = Objects.requireNonNull(this.items.getValue()); + final Profile profile = Objects.requireNonNull(Data.getProfile()); for (int i = 1; i < list.size(); i++) { - ((TransactionAccount) list.get(i)).setCurrency(newValue ? Data.getProfile() - .getDefaultCommodity() - : null); + ((TransactionAccount) list.get(i)).setCurrency( + newValue ? profile.getDefaultCommodity() : ""); } checkTransactionSubmittable(null); showCurrency.setValue(newValue); @@ -426,7 +438,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()); @@ -464,8 +475,12 @@ public class NewTransactionModel extends ViewModel { List newList = new ArrayList<>(); Item.resetIdDispenser(); + Item currentHead = Objects.requireNonNull(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); @@ -481,8 +496,8 @@ public class NewTransactionModel extends ViewModel { int negativeCount = 0; for (int i = 0; i < accounts.size(); i++) { LedgerTransactionAccount acc = accounts.get(i); - TransactionAccount item = - new TransactionAccount(acc.getAccountName(), acc.getCurrency()); + TransactionAccount item = new TransactionAccount(acc.getAccountName(), + Misc.nullIsEmpty(acc.getCurrency())); newList.add(item); item.setAccountName(acc.getAccountName()); @@ -579,6 +594,8 @@ public class NewTransactionModel extends ViewModel { submittable = false; } + boolean hasInvalidAmount = false; + for (int i = 1; i < list.size(); i++) { TransactionAccount item = list.get(i) .toTransactionAccount(); @@ -608,16 +625,18 @@ public class NewTransactionModel extends ViewModel { itemsWithAccountForCurrency.add(currName, item); } - if (!item.isAmountValid()) { - Logger.debug("submittable", - String.format("Not submittable: row %d has an invalid amount", i + 1)); - submittable = false; - } - else if (item.isAmountSet()) { + if (item.isAmountSet() && item.isAmountValid()) { itemsWithAmountForCurrency.add(currName, item); balance.add(currName, item.getAmount()); } else { + if (!item.isAmountValid()) { + Logger.debug("submittable", + String.format("Not submittable: row %d has an invalid amount", i)); + submittable = false; + hasInvalidAmount = true; + } + itemsWithEmptyAmountForCurrency.add(currName, item); if (!accName.isEmpty()) @@ -674,11 +693,11 @@ public class NewTransactionModel extends ViewModel { if (BuildConfig.DEBUG) { if (balanceReceiversCount == 0) Logger.debug("submittable", String.format( - "Transaction not submittable [%s]: non-zero balance " + + "Transaction not submittable [curr:%s]: non-zero balance " + "with no empty amounts with accounts", balCurrency)); else Logger.debug("submittable", String.format( - "Transaction not submittable [%s]: non-zero balance " + + "Transaction not submittable [curr:%s]: non-zero balance " + "with multiple empty amounts with accounts", balCurrency)); } submittable = false; @@ -704,7 +723,7 @@ public class NewTransactionModel extends ViewModel { continue; if (item == receiver) { - final String hint = String.format("%1.2f", -currencyBalance); + final String hint = Data.formatNumber(-currencyBalance); if (!acc.isAmountHintSet() || !Misc.equalStrings(acc.getAmountHint(), hint)) { @@ -732,16 +751,17 @@ public class NewTransactionModel extends ViewModel { // 5) a row with an empty account name or empty amount is guaranteed to exist for // each commodity - for (String balCurrency : balance.currencies()) { - int currEmptyRows = itemsWithEmptyAccountForCurrency.size(balCurrency); - int currRows = itemsForCurrency.size(balCurrency); - int currAccounts = itemsWithAccountForCurrency.size(balCurrency); - int currAmounts = itemsWithAmountForCurrency.size(balCurrency); - if ((currEmptyRows == 0) && - ((currRows == currAccounts) || (currRows == currAmounts))) - { - // perhaps there already is an unused empty row for another currency that - // is not used? + if (!hasInvalidAmount) { + for (String balCurrency : balance.currencies()) { + int currEmptyRows = itemsWithEmptyAccountForCurrency.size(balCurrency); + int currRows = itemsForCurrency.size(balCurrency); + int currAccounts = itemsWithAccountForCurrency.size(balCurrency); + int currAmounts = itemsWithAmountForCurrency.size(balCurrency); + if ((currEmptyRows == 0) && + ((currRows == currAccounts) || (currRows == currAmounts))) + { + // perhaps there already is an unused empty row for another currency that + // is not used? // boolean foundIt = false; // for (Item item : emptyRows) { // Currency itemCurrency = item.getCurrency(); @@ -750,22 +770,23 @@ public class NewTransactionModel extends ViewModel { // if (Misc.isZero(balance.get(itemCurrencyName))) { // item.setCurrency(Currency.loadByName(balCurrency)); // item.setAmountHint( -// String.format("%1.2f", -balance.get(balCurrency))); +// Data.formatNumber(-balance.get(balCurrency))); // foundIt = true; // break; // } // } // // if (!foundIt) - final TransactionAccount newAcc = new TransactionAccount("", balCurrency); - final float bal = balance.get(balCurrency); - if (!Misc.isZero(bal) && currAmounts == currRows) - newAcc.setAmountHint(String.format("%4.2f", -bal)); - Logger.debug("submittable", - String.format("Adding new item with %s for currency %s", - newAcc.getAmountHint(), balCurrency)); - list.add(newAcc); - listChanged = true; + final TransactionAccount newAcc = new TransactionAccount("", balCurrency); + final float bal = balance.get(balCurrency); + if (!Misc.isZero(bal) && currAmounts == currRows) + newAcc.setAmountHint(Data.formatNumber(-bal)); + Logger.debug("submittable", + String.format("Adding new item with %s for currency %s", + newAcc.getAmountHint(), balCurrency)); + list.add(newAcc); + listChanged = true; + } } } @@ -1027,7 +1048,8 @@ public class NewTransactionModel extends ViewModel { return ItemType.generalData; } public LedgerTransaction asLedgerTransaction() { - return new LedgerTransaction(0, date, description, Data.getProfile()); + return new LedgerTransaction(0, (date == null) ? SimpleDate.today() : date, description, + Objects.requireNonNull(Data.getProfile())); } public boolean equalContents(TransactionHead other) { if (other == null) @@ -1043,10 +1065,13 @@ public class NewTransactionModel extends ViewModel { private String accountName; private String amountHint; private String comment; - private String currency; + @NotNull + private String currency = ""; private float amount; private boolean amountSet; private boolean amountValid = true; + @NotNull + private String amountText = ""; private FocusedElement focusedElement = FocusedElement.Account; private boolean amountHintIsSet = false; private boolean isLast = false; @@ -1058,6 +1083,7 @@ public class NewTransactionModel extends ViewModel { amountSet = origin.amountSet; amountHint = origin.amountHint; amountHintIsSet = origin.amountHintIsSet; + amountText = origin.amountText; comment = origin.comment; currency = origin.currency; amountValid = origin.amountValid; @@ -1065,20 +1091,55 @@ public class NewTransactionModel extends ViewModel { isLast = origin.isLast; accountNameCursorPosition = origin.accountNameCursorPosition; } - public TransactionAccount(LedgerTransactionAccount account) { - super(); - currency = account.getCurrency(); - amount = account.getAmount(); - } public TransactionAccount(String accountName) { super(); this.accountName = accountName; } - public TransactionAccount(String accountName, String currency) { + public TransactionAccount(String accountName, @NotNull String currency) { super(); this.accountName = accountName; this.currency = currency; } + public @NotNull String getAmountText() { + return amountText; + } + public void setAmountText(@NotNull String amountText) { + this.amountText = amountText; + } + public boolean setAndCheckAmountText(@NotNull String amountText) { + String amtText = amountText.trim(); + this.amountText = amtText; + + boolean significantChange = false; + + if (amtText.isEmpty()) { + if (amountSet) { + significantChange = true; + } + resetAmount(); + } + else { + try { + amtText = amtText.replace(Data.getDecimalSeparator(), Data.decimalDot); + final float parsedAmount = Float.parseFloat(amtText); + if (!amountSet || !amountValid || !Misc.equalFloats(parsedAmount, amount)) + significantChange = true; + amount = parsedAmount; + amountSet = true; + amountValid = true; + } + catch (NumberFormatException e) { + Logger.debug("new-trans", String.format( + "assuming amount is not set due to number format exception. " + + "input was '%s'", amtText)); + if (amountValid) // it was valid and now it's not + significantChange = true; + amountValid = false; + } + } + + return significantChange; + } public boolean isLast() { return isLast; } @@ -1099,9 +1160,13 @@ public class NewTransactionModel extends ViewModel { public void setAmount(float amount) { this.amount = amount; amountSet = true; + amountValid = true; + amountText = Data.formatNumber(amount); } public void resetAmount() { amountSet = false; + amountValid = true; + amountText = ""; } @Override public ItemType getType() { @@ -1120,11 +1185,12 @@ public class NewTransactionModel extends ViewModel { public void setComment(String comment) { this.comment = comment; } + @NotNull public String getCurrency() { return currency; } - public void setCurrency(String currency) { - this.currency = currency; + public void setCurrency(@org.jetbrains.annotations.Nullable String currency) { + this.currency = Misc.nullIsEmpty(currency); } public boolean isAmountValid() { return amountValid; @@ -1150,6 +1216,7 @@ public class NewTransactionModel extends ViewModel { } @SuppressLint("DefaultLocale") @Override + @NotNull public String toString() { StringBuilder b = new StringBuilder(); b.append(String.format("id:%d/%s", id, Integer.toHexString(hashCode()))); @@ -1157,9 +1224,13 @@ public class NewTransactionModel extends ViewModel { b.append(String.format(" acc'%s'", accountName)); if (amountSet) - b.append(String.format(" %4.2f", amount)); + b.append(amountText) + .append(" [") + .append(amountValid ? "valid" : "invalid") + .append("] ") + .append(String.format(Locale.ROOT, " {raw %4.2f}", amount)); else if (amountHintIsSet) - b.append(String.format(" (%s)", amountHint)); + b.append(String.format(" (hint %s)", amountHint)); if (!TextUtils.isEmpty(currency)) b.append(" ") @@ -1179,7 +1250,9 @@ public class NewTransactionModel extends ViewModel { boolean equal = Misc.equalStrings(accountName, other.accountName); equal = equal && Misc.equalStrings(comment, other.comment) && - (amountSet ? other.amountSet && amount == other.amount : !other.amountSet); + (amountSet ? other.amountSet && amountValid == other.amountValid && + Misc.equalStrings(amountText, other.amountText) + : !other.amountSet); // compare amount hint only if there is no amount if (!amountSet) @@ -1223,9 +1296,9 @@ public class NewTransactionModel extends ViewModel { } private static class ItemsForCurrency { - private final HashMap> hashMap = new HashMap<>(); + private final HashMap<@NotNull String, List> hashMap = new HashMap<>(); @NonNull - List getList(@Nullable String currencyName) { + List getList(@NotNull String currencyName) { List list = hashMap.get(currencyName); if (list == null) { list = new ArrayList<>(); @@ -1233,11 +1306,11 @@ public class NewTransactionModel extends ViewModel { } return list; } - void add(@Nullable String currencyName, @NonNull NewTransactionModel.Item item) { - getList(currencyName).add(item); + void add(@NotNull String currencyName, @NonNull NewTransactionModel.Item item) { + getList(Objects.requireNonNull(currencyName)).add(item); } - int size(@Nullable String currencyName) { - return this.getList(currencyName) + int size(@NotNull String currencyName) { + return this.getList(Objects.requireNonNull(currencyName)) .size(); } Set currencies() {