diff --git a/app/src/main/java/com/bintianqi/owndroid/dpm/ApplicationManage.kt b/app/src/main/java/com/bintianqi/owndroid/dpm/ApplicationManage.kt index 4bc7b28..3a2ac0a 100644 --- a/app/src/main/java/com/bintianqi/owndroid/dpm/ApplicationManage.kt +++ b/app/src/main/java/com/bintianqi/owndroid/dpm/ApplicationManage.kt @@ -253,7 +253,7 @@ private fun UserCtrlDisabledPkg(pkgName:String){ Text(text = stringResource(R.string.ucd_desc)) Spacer(Modifier.padding(vertical = 5.dp)) Text(text = stringResource(R.string.app_list_is)) - SelectionContainer(modifier = Modifier.horizontalScroll(rememberScrollState()).animateContentSize(Animations().animateListSize)){ + SelectionContainer(modifier = Modifier.horizontalScroll(rememberScrollState()).animateContentSize()){ Text(text = if(listText==""){stringResource(R.string.none)}else{listText}) } Spacer(Modifier.padding(vertical = 5.dp)) @@ -437,7 +437,7 @@ private fun CrossProfilePkg(pkgName: String){ } LaunchedEffect(Unit){refresh()} Text(text = stringResource(R.string.app_list_is)) - SelectionContainer(modifier = Modifier.horizontalScroll(rememberScrollState()).animateContentSize(Animations().animateListSize)){ + SelectionContainer(modifier = Modifier.horizontalScroll(rememberScrollState()).animateContentSize()){ Text(text = if(list==""){stringResource(R.string.none)}else{list}) } Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween){ @@ -485,7 +485,7 @@ private fun CrossProfileWidget(pkgName: String){ Text(text = stringResource(R.string.cross_profile_widget), style = typography.headlineLarge) Spacer(Modifier.padding(vertical = 5.dp)) Text(text = stringResource(R.string.app_list_is)) - SelectionContainer(modifier = Modifier.horizontalScroll(rememberScrollState()).animateContentSize(Animations().animateListSize)){ + SelectionContainer(modifier = Modifier.horizontalScroll(rememberScrollState()).animateContentSize()){ Text(text = if(list==""){stringResource(R.string.none)}else{list}) } Spacer(Modifier.padding(vertical = 5.dp)) @@ -611,7 +611,7 @@ private fun PermittedAccessibility(pkgName: String){ } Spacer(Modifier.padding(vertical = 5.dp)) Text(text = stringResource(R.string.app_list_is)) - SelectionContainer(modifier = Modifier.horizontalScroll(rememberScrollState()).animateContentSize(Animations().animateListSize)){ + SelectionContainer(modifier = Modifier.horizontalScroll(rememberScrollState()).animateContentSize()){ Text(text = if(listText==""){stringResource(R.string.none)}else{listText}) } Spacer(Modifier.padding(vertical = 5.dp)) diff --git a/app/src/main/java/com/bintianqi/owndroid/dpm/SystemManager.kt b/app/src/main/java/com/bintianqi/owndroid/dpm/SystemManager.kt index 994703b..ea6c209 100644 --- a/app/src/main/java/com/bintianqi/owndroid/dpm/SystemManager.kt +++ b/app/src/main/java/com/bintianqi/owndroid/dpm/SystemManager.kt @@ -547,7 +547,7 @@ private fun LockTaskFeatures(){ } LaunchedEffect(Unit){refreshWhitelist()} Text(text = stringResource(R.string.whitelist_app), style = typography.titleLarge) - SelectionContainer(modifier = Modifier.animateContentSize(Animations().animateListSize)){ + SelectionContainer(modifier = Modifier.animateContentSize()){ Text(text = if(listText==""){ stringResource(R.string.none) }else{listText}) } OutlinedTextField( diff --git a/app/src/main/java/com/bintianqi/owndroid/ui/Animations.kt b/app/src/main/java/com/bintianqi/owndroid/ui/Animations.kt index 9c6fdb1..9f613cd 100644 --- a/app/src/main/java/com/bintianqi/owndroid/ui/Animations.kt +++ b/app/src/main/java/com/bintianqi/owndroid/ui/Animations.kt @@ -3,18 +3,15 @@ package com.bintianqi.owndroid.ui import androidx.compose.animation.* import androidx.compose.animation.core.* import androidx.compose.ui.unit.IntOffset -import androidx.compose.ui.unit.IntSize import androidx.navigation.NavBackStackEntry class Animations{ - val animateListSize:FiniteAnimationSpec = spring(stiffness = Spring.StiffnessMediumLow, visibilityThreshold = IntSize.VisibilityThreshold) - private val initialOffsetValue = 96 private val targetOffsetValue = 96 - private val bezier = CubicBezierEasing(0.3f, 0f, 0f, 1f) + private val bezier = CubicBezierEasing(0.4f, 0f, 0f, 1f) - private val tween: FiniteAnimationSpec = tween(450, easing = bezier) + private val tween: FiniteAnimationSpec = tween(400, easing = bezier) val navHostEnterTransition: AnimatedContentTransitionScope.() -> EnterTransition = { fadeIn(tween(83, easing = LinearEasing)) + @@ -26,6 +23,7 @@ class Animations{ } val navHostExitTransition: AnimatedContentTransitionScope.() -> ExitTransition = { + fadeOut(tween(83, easing = LinearEasing)) + slideOutOfContainer( animationSpec = tween, towards = AnimatedContentTransitionScope.SlideDirection.Start, @@ -34,6 +32,7 @@ class Animations{ } val navHostPopEnterTransition: AnimatedContentTransitionScope.() -> EnterTransition = { + fadeIn(tween(83, easing = LinearEasing)) + slideIntoContainer( animationSpec = tween, towards = AnimatedContentTransitionScope.SlideDirection.End,