From 92d63150a060d8bbdc2739a9ebc9ca551fb271ba Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 9 Sep 2013 13:34:53 +0400
Subject: sepia theme fixes; update overflow icons to use modern holo style;
 enable overflow icons for feed items

---
 res/layout/feeds_row.xml                     |  5 +----
 res/layout/feeds_row_selected.xml            |  5 +----
 res/layout/headlines_row.xml                 | 17 ++++++++++-------
 res/layout/headlines_row_selected.xml        | 10 ++++------
 res/layout/headlines_row_selected_unread.xml | 10 ++++------
 res/layout/headlines_row_unread.xml          | 10 ++++------
 6 files changed, 24 insertions(+), 33 deletions(-)

(limited to 'res/layout')

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_row.xml b/res/layout/headlines_row.xml
index ac371724..92b0d3cc 100644
--- a/res/layout/headlines_row.xml
+++ b/res/layout/headlines_row.xml
@@ -1,12 +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:paddingBottom="3dp"
     android:paddingLeft="6dp"
     android:paddingRight="6dp"
-    android:paddingTop="3dp" >
+    android:paddingTop="3dp"
+    tools:ignore="HardcodedText" >
 
     <LinearLayout
         android:id="@+id/inner_row"
@@ -14,7 +16,10 @@
         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"
@@ -117,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 e370d32f..c88c0a83 100644
--- a/res/layout/headlines_row_selected.xml
+++ b/res/layout/headlines_row_selected.xml
@@ -14,7 +14,7 @@
         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"
@@ -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 2305a4f3..764571d4 100644
--- a/res/layout/headlines_row_selected_unread.xml
+++ b/res/layout/headlines_row_selected_unread.xml
@@ -14,7 +14,7 @@
         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"
@@ -118,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 22f9c452..141b1736 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout/headlines_row_unread.xml
@@ -14,7 +14,7 @@
         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"
@@ -118,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>
 
-- 
cgit v1.2.3-54-g00ecf