From 35babd089dc6987f82fc92185f15065b48a9c3e9 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Thu, 19 May 2022 21:06:23 +0800
Subject: [PATCH] Image search layout tweaks

---
 .../ehviewer/widget/ImageSearchLayout.java    |  4 +--
 .../main/res/layout/widget_image_search.xml   | 29 ++++++++++++-------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/widget/ImageSearchLayout.java b/app/src/main/java/com/hippo/ehviewer/widget/ImageSearchLayout.java
index e6e198672..b8d3d88ed 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/ImageSearchLayout.java
+++ b/app/src/main/java/com/hippo/ehviewer/widget/ImageSearchLayout.java
@@ -141,7 +141,7 @@ public final class ImageSearchLayout extends LinearLayout implements View.OnClic
                 bitmap.compress(Bitmap.CompressFormat.JPEG, 90, os);
                 mImagePath = temp.getPath();
                 mPreview.setImageBitmap(bitmap);
-                mPreview.setVisibility(VISIBLE);
+                ((View)mPreview.getParent()).setVisibility(VISIBLE);
             } catch (FileNotFoundException e) {
                 e.printStackTrace();
             } finally {
@@ -166,7 +166,7 @@ public final class ImageSearchLayout extends LinearLayout implements View.OnClic
             }
             mImagePath = imagePath;
             mPreview.setImageBitmap(bitmap);
-            mPreview.setVisibility(VISIBLE);
+            ((View)mPreview.getParent()).setVisibility(VISIBLE);
         } catch (FileNotFoundException e) {
             // Ignore
         } finally {
diff --git a/app/src/main/res/layout/widget_image_search.xml b/app/src/main/res/layout/widget_image_search.xml
index 42e7a612b..d78058aaf 100644
--- a/app/src/main/res/layout/widget_image_search.xml
+++ b/app/src/main/res/layout/widget_image_search.xml
@@ -16,19 +16,26 @@
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <com.hippo.widget.FixedAspectImageView
-        android:id="@+id/preview"
+    <com.google.android.material.card.MaterialCardView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:adjustViewBounds="true"
-        android:maxWidth="@dimen/image_search_max_size"
-        android:maxHeight="@dimen/image_search_max_size"
-        android:visibility="gone" />
+        android:visibility="gone" >
+
+
+        <com.hippo.widget.FixedAspectImageView
+            android:id="@+id/preview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:adjustViewBounds="true"
+            android:maxWidth="@dimen/image_search_max_size"
+            android:maxHeight="@dimen/image_search_max_size" />
+
+    </com.google.android.material.card.MaterialCardView>
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/select_image"
-        style="@style/Widget.MaterialComponents.Button"
+        style="@style/Widget.Material3.Button.TonalButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
@@ -44,7 +51,7 @@
                 android:id="@+id/search_uss"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/advance_search_table_item_margin"
+                android:layout_marginEnd="@dimen/advance_search_table_item_margin"
                 android:layout_weight="1"
                 android:checked="true"
                 android:minWidth="0dp"
@@ -55,7 +62,7 @@
                 android:id="@+id/search_osc"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/advance_search_table_item_margin"
+                android:layout_marginStart="@dimen/advance_search_table_item_margin"
                 android:layout_weight="1"
                 android:checked="false"
                 android:minWidth="0dp"
@@ -69,7 +76,7 @@
                 android:id="@+id/search_se"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/advance_search_table_item_margin"
+                android:layout_marginEnd="@dimen/advance_search_table_item_margin"
                 android:layout_weight="1"
                 android:checked="false"
                 android:minWidth="0dp"
@@ -79,7 +86,7 @@
             <Space
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/advance_search_table_item_margin"
+                android:layout_marginStart="@dimen/advance_search_table_item_margin"
                 android:layout_weight="1"
                 android:checked="false" />