import net.ktnx.mobileledger.model.MobileLedgerProfile;
import net.ktnx.mobileledger.ui.CurrencySelectorFragment;
import net.ktnx.mobileledger.ui.DatePickerFragment;
-import net.ktnx.mobileledger.ui.OnCurrencySelectedListener;
import net.ktnx.mobileledger.ui.TextViewClearHelper;
import net.ktnx.mobileledger.utils.Colors;
import net.ktnx.mobileledger.utils.DimensionUtils;
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;
import static net.ktnx.mobileledger.ui.activity.NewTransactionModel.ItemType;
class NewTransactionItemHolder extends RecyclerView.ViewHolder
- implements DatePickerFragment.DatePickedListener, DescriptionSelectedCallback,
- OnCurrencySelectedListener {
+ implements DatePickerFragment.DatePickedListener, DescriptionSelectedCallback {
private final String decimalSeparator;
private final String decimalDot;
private final TextView tvCurrency;
private Observer<Boolean> currencyGapObserver;
private Observer<Locale> localeObserver;
private Observer<Currency> currencyObserver;
+ private Observer<Boolean> showCurrencyObserver;
private boolean inUpdate = false;
private boolean syncingData = false;
private View commentButton;
+ private NewTransactionItemsAdapter adapter;
//TODO multiple amounts with different currencies per posting
NewTransactionItemHolder(@NonNull View itemView, NewTransactionItemsAdapter adapter) {
super(itemView);
+ this.adapter = adapter;
tvAccount = itemView.findViewById(R.id.account_row_acc_name);
tvComment = itemView.findViewById(R.id.comment);
new TextViewClearHelper().attachToTextView((EditText) tvComment);
syncData();
Logger.debug("textWatcher",
"syncData() returned, checking if transaction is submittable");
- adapter.model.checkTransactionSubmittable(adapter);
+ adapter.checkTransactionSubmittable();
Logger.debug("textWatcher", "done");
}
};
start, count, after));
}
@Override
- public void onTextChanged(CharSequence s, int start, int before, int count) {
- Logger.debug("num",
- String.format(Locale.US, "onTextChanged: start=%d, before=%d, count=%d",
- start, before, 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) {
// 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);
tvCurrency.setOnClickListener(v -> {
CurrencySelectorFragment cpf = new CurrencySelectorFragment();
- cpf.setOnCurrencySelectedListener(this);
+ 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));
tvAmount.setImeOptions(EditorInfo.IME_ACTION_NEXT);
};
- currencyPositionObserver = position -> {
- updateCurrencyPositionAndPadding(position, Data.currencyGap.getValue());
+ localeObserver = locale -> {
+ 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);
};
- localeObserver = locale -> {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
- tvAmount.setKeyListener(DigitsKeyListener.getInstance(locale, true, true));
+ currencyPositionObserver = position -> {
+ updateCurrencyPositionAndPadding(position, Data.currencyGap.getValue());
};
- currencyObserver = this::setCurrency;
+ showCurrencyObserver = showCurrency -> {
+ if (showCurrency) {
+ tvCurrency.setVisibility(View.VISIBLE);
+ }
+ else {
+ tvCurrency.setVisibility(View.GONE);
+ item.setCurrency(null);
+ }
+ };
}
private void updateCurrencyPositionAndPadding(Currency.Position position, boolean hasGap) {
ConstraintLayout.LayoutParams amountLP =
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);
* syncData()
* <p>
* 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;
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);
+// account.setCurrency(null);
}
else {
try {
case bottomFiller:
throw new RuntimeException("Should not happen");
}
+
+ return true;
}
finally {
syncingData = false;
Data.currencyGap.removeObserver(currencyGapObserver);
Data.locale.removeObserver(localeObserver);
this.item.stopObservingCurrency(currencyObserver);
+ this.item.getModel().showCurrency.removeObserver(showCurrencyObserver);
this.item = null;
}
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.currencySymbolPosition.observe(activity, currencyPositionObserver);
- Data.currencyGap.observe(activity, currencyGapObserver);
- Data.locale.observe(activity, localeObserver);
- item.observeCurrency(activity, currencyObserver);
+
+ 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);
+ break;
+ case transactionRow:
+ item.observeAmountHint(activity, hintObserver);
+ item.observeCommentVisible(activity, commentVisibleObserver);
+ item.observeComment(activity, commentObserver);
+ 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.getModel()
+ .observeAccountCount(activity, accountCountObserver);
+ break;
+ }
}
}
finally {
}
@Override
- public void onCurrencySelected(Currency item) {
- this.item.setCurrency(item);
- }
- @Override
public void descriptionSelected(String description) {
tvAccount.setText(description);
tvAmount.requestFocus(View.FOCUS_FORWARD);
projects / mobile-ledger.git / blobdiff