Skip to content

Commit 6f6717a

Browse files
authored
Merge branch 'android:main' into basic-deeplink-new-design
2 parents 5c6e910 + e48ea51 commit 6f6717a

File tree

1 file changed

+21
-6
lines changed

1 file changed

+21
-6
lines changed

app/src/main/java/com/example/nav3recipes/animations/AnimatedActivity.kt

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,18 +95,33 @@ class AnimatedActivity : ComponentActivity() {
9595
},
9696
transitionSpec = {
9797
// Slide in from right when navigating forward
98-
slideInHorizontally(initialOffsetX = { it }) togetherWith
99-
slideOutHorizontally(targetOffsetX = { -it })
98+
slideInHorizontally(
99+
initialOffsetX = { it },
100+
animationSpec = tween(1000)
101+
) togetherWith slideOutHorizontally(
102+
targetOffsetX = { -it },
103+
animationSpec = tween(1000)
104+
)
100105
},
101106
popTransitionSpec = {
102107
// Slide in from left when navigating back
103-
slideInHorizontally(initialOffsetX = { -it }) togetherWith
104-
slideOutHorizontally(targetOffsetX = { it })
108+
slideInHorizontally(
109+
initialOffsetX = { -it },
110+
animationSpec = tween(1000)
111+
) togetherWith slideOutHorizontally(
112+
targetOffsetX = { it },
113+
animationSpec = tween(1000)
114+
)
105115
},
106116
predictivePopTransitionSpec = {
107117
// Slide in from left when navigating back
108-
slideInHorizontally(initialOffsetX = { -it }) togetherWith
109-
slideOutHorizontally(targetOffsetX = { it })
118+
slideInHorizontally(
119+
initialOffsetX = { -it },
120+
animationSpec = tween(1000)
121+
) togetherWith slideOutHorizontally(
122+
targetOffsetX = { it },
123+
animationSpec = tween(1000)
124+
)
110125
}
111126
)
112127
}

0 commit comments

Comments
 (0)