improve: use the menu name as a navigation title (#8)

kevinhermawan · Jan 11, 2024 · 86605f4 · 86605f4
1 parent b755902
commit 86605f4
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 54 deletions.
diff --git a/ImageEditModule/Sources/ImageEditModule/ImageEditView.swift b/ImageEditModule/Sources/ImageEditModule/ImageEditView.swift
@@ -41,21 +41,24 @@ public struct ImageEditView: View {
     }
 
     public var body: some View {
-        VStack {
-            ImageResultListView(dalleViewModel.results) { url in
-                ImageResultListItemView(url: url).tag(url)
+        NavigationStack {
+            VStack {
+                ImageResultListView(dalleViewModel.results) { url in
+                    ImageResultListItemView(url: url).tag(url)
+                }
+
+                PromptField(prompt: $prompt, viewState: dalleViewModel.viewState) {
+                    generationAction()
+                } cancellationAction: {
+                    dalleViewModel.cancel()
+                }
+                .padding(.bottom, 8)
+                .padding(.horizontal)
             }
-
-            PromptField(prompt: $prompt, viewState: dalleViewModel.viewState) {
-                generationAction()
-            } cancellationAction: {
+            .navigationTitle("Image Edit")
+            .onDisappear {
                 dalleViewModel.cancel()
             }
-            .padding(.bottom, 8)
-            .padding(.horizontal)
-        }
-        .onDisappear {
-            dalleViewModel.cancel()
         }
     }
 

diff --git a/ImageGenerationModule/Sources/ImageGenerationModule/ImageGenerationView.swift b/ImageGenerationModule/Sources/ImageGenerationModule/ImageGenerationView.swift
@@ -44,21 +44,24 @@ public struct ImageGenerationView: View {
     }
 
     public var body: some View {
-        VStack {
-            ImageResultListView(dalleViewModel.results) { url in
-                ImageResultListItemView(url: url).tag(url)
+        NavigationStack {
+            VStack {
+                ImageResultListView(dalleViewModel.results) { url in
+                    ImageResultListItemView(url: url).tag(url)
+                }
+
+                PromptField(prompt: $prompt, viewState: dalleViewModel.viewState) {
+                    generationAction()
+                } cancellationAction: {
+                    dalleViewModel.cancel()
+                }
+                .padding(.bottom, 8)
+                .padding(.horizontal)
             }
-
-            PromptField(prompt: $prompt, viewState: dalleViewModel.viewState) {
-                generationAction()
-            } cancellationAction: {
+            .navigationTitle("Image Generation")
+            .onDisappear {
                 dalleViewModel.cancel()
             }
-            .padding(.bottom, 8)
-            .padding(.horizontal)
-        }
-        .onDisappear {
-            dalleViewModel.cancel()
         }
     }
 

diff --git a/ImageVariationModule/Sources/ImageVariationModule/ImageVariationView.swift b/ImageVariationModule/Sources/ImageVariationModule/ImageVariationView.swift
@@ -37,40 +37,43 @@ public struct ImageVariationView: View {
     }
 
     public var body: some View {
-        VStack {
-            ImageResultListView(dalleViewModel.results) { url in
-                ImageResultListItemView(url: url).tag(url)
-            }
-
-            HStack {
-                if let errorMessage = dalleViewModel.viewState?.errorMessage {
-                    Text(LocalizedStringKey(errorMessage))
-                        .foregroundStyle(.red)
-                        .font(.callout)
-                }
-
-                Spacer()
-
-                Button(action: { generationAction() }) {
-                    Label("Generate Variation", systemImage: "arrow.up.circle.fill")
-                        .padding(.vertical, 8)
-                        .padding(.horizontal)
+        NavigationStack {
+            VStack {
+                ImageResultListView(dalleViewModel.results) { url in
+                    ImageResultListItemView(url: url).tag(url)
                 }
-                .buttonStyle(.borderedProminent)
-                .hide(if: generating, removeCompletely: true)
 
-                Button(action: { dalleViewModel.cancel() }) {
-                    Label("Cancel Generation", systemImage: "stop.fill")
-                        .padding(.vertical, 8)
-                        .padding(.horizontal)
+                HStack {
+                    if let errorMessage = dalleViewModel.viewState?.errorMessage {
+                        Text(LocalizedStringKey(errorMessage))
+                            .foregroundStyle(.red)
+                            .font(.callout)
+                    }
+
+                    Spacer()
+
+                    Button(action: { generationAction() }) {
+                        Label("Generate Variation", systemImage: "arrow.up.circle.fill")
+                            .padding(.vertical, 8)
+                            .padding(.horizontal)
+                    }
+                    .buttonStyle(.borderedProminent)
+                    .hide(if: generating, removeCompletely: true)
+
+                    Button(action: { dalleViewModel.cancel() }) {
+                        Label("Cancel Generation", systemImage: "stop.fill")
+                            .padding(.vertical, 8)
+                            .padding(.horizontal)
+                    }
+                    .buttonStyle(.bordered)
+                    .visible(if: generating, removeCompletely: true)
                 }
-                .buttonStyle(.bordered)
-                .visible(if: generating, removeCompletely: true)
+                .padding()
+            }
+            .navigationTitle("Image Variation")
+            .onDisappear {
+                dalleViewModel.cancel()
             }
-            .padding()
-        }
-        .onDisappear {
-            dalleViewModel.cancel()
         }
     }