iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drop compat themes, use values-v11

Browse Source
This commit is contained in:
Andrew Dolgov 2011-12-05 11:45:50 +03:00
parent 40dcbe61d0
commit 41ee431715
3 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
res/values-v11/style.xml Normal file
View File

@ -0,0 +1,34 @@
<resources>
<style name="LightTheme" parent="android:Theme.Holo.Light">
<item name="feedlistDivider">@android:drawable/divider_horizontal_bright</item>
<item name="feedlistBackground">#fafafa</item>
<item name="unreadCounterColor">#0000ff</item>
<item name="headlinesBackground">#ffffff</item>
<item name="articleDivider">#96c5ff</item>
<item name="articleHeader">@android:color/transparent</item>
<item name="headlineSelectedBackground">#fff7d5</item>
<item name="headlineUnreadBackground">#ffffff</item>
<item name="headlineNormalBackground">@android:color/transparent</item>
<item name="feedsSelectedBackground">#96C5FF</item>
<item name="headlineSeparatorUnread">#96C5FF</item>
<item name="headlineSeparatorNormal">#909090</item>
<item name="headlineSeparatorSelected">#DBC981</item>
</style>
<style name="DarkTheme" parent="android:Theme.Holo">
<item name="feedlistDivider">@android:drawable/divider_horizontal_dark</item>
<item name="feedlistBackground">#101010</item>
<item name="unreadCounterColor">#303030</item>
<item name="headlinesBackground">#000000</item>
<item name="articleDivider">#303060</item>
<item name="articleHeader">@android:color/transparent</item>
<item name="headlineSelectedBackground">#303060</item>
<item name="headlineUnreadBackground">#303030</item>
<item name="headlineNormalBackground">@android:color/transparent</item>
<item name="feedsSelectedBackground">#303060</item>
<item name="headlineSeparatorUnread">#303060</item>
<item name="headlineSeparatorNormal">#303030</item>
<item name="headlineSeparatorSelected">#47478E</item>
</style>
</resources>

36
res/values/style.xml
View File

@ -1,21 +1,5 @@
<resources>
<style name="LightTheme" parent="android:Theme.Holo.Light">
<item name="feedlistDivider">@android:drawable/divider_horizontal_bright</item>
<item name="feedlistBackground">#fafafa</item>
<item name="unreadCounterColor">#0000ff</item>
<item name="headlinesBackground">#ffffff</item>
<item name="articleDivider">#96c5ff</item>
<item name="articleHeader">@android:color/transparent</item>
<item name="headlineSelectedBackground">#fff7d5</item>
<item name="headlineUnreadBackground">#ffffff</item>
<item name="headlineNormalBackground">@android:color/transparent</item>
<item name="feedsSelectedBackground">#96C5FF</item>
<item name="headlineSeparatorUnread">#96C5FF</item>
<item name="headlineSeparatorNormal">#909090</item>
<item name="headlineSeparatorSelected">#DBC981</item>
</style>
<style name="LightCompatTheme" parent="android:Theme.Light.NoTitleBar">
<style name="LightTheme" parent="android:Theme.Light.NoTitleBar">
<item name="feedlistDivider">@android:drawable/divider_horizontal_bright</item>
<item name="feedlistBackground">#fafafa</item>
<item name="unreadCounterColor">#0000ff</item>
@ -31,23 +15,7 @@
<item name="headlineSeparatorSelected">#DBC981</item>
</style>
<style name="DarkTheme" parent="android:Theme.Holo">
<item name="feedlistDivider">@android:drawable/divider_horizontal_dark</item>
<item name="feedlistBackground">#101010</item>
<item name="unreadCounterColor">#303030</item>
<item name="headlinesBackground">#000000</item>
<item name="articleDivider">#303060</item>
<item name="articleHeader">@android:color/transparent</item>
<item name="headlineSelectedBackground">#303060</item>
<item name="headlineUnreadBackground">#303030</item>
<item name="headlineNormalBackground">@android:color/transparent</item>
<item name="feedsSelectedBackground">#303060</item>
<item name="headlineSeparatorUnread">#303060</item>
<item name="headlineSeparatorNormal">#303030</item>
<item name="headlineSeparatorSelected">#47478E</item>
</style>
<style name="DarkCompatTheme" parent="android:Theme.Black.NoTitleBar">
<style name="DarkTheme" parent="android:Theme.Black.NoTitleBar">
<item name="feedlistDivider">@android:drawable/divider_horizontal_dark</item>
<item name="feedlistBackground">#101010</item>
<item name="unreadCounterColor">#303030</item>

4
src/org/fox/ttrss/MainActivity.java
View File

@ -284,9 +284,9 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe
m_compatMode = android.os.Build.VERSION.SDK_INT <= 10;
if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK")) {
setTheme(m_compatMode ? R.style.DarkCompatTheme : R.style.DarkTheme);
setTheme(R.style.DarkTheme);
} else {
setTheme(m_compatMode ? R.style.LightCompatTheme : R.style.LightTheme);
setTheme(R.style.LightTheme);
}
super.onCreate(savedInstanceState);