From 5041df3258604c323b4e6f5ee82ee136d52769d6 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 12 Feb 2015 21:09:53 +0300
Subject: the cards, they are no more

---
 org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java | 4 ++--
 .../java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java     | 4 ++--
 org.fox.ttrss/src/main/res/layout/headlines_row.xml              | 9 +++------
 org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml       | 9 +++------
 4 files changed, 10 insertions(+), 16 deletions(-)

(limited to 'org.fox.ttrss')

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
index 6e19b1d8..5dca5828 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
@@ -349,10 +349,10 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 
 		ListView list = (ListView)view.findViewById(R.id.headlines_list);
 
-        if (!m_compactLayoutMode) {
+        /* if (!m_compactLayoutMode) {
             list.setDividerHeight(0);
             list.setDivider(null);
-        }
+        } */
 
         if (m_prefs.getBoolean("headlines_mark_read_scroll", false)) {
             WindowManager wm = (WindowManager) m_activity.getSystemService(Context.WINDOW_SERVICE);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index b47cf576..8c0b26b5 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -304,10 +304,10 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 		
 		ListView list = (ListView)view.findViewById(R.id.headlines_list);
 
-        if (!m_compactLayoutMode) {
+        /* if (!m_compactLayoutMode) {
             list.setDividerHeight(0);
             list.setDivider(null);
-        }
+        } */
 
         if (m_prefs.getBoolean("headlines_mark_read_scroll", false)) {
             WindowManager wm = (WindowManager) m_activity.getSystemService(Context.WINDOW_SERVICE);
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 28dcd046..728c21c4 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+<FrameLayout
     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"
-    card_view:cardElevation="2dp"
-    card_view:cardUseCompatPadding="true"
-    card_view:cardBackgroundColor="?headlineNormalBackground"
+    android:background="?headlineNormalBackground"
     tools:ignore="HardcodedText" >
 
     <TableLayout
@@ -188,4 +185,4 @@
         </TableRow>
     </TableLayout>
 
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
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 7add9c92..fb061693 100755
--- 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,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+<FrameLayout
     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"
-    card_view:cardElevation="2dp"
-    card_view:cardUseCompatPadding="true"
-    card_view:cardBackgroundColor="?headlineUnreadBackground"
+    android:background="?headlineUnreadBackground"
     tools:ignore="HardcodedText" >
 
     <TableLayout
@@ -189,4 +186,4 @@
         </TableRow>
     </TableLayout>
 
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
-- 
cgit v1.2.3