X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionItemHolder.java;h=0ee99136eaa0d51579677b296e4a55e42a397b85;hb=0fb03702b44e99bef2a5674d96f025595aed4274;hp=6988fe4f4ba4b0b17e0584d4e9491f03a1807fd9;hpb=7ae5407090d9ffe2026775ba9e569014f879b54d;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 6988fe4f..0ee99136 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 @@ -26,11 +26,14 @@ 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.TextView; import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.constraintlayout.widget.ConstraintLayout; import androidx.lifecycle.Observer; import androidx.recyclerview.widget.RecyclerView; @@ -39,8 +42,10 @@ import net.ktnx.mobileledger.async.DescriptionSelectedCallback; import net.ktnx.mobileledger.model.Data; import net.ktnx.mobileledger.model.LedgerTransactionAccount; import net.ktnx.mobileledger.model.MobileLedgerProfile; -import net.ktnx.mobileledger.ui.AutoCompleteTextViewWithClear; +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.Logger; import net.ktnx.mobileledger.utils.MLDB; import net.ktnx.mobileledger.utils.Misc; @@ -62,7 +67,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder private AutoCompleteTextView tvDescription; private AutoCompleteTextView tvAccount; private TextView tvComment; - private TextView tvAmount; + private EditText tvAmount; private LinearLayout lHead; private ViewGroup lAccount; private FrameLayout lPadding; @@ -74,12 +79,18 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder private Observer focusedAccountObserver; private Observer accountCountObserver; private Observer editableObserver; + private Observer commentVisibleObserver; + private Observer commentObserver; + private Observer localeObserver; private boolean inUpdate = false; private boolean syncingData = false; + private View commentButton; NewTransactionItemHolder(@NonNull View itemView, NewTransactionItemsAdapter adapter) { super(itemView); tvAccount = itemView.findViewById(R.id.account_row_acc_name); tvComment = itemView.findViewById(R.id.comment); + new TextViewClearHelper().attachToTextView((EditText) tvComment); + commentButton = itemView.findViewById(R.id.comment_button); tvAmount = itemView.findViewById(R.id.account_row_acc_amounts); tvDate = itemView.findViewById(R.id.new_transaction_date); tvDescription = itemView.findViewById(R.id.new_transaction_description); @@ -126,6 +137,11 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder tvAccount.setOnFocusChangeListener(focusMonitor); tvAmount.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, @@ -172,15 +188,14 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { // only one decimal separator is allowed // plus and minus are allowed only at the beginning + String allowed = "0123456789"; String val = s.toString(); - if (val.isEmpty()) - tvAmount.setKeyListener(DigitsKeyListener.getInstance( - "0123456789+-" + decimalSeparator + decimalDot)); - else if (val.contains(decimalSeparator) || val.contains(decimalDot)) - tvAmount.setKeyListener(DigitsKeyListener.getInstance("0123456789")); - else - tvAmount.setKeyListener(DigitsKeyListener.getInstance( - "0123456789" + decimalSeparator + decimalDot)); + 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); @@ -192,7 +207,6 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder tvComment.addTextChangedListener(tw); tvAmount.addTextChangedListener(amountWatcher); - // FIXME: react on locale changes if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) tvAmount.setKeyListener(DigitsKeyListener.getInstance(Locale.getDefault(), true, true)); else @@ -236,6 +250,8 @@ 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()) { @@ -298,6 +314,11 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder else tvAmount.setImeOptions(EditorInfo.IME_ACTION_NEXT); }; + + localeObserver = locale -> { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) + tvAmount.setKeyListener(DigitsKeyListener.getInstance(locale, true, true)); + }; } private void setEditable(Boolean editable) { tvDate.setEnabled(editable); @@ -305,6 +326,33 @@ 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"); @@ -341,7 +389,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder final LedgerTransactionAccount account = item.getAccount(); account.setAccountName(String.valueOf(tvAccount.getText())); - account.setComment(String.valueOf(tvComment.getText())); + item.setComment(String.valueOf(tvComment.getText())); // TODO: handle multiple amounts String amount = String.valueOf(tvAmount.getText()); @@ -393,10 +441,13 @@ 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.locale.removeObserver(localeObserver); this.item = null; } @@ -443,10 +494,13 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder 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); } } finally {