From e0bd573988bd6f545d250b0569a9e4b591bb78ca Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Thu, 7 Jul 2022 08:51:00 +0800
Subject: [PATCH] Gallery detail card layout refactor

---
 .../ehviewer/ui/scene/GalleryDetailScene.java |  2 +-
 .../res/layout/gallery_detail_content.xml     |  2 -
 .../main/res/layout/gallery_detail_header.xml | 75 ++++++++++++++-
 .../main/res/layout/gallery_detail_info.xml   | 93 -------------------
 4 files changed, 74 insertions(+), 98 deletions(-)
 delete mode 100644 app/src/main/res/layout/gallery_detail_info.xml

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
index 6a73584d8..34ab78484 100755
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
@@ -640,7 +640,7 @@ public class GalleryDetailScene extends ToolbarScene implements View.OnClickList
         mBelowHeader = mainView.findViewById(R.id.below_header);
         View belowHeader = mBelowHeader;
 
-        mInfo = ViewUtils.$$(belowHeader, R.id.info);
+        mInfo = ViewUtils.$$(mHeader, R.id.info);
         mLanguage = (TextView) ViewUtils.$$(mInfo, R.id.language);
         mPages = (TextView) ViewUtils.$$(mInfo, R.id.pages);
         mSize = (TextView) ViewUtils.$$(mInfo, R.id.size);
diff --git a/app/src/main/res/layout/gallery_detail_content.xml b/app/src/main/res/layout/gallery_detail_content.xml
index 1cb676763..9726a1ee0 100644
--- a/app/src/main/res/layout/gallery_detail_content.xml
+++ b/app/src/main/res/layout/gallery_detail_content.xml
@@ -31,8 +31,6 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <include layout="@layout/gallery_detail_info" />
-
             <include layout="@layout/gallery_detail_actions" />
 
             <include layout="@layout/gallery_detail_tags" />
diff --git a/app/src/main/res/layout/gallery_detail_header.xml b/app/src/main/res/layout/gallery_detail_header.xml
index 785ca0b59..bf7ad1e53 100644
--- a/app/src/main/res/layout/gallery_detail_header.xml
+++ b/app/src/main/res/layout/gallery_detail_header.xml
@@ -82,9 +82,80 @@
 
                 </com.google.android.material.card.MaterialCardView>
 
+                <com.google.android.material.card.MaterialCardView
+                    android:id="@+id/info"
+                    style="@style/Widget.Material3.CardView.Filled"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="@dimen/keyline_margin"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:orientation="vertical">
+
+                    <TableLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:padding="8dp">
+
+                        <TableRow>
+
+                            <TextView
+                                android:id="@+id/language"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:gravity="left"
+                                android:singleLine="true" />
+
+                            <TextView
+                                android:id="@+id/size"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:gravity="right"
+                                android:singleLine="true" />
+
+                        </TableRow>
+
+                        <TableRow android:paddingTop="8dp">
+
+                            <TextView
+                                android:id="@+id/favoredTimes"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:gravity="left"
+                                android:singleLine="true" />
+
+                            <TextView
+                                android:id="@+id/pages"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:gravity="right"
+                                android:singleLine="true" />
+
+                        </TableRow>
+
+                        <TableRow android:paddingTop="8dp">
+
+                            <TextView
+                                android:id="@+id/posted"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:gravity="left"
+                                android:singleLine="true" />
+
+                        </TableRow>
+                    </TableLayout>
+
+                </com.google.android.material.card.MaterialCardView>
+
                 <com.google.android.material.chip.Chip
-                    style="@style/Widget.Material3.Chip.Assist"
                     android:id="@+id/uploader"
+                    style="@style/Widget.Material3.Chip.Assist"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignBottom="@id/thumb_card"
@@ -97,8 +168,8 @@
                     app:ensureMinTouchTargetSize="true" />
 
                 <com.google.android.material.chip.Chip
-                    style="@style/Widget.Material3.Chip.Assist"
                     android:id="@+id/category"
+                    style="@style/Widget.Material3.Chip.Assist"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_above="@id/uploader"
diff --git a/app/src/main/res/layout/gallery_detail_info.xml b/app/src/main/res/layout/gallery_detail_info.xml
deleted file mode 100644
index 8e3b029cd..000000000
--- a/app/src/main/res/layout/gallery_detail_info.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2016 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/info"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?selectableItemBackground"
-    android:clickable="true"
-    android:focusable="true"
-    android:orientation="vertical"
-    android:padding="@dimen/keyline_margin">
-
-    <TableLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/keyline_margin"
-        android:paddingRight="@dimen/keyline_margin">
-
-        <TableRow>
-
-            <TextView
-                android:id="@+id/language"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="left"
-                android:singleLine="true"
-                android:textColor="?android:attr/textColorPrimary" />
-
-            <TextView
-                android:id="@+id/pages"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:singleLine="true"
-                android:textColor="?android:attr/textColorPrimary" />
-
-            <TextView
-                android:id="@+id/size"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="right"
-                android:singleLine="true"
-                android:textColor="?android:attr/textColorPrimary" />
-
-        </TableRow>
-
-        <TableRow android:paddingTop="8dp">
-
-            <TextView
-                android:id="@+id/favoredTimes"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="left"
-                android:singleLine="true"
-                android:textColor="?android:attr/textColorPrimary" />
-
-            <TextView
-                android:id="@+id/posted"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="right"
-                android:singleLine="true"
-                android:textColor="?android:attr/textColorPrimary" />
-
-        </TableRow>
-    </TableLayout>
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="16dp"
-        android:text="@string/more_information" />
-
-</LinearLayout>