/*
- * 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
private final Observer<Boolean> showCurrencyObserver;
private final Observer<String> commentObserver;
private final Observer<Boolean> amountValidityObserver;
+ private final View tvCurrencyButton;
private String decimalSeparator;
private NewTransactionModel.Item item;
private Date date;
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);
try {
final int pos = getAdapterPosition();
adapter.updateFocusedItem(pos);
- switch (id) {
- case R.id.account_row_acc_name:
- adapter.noteFocusIsOnAccount(pos);
- break;
- case R.id.account_row_acc_amounts:
- adapter.noteFocusIsOnAmount(pos);
- break;
- case R.id.comment:
- adapter.noteFocusIsOnComment(pos);
- break;
- case R.id.transaction_comment:
- adapter.noteFocusIsOnTransactionComment(pos);
- break;
- case R.id.new_transaction_description:
- adapter.noteFocusIsOnDescription(pos);
- break;
+ if (id == R.id.account_row_acc_name) {
+ adapter.noteFocusIsOnAccount(pos);
+ }
+ else if (id == R.id.account_row_acc_amounts) {
+ adapter.noteFocusIsOnAmount(pos);
+ }
+ else if (id == R.id.comment) {
+ adapter.noteFocusIsOnComment(pos);
+ }
+ else if (id == R.id.transaction_comment) {
+ adapter.noteFocusIsOnTransactionComment(pos);
+ }
+ else if (id == R.id.new_transaction_description) {
+ adapter.noteFocusIsOnDescription(pos);
}
}
finally {
tvComment.addTextChangedListener(tw);
tvAmount.addTextChangedListener(amountWatcher);
- tvCurrency.setOnClickListener(v -> {
+ tvCurrencyButton.setOnClickListener(v -> {
CurrencySelectorFragment cpf = new CurrencySelectorFragment();
cpf.showPositionAndPadding();
cpf.setOnCurrencySelectedListener(c -> item.setCurrency(c));
break;
case Description:
boolean focused = tvDescription.requestFocus();
- tvDescription.dismissDropDown();
+// tvDescription.dismissDropDown();
if (focused)
Misc.showSoftKeyboard(
(NewTransactionActivity) tvDescription.getContext());
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);
}
};