sepia theme fixes; update overflow icons to use modern holo style;

enable overflow icons for feed items

16 files changed, 144 insertions, 38 deletions

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..45235231
--- /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="#f0f0f0" />

+            <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..5e2aad22
--- /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="#f0f0f0" />

+            <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_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>

 

diff --git a/res/values-v11/style.xml b/res/values-v11/style.xml
index 5e1c4cfb..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>