mirror of
https://github.com/awfixers-stuff/OwnDroid.git
synced 2026-03-23 19:15:58 +00:00
convert Animation class to a object
This commit is contained in:
@@ -106,10 +106,10 @@ fun MyScaffold(){
|
|||||||
.background(bgColor)
|
.background(bgColor)
|
||||||
.imePadding()
|
.imePadding()
|
||||||
.pointerInput(Unit) {detectTapGestures(onTap = {focusMgr.clearFocus()})},
|
.pointerInput(Unit) {detectTapGestures(onTap = {focusMgr.clearFocus()})},
|
||||||
enterTransition = Animations().navHostEnterTransition,
|
enterTransition = Animations.navHostEnterTransition,
|
||||||
exitTransition = Animations().navHostExitTransition,
|
exitTransition = Animations.navHostExitTransition,
|
||||||
popEnterTransition = Animations().navHostPopEnterTransition,
|
popEnterTransition = Animations.navHostPopEnterTransition,
|
||||||
popExitTransition = Animations().navHostPopExitTransition
|
popExitTransition = Animations.navHostPopExitTransition
|
||||||
){
|
){
|
||||||
composable(route = "HomePage", content = { HomePage(navCtrl)})
|
composable(route = "HomePage", content = { HomePage(navCtrl)})
|
||||||
composable(route = "SystemManage", content = { SystemManage(navCtrl) })
|
composable(route = "SystemManage", content = { SystemManage(navCtrl) })
|
||||||
|
|||||||
@@ -47,10 +47,10 @@ fun AppSetting(navCtrl:NavHostController){
|
|||||||
){
|
){
|
||||||
NavHost(
|
NavHost(
|
||||||
navController = localNavCtrl, startDestination = "Home",
|
navController = localNavCtrl, startDestination = "Home",
|
||||||
enterTransition = Animations().navHostEnterTransition,
|
enterTransition = Animations.navHostEnterTransition,
|
||||||
exitTransition = Animations().navHostExitTransition,
|
exitTransition = Animations.navHostExitTransition,
|
||||||
popEnterTransition = Animations().navHostPopEnterTransition,
|
popEnterTransition = Animations.navHostPopEnterTransition,
|
||||||
popExitTransition = Animations().navHostPopExitTransition,
|
popExitTransition = Animations.navHostPopExitTransition,
|
||||||
modifier = Modifier.background(bgColor).padding(top = it.calculateTopPadding())
|
modifier = Modifier.background(bgColor).padding(top = it.calculateTopPadding())
|
||||||
){
|
){
|
||||||
composable(route = "Home"){Home(localNavCtrl)}
|
composable(route = "Home"){Home(localNavCtrl)}
|
||||||
|
|||||||
@@ -122,10 +122,10 @@ fun ApplicationManage(navCtrl:NavHostController){
|
|||||||
}
|
}
|
||||||
NavHost(
|
NavHost(
|
||||||
navController = localNavCtrl, startDestination = "Home",
|
navController = localNavCtrl, startDestination = "Home",
|
||||||
enterTransition = Animations().navHostEnterTransition,
|
enterTransition = Animations.navHostEnterTransition,
|
||||||
exitTransition = Animations().navHostExitTransition,
|
exitTransition = Animations.navHostExitTransition,
|
||||||
popEnterTransition = Animations().navHostPopEnterTransition,
|
popEnterTransition = Animations.navHostPopEnterTransition,
|
||||||
popExitTransition = Animations().navHostPopExitTransition,
|
popExitTransition = Animations.navHostPopExitTransition,
|
||||||
modifier = Modifier.background(bgColor)
|
modifier = Modifier.background(bgColor)
|
||||||
){
|
){
|
||||||
composable(route = "Home"){Home(localNavCtrl,pkgName)}
|
composable(route = "Home"){Home(localNavCtrl,pkgName)}
|
||||||
|
|||||||
@@ -61,10 +61,10 @@ fun ManagedProfile(navCtrl: NavHostController) {
|
|||||||
){
|
){
|
||||||
NavHost(
|
NavHost(
|
||||||
navController = localNavCtrl, startDestination = "Home",
|
navController = localNavCtrl, startDestination = "Home",
|
||||||
enterTransition = Animations().navHostEnterTransition,
|
enterTransition = Animations.navHostEnterTransition,
|
||||||
exitTransition = Animations().navHostExitTransition,
|
exitTransition = Animations.navHostExitTransition,
|
||||||
popEnterTransition = Animations().navHostPopEnterTransition,
|
popEnterTransition = Animations.navHostPopEnterTransition,
|
||||||
popExitTransition = Animations().navHostPopExitTransition,
|
popExitTransition = Animations.navHostPopExitTransition,
|
||||||
modifier = Modifier.background(bgColor).padding(top = it.calculateTopPadding())
|
modifier = Modifier.background(bgColor).padding(top = it.calculateTopPadding())
|
||||||
){
|
){
|
||||||
composable(route = "Home"){Home(localNavCtrl)}
|
composable(route = "Home"){Home(localNavCtrl)}
|
||||||
|
|||||||
@@ -82,10 +82,10 @@ fun Network(navCtrl: NavHostController){
|
|||||||
){
|
){
|
||||||
NavHost(
|
NavHost(
|
||||||
navController = localNavCtrl, startDestination = "Home",
|
navController = localNavCtrl, startDestination = "Home",
|
||||||
enterTransition = Animations().navHostEnterTransition,
|
enterTransition = Animations.navHostEnterTransition,
|
||||||
exitTransition = Animations().navHostExitTransition,
|
exitTransition = Animations.navHostExitTransition,
|
||||||
popEnterTransition = Animations().navHostPopEnterTransition,
|
popEnterTransition = Animations.navHostPopEnterTransition,
|
||||||
popExitTransition = Animations().navHostPopExitTransition,
|
popExitTransition = Animations.navHostPopExitTransition,
|
||||||
modifier = Modifier.background(bgColor).padding(top = it.calculateTopPadding())
|
modifier = Modifier.background(bgColor).padding(top = it.calculateTopPadding())
|
||||||
){
|
){
|
||||||
composable(route = "Home"){Home(localNavCtrl,scrollState)}
|
composable(route = "Home"){Home(localNavCtrl,scrollState)}
|
||||||
|
|||||||
@@ -74,10 +74,10 @@ fun Password(navCtrl: NavHostController){
|
|||||||
){
|
){
|
||||||
NavHost(
|
NavHost(
|
||||||
navController = localNavCtrl, startDestination = "Home",
|
navController = localNavCtrl, startDestination = "Home",
|
||||||
enterTransition = Animations().navHostEnterTransition,
|
enterTransition = Animations.navHostEnterTransition,
|
||||||
exitTransition = Animations().navHostExitTransition,
|
exitTransition = Animations.navHostExitTransition,
|
||||||
popEnterTransition = Animations().navHostPopEnterTransition,
|
popEnterTransition = Animations.navHostPopEnterTransition,
|
||||||
popExitTransition = Animations().navHostPopExitTransition,
|
popExitTransition = Animations.navHostPopExitTransition,
|
||||||
modifier = Modifier.background(bgColor).padding(top = it.calculateTopPadding())
|
modifier = Modifier.background(bgColor).padding(top = it.calculateTopPadding())
|
||||||
){
|
){
|
||||||
composable(route = "Home"){Home(localNavCtrl,scrollState)}
|
composable(route = "Home"){Home(localNavCtrl,scrollState)}
|
||||||
|
|||||||
@@ -78,10 +78,10 @@ fun DpmPermissions(navCtrl:NavHostController){
|
|||||||
){
|
){
|
||||||
NavHost(
|
NavHost(
|
||||||
navController = localNavCtrl, startDestination = "Home",
|
navController = localNavCtrl, startDestination = "Home",
|
||||||
enterTransition = Animations().navHostEnterTransition,
|
enterTransition = Animations.navHostEnterTransition,
|
||||||
exitTransition = Animations().navHostExitTransition,
|
exitTransition = Animations.navHostExitTransition,
|
||||||
popEnterTransition = Animations().navHostPopEnterTransition,
|
popEnterTransition = Animations.navHostPopEnterTransition,
|
||||||
popExitTransition = Animations().navHostPopExitTransition,
|
popExitTransition = Animations.navHostPopExitTransition,
|
||||||
modifier = Modifier.background(bgColor).padding(top = it.calculateTopPadding())
|
modifier = Modifier.background(bgColor).padding(top = it.calculateTopPadding())
|
||||||
){
|
){
|
||||||
composable(route = "Home"){Home(localNavCtrl,scrollState)}
|
composable(route = "Home"){Home(localNavCtrl,scrollState)}
|
||||||
|
|||||||
@@ -88,10 +88,10 @@ fun SystemManage(navCtrl:NavHostController){
|
|||||||
){
|
){
|
||||||
NavHost(
|
NavHost(
|
||||||
navController = localNavCtrl, startDestination = "Home",
|
navController = localNavCtrl, startDestination = "Home",
|
||||||
enterTransition = Animations().navHostEnterTransition,
|
enterTransition = Animations.navHostEnterTransition,
|
||||||
exitTransition = Animations().navHostExitTransition,
|
exitTransition = Animations.navHostExitTransition,
|
||||||
popEnterTransition = Animations().navHostPopEnterTransition,
|
popEnterTransition = Animations.navHostPopEnterTransition,
|
||||||
popExitTransition = Animations().navHostPopExitTransition,
|
popExitTransition = Animations.navHostPopExitTransition,
|
||||||
modifier = Modifier.background(bgColor).padding(top = it.calculateTopPadding())
|
modifier = Modifier.background(bgColor).padding(top = it.calculateTopPadding())
|
||||||
){
|
){
|
||||||
composable(route = "Home"){Home(localNavCtrl,scrollState)}
|
composable(route = "Home"){Home(localNavCtrl,scrollState)}
|
||||||
|
|||||||
@@ -82,10 +82,10 @@ fun UserManage(navCtrl:NavHostController) {
|
|||||||
){
|
){
|
||||||
NavHost(
|
NavHost(
|
||||||
navController = localNavCtrl, startDestination = "Home",
|
navController = localNavCtrl, startDestination = "Home",
|
||||||
enterTransition = Animations().navHostEnterTransition,
|
enterTransition = Animations.navHostEnterTransition,
|
||||||
exitTransition = Animations().navHostExitTransition,
|
exitTransition = Animations.navHostExitTransition,
|
||||||
popEnterTransition = Animations().navHostPopEnterTransition,
|
popEnterTransition = Animations.navHostPopEnterTransition,
|
||||||
popExitTransition = Animations().navHostPopExitTransition,
|
popExitTransition = Animations.navHostPopExitTransition,
|
||||||
modifier = Modifier.background(bgColor).padding(top = it.calculateTopPadding())
|
modifier = Modifier.background(bgColor).padding(top = it.calculateTopPadding())
|
||||||
){
|
){
|
||||||
composable(route = "Home"){Home(localNavCtrl,scrollState)}
|
composable(route = "Home"){Home(localNavCtrl,scrollState)}
|
||||||
|
|||||||
@@ -80,10 +80,10 @@ fun UserRestriction(navCtrl: NavHostController){
|
|||||||
){
|
){
|
||||||
NavHost(
|
NavHost(
|
||||||
navController = localNavCtrl, startDestination = "Home",
|
navController = localNavCtrl, startDestination = "Home",
|
||||||
enterTransition = Animations().navHostEnterTransition,
|
enterTransition = Animations.navHostEnterTransition,
|
||||||
exitTransition = Animations().navHostExitTransition,
|
exitTransition = Animations.navHostExitTransition,
|
||||||
popEnterTransition = Animations().navHostPopEnterTransition,
|
popEnterTransition = Animations.navHostPopEnterTransition,
|
||||||
popExitTransition = Animations().navHostPopExitTransition,
|
popExitTransition = Animations.navHostPopExitTransition,
|
||||||
modifier = Modifier.background(bgColor).padding(top = it.calculateTopPadding())
|
modifier = Modifier.background(bgColor).padding(top = it.calculateTopPadding())
|
||||||
){
|
){
|
||||||
composable(route = "Internet"){Internet()}
|
composable(route = "Internet"){Internet()}
|
||||||
|
|||||||
@@ -5,20 +5,20 @@ import androidx.compose.animation.core.*
|
|||||||
import androidx.compose.ui.unit.IntOffset
|
import androidx.compose.ui.unit.IntOffset
|
||||||
import androidx.navigation.NavBackStackEntry
|
import androidx.navigation.NavBackStackEntry
|
||||||
|
|
||||||
class Animations{
|
object Animations{
|
||||||
private val initialOffsetValue = 96
|
private const val INITIAL_OFFSET_VALUE = 96
|
||||||
private val targetOffsetValue = 96
|
private const val TARGET_OFFSET_VALUE = 96
|
||||||
|
|
||||||
private val bezier = CubicBezierEasing(0.4f, 0f, 0f, 1f)
|
private val bezier = CubicBezierEasing(0.4f, 0f, 0f, 1f)
|
||||||
|
|
||||||
private val tween: FiniteAnimationSpec<IntOffset> = tween(400, easing = bezier)
|
private val tween: FiniteAnimationSpec<IntOffset> = tween(450, easing = bezier)
|
||||||
|
|
||||||
val navHostEnterTransition: AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition = {
|
val navHostEnterTransition: AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition = {
|
||||||
fadeIn(tween(83, easing = LinearEasing)) +
|
fadeIn(tween(83, easing = LinearEasing)) +
|
||||||
slideIntoContainer(
|
slideIntoContainer(
|
||||||
animationSpec = tween,
|
animationSpec = tween,
|
||||||
towards = AnimatedContentTransitionScope.SlideDirection.End,
|
towards = AnimatedContentTransitionScope.SlideDirection.End,
|
||||||
initialOffset = {initialOffsetValue}
|
initialOffset = {INITIAL_OFFSET_VALUE}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -27,7 +27,7 @@ class Animations{
|
|||||||
slideOutOfContainer(
|
slideOutOfContainer(
|
||||||
animationSpec = tween,
|
animationSpec = tween,
|
||||||
towards = AnimatedContentTransitionScope.SlideDirection.Start,
|
towards = AnimatedContentTransitionScope.SlideDirection.Start,
|
||||||
targetOffset = {-targetOffsetValue}
|
targetOffset = {-TARGET_OFFSET_VALUE}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -36,7 +36,7 @@ class Animations{
|
|||||||
slideIntoContainer(
|
slideIntoContainer(
|
||||||
animationSpec = tween,
|
animationSpec = tween,
|
||||||
towards = AnimatedContentTransitionScope.SlideDirection.End,
|
towards = AnimatedContentTransitionScope.SlideDirection.End,
|
||||||
initialOffset = {-initialOffsetValue}
|
initialOffset = {-INITIAL_OFFSET_VALUE}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -45,7 +45,7 @@ class Animations{
|
|||||||
slideOutOfContainer(
|
slideOutOfContainer(
|
||||||
animationSpec = tween,
|
animationSpec = tween,
|
||||||
towards = AnimatedContentTransitionScope.SlideDirection.Start,
|
towards = AnimatedContentTransitionScope.SlideDirection.Start,
|
||||||
targetOffset = {targetOffsetValue}
|
targetOffset = {TARGET_OFFSET_VALUE}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user