X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionItemHolder.java;h=221e60f873a9e0cc901eb1e5d2996d9e55ad8a4d;hb=97fbfe069a9eeb18728fe9604add248606419e1e;hp=53e97e826c0092cb23ec1eb4136b69a6944bdcd5;hpb=ee38e21aa7318a51f9f3e62788d920e13b7be620;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 53e97e82..221e60f8 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 @@ -18,6 +18,7 @@ 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.TextWatcher; @@ -29,7 +30,7 @@ import android.view.inputmethod.EditorInfo; import android.widget.AutoCompleteTextView; import android.widget.EditText; import android.widget.FrameLayout; -import android.widget.LinearLayout; +import android.widget.ProgressBar; import android.widget.TextView; import androidx.annotation.NonNull; @@ -46,7 +47,6 @@ import net.ktnx.mobileledger.model.LedgerTransactionAccount; import net.ktnx.mobileledger.model.MobileLedgerProfile; import net.ktnx.mobileledger.ui.CurrencySelectorFragment; import net.ktnx.mobileledger.ui.DatePickerFragment; -import net.ktnx.mobileledger.ui.OnCurrencySelectedListener; import net.ktnx.mobileledger.ui.TextViewClearHelper; import net.ktnx.mobileledger.utils.Colors; import net.ktnx.mobileledger.utils.DimensionUtils; @@ -54,6 +54,8 @@ import net.ktnx.mobileledger.utils.Logger; import net.ktnx.mobileledger.utils.MLDB; import net.ktnx.mobileledger.utils.Misc; +import org.jetbrains.annotations.NotNull; + import java.text.DecimalFormatSymbols; import java.util.Calendar; import java.util.Date; @@ -63,8 +65,7 @@ import java.util.Locale; import static net.ktnx.mobileledger.ui.activity.NewTransactionModel.ItemType; class NewTransactionItemHolder extends RecyclerView.ViewHolder - implements DatePickerFragment.DatePickedListener, DescriptionSelectedCallback, - OnCurrencySelectedListener { + implements DatePickerFragment.DatePickedListener, DescriptionSelectedCallback { private final String decimalSeparator; private final String decimalDot; private final TextView tvCurrency; @@ -74,7 +75,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder private AutoCompleteTextView tvAccount; private TextView tvComment; private EditText tvAmount; - private LinearLayout lHead; + private ViewGroup lHead; private ViewGroup lAccount; private FrameLayout lPadding; private MobileLedgerProfile mProfile; @@ -85,13 +86,13 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder private Observer focusedAccountObserver; private Observer accountCountObserver; private Observer editableObserver; - private Observer commentVisibleObserver; - private Observer commentObserver; private Observer currencyPositionObserver; private Observer currencyGapObserver; private Observer localeObserver; private Observer currencyObserver; private Observer showCurrencyObserver; + private Observer commentObserver; + private Observer busyFlagObserver; private boolean inUpdate = false; private boolean syncingData = false; private View commentButton; @@ -109,6 +110,8 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder lHead = itemView.findViewById(R.id.ntr_data); lAccount = itemView.findViewById(R.id.ntr_account); lPadding = itemView.findViewById(R.id.ntr_padding); + View commentLayout = itemView.findViewById(R.id.comment_layout); + ProgressBar p = itemView.findViewById(R.id.progressBar); tvDescription.setNextFocusForwardId(View.NO_ID); tvAccount.setNextFocusForwardId(View.NO_ID); @@ -116,18 +119,25 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder tvDate.setOnClickListener(v -> pickTransactionDate()); + itemView.findViewById(R.id.comment_button) + .setOnClickListener(v -> { + tvComment.setVisibility(View.VISIBLE); + tvComment.requestFocus(); + }); + mProfile = Data.profile.getValue(); if (mProfile == null) throw new AssertionError(); View.OnFocusChangeListener focusMonitor = (v, hasFocus) -> { + final int id = v.getId(); if (hasFocus) { boolean wasSyncing = syncingData; syncingData = true; try { final int pos = getAdapterPosition(); adapter.updateFocusedItem(pos); - switch (v.getId()) { + switch (id) { case R.id.account_row_acc_name: adapter.noteFocusIsOnAccount(pos); break; @@ -143,17 +153,25 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder syncingData = wasSyncing; } } + + if (id == R.id.comment) { + commentLayout.setAlpha(hasFocus ? 1f : 0.5f); + tvComment.setTypeface(null, hasFocus ? Typeface.NORMAL : Typeface.ITALIC); + if (hasFocus) + tvComment.setHint(R.string.transaction_account_comment_hint); + else + tvComment.setHint(""); + + if (!hasFocus && Misc.isEmptyOrNull(tvComment.getText())) + tvComment.setVisibility(View.INVISIBLE); + } }; tvDescription.setOnFocusChangeListener(focusMonitor); tvAccount.setOnFocusChangeListener(focusMonitor); tvAmount.setOnFocusChangeListener(focusMonitor); + tvComment.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, @@ -183,7 +201,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder syncData(); Logger.debug("textWatcher", "syncData() returned, checking if transaction is submittable"); - adapter.model.checkTransactionSubmittable(adapter); + adapter.checkTransactionSubmittable(); Logger.debug("textWatcher", "done"); } }; @@ -195,11 +213,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder start, count, after)); } @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - Logger.debug("num", - String.format(Locale.US, "onTextChanged: start=%d, before=%d, count=%d", - start, before, count)); - } + public void onTextChanged(CharSequence s, int start, int before, int count) {} @Override public void afterTextChanged(Editable s) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { @@ -207,16 +221,17 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder // plus and minus are allowed only at the beginning String allowed = "0123456789"; String val = s.toString(); + Logger.debug("input", val); 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); } + + if (syncData()) + adapter.checkTransactionSubmittable(); } }; tvDescription.addTextChangedListener(tw); @@ -226,7 +241,8 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder tvCurrency.setOnClickListener(v -> { CurrencySelectorFragment cpf = new CurrencySelectorFragment(); - cpf.setOnCurrencySelectedListener(this); + cpf.showPositionAndPadding(); + cpf.setOnCurrencySelectedListener(c -> item.setCurrency(c)); final AppCompatActivity activity = (AppCompatActivity) v.getContext(); cpf.show(activity.getSupportFragmentManager(), "currency-selector"); }); @@ -275,8 +291,6 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder } }; editableObserver = this::setEditable; - commentVisibleObserver = this::setCommentVisible; - commentObserver = this::setComment; focusedAccountObserver = index -> { if ((index != null) && index.equals(getAdapterPosition())) { switch (item.getType()) { @@ -298,6 +312,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder tvAmount.requestFocus(); break; case Comment: + tvComment.setVisibility(View.VISIBLE); tvComment.requestFocus(); break; case Account: @@ -340,14 +355,6 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder tvAmount.setImeOptions(EditorInfo.IME_ACTION_NEXT); }; - currencyPositionObserver = position -> { - updateCurrencyPositionAndPadding(position, Data.currencyGap.getValue()); - }; - - currencyGapObserver = hasGap -> { - updateCurrencyPositionAndPadding(Data.currencySymbolPosition.getValue(), hasGap); - }; - localeObserver = locale -> { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) tvAmount.setKeyListener(DigitsKeyListener.getInstance(locale, true, true)); @@ -355,20 +362,36 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder currencyObserver = currency -> { setCurrency(currency); - adapter.model.checkTransactionSubmittable(adapter); + adapter.checkTransactionSubmittable(); }; + currencyGapObserver = + hasGap -> updateCurrencyPositionAndPadding(Data.currencySymbolPosition.getValue(), + hasGap); + + currencyPositionObserver = + position -> updateCurrencyPositionAndPadding(position, Data.currencyGap.getValue()); + showCurrencyObserver = showCurrency -> { - if (item.getType() == ItemType.transactionRow) { - if (showCurrency) { - tvCurrency.setVisibility(View.VISIBLE); - } - else { - tvCurrency.setVisibility(View.GONE); - item.setCurrency(null); - } + if (showCurrency) { + tvCurrency.setVisibility(View.VISIBLE); + } + else { + tvCurrency.setVisibility(View.GONE); + item.setCurrency(null); } }; + + commentObserver = comment -> { + final View focusedView = tvComment.findFocus(); + tvComment.setTypeface(null, + (focusedView == tvComment) ? Typeface.NORMAL : Typeface.ITALIC); + tvComment.setVisibility( + ((focusedView != tvComment) && Misc.isEmptyOrNull(comment)) ? View.INVISIBLE + : View.VISIBLE); + }; + + busyFlagObserver = isBusy -> {p.setVisibility(isBusy ? View.VISIBLE : View.INVISIBLE);}; } private void updateCurrencyPositionAndPadding(Currency.Position position, boolean hasGap) { ConstraintLayout.LayoutParams amountLP = @@ -434,7 +457,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder tvAccount.setEnabled(editable); tvAmount.setEnabled(editable); } - private void setCommentVisible(Boolean visible) { + private void setCommentVisible(@NotNull Boolean visible) { if (visible) { // showing; show the comment view and align the comment button to it tvComment.setVisibility(View.VISIBLE); @@ -446,21 +469,15 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder commentButton.setLayoutParams(lp); } else { - // hiding; hide the comment comment view and align amounts layout under it + // hiding; hide the comment view and align the comment bottom to the amount tvComment.setVisibility(View.GONE); ConstraintLayout.LayoutParams lp = (ConstraintLayout.LayoutParams) commentButton.getLayoutParams(); - lp.bottomToBottom = R.id.ntr_account; // R.id.parent doesn't work here + lp.bottomToBottom = R.id.amount_layout; // 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"); @@ -475,14 +492,16 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder * syncData() *

* Stores the data from the UI elements into the model item + * Returns true if there were changes made that suggest transaction has to be + * checked for being submittable */ - private void syncData() { + private boolean syncData() { if (item == null) - return; + return false; if (syncingData) { Logger.debug("new-trans", "skipping syncData() loop"); - return; + return false; } syncingData = true; @@ -499,7 +518,6 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder item.setComment(String.valueOf(tvComment.getText())); - // TODO: handle multiple amounts String amount = String.valueOf(tvAmount.getText()); amount = amount.trim(); @@ -532,6 +550,8 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder case bottomFiller: throw new RuntimeException("Should not happen"); } + + return true; } finally { syncingData = false; @@ -558,8 +578,6 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder 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() @@ -569,6 +587,8 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder Data.locale.removeObserver(localeObserver); this.item.stopObservingCurrency(currencyObserver); this.item.getModel().showCurrency.removeObserver(showCurrencyObserver); + this.item.stopObservingComment(commentObserver); + this.item.getModel().stopObservingBusyFlag(busyFlagObserver); this.item = null; } @@ -607,26 +627,34 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder setEditable(false); break; } - if (this.item == null) { // was null or has changed this.item = item; final NewTransactionActivity activity = (NewTransactionActivity) tvDescription.getContext(); - item.observeDate(activity, dateObserver); - 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.currencySymbolPosition.observe(activity, currencyPositionObserver); - Data.currencyGap.observe(activity, currencyGapObserver); - Data.locale.observe(activity, localeObserver); - item.observeCurrency(activity, currencyObserver); - item.getModel().showCurrency.observe(activity, showCurrencyObserver); + + if (!item.isOfType(ItemType.bottomFiller)) { + item.observeEditableFlag(activity, editableObserver); + item.getModel() + .observeFocusedItem(activity, focusedAccountObserver); + } + switch (item.getType()) { + case generalData: + item.observeDate(activity, dateObserver); + item.observeDescription(activity, descriptionObserver); + item.getModel().observeBusyFlag(activity, busyFlagObserver); + break; + case transactionRow: + item.observeAmountHint(activity, hintObserver); + Data.currencySymbolPosition.observe(activity, currencyPositionObserver); + Data.currencyGap.observe(activity, currencyGapObserver); + Data.locale.observe(activity, localeObserver); + item.observeCurrency(activity, currencyObserver); + item.getModel().showCurrency.observe(activity, showCurrencyObserver); + item.observeComment(activity, commentObserver); + item.getModel() + .observeAccountCount(activity, accountCountObserver); + break; + } } } finally { @@ -644,10 +672,6 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder } @Override - public void onCurrencySelected(Currency item) { - this.item.setCurrency(item); - } - @Override public void descriptionSelected(String description) { tvAccount.setText(description); tvAmount.requestFocus(View.FOCUS_FORWARD);