PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bump material-motion-compose-core to 0.10.3 (#3071)

Browse Source 
https://github.com/fornewid/material-motion-compose/releases/tag/v0.10.3
This commit is contained in:
Goooler
2022-11-01 14:14:17 +08:00
committed by GitHub
parent 3467792fa0
commit f809e7acee
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+1 -1
View File
@@ -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'
lawnchair/src/app/lawnchair/ui/preferences/Preferences.kt
+8 -8
View File
@@ -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<PreferenceInteractor> {
fun Preferences(interactor: PreferenceInteractor = viewModel<PreferenceViewModel>()) {
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<PreferenceViewModel
AnimatedNavHost(
navController = navController,
startDestination = "/",
enterTransition = { motionSpec.enter.transition(!isRtl, density) },
exitTransition = { motionSpec.exit.transition(!isRtl, density) },
popEnterTransition = { motionSpec.enter.transition(isRtl, density) },
popExitTransition = { motionSpec.exit.transition(isRtl, density) },
enterTransition = { materialSharedAxisXIn(!isRtl, slideDistance) },
exitTransition = { materialSharedAxisXOut(!isRtl, slideDistance) },
popEnterTransition = { materialSharedAxisXIn(isRtl, slideDistance) },
popExitTransition = { materialSharedAxisXOut(isRtl, slideDistance) },
) {
preferenceGraph(route = "/", { PreferencesDashboard() }) { subRoute ->
generalGraph(route = subRoute(Routes.GENERAL))