修复由于阅读界面测量错误造成的一些问题
This commit is contained in:
1 file changed
+8
-10
@@ -18,10 +18,12 @@ import androidx.activity.addCallback
|
|||||||
import androidx.activity.result.contract.ActivityResultContracts
|
import androidx.activity.result.contract.ActivityResultContracts
|
||||||
import androidx.appcompat.app.AlertDialog
|
import androidx.appcompat.app.AlertDialog
|
||||||
import androidx.appcompat.widget.PopupMenu
|
import androidx.appcompat.widget.PopupMenu
|
||||||
|
import androidx.core.view.doOnPreDraw
|
||||||
import androidx.core.view.get
|
import androidx.core.view.get
|
||||||
import androidx.core.view.size
|
import androidx.core.view.size
|
||||||
import androidx.lifecycle.lifecycleScope
|
import androidx.lifecycle.lifecycleScope
|
||||||
import com.google.android.material.transition.platform.MaterialContainerTransform
|
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.google.android.material.transition.platform.MaterialSharedAxis
|
||||||
import com.jaredrummler.android.colorpicker.ColorPickerDialogListener
|
import com.jaredrummler.android.colorpicker.ColorPickerDialogListener
|
||||||
import io.legato.kazusa.BuildConfig
|
import io.legato.kazusa.BuildConfig
|
||||||
@@ -263,24 +265,20 @@ class ReadBookActivity : BaseReadBookActivity(),
|
|||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
|
|
||||||
if (AppConfig.sharedElementEnterTransitionEnable) {
|
if (AppConfig.sharedElementEnterTransitionEnable) {
|
||||||
|
setEnterSharedElementCallback(MaterialContainerTransformSharedElementCallback())
|
||||||
val transform = MaterialContainerTransform().apply {
|
val transform = MaterialContainerTransform().apply {
|
||||||
addTarget(binding.rootView)
|
addTarget(binding.root)
|
||||||
scrimColor = Color.TRANSPARENT
|
scrimColor = Color.TRANSPARENT
|
||||||
duration = delayMillis
|
duration = delayMillis
|
||||||
}
|
}
|
||||||
window.sharedElementEnterTransition = transform
|
window.sharedElementEnterTransition = transform
|
||||||
|
window.sharedElementReturnTransition = transform
|
||||||
}
|
}
|
||||||
window.sharedElementReturnTransition =
|
|
||||||
MaterialSharedAxis(MaterialSharedAxis.X, true).apply {
|
|
||||||
duration = delayMillis
|
|
||||||
}
|
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
|
|
||||||
if (AppConfig.sharedElementEnterTransitionEnable)
|
if (AppConfig.sharedElementEnterTransitionEnable){
|
||||||
binding.rootView.transitionName = intent.getStringExtra("transitionName")
|
binding.rootView.transitionName = intent.getStringExtra("transitionName")
|
||||||
|
}
|
||||||
upScreenTimeOut()
|
upScreenTimeOut()
|
||||||
ReadBook.register(this)
|
ReadBook.register(this)
|
||||||
|
|
||||||
@@ -310,7 +308,7 @@ class ReadBookActivity : BaseReadBookActivity(),
|
|||||||
if (getPrefBoolean("disableReturnKey") && !menuLayoutIsVisible) {
|
if (getPrefBoolean("disableReturnKey") && !menuLayoutIsVisible) {
|
||||||
return@addCallback
|
return@addCallback
|
||||||
}
|
}
|
||||||
finish()
|
supportFinishAfterTransition()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user