invert the if statements

TeamNewPipe · Mar 18, 2021 · 14648d1 · 14648d1
1 parent 7f74caa
commit 14648d1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java b/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java
@@ -152,16 +152,16 @@ public static int getThemeForService(final Context context, final int serviceId)
             defaultTheme = R.style.BlackTheme;
         } else if (selectedTheme.equals(automaticDeviceTheme)) {
 
-            if (!isDeviceDarkThemeEnabled(context)) {
-                // there is only one day theme
-                defaultTheme = R.style.LightTheme;
-            } else {
+            if (isDeviceDarkThemeEnabled(context)) {
                 final String selectedNightTheme = getSelectedNightThemeString(context);
                 if (selectedNightTheme.equals(blackTheme)) {
                     defaultTheme = R.style.BlackTheme;
                 } else {
                     defaultTheme = R.style.DarkTheme;
                 }
+            } else {
+                // there is only one day theme
+                defaultTheme = R.style.LightTheme;
             }
         }
 
@@ -213,16 +213,16 @@ public static int getSettingsThemeStyle(final Context context) {
         } else if (selectedTheme.equals(darkTheme)) {
             return R.style.DarkSettingsTheme;
         } else if (selectedTheme.equals(automaticDeviceTheme)) {
-            if (!isDeviceDarkThemeEnabled(context)) {
-                // there is only one day theme
-                return R.style.LightSettingsTheme;
-            } else {
+            if (isDeviceDarkThemeEnabled(context)) {
                 final String selectedNightTheme = getSelectedNightThemeString(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 {
             // Fallback

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -673,5 +673,4 @@
     <string name="auto_device_theme_title">Automatique (thème de l\'appareil)</string>
     <string name="night_theme_summary">Choisissez votre thème nuit favori — %s</string>
     <string name="select_night_theme_toast">Vous pouvez chosir votre thème nuit favori</string>
->>>>>>> b7d9cf718... use a list for night themes
 </resources>