X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fprofiles%2FProfileDetailFragment.java;h=57fe6b995267b9a7d5c8f5495544f0f0ef7ceb1e;hp=8b4136a593bb30e026f618265104933541cb87fc;hb=83cac114e375728080194fb09758b49c50a8119b;hpb=9c0779bf1407b44b5dcc46035b1cef527b9fa2f6

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java
index 8b4136a5..57fe6b99 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java
@@ -158,7 +158,7 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue
                 MobileLedgerProfile.storeProfilesOrder();
 
                 // first profile ever?
-                if (Data.profiles.getList().size() == 1) Data.profile.set(mProfile);
+                if (Data.profiles.size() == 1) Data.profile.set(mProfile);
             }
 
             Activity activity = getActivity();
@@ -196,6 +196,7 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue
         hookClearErrorOnFocusListener(userName, userNameLayout);
         hookClearErrorOnFocusListener(password, passwordLayout);
 
+        int profileThemeId;
         if (mProfile != null) {
             profileName.setText(mProfile.getName());
             postingPermitted.setChecked(mProfile.isPostingPermitted());
@@ -204,10 +205,7 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue
             authParams.setVisibility(mProfile.isAuthEnabled() ? View.VISIBLE : View.GONE);
             userName.setText(mProfile.isAuthEnabled() ? mProfile.getAuthUserName() : "");
             password.setText(mProfile.isAuthEnabled() ? mProfile.getAuthPassword() : "");
-
-            huePickerView.setBackgroundColor(Colors.getPrimaryColorForHue(
-                    (mProfile.getThemeId() == -1) ? Colors.DEFAULT_HUE_DEG
-                                                  : mProfile.getThemeId()));
+            profileThemeId = mProfile.getThemeId();
         }
         else {
             profileName.setText("");
@@ -217,14 +215,14 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue
             authParams.setVisibility(View.GONE);
             userName.setText("");
             password.setText("");
-            huePickerView.setBackgroundColor(Colors.getPrimaryColorForHue(Colors.DEFAULT_HUE_DEG));
+            profileThemeId = -1;
         }
 
-        int profileThemeId = (mProfile == null) ? -1 : mProfile.getThemeId();
         final int hue = (profileThemeId == -1) ? Colors.DEFAULT_HUE_DEG : profileThemeId;
         final int profileColor = Colors.getPrimaryColorForHue(hue);
 
         huePickerView.setBackgroundColor(profileColor);
+        huePickerView.setTag(profileThemeId);
         huePickerView.setOnClickListener(v -> {
             HueRingDialog d = new HueRingDialog(
                     Objects.requireNonNull(ProfileDetailFragment.this.getContext()), hue);