X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionItemHolder.java;h=37506c049dfcda096039d644fdde908c43d8ef24;hb=5dd947c640d975082c5aa05328fa75bc6ac852fb;hp=6f410924081ef85e41f21e7073f51382d795f6da;hpb=5545ddea3574103c2a7eea552fff0d43a0587fac;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemHolder.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemHolder.java index 6f410924..37506c04 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemHolder.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemHolder.java @@ -91,6 +91,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder private Observer currencyGapObserver; private Observer localeObserver; private Observer currencyObserver; + private Observer showCurrencyObserver; private boolean inUpdate = false; private boolean syncingData = false; private View commentButton; @@ -231,7 +232,8 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder }); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) - tvAmount.setKeyListener(DigitsKeyListener.getInstance(Locale.getDefault(), true, true)); + tvAmount.setKeyListener( + DigitsKeyListener.getInstance(Data.locale.getValue(), true, true)); else tvAmount.setKeyListener( DigitsKeyListener.getInstance("0123456789+-" + decimalSeparator + decimalDot)); @@ -352,6 +354,18 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder }; currencyObserver = this::setCurrency; + + showCurrencyObserver = showCurrency -> { + if (item.getType() == ItemType.transactionRow) { + if (showCurrency) { + tvCurrency.setVisibility(View.VISIBLE); + } + else { + tvCurrency.setVisibility(View.GONE); + item.setCurrency(null); + } + } + }; } private void updateCurrencyPositionAndPadding(Currency.Position position, boolean hasGap) { ConstraintLayout.LayoutParams amountLP = @@ -551,6 +565,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder Data.currencyGap.removeObserver(currencyGapObserver); Data.locale.removeObserver(localeObserver); this.item.stopObservingCurrency(currencyObserver); + this.item.getModel().showCurrency.removeObserver(showCurrencyObserver); this.item = null; } @@ -608,6 +623,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder Data.currencyGap.observe(activity, currencyGapObserver); Data.locale.observe(activity, localeObserver); item.observeCurrency(activity, currencyObserver); + item.getModel().showCurrency.observe(activity, showCurrencyObserver); } } finally {