Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS-for-Honeycomb

28 files changed, 285 insertions, 126 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e6c63139..e147e3e1 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="197"
-    android:versionName="1.10" >
+    android:versionCode="198"
+    android:versionName="1.11" >
 
     <uses-sdk
         android:minSdkVersion="8"
diff --git a/res/drawable-hdpi/ic_action_overflow.png b/res/drawable-hdpi/ic_action_overflow.png
new file mode 100644
index 00000000..0612f431
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_overflow.png
diff --git a/res/drawable-hdpi/ic_mailbox_collapsed_holo_dark.png b/res/drawable-hdpi/ic_mailbox_collapsed_holo_dark.png
deleted file mode 100644
index eb1a7bd8..00000000
--- a/res/drawable-hdpi/ic_mailbox_collapsed_holo_dark.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png b/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png
deleted file mode 100644
index 2c395b80..00000000
--- a/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png
+++ /dev/null
diff --git a/res/drawable/headline_row.xml b/res/drawable/headline_row.xml
new file mode 100644
index 00000000..c928013e
--- /dev/null
+++ b/res/drawable/headline_row.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>

+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >

+

+    <item>

+        <shape android:shape="rectangle" >

+            <solid android:color="#e0e0e0" />

+            <corners android:radius="2dp"/>

+        </shape>

+    </item>

+

+    <item

+        android:bottom="2dp">

+        <shape android:shape="rectangle" >

+            <solid android:color="#f5f5f5" />

+            <corners android:radius="2dp"/>

+        </shape>

+    </item>

+

+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/headline_row_selected.xml b/res/drawable/headline_row_selected.xml
new file mode 100644
index 00000000..1f30f42f
--- /dev/null
+++ b/res/drawable/headline_row_selected.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>

+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >

+

+    <item>

+        <shape android:shape="rectangle" >

+            <solid android:color="#e0e0e0" />

+            <corners android:radius="2dp"/>

+        </shape>

+    </item>

+

+    <item

+        android:bottom="2dp">

+        <shape android:shape="rectangle" >

+            <solid android:color="#88b0f0" />

+            <corners android:radius="2dp"/>

+        </shape>

+    </item>

+

+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/headline_row_selected_sepia.xml b/res/drawable/headline_row_selected_sepia.xml
new file mode 100644
index 00000000..0ed5da7a
--- /dev/null
+++ b/res/drawable/headline_row_selected_sepia.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>

+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >

+

+    <item>

+        <shape android:shape="rectangle" >

+            <solid android:color="#d0d0d0" />

+            <corners android:radius="2dp"/>

+        </shape>

+    </item>

+

+    <item

+        android:bottom="2dp">

+        <shape android:shape="rectangle" >

+            <solid android:color="#E5B0A0" />

+            <corners android:radius="2dp"/>

+        </shape>

+    </item>

+

+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/headline_row_sepia.xml b/res/drawable/headline_row_sepia.xml
new file mode 100644
index 00000000..5fcb7aa1
--- /dev/null
+++ b/res/drawable/headline_row_sepia.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>

+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >

+

+    <item>

+        <shape android:shape="rectangle" >

+            <solid android:color="#d0d0d0" />

+            <corners android:radius="2dp"/>

+        </shape>

+    </item>

+

+    <item

+        android:bottom="2dp">

+        <shape android:shape="rectangle" >

+            <solid android:color="#f5f5f5" />

+            <corners android:radius="2dp"/>

+        </shape>

+    </item>

+

+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/headline_row_unread.xml b/res/drawable/headline_row_unread.xml
new file mode 100644
index 00000000..14840998
--- /dev/null
+++ b/res/drawable/headline_row_unread.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>

+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >

+

+    <item>

+        <shape android:shape="rectangle" >

+            <solid android:color="#e0e0e0" />

+            <corners android:radius="2dp"/>

+        </shape>

+    </item>

+

+    <item

+        android:bottom="2dp">

+        <shape android:shape="rectangle" >

+            <solid android:color="#ffffff" />

+            <corners android:radius="2dp"/>

+        </shape>

+    </item>

+

+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/headline_row_unread_sepia.xml b/res/drawable/headline_row_unread_sepia.xml
new file mode 100644
index 00000000..f062fb7e
--- /dev/null
+++ b/res/drawable/headline_row_unread_sepia.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>

+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >

+

+    <item>

+        <shape android:shape="rectangle" >

+            <solid android:color="#d0d0d0" />

+            <corners android:radius="2dp"/>

+        </shape>

+    </item>

+

+    <item

+        android:bottom="2dp">

+        <shape android:shape="rectangle" >

+            <solid android:color="#ffffff" />

+            <corners android:radius="2dp"/>

+        </shape>

+    </item>

+

+</layer-list>
\ No newline at end of file
diff --git a/res/layout/feeds_row.xml b/res/layout/feeds_row.xml
index e52de2c2..35cef732 100644
--- a/res/layout/feeds_row.xml
+++ b/res/layout/feeds_row.xml
@@ -58,9 +58,6 @@
         android:layout_height="wrap_content"
         android:layout_weight="0"
         android:background="@null"
-        android:paddingLeft="6dp"
-        android:paddingTop="6dp"
-        android:visibility="gone"
-        android:src="@drawable/ic_mailbox_collapsed_holo_light" />
+        android:src="@drawable/ic_action_overflow" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/feeds_row_selected.xml b/res/layout/feeds_row_selected.xml
index 7876d150..0d145b23 100644
--- a/res/layout/feeds_row_selected.xml
+++ b/res/layout/feeds_row_selected.xml
@@ -58,9 +58,6 @@
         android:layout_height="wrap_content"
         android:layout_weight="0"
         android:background="@null"
-        android:paddingLeft="6dp"
-        android:paddingTop="6dp"
-        android:visibility="gone"
-        android:src="@drawable/ic_mailbox_collapsed_holo_light" />
+        android:src="@drawable/ic_action_overflow" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/headlines_fragment.xml b/res/layout/headlines_fragment.xml
index d3effae6..5df36557 100644
--- a/res/layout/headlines_fragment.xml
+++ b/res/layout/headlines_fragment.xml
@@ -10,6 +10,7 @@
         android:layoutAnimation="@anim/layout_headline"

         android:dividerHeight="0dp"

         android:divider="@null"

+        android:paddingTop="3dp"

         android:layout_height="match_parent" >

     </ListView>

 

diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml
index c4ea2c76..92b0d3cc 100644
--- a/res/layout/headlines_row.xml
+++ b/res/layout/headlines_row.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>

 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

+    xmlns:tools="http://schemas.android.com/tools"

     android:id="@+id/headlines_row"

     android:layout_width="fill_parent"

     android:layout_height="wrap_content"

-    android:paddingTop="6dp"

+    android:paddingBottom="3dp"

     android:paddingLeft="6dp"

-    android:paddingRight="6dp" >

+    android:paddingRight="6dp"

+    android:paddingTop="3dp"

+    tools:ignore="HardcodedText" >

 

     <LinearLayout

         android:id="@+id/inner_row"

@@ -13,15 +16,17 @@
         android:layout_height="match_parent"

         android:background="?headlineNormalBackground"

         android:orientation="vertical"

-        android:padding="6dp" >

+        android:paddingBottom="2dp"

+        android:paddingLeft="6dp"

+        android:paddingRight="6dp"

+        android:paddingTop="6dp" >

 

         <LinearLayout

             android:id="@+id/linearLayout6"

             android:layout_width="match_parent"

             android:layout_height="wrap_content"

             android:gravity="center_vertical"

-            android:orientation="horizontal"

-            android:paddingLeft="6dp" >

+            android:orientation="horizontal" >

 

             <TextView

                 android:id="@+id/title"

@@ -42,14 +47,8 @@
             android:layout_height="wrap_content"

             android:layout_weight="1"

             android:gravity="center_vertical"

-            android:orientation="horizontal" >

-

-            <CheckBox

-                android:id="@+id/selected"

-                android:layout_width="wrap_content"

-                android:layout_height="wrap_content"

-                android:layout_weight="0"

-                android:focusable="false" />

+            android:orientation="horizontal"

+            android:paddingTop="3dp" >

 

             <TextView

                 android:id="@+id/feed_title"

@@ -78,7 +77,7 @@
             android:id="@+id/excerpt"

             android:layout_width="match_parent"

             android:layout_height="match_parent"

-            android:paddingLeft="6dp"

+            android:paddingTop="3dp"

             android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."

             android:textColor="?headlineExcerptTextColor"

             android:textSize="13sp" />

@@ -86,8 +85,15 @@
         <LinearLayout

             android:layout_width="match_parent"

             android:layout_height="wrap_content"

-            android:gravity="center_vertical"

-            android:paddingLeft="6dp" >

+            android:gravity="center_vertical" >

+

+            <CheckBox

+                android:id="@+id/selected"

+                android:layout_width="wrap_content"

+                android:layout_height="wrap_content"

+                android:layout_marginLeft="-6dp"

+                android:layout_weight="0"

+                android:focusable="false" />

 

             <TextView

                 android:id="@+id/author"

@@ -116,17 +122,15 @@
                 android:layout_height="wrap_content"

                 android:layout_weight="0"

                 android:clickable="true"

+                android:paddingRight="6dp"

                 android:src="@drawable/ic_rss_bw" />

 

-            <ImageButton

+            <ImageView

                 android:id="@+id/article_menu_button"

                 android:layout_width="wrap_content"

                 android:layout_height="wrap_content"

                 android:layout_weight="0"

-                android:background="@null"

-                android:paddingLeft="10dp"

-                android:paddingTop="6dp"

-                android:src="@drawable/ic_mailbox_collapsed_holo_light" />

+                android:src="@drawable/ic_action_overflow" />

         </LinearLayout>

     </LinearLayout>

 

diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml
index 5cebee9d..c88c0a83 100644
--- a/res/layout/headlines_row_selected.xml
+++ b/res/layout/headlines_row_selected.xml
@@ -3,9 +3,10 @@
     android:id="@+id/headlines_row"

     android:layout_width="fill_parent"

     android:layout_height="wrap_content"

+    android:paddingBottom="3dp"

     android:paddingLeft="6dp"

     android:paddingRight="6dp"

-    android:paddingTop="6dp" >

+    android:paddingTop="3dp" >

 

     <LinearLayout

         android:id="@+id/inner_row"

@@ -13,15 +14,14 @@
         android:layout_height="match_parent"

         android:background="?headlineSelectedBackground"

         android:orientation="vertical"

-        android:padding="6dp" >

+        android:paddingTop="6dp" android:paddingLeft="6dp" android:paddingRight="6dp" android:paddingBottom="2dp" >

 

         <LinearLayout

             android:id="@+id/linearLayout6"

             android:layout_width="match_parent"

             android:layout_height="wrap_content"

             android:gravity="center_vertical"

-            android:orientation="horizontal"

-            android:paddingLeft="6dp" >

+            android:orientation="horizontal" >

 

             <TextView

                 android:id="@+id/title"

@@ -33,8 +33,7 @@
                 android:singleLine="false"

                 android:text="Sample entry title"

                 android:textColor="?attr/headlineSelectedTextColor"

-                android:textSize="16sp"

-                android:textStyle="bold" />

+                android:textSize="16sp" />

         </LinearLayout>

 

         <LinearLayout

@@ -43,14 +42,8 @@
             android:layout_height="wrap_content"

             android:layout_weight="1"

             android:gravity="center_vertical"

-            android:orientation="horizontal" >

-

-            <CheckBox

-                android:id="@+id/selected"

-                android:layout_width="wrap_content"

-                android:layout_height="wrap_content"

-                android:layout_weight="0"

-                android:focusable="false" />

+            android:orientation="horizontal"

+            android:paddingTop="3dp" >

 

             <TextView

                 android:id="@+id/feed_title"

@@ -79,7 +72,7 @@
             android:id="@+id/excerpt"

             android:layout_width="match_parent"

             android:layout_height="match_parent"

-            android:paddingLeft="6dp"

+            android:paddingTop="3dp"

             android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."

             android:textColor="?headlineSelectedExcerptTextColor"

             android:textSize="13sp" />

@@ -87,8 +80,15 @@
         <LinearLayout

             android:layout_width="match_parent"

             android:layout_height="wrap_content"

-            android:gravity="center_vertical"

-            android:paddingLeft="6dp" >

+            android:gravity="center_vertical" >

+

+            <CheckBox

+                android:id="@+id/selected"

+                android:layout_width="wrap_content"

+                android:layout_height="wrap_content"

+                android:layout_marginLeft="-6dp"

+                android:layout_weight="0"

+                android:focusable="false" />

 

             <TextView

                 android:id="@+id/author"

@@ -117,17 +117,15 @@
                 android:layout_height="wrap_content"

                 android:layout_weight="0"

                 android:clickable="true"

+                android:paddingRight="6dp"

                 android:src="@drawable/ic_rss_bw" />

 

-            <ImageButton

+            <ImageView

                 android:id="@+id/article_menu_button"

                 android:layout_width="wrap_content"

                 android:layout_height="wrap_content"

                 android:layout_weight="0"

-                android:background="@null"

-                android:paddingLeft="10dp"

-                android:paddingTop="6dp"

-                android:src="@drawable/ic_mailbox_collapsed_holo_light" />

+                android:src="@drawable/ic_action_overflow" />

         </LinearLayout>

     </LinearLayout>

 

diff --git a/res/layout/headlines_row_selected_unread.xml b/res/layout/headlines_row_selected_unread.xml
index 3cc7cbd9..764571d4 100644
--- a/res/layout/headlines_row_selected_unread.xml
+++ b/res/layout/headlines_row_selected_unread.xml
@@ -3,9 +3,10 @@
     android:id="@+id/headlines_row"

     android:layout_width="fill_parent"

     android:layout_height="wrap_content"

+    android:paddingBottom="3dp"

     android:paddingLeft="6dp"

     android:paddingRight="6dp"

-    android:paddingTop="6dp" >

+    android:paddingTop="3dp" >

 

     <LinearLayout

         android:id="@+id/inner_row"

@@ -13,15 +14,14 @@
         android:layout_height="match_parent"

         android:background="?headlineSelectedBackground"

         android:orientation="vertical"

-        android:padding="6dp" >

+        android:paddingTop="6dp" android:paddingLeft="6dp" android:paddingRight="6dp" android:paddingBottom="2dp" >

 

         <LinearLayout

             android:id="@+id/linearLayout6"

             android:layout_width="match_parent"

             android:layout_height="wrap_content"

             android:gravity="center_vertical"

-            android:orientation="horizontal"

-            android:paddingLeft="6dp" >

+            android:orientation="horizontal" >

 

             <TextView

                 android:id="@+id/title"

@@ -43,14 +43,8 @@
             android:layout_height="wrap_content"

             android:layout_weight="1"

             android:gravity="center_vertical"

-            android:orientation="horizontal" >

-

-            <CheckBox

-                android:id="@+id/selected"

-                android:layout_width="wrap_content"

-                android:layout_height="wrap_content"

-                android:layout_weight="0"

-                android:focusable="false" />

+            android:orientation="horizontal"

+            android:paddingTop="3dp" >

 

             <TextView

                 android:id="@+id/feed_title"

@@ -79,7 +73,7 @@
             android:id="@+id/excerpt"

             android:layout_width="match_parent"

             android:layout_height="match_parent"

-            android:paddingLeft="6dp"

+            android:paddingTop="3dp"

             android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."

             android:textColor="?headlineSelectedExcerptTextColor"

             android:textSize="13sp" />

@@ -87,8 +81,15 @@
         <LinearLayout

             android:layout_width="match_parent"

             android:layout_height="wrap_content"

-            android:gravity="center_vertical"

-            android:paddingLeft="6dp" >

+            android:gravity="center_vertical" >

+

+            <CheckBox

+                android:id="@+id/selected"

+                android:layout_width="wrap_content"

+                android:layout_height="wrap_content"

+                android:layout_marginLeft="-6dp"

+                android:layout_weight="0"

+                android:focusable="false" />

 

             <TextView

                 android:id="@+id/author"

@@ -117,17 +118,15 @@
                 android:layout_height="wrap_content"

                 android:layout_weight="0"

                 android:clickable="true"

+                android:paddingRight="6dp"

                 android:src="@drawable/ic_rss_bw" />

 

-            <ImageButton

+            <ImageView

                 android:id="@+id/article_menu_button"

                 android:layout_width="wrap_content"

                 android:layout_height="wrap_content"

                 android:layout_weight="0"

-                android:background="@null"

-                android:paddingLeft="10dp"

-                android:paddingTop="6dp"

-                android:src="@drawable/ic_mailbox_collapsed_holo_light" />

+                android:src="@drawable/ic_action_overflow" />

         </LinearLayout>

     </LinearLayout>

 

diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml
index 93fe4106..141b1736 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout/headlines_row_unread.xml
@@ -3,9 +3,10 @@
     android:id="@+id/headlines_row"

     android:layout_width="fill_parent"

     android:layout_height="wrap_content"

+    android:paddingBottom="3dp"

     android:paddingLeft="6dp"

     android:paddingRight="6dp"

-    android:paddingTop="6dp" >

+    android:paddingTop="3dp" >

 

     <LinearLayout

         android:id="@+id/inner_row"

@@ -13,15 +14,14 @@
         android:layout_height="match_parent"

         android:background="?headlineUnreadBackground"

         android:orientation="vertical"

-        android:padding="6dp" >

+        android:paddingTop="6dp" android:paddingLeft="6dp" android:paddingRight="6dp" android:paddingBottom="2dp" > >

 

         <LinearLayout

             android:id="@+id/linearLayout6"

             android:layout_width="match_parent"

             android:layout_height="wrap_content"

             android:gravity="center_vertical"

-            android:orientation="horizontal"

-            android:paddingLeft="6dp" >

+            android:orientation="horizontal" >

 

             <TextView

                 android:id="@+id/title"

@@ -43,14 +43,8 @@
             android:layout_height="wrap_content"

             android:layout_weight="1"

             android:gravity="center_vertical"

-            android:orientation="horizontal" >

-

-            <CheckBox

-                android:id="@+id/selected"

-                android:layout_width="wrap_content"

-                android:layout_height="wrap_content"

-                android:layout_weight="0"

-                android:focusable="false" />

+            android:orientation="horizontal"

+            android:paddingTop="3dp" >

 

             <TextView

                 android:id="@+id/feed_title"

@@ -79,7 +73,7 @@
             android:id="@+id/excerpt"

             android:layout_width="match_parent"

             android:layout_height="match_parent"

-            android:paddingLeft="6dp"

+            android:paddingTop="3dp"

             android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."

             android:textColor="?headlineExcerptTextColor"

             android:textSize="13sp" />

@@ -87,8 +81,15 @@
         <LinearLayout

             android:layout_width="match_parent"

             android:layout_height="wrap_content"

-            android:gravity="center_vertical"

-            android:paddingLeft="6dp" >

+            android:gravity="center_vertical" >

+

+            <CheckBox

+                android:id="@+id/selected"

+                android:layout_width="wrap_content"

+                android:layout_height="wrap_content"

+                android:layout_marginLeft="-6dp"

+                android:layout_weight="0"

+                android:focusable="false" />

 

             <TextView

                 android:id="@+id/author"

@@ -117,17 +118,15 @@
                 android:layout_height="wrap_content"

                 android:layout_weight="0"

                 android:clickable="true"

+                android:paddingRight="6dp"

                 android:src="@drawable/ic_rss_bw" />

 

-            <ImageButton

+            <ImageView

                 android:id="@+id/article_menu_button"

                 android:layout_width="wrap_content"

                 android:layout_height="wrap_content"

                 android:layout_weight="0"

-                android:background="@null"

-                android:paddingLeft="10dp"

-                android:paddingTop="6dp"

-                android:src="@drawable/ic_mailbox_collapsed_holo_light" />

+                android:src="@drawable/ic_action_overflow" />

         </LinearLayout>

     </LinearLayout>

 

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 5cd5bc28..8f1e4c9a 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -195,9 +195,10 @@
     <string name="light_theme_is_not_supported_on_honeycomb">ライトテーマはHoneycombではサポートされていません</string>

     <string name="pref_headlines_mark_read_scroll">スクロールしたら既読にする</string>

     <string name="pref_headlines_mark_read_scroll_long">ヘッドラインをスクロールしたら既読にする</string>

-    <string name="mark_num_headlines_as_read"> %1$d 件の記事を既読にしますか？</string>

+    <string name="mark_num_headlines_as_read">%1$d 件の記事を既読にしますか？</string>

     <string name="prefs_confirm_headlines_catchup">記事を既読にする際に確認する</string>

     <string name="author_formatted">by %1$s</string>

     <string name="n_unread_articles">%1$d 件の未読記事</string>

     <string name="pref_headline_font_size">ヘッドラインの文字サイズ</string>

+    <string name="context_confirm_catchup">%1$s の全ての記事を既読にしますか？</string>

 </resources>

diff --git a/res/values-v11/style.xml b/res/values-v11/style.xml
index b1c0e4ef..d2adf334 100644
--- a/res/values-v11/style.xml
+++ b/res/values-v11/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>
@@ -53,7 +54,7 @@
 		<item name="articleBackground">@android:color/black</item>
 		<item name="headlineSelectedBackground">@color/ics_cyan</item>
 		<item name="headlineUnreadBackground">#202020</item>
-		<item name="headlineNormalBackground">#101010</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>
diff --git a/res/values/resources.xml b/res/values/resources.xml
index f32ec5b7..7e1b097e 100644
--- a/res/values/resources.xml
+++ b/res/values/resources.xml
@@ -10,5 +10,5 @@
 	<color name="unread_counter_background_dark">#303030</color>

 	<color name="unread_counter_background_sepia">#C46262</color>

 	<color name="unread_counter_background_selected_light">#4684ff</color>

-	<color name="feeds_dark_gray">#1c1d1e</color>

+	<color name="feeds_dark_gray">#1c1d1e</color>	

 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a05188d8..e4ef4831 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -200,4 +200,5 @@
     <string name="author_formatted">by %1$s</string>
     <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>
 </resources>
diff --git a/res/values/style.xml b/res/values/style.xml
index fec0dcac..4a8e93ba 100644
--- a/res/values/style.xml
+++ b/res/values/style.xml
@@ -53,7 +53,7 @@
 		<item name="articleBackground">@android:color/black</item>
 		<item name="headlineSelectedBackground">@color/ics_cyan</item>
 		<item name="headlineUnreadBackground">#202020</item>
-		<item name="headlineNormalBackground">#101010</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>
diff --git a/src/org/fox/ttrss/FeedCategoriesFragment.java b/src/org/fox/ttrss/FeedCategoriesFragment.java
index 34b21922..f2c6d522 100644
--- a/src/org/fox/ttrss/FeedCategoriesFragment.java
+++ b/src/org/fox/ttrss/FeedCategoriesFragment.java
@@ -13,7 +13,10 @@ import org.fox.ttrss.types.FeedCategoryList;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.os.Bundle;
@@ -125,9 +128,36 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
 			return true;
 		case R.id.catchup_category:
 			if (true) {
-				FeedCategory cat = getCategoryAtPosition(info.position);
+				final FeedCategory cat = getCategoryAtPosition(info.position);
 				if (cat != null) {
-					m_activity.catchupFeed(new Feed(cat.id, cat.title, true));
+										
+					if (m_prefs.getBoolean("confirm_headlines_catchup", true)) {
+						AlertDialog.Builder builder = new AlertDialog.Builder(
+								m_activity)
+								.setMessage(getString(R.string.context_confirm_catchup, cat.title))
+								.setPositiveButton(R.string.catchup,
+										new Dialog.OnClickListener() {
+											public void onClick(DialogInterface dialog,
+													int which) {
+	
+												m_activity.catchupFeed(new Feed(cat.id, cat.title, true));											
+												
+											}
+										})
+								.setNegativeButton(R.string.dialog_cancel,
+										new Dialog.OnClickListener() {
+											public void onClick(DialogInterface dialog,
+													int which) {
+		
+											}
+										});
+		
+						AlertDialog dlg = builder.create();
+						dlg.show();						
+					} else {
+						m_activity.catchupFeed(new Feed(cat.id, cat.title, true));
+					}
+
 				}
 			}
 			return true;
@@ -415,9 +445,6 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
 			ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
 			
 			if (ib != null) {
-				if (m_activity.isDarkTheme())
-					ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
-				
 				ib.setOnClickListener(new OnClickListener() {					
 					@Override
 					public void onClick(View v) {
diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java
index 9eae321b..cc851cd4 100644
--- a/src/org/fox/ttrss/FeedsFragment.java
+++ b/src/org/fox/ttrss/FeedsFragment.java
@@ -19,7 +19,10 @@ import org.fox.ttrss.types.FeedList;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.graphics.Bitmap;
@@ -156,9 +159,35 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
 			return true;
 		case R.id.catchup_feed:
 			if (true) {
-				Feed feed = getFeedAtPosition(info.position);
+				final Feed feed = getFeedAtPosition(info.position);
+				
 				if (feed != null) {
-					m_activity.catchupFeed(feed);
+					if (m_prefs.getBoolean("confirm_headlines_catchup", true)) {
+						AlertDialog.Builder builder = new AlertDialog.Builder(
+								m_activity)
+								.setMessage(getString(R.string.context_confirm_catchup, feed.title))
+								.setPositiveButton(R.string.catchup,
+										new Dialog.OnClickListener() {
+											public void onClick(DialogInterface dialog,
+													int which) {
+	
+												m_activity.catchupFeed(feed);											
+												
+											}
+										})
+								.setNegativeButton(R.string.dialog_cancel,
+										new Dialog.OnClickListener() {
+											public void onClick(DialogInterface dialog,
+													int which) {
+		
+											}
+										});
+		
+						AlertDialog dlg = builder.create();
+						dlg.show();						
+					} else {
+						m_activity.catchupFeed(feed);
+					}
 				}
 			}
 			return true;
@@ -542,9 +571,6 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
 			ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
 			
 			if (ib != null) {
-				if (m_activity.isDarkTheme())
-					ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
-				
 				ib.setOnClickListener(new OnClickListener() {					
 					@Override
 					public void onClick(View v) {
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java
index 16a0f64d..53bedc59 100644
--- a/src/org/fox/ttrss/HeadlinesFragment.java
+++ b/src/org/fox/ttrss/HeadlinesFragment.java
@@ -795,13 +795,13 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 				});
 			}
 			
-			ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button);
+			ImageView iv = (ImageView) v.findViewById(R.id.article_menu_button);
 			
-			if (ib != null) {
-				if (m_activity.isDarkTheme())
-					ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
+			if (iv != null) {
+				//if (m_activity.isDarkTheme())
+				//	ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
 				
-				ib.setOnClickListener(new OnClickListener() {					
+				iv.setOnClickListener(new OnClickListener() {					
 					@Override
 					public void onClick(View v) {
 						getActivity().openContextMenu(v);
diff --git a/src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java b/src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java
index ad229919..682cf3e6 100644
--- a/src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java
@@ -288,9 +288,6 @@ public class OfflineFeedCategoriesFragment extends Fragment implements OnItemCli
 			ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
 			
 			if (ib != null) {
-				if (m_activity.isDarkTheme())
-					ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
-				
 				ib.setOnClickListener(new OnClickListener() {					
 					@Override
 					public void onClick(View v) {
diff --git a/src/org/fox/ttrss/offline/OfflineFeedsFragment.java b/src/org/fox/ttrss/offline/OfflineFeedsFragment.java
index 98996858..69a07595 100644
--- a/src/org/fox/ttrss/offline/OfflineFeedsFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineFeedsFragment.java
@@ -322,9 +322,6 @@ public class OfflineFeedsFragment extends Fragment implements OnItemClickListene
 			ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
 			
 			if (ib != null) {
-				if (m_activity.isDarkTheme())
-					ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
-				
 				ib.setOnClickListener(new OnClickListener() {					
 					@Override
 					public void onClick(View v) {
diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index da929569..afa08b40 100644
--- a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -645,11 +645,11 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 				});
 			}
 			
-			ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button);
+			ImageView ib = (ImageView) v.findViewById(R.id.article_menu_button);
 			
 			if (ib != null) {
-				if (m_activity.isDarkTheme())
-					ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
+				//if (m_activity.isDarkTheme())
+				//	ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark);
 				
 				ib.setOnClickListener(new OnClickListener() {					
 					@Override