summaryrefslogtreecommitdiff
path: root/org.fox.ttrss/src/main/res
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2019-11-28 08:13:17 +0300
committerAndrew Dolgov <[email protected]>2019-11-28 08:13:17 +0300
commit290fe68fc611c7897face796318a83f11ace622c (patch)
tree1a8bbdea95d195ccefb3f7eb604615b00052d3d7 /org.fox.ttrss/src/main/res
parentd3b537d6a8e960f84256051666e2b5bea72b91cc (diff)
use Theme.DayNight and values-night to implement light/dark theme
GalleryActivity: add all checked images together to prevent pager desync
Diffstat (limited to 'org.fox.ttrss/src/main/res')
-rw-r--r--org.fox.ttrss/src/main/res/values-night/style.xml63
-rwxr-xr-xorg.fox.ttrss/src/main/res/values-v21/style.xml6
-rw-r--r--org.fox.ttrss/src/main/res/values/arrays.xml5
-rwxr-xr-xorg.fox.ttrss/src/main/res/values/style.xml12
-rwxr-xr-xorg.fox.ttrss/src/main/res/xml/preferences.xml2
5 files changed, 76 insertions, 12 deletions
diff --git a/org.fox.ttrss/src/main/res/values-night/style.xml b/org.fox.ttrss/src/main/res/values-night/style.xml
new file mode 100644
index 00000000..c81d4b31
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/values-night/style.xml
@@ -0,0 +1,63 @@
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <style name="AppTheme" parent="AppTheme.Base">
+ <item name="windowActionModeOverlay">true</item>
+
+ <!-- <item name="statusBarHintColor">?colorPrimary</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>
+ <item name="headlineExcerptTextColor">#bebebe</item>
+ <item name="headlineSecondaryTextColor">#909090</item>
+ <item name="headlineTitleHighScoreUnreadTextColor">#00FF00</item>
+ <item name="headlineSelectedExcerptTextColor">#bebebe</item>
+ <item name="headlineSelectedSecondaryTextColor">?headlineSelectedExcerptTextColor</item>
+ <item name="headlineSelectedBackground">#1c1c1c</item>
+ <item name="headlineHeaderBackground">#99000000</item>
+ <item name="headlineUnreadBackground">#101010</item>
+ <item name="linkColor">#2d92c8</item>
+ <item name="loadingBackground">@android:color/black</item>
+ <item name="articleNoteTextColor">#bebebe</item>
+ <item name="articleNoteBackground">#303030</item>
+ <item name="parentBtnBackground">#101010</item>
+ <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item>
+ <item name="feedlistBackground">#1c1d1e</item>
+ <item name="headlinesBackground">#1c1d1e</item>
+ <item name="articleBackground">@android:color/black</item>
+ <item name="feedsSelectedBackground">#1c1c1c</item>
+ <item name="feedlistSelectedTextColor">@android:color/white</item>
+ <item name="articleHeader">@android:color/transparent</item>
+ <item name="articleHeaderTextColor">@android:color/white</item>
+ <item name="floatingActionButtonStyle">@style/FabTheme</item>
+ <item name="articleTextColor">#e0e0e0</item>
+ <item name="headlineFooterColor">?colorPrimary</item>
+ <item name="articleHeaderSeparator">#303030</item>
+
+ <item name="colorPrimary">#1e6286</item>
+ <item name="colorPrimaryDark">#18506e</item>
+ <item name="colorAccent">#D84315</item>
+
+ <item name="ic_rss_box">@drawable/ic_rss_box</item>
+ <item name="ic_checkbox_marked">@drawable/ic_checkbox_marked</item>
+ <item name="ic_star">@drawable/ic_star</item>
+ <item name="ic_star_outline">@drawable/ic_star_outline</item>
+ <item name="ic_share">@drawable/ic_share</item>
+ <item name="ic_inbox">@drawable/ic_inbox</item>
+ <item name="ic_go_back">@drawable/ic_go_back</item>
+ <item name="ic_settings">@drawable/ic_settings</item>
+ <item name="ic_filter_variant">@drawable/ic_filter_variant</item>
+ <item name="ic_cloud_download">@drawable/ic_cloud_download</item>
+ <item name="ic_cloud_upload">@drawable/ic_cloud_upload</item>
+ <item name="ic_archive">@drawable/ic_archive</item>
+ <item name="ic_fresh">@drawable/ic_fresh</item>
+ <item name="ic_restore">@drawable/ic_restore</item>
+ <item name="ic_folder_outline">@drawable/ic_folder_outline</item>
+ <item name="ic_dots_vertical">@drawable/ic_dots_vertical</item>
+ <item name="ic_dots_vertical_circle">@drawable/ic_dots_vertical_circle</item>
+ <item name="ic_attachment">@drawable/ic_attachment</item>
+ <item name="ic_attachment_vert">@drawable/ic_attachment_vert</item>
+
+ <item name="drawer_header">@drawable/drawer_header_dark</item>
+ </style>
+</resources> \ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/values-v21/style.xml b/org.fox.ttrss/src/main/res/values-v21/style.xml
index 1e5a366a..17484a87 100755
--- a/org.fox.ttrss/src/main/res/values-v21/style.xml
+++ b/org.fox.ttrss/src/main/res/values-v21/style.xml
@@ -1,16 +1,16 @@
<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.NoActionBar">
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowBackground">@color/window_background</item>
</style>
- <style name="DarkTheme.Base" parent="Theme.AppCompat.NoActionBar">
+ <!-- <style name="DarkTheme.Base" parent="Theme.AppCompat.NoActionBar">
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowBackground">@color/window_background_dark</item>
<item name="android:navigationBarColor">@android:color/black</item>
- </style>
+ </style> -->
<style name="DarkDialogTheme" parent="android:Theme.Material.Dialog">
</style>
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>
diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml
index f20bb2cc..d9fef61a 100755
--- a/org.fox.ttrss/src/main/res/xml/preferences.xml
+++ b/org.fox.ttrss/src/main/res/xml/preferences.xml
@@ -32,7 +32,7 @@
android:key="category_look_and_feel"
android:title="@string/look_and_feel" >
<ListPreference
- android:defaultValue="THEME_LIGHT"
+ android:defaultValue="THEME_AUTO"
android:entries="@array/pref_theme_names"
android:entryValues="@array/pref_theme_values"
android:key="theme"