From e772a52bf299a6ff609bdfb0883e63b7ec3bc946 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Sun, 7 Aug 2022 14:38:27 +0800
Subject: [PATCH] Fix thumb card margin

---
 .../java/com/hippo/ehviewer/widget/FixedThumb.java    |  5 -----
 app/src/main/res/layout/gallery_detail_header.xml     |  5 +++--
 app/src/main/res/layout/item_gallery_list.xml         | 11 ++++++-----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/widget/FixedThumb.java b/app/src/main/java/com/hippo/ehviewer/widget/FixedThumb.java
index 95205009f..cd68fee30 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/FixedThumb.java
+++ b/app/src/main/java/com/hippo/ehviewer/widget/FixedThumb.java
@@ -53,11 +53,6 @@ public class FixedThumb extends LoadImageView {
         a.recycle();
     }
 
-    public void setFix(float minAspect, float maxAspect) {
-        this.minAspect = minAspect;
-        this.maxAspect = maxAspect;
-    }
-
     @Override
     public void onPreSetImageDrawable(Drawable drawable, boolean isTarget) {
         if (alwaysCutAndScale) {
diff --git a/app/src/main/res/layout/gallery_detail_header.xml b/app/src/main/res/layout/gallery_detail_header.xml
index 5e04a7a41..b05012aeb 100644
--- a/app/src/main/res/layout/gallery_detail_header.xml
+++ b/app/src/main/res/layout/gallery_detail_header.xml
@@ -77,10 +77,11 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent">
 
-                    <com.hippo.widget.LoadImageView
+                    <com.hippo.ehviewer.widget.FixedThumb
                         android:id="@+id/thumb"
                         android:layout_width="@dimen/gallery_detail_thumb_width"
-                        android:layout_height="@dimen/gallery_detail_thumb_height" />
+                        android:layout_height="@dimen/gallery_detail_thumb_height"
+                        app:alwaysCutAndScale="true"/>
 
                 </com.google.android.material.card.MaterialCardView>
 
diff --git a/app/src/main/res/layout/item_gallery_list.xml b/app/src/main/res/layout/item_gallery_list.xml
index 0c0d93021..3c2b6636f 100644
--- a/app/src/main/res/layout/item_gallery_list.xml
+++ b/app/src/main/res/layout/item_gallery_list.xml
@@ -15,6 +15,7 @@
 
 <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/card"
     style="@style/Widget.Material3.CardView.Elevated"
     android:layout_width="match_parent"
@@ -31,15 +32,15 @@
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/thumb_card"
             style="@style/Widget.Material3.CardView.Filled"
-            android:layout_width="@dimen/gallery_list_thumb_width"
-            android:layout_height="@dimen/gallery_list_thumb_height">
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
 
             <com.hippo.ehviewer.widget.FixedThumb
                 android:id="@+id/thumb"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_width="@dimen/gallery_list_thumb_width"
+                android:layout_height="@dimen/gallery_list_thumb_height"
                 app:alwaysCutAndScale="true"
-                app:retryType="click" />
+                app:retryType="click"/>
 
         </com.google.android.material.card.MaterialCardView>