summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2012-01-17 13:44:46 +0300
committerAndrew Dolgov <[email protected]>2012-01-17 13:44:46 +0300
commit92e962f515e8da0c65c255d84e6d9e144381edde (patch)
tree02c2a25154780437bd1901ec00dc0ab6ed59b377
parent0f3fd963384e9c2faa734a207e980c27bd97666b (diff)
add color theme for ICS
-rw-r--r--res/values-v14/style.xml34
-rw-r--r--src/org/fox/ttrss/MainActivity.java6
2 files changed, 39 insertions, 1 deletions
diff --git a/res/values-v14/style.xml b/res/values-v14/style.xml
new file mode 100644
index 00000000..7c876100
--- /dev/null
+++ b/res/values-v14/style.xml
@@ -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">#33b5e5</item>
+ <item name="articleHeader">@android:color/transparent</item>
+ <item name="headlineSelectedBackground">#195668</item>
+ <item name="headlineUnreadBackground">#303030</item>
+ <item name="headlineNormalBackground">@android:color/transparent</item>
+ <item name="feedsSelectedBackground">#195668</item>
+ <item name="headlineSeparatorUnread">#33b5e5</item>
+ <item name="headlineSeparatorNormal">#303030</item>
+ <item name="headlineSeparatorSelected">#33b5e5</item>
+ </style>
+
+</resources> \ No newline at end of file
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java
index fb5733b7..06647e11 100644
--- a/src/org/fox/ttrss/MainActivity.java
+++ b/src/org/fox/ttrss/MainActivity.java
@@ -503,7 +503,11 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
Log.d(TAG, "m_compatMode=" + m_compatMode);
if (!m_compatMode) {
- new TransitionHelper((ViewGroup) findViewById(R.id.main));
+ if (findViewById(R.id.main_flipper) != null)
+ new TransitionHelper((ViewGroup) findViewById(R.id.main_flipper));
+ else
+ new TransitionHelper((ViewGroup) findViewById(R.id.main));
+
m_headlinesActionModeCallback = new HeadlinesActionModeCallback();
}