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=0ee99136eaa0d51579677b296e4a55e42a397b85;hpb=0fb03702b44e99bef2a5674d96f025595aed4274;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 0ee99136..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,17 +18,19 @@ 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; import android.text.method.DigitsKeyListener; +import android.view.Gravity; import android.view.View; import android.view.ViewGroup; 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; @@ -39,6 +41,7 @@ import androidx.recyclerview.widget.RecyclerView; import net.ktnx.mobileledger.R; import net.ktnx.mobileledger.async.DescriptionSelectedCallback; +import net.ktnx.mobileledger.model.Currency; import net.ktnx.mobileledger.model.Data; import net.ktnx.mobileledger.model.LedgerTransactionAccount; import net.ktnx.mobileledger.model.MobileLedgerProfile; @@ -46,10 +49,13 @@ import net.ktnx.mobileledger.ui.CurrencySelectorFragment; import net.ktnx.mobileledger.ui.DatePickerFragment; import net.ktnx.mobileledger.ui.TextViewClearHelper; import net.ktnx.mobileledger.utils.Colors; +import net.ktnx.mobileledger.utils.DimensionUtils; 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; @@ -62,13 +68,14 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder implements DatePickerFragment.DatePickedListener, DescriptionSelectedCallback { private final String decimalSeparator; private final String decimalDot; + private final TextView tvCurrency; 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; @@ -79,12 +86,17 @@ 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; + //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); @@ -92,11 +104,14 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder new TextViewClearHelper().attachToTextView((EditText) tvComment); commentButton = itemView.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); tvDescription.setNextFocusForwardId(View.NO_ID); tvAccount.setNextFocusForwardId(View.NO_ID); @@ -104,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; @@ -131,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, @@ -171,18 +201,19 @@ 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"); } }; final TextWatcher amountWatcher = new TextWatcher() { @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) { + Logger.debug("num", + String.format(Locale.US, "beforeTextChanged: start=%d, count=%d, after=%d", + start, count, after)); } @Override - public void onTextChanged(CharSequence s, int start, int before, int 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) { @@ -190,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); @@ -207,8 +239,17 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder tvComment.addTextChangedListener(tw); tvAmount.addTextChangedListener(amountWatcher); + tvCurrency.setOnClickListener(v -> { + CurrencySelectorFragment cpf = new CurrencySelectorFragment(); + cpf.showPositionAndPadding(); + cpf.setOnCurrencySelectedListener(c -> item.setCurrency(c)); + final AppCompatActivity activity = (AppCompatActivity) v.getContext(); + cpf.show(activity.getSupportFragmentManager(), "currency-selector"); + }); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) - tvAmount.setKeyListener(DigitsKeyListener.getInstance(Locale.getDefault(), true, true)); + tvAmount.setKeyListener( + DigitsKeyListener.getInstance(Data.locale.getValue(), true, true)); else tvAmount.setKeyListener( DigitsKeyListener.getInstance("0123456789+-" + decimalSeparator + decimalDot)); @@ -250,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()) { @@ -273,6 +312,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder tvAmount.requestFocus(); break; case Comment: + tvComment.setVisibility(View.VISIBLE); tvComment.requestFocus(); break; case Account: @@ -319,6 +359,97 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) tvAmount.setKeyListener(DigitsKeyListener.getInstance(locale, true, true)); }; + + currencyObserver = currency -> { + setCurrency(currency); + adapter.checkTransactionSubmittable(); + }; + + 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); + } + }; + + 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 = + (ConstraintLayout.LayoutParams) tvAmount.getLayoutParams(); + ConstraintLayout.LayoutParams currencyLP = + (ConstraintLayout.LayoutParams) tvCurrency.getLayoutParams(); + + if (position == Currency.Position.before) { + currencyLP.startToStart = ConstraintLayout.LayoutParams.PARENT_ID; + currencyLP.endToEnd = ConstraintLayout.LayoutParams.UNSET; + + amountLP.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID; + amountLP.endToStart = ConstraintLayout.LayoutParams.UNSET; + amountLP.startToStart = ConstraintLayout.LayoutParams.UNSET; + amountLP.startToEnd = tvCurrency.getId(); + + tvCurrency.setGravity(Gravity.END); + } + else { + currencyLP.startToStart = ConstraintLayout.LayoutParams.UNSET; + currencyLP.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID; + + amountLP.startToStart = ConstraintLayout.LayoutParams.PARENT_ID; + amountLP.startToEnd = ConstraintLayout.LayoutParams.UNSET; + amountLP.endToEnd = ConstraintLayout.LayoutParams.UNSET; + amountLP.endToStart = tvCurrency.getId(); + + tvCurrency.setGravity(Gravity.START); + } + + amountLP.resolveLayoutDirection(tvAmount.getLayoutDirection()); + currencyLP.resolveLayoutDirection(tvCurrency.getLayoutDirection()); + + tvAmount.setLayoutParams(amountLP); + tvCurrency.setLayoutParams(currencyLP); + + // distance between the amount and the currency symbol + int gapSize = DimensionUtils.sp2px(tvCurrency.getContext(), 5); + + if (position == Currency.Position.before) { + tvCurrency.setPaddingRelative(0, 0, hasGap ? gapSize : 0, 0); + } + else { + tvCurrency.setPaddingRelative(hasGap ? gapSize : 0, 0, 0, 0); + } + } + private void setCurrencyString(String currency) { + if ((currency == null) || currency.isEmpty()) { + tvCurrency.setText(R.string.currency_symbol); + tvCurrency.setTextColor(0x7f000000 + (0x00ffffff & Colors.defaultTextColor)); + } + else { + tvCurrency.setText(currency); + tvCurrency.setTextColor(Colors.defaultTextColor); + } + } + private void setCurrency(Currency currency) { + setCurrencyString((currency == null) ? null : currency.getName()); } private void setEditable(Boolean editable) { tvDate.setEnabled(editable); @@ -326,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); @@ -338,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"); @@ -367,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; @@ -391,12 +518,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); } else { try { @@ -409,12 +536,22 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder "input was '%s'", amount)); account.resetAmount(); } + final String curr = String.valueOf(tvCurrency.getText()); + if (curr.equals(tvCurrency.getContext() + .getResources() + .getString(R.string.currency_symbol)) || + curr.isEmpty()) + account.setCurrency(null); + else + account.setCurrency(curr); } break; case bottomFiller: throw new RuntimeException("Should not happen"); } + + return true; } finally { syncingData = false; @@ -441,13 +578,17 @@ 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() .stopObservingAccountCount(accountCountObserver); + Data.currencySymbolPosition.removeObserver(currencyPositionObserver); + 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().stopObservingBusyFlag(busyFlagObserver); this.item = null; } @@ -473,6 +614,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder // tvAmount.setHint(R.string.zero_amount); } tvAmount.setHint(item.getAmountHint()); + setCurrencyString(acc.getCurrency()); lHead.setVisibility(View.GONE); lAccount.setVisibility(View.VISIBLE); lPadding.setVisibility(View.GONE); @@ -485,22 +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.locale.observe(activity, localeObserver); + + 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 {