From 9fa29416afab128e41b54fe78fa66d75b5d44251 Mon Sep 17 00:00:00 2001
From: HapeLee <1321903405@qq.com>
Date: Thu, 18 Sep 2025 19:27:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=B1=E4=BA=8E=E9=98=85?=
 =?UTF-8?q?=E8=AF=BB=E7=95=8C=E9=9D=A2=E6=B5=8B=E9=87=8F=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E9=80=A0=E6=88=90=E7=9A=84=E4=B8=80=E4=BA=9B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kazusa/ui/book/read/ReadBookActivity.kt    | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legato/kazusa/ui/book/read/ReadBookActivity.kt
index 0d4a2a201..5999085dd 100644
--- a/app/src/main/java/io/legato/kazusa/ui/book/read/ReadBookActivity.kt
+++ b/app/src/main/java/io/legato/kazusa/ui/book/read/ReadBookActivity.kt
@@ -18,10 +18,12 @@ import androidx.activity.addCallback
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.PopupMenu
+import androidx.core.view.doOnPreDraw
 import androidx.core.view.get
 import androidx.core.view.size
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.transition.platform.MaterialContainerTransform
+import com.google.android.material.transition.platform.MaterialContainerTransformSharedElementCallback
 import com.google.android.material.transition.platform.MaterialSharedAxis
 import com.jaredrummler.android.colorpicker.ColorPickerDialogListener
 import io.legato.kazusa.BuildConfig
@@ -263,24 +265,20 @@ class ReadBookActivity : BaseReadBookActivity(),
     override fun onCreate(savedInstanceState: Bundle?) {
 
         if (AppConfig.sharedElementEnterTransitionEnable) {
-
+            setEnterSharedElementCallback(MaterialContainerTransformSharedElementCallback())
             val transform = MaterialContainerTransform().apply {
-                addTarget(binding.rootView)
+                addTarget(binding.root)
                 scrimColor = Color.TRANSPARENT
                 duration = delayMillis
             }
             window.sharedElementEnterTransition = transform
-
+            window.sharedElementReturnTransition = transform
         }
-        window.sharedElementReturnTransition =
-            MaterialSharedAxis(MaterialSharedAxis.X, true).apply {
-                duration = delayMillis
-            }
         super.onCreate(savedInstanceState)
 
-        if (AppConfig.sharedElementEnterTransitionEnable)
+        if (AppConfig.sharedElementEnterTransitionEnable){
             binding.rootView.transitionName = intent.getStringExtra("transitionName")
-
+        }
         upScreenTimeOut()
         ReadBook.register(this)
 
@@ -310,7 +308,7 @@ class ReadBookActivity : BaseReadBookActivity(),
             if (getPrefBoolean("disableReturnKey") && !menuLayoutIsVisible) {
                 return@addCallback
             }
-            finish()
+            supportFinishAfterTransition()
         }
     }