From 439899fbdceaefc5ad8b6d191f9d3a7be4f93768 Mon Sep 17 00:00:00 2001
From: Dude so hot <djohn@fbi.gov>
Date: Sun, 20 Oct 2024 20:28:16 +0800
Subject: [PATCH] Use Expressive MotionScheme

---
 .../kotlin/com/hippo/ehviewer/ui/Theme.kt     |  4 +---
 .../com/hippo/ehviewer/ui/theme/Theme.kt      | 20 ++++---------------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/Theme.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/Theme.kt
index e7975ba40..a6468c46a 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/Theme.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/Theme.kt
@@ -22,10 +22,8 @@ import soup.compose.material.motion.animation.rememberSlideDistance
 inline fun ComponentActivity.setMD3Content(crossinline content: @Composable () -> Unit) = setContent {
     EhTheme(useDarkTheme = isSystemInDarkTheme()) {
         ProvideVectorPainterCache {
-            val dialogState = remember { DialogState() }
-            dialogState.Intercept()
             CompositionLocalProvider(
-                LocalDialogState provides dialogState,
+                LocalDialogState provides remember { DialogState() }.apply { Intercept() },
             ) {
                 content()
             }
diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/theme/Theme.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/theme/Theme.kt
index cd1c83000..fe88150c5 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/theme/Theme.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/theme/Theme.kt
@@ -7,7 +7,7 @@ import androidx.compose.material3.MotionScheme
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
-import androidx.compose.material3.lightColorScheme
+import androidx.compose.material3.expressiveLightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
@@ -43,7 +43,7 @@ fun EhTheme(useDarkTheme: Boolean, content: @Composable () -> Unit) {
         if (isAtLeastS) {
             dynamicLightColorScheme(context)
         } else {
-            lightColorScheme()
+            expressiveLightColorScheme()
         }
     }
 
@@ -58,18 +58,6 @@ fun EhTheme(useDarkTheme: Boolean, content: @Composable () -> Unit) {
 }
 
 // https://issuetracker.google.com/363892346
-object CustomMotionScheme : MotionScheme {
-    private val motionScheme = MotionScheme.standard()
-
-    override fun <T> defaultSpatialSpec() = motionScheme.defaultEffectsSpec<T>()
-
-    override fun <T> fastSpatialSpec() = motionScheme.fastSpatialSpec<T>()
-
-    override fun <T> slowSpatialSpec() = motionScheme.slowSpatialSpec<T>()
-
-    override fun <T> defaultEffectsSpec() = motionScheme.defaultEffectsSpec<T>()
-
-    override fun <T> fastEffectsSpec() = motionScheme.fastEffectsSpec<T>()
-
-    override fun <T> slowEffectsSpec() = motionScheme.slowEffectsSpec<T>()
+object CustomMotionScheme : MotionScheme by MotionScheme.expressive() {
+    override fun <T> defaultSpatialSpec() = defaultEffectsSpec<T>()
 }