X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionItemHolder.java;h=3e6cab36328f7079e569f4efaad78de619de16aa;hb=ee3c0ffdb714b35759198466f955e2333fdd8c8b;hp=b63ce8e9adeab74c7fcc1a5c814e1983ec3babfd;hpb=cc37874c011bd23ec4fd34c4423a89ceea2d6509;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 b63ce8e9..3e6cab36 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 @@ -30,7 +30,6 @@ import android.view.inputmethod.EditorInfo; import android.widget.AutoCompleteTextView; import android.widget.EditText; import android.widget.FrameLayout; -import android.widget.ProgressBar; import android.widget.TextView; import androidx.annotation.NonNull; @@ -54,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; @@ -69,6 +66,8 @@ 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; @@ -82,6 +81,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder private Date date; private Observer dateObserver; private Observer descriptionObserver; + private Observer transactionCommentObserver; private Observer hintObserver; private Observer focusedAccountObserver; private Observer accountCountObserver; @@ -92,26 +92,27 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder private Observer currencyObserver; private Observer showCurrencyObserver; private Observer commentObserver; - private Observer busyFlagObserver; 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); - tvAccount = itemView.findViewById(R.id.account_row_acc_name); - tvComment = itemView.findViewById(R.id.comment); + lAccount = itemView.findViewById(R.id.ntr_account); + tvAccount = lAccount.findViewById(R.id.account_row_acc_name); + tvComment = lAccount.findViewById(R.id.comment); + tvTransactionComment = itemView.findViewById(R.id.transaction_comment); new TextViewClearHelper().attachToTextView((EditText) tvComment); - commentButton = itemView.findViewById(R.id.comment_button); + 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); 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); + 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); @@ -119,10 +120,15 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder tvDate.setOnClickListener(v -> pickTransactionDate()); - itemView.findViewById(R.id.comment_button) + commentButton.setOnClickListener(v -> { + tvComment.setVisibility(View.VISIBLE); + tvComment.requestFocus(); + }); + + transactionCommentLayout.findViewById(R.id.comment_button) .setOnClickListener(v -> { - tvComment.setVisibility(View.VISIBLE); - tvComment.requestFocus(); + tvTransactionComment.setVisibility(View.VISIBLE); + tvTransactionComment.requestFocus(); }); mProfile = Data.profile.getValue(); @@ -147,6 +153,12 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder case R.id.comment: adapter.noteFocusIsOnComment(pos); break; + case R.id.transaction_comment: + adapter.noteFocusIsOnTransactionComment(pos); + break; + case R.id.new_transaction_description: + adapter.noteFocusIsOnDescription(pos); + break; } } finally { @@ -155,15 +167,10 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder } 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); + commentFocusChanged(commentLayout, tvComment, hasFocus); + } + else if (id == R.id.transaction_comment) { + commentFocusChanged(transactionCommentLayout, tvTransactionComment, hasFocus); } }; @@ -171,6 +178,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder tvAccount.setOnFocusChangeListener(focusMonitor); tvAmount.setOnFocusChangeListener(focusMonitor); tvComment.setOnFocusChangeListener(focusMonitor); + tvTransactionComment.setOnFocusChangeListener(focusMonitor); MLDB.hookAutocompletionAdapter(tvDescription.getContext(), tvDescription, MLDB.DESCRIPTION_HISTORY_TABLE, "description", false, adapter, mProfile); @@ -235,6 +243,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder } }; tvDescription.addTextChangedListener(tw); + tvTransactionComment.addTextChangedListener(tw); tvAccount.addTextChangedListener(tw); tvComment.addTextChangedListener(tw); tvAmount.addTextChangedListener(amountWatcher); @@ -276,6 +285,15 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder syncingData = false; } }; + transactionCommentObserver = transactionComment -> { + 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); + + }; hintObserver = hint -> { if (syncingData) return; @@ -292,40 +310,47 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder }; editableObserver = this::setEditable; focusedAccountObserver = index -> { - if ((index != null) && index.equals(getAdapterPosition())) { - switch (item.getType()) { - case generalData: - // bad idea - double pop-up, and not really necessary. - // the user can tap the input to get the calendar - //if (!tvDate.hasFocus()) tvDate.requestFocus(); - boolean focused = tvDescription.requestFocus(); - tvDescription.dismissDropDown(); - if (focused) - Misc.showSoftKeyboard( - (NewTransactionActivity) tvDescription.getContext()); - break; - case transactionRow: - // do nothing if a row element already has the focus - if (!itemView.hasFocus()) { - 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; - } - } + if ((index == null) || !index.equals(getAdapterPosition()) || itemView.hasFocus()) + return; - break; - } + switch (item.getType()) { + case generalData: + // bad idea - double pop-up, and not really necessary. + // the user can tap the input to get the calendar + //if (!tvDate.hasFocus()) tvDate.requestFocus(); + switch (item.getFocusedElement()) { + case TransactionComment: + tvTransactionComment.setVisibility(View.VISIBLE); + tvTransactionComment.requestFocus(); + break; + case Description: + boolean focused = tvDescription.requestFocus(); + tvDescription.dismissDropDown(); + if (focused) + Misc.showSoftKeyboard( + (NewTransactionActivity) tvDescription.getContext()); + break; + } + break; + case transactionRow: + switch (item.getFocusedElement()) { + case Amount: + tvAmount.requestFocus(); + break; + case Comment: + tvComment.setVisibility(View.VISIBLE); + tvComment.requestFocus(); + break; + case Account: + boolean focused = tvAccount.requestFocus(); + tvAccount.dismissDropDown(); + if (focused) + Misc.showSoftKeyboard( + (NewTransactionActivity) tvAccount.getContext()); + break; + } + + break; } }; accountCountObserver = count -> { @@ -390,7 +415,54 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder : View.VISIBLE); }; - busyFlagObserver = isBusy -> {p.setVisibility(isBusy ? View.VISIBLE : View.INVISIBLE);}; + 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) { + accountParams.endToStart = ConstraintLayout.LayoutParams.UNSET; + accountParams.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID; + + amountLayoutParams.topToTop = ConstraintLayout.LayoutParams.UNSET; + amountLayoutParams.topToBottom = tvAccount.getId(); + + commentLayout.setVisibility(View.VISIBLE); + } + else { + accountParams.endToStart = amountLayout.getId(); + accountParams.endToEnd = ConstraintLayout.LayoutParams.UNSET; + + amountLayoutParams.topToBottom = ConstraintLayout.LayoutParams.UNSET; + amountLayoutParams.topToTop = ConstraintLayout.LayoutParams.PARENT_ID; + + commentLayout.setVisibility(View.GONE); + } + + tvAccount.setLayoutParams(accountParams); + amountLayout.setLayoutParams(amountLayoutParams); + + transactionCommentLayout.setVisibility(show ? View.VISIBLE : View.GONE); + }; + } + private void commentFocusChanged(View layout, TextView textView, boolean hasFocus) { + int textColor; + if (hasFocus) { + textColor = Colors.defaultTextColor; + textView.setTypeface(null, Typeface.NORMAL); + textView.setHint(R.string.transaction_account_comment_hint); + } + else { + textColor = Colors.defaultTextColorDisabled; + textView.setTypeface(null, Typeface.ITALIC); + textView.setHint(""); + if (Misc.isEmptyOrNull(textView.getText())) { + textView.setVisibility(View.INVISIBLE); + } + } + textView.setTextColor(textColor); + } private void updateCurrencyPositionAndPadding(Currency.Position position, boolean hasGap) { ConstraintLayout.LayoutParams amountLP = @@ -456,27 +528,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 beginUpdates() { if (inUpdate) throw new RuntimeException("Already in update mode"); @@ -510,6 +561,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder case generalData: item.setDate(String.valueOf(tvDate.getText())); item.setDescription(String.valueOf(tvDescription.getText())); + item.setTransactionComment(String.valueOf(tvTransactionComment.getText())); break; case transactionRow: final LedgerTransactionAccount account = item.getAccount(); @@ -575,6 +627,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder if (this.item != null && !this.item.equals(item)) { this.item.stopObservingDate(dateObserver); this.item.stopObservingDescription(descriptionObserver); + this.item.stopObservingTransactionComment(transactionCommentObserver); this.item.stopObservingAmountHint(hintObserver); this.item.stopObservingEditableFlag(editableObserver); this.item.getModel() @@ -587,7 +640,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder this.item.stopObservingCurrency(currencyObserver); this.item.getModel().showCurrency.removeObserver(showCurrencyObserver); this.item.stopObservingComment(commentObserver); - this.item.getModel().stopObservingBusyFlag(busyFlagObserver); + this.item.getModel().showComments.removeObserver(showCommentsObserver); this.item = null; } @@ -596,6 +649,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder case generalData: tvDate.setText(item.getFormattedDate()); tvDescription.setText(item.getDescription()); + tvTransactionComment.setText(item.getTransactionComment()); lHead.setVisibility(View.VISIBLE); lAccount.setVisibility(View.GONE); lPadding.setVisibility(View.GONE); @@ -635,12 +689,14 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder item.observeEditableFlag(activity, editableObserver); item.getModel() .observeFocusedItem(activity, focusedAccountObserver); + item.getModel() + .observeShowComments(activity, showCommentsObserver); } switch (item.getType()) { case generalData: item.observeDate(activity, dateObserver); item.observeDescription(activity, descriptionObserver); - item.getModel().observeBusyFlag(activity, busyFlagObserver); + item.observeTransactionComment(activity, transactionCommentObserver); break; case transactionRow: item.observeAmountHint(activity, hintObserver);