From c4c88c40c5231802fa00587da41f6691fc441781 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Thu, 19 May 2022 20:07:37 +0800
Subject: [PATCH] Surround Image with round corner cardview

---
 app/src/main/res/layout/item_gallery_list.xml | 39 +++++++++++--------
 .../main/res/layout/item_gallery_preview.xml  | 22 +++++++----
 2 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/app/src/main/res/layout/item_gallery_list.xml b/app/src/main/res/layout/item_gallery_list.xml
index 36d056a84..a10fb4172 100644
--- a/app/src/main/res/layout/item_gallery_list.xml
+++ b/app/src/main/res/layout/item_gallery_list.xml
@@ -29,13 +29,20 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <com.hippo.ehviewer.widget.FixedThumb
-            android:id="@+id/thumb"
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/thumb_card"
             android:layout_width="@dimen/gallery_list_thumb_width"
-            android:layout_height="@dimen/gallery_list_thumb_height"
-            app:maxAspect="1.333"
-            app:minAspect="0.333"
-            app:retryType="click" />
+            android:layout_height="@dimen/gallery_list_thumb_height">
+
+            <com.hippo.ehviewer.widget.FixedThumb
+                android:id="@+id/thumb"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:maxAspect="1.333"
+                app:minAspect="0.333"
+                app:retryType="click" />
+
+        </com.google.android.material.card.MaterialCardView>
 
         <TextView
             android:id="@+id/title"
@@ -46,7 +53,7 @@
             android:layout_marginLeft="8dp"
             android:layout_marginTop="4dp"
             android:layout_marginRight="8dp"
-            android:layout_toRightOf="@id/thumb" />
+            android:layout_toEndOf="@id/thumb_card" />
 
         <TextView
             android:id="@+id/uploader"
@@ -54,7 +61,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/title"
-            android:layout_alignLeft="@id/title"
+            android:layout_alignStart="@id/title"
             android:layout_marginTop="2dp" />
 
         <TextView
@@ -62,8 +69,8 @@
             style="@style/CardMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignLeft="@id/title"
-            android:layout_alignBottom="@id/thumb"
+            android:layout_alignStart="@id/title"
+            android:layout_alignBottom="@id/thumb_card"
             android:layout_marginBottom="8dp"
             android:paddingLeft="8dp"
             android:paddingTop="2dp"
@@ -77,7 +84,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_above="@id/category"
-            android:layout_alignLeft="@id/title"
+            android:layout_alignStart="@id/title"
             android:layout_marginBottom="4dp" />
 
         <TextView
@@ -85,17 +92,17 @@
             style="@style/CardMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignBottom="@id/thumb"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="6dp"
+            android:layout_alignBottom="@id/thumb_card"
+            android:layout_alignParentEnd="true"
+            android:layout_marginEnd="6dp"
             android:layout_marginBottom="4dp" />
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_above="@id/posted"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="6dp"
+            android:layout_alignParentEnd="true"
+            android:layout_marginEnd="6dp"
             android:divider="@drawable/spacer_x6"
             android:gravity="center_vertical"
             android:orientation="horizontal"
diff --git a/app/src/main/res/layout/item_gallery_preview.xml b/app/src/main/res/layout/item_gallery_preview.xml
index f5a7d392e..db0a10a4a 100644
--- a/app/src/main/res/layout/item_gallery_preview.xml
+++ b/app/src/main/res/layout/item_gallery_preview.xml
@@ -19,15 +19,21 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <com.hippo.ehviewer.widget.FixedThumb xmlns:auto="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/image"
+    <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:foreground="?selectableItemBackground"
-        auto:aspect="0.667"
-        auto:maxAspect="0.8"
-        auto:minAspect="0.5"
-        auto:retryType="longClick" />
+        android:layout_height="wrap_content">
+
+        <com.hippo.ehviewer.widget.FixedThumb xmlns:auto="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/image"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:foreground="?selectableItemBackground"
+            auto:aspect="0.667"
+            auto:maxAspect="0.8"
+            auto:minAspect="0.5"
+            auto:retryType="longClick" />
+
+    </com.google.android.material.card.MaterialCardView>
 
     <TextView
         android:id="@+id/text"