From bcc95f2ef0647e9c18741c28e67ad947175be2c1 Mon Sep 17 00:00:00 2001
From: CappielloAntonio <antoniocappiello.play@gmail.com>
Date: Mon, 6 Dec 2021 10:56:12 +0100
Subject: [PATCH] Fix theme selector

---
 app/src/main/java/com/cappielloantonio/play/App.java          | 2 +-
 .../java/com/cappielloantonio/play/helper/ThemeHelper.java    | 3 +++
 .../cappielloantonio/play/ui/fragment/SettingsFragment.java   | 4 ++--
 .../java/com/cappielloantonio/play/util/PreferenceUtil.java   | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/cappielloantonio/play/App.java b/app/src/main/java/com/cappielloantonio/play/App.java
index 0b9b37eb..49fd07bd 100644
--- a/app/src/main/java/com/cappielloantonio/play/App.java
+++ b/app/src/main/java/com/cappielloantonio/play/App.java
@@ -23,7 +23,7 @@ public class App extends Application {
         CrashReporter.initialize(this);
 
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-        String themePref = sharedPreferences.getString("themePref", ThemeHelper.DEFAULT_MODE);
+        String themePref = sharedPreferences.getString("theme", ThemeHelper.DEFAULT_MODE);
         ThemeHelper.applyTheme(themePref);
     }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/helper/ThemeHelper.java b/app/src/main/java/com/cappielloantonio/play/helper/ThemeHelper.java
index 25e60f9b..f67b6f16 100644
--- a/app/src/main/java/com/cappielloantonio/play/helper/ThemeHelper.java
+++ b/app/src/main/java/com/cappielloantonio/play/helper/ThemeHelper.java
@@ -1,6 +1,7 @@
 package com.cappielloantonio.play.helper;
 
 import android.os.Build;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatDelegate;
@@ -13,6 +14,8 @@ public class ThemeHelper {
     public static final String DEFAULT_MODE = "default";
 
     public static void applyTheme(@NonNull String themePref) {
+        Log.i(TAG, "+++ applyTheme: " + themePref);
+
         switch (themePref) {
             case LIGHT_MODE: {
                 AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SettingsFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SettingsFragment.java
index 8d1f8de5..f9a5056a 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SettingsFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SettingsFragment.java
@@ -3,6 +3,7 @@ package com.cappielloantonio.play.ui.fragment;
 import android.content.Intent;
 import android.media.audiofx.AudioEffect;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -115,8 +116,7 @@ public class SettingsFragment extends PreferenceFragmentCompat {
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         setPreferencesFromResource(R.xml.global_preferences, rootKey);
-
-        ListPreference themePreference = findPreference("themePref");
+        ListPreference themePreference = findPreference("theme");
         if (themePreference != null) {
             themePreference.setOnPreferenceChangeListener(
                     (preference, newValue) -> {
diff --git a/app/src/main/java/com/cappielloantonio/play/util/PreferenceUtil.java b/app/src/main/java/com/cappielloantonio/play/util/PreferenceUtil.java
index 7171ed1f..cc176615 100644
--- a/app/src/main/java/com/cappielloantonio/play/util/PreferenceUtil.java
+++ b/app/src/main/java/com/cappielloantonio/play/util/PreferenceUtil.java
@@ -11,6 +11,7 @@ public class PreferenceUtil {
     private static final String TAG = "PreferenceUtil";
 
     public static final String SERVER = "server";
+    public static final String THEME = "theme";
     public static final String USER = "user";
     public static final String PASSWORD = "password";
     public static final String TOKEN = "token";
@@ -45,7 +46,7 @@ public class PreferenceUtil {
     }
 
     public String getTheme() {
-        return mPreferences.getString("themePref", ThemeHelper.DEFAULT_MODE);
+        return mPreferences.getString(THEME, ThemeHelper.DEFAULT_MODE);
     }
 
     public String getServer() {