more pronounced day/month delimiters in the transaction list

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / CurrencySelectorFragment.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/CurrencySelectorFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/CurrencySelectorFragment.java
index 4ec2abfea13125eda0767c65e0873cdaf95658e2..759cd90e78451d01887dbb488cb1910d2967ace0 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/CurrencySelectorFragment.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/CurrencySelectorFragment.java
@@ -130,6 +130,8 @@ public class CurrencySelectorFragment extends AppCompatDialogFragment
         final TextView tvNoCurrBtn = csd.findViewById(R.id.btn_no_currency);
         final TextView tvAddCurrOkBtn = csd.findViewById(R.id.btn_add_currency);
         final TextView tvAddCurrBtn = csd.findViewById(R.id.btn_add_new);
+        final SwitchMaterial gap = csd.findViewById(R.id.currency_gap);
+        final RadioGroup rgPosition = csd.findViewById(R.id.position_radio_group);
 
         tvNewCurrName.setVisibility(View.GONE);
         tvAddCurrOkBtn.setVisibility(View.GONE);
@@ -149,15 +151,14 @@ public class CurrencySelectorFragment extends AppCompatDialogFragment
         });
 
         tvAddCurrOkBtn.setOnClickListener(v -> {
-
-
             String currName = String.valueOf(tvNewCurrName.getText());
             if (!currName.isEmpty()) {
                 DB.get()
                   .getCurrencyDAO()
                   .insert(new net.ktnx.mobileledger.db.Currency(0,
-                          String.valueOf(tvNewCurrName.getText()), "after", false));
-                // FIXME hardcoded position and gap setting
+                          String.valueOf(tvNewCurrName.getText()),
+                          (rgPosition.getCheckedRadioButtonId() == R.id.currency_position_left)
+                          ? "before" : "after", gap.isChecked()));
             }
 
             tvNewCurrName.setVisibility(View.GONE);
@@ -180,7 +181,6 @@ public class CurrencySelectorFragment extends AppCompatDialogFragment
         else
             rbPositionRight.toggle();
 
-        RadioGroup rgPosition = csd.findViewById(R.id.position_radio_group);
         rgPosition.setOnCheckedChangeListener((group, checkedId) -> {
             if (checkedId == R.id.currency_position_left)
                 Data.currencySymbolPosition.setValue(Currency.Position.before);
@@ -188,8 +188,6 @@ public class CurrencySelectorFragment extends AppCompatDialogFragment
                 Data.currencySymbolPosition.setValue(Currency.Position.after);
         });
 
-        SwitchMaterial gap = csd.findViewById(R.id.currency_gap);
-
         gap.setChecked(Data.currencyGap.getValue());
 
         gap.setOnCheckedChangeListener((v, checked) -> Data.currencyGap.setValue(checked));
@@ -199,8 +197,13 @@ public class CurrencySelectorFragment extends AppCompatDialogFragment
                                                                            visible ? View.VISIBLE
                                                                                    : View.GONE));
 
-        if ((savedInstanceState != null) ? savedInstanceState.getBoolean(ARG_SHOW_PARAMS,
-                DEFAULT_SHOW_PARAMS) : DEFAULT_SHOW_PARAMS)
+        final boolean showParams;
+        if (getArguments() == null)
+            showParams = DEFAULT_SHOW_PARAMS;
+        else
+            showParams = getArguments().getBoolean(ARG_SHOW_PARAMS, DEFAULT_SHOW_PARAMS);
+
+        if (showParams)
             model.showPositionAndPadding();
         else
             model.hidePositionAndPadding();