From f506bfb14aca5c2cdeeb95b0b80475bd72a8e1d6 Mon Sep 17 00:00:00 2001
From: Morgan Lim <morgan.lim@mail.mcgill.ca>
Date: Thu, 9 Jul 2020 15:54:27 -0400
Subject: [PATCH] Rename Day/Night and Day/Black to "Dynamic". On v28/Android
 Pie and lower, themes still change based on time of day. On Android 10 and
 up, theme changes in accordance with system dark mode setting.

---
 .../net/nullsum/audinaut/activity/SubsonicActivity.java  | 9 ++++++++-
 app/src/main/res/values/strings.xml                      | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java b/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java
index 33fe394..f687a68 100644
--- a/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java
+++ b/app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java
@@ -24,6 +24,7 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.media.AudioManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
@@ -85,7 +86,13 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
     private static ImageLoader IMAGE_LOADER;
 
     static {
-        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_AUTO);
+        // If Android Pie or older, set night mode by system clock
+        if (Build.VERSION.SDK_INT<29) {
+            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_AUTO);
+        } else {
+            // Else, for Android 10+, follow system dark mode setting
+            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
+        }
     }
 
     final List<SubsonicFragment> backStack = new ArrayList<>();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index de4dfa7..25ca90c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -162,8 +162,8 @@
     <string name="settings.theme_light">Light</string>
     <string name="settings.theme_dark">Dark</string>
     <string name="settings.theme_black">Black</string>
-    <string name="settings.theme_day_night">Day/Night</string>
-    <string name="settings.theme_day_black_night">Day/Black Night</string>
+    <string name="settings.theme_day_night">Dynamic (Light/Dark)</string>
+    <string name="settings.theme_day_black_night">Dynamic (Light/Black)</string>
     <string name="settings.theme_fullscreen">Fullscreen</string>
     <string name="settings.theme_fullscreen_summary">Hide as many UI elements as Android will allow</string>
     <string name="settings.track_title">Display Track #</string>