X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionItemHolder.java;h=efb7b52256871d7714a297cdad08b8d92f6f2dcb;hb=a34236c6b6a3931c5da03da9664ef1811c740433;hp=91d45031bd373e0f788be3813606cd7df47457c3;hpb=3229d2d25ab4310f211dfb834cf531077585ae2e;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 91d45031..efb7b522 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; @@ -46,7 +46,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; @@ -63,18 +62,19 @@ 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; + 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,29 +85,33 @@ 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; //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); + 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); @@ -115,18 +119,30 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder tvDate.setOnClickListener(v -> pickTransactionDate()); + commentButton.setOnClickListener(v -> { + tvComment.setVisibility(View.VISIBLE); + tvComment.requestFocus(); + }); + + transactionCommentLayout.findViewById(R.id.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; @@ -142,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, @@ -182,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"); } }; @@ -194,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) { @@ -206,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); @@ -225,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"); }); @@ -274,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()) { @@ -297,6 +312,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder tvAmount.requestFocus(); break; case Comment: + tvComment.setVisibility(View.VISIBLE); tvComment.requestFocus(); break; case Account: @@ -339,20 +355,90 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder tvAmount.setImeOptions(EditorInfo.IME_ACTION_NEXT); }; - currencyPositionObserver = position -> { - updateCurrencyPositionAndPadding(position, Data.currencyGap.getValue()); + localeObserver = locale -> { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) + tvAmount.setKeyListener(DigitsKeyListener.getInstance(locale, true, true)); }; - currencyGapObserver = hasGap -> { - updateCurrencyPositionAndPadding(Data.currencySymbolPosition.getValue(), hasGap); + currencyObserver = currency -> { + setCurrency(currency); + adapter.checkTransactionSubmittable(); }; - localeObserver = locale -> { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) - tvAmount.setKeyListener(DigitsKeyListener.getInstance(locale, true, true)); + currencyGapObserver = + hasGap -> updateCurrencyPositionAndPadding(Data.currencySymbolPosition.getValue(), + hasGap); + + currencyPositionObserver = + position -> updateCurrencyPositionAndPadding(position, Data.currencyGap.getValue()); + + showCurrencyObserver = showCurrency -> { + if (showCurrency) { + tvCurrency.setVisibility(View.VISIBLE); + } + else { + tvCurrency.setVisibility(View.GONE); + item.setCurrency(null); + } }; - currencyObserver = this::setCurrency; + 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) { + 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 = @@ -418,33 +504,6 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder tvAccount.setEnabled(editable); tvAmount.setEnabled(editable); } - private void setCommentVisible(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 comment view and align amounts layout under it - tvComment.setVisibility(View.GONE); - ConstraintLayout.LayoutParams lp = - (ConstraintLayout.LayoutParams) commentButton.getLayoutParams(); - lp.bottomToBottom = R.id.ntr_account; // 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"); @@ -459,14 +518,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; @@ -483,13 +544,12 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder item.setComment(String.valueOf(tvComment.getText())); - // TODO: handle multiple amounts String amount = String.valueOf(tvAmount.getText()); amount = amount.trim(); if (amount.isEmpty()) { account.resetAmount(); - account.setCurrency(null); +// account.setCurrency(null); } else { try { @@ -516,6 +576,8 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder case bottomFiller: throw new RuntimeException("Should not happen"); } + + return true; } finally { syncingData = false; @@ -542,8 +604,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() @@ -552,6 +612,9 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder Data.currencyGap.removeObserver(currencyGapObserver); 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; } @@ -590,25 +653,35 @@ 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); + + if (!item.isOfType(ItemType.bottomFiller)) { + 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); + 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 { @@ -626,10 +699,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);