X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fnew_transaction%2FNewTransactionModel.java;h=f17f77b17b1c97c8e2e461779c751c95f1456f0b;hb=3173a61c334646acf7cdd776b1001243dddd1baa;hp=311226dacd6ec85504e562bc30bab73bf1697e63;hpb=ee517e303eef7ec2ba6ca39dc73252b539bce0da;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 311226da..f17f77b1 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 @@ -101,7 +101,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; } @@ -190,8 +192,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); @@ -260,7 +264,6 @@ public class NewTransactionModel extends ViewModel { if (Misc.emptyIsNull(transactionComment) != null) head.setComment(transactionComment); - Item.resetIdDispenser(); List newItems = new ArrayList<>(); newItems.add(head); @@ -302,6 +305,7 @@ public class NewTransactionModel extends ViewModel { newItems.add(accRow); } + renumberItems(newItems); Misc.onMainThread(() -> replaceItems(newItems)); }); }