X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionItemHolder.java;h=504ec0adc0811477726869e4c2810ffaefec7da0;hb=5f09bee380291c06a5fee1bb55049a1b09cf4e3c;hp=507055ff0eda9eac0dcc9e74d824a06c3db2d8cd;hpb=7cb9091315c4adf9bb278995469c0bb401c33939;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 507055ff..504ec0ad 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 @@ -23,14 +23,17 @@ import android.text.Editable; import android.text.TextWatcher; import android.text.method.DigitsKeyListener; 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.widget.LinearLayoutCompat; +import androidx.appcompat.app.AppCompatActivity; +import androidx.constraintlayout.widget.ConstraintLayout; import androidx.lifecycle.Observer; import androidx.recyclerview.widget.RecyclerView; @@ -39,7 +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.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; @@ -50,6 +56,8 @@ import java.util.Date; import java.util.GregorianCalendar; import java.util.Locale; +import static net.ktnx.mobileledger.ui.activity.NewTransactionModel.ItemType; + class NewTransactionItemHolder extends RecyclerView.ViewHolder implements DatePickerFragment.DatePickedListener, DescriptionSelectedCallback { private final String decimalSeparator; @@ -58,9 +66,10 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder private TextView tvDate; private AutoCompleteTextView tvDescription; private AutoCompleteTextView tvAccount; + private TextView tvComment; private TextView tvAmount; - private LinearLayoutCompat lHead; - private LinearLayout lAccount; + private LinearLayout lHead; + private ViewGroup lAccount; private FrameLayout lPadding; private MobileLedgerProfile mProfile; private Date date; @@ -70,11 +79,17 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder private Observer focusedAccountObserver; private Observer accountCountObserver; private Observer editableObserver; + private Observer commentVisibleObserver; + private Observer commentObserver; 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); @@ -97,7 +112,19 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder boolean wasSyncing = syncingData; syncingData = true; try { - adapter.updateFocusedItem(getAdapterPosition()); + final int pos = getAdapterPosition(); + adapter.updateFocusedItem(pos); + switch (v.getId()) { + case R.id.account_row_acc_name: + adapter.noteFocusIsOnAccount(pos); + break; + case R.id.account_row_acc_amounts: + adapter.noteFocusIsOnAmount(pos); + break; + case R.id.comment: + adapter.noteFocusIsOnComment(pos); + break; + } } finally { syncingData = wasSyncing; @@ -109,6 +136,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,6 +204,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder }; tvDescription.addTextChangedListener(tw); tvAccount.addTextChangedListener(tw); + tvComment.addTextChangedListener(tw); tvAmount.addTextChangedListener(amountWatcher); // FIXME: react on locale changes @@ -218,6 +251,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()) { @@ -234,10 +269,21 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder case transactionRow: // do nothing if a row element already has the focus if (!itemView.hasFocus()) { - focused = tvAccount.requestFocus(); - tvAccount.dismissDropDown(); - if (focused) - Misc.showSoftKeyboard((NewTransactionActivity) tvAccount.getContext()); + 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; + } } break; @@ -252,7 +298,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder adapterPosition, layoutPosition, item.getType() .toString() .concat(item.getType() == - NewTransactionModel.ItemType.transactionRow + ItemType.transactionRow ? String.format(Locale.US, "'%s'=%s", item.getAccount() @@ -276,6 +322,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"); @@ -309,29 +382,28 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder item.setDescription(String.valueOf(tvDescription.getText())); break; case transactionRow: - item.getAccount() - .setAccountName(String.valueOf(tvAccount.getText())); + final LedgerTransactionAccount account = item.getAccount(); + account.setAccountName(String.valueOf(tvAccount.getText())); + + item.setComment(String.valueOf(tvComment.getText())); // TODO: handle multiple amounts String amount = String.valueOf(tvAmount.getText()); amount = amount.trim(); if (amount.isEmpty()) { - item.getAccount() - .resetAmount(); + account.resetAmount(); } else { try { amount = amount.replace(decimalSeparator, decimalDot); - item.getAccount() - .setAmount(Float.parseFloat(amount)); + account.setAmount(Float.parseFloat(amount)); } catch (NumberFormatException e) { Logger.debug("new-trans", String.format( "assuming amount is not set due to number format exception. " + "input was '%s'", amount)); - item.getAccount() - .resetAmount(); + account.resetAmount(); } } @@ -346,6 +418,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder } private void pickTransactionDate() { DatePickerFragment picker = new DatePickerFragment(); + picker.setFutureDates(mProfile.getFutureDates()); picker.setOnDatePickedListener(this); picker.show(((NewTransactionActivity) tvDate.getContext()).getSupportFragmentManager(), "datePicker"); @@ -364,6 +437,8 @@ 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() @@ -384,6 +459,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder case transactionRow: LedgerTransactionAccount acc = item.getAccount(); tvAccount.setText(acc.getAccountName()); + tvComment.setText(acc.getComment()); if (acc.isAmountSet()) { tvAmount.setText(String.format("%1.2f", acc.getAmount())); } @@ -413,6 +489,8 @@ 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()