From 0c2cbe809da3d41dde91cba7ca659b766eba337d Mon Sep 17 00:00:00 2001
From: Sun-QAQ <75133710+Sun-QAQ@users.noreply.github.com>
Date: Fri, 10 Jan 2025 18:30:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BE=E7=89=87=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=8D=95=E9=A1=B5=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=20(#4518)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 优化图片样式单页显示逻辑

- 当书籍图片样式为空或书源内容规则为单页样式时，自动切换为单页显示
- 在切换为单页样式时，将页面切换动画设置为覆盖

* Revert "优化图片样式单页显示逻辑"

This reverts commit 2c415ef60169c0545301e2ea4314f255ffe65d22.

* 优化图片样式单页显示逻辑

- 当书源内容规则为单页样式时，自动切换为单页显示
- 在切换为单页样式时，将页面切换动画设置为覆盖
---
 app/src/main/java/io/legado/app/model/ReadBook.kt             | 4 ++++
 .../main/java/io/legado/app/ui/book/read/ReadBookActivity.kt  | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/app/src/main/java/io/legado/app/model/ReadBook.kt b/app/src/main/java/io/legado/app/model/ReadBook.kt
index 07efe28d7..42a7e9ccd 100644
--- a/app/src/main/java/io/legado/app/model/ReadBook.kt
+++ b/app/src/main/java/io/legado/app/model/ReadBook.kt
@@ -172,6 +172,10 @@ object ReadBook : CoroutineScope by MainScope() {
                 if (book.getImageStyle().isNullOrBlank()) {
                     book.setImageStyle(it.getContentRule().imageStyle)
                 }
+                if (it.getContentRule().imageStyle == Book.imgStyleSingle) {
+                    book.setImageStyle(it.getContentRule().imageStyle)
+                    book.setPageAnim(0)
+                }
             } ?: let {
                 bookSource = null
             }
diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
index 608b83457..6a19fa2c4 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
@@ -571,6 +571,8 @@ class ReadBookActivity : BaseReadBookActivity(),
                     imgStyles
                 ) { _, index ->
                     ReadBook.book?.setImageStyle(imgStyles[index])
+                    ReadBook.book?.setPageAnim(0)  // 切换图片样式single后，自动切换为覆盖
+                    binding.readView.upPageAnim()
                     ReadBook.loadContent(false)
                 }
             }