properly fix missing cardview padding on 5.0, duh

7 files changed, 9 insertions, 21 deletions

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 a5168aab..d605a9c1 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
@@ -329,14 +329,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 		
 		ListView list = (ListView)view.findViewById(R.id.headlines_list);
 
-        // thanks google
-        if (android.os.Build.VERSION.SDK_INT <= android.os.Build.VERSION_CODES.KITKAT) {
-            list.setDividerHeight(0);
-
-            int px = m_activity.dpToPx(4);
-            list.setPadding(px, px, px, px);
-        }
-
         if (m_prefs.getBoolean("headlines_mark_read_scroll", false)) {
             WindowManager wm = (WindowManager) m_activity.getSystemService(Context.WINDOW_SERVICE);
             Display display = wm.getDefaultDisplay();
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 a49bef60..ab89c8d9 100644
--- 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
@@ -307,14 +307,6 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 		
 		ListView list = (ListView)view.findViewById(R.id.headlines_list);
 
-        // thanks google
-        if (android.os.Build.VERSION.SDK_INT <= android.os.Build.VERSION_CODES.KITKAT) {
-            list.setDividerHeight(0);
-
-            int px = m_activity.dpToPx(4);
-            list.setPadding(px, px, px, px);
-        }
-
         if (m_prefs.getBoolean("headlines_mark_read_scroll", false)) {
             WindowManager wm = (WindowManager) m_activity.getSystemService(Context.WINDOW_SERVICE);
             Display display = wm.getDefaultDisplay();
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 575707bb..181b1d0c 100644
--- a/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml
@@ -10,12 +10,12 @@
     	android:layout_height="match_parent" >
     
 	   <ListView
-           android:padding="8dp"
+           android:padding="4dp"
 	       android:id="@+id/headlines_list"
 	       android:layout_width="match_parent"
 	       android:layoutAnimation="@anim/layout_headline"
-	       android:dividerHeight="8dp"
-	       android:divider="@android:color/transparent"
+	       android:dividerHeight="0dp"
+	       android:divider="@null"
 	       android:layout_height="match_parent" >
 	   </ListView>
 	</android.support.v4.widget.SwipeRefreshLayout>
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 408a2251..681c024c 100644
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -7,6 +7,7 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     card_view:cardElevation="2dp"
+    card_view:cardUseCompatPadding="true"
     card_view:cardBackgroundColor="?headlineNormalBackground"
     tools:ignore="HardcodedText" >
 
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 36224ba0..6a66b3ad 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
@@ -7,6 +7,7 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     card_view:cardElevation="2dp"
+    card_view:cardUseCompatPadding="true"
     card_view:cardBackgroundColor="?headlineSelectedBackground"
     tools:ignore="HardcodedText" >
 
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 ad144313..a07de550 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
@@ -6,7 +6,8 @@
     android:id="@+id/headlines_row"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    card_view:cardElevation="2dp"
+    card_view:cardElevation="4dp"
+    card_view:cardUseCompatPadding="true"
     card_view:cardBackgroundColor="?headlineSelectedBackground"
     tools:ignore="HardcodedText" >
 
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 5931b26c..4e5b9ab1 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
@@ -6,7 +6,8 @@
     android:id="@+id/headlines_row"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    card_view:cardElevation="2dp"
+    card_view:cardElevation="4dp"
+    card_view:cardUseCompatPadding="true"
     card_view:cardBackgroundColor="?headlineUnreadBackground"
     tools:ignore="HardcodedText" >