/*
- * Copyright © 2019 Damyan Ivanov.
+ * Copyright © 2020 Damyan Ivanov.
* This file is part of MoLe.
* MoLe is free software: you can distribute it and/or modify it
* under the term of the GNU General Public License as published by
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 net.ktnx.mobileledger.utils.Logger;
import net.ktnx.mobileledger.utils.MLDB;
import net.ktnx.mobileledger.utils.Misc;
+import net.ktnx.mobileledger.utils.SimpleDate;
import java.text.DecimalFormatSymbols;
-import java.util.Calendar;
+import java.text.ParseException;
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;
private final String decimalDot;
private final TextView tvCurrency;
private final Observer<Boolean> showCommentsObserver;
private final TextView tvTransactionComment;
+ private String decimalSeparator;
private NewTransactionModel.Item item;
private TextView tvDate;
private AutoCompleteTextView tvDescription;
private FrameLayout lPadding;
private MobileLedgerProfile mProfile;
private Date date;
- private Observer<Date> dateObserver;
+ private Observer<SimpleDate> dateObserver;
private Observer<String> descriptionObserver;
private Observer<String> transactionCommentObserver;
private Observer<String> hintObserver;
private Observer<Currency> currencyObserver;
private Observer<Boolean> showCurrencyObserver;
private Observer<String> commentObserver;
+ private Observer<Boolean> amountValidityObserver;
private boolean inUpdate = false;
private boolean syncingData = false;
private View commentButton;
});
transactionCommentLayout.findViewById(R.id.comment_button)
- .setOnClickListener(v -> {
- tvTransactionComment.setVisibility(View.VISIBLE);
- tvTransactionComment.requestFocus();
- });
+ .setOnClickListener(v -> {
+ tvTransactionComment.setVisibility(View.VISIBLE);
+ tvTransactionComment.requestFocus();
+ });
mProfile = Data.profile.getValue();
if (mProfile == null)
MLDB.hookAutocompletionAdapter(tvAccount.getContext(), tvAccount, MLDB.ACCOUNTS_TABLE,
"name", true, this, mProfile);
- // FIXME: react on configuration (locale) changes
decimalSeparator = String.valueOf(DecimalFormatSymbols.getInstance()
.getMonetaryDecimalSeparator());
+ localeObserver = locale -> {
+ decimalSeparator = String.valueOf(DecimalFormatSymbols.getInstance(locale)
+ .getMonetaryDecimalSeparator());
+ };
+
decimalDot = ".";
final TextWatcher tw = new TextWatcher() {
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) {
- // only one decimal separator is allowed
- // 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));
- }
if (syncData())
adapter.checkTransactionSubmittable();
cpf.show(activity.getSupportFragmentManager(), "currency-selector");
});
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
- tvAmount.setKeyListener(
- DigitsKeyListener.getInstance(Data.locale.getValue(), true, true));
- else
- tvAmount.setKeyListener(
- DigitsKeyListener.getInstance("0123456789+-" + decimalSeparator + decimalDot));
-
dateObserver = date -> {
if (syncingData)
return;
tvAmount.setImeOptions(EditorInfo.IME_ACTION_NEXT);
};
- localeObserver = locale -> {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
- tvAmount.setKeyListener(DigitsKeyListener.getInstance(locale, true, true));
- };
-
currencyObserver = currency -> {
setCurrency(currency);
adapter.checkTransactionSubmittable();
transactionCommentLayout.setVisibility(show ? View.VISIBLE : View.GONE);
};
+
+ amountValidityObserver = valid -> {
+ tvAmount.setCompoundDrawablesRelativeWithIntrinsicBounds(
+ valid ? 0 : R.drawable.ic_error_outline_black_24dp, 0, 0, 0);
+ tvAmount.setMinEms(valid ? 4 : 5);
+ };
}
private void commentFocusChanged(View layout, TextView textView, boolean hasFocus) {
int textColor;
if (amount.isEmpty()) {
account.resetAmount();
-// account.setCurrency(null);
+ item.validateAmount();
}
else {
try {
amount = amount.replace(decimalSeparator, decimalDot);
account.setAmount(Float.parseFloat(amount));
+ item.validateAmount();
}
catch (NumberFormatException e) {
Logger.debug("new-trans", String.format(
"assuming amount is not set due to number format exception. " +
"input was '%s'", amount));
- account.resetAmount();
+ account.invalidateAmount();
+ item.invalidateAmount();
}
final String curr = String.valueOf(tvCurrency.getText());
if (curr.equals(tvCurrency.getContext()
return true;
}
+ catch (ParseException e) {
+ throw new RuntimeException("Should not happen", e);
+ }
finally {
syncingData = false;
}
DatePickerFragment picker = new DatePickerFragment();
picker.setFutureDates(mProfile.getFutureDates());
picker.setOnDatePickedListener(this);
+ picker.setCurrentDateFromText(tvDate.getText());
picker.show(((NewTransactionActivity) tvDate.getContext()).getSupportFragmentManager(),
- "datePicker");
+ null);
}
/**
* setData
this.item.getModel().showCurrency.removeObserver(showCurrencyObserver);
this.item.stopObservingComment(commentObserver);
this.item.getModel().showComments.removeObserver(showCommentsObserver);
+ this.item.stopObservingAmountValidity(amountValidityObserver);
this.item = null;
}
item.observeComment(activity, commentObserver);
item.getModel()
.observeAccountCount(activity, accountCountObserver);
+ item.observeAmountValidity(activity, amountValidityObserver);
break;
}
}
}
@Override
public void onDatePicked(int year, int month, int day) {
- final Calendar c = GregorianCalendar.getInstance();
- c.set(year, month, day);
- item.setDate(c.getTime());
+ item.setDate(new SimpleDate(year, month+1, day));
boolean focused = tvDescription.requestFocus();
if (focused)
Misc.showSoftKeyboard((NewTransactionActivity) tvAccount.getContext());