From 356b7a4d11096b57996b0aaca854a8ef63d77670 Mon Sep 17 00:00:00 2001 From: Damyan Ivanov Date: Wed, 13 May 2020 21:39:36 +0300 Subject: [PATCH] handle transaction comment UI changes --- .../ui/activity/NewTransactionItemHolder.java | 96 ++++++++++++------- .../activity/NewTransactionItemsAdapter.java | 6 ++ .../ui/activity/NewTransactionModel.java | 23 ++++- 3 files changed, 90 insertions(+), 35 deletions(-) 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 efb7b522..84d744b5 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 @@ -81,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; @@ -152,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 { @@ -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,41 +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.setVisibility(View.VISIBLE); - 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 -> { @@ -537,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(); @@ -602,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() @@ -623,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); @@ -669,6 +696,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder case generalData: item.observeDate(activity, dateObserver); item.observeDescription(activity, descriptionObserver); + item.observeTransactionComment(activity, transactionCommentObserver); break; case transactionRow: item.observeAmountHint(activity, hintObserver); diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemsAdapter.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemsAdapter.java index df58e539..5caa38a5 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemsAdapter.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemsAdapter.java @@ -371,6 +371,12 @@ class NewTransactionItemsAdapter extends RecyclerView.Adapter isSubmittable() { return this.isSubmittable; } void reset() { header.date.setValue(null); header.description.setValue(null); + header.comment.setValue(null); items.clear(); items.add(new Item(this, new LedgerTransactionAccount(""))); items.add(new Item(this, new LedgerTransactionAccount(""))); @@ -216,7 +220,7 @@ public class NewTransactionModel extends ViewModel { } enum ItemType {generalData, transactionRow, bottomFiller} - enum FocusedElement {Account, Comment, Amount} + enum FocusedElement {Account, Comment, Amount, Description, TransactionComment} //========================================================================================== @@ -386,6 +390,23 @@ public class NewTransactionModel extends ViewModel { @NonNull androidx.lifecycle.Observer observer) { this.description.removeObserver(observer); } + public String getTransactionComment() { + ensureType(ItemType.generalData); + return comment.getValue(); + } + public void setTransactionComment(String transactionComment) { + ensureType(ItemType.generalData); + this.comment.setValue(transactionComment); + } + void observeTransactionComment(@NonNull @NotNull LifecycleOwner owner, + @NonNull Observer observer) { + ensureType(ItemType.generalData); + this.comment.observe(owner, observer); + } + void stopObservingTransactionComment(@NonNull Observer observer) { + ensureType(ItemType.generalData); + this.comment.removeObserver(observer); + } public LedgerTransactionAccount getAccount() { ensureType(ItemType.transactionRow); return account; -- 2.39.5