moved satellite imagery icon from bottom left to navigation bar and updated the icon

Author: srikanth-vg

GoInfoGame/GoInfoGame/UI/Map/MapView.swift

@@ -180,10 +180,7 @@ struct MapView: View {
                         .padding(.leading, 16)
                         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .bottomLeading)
                         Spacer()
-                        FloatingActionButtonStack(mapButtonAction: {
-                            viewModel.updateOptions(for: mapViewRef?.region.center ?? CLLocationCoordinate2D(latitude: 0.0, longitude: 0.0))
-                            viewModel.showSatellitePicker = true
-                        })
+                        FloatingActionButtonStack()
                     }
                 }
 
@@ -222,6 +219,17 @@ struct MapView: View {
             .navigationBarItems(leading: EmptyView())
             .toolbar {
 
+                ToolbarItem(placement: .navigationBarTrailing) {
+                    Button(action: {
+                        debugPrint("satellite icon tapped")
+                        viewModel.updateOptions(for: mapViewRef?.region.center ?? CLLocationCoordinate2D(latitude: 0.0, longitude: 0.0))
+                        viewModel.showSatellitePicker = true
+                    }) {
+                        Image(systemName: "square.2.layers.3d.bottom.filled")
+                            .frame(width: 20, height: 20)
+                            .foregroundStyle(Color(red: 135/255, green: 62/255, blue: 242/255))
+                    }
+                }
                 ToolbarItem(placement: .navigationBarTrailing) {
                     Button(action: {
                         print("Settings icon tapped")

GoInfoGame/GoInfoGame/UI/Utils/FloatingActionButtonStack.swift

@@ -9,7 +9,6 @@ import SwiftUI
 
 struct FloatingActionButtonStack: View {
 
-    var mapButtonAction: () -> ()
     @State private var showBottomSheet = false
 
     var body: some View {
@@ -18,8 +17,6 @@ struct FloatingActionButtonStack: View {
             HStack {
                 Spacer()
                 VStack {
-                    MapSwitcherButton(action: mapButtonAction)
-                    
                     Button(action: {
                         showBottomSheet.toggle()
                     }) {
@@ -47,28 +44,5 @@ struct FloatingActionButtonStack: View {
     }
 }
 #Preview {
-    FloatingActionButtonStack(mapButtonAction: {})
-}
-
-struct MapSwitcherButton: View {
-    
-    var action: () -> ()
-    
-    var body: some View {
-        Button(action:
-                action
-        ) {
-            ZStack {
-                Circle()
-                    .fill(Color(red: 135/255, green: 62/255, blue: 242/255))
-                    .frame(width: 40, height: 40)
-                    .shadow(radius: 5)
-                
-                Image(systemName: "map")
-                    .font(.system(size: 28))
-                    .foregroundColor(.white)
-            }
-        }
-        .padding([.bottom], 15)
-    }
+    FloatingActionButtonStack()
 }