X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fnew_transaction%2FNewTransactionFragment.java;h=140b3a74e0512d68e39159366af8817cbec3fe85;hb=ea6e0ebc968bb3a3b7fb913d9e0282d374957815;hp=9a2226f3acb5c776af9f2a99a4738bbd26b9871b;hpb=da6d2e9c50bef3d38a957f91004b21d43d0732e3;p=mobile-ledger-staging.git diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionFragment.java index 9a2226f3..140b3a74 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionFragment.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionFragment.java @@ -56,7 +56,7 @@ import net.ktnx.mobileledger.model.Data; import net.ktnx.mobileledger.model.LedgerTransaction; import net.ktnx.mobileledger.model.LedgerTransactionAccount; import net.ktnx.mobileledger.model.MobileLedgerProfile; -import net.ktnx.mobileledger.ui.QRScanAbleFragment; +import net.ktnx.mobileledger.ui.QRScanCapableFragment; import net.ktnx.mobileledger.ui.patterns.PatternsActivity; import net.ktnx.mobileledger.utils.Logger; import net.ktnx.mobileledger.utils.Misc; @@ -79,7 +79,7 @@ import java.util.regex.Pattern; // TODO: offer to undo account remove-on-swipe -public class NewTransactionFragment extends QRScanAbleFragment { +public class NewTransactionFragment extends QRScanCapableFragment { private NewTransactionItemsAdapter listAdapter; private NewTransactionModel viewModel; private FloatingActionButton fab; @@ -262,6 +262,8 @@ public class NewTransactionFragment extends QRScanAbleFragment { acc.getAccountComment()); Float amount = extractFloatFromMatches(m, acc.getAmountMatchGroup(), acc.getAmount()); + if (amount != null && acc.getNegateAmount() != null && acc.getNegateAmount()) + amount = -amount; if (accountsInInitialState) { NewTransactionModel.Item item = viewModel.getItem(rowIndex);