Merge pull request #248 from TaskarCenterAtUW/feature-switch-workspace

Switch Workspace

Author: iAKM

GoInfoGame/GoInfoGame/UI/Map/CustomMap.swift

@@ -162,14 +162,20 @@ struct CustomMap: UIViewRepresentable {
 
         // Helper method to update the region
         func updateUserRegion(_ mapView: MKMapView) {
-            // Update the region only if it hasn't been set yet
-            if self.parent.isPresented  {
-                return
-            } else if !isRegionSet {
+            guard !parent.isPresented else { return }
+
+            let center = parent.region.center
+            guard CLLocationCoordinate2DIsValid(center),
+                  !(center.latitude == 0 && center.longitude == 0) else { return }
+
+            if parent.selectedAnnotations.isEmpty && !isRegionSet {
                 mapView.setRegion(parent.region, animated: true)
                 isRegionSet = true
             }
+
         }
+
+
 
 
         // To keep the selected annotation visible at the top
@@ -229,6 +235,9 @@ struct CustomMap: UIViewRepresentable {
         // Customizes the view for each annotation
         func mapView(_ mapView: MKMapView, viewFor annotation: MKAnnotation) -> MKAnnotationView? {
             self.mapView = mapView
+            if annotation is MKUserLocation {
+                   return nil
+               }
             if let clusterAnnotation = annotation as? MKClusterAnnotation {
                 let identifier = "cluster"
                 var clusterView = mapView.dequeueReusableAnnotationView(withIdentifier: identifier) as? MKMarkerAnnotationView

GoInfoGame/GoInfoGame/UI/Map/MapView.swift

@@ -252,7 +252,7 @@ struct MapView: View {
             }
 
             .sheet(isPresented: $showUserSettingsSheet) {
-                UserSettingsView( options: OptionModel.options, onNavigate: { navigate in
+                UserSettingsView(selectedWorkspace: selectedWorkspace?.title ?? "", options: OptionModel.options, onNavigate: { navigate in
                     showUserSettingsSheet = false
                     DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
                         //   navigateToProfileSettings = true
@@ -280,6 +280,10 @@ struct MapView: View {
                             let extendedVisibleRect = rect.insetBy(dx: -rect.size.width * 0.25, dy: -rect.size.height * 0.25)
                             shadowOverlay.addVisibleRect(extendedVisibleRect)
 
+                        case .switchWorkspace:
+                            //navigate to inital view
+                            print("Switch workspace here")
+                          switchToInitialView()
                         }
                     }
 
@@ -422,6 +426,14 @@ struct MapView: View {
         }
     }
 
+    func switchToInitialView() {
+        if let scene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
+           let window = scene.windows.first {
+            window.rootViewController = UIHostingController(rootView: InitialView())
+            window.makeKeyAndVisible()
+        }
+    }
+    
     private func setContextualInfo(contextualinfo: String) {
         contextualInfo.info = contextualinfo
 

GoInfoGame/GoInfoGame/UI/UserSettingsView.swift

@@ -18,27 +18,29 @@ struct OptionModel: Identifiable, Hashable {
     static let options: [OptionModel] = [
            OptionModel(title: "User Profile", icon: "person.crop.circle.fill", destination: .profile),
            OptionModel(title: "Manage Quests", icon: "slider.horizontal.3", destination: .manageQuests),
-           OptionModel(title: "Download Data", icon: "arrow.down.circle.fill", destination: .downloadData)
+           OptionModel(title: "Download Data", icon: "arrow.down.circle.fill", destination: .downloadData),
+           OptionModel(title: "Switch Workspace", icon: "arrow.right.arrow.left.circle.fill", destination: .switchWorkspace)
        ]
 }
 
 enum SettingsDestination: Hashable {
     case profile
     case manageQuests
     case downloadData
+    case switchWorkspace
 
 }
 struct UserSettingsView: View {
     @Environment(\.presentationMode) var presentationMode
 
-    
+    @State var selectedWorkspace: String = ""
     let options: [OptionModel]
     let onNavigate: (SettingsDestination) -> Void
 
     var body: some View {
         VStack(alignment: .leading, spacing: 12) {
             HStack(alignment: .firstTextBaseline) {
-                Text("")
+                Text(selectedWorkspace)
 
 
                 Spacer()