Issue #660 - changed theme setting to nightmode selection, update isDarkTheme(), changed settings default to NightMode=Auto

6 files changed, 11 insertions, 11 deletions

diff --git a/News-Android-App/src/main/res/drawable/left_drawer_header_background.xml b/News-Android-App/src/main/res/drawable/left_drawer_header_background.xml
index b4a9c987..2ae8d8b4 100644
--- a/News-Android-App/src/main/res/drawable/left_drawer_header_background.xml
+++ b/News-Android-App/src/main/res/drawable/left_drawer_header_background.xml
@@ -3,8 +3,8 @@
     <item>
         <shape>
             <gradient
-                android:startColor="@color/owncloudBlueLight"
-                android:endColor="@color/owncloudBlueDark"
+                android:startColor="@color/owncloudBlue"
+                android:endColor="@color/owncloudBlue"
                 android:angle="-90"/>
         </shape>
     </item>
diff --git a/News-Android-App/src/main/res/drawable/splash_screen.xml b/News-Android-App/src/main/res/drawable/splash_screen.xml
index 81d1036e..2a16682c 100644
--- a/News-Android-App/src/main/res/drawable/splash_screen.xml
+++ b/News-Android-App/src/main/res/drawable/splash_screen.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:drawable="@color/nextcloudBlueLight"/>
+        android:drawable="@color/nextcloudBlue"/>
 
     <item>
         <bitmap
diff --git a/News-Android-App/src/main/res/drawable/swipe_markasread.xml b/News-Android-App/src/main/res/drawable/swipe_markasread.xml
index 7bfe07de..0725d443 100644
--- a/News-Android-App/src/main/res/drawable/swipe_markasread.xml
+++ b/News-Android-App/src/main/res/drawable/swipe_markasread.xml
@@ -2,8 +2,8 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <selector>
-            <item android:state_above_anchor="false"><color android:color="@color/swipeBackgroundDark" /></item>
-            <item android:state_above_anchor="true"><color android:color="@color/markasreadColorDark" /></item>
+            <item android:state_above_anchor="false"><color android:color="@color/swipeBackground" /></item>
+            <item android:state_above_anchor="true"><color android:color="@color/markasreadColor" /></item>
         </selector>
     </item>
     <item android:left="5dp">
diff --git a/News-Android-App/src/main/res/drawable/swipe_markasread_light.xml b/News-Android-App/src/main/res/drawable/swipe_markasread_light.xml
index 350f501e..0725d443 100644
--- a/News-Android-App/src/main/res/drawable/swipe_markasread_light.xml
+++ b/News-Android-App/src/main/res/drawable/swipe_markasread_light.xml
@@ -2,8 +2,8 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <selector>
-            <item android:state_above_anchor="false"><color android:color="@color/swipeBackgroundLight" /></item>
-            <item android:state_above_anchor="true"><color android:color="@color/markasreadColorLight" /></item>
+            <item android:state_above_anchor="false"><color android:color="@color/swipeBackground" /></item>
+            <item android:state_above_anchor="true"><color android:color="@color/markasreadColor" /></item>
         </selector>
     </item>
     <item android:left="5dp">
diff --git a/News-Android-App/src/main/res/drawable/swipe_setstarred.xml b/News-Android-App/src/main/res/drawable/swipe_setstarred.xml
index 7fefa96c..43eb94bd 100644
--- a/News-Android-App/src/main/res/drawable/swipe_setstarred.xml
+++ b/News-Android-App/src/main/res/drawable/swipe_setstarred.xml
@@ -2,8 +2,8 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <selector>
-            <item android:state_above_anchor="false"><color android:color="@color/swipeBackgroundLight" /></item>
-            <item android:state_above_anchor="true"><color android:color="@color/starredColorDark" /></item>
+            <item android:state_above_anchor="false"><color android:color="@color/swipeBackground" /></item>
+            <item android:state_above_anchor="true"><color android:color="@color/starredColor" /></item>
         </selector>
     </item>
     <item android:right="5dp">
diff --git a/News-Android-App/src/main/res/drawable/swipe_setstarred_light.xml b/News-Android-App/src/main/res/drawable/swipe_setstarred_light.xml
index 35fc8a4a..43eb94bd 100644
--- a/News-Android-App/src/main/res/drawable/swipe_setstarred_light.xml
+++ b/News-Android-App/src/main/res/drawable/swipe_setstarred_light.xml
@@ -2,8 +2,8 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <selector>
-            <item android:state_above_anchor="false"><color android:color="@color/swipeBackgroundLight" /></item>
-            <item android:state_above_anchor="true"><color android:color="@color/starredColorLight" /></item>
+            <item android:state_above_anchor="false"><color android:color="@color/swipeBackground" /></item>
+            <item android:state_above_anchor="true"><color android:color="@color/starredColor" /></item>
         </selector>
     </item>
     <item android:right="5dp">