From c0ef67b46846e5fb38634993d91e8b1a356d736f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 24 Oct 2014 13:43:16 +0400
Subject: [PATCH] switch to cardview, remove obsolete drawables

---
 .../src/main/res/drawable/headline_row.xml    | 19 -------------------
 .../res/drawable/headline_row_selected.xml    | 19 -------------------
 .../drawable/headline_row_selected_sepia.xml  | 19 -------------------
 .../main/res/drawable/headline_row_sepia.xml  | 19 -------------------
 .../main/res/drawable/headline_row_unread.xml | 19 -------------------
 .../drawable/headline_row_unread_sepia.xml    | 19 -------------------
 .../main/res/layout/headlines_fragment.xml    |  2 --
 .../src/main/res/layout/headlines_row.xml     | 13 ++++++-------
 .../res/layout/headlines_row_selected.xml     | 15 ++++++++-------
 .../layout/headlines_row_selected_unread.xml  | 15 ++++++++-------
 .../main/res/layout/headlines_row_unread.xml  | 15 ++++++++-------
 org.fox.ttrss/src/main/res/values/style.xml   | 10 ++++------
 12 files changed, 34 insertions(+), 150 deletions(-)
 delete mode 100644 org.fox.ttrss/src/main/res/drawable/headline_row.xml
 delete mode 100644 org.fox.ttrss/src/main/res/drawable/headline_row_selected.xml
 delete mode 100644 org.fox.ttrss/src/main/res/drawable/headline_row_selected_sepia.xml
 delete mode 100644 org.fox.ttrss/src/main/res/drawable/headline_row_sepia.xml
 delete mode 100644 org.fox.ttrss/src/main/res/drawable/headline_row_unread.xml
 delete mode 100644 org.fox.ttrss/src/main/res/drawable/headline_row_unread_sepia.xml

diff --git a/org.fox.ttrss/src/main/res/drawable/headline_row.xml b/org.fox.ttrss/src/main/res/drawable/headline_row.xml
deleted file mode 100644
index ccfb8703..00000000
--- a/org.fox.ttrss/src/main/res/drawable/headline_row.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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/org.fox.ttrss/src/main/res/drawable/headline_row_selected.xml b/org.fox.ttrss/src/main/res/drawable/headline_row_selected.xml
deleted file mode 100644
index 3f005c8a..00000000
--- a/org.fox.ttrss/src/main/res/drawable/headline_row_selected.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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/org.fox.ttrss/src/main/res/drawable/headline_row_selected_sepia.xml b/org.fox.ttrss/src/main/res/drawable/headline_row_selected_sepia.xml
deleted file mode 100644
index 17d096e1..00000000
--- a/org.fox.ttrss/src/main/res/drawable/headline_row_selected_sepia.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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/org.fox.ttrss/src/main/res/drawable/headline_row_sepia.xml b/org.fox.ttrss/src/main/res/drawable/headline_row_sepia.xml
deleted file mode 100644
index facd2b6a..00000000
--- a/org.fox.ttrss/src/main/res/drawable/headline_row_sepia.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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/org.fox.ttrss/src/main/res/drawable/headline_row_unread.xml b/org.fox.ttrss/src/main/res/drawable/headline_row_unread.xml
deleted file mode 100644
index 6813164f..00000000
--- a/org.fox.ttrss/src/main/res/drawable/headline_row_unread.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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/org.fox.ttrss/src/main/res/drawable/headline_row_unread_sepia.xml b/org.fox.ttrss/src/main/res/drawable/headline_row_unread_sepia.xml
deleted file mode 100644
index 6c649257..00000000
--- a/org.fox.ttrss/src/main/res/drawable/headline_row_unread_sepia.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml b/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml
index 16e25520..df44f739 100644
--- a/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml
@@ -13,8 +13,6 @@
 	       android:id="@+id/headlines"
            android:scrollbars="vertical"
 	       android:layout_width="match_parent"
-	       android:dividerHeight="0dp"
-	       android:divider="@null"
 	       android:paddingTop="3dp"
 	       android:layout_height="match_parent" >
 	   </android.support.v7.widget.RecyclerView>
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
index 975485a3..28880f9d 100644
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v7.widget.CardView
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     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"
+    card_view:cardElevation="2dp"
+    card_view:cardBackgroundColor="?headlineNormalBackground"
     tools:ignore="HardcodedText" >
 
     <LinearLayout
         android:id="@+id/inner_row"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?headlineNormalBackground"
         android:orientation="vertical"
         android:paddingBottom="2dp"
         android:paddingLeft="6dp"
@@ -158,4 +157,4 @@
         </LinearLayout>
     </LinearLayout>
 
-</FrameLayout>
\ No newline at end of file
+</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml
index 5371dce3..5fa4e279 100644
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v7.widget.CardView
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     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" >
+    card_view:cardElevation="2dp"
+    card_view:cardBackgroundColor="?headlineSelectedBackground"
+    tools:ignore="HardcodedText" >
 
     <LinearLayout
         android:id="@+id/inner_row"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?headlineSelectedBackground"
         android:orientation="vertical"
         android:paddingBottom="2dp"
         android:paddingLeft="6dp"
@@ -156,4 +157,4 @@
         </LinearLayout>
     </LinearLayout>
 
-</FrameLayout>
\ No newline at end of file
+</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml
index 8d03620b..51aaa263 100644
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v7.widget.CardView
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     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" >
+    card_view:cardElevation="2dp"
+    card_view:cardBackgroundColor="?headlineSelectedBackground"
+    tools:ignore="HardcodedText" >
 
     <LinearLayout
         android:id="@+id/inner_row"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?headlineSelectedBackground"
         android:orientation="vertical"
         android:paddingBottom="2dp"
         android:paddingLeft="6dp"
@@ -157,4 +158,4 @@
         </LinearLayout>
     </LinearLayout>
 
-</FrameLayout>
+</android.support.v7.widget.CardView>
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
index b5e9d3f6..1fdd4f8a 100644
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v7.widget.CardView
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     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" >
+    card_view:cardElevation="2dp"
+    card_view:cardBackgroundColor="?headlineUnreadBackground"
+    tools:ignore="HardcodedText" >
 
     <LinearLayout
         android:id="@+id/inner_row"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?headlineUnreadBackground"
         android:orientation="vertical"
         android:paddingBottom="2dp"
         android:paddingLeft="6dp"
@@ -157,4 +158,4 @@
         </LinearLayout>
     </LinearLayout>
 
-</FrameLayout>
\ No newline at end of file
+</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
index 8c1fb98f..ab7f9b8f 100644
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -9,9 +9,9 @@
 		<item name="headlinesBackground"><!--  #f0f0f0 -->@drawable/shadow_headlines</item>
 		<item name="headlinesBackgroundSolid">#f0f0f0</item>
 		<item name="articleBackground">@android:color/transparent</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="headlineSelectedBackground">#88b0f0</item>
+		<item name="headlineUnreadBackground">@android:color/white</item>
+		<item name="headlineNormalBackground">#f5f5f5</item>
 		<item name="feedsSelectedBackground">#88b0f0</item>
 		<item name="feedlistTextColor">@android:color/primary_text_light</item>
 		<item name="feedlistSelectedTextColor">#ffffff</item>
@@ -41,9 +41,7 @@
 		<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">@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="headlineSelectedBackground">#E5B0A0</item>
 		<item name="feedsSelectedBackground">#E5B0A0</item>
 		<item name="articleBackground">@drawable/paper_sepia</item>
 		<item name="unreadCounterBackground">@drawable/counter_background_sepia</item>