X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionItemHolder.java;h=c274c455cef6845d5af8601f1c776ea92064d24c;hb=c27aa72c2c641bcd568692b4a20b125605cfb3b5;hp=3049bac4ebf34ef02e9723bd5e4bc7b0f515a174;hpb=2a10026b966907fa60376778295ce6818458b3d0;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 3049bac4..c274c455 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
@@ -46,7 +46,6 @@ 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.DimensionUtils;
 import net.ktnx.mobileledger.utils.Logger;
 import net.ktnx.mobileledger.utils.MLDB;
@@ -133,9 +132,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder
                                     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();
@@ -189,10 +186,9 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder
 
         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 = ".";
 
@@ -502,13 +498,17 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder
         }
     }
     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) {
@@ -718,7 +718,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder
     }
     @Override
     public void onDatePicked(int year, int month, int day) {
-        item.setDate(new SimpleDate(year, month+1, day));
+        item.setDate(new SimpleDate(year, month + 1, day));
         boolean focused = tvDescription.requestFocus();
         if (focused)
             Misc.showSoftKeyboard((NewTransactionActivity) tvAccount.getContext());