/*
- * 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.widget.FrameLayout;
import android.widget.TextView;
+import androidx.annotation.ColorInt;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.constraintlayout.widget.ConstraintLayout;
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.DimensionUtils;
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;
private NewTransactionModel.Item item;
private TextView tvDate;
private AutoCompleteTextView tvDescription;
+ private TextView tvDummy;
private AutoCompleteTextView tvAccount;
private TextView tvComment;
private EditText tvAmount;
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;
tvCurrency = itemView.findViewById(R.id.currency);
tvDate = itemView.findViewById(R.id.new_transaction_date);
tvDescription = itemView.findViewById(R.id.new_transaction_description);
+ tvDummy = itemView.findViewById(R.id.dummy_text);
lHead = itemView.findViewById(R.id.ntr_data);
lPadding = itemView.findViewById(R.id.ntr_padding);
final View commentLayout = itemView.findViewById(R.id.comment_layout);
tvTransactionComment.requestFocus();
});
- mProfile = Data.profile.getValue();
- if (mProfile == null)
- throw new AssertionError();
+ mProfile = Data.getProfile();
View.OnFocusChangeListener focusMonitor = (v, hasFocus) -> {
final int id = v.getId();
}
if (id == R.id.comment) {
- commentFocusChanged(commentLayout, tvComment, hasFocus);
+ commentFocusChanged(tvComment, hasFocus);
}
else if (id == R.id.transaction_comment) {
- commentFocusChanged(transactionCommentLayout, tvTransactionComment, hasFocus);
+ commentFocusChanged(tvTransactionComment, hasFocus);
}
};
decimalSeparator = String.valueOf(DecimalFormatSymbols.getInstance()
.getMonetaryDecimalSeparator());
- localeObserver = locale -> {
- decimalSeparator = String.valueOf(DecimalFormatSymbols.getInstance(locale)
- .getMonetaryDecimalSeparator());
- };
+ localeObserver = locale -> decimalSeparator = String.valueOf(
+ DecimalFormatSymbols.getInstance(locale)
+ .getMonetaryDecimalSeparator());
decimalDot = ".";
}
};
editableObserver = this::setEditable;
+ commentFocusChanged(tvTransactionComment, false);
+ commentFocusChanged(tvComment, false);
focusedAccountObserver = index -> {
if ((index == null) || !index.equals(getAdapterPosition()) || itemView.hasFocus())
return;
tvAmount.setMinEms(valid ? 4 : 5);
};
}
- private void commentFocusChanged(View layout, TextView textView, boolean hasFocus) {
- int textColor;
+ private void commentFocusChanged(TextView textView, boolean hasFocus) {
+ @ColorInt int textColor;
+ textColor = tvDummy.getTextColors()
+ .getDefaultColor();
if (hasFocus) {
- textColor = Colors.defaultTextColor;
textView.setTypeface(null, Typeface.NORMAL);
textView.setHint(R.string.transaction_account_comment_hint);
}
else {
- textColor = Colors.defaultTextColorDisabled;
+ int alpha = (textColor >> 24 & 0xff);
+ alpha = 3 * alpha / 4;
+ textColor = (alpha << 24) | (0x00ffffff & textColor);
textView.setTypeface(null, Typeface.ITALIC);
textView.setHint("");
if (Misc.isEmptyOrNull(textView.getText())) {
}
}
private void setCurrencyString(String currency) {
+ @ColorInt int textColor = tvDummy.getTextColors()
+ .getDefaultColor();
if ((currency == null) || currency.isEmpty()) {
tvCurrency.setText(R.string.currency_symbol);
- tvCurrency.setTextColor(0x7f000000 + (0x00ffffff & Colors.defaultTextColor));
+ int alpha = (textColor >> 24) & 0xff;
+ alpha = alpha * 3 / 4;
+ tvCurrency.setTextColor((alpha << 24) | (0x00ffffff & textColor));
}
else {
tvCurrency.setText(currency);
- tvCurrency.setTextColor(Colors.defaultTextColor);
+ tvCurrency.setTextColor(textColor);
}
}
private void setCurrency(Currency currency) {
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
}
@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());