diff --git a/build.gradle b/build.gradle index 58004e179c..341918adf1 100644 --- a/build.gradle +++ b/build.gradle @@ -387,7 +387,7 @@ dependencies { implementation "com.google.accompanist:accompanist-placeholder-material:$accompanist_version" implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version" implementation "com.google.android.material:material:1.7.0" - implementation "io.github.fornewid:material-motion-compose-core:0.9.1" + implementation "io.github.fornewid:material-motion-compose-core:0.10.3" implementation 'dev.kdrag0n:colorkt:1.0.5' implementation 'io.coil-kt:coil-compose:2.2.2' implementation 'me.xdrop:fuzzywuzzy:1.4.0' diff --git a/lawnchair/src/app/lawnchair/ui/preferences/Preferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/Preferences.kt index afcb142b78..d560f148b0 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/Preferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/Preferences.kt @@ -21,7 +21,6 @@ import androidx.compose.material3.Surface import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.staticCompositionLocalOf -import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.LocalLayoutDirection import androidx.compose.ui.unit.LayoutDirection import androidx.lifecycle.viewmodel.compose.viewModel @@ -35,7 +34,9 @@ import app.lawnchair.ui.util.ProvideBottomSheetHandler import app.lawnchair.util.ProvideLifecycleState import com.google.accompanist.navigation.animation.AnimatedNavHost import com.google.accompanist.navigation.animation.rememberAnimatedNavController -import soup.compose.material.motion.materialSharedAxisX +import soup.compose.material.motion.animation.materialSharedAxisXIn +import soup.compose.material.motion.animation.materialSharedAxisXOut +import soup.compose.material.motion.animation.rememberSlideDistance object Routes { const val GENERAL = "general" @@ -72,8 +73,7 @@ val LocalPreferenceInteractor = staticCompositionLocalOf { fun Preferences(interactor: PreferenceInteractor = viewModel()) { val navController = rememberAnimatedNavController() val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl - val motionSpec = materialSharedAxisX() - val density = LocalDensity.current + val slideDistance = rememberSlideDistance() SystemUi() Providers { @@ -85,10 +85,10 @@ fun Preferences(interactor: PreferenceInteractor = viewModel generalGraph(route = subRoute(Routes.GENERAL))