From 87b8f69b5d53bd300abe77d935cdc77abdfad304 Mon Sep 17 00:00:00 2001 From: BinTianqi Date: Wed, 8 May 2024 08:33:46 +0800 Subject: [PATCH] convert Animation class to a object --- .../java/com/bintianqi/owndroid/MainActivity.kt | 8 ++++---- .../main/java/com/bintianqi/owndroid/Setting.kt | 8 ++++---- .../bintianqi/owndroid/dpm/ApplicationManage.kt | 8 ++++---- .../com/bintianqi/owndroid/dpm/ManagedProfile.kt | 8 ++++---- .../java/com/bintianqi/owndroid/dpm/Network.kt | 8 ++++---- .../java/com/bintianqi/owndroid/dpm/Password.kt | 8 ++++---- .../com/bintianqi/owndroid/dpm/Permissions.kt | 8 ++++---- .../com/bintianqi/owndroid/dpm/SystemManager.kt | 8 ++++---- .../com/bintianqi/owndroid/dpm/UserManager.kt | 8 ++++---- .../bintianqi/owndroid/dpm/UserRestriction.kt | 8 ++++---- .../java/com/bintianqi/owndroid/ui/Animations.kt | 16 ++++++++-------- 11 files changed, 48 insertions(+), 48 deletions(-) diff --git a/app/src/main/java/com/bintianqi/owndroid/MainActivity.kt b/app/src/main/java/com/bintianqi/owndroid/MainActivity.kt index 6686dd9..7f0e837 100644 --- a/app/src/main/java/com/bintianqi/owndroid/MainActivity.kt +++ b/app/src/main/java/com/bintianqi/owndroid/MainActivity.kt @@ -106,10 +106,10 @@ fun MyScaffold(){ .background(bgColor) .imePadding() .pointerInput(Unit) {detectTapGestures(onTap = {focusMgr.clearFocus()})}, - enterTransition = Animations().navHostEnterTransition, - exitTransition = Animations().navHostExitTransition, - popEnterTransition = Animations().navHostPopEnterTransition, - popExitTransition = Animations().navHostPopExitTransition + enterTransition = Animations.navHostEnterTransition, + exitTransition = Animations.navHostExitTransition, + popEnterTransition = Animations.navHostPopEnterTransition, + popExitTransition = Animations.navHostPopExitTransition ){ composable(route = "HomePage", content = { HomePage(navCtrl)}) composable(route = "SystemManage", content = { SystemManage(navCtrl) }) diff --git a/app/src/main/java/com/bintianqi/owndroid/Setting.kt b/app/src/main/java/com/bintianqi/owndroid/Setting.kt index 865d909..4d7ab9f 100644 --- a/app/src/main/java/com/bintianqi/owndroid/Setting.kt +++ b/app/src/main/java/com/bintianqi/owndroid/Setting.kt @@ -47,10 +47,10 @@ fun AppSetting(navCtrl:NavHostController){ ){ NavHost( navController = localNavCtrl, startDestination = "Home", - enterTransition = Animations().navHostEnterTransition, - exitTransition = Animations().navHostExitTransition, - popEnterTransition = Animations().navHostPopEnterTransition, - popExitTransition = Animations().navHostPopExitTransition, + enterTransition = Animations.navHostEnterTransition, + exitTransition = Animations.navHostExitTransition, + popEnterTransition = Animations.navHostPopEnterTransition, + popExitTransition = Animations.navHostPopExitTransition, modifier = Modifier.background(bgColor).padding(top = it.calculateTopPadding()) ){ composable(route = "Home"){Home(localNavCtrl)} 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 3a2ac0a..5d760e4 100644 --- a/app/src/main/java/com/bintianqi/owndroid/dpm/ApplicationManage.kt +++ b/app/src/main/java/com/bintianqi/owndroid/dpm/ApplicationManage.kt @@ -122,10 +122,10 @@ fun ApplicationManage(navCtrl:NavHostController){ } NavHost( navController = localNavCtrl, startDestination = "Home", - enterTransition = Animations().navHostEnterTransition, - exitTransition = Animations().navHostExitTransition, - popEnterTransition = Animations().navHostPopEnterTransition, - popExitTransition = Animations().navHostPopExitTransition, + enterTransition = Animations.navHostEnterTransition, + exitTransition = Animations.navHostExitTransition, + popEnterTransition = Animations.navHostPopEnterTransition, + popExitTransition = Animations.navHostPopExitTransition, modifier = Modifier.background(bgColor) ){ composable(route = "Home"){Home(localNavCtrl,pkgName)} diff --git a/app/src/main/java/com/bintianqi/owndroid/dpm/ManagedProfile.kt b/app/src/main/java/com/bintianqi/owndroid/dpm/ManagedProfile.kt index 6138fb1..f80db86 100644 --- a/app/src/main/java/com/bintianqi/owndroid/dpm/ManagedProfile.kt +++ b/app/src/main/java/com/bintianqi/owndroid/dpm/ManagedProfile.kt @@ -61,10 +61,10 @@ fun ManagedProfile(navCtrl: NavHostController) { ){ NavHost( navController = localNavCtrl, startDestination = "Home", - enterTransition = Animations().navHostEnterTransition, - exitTransition = Animations().navHostExitTransition, - popEnterTransition = Animations().navHostPopEnterTransition, - popExitTransition = Animations().navHostPopExitTransition, + enterTransition = Animations.navHostEnterTransition, + exitTransition = Animations.navHostExitTransition, + popEnterTransition = Animations.navHostPopEnterTransition, + popExitTransition = Animations.navHostPopExitTransition, modifier = Modifier.background(bgColor).padding(top = it.calculateTopPadding()) ){ composable(route = "Home"){Home(localNavCtrl)} diff --git a/app/src/main/java/com/bintianqi/owndroid/dpm/Network.kt b/app/src/main/java/com/bintianqi/owndroid/dpm/Network.kt index 476f437..29930f2 100644 --- a/app/src/main/java/com/bintianqi/owndroid/dpm/Network.kt +++ b/app/src/main/java/com/bintianqi/owndroid/dpm/Network.kt @@ -82,10 +82,10 @@ fun Network(navCtrl: NavHostController){ ){ NavHost( navController = localNavCtrl, startDestination = "Home", - enterTransition = Animations().navHostEnterTransition, - exitTransition = Animations().navHostExitTransition, - popEnterTransition = Animations().navHostPopEnterTransition, - popExitTransition = Animations().navHostPopExitTransition, + enterTransition = Animations.navHostEnterTransition, + exitTransition = Animations.navHostExitTransition, + popEnterTransition = Animations.navHostPopEnterTransition, + popExitTransition = Animations.navHostPopExitTransition, modifier = Modifier.background(bgColor).padding(top = it.calculateTopPadding()) ){ composable(route = "Home"){Home(localNavCtrl,scrollState)} diff --git a/app/src/main/java/com/bintianqi/owndroid/dpm/Password.kt b/app/src/main/java/com/bintianqi/owndroid/dpm/Password.kt index 427d041..1d16d46 100644 --- a/app/src/main/java/com/bintianqi/owndroid/dpm/Password.kt +++ b/app/src/main/java/com/bintianqi/owndroid/dpm/Password.kt @@ -74,10 +74,10 @@ fun Password(navCtrl: NavHostController){ ){ NavHost( navController = localNavCtrl, startDestination = "Home", - enterTransition = Animations().navHostEnterTransition, - exitTransition = Animations().navHostExitTransition, - popEnterTransition = Animations().navHostPopEnterTransition, - popExitTransition = Animations().navHostPopExitTransition, + enterTransition = Animations.navHostEnterTransition, + exitTransition = Animations.navHostExitTransition, + popEnterTransition = Animations.navHostPopEnterTransition, + popExitTransition = Animations.navHostPopExitTransition, modifier = Modifier.background(bgColor).padding(top = it.calculateTopPadding()) ){ composable(route = "Home"){Home(localNavCtrl,scrollState)} diff --git a/app/src/main/java/com/bintianqi/owndroid/dpm/Permissions.kt b/app/src/main/java/com/bintianqi/owndroid/dpm/Permissions.kt index 8e9b245..32da9b9 100644 --- a/app/src/main/java/com/bintianqi/owndroid/dpm/Permissions.kt +++ b/app/src/main/java/com/bintianqi/owndroid/dpm/Permissions.kt @@ -78,10 +78,10 @@ fun DpmPermissions(navCtrl:NavHostController){ ){ NavHost( navController = localNavCtrl, startDestination = "Home", - enterTransition = Animations().navHostEnterTransition, - exitTransition = Animations().navHostExitTransition, - popEnterTransition = Animations().navHostPopEnterTransition, - popExitTransition = Animations().navHostPopExitTransition, + enterTransition = Animations.navHostEnterTransition, + exitTransition = Animations.navHostExitTransition, + popEnterTransition = Animations.navHostPopEnterTransition, + popExitTransition = Animations.navHostPopExitTransition, modifier = Modifier.background(bgColor).padding(top = it.calculateTopPadding()) ){ composable(route = "Home"){Home(localNavCtrl,scrollState)} 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 ea6c209..c5e44e9 100644 --- a/app/src/main/java/com/bintianqi/owndroid/dpm/SystemManager.kt +++ b/app/src/main/java/com/bintianqi/owndroid/dpm/SystemManager.kt @@ -88,10 +88,10 @@ fun SystemManage(navCtrl:NavHostController){ ){ NavHost( navController = localNavCtrl, startDestination = "Home", - enterTransition = Animations().navHostEnterTransition, - exitTransition = Animations().navHostExitTransition, - popEnterTransition = Animations().navHostPopEnterTransition, - popExitTransition = Animations().navHostPopExitTransition, + enterTransition = Animations.navHostEnterTransition, + exitTransition = Animations.navHostExitTransition, + popEnterTransition = Animations.navHostPopEnterTransition, + popExitTransition = Animations.navHostPopExitTransition, modifier = Modifier.background(bgColor).padding(top = it.calculateTopPadding()) ){ composable(route = "Home"){Home(localNavCtrl,scrollState)} diff --git a/app/src/main/java/com/bintianqi/owndroid/dpm/UserManager.kt b/app/src/main/java/com/bintianqi/owndroid/dpm/UserManager.kt index 9a52ffc..29ff085 100644 --- a/app/src/main/java/com/bintianqi/owndroid/dpm/UserManager.kt +++ b/app/src/main/java/com/bintianqi/owndroid/dpm/UserManager.kt @@ -82,10 +82,10 @@ fun UserManage(navCtrl:NavHostController) { ){ NavHost( navController = localNavCtrl, startDestination = "Home", - enterTransition = Animations().navHostEnterTransition, - exitTransition = Animations().navHostExitTransition, - popEnterTransition = Animations().navHostPopEnterTransition, - popExitTransition = Animations().navHostPopExitTransition, + enterTransition = Animations.navHostEnterTransition, + exitTransition = Animations.navHostExitTransition, + popEnterTransition = Animations.navHostPopEnterTransition, + popExitTransition = Animations.navHostPopExitTransition, modifier = Modifier.background(bgColor).padding(top = it.calculateTopPadding()) ){ composable(route = "Home"){Home(localNavCtrl,scrollState)} diff --git a/app/src/main/java/com/bintianqi/owndroid/dpm/UserRestriction.kt b/app/src/main/java/com/bintianqi/owndroid/dpm/UserRestriction.kt index 7d65311..77e0522 100644 --- a/app/src/main/java/com/bintianqi/owndroid/dpm/UserRestriction.kt +++ b/app/src/main/java/com/bintianqi/owndroid/dpm/UserRestriction.kt @@ -80,10 +80,10 @@ fun UserRestriction(navCtrl: NavHostController){ ){ NavHost( navController = localNavCtrl, startDestination = "Home", - enterTransition = Animations().navHostEnterTransition, - exitTransition = Animations().navHostExitTransition, - popEnterTransition = Animations().navHostPopEnterTransition, - popExitTransition = Animations().navHostPopExitTransition, + enterTransition = Animations.navHostEnterTransition, + exitTransition = Animations.navHostExitTransition, + popEnterTransition = Animations.navHostPopEnterTransition, + popExitTransition = Animations.navHostPopExitTransition, modifier = Modifier.background(bgColor).padding(top = it.calculateTopPadding()) ){ composable(route = "Internet"){Internet()} 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 9f613cd..d6fbe40 100644 --- a/app/src/main/java/com/bintianqi/owndroid/ui/Animations.kt +++ b/app/src/main/java/com/bintianqi/owndroid/ui/Animations.kt @@ -5,20 +5,20 @@ import androidx.compose.animation.core.* import androidx.compose.ui.unit.IntOffset import androidx.navigation.NavBackStackEntry -class Animations{ - private val initialOffsetValue = 96 - private val targetOffsetValue = 96 +object Animations{ + private const val INITIAL_OFFSET_VALUE = 96 + private const val TARGET_OFFSET_VALUE = 96 private val bezier = CubicBezierEasing(0.4f, 0f, 0f, 1f) - private val tween: FiniteAnimationSpec = tween(400, easing = bezier) + private val tween: FiniteAnimationSpec = tween(450, easing = bezier) val navHostEnterTransition: AnimatedContentTransitionScope.() -> EnterTransition = { fadeIn(tween(83, easing = LinearEasing)) + slideIntoContainer( animationSpec = tween, towards = AnimatedContentTransitionScope.SlideDirection.End, - initialOffset = {initialOffsetValue} + initialOffset = {INITIAL_OFFSET_VALUE} ) } @@ -27,7 +27,7 @@ class Animations{ slideOutOfContainer( animationSpec = tween, towards = AnimatedContentTransitionScope.SlideDirection.Start, - targetOffset = {-targetOffsetValue} + targetOffset = {-TARGET_OFFSET_VALUE} ) } @@ -36,7 +36,7 @@ class Animations{ slideIntoContainer( animationSpec = tween, towards = AnimatedContentTransitionScope.SlideDirection.End, - initialOffset = {-initialOffsetValue} + initialOffset = {-INITIAL_OFFSET_VALUE} ) } @@ -45,7 +45,7 @@ class Animations{ slideOutOfContainer( animationSpec = tween, towards = AnimatedContentTransitionScope.SlideDirection.Start, - targetOffset = {targetOffsetValue} + targetOffset = {TARGET_OFFSET_VALUE} ) }