From 1d0996a412328409d7c122a3f8f693b0153271b8 Mon Sep 17 00:00:00 2001
From: Xwite <1797350009@qq.com>
Date: Sun, 26 Mar 2023 10:30:40 +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 | 8 +-
.../main/res/layout/activity_book_info.xml | 575 +++++++++---------
2 files changed, 291 insertions(+), 292 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 cfaedcce1..6bf8843f6 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
@@ -113,10 +113,6 @@ class BookInfoActivity :
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)
@@ -427,6 +423,10 @@ class BookInfoActivity :
}
}
}
+ refreshLayout?.setOnRefreshListener {
+ refreshLayout?.isRefreshing = false
+ refreshBook()
+ }
}
private fun setSourceVariable() {
diff --git a/app/src/main/res/layout/activity_book_info.xml b/app/src/main/res/layout/activity_book_info.xml
index 4797ec662..ecc5272ad 100644
--- a/app/src/main/res/layout/activity_book_info.xml
+++ b/app/src/main/res/layout/activity_book_info.xml
@@ -70,337 +70,336 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:scrollbarStyle="outsideInset"
+ android:scrollbars="vertical"
+ android:fillViewport="true"
+ android:fitsSystemWindows="false"
+ android:focusable="true">
-
-
-
-
-
-
-
-
-
-
+ android:text="@string/book_name"
+ android:textColor="@color/primaryText"
+ android:textSize="18sp"
+ tools:ignore="RtlHardcoded" />
-
+ android:layout_marginBottom="6dp"
+ android:layout_gravity="center"
+ android:gravity="center"
+ android:visibility="gone" />
+ android:layout_height="wrap_content">
-
-
-
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ android:paddingTop="3dp"
+ android:paddingBottom="3dp"
+ tools:ignore="UseCompoundDrawables">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_marginTop="8dp"
+ android:clickable="true"
+ android:focusable="true"
+ android:minHeight="48dp"
+ android:paddingLeft="8dp"
+ android:paddingBottom="8dp"
+ android:text="@string/book_intro"
+ android:textColor="@color/secondaryText"
+ android:textSize="14sp"
+ android:visibility="visible"
+ tools:ignore="RtlHardcoded,RtlSymmetry" />
-
+
+
+
+
+
+
+ android:gravity="center"
+ android:includeFontPadding="false"
+ android:text="@string/remove_from_bookshelf"
+ android:textColor="@color/primaryText"
+ android:textSize="15sp" />
+
+
-
-
-
-
-
-
-
-
-
-
-
+
-