Skip to content

Commit 251fcfb

Browse files
authored
Add more demo transitions (#25)
1 parent 7164d6b commit 251fcfb

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

Demo/Demo/AppState.swift

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ final class AppState: ObservableObject {
66
case `default`
77
case slide
88
case crossFade
9-
case slideAndFade
9+
case slideAndFadeIn
10+
case slideAndFadeOut
1011
case moveVertically
1112
case swing
1213
case zoom
14+
case zoomAndSlide
1315

1416
var description: String {
1517
switch self {
@@ -19,14 +21,18 @@ final class AppState: ObservableObject {
1921
return "Slide"
2022
case .crossFade:
2123
return "Fade"
22-
case .slideAndFade:
23-
return "Slide + Fade"
24+
case .slideAndFadeIn:
25+
return "Slide + Fade In"
26+
case .slideAndFadeOut:
27+
return "Slide + Fade Out"
2428
case .moveVertically:
2529
return "Slide Vertically"
2630
case .swing:
2731
return "Swing"
2832
case .zoom:
2933
return "Zoom"
34+
case .zoomAndSlide:
35+
return "Zoom + Slide"
3036
}
3137
}
3238

@@ -38,14 +44,18 @@ final class AppState: ObservableObject {
3844
return .slide
3945
case .crossFade:
4046
return .fade(.cross)
41-
case .slideAndFade:
47+
case .slideAndFadeIn:
4248
return .slide.combined(with: .fade(.in))
49+
case .slideAndFadeOut:
50+
return .slide.combined(with: .fade(.out))
4351
case .moveVertically:
4452
return .slide(axis: .vertical)
4553
case .swing:
4654
return .swing
4755
case .zoom:
48-
return .zoom
56+
return .zoom.combined(with: .fade(.in))
57+
case .zoomAndSlide:
58+
return .zoom.combined(with: .slide)
4959
}
5060
}
5161
}

Demo/Demo/Zoom.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ extension AnyNavigationTransition {
99

1010
struct Zoom: NavigationTransition {
1111
var body: some NavigationTransition {
12-
Slide(axis: .horizontal)
1312
MirrorPush {
1413
Scale(0.5)
1514
}

0 commit comments

Comments
 (0)