From 9924b6ec0b7e0895efbb21462fb114e59e317703 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Fri, 11 Aug 2023 10:47:40 +0800
Subject: [PATCH] Cleanup layout

---
 .../hippo/ehviewer/ui/scene/FavoritesScene.kt |  6 ++
 .../ehviewer/ui/scene/GalleryListScene.kt     |  8 ++-
 app/src/main/res/layout/scene_favorites.xml   | 52 +-------------
 .../res/layout/scene_gallery_comments.xml     | 71 +++++++++----------
 .../main/res/layout/scene_gallery_list.xml    | 52 +-------------
 .../main/res/layout/widget_content_layout.xml | 70 ++++++++++++++++++
 6 files changed, 120 insertions(+), 139 deletions(-)
 create mode 100644 app/src/main/res/layout/widget_content_layout.xml

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt
index 1e5e9434c..8c30b9532 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt
@@ -210,6 +210,12 @@ class FavoritesScene : SearchBarScene() {
         mAdapter?.type = Settings.listMode
     }
 
+    private val SceneFavoritesBinding.fastScroller get() = contentLayout.fastScroller
+    private val SceneFavoritesBinding.refreshLayout get() = contentLayout.refreshLayout
+    private val SceneFavoritesBinding.recyclerView get() = contentLayout.recyclerView
+    private val SceneFavoritesBinding.progress get() = contentLayout.progress
+    private val SceneFavoritesBinding.tip get() = contentLayout.tip
+
     override fun onCreateViewWithToolbar(
         inflater: LayoutInflater,
         container: ViewGroup?,
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt
index 12dac6b86..e24f6bacd 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt
@@ -310,6 +310,12 @@ class GalleryListScene : SearchBarScene() {
         }
     }
 
+    private val SceneGalleryListBinding.fastScroller get() = contentLayout.fastScroller
+    private val SceneGalleryListBinding.refreshLayout get() = contentLayout.refreshLayout
+    private val SceneGalleryListBinding.recyclerView get() = contentLayout.recyclerView
+    private val SceneGalleryListBinding.progress get() = contentLayout.progress
+    private val SceneGalleryListBinding.tip get() = contentLayout.tip
+
     override fun onCreateViewWithToolbar(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -329,7 +335,7 @@ class GalleryListScene : SearchBarScene() {
                 mSearchFab.parent as View,
             ),
         )
-        mViewTransition = BringOutTransition(binding.contentLayout, binding.searchLayout)
+        mViewTransition = BringOutTransition(binding.contentLayout.contentView, binding.searchLayout)
         binding.fastScroller.setOnDragHandlerListener(object : OnDragHandlerListener {
             override fun onStartDragHandler() {}
             override fun onEndDragHandler() {
diff --git a/app/src/main/res/layout/scene_favorites.xml b/app/src/main/res/layout/scene_favorites.xml
index 39a43b4d5..95658bc49 100644
--- a/app/src/main/res/layout/scene_favorites.xml
+++ b/app/src/main/res/layout/scene_favorites.xml
@@ -17,57 +17,9 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <FrameLayout
+    <include
         android:id="@+id/content_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipChildren="false"
-        android:paddingTop="16dp"
-        app:layout_behavior="@string/searchbar_scrolling_view_behavior">
-
-        <TextView
-            android:id="@+id/tip"
-            style="@style/TextAppearance.AppCompat.Medium"
-            android:layout_width="228dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:drawablePadding="8dp"
-            android:gravity="center_horizontal" />
-
-        <com.google.android.material.progressindicator.CircularProgressIndicator
-            android:id="@+id/progress"
-            style="@style/ProgressView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center" />
-
-        <androidx.swiperefreshlayout.widget.ThemedSwipeRefreshLayout
-            android:id="@+id/refresh_layout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginTop="@dimen/gallery_padding_top_search_bar"
-            android:clipChildren="false"
-            app:fitsSystemWindowsInsets="top">
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recycler_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clipChildren="false"
-                android:clipToPadding="false" />
-
-        </androidx.swiperefreshlayout.widget.ThemedSwipeRefreshLayout>
-    </FrameLayout>
-
-    <com.hippo.ehviewer.ui.legacy.FastScroller
-        android:id="@+id/fast_scroller"
-        android:layout_width="30dp"
-        android:layout_height="match_parent"
-        android:layout_gravity="end"
-        android:paddingStart="20dp"
-        android:paddingTop="128dp"
-        android:paddingEnd="4dp"
-        android:paddingBottom="8dp" />
+        layout="@layout/widget_content_layout" />
 
     <com.hippo.ehviewer.ui.legacy.FabLayout
         android:id="@+id/fab_layout"
diff --git a/app/src/main/res/layout/scene_gallery_comments.xml b/app/src/main/res/layout/scene_gallery_comments.xml
index 6ef5d469d..2debec3aa 100644
--- a/app/src/main/res/layout/scene_gallery_comments.xml
+++ b/app/src/main/res/layout/scene_gallery_comments.xml
@@ -46,49 +46,44 @@
         android:text="@string/no_one_comments_gallery"
         app:fitsSystemWindowsInsets="bottom" />
 
-    <FrameLayout
+    <LinearLayout
+        android:id="@+id/edit_panel"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:background="?attr/colorPrimaryContainer"
+        android:elevation="4dp"
+        android:orientation="horizontal"
+        android:visibility="invisible"
+        app:fitsSystemWindowsInsets="bottom">
 
-        <LinearLayout
-            android:id="@+id/edit_panel"
-            android:layout_width="match_parent"
+        <EditText
+            android:id="@+id/edit_text"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:background="@null"
+            android:gravity="start|center_vertical"
+            android:importantForAutofill="no"
+            android:inputType="textMultiLine"
+            android:maxHeight="168dp"
+            android:minHeight="56dp"
+            android:padding="@dimen/keyline_margin"
+            android:textColor="?colorOnPrimaryContainer"
+            android:textSize="16sp" />
+
+        <ImageView
+            android:id="@+id/send"
+            android:layout_width="56dp"
+            android:layout_height="56dp"
             android:layout_gravity="bottom"
-            android:background="?attr/colorPrimaryContainer"
-            android:elevation="4dp"
-            android:orientation="horizontal"
-            android:visibility="invisible"
-            app:fitsSystemWindowsInsets="bottom">
+            android:background="?selectableItemBackgroundBorderless"
+            android:clickable="true"
+            android:focusable="true"
+            android:padding="16dp"
+            app:tint="?colorOnPrimaryContainer" />
 
-            <EditText
-                android:id="@+id/edit_text"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="@null"
-                android:gravity="start|center_vertical"
-                android:importantForAutofill="no"
-                android:inputType="textMultiLine"
-                android:maxHeight="168dp"
-                android:minHeight="56dp"
-                android:padding="@dimen/keyline_margin"
-                android:textColor="?colorOnPrimaryContainer"
-                android:textSize="16sp" />
-
-            <ImageView
-                android:id="@+id/send"
-                android:layout_width="56dp"
-                android:layout_height="56dp"
-                android:layout_gravity="bottom"
-                android:background="?selectableItemBackgroundBorderless"
-                android:clickable="true"
-                android:focusable="true"
-                android:padding="16dp"
-                app:tint="?colorOnPrimaryContainer" />
-
-        </LinearLayout>
-    </FrameLayout>
+    </LinearLayout>
 
     <com.hippo.ehviewer.ui.legacy.FabLayout
         android:id="@+id/fab_layout"
diff --git a/app/src/main/res/layout/scene_gallery_list.xml b/app/src/main/res/layout/scene_gallery_list.xml
index e7857645e..4306ec937 100644
--- a/app/src/main/res/layout/scene_gallery_list.xml
+++ b/app/src/main/res/layout/scene_gallery_list.xml
@@ -17,57 +17,9 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <FrameLayout
+    <include
         android:id="@+id/content_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipChildren="false"
-        android:paddingTop="16dp"
-        app:layout_behavior="@string/searchbar_scrolling_view_behavior">
-
-        <TextView
-            android:id="@+id/tip"
-            style="@style/TextAppearance.AppCompat.Medium"
-            android:layout_width="228dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:drawablePadding="8dp"
-            android:gravity="center_horizontal" />
-
-        <com.google.android.material.progressindicator.CircularProgressIndicator
-            android:id="@+id/progress"
-            style="@style/ProgressView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center" />
-
-        <androidx.swiperefreshlayout.widget.ThemedSwipeRefreshLayout
-            android:id="@+id/refresh_layout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginTop="@dimen/gallery_padding_top_search_bar"
-            android:clipChildren="false"
-            app:fitsSystemWindowsInsets="top">
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recycler_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clipChildren="false"
-                android:clipToPadding="false" />
-
-        </androidx.swiperefreshlayout.widget.ThemedSwipeRefreshLayout>
-    </FrameLayout>
-
-    <com.hippo.ehviewer.ui.legacy.FastScroller
-        android:id="@+id/fast_scroller"
-        android:layout_width="30dp"
-        android:layout_height="match_parent"
-        android:layout_gravity="end"
-        android:paddingStart="20dp"
-        android:paddingTop="128dp"
-        android:paddingEnd="4dp"
-        android:paddingBottom="8dp" />
+        layout="@layout/widget_content_layout" />
 
     <com.hippo.ehviewer.ui.legacy.SearchLayout
         android:id="@+id/search_layout"
diff --git a/app/src/main/res/layout/widget_content_layout.xml b/app/src/main/res/layout/widget_content_layout.xml
new file mode 100644
index 000000000..04eedd32e
--- /dev/null
+++ b/app/src/main/res/layout/widget_content_layout.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2015 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.
+  -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/content_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clipChildren="false"
+    android:paddingTop="16dp"
+    app:fitsSystemWindowsInsets="top"
+    app:layout_behavior="@string/searchbar_scrolling_view_behavior">
+
+    <com.google.android.material.progressindicator.CircularProgressIndicator
+        android:id="@+id/progress"
+        style="@style/ProgressView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center" />
+
+    <TextView
+        android:id="@+id/tip"
+        style="@style/TextAppearance.AppCompat.Medium"
+        android:layout_width="228dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:drawablePadding="8dp"
+        android:gravity="center_horizontal" />
+
+    <androidx.swiperefreshlayout.widget.ThemedSwipeRefreshLayout
+        android:id="@+id/refresh_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="@dimen/gallery_padding_top_search_bar"
+        android:clipChildren="false">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clipChildren="false"
+            android:clipToPadding="false" />
+
+    </androidx.swiperefreshlayout.widget.ThemedSwipeRefreshLayout>
+
+    <com.hippo.ehviewer.ui.legacy.FastScroller
+        android:id="@+id/fast_scroller"
+        android:layout_width="30dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="end"
+        android:layout_marginTop="@dimen/gallery_padding_top_search_bar"
+        android:paddingStart="20dp"
+        android:paddingTop="8dp"
+        android:paddingEnd="4dp"
+        android:paddingBottom="8dp" />
+
+</FrameLayout>