From 54aedb98e34dfc76f4b962ceb949d00cd28a0e90 Mon Sep 17 00:00:00 2001
From: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
Date: Wed, 18 Feb 2015 00:03:49 -0500
Subject: [PATCH] Fix margin/gap inconsistency between 5.0 and pre-5.0

---
 .../src/main/res/layout/native_list_card_layout.xml    |  2 ++
 .../res/layout/native_list_card_thumbnail_layout.xml   |  4 +++-
 library-core/src/main/res/values/dimens.xml            | 10 +++++-----
 .../res/layout/native_recyclerview_card_layout.xml     |  2 ++
 .../native_recyclerview_card_thumbnail_layout.xml      |  2 ++
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/library-core/src/main/res/layout/native_list_card_layout.xml b/library-core/src/main/res/layout/native_list_card_layout.xml
index ccab4128..46e91b8e 100644
--- a/library-core/src/main/res/layout/native_list_card_layout.xml
+++ b/library-core/src/main/res/layout/native_list_card_layout.xml
@@ -27,10 +27,12 @@
     <it.gmariotti.cardslib.library.view.CardViewNative
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:card="http://schemas.android.com/apk/res-auto"
+        xmlns:card_view="http://schemas.android.com/apk/res-auto"
         android:id="@+id/list_cardId"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         style="@style/native_list_card.base"
+        card_view:cardUseCompatPadding="true"
         card:card_layout_resourceID="@layout/native_card_layout"/>
 
 </LinearLayout>
diff --git a/library-core/src/main/res/layout/native_list_card_thumbnail_layout.xml b/library-core/src/main/res/layout/native_list_card_thumbnail_layout.xml
index 34b23bab..6313ca4f 100644
--- a/library-core/src/main/res/layout/native_list_card_thumbnail_layout.xml
+++ b/library-core/src/main/res/layout/native_list_card_thumbnail_layout.xml
@@ -27,12 +27,14 @@
 <it.gmariotti.cardslib.library.view.CardViewNative
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:card="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:id="@+id/list_cardId"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     style="@style/native_list_card.thumbnail"
+    card_view:cardUseCompatPadding="true"
     card:card_layout_resourceID="@layout/native_card_thumbnail_layout"
     />
 
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/library-core/src/main/res/values/dimens.xml b/library-core/src/main/res/values/dimens.xml
index b05ddf16..d3453633 100644
--- a/library-core/src/main/res/values/dimens.xml
+++ b/library-core/src/main/res/values/dimens.xml
@@ -141,14 +141,14 @@
     <!-- List -->
     <dimen name="native_list_card_margin_left">0dp</dimen>
     <dimen name="native_list_card_margin_right">0dp</dimen>
-    <dimen name="native_list_card_margin_bottom">6dp</dimen>
-    <dimen name="native_list_card_margin_top">6dp</dimen>
+    <dimen name="native_list_card_margin_bottom">0dp</dimen>
+    <dimen name="native_list_card_margin_top">0dp</dimen>
 
     <!-- RecyclerView -->
     <dimen name="native_recyclerview_card_margin_left">0dp</dimen>
     <dimen name="native_recyclerview_card_margin_right">0dp</dimen>
-    <dimen name="native_recyclerview_card_margin_bottom">6dp</dimen>
-    <dimen name="native_recyclerview_card_margin_top">6dp</dimen>
+    <dimen name="native_recyclerview_card_margin_bottom">0dp</dimen>
+    <dimen name="native_recyclerview_card_margin_top">0dp</dimen>
 
     <!-- Grid -->
     <dimen name="grid_card_padding_left">2dp</dimen>
@@ -173,4 +173,4 @@
 
 
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/library-recyclerview/src/main/res/layout/native_recyclerview_card_layout.xml b/library-recyclerview/src/main/res/layout/native_recyclerview_card_layout.xml
index c5ecb9ca..8e341011 100644
--- a/library-recyclerview/src/main/res/layout/native_recyclerview_card_layout.xml
+++ b/library-recyclerview/src/main/res/layout/native_recyclerview_card_layout.xml
@@ -25,10 +25,12 @@
     <it.gmariotti.cardslib.library.view.CardViewNative
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:card="http://schemas.android.com/apk/res-auto"
+        xmlns:card_view="http://schemas.android.com/apk/res-auto"
         android:id="@+id/list_cardId"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         style="@style/native_recyclerview_card.base"
+        card_view:cardUseCompatPadding="true"
         card:card_layout_resourceID="@layout/native_card_layout"/>
 
 
diff --git a/library-recyclerview/src/main/res/layout/native_recyclerview_card_thumbnail_layout.xml b/library-recyclerview/src/main/res/layout/native_recyclerview_card_thumbnail_layout.xml
index 12c99ccc..42729445 100644
--- a/library-recyclerview/src/main/res/layout/native_recyclerview_card_thumbnail_layout.xml
+++ b/library-recyclerview/src/main/res/layout/native_recyclerview_card_thumbnail_layout.xml
@@ -23,9 +23,11 @@
 <it.gmariotti.cardslib.library.view.CardViewNative
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:card="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:id="@+id/list_cardId"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     style="@style/native_recyclerview_card.thumbnail"
+    card_view:cardUseCompatPadding="true"
     card:card_layout_resourceID="@layout/native_card_thumbnail_layout"
     />