From 0704579d26623e34b60f7f3243d4ef3d2c825535 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Sat, 20 Oct 2018 01:41:20 +0800
Subject: [PATCH] Adjust card elevation

---
 app/src/main/res/layout/gallery_detail_header.xml | 2 +-
 app/src/main/res/layout/item_download.xml         | 1 +
 app/src/main/res/layout/item_gallery_grid.xml     | 1 +
 app/src/main/res/layout/item_gallery_list.xml     | 1 +
 app/src/main/res/layout/search_category.xml       | 1 +
 app/src/main/res/values/dimens.xml                | 2 +-
 app/src/main/res/values/styles.xml                | 4 ++--
 7 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/layout/gallery_detail_header.xml b/app/src/main/res/layout/gallery_detail_header.xml
index 4c3516ff5..58ded743e 100644
--- a/app/src/main/res/layout/gallery_detail_header.xml
+++ b/app/src/main/res/layout/gallery_detail_header.xml
@@ -40,7 +40,7 @@
 
         <Space
             android:layout_width="match_parent"
-            android:layout_height="26dp"/>
+            android:layout_height="24dp"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/item_download.xml b/app/src/main/res/layout/item_download.xml
index f39f618ce..83fb9657e 100644
--- a/app/src/main/res/layout/item_download.xml
+++ b/app/src/main/res/layout/item_download.xml
@@ -20,6 +20,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_margin="2dp"
     style="@style/CardView.Reactive">
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/item_gallery_grid.xml b/app/src/main/res/layout/item_gallery_grid.xml
index 18b8e08a9..183f48dc7 100644
--- a/app/src/main/res/layout/item_gallery_grid.xml
+++ b/app/src/main/res/layout/item_gallery_grid.xml
@@ -20,6 +20,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_margin="2dp"
     style="@style/CardView.Normal">
 
     <com.hippo.ehviewer.widget.TileThumb
diff --git a/app/src/main/res/layout/item_gallery_list.xml b/app/src/main/res/layout/item_gallery_list.xml
index e00b656ba..79c141b55 100644
--- a/app/src/main/res/layout/item_gallery_list.xml
+++ b/app/src/main/res/layout/item_gallery_list.xml
@@ -19,6 +19,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_margin="2dp"
     style="@style/CardView.Reactive">
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/search_category.xml b/app/src/main/res/layout/search_category.xml
index ecc3deda6..a7291a241 100644
--- a/app/src/main/res/layout/search_category.xml
+++ b/app/src/main/res/layout/search_category.xml
@@ -18,6 +18,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_margin="2dp"
     style="@style/CardView.Normal">
 
     <LinearLayout
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index d0051c0b5..f923fb77b 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -52,7 +52,7 @@
     <dimen name="gallery_grid_margin_v">4dp</dimen>
 
     <!-- 8dp - 4dp, 4dp for card padding -->
-    <dimen name="gallery_search_bar_margin_h">4dp</dimen>
+    <dimen name="gallery_search_bar_margin_h">6dp</dimen>
     <!-- 12dp - 4dp, 4dp for card padding -->
     <dimen name="gallery_search_bar_margin_v">8dp</dimen>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3efa192cc..b6f44c7ee 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -141,8 +141,8 @@
     <style name="CardView.Normal">
         <item name="cardCornerRadius">2dp</item>
         <item name="cardUseCompatPadding">true</item>
-        <item name="cardElevation">4dp</item>
-        <item name="cardMaxElevation">4dp</item>
+        <item name="cardElevation">2dp</item>
+        <item name="cardMaxElevation">2dp</item>
         <item name="cardPreventCornerOverlap">true</item>
         <item name="cardBackgroundColor">?attr/contentColorPrimary</item>
         <item name="contentPadding">0dp</item>