/*
- * Copyright © 2021 Damyan Ivanov.
+ * Copyright © 2022 Damyan Ivanov.
* This file is part of MoLe.
* MoLe is free software: you can distribute it and/or modify it
* under the term of the GNU General Public License as published by
package net.ktnx.mobileledger.ui.new_transaction;
import android.annotation.SuppressLint;
-import android.os.Handler;
-import android.os.Looper;
+import android.os.Build;
import android.text.TextUtils;
import androidx.annotation.NonNull;
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;
private final MutableLiveData<Boolean> simulateSave = new InertMutableLiveData<>(false);
private final AtomicInteger busyCounter = new AtomicInteger(0);
private final MutableLiveData<Boolean> busyFlag = new InertMutableLiveData<>(false);
- private final Observer<MobileLedgerProfile> profileObserver = profile -> {
- showCurrency.postValue(profile.getShowCommodityByDefault());
- showComments.postValue(profile.getShowCommentsByDefault());
+ private final Observer<Profile> profileObserver = profile -> {
+ if (profile != null) {
+ showCurrency.postValue(profile.getShowCommodityByDefault());
+ showComments.postValue(profile.getShowCommentsByDefault());
+ }
};
private final MutableLiveData<FocusInfo> focusInfo = new MutableLiveData<>();
private boolean observingDataProfile;
public NewTransactionModel() {
- reset();
}
public LiveData<Boolean> getShowCurrency() {
return showCurrency;
* make old items replaceable in-place. makes the new values visually blend in
*/
private void renumberItems() {
- final List<Item> list = items.getValue();
+ renumberItems(items.getValue());
+ }
+ private void renumberItems(List<Item> list) {
if (list == null) {
return;
}
return copy;
}
private List<Item> shallowCopyList() {
- return new ArrayList<>(items.getValue());
+ return new ArrayList<>(Objects.requireNonNull(items.getValue()));
}
LiveData<Boolean> getShowComments() {
return showComments;
List<Item> 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);
if (Misc.emptyIsNull(transactionComment) != null)
head.setComment(transactionComment);
- Item.resetIdDispenser();
List<Item> newItems = new ArrayList<>();
newItems.add(head);
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(() -> replaceItems(newItems));
+ 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));
}
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);
}
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));
}
noteFocusChanged(fi.position - 1, fi.element);
setItems(newList);
}
- void noteFocusChanged(int position, FocusedElement element) {
+ void noteFocusChanged(int position, @Nullable FocusedElement element) {
FocusInfo present = focusInfo.getValue();
if (present == null || present.position != position || present.element != element)
focusInfo.setValue(new FocusInfo(position, element));
// visual changes -- the currency fields will be hidden or reset to default anyway
// still, there may be changes in the submittable state
final List<Item> 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);
List<Item> list = Objects.requireNonNull(items.getValue());
TransactionHead head = list.get(0)
.toTransactionHead();
- SimpleDate date = head.getDate();
LedgerTransaction tr = head.asLedgerTransaction();
tr.setComment(head.getComment());
- LedgerTransactionAccount emptyAmountAccount = null;
- float emptyAmountAccountBalance = 0;
+ HashMap<String, List<LedgerTransactionAccount>> emptyAmountAccounts = new HashMap<>();
+ HashMap<String, Float> emptyAmountAccountBalance = new HashMap<>();
for (int i = 1; i < list.size(); i++) {
TransactionAccount item = list.get(i)
.toTransactionAccount();
+ String currency = item.getCurrency();
LedgerTransactionAccount acc = new LedgerTransactionAccount(item.getAccountName()
- .trim(),
- item.getCurrency());
+ .trim(), currency);
if (acc.getAccountName()
.isEmpty())
continue;
if (item.isAmountSet()) {
acc.setAmount(item.getAmount());
- emptyAmountAccountBalance += item.getAmount();
+ Float emptyCurrBalance = emptyAmountAccountBalance.get(currency);
+ if (emptyCurrBalance == null) {
+ emptyAmountAccountBalance.put(currency, item.getAmount());
+ }
+ else {
+ emptyAmountAccountBalance.put(currency, emptyCurrBalance + item.getAmount());
+ }
}
else {
- emptyAmountAccount = acc;
+ List<LedgerTransactionAccount> emptyCurrAccounts =
+ emptyAmountAccounts.get(currency);
+ if (emptyCurrAccounts == null)
+ emptyAmountAccounts.put(currency, emptyCurrAccounts = new ArrayList<>());
+ emptyCurrAccounts.add(acc);
}
tr.addAccount(acc);
}
- if (emptyAmountAccount != null)
- emptyAmountAccount.setAmount(-emptyAmountAccountBalance);
+ if (emptyAmountAccounts.size() > 0) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+ emptyAmountAccounts.forEach((currency, accounts) -> {
+ if (accounts.size() != 1)
+ throw new RuntimeException(String.format(Locale.US,
+ "Should not happen: approved transaction has %d accounts for " +
+ "currency %s", accounts.size(), currency));
+ accounts.get(0)
+ .setAmount(-Objects.requireNonNull(
+ emptyAmountAccountBalance.get(currency)));
+ });
+ }
+ else {
+ for (String currency : emptyAmountAccounts.keySet()) {
+ List<LedgerTransactionAccount> accounts =
+ Objects.requireNonNull(emptyAmountAccounts.get(currency));
+
+ if (accounts.size() != 1)
+ throw new RuntimeException(String.format(Locale.US,
+ "Should not happen: approved transaction has %d accounts for " +
+ "currency %s", accounts.size(), currency));
+ accounts.get(0)
+ .setAmount(-Objects.requireNonNull(
+ emptyAmountAccountBalance.get(currency)));
+ }
+ }
+ }
return tr;
}
- void loadTransactionIntoModel(long profileId, int transactionId) {
+ void loadTransactionIntoModel(@NonNull TransactionWithAccounts tr) {
List<Item> newList = new ArrayList<>();
Item.resetIdDispenser();
- LedgerTransaction tr;
- MobileLedgerProfile profile = Data.getProfile(profileId);
- if (profile == null)
- throw new RuntimeException(String.format(
- "Unable to find profile %s, which is supposed to contain transaction %d",
- profileId, transactionId));
- tr = profile.loadTransaction(transactionId);
- TransactionHead head = new TransactionHead(tr.getDescription());
- head.setComment(tr.getComment());
+ 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);
- List<LedgerTransactionAccount> accounts = tr.getAccounts();
+ List<LedgerTransactionAccount> accounts = new ArrayList<>();
+ for (net.ktnx.mobileledger.db.TransactionAccount acc : tr.accounts) {
+ accounts.add(new LedgerTransactionAccount(acc));
+ }
TransactionAccount firstNegative = null;
TransactionAccount firstPositive = null;
int singleNegativeIndex = -1;
int singlePositiveIndex = -1;
int negativeCount = 0;
+ boolean hasCurrency = false;
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());
}
else
item.resetAmount();
+
+ if (item.getCurrency()
+ .length() > 0)
+ hasCurrency = true;
}
if (BuildConfig.DEBUG)
dumpItemList("Loaded previous transaction", newList);
moveItemLast(newList, singlePositiveIndex);
}
- setItems(newList);
-
- noteFocusChanged(1, FocusedElement.Amount);
+ final boolean foundTransactionHasCurrency = hasCurrency;
+ Misc.onMainThread(() -> {
+ setItems(newList);
+ noteFocusChanged(1, FocusedElement.Amount);
+ if (foundTransactionHasCurrency)
+ showCurrency.setValue(true);
+ });
}
/**
* A transaction is submittable if:
submittable = false;
}
+ boolean hasInvalidAmount = false;
+
for (int i = 1; i < list.size(); i++) {
TransactionAccount item = list.get(i)
.toTransactionAccount();
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())
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;
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))
{
Logger.debug("submittable",
- String.format("Setting amount hint of {%s} to %s [%s]",
- acc.toString(), hint, balCurrency));
+ String.format("Setting amount hint of {%s} to %s [%s]", acc,
+ hint, balCurrency));
acc.setAmountHint(hint);
listChanged = true;
}
// 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();
// 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;
+ }
}
}
public static class FocusInfo {
int position;
FocusedElement element;
- public FocusInfo(int position, FocusedElement element) {
+ public FocusInfo(int position, @Nullable FocusedElement element) {
this.position = position;
this.element = element;
}
b.append(String.format(" '%s'", description));
if (date != null)
- b.append(String.format("@%s", date.toString()));
+ b.append(String.format("@%s", date));
if (!TextUtils.isEmpty(comment))
b.append(String.format(" /%s/", comment));
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)
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;
amountSet = origin.amountSet;
amountHint = origin.amountHint;
amountHintIsSet = origin.amountHintIsSet;
+ amountText = origin.amountText;
comment = origin.comment;
currency = origin.currency;
amountValid = origin.amountValid;
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;
}
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() {
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;
}
@SuppressLint("DefaultLocale")
@Override
+ @NotNull
public String toString() {
StringBuilder b = new StringBuilder();
b.append(String.format("id:%d/%s", id, Integer.toHexString(hashCode())));
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(" ")
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)
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(),
- equal));
+ String.format("Comparing {%s} and {%s}: %s", this, other, equal));
return equal;
}
public int getAccountNameCursorPosition() {
}
private static class ItemsForCurrency {
- private final HashMap<String, List<Item>> hashMap = new HashMap<>();
+ private final HashMap<@NotNull String, List<Item>> hashMap = new HashMap<>();
@NonNull
- List<NewTransactionModel.Item> getList(@Nullable String currencyName) {
+ List<NewTransactionModel.Item> getList(@NotNull String currencyName) {
List<NewTransactionModel.Item> list = hashMap.get(currencyName);
if (list == null) {
list = new ArrayList<>();
}
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<String> currencies() {
projects / mobile-ledger.git / blobdiff