X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionItemHolder.java;h=62f0de49677df85c70b58890907bb084994713b7;hb=667ce42731c95a98926657fea359b56209f9348e;hp=a3dd711d9ebe1ad7102bbb933b567e21e4991600;hpb=a1f5cf187a6bc2731aa1ed057d3d11fccc5de2c4;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 a3dd711d..62f0de49 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 © 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 @@ -19,10 +19,9 @@ package net.ktnx.mobileledger.ui.activity; 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; @@ -32,6 +31,7 @@ import android.widget.EditText; 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; @@ -47,55 +47,54 @@ import net.ktnx.mobileledger.model.MobileLedgerProfile; 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 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 dateObserver; + private final Observer descriptionObserver; + private final Observer transactionCommentObserver; + private final Observer hintObserver; + private final Observer focusedAccountObserver; + private final Observer accountCountObserver; + private final Observer editableObserver; + private final Observer currencyPositionObserver; + private final Observer currencyGapObserver; + private final Observer localeObserver; + private final Observer currencyObserver; + private final Observer showCurrencyObserver; + private final Observer commentObserver; + private final Observer 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 dateObserver; - private Observer descriptionObserver; - private Observer transactionCommentObserver; - private Observer hintObserver; - private Observer focusedAccountObserver; - private Observer accountCountObserver; - private Observer editableObserver; - private Observer currencyPositionObserver; - private Observer currencyGapObserver; - private Observer localeObserver; - private Observer currencyObserver; - private Observer showCurrencyObserver; - private Observer commentObserver; - private Observer 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); @@ -104,11 +103,11 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder 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); @@ -121,10 +120,11 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder 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 -> { @@ -132,9 +132,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder 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(); @@ -168,10 +166,10 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder } 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); } }; @@ -186,9 +184,12 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder 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() { @@ -244,13 +245,6 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder 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; @@ -277,9 +271,9 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder 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 -> { @@ -297,6 +291,8 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder } }; editableObserver = this::setEditable; + commentFocusChanged(tvTransactionComment, false); + commentFocusChanged(tvComment, false); focusedAccountObserver = index -> { if ((index == null) || !index.equals(getAdapterPosition()) || itemView.hasFocus()) return; @@ -367,11 +363,6 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder 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(); @@ -399,8 +390,8 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder 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 -> { @@ -440,18 +431,21 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder 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); } } @@ -504,13 +498,17 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder } } 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) { @@ -600,6 +598,9 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder return true; } + catch (ParseException e) { + throw new RuntimeException("Should not happen", e); + } finally { syncingData = false; } @@ -608,8 +609,9 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder DatePickerFragment picker = new DatePickerFragment(); picker.setFutureDates(mProfile.getFutureDates()); picker.setOnDatePickedListener(this); + picker.setCurrentDateFromText(tvDate.getText()); picker.show(((NewTransactionActivity) tvDate.getContext()).getSupportFragmentManager(), - "datePicker"); + null); } /** * setData @@ -682,7 +684,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder final NewTransactionActivity activity = (NewTransactionActivity) tvDescription.getContext(); - if (!item.isOfType(ItemType.bottomFiller)) { + if (!item.isBottomFiller()) { item.observeEditableFlag(activity, editableObserver); item.getModel() .observeFocusedItem(activity, focusedAccountObserver); @@ -716,9 +718,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder } @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());