move guides feature

criticalmaps · Oct 5, 2024 · 167d53b · 167d53b
1 parent 0a33e9e
commit 167d53b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 36 deletions.
diff --git a/CriticalMapsKit/Sources/AppFeature/AppNavigationView.swift b/CriticalMapsKit/Sources/AppFeature/AppNavigationView.swift
@@ -46,11 +46,6 @@ public struct AppNavigationView: View {
         .accessibility(label: Text("App navigation \(L10n.Chat.title)"))
       menuSeperator
 
-      // Rules
-      rulesFeature
-        .accessibility(label: Text("App navigation \(L10n.Rules.title)"))
-      menuSeperator
-
       // Settings
       settingsFeature
         .accessibility(label: Text("App navigation \(L10n.Settings.title)"))
@@ -122,36 +117,6 @@ public struct AppNavigationView: View {
     )
   }
 
-  var rulesFeature: some View {
-    Button(
-      action: {
-        viewStore.send(.setNavigation(tag: .rules))
-      },
-      label: {
-        Image(systemName: "exclamationmark.square")
-          .iconModifier()
-      }
-    )
-    .frame(maxWidth: .infinity, minHeight: minHeight)
-    .contentShape(Rectangle())
-    .accessibilityShowsLargeContentViewer {
-      Label(L10n.Rules.title, systemImage: "exclamationmark.square")
-    }
-    .sheet(
-      isPresented: viewStore.binding(
-        get: \.isRulesViewPresented,
-        send: AppFeature.Action.dismissSheetView
-      ),
-      onDismiss: { viewStore.send(.dismissSheetView) },
-      content: {
-        CMNavigationView {
-          GuideView()
-            .accessibilityAddTraits([.isModal])
-        }
-      }
-    )
-  }
-
   var settingsFeature: some View {
     Button(
       action: {

diff --git a/CriticalMapsKit/Sources/AppFeature/AppView.swift b/CriticalMapsKit/Sources/AppFeature/AppView.swift
@@ -88,6 +88,7 @@ public struct AppView: View {
           .frame(maxWidth: 400)
       }
       .frame(maxWidth: .infinity, alignment: .center)
+      .padding(.horizontal, .grid(8))
     }
     .bottomSheet(
       bottomSheetPosition: viewStore.$bottomSheetPosition,

diff --git a/CriticalMapsKit/Sources/GuideFeature/GuideView.swift b/CriticalMapsKit/Sources/GuideFeature/GuideView.swift
@@ -20,7 +20,6 @@ public struct GuideView: View {
     }
     .listStyle(PlainListStyle())
     .navigationTitle(L10n.Rules.title)
-    .dismissable()
   }
 }
 

diff --git a/CriticalMapsKit/Sources/SettingsFeature/SettingsView.swift b/CriticalMapsKit/Sources/SettingsFeature/SettingsView.swift
@@ -1,5 +1,6 @@
 import AcknowList
 import ComposableArchitecture
+import GuideFeature
 import Helpers
 import L10n
 import Styleguide
@@ -215,6 +216,11 @@ public struct SettingsView: View {
         .accessibilityAddTraits(.isLink)
       }
 
+      SettingsNavigationLink(
+        destination: GuideView(),
+        title: L10n.Rules.title
+      )
+
       if let acknowledgementsPlistPath = viewStore.acknowledgementsPlistPath {
         SettingsNavigationLink(
           destination: AcknowListSwiftUIView(plistPath: acknowledgementsPlistPath),
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,6 @@ public struct GuideView: View { @@
         }
         .listStyle(PlainListStyle())
         .navigationTitle(L10n.Rules.title)
-        .dismissable()
       }
     }
@@ Expand Down @@