Merge pull request #5899 from Stypox/fix-settings-theme

Fix settings switches are not red anymore
TeamNewPipe · Mar 24, 2021 · 67afd05 · 67afd05
2 parents c7efa8c + 0fcaf20
commit 67afd05
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
@@ -48,7 +48,7 @@ public static void initSettings(final Context context) {
 
     @Override
     protected void onCreate(final Bundle savedInstanceBundle) {
-        ThemeHelper.setTheme(this);
+        setTheme(ThemeHelper.getSettingsThemeStyle(this));
         assureCorrectAppLanguage(this);
         super.onCreate(savedInstanceBundle);
 

diff --git a/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java b/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java
@@ -169,6 +169,39 @@ public static int getThemeForService(final Context context, final int serviceId)
         return baseTheme;
     }
 
+    @StyleRes
+    public static int getSettingsThemeStyle(final Context context) {
+        final Resources res = context.getResources();
+        final String lightTheme = res.getString(R.string.light_theme_key);
+        final String blackTheme = res.getString(R.string.black_theme_key);
+        final String automaticDeviceTheme = res.getString(R.string.auto_device_theme_key);
+
+
+        final String selectedTheme = getSelectedThemeKey(context);
+
+        if (selectedTheme.equals(lightTheme)) {
+            return R.style.LightSettingsTheme;
+        } else if (selectedTheme.equals(blackTheme)) {
+            return R.style.BlackSettingsTheme;
+        } else if (selectedTheme.equals(automaticDeviceTheme)) {
+            if (isDeviceDarkThemeEnabled(context)) {
+                // use the dark theme variant preferred by the user
+                final String selectedNightTheme = getSelectedNightThemeKey(context);
+                if (selectedNightTheme.equals(blackTheme)) {
+                    return R.style.BlackSettingsTheme;
+                } else {
+                    return R.style.DarkSettingsTheme;
+                }
+            } else {
+                // there is only one day theme
+                return R.style.LightSettingsTheme;
+            }
+        } else {
+            // default to dark theme
+            return R.style.DarkSettingsTheme;
+        }
+    }
+
     /**
      * Get a resource id from a resource styled according to the context's theme.
      *