diff options
author | Andrew Dolgov <[email protected]> | 2014-10-16 00:11:59 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2014-10-16 00:11:59 +0400 |
commit | a77d00eeea212f17df05bf63a23745b2d46ba2d3 (patch) | |
tree | 3d0011b24f4d67c231d9380d9050c2233ef6b1d6 | |
parent | 88dcb055a2bb81fa226a9233d7e08fca0bdae805 (diff) |
theme-related fixes
-rw-r--r-- | res/values-v19/style.xml | 27 | ||||
-rw-r--r-- | res/values/style.xml | 37 |
2 files changed, 44 insertions, 20 deletions
diff --git a/res/values-v19/style.xml b/res/values-v19/style.xml new file mode 100644 index 00000000..9bf1e68e --- /dev/null +++ b/res/values-v19/style.xml @@ -0,0 +1,27 @@ +<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <style name="LightTheme" parent="LightThemeBase">
+ <item name="android:windowTranslucentStatus">true</item>
+ <item name="android:windowTranslucentNavigation">false</item>
+ <item name="android:fitsSystemWindows">true</item>
+ </style>
+
+ <style name="SepiaTheme" parent="SepiaThemeBase">
+ <item name="android:windowTranslucentStatus">true</item>
+ <item name="android:windowTranslucentNavigation">false</item>
+ <item name="android:fitsSystemWindows">true</item>
+ </style>
+
+ <style name="HoloTheme" parent="HoloThemeBase">
+ <item name="android:windowTranslucentStatus">true</item>
+ <item name="android:windowTranslucentNavigation">false</item>
+ <item name="android:fitsSystemWindows">true</item>
+ </style>
+
+ <style name="DarkTheme" parent="DarkThemeBase">
+ <item name="android:windowTranslucentStatus">true</item>
+ <item name="android:windowTranslucentNavigation">false</item>
+ <item name="android:fitsSystemWindows">true</item>
+ </style>
+
+</resources>
\ No newline at end of file diff --git a/res/values/style.xml b/res/values/style.xml index 4028d3a1..8c1fb98f 100644 --- a/res/values/style.xml +++ b/res/values/style.xml @@ -1,10 +1,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="LightTheme" parent="Theme.AppCompat.Light.DarkActionBar"> - <item name="android:windowTranslucentStatus">true</item> - <item name="android:windowTranslucentNavigation">false</item> - <item name="android:fitsSystemWindows">true</item> + + <style name="LightThemeBase" parent="Theme.AppCompat.Light.DarkActionBar"> <item name="statusBarHintColor">#6482AF</item> - <item name="smallScreenBackground">#eeeeee</item> <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_bright</item> <item name="feedlistBackground"><!-- #e0e0e0 -->@drawable/shadow_feeds</item> @@ -35,12 +32,11 @@ <item name="android:actionBarStyle">@style/ActionBar.Light</item> </style> - <style name="SepiaTheme" parent="LightTheme"> - <item name="android:windowTranslucentStatus">true</item> - <item name="android:windowTranslucentNavigation">false</item> - <item name="android:fitsSystemWindows">true</item> + <style name="LightTheme" parent="LightThemeBase"> + </style> + + <style name="SepiaThemeBase" parent="LightTheme"> <item name="statusBarHintColor">#7F3F3F</item> - <item name="smallScreenBackground">@drawable/paper_sepia</item> <item name="feedlistBackground">@drawable/shadow_feeds_sepia</item> <item name="headlinesBackground">@drawable/shadow_headlines_sepia</item> @@ -57,12 +53,11 @@ <item name="android:actionBarStyle">@style/ActionBar.Sepia</item> </style> - <style name="HoloTheme" parent="Theme.AppCompat"> - <item name="android:windowTranslucentStatus">true</item> - <item name="android:windowTranslucentNavigation">false</item> - <item name="android:fitsSystemWindows">true</item> + <style name="SepiaTheme" parent="SepiaThemeBase"> + </style> + + <style name="HoloThemeBase" parent="Theme.AppCompat"> <item name="statusBarHintColor">@android:color/black</item> - <item name="smallScreenBackground">@android:color/transparent</item> <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item> <item name="feedlistBackground">@android:color/transparent</item> @@ -92,12 +87,11 @@ <item name="articleNoteBackground">#303030</item> </style> - <style name="DarkTheme" parent="HoloTheme"> - <item name="android:windowTranslucentStatus">true</item> - <item name="android:windowTranslucentNavigation">false</item> - <item name="android:fitsSystemWindows">true</item> + <style name="HoloTheme" parent="HoloThemeBase"> + </style> + + <style name="DarkThemeBase" parent="HoloTheme"> <item name="statusBarHintColor">#394A63</item> - <item name="smallScreenBackground">@color/feeds_dark_gray</item> <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item> <item name="feedlistBackground">@drawable/shadow_feeds_gray</item> @@ -115,6 +109,9 @@ <item name="headlineSelectedSecondaryTextColor">#a0a0a0</item> </style> + <style name="DarkTheme" parent="DarkThemeBase"> + </style> + <style name="ActionBar.Light" parent="Widget.AppCompat.ActionBar.Solid"> <item name="android:background">#6482AF</item> <item name="android:titleTextStyle">@style/ActionBarText.Light</item> |