X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionItemHolder.java;fp=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionItemHolder.java;h=b2dd24dac890eef4b68bf3a0be189caf2b977c7b;hb=e974cb05e7234d603543847c251886a4e2898709;hp=13481f1ee9621feca9c6df718536a5c43c2dc8c0;hpb=af420b00f44fdc306439e05567cfc64d38b5ece9;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 13481f1e..b2dd24da 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 @@ -1,5 +1,5 @@ /* - * Copyright © 2020 Damyan Ivanov. + * Copyright © 2021 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 @@ -90,6 +90,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder private final Observer showCurrencyObserver; private final Observer commentObserver; private final Observer amountValidityObserver; + private final View tvCurrencyButton; private String decimalSeparator; private NewTransactionModel.Item item; private Date date; @@ -105,6 +106,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder new TextViewClearHelper().attachToTextView((EditText) tvComment); tvAmount = itemView.findViewById(R.id.account_row_acc_amounts); tvCurrency = itemView.findViewById(R.id.currency); + tvCurrencyButton = lAccount.findViewById(R.id.currencyButton); tvDate = itemView.findViewById(R.id.new_transaction_date); tvDescription = itemView.findViewById(R.id.new_transaction_description); tvDummy = itemView.findViewById(R.id.dummy_text); @@ -237,7 +239,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder tvComment.addTextChangedListener(tw); tvAmount.addTextChangedListener(amountWatcher); - tvCurrency.setOnClickListener(v -> { + tvCurrencyButton.setOnClickListener(v -> { CurrencySelectorFragment cpf = new CurrencySelectorFragment(); cpf.showPositionAndPadding(); cpf.setOnCurrencySelectedListener(c -> item.setCurrency(c)); @@ -378,12 +380,14 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder showCurrencyObserver = showCurrency -> { if (showCurrency) { tvCurrency.setVisibility(View.VISIBLE); + tvCurrencyButton.setVisibility(View.VISIBLE); String defaultCommodity = mProfile.getDefaultCommodity(); item.setCurrency( (defaultCommodity == null) ? null : Currency.loadByName(defaultCommodity)); } else { tvCurrency.setVisibility(View.GONE); + tvCurrencyButton.setVisibility(View.GONE); item.setCurrency(null); } };