diff options
author | Andrew Dolgov <[email protected]> | 2013-01-03 13:15:56 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-01-03 13:15:56 +0400 |
commit | 4b92a16f101359cac1df7fd8fded54c0af2d5f20 (patch) | |
tree | 4d5417dfbb5abcb8460991d93385d19a6244df67 | |
parent | 5d1c621be89852b900f4346b75917675a90a519d (diff) |
add v11 style resources to fix theme breakage on HC
-rw-r--r-- | AndroidManifest.xml | 4 | ||||
-rw-r--r-- | res/values-v11/style.xml | 3 | ||||
-rw-r--r-- | res/values-v15/style.xml | 67 |
3 files changed, 71 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c6388116..91512dce 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="127" - android:versionName="1.5" > + android:versionCode="128" + android:versionName="1.6" > <uses-sdk android:minSdkVersion="8" diff --git a/res/values-v11/style.xml b/res/values-v11/style.xml index 9ded814e..6e9a67d8 100644 --- a/res/values-v11/style.xml +++ b/res/values-v11/style.xml @@ -1,5 +1,6 @@ +<!-- Note: the only difference between this and v15 style is Holo.Light base theme (Holo.Light.DarkActionBar does not exist in HC and causes breakage) -->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
- <style name="LightTheme" parent="android:Theme.Holo.Light.DarkActionBar">
+ <style name="LightTheme" parent="android:Theme.Holo.Light">
<item name="smallScreenBackground">@android:color/transparent</item>
<item name="horizontalDivider">@android:drawable/divider_horizontal_bright</item>
<item name="feedlistBackground"><!-- #e0e0e0 -->@drawable/shadow_feeds</item>
diff --git a/res/values-v15/style.xml b/res/values-v15/style.xml new file mode 100644 index 00000000..9ded814e --- /dev/null +++ b/res/values-v15/style.xml @@ -0,0 +1,67 @@ +<resources xmlns:android="http://schemas.android.com/apk/res/android">
+ <style name="LightTheme" parent="android:Theme.Holo.Light.DarkActionBar">
+ <item name="smallScreenBackground">@android:color/transparent</item>
+ <item name="horizontalDivider">@android:drawable/divider_horizontal_bright</item>
+ <item name="feedlistBackground"><!-- #e0e0e0 -->@drawable/shadow_feeds</item>
+ <item name="unreadCounterColor">#0000ff</item>
+ <item name="headlinesBackground"><!-- #f0f0f0 -->@drawable/shadow_headlines</item>
+ <item name="headlinesBackgroundSolid">#f0f0f0</item>
+ <item name="articleBackground">#ffffff</item>
+ <item name="headlineSelectedBackground">@drawable/headline_row_selected_light</item>
+ <item name="headlineSelectedBackgroundSolid">@color/headline_row_selected_light</item>
+ <item name="headlineUnreadBackground">@android:color/transparent</item>
+ <item name="headlineNormalBackground">@android:color/transparent</item>
+ <item name="feedsSelectedBackground">@drawable/headline_row_selected_light</item>
+ <item name="feedsSelectedBackgroundSolid">@color/headline_row_selected_light</item>
+ <item name="feedlistTextColor">@android:color/primary_text_light</item>
+ <item name="feedlistSelectedTextColor">#ffffff</item>
+ <item name="headlineTextColor">#909090</item>
+ <item name="headlineUnreadTextColor">@android:color/primary_text_light</item>
+ <item name="headlineSelectedTextColor">#ffffff</item>
+ <item name="headlineExcerptTextColor">#909090</item>
+ <item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_light</item>
+ <item name="linkColor">#30B0E0</item>
+ <item name="loadingBackground">@android:color/white</item>
+ </style>
+
+ <style name="SepiaTheme" parent="LightTheme">
+ <item name="smallScreenBackground">@drawable/paper_sepia</item>
+ <item name="feedlistBackground">@drawable/shadow_feeds_sepia</item>
+ <item name="headlinesBackground">@drawable/shadow_headlines_sepia</item>
+ <item name="headlinesBackgroundSolid">@drawable/paper_sepia</item>
+ <item name="headlineSelectedBackground">@drawable/headline_row_selected_sepia</item>
+ <item name="headlineSelectedBackgroundSolid">@color/headline_row_selected_sepia</item>
+ <item name="feedsSelectedBackground">@drawable/headline_row_selected_sepia</item>
+ <item name="feedsSelectedBackgroundSolid">@color/headline_row_selected_sepia</item>
+ <item name="articleBackground">@drawable/paper_sepia</item>
+ <item name="unreadCounterColor">#C46262</item>
+ <item name="feedlistTextColor">#35281C</item>
+ <item name="linkColor">#C46262</item>
+ </style>
+
+ <style name="DarkTheme" parent="android:Theme.Holo">
+ <item name="smallScreenBackground">@android:color/transparent</item>
+ <item name="horizontalDivider">@android:drawable/divider_horizontal_dark</item>
+ <item name="feedlistBackground">@drawable/ics_divider_vertical</item>
+ <item name="unreadCounterColor">#303030</item>
+ <item name="headlinesBackground">@drawable/headlines_dark</item>
+ <item name="headlinesBackgroundSolid">@drawable/headlines_dark</item>
+ <item name="articleBackground">@android:color/black</item>
+ <item name="headlineSelectedBackground">@drawable/headline_row_selected_dark</item>
+ <item name="headlineSelectedBackgroundSolid">@color/ics_cyan</item>
+ <item name="headlineUnreadBackground">@android:color/transparent</item>
+ <item name="headlineNormalBackground">@android:color/transparent</item>
+ <item name="feedsSelectedBackground">@drawable/headline_row_selected_dark</item>
+ <item name="feedsSelectedBackgroundSolid">@color/ics_cyan</item>
+ <item name="feedlistTextColor">@android:color/primary_text_dark</item>
+ <item name="feedlistSelectedTextColor">@android:color/black</item>
+ <item name="headlineTextColor">@android:color/secondary_text_dark</item>
+ <item name="headlineUnreadTextColor">@android:color/primary_text_dark</item>
+ <item name="headlineSelectedTextColor">@android:color/white</item>
+ <item name="headlineExcerptTextColor">@android:color/secondary_text_dark</item>
+ <item name="headlineSelectedExcerptTextColor">@android:color/black</item>
+ <item name="linkColor">@color/ics_cyan</item>
+ <item name="loadingBackground">@android:color/black</item>
+ </style>
+
+</resources>
\ No newline at end of file |