awfixer/OwnDroid
1
0
Fork 0
mirror of https://github.com/awfixers-stuff/OwnDroid.git synced 2026-03-23 11:05:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

optimize CubicBezierEasing

Browse Source
This commit is contained in:
BinTianqi
2024-05-07 21:01:42 +08:00
parent 7f5e5250ad
commit 5dc6dae844
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/bintianqi/owndroid/dpm/ApplicationManage.kt
View File

@@ -253,7 +253,7 @@ private fun UserCtrlDisabledPkg(pkgName:String){
Text(text = stringResource(R.string.ucd_desc)) Text(text = stringResource(R.string.ucd_desc))
Spacer(Modifier.padding(vertical = 5.dp)) Spacer(Modifier.padding(vertical = 5.dp))
Text(text = stringResource(R.string.app_list_is)) 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}) Text(text = if(listText==""){stringResource(R.string.none)}else{listText})
} }
Spacer(Modifier.padding(vertical = 5.dp)) Spacer(Modifier.padding(vertical = 5.dp))
@@ -437,7 +437,7 @@ private fun CrossProfilePkg(pkgName: String){
} }
LaunchedEffect(Unit){refresh()} LaunchedEffect(Unit){refresh()}
Text(text = stringResource(R.string.app_list_is)) 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}) Text(text = if(list==""){stringResource(R.string.none)}else{list})
} }
Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween){ 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) Text(text = stringResource(R.string.cross_profile_widget), style = typography.headlineLarge)
Spacer(Modifier.padding(vertical = 5.dp)) Spacer(Modifier.padding(vertical = 5.dp))
Text(text = stringResource(R.string.app_list_is)) 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}) Text(text = if(list==""){stringResource(R.string.none)}else{list})
} }
Spacer(Modifier.padding(vertical = 5.dp)) Spacer(Modifier.padding(vertical = 5.dp))
@@ -611,7 +611,7 @@ private fun PermittedAccessibility(pkgName: String){
} }
Spacer(Modifier.padding(vertical = 5.dp)) Spacer(Modifier.padding(vertical = 5.dp))
Text(text = stringResource(R.string.app_list_is)) 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}) Text(text = if(listText==""){stringResource(R.string.none)}else{listText})
} }
Spacer(Modifier.padding(vertical = 5.dp)) Spacer(Modifier.padding(vertical = 5.dp))

2
app/src/main/java/com/bintianqi/owndroid/dpm/SystemManager.kt
View File

@@ -547,7 +547,7 @@ private fun LockTaskFeatures(){
} }
LaunchedEffect(Unit){refreshWhitelist()} LaunchedEffect(Unit){refreshWhitelist()}
Text(text = stringResource(R.string.whitelist_app), style = typography.titleLarge) 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}) Text(text = if(listText==""){ stringResource(R.string.none) }else{listText})
} }
OutlinedTextField( OutlinedTextField(

9
app/src/main/java/com/bintianqi/owndroid/ui/Animations.kt
View File

@@ -3,18 +3,15 @@ package com.bintianqi.owndroid.ui
import androidx.compose.animation.* import androidx.compose.animation.*
import androidx.compose.animation.core.* import androidx.compose.animation.core.*
import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.IntOffset
import androidx.compose.ui.unit.IntSize
import androidx.navigation.NavBackStackEntry import androidx.navigation.NavBackStackEntry
class Animations{ class Animations{
val animateListSize:FiniteAnimationSpec<IntSize> = spring(stiffness = Spring.StiffnessMediumLow, visibilityThreshold = IntSize.VisibilityThreshold)
private val initialOffsetValue = 96 private val initialOffsetValue = 96
private val targetOffsetValue = 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<IntOffset> = tween(450, easing = bezier) private val tween: FiniteAnimationSpec<IntOffset> = tween(400, easing = bezier)
val navHostEnterTransition: AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition = { val navHostEnterTransition: AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition = {
fadeIn(tween(83, easing = LinearEasing)) + fadeIn(tween(83, easing = LinearEasing)) +
@@ -26,6 +23,7 @@ class Animations{
} }
val navHostExitTransition: AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition = { val navHostExitTransition: AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition = {
fadeOut(tween(83, easing = LinearEasing)) +
slideOutOfContainer( slideOutOfContainer(
animationSpec = tween, animationSpec = tween,
towards = AnimatedContentTransitionScope.SlideDirection.Start, towards = AnimatedContentTransitionScope.SlideDirection.Start,
@@ -34,6 +32,7 @@ class Animations{
} }
val navHostPopEnterTransition: AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition = { val navHostPopEnterTransition: AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition = {
fadeIn(tween(83, easing = LinearEasing)) +
slideIntoContainer( slideIntoContainer(
animationSpec = tween, animationSpec = tween,
towards = AnimatedContentTransitionScope.SlideDirection.End, towards = AnimatedContentTransitionScope.SlideDirection.End,