follow system setting in dark mode

Author: kasnder

app/src/main/java/eu/faircode/netguard/ActivitySettings.java

@@ -438,9 +438,6 @@ else if ("whitelist_roaming".equals(name))
         else if ("pause".equals(name))
             getPreferenceScreen().findPreference(name).setTitle(getString(R.string.setting_pause, prefs.getString(name, "10")));
 
-        else if ("dark_theme".equals(name))
-            recreate();
-
         else if ("subnet".equals(name))
             ServiceSinkhole.reload("changed " + name, this, false);
 

app/src/main/java/eu/faircode/netguard/ApplicationEx.java

@@ -129,18 +129,17 @@ public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle saved
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
                     android.widget.FrameLayout content = activity.findViewById(android.R.id.content);
 
-                    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
-                    boolean dark = prefs.getBoolean("dark_theme", false);
-
                     // On Android 15+, setStatusBarColor is ignored
                     // Set window background to primary color - this shows behind the status bar
                     int primaryColor = ContextCompat.getColor(activity, R.color.colorPrimary);
                     activity.getWindow().setBackgroundDrawable(new ColorDrawable(primaryColor));
 
+                    boolean isNight = (activity.getResources().getConfiguration().uiMode & android.content.res.Configuration.UI_MODE_NIGHT_MASK) == android.content.res.Configuration.UI_MODE_NIGHT_YES;
+
                     // Set status bar icons to light (white) since our background is dark
                     View decor = activity.getWindow().getDecorView();
                     WindowCompat.getInsetsController(activity.getWindow(), decor).setAppearanceLightStatusBars(false);
-                    WindowCompat.getInsetsController(activity.getWindow(), decor).setAppearanceLightNavigationBars(!dark);
+                    WindowCompat.getInsetsController(activity.getWindow(), decor).setAppearanceLightNavigationBars(!isNight);
 
                     ViewCompat.setOnApplyWindowInsetsListener(content, new OnApplyWindowInsetsListener() {
                         @NonNull
@@ -157,8 +156,9 @@ public WindowInsetsCompat onApplyWindowInsets(@NonNull View v, @NonNull WindowIn
                             // Set background on the actual layout (first child), not on the content frame
                             // This way the padding area shows the window background (primary color)
                             if (content.getChildCount() > 0) {
+                                boolean isNight = (activity.getResources().getConfiguration().uiMode & android.content.res.Configuration.UI_MODE_NIGHT_MASK) == android.content.res.Configuration.UI_MODE_NIGHT_YES;
                                 View child = content.getChildAt(0);
-                                child.setBackgroundColor(dark ? Color.BLACK : Color.WHITE);
+                                child.setBackgroundColor(isNight ? Color.BLACK : Color.WHITE);
                             }
 
                             return insets;

app/src/main/java/eu/faircode/netguard/Util.java

@@ -470,17 +470,8 @@ public static boolean ownFault(Context context, Throwable ex) {
     }
 
     public static void setTheme(Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        boolean dark = prefs.getBoolean("dark_theme", false);
-        context.setTheme(dark ? R.style.AppThemeRedDark : R.style.AppThemeRed);
-
-        if (dark) {
-            AppCompatDelegate.setDefaultNightMode(
-                    AppCompatDelegate.MODE_NIGHT_YES);
-        } else {
-            AppCompatDelegate.setDefaultNightMode(
-                    AppCompatDelegate.MODE_NIGHT_NO);
-        }
+        context.setTheme(R.style.AppThemeRed);
+        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
     }
 
     public static int dips2pixels(int dips, Context context) {

app/src/main/res/values-night/styles.xml

@@ -7,5 +7,12 @@
         <item name="android:windowBackground">@color/black</item>
         <item name="android:colorBackground">@color/black</item>
     </style>
-</resources>
 
+    <style name="AppThemeRed" parent="BaseThemeLight">
+        <item name="colorPrimary">@color/colorRedPrimary</item>
+        <item name="colorPrimaryDark">@color/colorRedPrimaryDark</item>
+        <item name="colorAccent">@color/colorRedAccent</item>
+        <item name="colorOn">@color/colorRedOff</item>
+        <item name="colorOff">@color/colorRedOn</item>
+    </style>
+</resources>

app/src/main/res/values/styles.xml

@@ -71,14 +71,6 @@
         <item name="colorOff">@color/colorRedOn</item>
     </style>
 
-    <style name="AppThemeRedDark" parent="BaseThemeLight">
-        <item name="colorPrimary">@color/colorRedPrimary</item>
-        <item name="colorPrimaryDark">@color/colorRedPrimaryDark</item>
-        <item name="colorAccent">@color/colorRedAccent</item>
-        <item name="colorOn">@color/colorRedOff</item>
-        <item name="colorOff">@color/colorRedOn</item>
-    </style>
-
     <style name="AppDialog" parent="Theme.AppCompat.Dialog">
         <item name="windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>

app/src/main/res/xml/preferences.xml

@@ -11,10 +11,6 @@
                 android:key="strict_blocking"
                 android:summary="@string/summary_strict_blocking"
                 android:title="@string/setting_strict_blocking" />
-            <eu.faircode.netguard.SwitchPreference
-                android:defaultValue="false"
-                android:key="dark_theme"
-                android:title="@string/setting_dark" />
             <eu.faircode.netguard.SwitchPreference
                 android:defaultValue="true"
                 android:key="installed"