From 203170c075bfbc1ae020283311adc4baa9c0ffd0 Mon Sep 17 00:00:00 2001
From: Xwite <1797350009@qq.com>
Date: Sun, 26 Mar 2023 10:10:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=20close=20#2912?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/book/info/BookInfoActivity.kt      | 18 ++++--
 .../main/res/layout/activity_book_info.xml    | 61 +++++++++++--------
 2 files changed, 49 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
index ff6f7c090..cfaedcce1 100644
--- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
@@ -25,6 +25,7 @@ import io.legado.app.help.config.AppConfig
 import io.legado.app.help.config.LocalConfig
 import io.legado.app.lib.dialogs.alert
 import io.legado.app.lib.dialogs.selector
+import io.legado.app.lib.theme.accentColor
 import io.legado.app.lib.theme.backgroundColor
 import io.legado.app.lib.theme.bottomBackground
 import io.legado.app.lib.theme.getPrimaryTextColor
@@ -111,6 +112,11 @@ class BookInfoActivity :
     @SuppressLint("PrivateResource")
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         binding.titleBar.setBackgroundResource(R.color.transparent)
+        binding.refreshLayout.setColorSchemeColors(accentColor)
+        binding.refreshLayout.setOnRefreshListener {
+            binding.refreshLayout.isRefreshing = false
+            refreshBook()
+        }
         binding.arcView.setBgColor(backgroundColor)
         binding.llInfo.setBackgroundColor(backgroundColor)
         binding.scrollView.setBackgroundColor(backgroundColor)
@@ -169,10 +175,7 @@ class BookInfoActivity :
                 }
             }
             R.id.menu_refresh -> {
-                upLoading(true)
-                viewModel.getBook()?.let {
-                    viewModel.refreshBook(it)
-                }
+                refreshBook()
             }
             R.id.menu_login -> viewModel.bookSource?.let {
                 startActivity<SourceLoginActivity> {
@@ -236,6 +239,13 @@ class BookInfoActivity :
         }
     }
 
+    private fun refreshBook() {
+        upLoading(true)
+        viewModel.getBook()?.let {
+            viewModel.refreshBook(it)
+        }
+    }
+
     private fun upLoadBook(
         book: Book,
         bookWebDav: RemoteBookWebDav? = AppWebDav.defaultBookWebDav
diff --git a/app/src/main/res/layout/activity_book_info.xml b/app/src/main/res/layout/activity_book_info.xml
index 1cc0fa0d9..4797ec662 100644
--- a/app/src/main/res/layout/activity_book_info.xml
+++ b/app/src/main/res/layout/activity_book_info.xml
@@ -29,39 +29,48 @@
             app:title="@string/book_info"
             app:themeMode="dark" />
 
-        <RelativeLayout
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/refresh_layout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp">
+            android:layout_height="0dp"
+            app:layout_constraintTop_toBottomOf="@+id/title_bar"
+            app:layout_constraintBottom_toBottomOf="parent">
 
-            <io.legado.app.ui.widget.image.ArcView
-                android:id="@+id/arc_view"
-                android:layout_marginTop="90dp"
+            <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="78dp"
-                app:arcDirectionTop="true"
-                app:arcHeight="36dp"
-                app:bgColor="@color/background" />
-
-            <androidx.cardview.widget.CardView
-                android:layout_margin="3dp"
-                android:layout_centerHorizontal="true"
-                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                app:cardCornerRadius="5dp"
-                app:cardElevation="8dp">
+                android:layout_marginTop="8dp">
 
-                <io.legado.app.ui.widget.image.CoverImageView
-                    android:id="@+id/iv_cover"
-                    android:layout_width="110dp"
-                    android:layout_height="160dp"
-                    android:contentDescription="@string/img_cover"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/image_cover_default" />
+                <io.legado.app.ui.widget.image.ArcView
+                    android:id="@+id/arc_view"
+                    android:layout_marginTop="90dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="78dp"
+                    app:arcDirectionTop="true"
+                    app:arcHeight="36dp"
+                    app:bgColor="@color/background" />
 
-            </androidx.cardview.widget.CardView>
+                <androidx.cardview.widget.CardView
+                    android:layout_margin="3dp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:cardCornerRadius="5dp"
+                    app:cardElevation="8dp">
 
-        </RelativeLayout>
+                    <io.legado.app.ui.widget.image.CoverImageView
+                        android:id="@+id/iv_cover"
+                        android:layout_width="110dp"
+                        android:layout_height="160dp"
+                        android:contentDescription="@string/img_cover"
+                        android:scaleType="centerCrop"
+                        android:src="@drawable/image_cover_default" />
+
+                </androidx.cardview.widget.CardView>
+
+            </RelativeLayout>
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
         <ScrollView
             android:id="@+id/scroll_view"