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;
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;
private AutoCompleteTextView tvDescription;
private AutoCompleteTextView tvAccount;
private TextView tvComment;
- private TextView tvAmount;
+ private EditText tvAmount;
private LinearLayout lHead;
private ViewGroup lAccount;
private FrameLayout lPadding;
private Observer<Integer> focusedAccountObserver;
private Observer<Integer> accountCountObserver;
private Observer<Boolean> editableObserver;
+ private Observer<Boolean> commentVisibleObserver;
+ private Observer<String> 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);
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,
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);
}
};
editableObserver = this::setEditable;
+ commentVisibleObserver = this::setCommentVisible;
+ commentObserver = this::setComment;
focusedAccountObserver = index -> {
if ((index != null) && index.equals(getAdapterPosition())) {
switch (item.getType()) {
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");
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());
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()
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()