From bc7e851b9a11655f9cbca91d301781c238c4d67e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Fri, 22 Jun 2012 00:35:53 +0400
Subject: [PATCH] add shadows to light theme, misc layout/theme tweaks

---
 res/drawable-hdpi/shadow_bitmap.png           | Bin 0 -> 299 bytes
 res/drawable/shadow.xml                       |   5 ++
 res/drawable/shadow_feeds.xml                 |   7 ++
 res/drawable/shadow_headlines.xml             |   7 ++
 res/layout-port/headlines_row.xml             |   7 --
 res/layout-port/headlines_row_selected.xml    |   7 --
 res/layout-port/headlines_row_unread.xml      |   9 +--
 res/layout-xlarge-port/main.xml               |  74 +++++++++---------
 res/layout-xlarge/headlines_row.xml           |   8 --
 res/layout-xlarge/headlines_row_selected.xml  |   7 --
 res/layout-xlarge/headlines_row_unread.xml    |   9 +--
 res/layout-xlarge/main.xml                    |  59 +++++++-------
 res/layout/article_fragment.xml               |  34 ++------
 res/layout/feeds_fragment.xml                 |   3 +-
 res/layout/headlines_row.xml                  |   8 --
 res/layout/headlines_row_selected.xml         |   7 --
 res/layout/headlines_row_unread.xml           |   9 +--
 res/values-v11/style.xml                      |  49 ------------
 res/values-v14/style.xml                      |  26 +++---
 res/values/attrs.xml                          |   2 +
 res/values/resources.xml                      |   7 ++
 res/values/style.xml                          |   4 +
 src/org/fox/ttrss/ArticleFragment.java        |   5 +-
 src/org/fox/ttrss/HeadlinesFragment.java      |   4 +-
 src/org/fox/ttrss/MainActivity.java           |   8 +-
 .../ttrss/offline/OfflineArticleFragment.java |   5 +-
 .../offline/OfflineHeadlinesFragment.java     |   4 +-
 27 files changed, 145 insertions(+), 229 deletions(-)
 create mode 100644 res/drawable-hdpi/shadow_bitmap.png
 create mode 100644 res/drawable/shadow.xml
 create mode 100644 res/drawable/shadow_feeds.xml
 create mode 100644 res/drawable/shadow_headlines.xml
 delete mode 100644 res/values-v11/style.xml
 create mode 100644 res/values/resources.xml

diff --git a/res/drawable-hdpi/shadow_bitmap.png b/res/drawable-hdpi/shadow_bitmap.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fb8a2503e4a8a0519d3932428cb072e95754fe4
GIT binary patch
literal 299
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nC-mUKs7M+SzC{oH>NS%G}c0*}aI
z1_r)^Ak4U9V)k30pk#?_L`iUdT1k0gQ7S_~VrE{6o}X)oLYc9ish)+obweyr(F#u&
z$B+!?w=*5NnjHjK*qv1lCU^vhs2=>k-{>n7KcBF^>XpE0va4^#^;kU5jQGYBp7D^a
z{KW%CTbqZh`4R~&oM{mWt^75K*6GrMc}Mhvp3KWyIW6n0|AC$vg2qX1I=!x%0lHU%
z)}CQmqY*Zx$KLw=s%bzKqDQ-erZ8O%(!F}h=RjAI>&YL<zrUtuOtfFMG-_381=GAY
p^WL;S{h0Lh=qitS_N%`#7yNKJ`1$VUOF%a>c)I$ztaD0e0s!}BZk_-D

literal 0
HcmV?d00001

diff --git a/res/drawable/shadow.xml b/res/drawable/shadow.xml
new file mode 100644
index 00000000..51670851
--- /dev/null
+++ b/res/drawable/shadow.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/shadow_bitmap"
+    android:gravity="fill_vertical|right" />    
diff --git a/res/drawable/shadow_feeds.xml b/res/drawable/shadow_feeds.xml
new file mode 100644
index 00000000..f43427c4
--- /dev/null
+++ b/res/drawable/shadow_feeds.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item android:drawable="@color/feeds_light"/>
+    <item android:drawable="@drawable/shadow"/>
+    
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/shadow_headlines.xml b/res/drawable/shadow_headlines.xml
new file mode 100644
index 00000000..09e5aa6a
--- /dev/null
+++ b/res/drawable/shadow_headlines.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item android:drawable="@color/headlines_light"/>
+    <item android:drawable="@drawable/shadow"/>
+    
+</layer-list>
\ No newline at end of file
diff --git a/res/layout-port/headlines_row.xml b/res/layout-port/headlines_row.xml
index 223dfc0d..85710827 100644
--- a/res/layout-port/headlines_row.xml
+++ b/res/layout-port/headlines_row.xml
@@ -12,13 +12,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
 
-        <ImageView
-            android:id="@+id/headlines_separator"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:background="?headlineSeparatorNormal"
-            android:paddingRight="4dip" />
-
         <LinearLayout
             android:id="@+id/linearLayout1"
             android:layout_width="match_parent"
diff --git a/res/layout-port/headlines_row_selected.xml b/res/layout-port/headlines_row_selected.xml
index 74b7ca8d..2d1620db 100644
--- a/res/layout-port/headlines_row_selected.xml
+++ b/res/layout-port/headlines_row_selected.xml
@@ -12,13 +12,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
 
-        <ImageView
-            android:id="@+id/headlines_separator"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:background="?headlineSeparatorSelected"
-            android:paddingRight="4dip" />
-
         <LinearLayout
             android:id="@+id/linearLayout1"
             android:layout_width="match_parent"
diff --git a/res/layout-port/headlines_row_unread.xml b/res/layout-port/headlines_row_unread.xml
index 4910cdc7..46b28538 100644
--- a/res/layout-port/headlines_row_unread.xml
+++ b/res/layout-port/headlines_row_unread.xml
@@ -12,13 +12,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
 
-        <ImageView
-            android:id="@+id/headlines_separator"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:background="?headlineSeparatorUnread"
-            android:paddingRight="4dip" />
-
         <LinearLayout
             android:id="@+id/linearLayout1"
             android:layout_width="match_parent"
@@ -34,7 +27,7 @@
                 android:ellipsize="end"
                 android:singleLine="true"
                 android:text="There are many variations of passages of Lorem Ipsum available"
-                android:textColor="?headlineTextColor"
+                android:textColor="?headlineUnreadTextColor"
                 android:textSize="16sp" />
 
             <LinearLayout
diff --git a/res/layout-xlarge-port/main.xml b/res/layout-xlarge-port/main.xml
index 37553326..78ccdd3d 100644
--- a/res/layout-xlarge-port/main.xml
+++ b/res/layout-xlarge-port/main.xml
@@ -3,6 +3,44 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent" >
 
+    <LinearLayout
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal" >
+
+        <FrameLayout
+            android:id="@+id/feeds_fragment"
+            android:layout_width="300dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0"
+            android:background="?feedlistBackground" >
+        </FrameLayout>
+
+        <LinearLayout
+            android:id="@+id/vertical_fragment_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical" >
+
+            <FrameLayout
+                android:id="@+id/headlines_fragment"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="0.5"
+                android:background="?headlinesBackgroundSolid" >
+            </FrameLayout>
+
+            <FrameLayout
+                android:id="@+id/article_fragment"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:background="?articleHeader" 
+                android:layout_weight="0.5" >
+            </FrameLayout>
+        </LinearLayout>
+    </LinearLayout>
+
     <LinearLayout
         android:id="@+id/loading_container"
         android:layout_width="match_parent"
@@ -18,40 +56,4 @@
             android:text="@string/loading_message"
             android:textAppearance="?android:attr/textAppearanceLarge" />
     </LinearLayout>
-
-    <LinearLayout
-        android:orientation="horizontal" 
-        android:id="@+id/fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" >
-    
-    <FrameLayout
-        android:id="@+id/feeds_fragment"
-        android:layout_width="300dp"
-        android:layout_height="match_parent"
-        android:layout_weight="0" >
-    </FrameLayout>
-
-    <LinearLayout
-        android:id="@+id/vertical_fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical" >
-
-        <FrameLayout
-            android:id="@+id/headlines_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="0.5" >
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/article_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="0.5" >
-        </FrameLayout>
-    </LinearLayout>
-
-    </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout-xlarge/headlines_row.xml b/res/layout-xlarge/headlines_row.xml
index 73e6b941..9a311ef9 100644
--- a/res/layout-xlarge/headlines_row.xml
+++ b/res/layout-xlarge/headlines_row.xml
@@ -14,14 +14,6 @@
         android:gravity="center_vertical"
         android:orientation="horizontal" >
 
-
-        <ImageView
-            android:id="@+id/headlines_separator"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:background="?headlineSeparatorNormal"
-            android:paddingRight="4dip" />
-
         <CheckBox
             android:id="@+id/selected"
             android:layout_width="wrap_content"
diff --git a/res/layout-xlarge/headlines_row_selected.xml b/res/layout-xlarge/headlines_row_selected.xml
index 00171f0d..80dfaac2 100644
--- a/res/layout-xlarge/headlines_row_selected.xml
+++ b/res/layout-xlarge/headlines_row_selected.xml
@@ -13,13 +13,6 @@
         android:gravity="center_vertical"
         android:orientation="horizontal" >
 
-        <ImageView
-            android:id="@+id/headlines_separator"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:background="?headlineSeparatorSelected"
-            android:paddingRight="4dip" />
-
         <CheckBox
             android:id="@+id/selected"
             android:layout_width="wrap_content"
diff --git a/res/layout-xlarge/headlines_row_unread.xml b/res/layout-xlarge/headlines_row_unread.xml
index 1ba714ab..23f648a2 100644
--- a/res/layout-xlarge/headlines_row_unread.xml
+++ b/res/layout-xlarge/headlines_row_unread.xml
@@ -13,13 +13,6 @@
         android:gravity="center_vertical"
         android:orientation="horizontal" >
 
-        <ImageView
-            android:id="@+id/headlines_separator"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:background="?headlineSeparatorUnread"
-            android:paddingRight="4dip" />
-
         <CheckBox
             android:id="@+id/selected"
             android:layout_width="wrap_content"
@@ -43,7 +36,7 @@
                 android:ellipsize="end"
                 android:singleLine="true"
                 android:text="{Title...}"
-                android:textColor="?headlineTextColor"
+                android:textColor="?headlineUnreadTextColor"
                 android:textSize="16sp" >
             </TextView>
 
diff --git a/res/layout-xlarge/main.xml b/res/layout-xlarge/main.xml
index 283e35ae..3278ff22 100644
--- a/res/layout-xlarge/main.xml
+++ b/res/layout-xlarge/main.xml
@@ -4,6 +4,37 @@
     android:layout_height="fill_parent"
     >
 
+    <LinearLayout
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal" >
+
+        <FrameLayout
+            android:id="@+id/feeds_fragment"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.3"
+            android:background="?feedlistBackground" >
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/headlines_fragment"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.4"
+            android:background="?headlinesBackground" >
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/article_fragment"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.6"
+            android:background="?articleHeader" >
+        </FrameLayout>
+    </LinearLayout>
+
     <LinearLayout
         android:id="@+id/loading_container"
         android:layout_width="match_parent"
@@ -20,32 +51,4 @@
             android:textAppearance="?android:attr/textAppearanceLarge" />
     </LinearLayout>
 
-    <LinearLayout
-        android:orientation="horizontal" 
-        android:id="@+id/fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" >
-
-        <FrameLayout
-            android:id="@+id/feeds_fragment"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.3" >
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/headlines_fragment"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.4" >
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/article_fragment"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.6" >
-        </FrameLayout>
-    </LinearLayout>
-
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml
index f884f8c2..16ae890a 100644
--- a/res/layout/article_fragment.xml
+++ b/res/layout/article_fragment.xml
@@ -3,17 +3,7 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="horizontal" >
-
-    <ImageView
-        android:id="@+id/splitter_vertical"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_weight="0"
-        android:background="?articleDivider"
-        android:clickable="true"
-        android:paddingLeft="4dip" >
-    </ImageView>
-
+

     <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:ads="http://schemas.android.com/apk/lib/com.google.ads"
@@ -21,26 +11,16 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:orientation="vertical" >
-
-        <ImageView
-            android:id="@+id/splitter_horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:background="?articleDivider"
-            android:clickable="true"
-            android:paddingTop="4dip" />
+        android:orientation="vertical"
+        android:padding="5sp" >
 
         <LinearLayout
             android:id="@+id/article_header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:background="?articleHeader"
+            android:layout_weight="0"            
             android:orientation="vertical"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp" >
+            android:paddingBottom="5sp">
 
             <TextView
                 android:id="@+id/title"
@@ -48,7 +28,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text="There are many variations of passages of Lorem Ipsum available"
-                android:textSize="15sp" />
+                android:textSize="16sp" />
 

             <LinearLayout
                 android:layout_width="match_parent"
@@ -89,7 +69,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:padding="3dip" >
+            android:padding="5sp" >
         </WebView>
 
         <LinearLayout
diff --git a/res/layout/feeds_fragment.xml b/res/layout/feeds_fragment.xml
index c7f9237f..2204feb8 100644
--- a/res/layout/feeds_fragment.xml
+++ b/res/layout/feeds_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    
     android:layout_height="fill_parent" android:layout_width="match_parent" android:id="@+id/feeds_fragment">
     <LinearLayout android:id="@+id/loading_container" android:gravity="center" android:layout_height="match_parent" android:layout_width="match_parent">
         <TextView android:layout_width="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" android:id="@+id/loading_message" android:layout_height="wrap_content" ></TextView>
@@ -8,7 +9,7 @@
     <ListView android:id="@+id/feeds" android:layout_height="match_parent" android:layout_width="match_parent"></ListView>
 
      <TextView android:id="@+id/no_feeds"
-     	android:visibility="invisible"    	
+     	android:visibility="invisible"    	
     	android:layout_gravity="center" android:color="#909090" 
     	android:textAppearance="?android:attr/textAppearanceLarge" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_feeds"></TextView>
         
diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml
index 26c7bc95..8b154777 100644
--- a/res/layout/headlines_row.xml
+++ b/res/layout/headlines_row.xml
@@ -14,14 +14,6 @@
         android:gravity="center_vertical"
         android:orientation="horizontal" >
 
-
-        <ImageView
-            android:id="@+id/headlines_separator"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:background="?headlineSeparatorNormal"
-            android:paddingRight="4dip" />
-
         <CheckBox
             android:id="@+id/selected"
             android:layout_width="wrap_content"
diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml
index 8a6ee7e7..115167bb 100644
--- a/res/layout/headlines_row_selected.xml
+++ b/res/layout/headlines_row_selected.xml
@@ -13,13 +13,6 @@
         android:gravity="center_vertical"
         android:orientation="horizontal" >
 
-        <ImageView
-            android:id="@+id/headlines_separator"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:background="?headlineSeparatorSelected"
-            android:paddingRight="4dip" />
-
         <CheckBox
             android:id="@+id/selected"
             android:layout_width="wrap_content"
diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml
index 5a2bbc53..b85b6699 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout/headlines_row_unread.xml
@@ -13,13 +13,6 @@
         android:gravity="center_vertical"
         android:orientation="horizontal" >
 
-        <ImageView
-            android:id="@+id/headlines_separator"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:background="?headlineSeparatorUnread"
-            android:paddingRight="4dip" />
-
         <CheckBox
             android:id="@+id/selected"
             android:layout_width="wrap_content"
@@ -43,7 +36,7 @@
                 android:ellipsize="end"
                 android:singleLine="true"
                 android:text="{Title...}"
-                android:textColor="?headlineTextColor"
+                android:textColor="?headlineUnreadTextColor"
                 android:textSize="16sp" >
             </TextView>
 
diff --git a/res/values-v11/style.xml b/res/values-v11/style.xml
deleted file mode 100644
index 931bf629..00000000
--- a/res/values-v11/style.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<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>
-		<item name="feedlistTextColor">@android:color/primary_text_light</item>
-		<item name="feedlistSelectedTextColor">@android:color/primary_text_light</item>
-    	<item name="headlineTextColor">@android:color/primary_text_light</item>
-    	<item name="headlineSelectedTextColor">@android:color/primary_text_light</item>
-    	<item name="headlineExcerptTextColor">@android:color/secondary_text_light</item>
-    	<item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_light</item>
-    	<item name="linkColor">#5858F8</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>
-        <item name="feedlistTextColor">@android:color/primary_text_dark</item>
-        <item name="feedlistSelectedTextColor">@android:color/primary_text_dark</item>
-        <item name="headlineTextColor">@android:color/primary_text_dark</item>
-        <item name="headlineSelectedTextColor">@android:color/primary_text_dark</item>
-        <item name="headlineExcerptTextColor">@android:color/secondary_text_dark</item>
-        <item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_dark</item>
-        <item name="linkColor">#5858F8</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/res/values-v14/style.xml b/res/values-v14/style.xml
index afef40b4..222aea54 100644
--- a/res/values-v14/style.xml
+++ b/res/values-v14/style.xml
@@ -1,21 +1,23 @@
 <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="feedlistBackground"><!--  #e0e0e0 -->@drawable/shadow_feeds</item>
 		<item name="unreadCounterColor">#0000ff</item>
-		<item name="headlinesBackground">#ffffff</item>
+		<item name="headlinesBackground"><!--  #f0f0f0 -->@drawable/shadow_headlines</item>
+		<item name="headlinesBackgroundSolid">#f0f0f0</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="articleHeader">#ffffff</item>
+		<item name="headlineSelectedBackground">#ffffff</item>
+		<item name="headlineUnreadBackground">@android:color/transparent</item>
 		<item name="headlineNormalBackground">@android:color/transparent</item>
-		<item name="feedsSelectedBackground">#96C5FF</item>
+		<item name="feedsSelectedBackground">#f0f0f0</item>
 		<item name="headlineSeparatorUnread">#96C5FF</item>
 		<item name="headlineSeparatorNormal">#909090</item>
 		<item name="headlineSeparatorSelected">#DBC981</item>
 		<item name="feedlistTextColor">@android:color/primary_text_light</item>
 		<item name="feedlistSelectedTextColor">@android:color/primary_text_light</item>
-    	<item name="headlineTextColor">@android:color/primary_text_light</item>
+    	<item name="headlineTextColor">@android:color/secondary_text_light</item>
+    	<item name="headlineUnreadTextColor">@android:color/primary_text_light</item>
     	<item name="headlineSelectedTextColor">@android:color/primary_text_light</item>
     	<item name="headlineExcerptTextColor">@android:color/secondary_text_light</item>
     	<item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_light</item>
@@ -24,13 +26,14 @@
 
 	<style name="DarkTheme" parent="android:Theme.Holo">
 		<item name="feedlistDivider">@android:drawable/divider_horizontal_dark</item>
-		<item name="feedlistBackground">#101010</item>
+		<item name="feedlistBackground">@android:color/transparent</item>
 		<item name="unreadCounterColor">#303030</item>
-		<item name="headlinesBackground">#000000</item>
+		<item name="headlinesBackground">#101010</item>
+		<item name="headlinesBackgroundSolid">#101010</item>
 		<item name="articleDivider">#33b5e5</item>
 		<item name="articleHeader">@android:color/transparent</item>
 		<item name="headlineSelectedBackground">#33b5e5</item>
-		<item name="headlineUnreadBackground">#303030</item>
+		<item name="headlineUnreadBackground">@android:color/transparent</item>
 		<item name="headlineNormalBackground">@android:color/transparent</item>
 		<item name="feedsSelectedBackground">#33b5e5</item>
 		<item name="headlineSeparatorUnread">#33b5e5</item>
@@ -38,7 +41,8 @@
 		<item name="headlineSeparatorSelected">#33b5e5</item>
         <item name="feedlistTextColor">@android:color/primary_text_dark</item>
         <item name="feedlistSelectedTextColor">@android:color/black</item>
-        <item name="headlineTextColor">@android:color/primary_text_dark</item>
+        <item name="headlineTextColor">@android:color/secondary_text_dark</item>
+        <item name="headlineUnreadTextColor">@android:color/primary_text_dark</item>
         <item name="headlineSelectedTextColor">@android:color/black</item>
         <item name="headlineExcerptTextColor">@android:color/secondary_text_dark</item>
         <item name="headlineSelectedExcerptTextColor">@android:color/black</item>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index e257bc5b..4278a138 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -4,6 +4,7 @@
     <attr name="feedlistBackground" format="reference|color" />
     <attr name="unreadCounterColor" format="reference|color" />
     <attr name="headlinesBackground" format="reference|color" />
+    <attr name="headlinesBackgroundSolid" format="reference|color" />
     <attr name="articleHeader" format="reference|color" />
     <attr name="articleDivider" format="reference|color" />
     <attr name="headlineSelectedBackground" format="reference|color" />
@@ -16,6 +17,7 @@
     <attr name="feedlistTextColor" format="reference|color" />
     <attr name="feedlistSelectedTextColor" format="reference|color" />
     <attr name="headlineTextColor" format="reference|color" />
+    <attr name="headlineUnreadTextColor" format="reference|color" />
     <attr name="headlineSelectedTextColor" format="reference|color" />
     <attr name="headlineExcerptTextColor" format="reference|color" />
     <attr name="headlineSelectedExcerptTextColor" format="reference|color" />
diff --git a/res/values/resources.xml b/res/values/resources.xml
new file mode 100644
index 00000000..41158d27
--- /dev/null
+++ b/res/values/resources.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="feeds_light">#e0e0e0</color>
+    <color name="headlines_light">#f0f0f0</color>
+
+</resources>
\ No newline at end of file
diff --git a/res/values/style.xml b/res/values/style.xml
index 39103f11..26dd0fcf 100644
--- a/res/values/style.xml
+++ b/res/values/style.xml
@@ -5,6 +5,7 @@
         <item name="feedlistBackground">#fafafa</item>
         <item name="unreadCounterColor">#0000ff</item>
         <item name="headlinesBackground">#ffffff</item>
+        <item name="headlinesBackgroundSolid">#ffffff</item>
         <item name="articleDivider">#96c5ff</item>
         <item name="articleHeader">@android:color/transparent</item>
         <item name="headlineSelectedBackground">#fff7d5</item>
@@ -17,6 +18,7 @@
         <item name="feedlistTextColor">@android:color/primary_text_light</item>
         <item name="feedlistSelectedTextColor">@android:color/primary_text_light</item>
         <item name="headlineTextColor">@android:color/primary_text_light</item>
+        <item name="headlineUnreadTextColor">@android:color/primary_text_light</item>
         <item name="headlineSelectedTextColor">@android:color/primary_text_light</item>
         <item name="headlineExcerptTextColor">@android:color/secondary_text_light</item>
         <item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_light</item>
@@ -28,6 +30,7 @@
         <item name="feedlistBackground">#101010</item>
         <item name="unreadCounterColor">#303030</item>
         <item name="headlinesBackground">#000000</item>
+        <item name="headlinesBackgroundSolid">#000000</item>
         <item name="articleDivider">#F5B800</item>
         <item name="articleHeader">@android:color/transparent</item>
         <item name="headlineSelectedBackground">#F5B800</item>
@@ -40,6 +43,7 @@
         <item name="feedlistTextColor">@android:color/primary_text_dark</item>
         <item name="feedlistSelectedTextColor">@android:color/primary_text_dark</item>
         <item name="headlineTextColor">@android:color/primary_text_dark</item>
+        <item name="headlineUnreadTextColor">@android:color/primary_text_dark</item>
         <item name="headlineSelectedTextColor">@android:color/black</item>
         <item name="headlineExcerptTextColor">@android:color/secondary_text_dark</item>
         <item name="headlineSelectedExcerptTextColor">@android:color/black</item>
diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java
index 7b1128aa..8ad8eab0 100644
--- a/src/org/fox/ttrss/ArticleFragment.java
+++ b/src/org/fox/ttrss/ArticleFragment.java
@@ -88,7 +88,7 @@ public class ArticleFragment extends Fragment {
 		
 		Activity activity = (Activity)getActivity();
 		
-		if (activity != null) {		
+		/* if (activity != null) {		
 			int orientation = activity.getWindowManager().getDefaultDisplay().getOrientation();
 			
 			if (!m_onlineServices.isSmallScreen()) {			
@@ -103,7 +103,7 @@ public class ArticleFragment extends Fragment {
 			}
 		} else {
 			view.findViewById(R.id.splitter_horizontal).setVisibility(View.GONE);
-		}
+		} */
 		
 		if (m_article != null) {
 			
@@ -187,6 +187,7 @@ public class ArticleFragment extends Fragment {
 					"<meta content=\"text/html; charset=utf-8\" http-equiv=\"content-type\">" +
 					//"<meta name=\"viewport\" content=\"target-densitydpi=device-dpi\" />" +
 					"<style type=\"text/css\">" +
+					"body { padding : 0px; margin : 0px; }" +
 					cssOverride +
 					"div.attachments { font-size : 70%; margin-top : 1em; }" +
 					"img { max-width : 98%; height : auto; }" +
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java
index 66696d63..9cdab1da 100644
--- a/src/org/fox/ttrss/HeadlinesFragment.java
+++ b/src/org/fox/ttrss/HeadlinesFragment.java
@@ -464,11 +464,11 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 				}
 			}       	
 
-			ImageView separator = (ImageView)v.findViewById(R.id.headlines_separator);
+			/* ImageView separator = (ImageView)v.findViewById(R.id.headlines_separator);
 			
 			if (separator != null && m_onlineServices.isSmallScreen()) {
 				separator.setVisibility(View.GONE);
-			}
+			} */
 
 			TextView content = (TextView)v.findViewById(R.id.content);
 			
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java
index 064836c9..67a4a328 100644
--- a/src/org/fox/ttrss/MainActivity.java
+++ b/src/org/fox/ttrss/MainActivity.java
@@ -420,6 +420,7 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
 
 	private void setUnreadOnly(boolean unread) {
 		m_unreadOnly = unread;
+		m_lastRefresh = 0;
 		refresh();
 	}
 
@@ -975,6 +976,7 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
 			startActivityForResult(intent, 0);
 			return true;
 		case R.id.update_feeds:
+			m_lastRefresh = 0;
 			refresh();
 			return true;
 		case R.id.logout:
@@ -1390,7 +1392,11 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
 						getActionBar().setTitle(R.string.app_name);
 					}
 					
-					getActionBar().setDisplayHomeAsUpEnabled(m_selectedArticle != null || m_activeCategory != null);
+					if (m_smallScreenMode) {
+						getActionBar().setDisplayHomeAsUpEnabled(m_selectedArticle != null || m_activeCategory != null);
+					} else {
+						getActionBar().setDisplayHomeAsUpEnabled(m_selectedArticle != null || m_activeCategory != null || m_activeFeed != null);
+					}
 					
 					if (android.os.Build.VERSION.SDK_INT >= 14) {			
 						ShareActionProvider shareProvider = (ShareActionProvider) m_menu.findItem(R.id.share_article).getActionProvider();
diff --git a/src/org/fox/ttrss/offline/OfflineArticleFragment.java b/src/org/fox/ttrss/offline/OfflineArticleFragment.java
index 9df30279..790963fb 100644
--- a/src/org/fox/ttrss/offline/OfflineArticleFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineArticleFragment.java
@@ -75,7 +75,7 @@ public class OfflineArticleFragment extends Fragment {
 		// TODO change to interface?
 		Activity activity = getActivity();
 		
-		if (activity != null) {		
+		/* if (activity != null) {		
 			int orientation = activity.getWindowManager().getDefaultDisplay().getOrientation();
 			
 			if (!m_offlineServices.isSmallScreen()) {			
@@ -90,7 +90,7 @@ public class OfflineArticleFragment extends Fragment {
 			}
 		} else {
 			view.findViewById(R.id.splitter_horizontal).setVisibility(View.GONE);
-		}
+		} */
 		
 		m_cursor = m_offlineServices.getReadableDb().query("articles", null, BaseColumns._ID + "=?", 
 				new String[] { String.valueOf(m_articleId) }, null, null, null);
@@ -193,6 +193,7 @@ public class OfflineArticleFragment extends Fragment {
 					"<meta content=\"text/html; charset=utf-8\" http-equiv=\"content-type\">" +
 					//"<meta name=\"viewport\" content=\"target-densitydpi=device-dpi\" />" +
 					"<style type=\"text/css\">" +
+					"body { padding : 0px; margin : 0px; }" +
 					cssOverride +
 					"img { max-width : 98%; height : auto; }" +
 					"</style>" +
diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index 3688c3e4..46dd1e8a 100644
--- a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -364,11 +364,11 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 				}
 			}       	
 
-			ImageView separator = (ImageView)v.findViewById(R.id.headlines_separator);
+			/* ImageView separator = (ImageView)v.findViewById(R.id.headlines_separator);
 			
 			if (separator != null && m_offlineServices.isSmallScreen()) {
 				separator.setVisibility(View.GONE);
-			}
+			} */
 			
 			TextView content = (TextView)v.findViewById(R.id.content);