[DroidKaigi#789] Use NavigationStack

coffmark · Sep 29, 2022 · 27c20b9 · 27c20b9
1 parent 2bed7dd
commit 27c20b9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/app-ios/Sources/MapFeature/MapView.swift b/app-ios/Sources/MapFeature/MapView.swift
@@ -34,15 +34,13 @@ public struct MapView: View {
 
     public var body: some View {
         WithViewStore(store) { viewStore in
-            NavigationView {
+            NavigationStack {
                 ZStack {
                     AssetColors.background.swiftUIColor
                     Image(asset: Assets.floorMap)
                         .resizable()
                         .scaledToFit()
                         .padding(14)
-                        .navigationTitle(StringsKt.shared.title_map.localized())
-                        .navigationBarTitleDisplayMode(.inline)
                         .toolbar {
                             ToolbarItem(placement: .bottomBar) {
                                 Button(
@@ -55,8 +53,9 @@ public struct MapView: View {
                             }
                         }
                 }
+                .navigationTitle(StringsKt.shared.title_map.localized())
+                .navigationBarTitleDisplayMode(.inline)
             }
-            .navigationViewStyle(.stack)
         }
     }
 }

diff --git a/app-ios/Sources/TimetableFeature/TimetableView.swift b/app-ios/Sources/TimetableFeature/TimetableView.swift
@@ -105,7 +105,7 @@ public struct TimetableView: View {
 
     public var body: some View {
         WithViewStore(store) { viewStore in
-            NavigationView {
+            NavigationStack {
                 ZStack(alignment: .top) {
 
                     if viewStore.state.showSheet {
@@ -192,7 +192,6 @@ public struct TimetableView: View {
                 }
                 .navigationBarTitleDisplayMode(.inline)
             }
-            .navigationViewStyle(.stack)
         }
     }
 }