/*
- * Copyright © 2019 Damyan Ivanov.
+ * Copyright © 2020 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
import android.annotation.SuppressLint;
import android.graphics.Typeface;
-import android.os.Build;
import android.text.Editable;
+import android.text.TextUtils;
import android.text.TextWatcher;
-import android.text.method.DigitsKeyListener;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.TextView;
+import androidx.annotation.ColorInt;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.constraintlayout.widget.ConstraintLayout;
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.DimensionUtils;
import net.ktnx.mobileledger.utils.Logger;
import net.ktnx.mobileledger.utils.MLDB;
import net.ktnx.mobileledger.utils.Misc;
+import net.ktnx.mobileledger.utils.SimpleDate;
import java.text.DecimalFormatSymbols;
-import java.util.Calendar;
+import java.text.ParseException;
import java.util.Date;
-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 final String decimalDot;
private final TextView tvCurrency;
private final Observer<Boolean> showCommentsObserver;
private final TextView tvTransactionComment;
+ private final TextView tvDate;
+ private final AutoCompleteTextView tvDescription;
+ private final TextView tvDummy;
+ private final AutoCompleteTextView tvAccount;
+ private final TextView tvComment;
+ private final EditText tvAmount;
+ private final ViewGroup lHead;
+ private final ViewGroup lAccount;
+ private final FrameLayout lPadding;
+ private final MobileLedgerProfile mProfile;
+ private final Observer<SimpleDate> dateObserver;
+ private final Observer<String> descriptionObserver;
+ private final Observer<String> transactionCommentObserver;
+ private final Observer<String> hintObserver;
+ private final Observer<Integer> focusedAccountObserver;
+ private final Observer<Integer> accountCountObserver;
+ private final Observer<Boolean> editableObserver;
+ private final Observer<Currency.Position> currencyPositionObserver;
+ private final Observer<Boolean> currencyGapObserver;
+ private final Observer<Locale> localeObserver;
+ private final Observer<Currency> currencyObserver;
+ private final Observer<Boolean> showCurrencyObserver;
+ private final Observer<String> commentObserver;
+ private final Observer<Boolean> amountValidityObserver;
+ private String decimalSeparator;
private NewTransactionModel.Item item;
- private TextView tvDate;
- private AutoCompleteTextView tvDescription;
- private AutoCompleteTextView tvAccount;
- private TextView tvComment;
- private EditText tvAmount;
- private ViewGroup lHead;
- private ViewGroup lAccount;
- private FrameLayout lPadding;
- private MobileLedgerProfile mProfile;
private Date date;
- private Observer<Date> dateObserver;
- private Observer<String> descriptionObserver;
- private Observer<String> transactionCommentObserver;
- private Observer<String> hintObserver;
- private Observer<Integer> focusedAccountObserver;
- private Observer<Integer> accountCountObserver;
- private Observer<Boolean> editableObserver;
- private Observer<Currency.Position> currencyPositionObserver;
- private Observer<Boolean> currencyGapObserver;
- private Observer<Locale> localeObserver;
- private Observer<Currency> currencyObserver;
- private Observer<Boolean> showCurrencyObserver;
- private Observer<String> commentObserver;
- private Observer<Boolean> amountValidityObserver;
private boolean inUpdate = false;
private boolean syncingData = false;
- private View commentButton;
//TODO multiple amounts with different currencies per posting
NewTransactionItemHolder(@NonNull View itemView, NewTransactionItemsAdapter adapter) {
super(itemView);
tvComment = lAccount.findViewById(R.id.comment);
tvTransactionComment = itemView.findViewById(R.id.transaction_comment);
new TextViewClearHelper().attachToTextView((EditText) tvComment);
- commentButton = lAccount.findViewById(R.id.comment_button);
tvAmount = itemView.findViewById(R.id.account_row_acc_amounts);
tvCurrency = itemView.findViewById(R.id.currency);
tvDate = itemView.findViewById(R.id.new_transaction_date);
tvDescription = itemView.findViewById(R.id.new_transaction_description);
+ tvDummy = itemView.findViewById(R.id.dummy_text);
lHead = itemView.findViewById(R.id.ntr_data);
lPadding = itemView.findViewById(R.id.ntr_padding);
final View commentLayout = itemView.findViewById(R.id.comment_layout);
tvDate.setOnClickListener(v -> pickTransactionDate());
- commentButton.setOnClickListener(v -> {
- tvComment.setVisibility(View.VISIBLE);
- tvComment.requestFocus();
- });
+ lAccount.findViewById(R.id.comment_button)
+ .setOnClickListener(v -> {
+ tvComment.setVisibility(View.VISIBLE);
+ tvComment.requestFocus();
+ });
transactionCommentLayout.findViewById(R.id.comment_button)
.setOnClickListener(v -> {
tvTransactionComment.requestFocus();
});
- mProfile = Data.profile.getValue();
- if (mProfile == null)
- throw new AssertionError();
+ mProfile = Data.getProfile();
View.OnFocusChangeListener focusMonitor = (v, hasFocus) -> {
final int id = v.getId();
}
if (id == R.id.comment) {
- commentFocusChanged(commentLayout, tvComment, hasFocus);
+ commentFocusChanged(tvComment, hasFocus);
}
else if (id == R.id.transaction_comment) {
- commentFocusChanged(transactionCommentLayout, tvTransactionComment, hasFocus);
+ commentFocusChanged(tvTransactionComment, hasFocus);
}
};
MLDB.hookAutocompletionAdapter(tvAccount.getContext(), tvAccount, MLDB.ACCOUNTS_TABLE,
"name", true, this, mProfile);
- // FIXME: react on configuration (locale) changes
decimalSeparator = String.valueOf(DecimalFormatSymbols.getInstance()
.getMonetaryDecimalSeparator());
+ localeObserver = locale -> decimalSeparator = String.valueOf(
+ DecimalFormatSymbols.getInstance(locale)
+ .getMonetaryDecimalSeparator());
+
decimalDot = ".";
final TextWatcher tw = new TextWatcher() {
cpf.show(activity.getSupportFragmentManager(), "currency-selector");
});
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
- tvAmount.setKeyListener(
- DigitsKeyListener.getInstance(Data.locale.getValue(), true, true));
- else
- tvAmount.setKeyListener(
- DigitsKeyListener.getInstance("0123456789+-" + decimalSeparator + decimalDot));
-
dateObserver = date -> {
if (syncingData)
return;
final View focusedView = tvTransactionComment.findFocus();
tvTransactionComment.setTypeface(null,
(focusedView == tvTransactionComment) ? Typeface.NORMAL : Typeface.ITALIC);
- tvTransactionComment.setVisibility(((focusedView != tvTransactionComment) &&
- Misc.isEmptyOrNull(transactionComment))
- ? View.INVISIBLE : View.VISIBLE);
+ tvTransactionComment.setVisibility(
+ ((focusedView != tvTransactionComment) && TextUtils.isEmpty(transactionComment))
+ ? View.INVISIBLE : View.VISIBLE);
};
hintObserver = hint -> {
}
};
editableObserver = this::setEditable;
+ commentFocusChanged(tvTransactionComment, false);
+ commentFocusChanged(tvComment, false);
focusedAccountObserver = index -> {
if ((index == null) || !index.equals(getAdapterPosition()) || itemView.hasFocus())
return;
tvAmount.setImeOptions(EditorInfo.IME_ACTION_NEXT);
};
- localeObserver = locale -> {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
- tvAmount.setKeyListener(DigitsKeyListener.getInstance(locale, true, true));
- };
-
currencyObserver = currency -> {
setCurrency(currency);
adapter.checkTransactionSubmittable();
tvComment.setTypeface(null,
(focusedView == tvComment) ? Typeface.NORMAL : Typeface.ITALIC);
tvComment.setVisibility(
- ((focusedView != tvComment) && Misc.isEmptyOrNull(comment)) ? View.INVISIBLE
- : View.VISIBLE);
+ ((focusedView != tvComment) && TextUtils.isEmpty(comment)) ? View.INVISIBLE
+ : View.VISIBLE);
};
showCommentsObserver = show -> {
tvAmount.setMinEms(valid ? 4 : 5);
};
}
- private void commentFocusChanged(View layout, TextView textView, boolean hasFocus) {
- int textColor;
+ private void commentFocusChanged(TextView textView, boolean hasFocus) {
+ @ColorInt int textColor;
+ textColor = tvDummy.getTextColors()
+ .getDefaultColor();
if (hasFocus) {
- textColor = Colors.defaultTextColor;
textView.setTypeface(null, Typeface.NORMAL);
textView.setHint(R.string.transaction_account_comment_hint);
}
else {
- textColor = Colors.defaultTextColorDisabled;
+ int alpha = (textColor >> 24 & 0xff);
+ alpha = 3 * alpha / 4;
+ textColor = (alpha << 24) | (0x00ffffff & textColor);
textView.setTypeface(null, Typeface.ITALIC);
textView.setHint("");
- if (Misc.isEmptyOrNull(textView.getText())) {
+ if (TextUtils.isEmpty(textView.getText())) {
textView.setVisibility(View.INVISIBLE);
}
}
}
}
private void setCurrencyString(String currency) {
+ @ColorInt int textColor = tvDummy.getTextColors()
+ .getDefaultColor();
if ((currency == null) || currency.isEmpty()) {
tvCurrency.setText(R.string.currency_symbol);
- tvCurrency.setTextColor(0x7f000000 + (0x00ffffff & Colors.defaultTextColor));
+ int alpha = (textColor >> 24) & 0xff;
+ alpha = alpha * 3 / 4;
+ tvCurrency.setTextColor((alpha << 24) | (0x00ffffff & textColor));
}
else {
tvCurrency.setText(currency);
- tvCurrency.setTextColor(Colors.defaultTextColor);
+ tvCurrency.setTextColor(textColor);
}
}
private void setCurrency(Currency currency) {
return true;
}
+ catch (ParseException e) {
+ throw new RuntimeException("Should not happen", e);
+ }
finally {
syncingData = false;
}
DatePickerFragment picker = new DatePickerFragment();
picker.setFutureDates(mProfile.getFutureDates());
picker.setOnDatePickedListener(this);
+ picker.setCurrentDateFromText(tvDate.getText());
picker.show(((NewTransactionActivity) tvDate.getContext()).getSupportFragmentManager(),
- "datePicker");
+ null);
}
/**
* setData
final NewTransactionActivity activity =
(NewTransactionActivity) tvDescription.getContext();
- if (!item.isOfType(ItemType.bottomFiller)) {
+ if (!item.isBottomFiller()) {
item.observeEditableFlag(activity, editableObserver);
item.getModel()
.observeFocusedItem(activity, focusedAccountObserver);
}
@Override
public void onDatePicked(int year, int month, int day) {
- final Calendar c = GregorianCalendar.getInstance();
- c.set(year, month, day);
- item.setDate(c.getTime());
+ item.setDate(new SimpleDate(year, month + 1, day));
boolean focused = tvDescription.requestFocus();
if (focused)
Misc.showSoftKeyboard((NewTransactionActivity) tvAccount.getContext());