summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.classpath2
-rw-r--r--res/values-v11/style.xml95
-rw-r--r--res/values/arrays.xml2
-rw-r--r--res/values/strings.xml1
-rw-r--r--res/values/style.xml43
-rw-r--r--src/org/fox/ttrss/CommonActivity.java3
6 files changed, 43 insertions, 103 deletions
diff --git a/.classpath b/.classpath
index 925078d1..aa361afe 100644
--- a/.classpath
+++ b/.classpath
@@ -8,6 +8,6 @@
<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
<classpathentry kind="lib" path="libs/dashclock-api-r1.1.jar"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
- <classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+ <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
diff --git a/res/values-v11/style.xml b/res/values-v11/style.xml
index d2adf334..d09304cd 100644
--- a/res/values-v11/style.xml
+++ b/res/values-v11/style.xml
@@ -1,99 +1,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
- <style name="LightTheme" parent="Theme.Sherlock.Light.DarkActionBar">
- <item name="smallScreenBackground">@android:color/transparent</item>
- <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_bright</item>
- <item name="feedlistBackground"><!-- #e0e0e0 -->@drawable/shadow_feeds</item>
- <item name="unreadCounterColor">#ffffff</item>
- <item name="headlinesBackground"><!-- #f0f0f0 -->@drawable/shadow_headlines</item>
- <item name="headlinesBackgroundSolid">#f0f0f0</item>
- <item name="articleBackground">@android:color/transparent</item>
- <item name="headlineSelectedBackground">@drawable/headline_row_selected</item>
- <item name="headlineUnreadBackground">@drawable/headline_row_unread</item>
- <item name="headlineNormalBackground">@drawable/headline_row</item>
- <item name="feedsSelectedBackground">#88b0f0</item>
- <item name="feedlistTextColor">@android:color/primary_text_light</item>
- <item name="feedlistSelectedTextColor">#ffffff</item>
- <item name="headlineTextColor">@android:color/secondary_text_light</item>
- <item name="headlineUnreadTextColor">@android:color/primary_text_light</item>
- <item name="headlineSelectedTextColor">#ffffff</item>
- <item name="headlineExcerptTextColor">@android:color/secondary_text_light</item>
- <item name="headlineSecondaryTextColor">#909090</item>
- <item name="headlineSelectedSecondaryTextColor">#606060</item>
- <item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_light</item>
- <item name="headlineTitleHighScoreUnreadTextColor">#008000</item>
- <item name="linkColor">#4684ff</item>
- <item name="loadingBackground">@android:color/white</item>
- <item name="unreadCounterBackground">@drawable/counter_background</item>
- <item name="unreadSelectedCounterBackground">@drawable/counter_background_selected_light</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="headlineUnreadBackground">@drawable/headline_row_unread_sepia</item> <!-- #F2EAE8 -->
- <item name="headlineNormalBackground">@drawable/headline_row_sepia</item>
- <item name="headlineSelectedBackground">@drawable/headline_row_selected_sepia</item> <!-- #E5B0A0 -->
- <item name="feedsSelectedBackground">#E5B0A0</item>
- <item name="articleBackground">@drawable/paper_sepia</item>
- <item name="unreadCounterBackground">@drawable/counter_background_sepia</item>
- <item name="unreadSelectedCounterBackground">@drawable/counter_background_sepia</item>
- <item name="feedlistTextColor">#35281C</item>
- <item name="linkColor">#C46262</item>
- <!-- <item name="android:actionBarStyle">@style/ActionBarSepia</item> -->
- </style>
-
- <style name="DarkTheme" parent="Theme.Sherlock">
- <item name="smallScreenBackground">@android:color/transparent</item>
- <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item>
- <item name="feedlistBackground">@android:color/transparent</item>
- <item name="unreadCounterColor">#ffffff</item>
- <item name="headlinesBackground">@android:color/black</item>
- <item name="headlinesBackgroundSolid">@android:color/black</item>
- <item name="articleBackground">@android:color/black</item>
- <item name="headlineSelectedBackground">@color/ics_cyan</item>
- <item name="headlineUnreadBackground">#202020</item>
- <item name="headlineNormalBackground">#151515</item>
- <item name="feedsSelectedBackground">@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="headlineSecondaryTextColor">#909090</item>
- <item name="headlineSelectedSecondaryTextColor">#404040</item>
- <item name="headlineTitleHighScoreUnreadTextColor">#00FF00</item>
- <item name="linkColor">@color/ics_cyan</item>
- <item name="loadingBackground">@android:color/black</item>
- <item name="unreadCounterBackground">@drawable/counter_background_dark</item>
- <item name="unreadSelectedCounterBackground">@drawable/counter_background_dark</item>
- </style>
-
- <style name="DarkGrayTheme" parent="DarkTheme">
- <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>
- <item name="headlinesBackground">@drawable/shadow_headlines_gray</item>
- <item name="headlinesBackgroundSolid">@color/feeds_dark_gray</item>
- <item name="articleBackground">@color/feeds_dark_gray</item>
- <item name="headlineSelectedBackground">#22667f</item>
- <item name="headlineUnreadBackground">#383c42</item>
- <item name="feedsSelectedBackground">#22667f</item>
- <item name="feedlistSelectedTextColor">@android:color/primary_text_dark</item>
- <item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_dark</item>
- <item name="headlineTextColor">@android:color/secondary_text_dark</item>
- <item name="actionBarStyle">@style/ActionBarDarkGray</item>
- <item name="android:actionBarStyle">@style/ActionBarDarkGray</item>
- <item name="headlineSelectedSecondaryTextColor">#a0a0a0</item>
-
- </style>
-
- <style name="ActionBarDarkGray" parent="Widget.Sherlock.ActionBar.Solid">
- <item name="android:background">#232527</item>
- </style>
<style name="DarkDialogTheme" parent="android:Theme.Holo.Dialog">
</style>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 63e90184..3586c84c 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -4,12 +4,14 @@
<item>@string/theme_dark_gray</item>
<item>@string/theme_light</item>
<item>@string/theme_sepia</item>
+ <item>@string/theme_system</item>
</string-array>
<string-array name="pref_theme_values" translatable="false">
<item>THEME_DARK</item>
<item>THEME_DARK_GRAY</item>
<item>THEME_LIGHT</item>
<item>THEME_SEPIA</item>
+ <item>THEME_SYSTEM</item>
</string-array>
<string-array name="pref_font_size_names">
<item>@string/font_size_small</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e4ef4831..24e3fc1f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -201,4 +201,5 @@
<string name="n_unread_articles">%1$d unread articles</string>
<string name="pref_headline_font_size">Headline text size</string>
<string name="context_confirm_catchup">Mark all articles in %1$s as read?</string>
+ <string name="theme_system">Device Default (4.2+)</string>
</resources>
diff --git a/res/values/style.xml b/res/values/style.xml
index 4a8e93ba..31299fae 100644
--- a/res/values/style.xml
+++ b/res/values/style.xml
@@ -7,9 +7,9 @@
<item name="headlinesBackground"><!-- #f0f0f0 -->@drawable/shadow_headlines</item>
<item name="headlinesBackgroundSolid">#f0f0f0</item>
<item name="articleBackground">@android:color/transparent</item>
- <item name="headlineSelectedBackground">#88b0f0</item>
- <item name="headlineUnreadBackground">#ffffff</item>
- <item name="headlineNormalBackground">#f0f0f0</item>
+ <item name="headlineSelectedBackground">@drawable/headline_row_selected</item>
+ <item name="headlineUnreadBackground">@drawable/headline_row_unread</item>
+ <item name="headlineNormalBackground">@drawable/headline_row</item>
<item name="feedsSelectedBackground">#88b0f0</item>
<item name="feedlistTextColor">@android:color/primary_text_light</item>
<item name="feedlistSelectedTextColor">#ffffff</item>
@@ -32,8 +32,9 @@
<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="headlineUnreadBackground">#f2eae8</item> <!-- #F2EAE8 -->
- <item name="headlineSelectedBackground">#E5B0A0</item>
+ <item name="headlineUnreadBackground">@drawable/headline_row_unread_sepia</item> <!-- #F2EAE8 -->
+ <item name="headlineNormalBackground">@drawable/headline_row_sepia</item>
+ <item name="headlineSelectedBackground">@drawable/headline_row_selected_sepia</item> <!-- #E5B0A0 -->
<item name="feedsSelectedBackground">#E5B0A0</item>
<item name="articleBackground">@drawable/paper_sepia</item>
<item name="unreadCounterBackground">@drawable/counter_background_sepia</item>
@@ -70,7 +71,35 @@
<item name="unreadCounterBackground">@drawable/counter_background_dark</item>
<item name="unreadSelectedCounterBackground">@drawable/counter_background_dark</item>
</style>
-
+
+ <style name="SystemTheme" parent="Theme.Sherlock.DeviceDefault">
+ <item name="smallScreenBackground">@android:color/transparent</item>
+ <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item>
+ <item name="feedlistBackground">@android:color/transparent</item>
+ <item name="unreadCounterColor">#ffffff</item>
+ <item name="headlinesBackground">@android:color/black</item>
+ <item name="headlinesBackgroundSolid">@android:color/black</item>
+ <item name="articleBackground">@android:color/black</item>
+ <item name="headlineSelectedBackground">@color/ics_cyan</item>
+ <item name="headlineUnreadBackground">#202020</item>
+ <item name="headlineNormalBackground">#151515</item>
+ <item name="feedsSelectedBackground">@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="headlineSecondaryTextColor">#909090</item>
+ <item name="headlineSelectedSecondaryTextColor">#404040</item>
+ <item name="headlineTitleHighScoreUnreadTextColor">#00FF00</item>
+ <item name="linkColor">@color/ics_cyan</item>
+ <item name="loadingBackground">@android:color/black</item>
+ <item name="unreadCounterBackground">@drawable/counter_background_dark</item>
+ <item name="unreadSelectedCounterBackground">@drawable/counter_background_dark</item>
+ </style>
+
<style name="DarkGrayTheme" parent="DarkTheme">
<item name="smallScreenBackground">@color/feeds_dark_gray</item>
<item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item>
@@ -93,7 +122,7 @@
<style name="ActionBarDarkGray" parent="Widget.Sherlock.ActionBar.Solid">
<item name="android:background">#232527</item>
</style>
-
+
<style name="DarkDialogTheme" parent="android:Theme.Dialog">
</style>
diff --git a/src/org/fox/ttrss/CommonActivity.java b/src/org/fox/ttrss/CommonActivity.java
index 5edceb4e..dd426966 100644
--- a/src/org/fox/ttrss/CommonActivity.java
+++ b/src/org/fox/ttrss/CommonActivity.java
@@ -173,6 +173,7 @@ public class CommonActivity extends SherlockFragmentActivity {
String defaultTheme = "THEME_DARK";
return (m_prefs.getString("theme", defaultTheme).equals("THEME_DARK")) ||
+ m_prefs.getString("theme", defaultTheme).equals("THEME_SYSTEM") ||
m_prefs.getString("theme", defaultTheme).equals("THEME_DARK_GRAY");
}
@@ -181,6 +182,8 @@ public class CommonActivity extends SherlockFragmentActivity {
if (prefs.getString("theme", defaultTheme).equals("THEME_DARK")) {
setTheme(R.style.DarkTheme);
+ } else if (prefs.getString("theme", defaultTheme).equals("THEME_SYSTEM")) {
+ setTheme(R.style.SystemTheme);
} else if (prefs.getString("theme", defaultTheme).equals("THEME_SEPIA")) {
setTheme(R.style.SepiaTheme);
} else if (prefs.getString("theme", defaultTheme).equals("THEME_DARK_GRAY")) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-14 04:47:23 +0000