From 290fe68fc611c7897face796318a83f11ace622c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 28 Nov 2019 08:13:17 +0300
Subject: use Theme.DayNight and values-night to implement light/dark theme
 GalleryActivity: add all checked images together to prevent pager desync

---
 org.fox.ttrss/src/main/res/values/arrays.xml |  5 +++--
 org.fox.ttrss/src/main/res/values/style.xml  | 12 ++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'org.fox.ttrss/src/main/res/values')

diff --git a/org.fox.ttrss/src/main/res/values/arrays.xml b/org.fox.ttrss/src/main/res/values/arrays.xml
index 25b2bd58..60053955 100644
--- a/org.fox.ttrss/src/main/res/values/arrays.xml
+++ b/org.fox.ttrss/src/main/res/values/arrays.xml
@@ -1,13 +1,13 @@
 <resources>
     <string-array name="pref_theme_names">
+        <item>@string/theme_auto</item>
         <item>@string/theme_light</item>
         <item>@string/theme_dark</item>
-        <item>@string/theme_amber</item>
     </string-array>
     <string-array name="pref_theme_values" translatable="false">
+        <item>THEME_AUTO</item>
         <item>THEME_LIGHT</item>
         <item>THEME_DARK</item>
-        <item>THEME_AMBER</item>
     </string-array>
     <string-array name="headline_mode_names">
         <item>@string/headline_display_mode_default</item>
@@ -52,4 +52,5 @@
         <item>30</item>
         <item>45</item>
     </string-array>
+    <string name="theme_auto">Automatic</string>
 </resources>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
index 9121638c..711b62a7 100755
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -1,11 +1,10 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="LightTheme.Base" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme.Base" parent="Theme.AppCompat.DayNight">
         <item name="android:windowNoTitle">true</item>
-
     </style>
 
-    <style name="LightTheme" parent="LightTheme.Base">
+    <style name="AppTheme" parent="AppTheme.Base">
         <item name="windowActionModeOverlay">true</item>
 
         <!-- <item name="statusBarHintColor">?colorPrimary</item> -->
@@ -66,6 +65,7 @@
         <item name="drawer_header">@drawable/drawer_header</item>
     </style>
 
+    <!--
     <style name="DarkTheme.Base" parent="Theme.AppCompat.NoActionBar">
 
     </style>
@@ -78,10 +78,10 @@
     </style>
 
     <style name="DarkTheme" parent="DarkTheme.Base">
-        <item name="windowActionModeOverlay">true</item>
+        <item name="windowActionModeOverlay">true</item> -->
 
         <!-- <item name="statusBarHintColor">?colorPrimary</item> -->
-        <item name="unreadCounterColor">#909090</item>
+        <!-- <item name="unreadCounterColor">#909090</item>
         <item name="feedlistTextColor">@android:color/white</item>
         <item name="headlineUnreadTextColor">@android:color/white</item>
         <item name="headlineSelectedTextColor">@android:color/white</item>
@@ -136,7 +136,7 @@
         <item name="ic_attachment_vert">@drawable/ic_attachment_vert</item>
 
         <item name="drawer_header">@drawable/drawer_header_dark</item>
-    </style>
+    </style> -->
 
     <style name="DarkDialogTheme" parent="android:Theme"></style>
 
-- 
cgit v1.2.3-54-g00ecf