import android.text.TextWatcher;
import android.text.method.DigitsKeyListener;
import android.view.View;
+import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo;
import android.widget.AutoCompleteTextView;
+import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.lifecycle.Observer;
import androidx.recyclerview.widget.RecyclerView;
import net.ktnx.mobileledger.model.Data;
import net.ktnx.mobileledger.model.LedgerTransactionAccount;
import net.ktnx.mobileledger.model.MobileLedgerProfile;
-import net.ktnx.mobileledger.ui.AutoCompleteTextViewWithClear;
+import net.ktnx.mobileledger.ui.CurrencySelectorFragment;
import net.ktnx.mobileledger.ui.DatePickerFragment;
+import net.ktnx.mobileledger.ui.TextViewClearHelper;
+import net.ktnx.mobileledger.utils.Colors;
import net.ktnx.mobileledger.utils.Logger;
import net.ktnx.mobileledger.utils.MLDB;
import net.ktnx.mobileledger.utils.Misc;
import java.util.GregorianCalendar;
import java.util.Locale;
+import static net.ktnx.mobileledger.ui.activity.NewTransactionModel.ItemType;
+
class NewTransactionItemHolder extends RecyclerView.ViewHolder
implements DatePickerFragment.DatePickedListener, DescriptionSelectedCallback {
private final String decimalSeparator;
private TextView tvDate;
private AutoCompleteTextView tvDescription;
private AutoCompleteTextView tvAccount;
- private TextView tvAmount;
+ private TextView tvComment;
+ private EditText tvAmount;
private LinearLayout lHead;
- private LinearLayout lAccount;
+ private ViewGroup lAccount;
private FrameLayout lPadding;
private MobileLedgerProfile mProfile;
private Date date;
private Observer<Integer> focusedAccountObserver;
private Observer<Integer> accountCountObserver;
private Observer<Boolean> editableObserver;
+ private Observer<Boolean> commentVisibleObserver;
+ private Observer<String> commentObserver;
+ private Observer<Locale> localeObserver;
private boolean inUpdate = false;
private boolean syncingData = false;
+ private View commentButton;
NewTransactionItemHolder(@NonNull View itemView, NewTransactionItemsAdapter adapter) {
super(itemView);
tvAccount = itemView.findViewById(R.id.account_row_acc_name);
+ tvComment = itemView.findViewById(R.id.comment);
+ new TextViewClearHelper().attachToTextView((EditText) tvComment);
+ commentButton = itemView.findViewById(R.id.comment_button);
tvAmount = itemView.findViewById(R.id.account_row_acc_amounts);
tvDate = itemView.findViewById(R.id.new_transaction_date);
tvDescription = itemView.findViewById(R.id.new_transaction_description);
try {
final int pos = getAdapterPosition();
adapter.updateFocusedItem(pos);
- if (v instanceof AutoCompleteTextViewWithClear) {
- adapter.noteFocusIsOnAccount(pos);
- }
- else {
- adapter.noteFocusIsOnAmount(pos);
+ switch (v.getId()) {
+ 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;
}
}
finally {
tvAccount.setOnFocusChangeListener(focusMonitor);
tvAmount.setOnFocusChangeListener(focusMonitor);
+ itemView.findViewById(R.id.comment_button)
+ .setOnClickListener(v -> {
+ final int pos = getAdapterPosition();
+ adapter.toggleComment(pos);
+ });
MLDB.hookAutocompletionAdapter(tvDescription.getContext(), tvDescription,
MLDB.DESCRIPTION_HISTORY_TABLE, "description", false, adapter, mProfile);
MLDB.hookAutocompletionAdapter(tvAccount.getContext(), tvAccount, MLDB.ACCOUNTS_TABLE,
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
// only one decimal separator is allowed
// plus and minus are allowed only at the beginning
+ String allowed = "0123456789";
String val = s.toString();
- if (val.isEmpty())
- tvAmount.setKeyListener(DigitsKeyListener.getInstance(
- "0123456789+-" + decimalSeparator + decimalDot));
- else if (val.contains(decimalSeparator) || val.contains(decimalDot))
- tvAmount.setKeyListener(DigitsKeyListener.getInstance("0123456789"));
- else
- tvAmount.setKeyListener(DigitsKeyListener.getInstance(
- "0123456789" + decimalSeparator + decimalDot));
+ if (val.isEmpty() || (tvAmount.getSelectionStart() == 0))
+ allowed += "-";
+ if (!val.contains(decimalSeparator) && !val.contains(decimalDot))
+ allowed += decimalSeparator + decimalDot;
+
+ tvAmount.setKeyListener(DigitsKeyListener.getInstance(allowed));
syncData();
adapter.model.checkTransactionSubmittable(adapter);
};
tvDescription.addTextChangedListener(tw);
tvAccount.addTextChangedListener(tw);
+ tvComment.addTextChangedListener(tw);
tvAmount.addTextChangedListener(amountWatcher);
- // FIXME: react on locale changes
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
tvAmount.setKeyListener(DigitsKeyListener.getInstance(Locale.getDefault(), true, true));
else
}
};
editableObserver = this::setEditable;
+ commentVisibleObserver = this::setCommentVisible;
+ commentObserver = this::setComment;
focusedAccountObserver = index -> {
if ((index != null) && index.equals(getAdapterPosition())) {
switch (item.getType()) {
case transactionRow:
// do nothing if a row element already has the focus
if (!itemView.hasFocus()) {
- if (item.focusIsOnAmount()) {
- tvAmount.requestFocus();
- }
- else {
- focused = tvAccount.requestFocus();
- tvAccount.dismissDropDown();
- if (focused)
- Misc.showSoftKeyboard((NewTransactionActivity) tvAccount.getContext());
+ switch (item.getFocusedElement()) {
+ case Amount:
+ tvAmount.requestFocus();
+ break;
+ case Comment:
+ tvComment.requestFocus();
+ break;
+ case Account:
+ focused = tvAccount.requestFocus();
+ tvAccount.dismissDropDown();
+ if (focused)
+ Misc.showSoftKeyboard(
+ (NewTransactionActivity) tvAccount.getContext());
+ break;
}
}
adapterPosition, layoutPosition, item.getType()
.toString()
.concat(item.getType() ==
- NewTransactionModel.ItemType.transactionRow
+ ItemType.transactionRow
? String.format(Locale.US,
"'%s'=%s",
item.getAccount()
else
tvAmount.setImeOptions(EditorInfo.IME_ACTION_NEXT);
};
+
+ localeObserver = locale -> {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+ tvAmount.setKeyListener(DigitsKeyListener.getInstance(locale, true, true));
+ };
}
private void setEditable(Boolean editable) {
tvDate.setEnabled(editable);
tvAccount.setEnabled(editable);
tvAmount.setEnabled(editable);
}
+ private void setCommentVisible(Boolean visible) {
+ if (visible) {
+ // showing; show the comment view and align the comment button to it
+ tvComment.setVisibility(View.VISIBLE);
+ tvComment.requestFocus();
+ ConstraintLayout.LayoutParams lp =
+ (ConstraintLayout.LayoutParams) commentButton.getLayoutParams();
+ lp.bottomToBottom = R.id.comment;
+
+ commentButton.setLayoutParams(lp);
+ }
+ else {
+ // hiding; hide the comment comment view and align amounts layout under it
+ tvComment.setVisibility(View.GONE);
+ ConstraintLayout.LayoutParams lp =
+ (ConstraintLayout.LayoutParams) commentButton.getLayoutParams();
+ lp.bottomToBottom = R.id.ntr_account; // R.id.parent doesn't work here
+
+ commentButton.setLayoutParams(lp);
+ }
+ }
+ private void setComment(String comment) {
+ if ((comment != null) && !comment.isEmpty())
+ commentButton.setBackgroundResource(R.drawable.ic_comment_black_24dp);
+ else
+ commentButton.setBackgroundResource(R.drawable.ic_comment_gray_24dp);
+ }
private void beginUpdates() {
if (inUpdate)
throw new RuntimeException("Already in update mode");
item.setDescription(String.valueOf(tvDescription.getText()));
break;
case transactionRow:
- item.getAccount()
- .setAccountName(String.valueOf(tvAccount.getText()));
+ final LedgerTransactionAccount account = item.getAccount();
+ account.setAccountName(String.valueOf(tvAccount.getText()));
+
+ item.setComment(String.valueOf(tvComment.getText()));
// TODO: handle multiple amounts
String amount = String.valueOf(tvAmount.getText());
amount = amount.trim();
if (amount.isEmpty()) {
- item.getAccount()
- .resetAmount();
+ account.resetAmount();
}
else {
try {
amount = amount.replace(decimalSeparator, decimalDot);
- item.getAccount()
- .setAmount(Float.parseFloat(amount));
+ account.setAmount(Float.parseFloat(amount));
}
catch (NumberFormatException e) {
Logger.debug("new-trans", String.format(
"assuming amount is not set due to number format exception. " +
"input was '%s'", amount));
- item.getAccount()
- .resetAmount();
+ account.resetAmount();
}
}
}
private void pickTransactionDate() {
DatePickerFragment picker = new DatePickerFragment();
+ picker.setFutureDates(mProfile.getFutureDates());
picker.setOnDatePickedListener(this);
picker.show(((NewTransactionActivity) tvDate.getContext()).getSupportFragmentManager(),
"datePicker");
this.item.stopObservingDescription(descriptionObserver);
this.item.stopObservingAmountHint(hintObserver);
this.item.stopObservingEditableFlag(editableObserver);
+ this.item.stopObservingCommentVisible(commentVisibleObserver);
+ this.item.stopObservingComment(commentObserver);
this.item.getModel()
.stopObservingFocusedItem(focusedAccountObserver);
this.item.getModel()
.stopObservingAccountCount(accountCountObserver);
+ Data.locale.removeObserver(localeObserver);
this.item = null;
}
case transactionRow:
LedgerTransactionAccount acc = item.getAccount();
tvAccount.setText(acc.getAccountName());
+ tvComment.setText(acc.getComment());
if (acc.isAmountSet()) {
tvAmount.setText(String.format("%1.2f", acc.getAmount()));
}
item.observeDescription(activity, descriptionObserver);
item.observeAmountHint(activity, hintObserver);
item.observeEditableFlag(activity, editableObserver);
+ item.observeCommentVisible(activity, commentVisibleObserver);
+ item.observeComment(activity, commentObserver);
item.getModel()
.observeFocusedItem(activity, focusedAccountObserver);
item.getModel()
.observeAccountCount(activity, accountCountObserver);
+ Data.locale.observe(activity, localeObserver);
}
}
finally {