X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionItemHolder.java;h=d92a4c69d542aaef4496ac002d4de7b6a80aed9e;hb=7b3937e47b0b270651ad3083e467bfaaf62e9dc8;hp=f1dc196a55c05f184fbe7264175454a906595a8d;hpb=ecf124ad38636e859b568f2392a13c7aeb7a0e65;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 f1dc196a..d92a4c69 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,6 @@ 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; @@ -53,8 +53,6 @@ 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; @@ -68,13 +66,15 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder private final String decimalSeparator; private final String decimalDot; private final TextView tvCurrency; + private final Observer showCommentsObserver; + private final TextView tvTransactionComment; private NewTransactionModel.Item item; private TextView tvDate; private AutoCompleteTextView tvDescription; 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 +85,12 @@ 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 boolean inUpdate = false; private boolean syncingData = false; private View commentButton; @@ -100,6 +99,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder super(itemView); tvAccount = itemView.findViewById(R.id.account_row_acc_name); tvComment = itemView.findViewById(R.id.comment); + tvTransactionComment = itemView.findViewById(R.id.transaction_comment); new TextViewClearHelper().attachToTextView((EditText) tvComment); commentButton = itemView.findViewById(R.id.comment_button); tvAmount = itemView.findViewById(R.id.account_row_acc_amounts); @@ -109,6 +109,9 @@ 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); + final View commentLayout = itemView.findViewById(R.id.comment_layout); + final View transactionCommentLayout = + itemView.findViewById(R.id.transaction_comment_layout); tvDescription.setNextFocusForwardId(View.NO_ID); tvAccount.setNextFocusForwardId(View.NO_ID); @@ -116,18 +119,30 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder tvDate.setOnClickListener(v -> pickTransactionDate()); + commentButton.setOnClickListener(v -> { + tvComment.setVisibility(View.VISIBLE); + tvComment.requestFocus(); + }); + + itemView.findViewById(R.id.transaction_comment_button) + .setOnClickListener(v -> { + tvTransactionComment.setVisibility(View.VISIBLE); + tvTransactionComment.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 +158,20 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder syncingData = wasSyncing; } } + + if (id == R.id.comment) { + commentFocusChanged(commentLayout, tvComment, hasFocus); + } + else if ( id == R.id.transaction_comment) { + commentFocusChanged(transactionCommentLayout, tvTransactionComment, hasFocus); + } }; 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, @@ -273,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()) { @@ -296,6 +312,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder tvAmount.requestFocus(); break; case Comment: + tvComment.setVisibility(View.VISIBLE); tvComment.requestFocus(); break; case Account: @@ -348,13 +365,12 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder adapter.checkTransactionSubmittable(); }; - currencyGapObserver = hasGap -> { - updateCurrencyPositionAndPadding(Data.currencySymbolPosition.getValue(), hasGap); - }; + currencyGapObserver = + hasGap -> updateCurrencyPositionAndPadding(Data.currencySymbolPosition.getValue(), + hasGap); - currencyPositionObserver = position -> { - updateCurrencyPositionAndPadding(position, Data.currencyGap.getValue()); - }; + currencyPositionObserver = + position -> updateCurrencyPositionAndPadding(position, Data.currencyGap.getValue()); showCurrencyObserver = showCurrency -> { if (showCurrency) { @@ -365,6 +381,58 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder 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); + }; + + showCommentsObserver = show -> { + final View amountLayout = itemView.findViewById(R.id.amount_layout); + ConstraintLayout.LayoutParams amountLayoutParams = + (ConstraintLayout.LayoutParams) amountLayout.getLayoutParams(); + ConstraintLayout.LayoutParams accountParams = + (ConstraintLayout.LayoutParams) tvAccount.getLayoutParams(); + if (show) { + commentLayout.setVisibility(View.VISIBLE); + + accountParams.endToStart = ConstraintLayout.LayoutParams.UNSET; + accountParams.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID; + + amountLayoutParams.topToTop = ConstraintLayout.LayoutParams.UNSET; + amountLayoutParams.topToBottom = tvAccount.getId(); + } + else { + commentLayout.setVisibility(View.GONE); + + accountParams.endToStart = amountLayout.getId(); + accountParams.endToEnd = ConstraintLayout.LayoutParams.UNSET; + + amountLayoutParams.topToBottom = ConstraintLayout.LayoutParams.UNSET; + amountLayoutParams.topToTop = ConstraintLayout.LayoutParams.PARENT_ID; + + } + + tvAccount.setLayoutParams(accountParams); + amountLayout.setLayoutParams(amountLayoutParams); + + transactionCommentLayout.setVisibility(show ? View.VISIBLE : View.GONE); + }; + } + private void commentFocusChanged(View layout, TextView textView, boolean hasFocus) { + layout.setAlpha(hasFocus ? 1f : 0.5f); + textView.setTypeface(null, hasFocus ? Typeface.NORMAL : Typeface.ITALIC); + if (hasFocus) + textView.setHint(R.string.transaction_account_comment_hint); + else + textView.setHint(""); + + if (!hasFocus && Misc.isEmptyOrNull(textView.getText())) + textView.setVisibility(View.INVISIBLE); } private void updateCurrencyPositionAndPadding(Currency.Position position, boolean hasGap) { ConstraintLayout.LayoutParams amountLP = @@ -430,33 +498,6 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder tvAccount.setEnabled(editable); tvAmount.setEnabled(editable); } - private void setCommentVisible(@NotNull 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 view and align the comment bottom to the amount - tvComment.setVisibility(View.GONE); - ConstraintLayout.LayoutParams lp = - (ConstraintLayout.LayoutParams) commentButton.getLayoutParams(); - 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"); @@ -557,8 +598,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() @@ -568,6 +607,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().showComments.removeObserver(showCommentsObserver); this.item = null; } @@ -615,6 +656,8 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder item.observeEditableFlag(activity, editableObserver); item.getModel() .observeFocusedItem(activity, focusedAccountObserver); + item.getModel() + .observeShowComments(activity, showCommentsObserver); } switch (item.getType()) { case generalData: @@ -623,13 +666,12 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder break; case transactionRow: item.observeAmountHint(activity, hintObserver); - item.observeCommentVisible(activity, commentVisibleObserver); - item.observeComment(activity, commentObserver); 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;