Updated map screen with new design

Author: srikanth-vg

GoInfoGame/GoInfoGame/Helpers/Generated/Strings+Generated.swift

@@ -208,6 +208,8 @@ internal enum L10n {
     internal static let undoConfirmNegative = L10n.tr("Localizable", "undo_confirm_negative", fallback: "Cancel")
     /// Usually looks like this?
     internal static let usuallyLooksLikeThis = L10n.tr("Localizable", "usually_looks_like_this", fallback: "Usually looks like this?")
+    /// Workspace
+    internal static let workspace = L10n.tr("Localizable", "Workspace", fallback: "Workspace")
   }
   internal enum Main {
     internal enum _13PWzT0e {

GoInfoGame/GoInfoGame/UI/Map/MapView.swift

@@ -181,7 +181,7 @@ struct MapView: View {
                         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .bottomLeading)
                         Spacer()
                         FloatingActionButtonStack()
-                            .padding(.bottom, 24)
+                            .padding(.bottom, 30)
                             .padding(.trailing, 16)
                             .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .bottomLeading)
 
@@ -223,9 +223,40 @@ struct MapView: View {
             .navigationBarItems(leading: EmptyView())
             .toolbar {
                 ToolbarItem(placement: .topBarLeading) {
-                    Text(selectedWorkspace?.title ?? "")
-                        .font(.custom("Lato-Bold", size: 16))
-                        .foregroundStyle(Asset.Colors.huskyPurple.swiftUIColor)
+                    HStack(spacing: 10)  {
+                        Button(action: {
+                            navigateToProfile = true
+                        }) {
+                            Image(systemName: "person.fill")
+                                .padding(8)
+                                .foregroundStyle(Color.white)
+                                .background {
+                                    LinearGradient(gradient: Gradient(colors: [Asset.Colors._8F57DEProfileIcon.swiftUIColor, Asset.Colors._2D0369ProfileIcon.swiftUIColor,]), startPoint: .top, endPoint: .bottom)
+                                }
+                                .frame(width: 34, height: 34)
+                                .clipShape(Circle())
+                        }
+                        
+                        Rectangle()
+                            .fill(Asset.Colors.ddddddLine.swiftUIColor)
+                            .frame(width: 1, height: 24)
+                            .cornerRadius(0.5)
+                        
+                        VStack(alignment: .leading) {
+                            Text(L10n.Localizable.workspace)
+                                .font(FontFamily.Lato.regular.swiftUIFont(size: 12))
+                                .foregroundStyle(Asset.Colors._83879BTextFiledTitle.swiftUIColor)
+                            
+                            Text(selectedWorkspace?.title ?? "")
+                                .font(FontFamily.Lato.bold.swiftUIFont(size: 14))
+                                .foregroundStyle(Asset.Colors.huskyPurple.swiftUIColor)
+                        }
+                    }
+                    
+                }
+                ToolbarItem(placement: .topBarLeading) {
+                    
+                    
                 }
 
                 ToolbarItem(placement: .navigationBarTrailing) {
@@ -243,8 +274,6 @@ struct MapView: View {
                             viewModel.checkSyncStatus()
                         }
                     })
-                    .foregroundStyle(Asset.Colors.huskyPurple.swiftUIColor)
-                    .frame(width: 30, height: 30)
                 }
 
                 ToolbarItem(placement: .navigationBarTrailing) {
@@ -254,19 +283,25 @@ struct MapView: View {
                         viewModel.showSatellitePicker = true
                     }) {
                         Image(systemName: "square.2.layers.3d.bottom.filled")
+                            .padding(8)
                             .foregroundStyle(Asset.Colors.huskyPurple.swiftUIColor)
+                            .background(Asset.Colors.e7E3EELightPurpuleBg.swiftUIColor)
+                            .frame(width: 34, height: 34)
+                            .clipShape(Circle())
                     }
-                    .frame(width: 30, height: 30)
                 }
                 ToolbarItem(placement: .navigationBarTrailing) {
                     Button(action: {
                         print("Settings icon tapped")
                         showUserSettingsSheet = true
                     }) {
                         Image(systemName: "gear")
+                            .padding(8)
                             .foregroundStyle(Asset.Colors.huskyPurple.swiftUIColor)
+                            .background(Asset.Colors.e7E3EELightPurpuleBg.swiftUIColor)
+                            .frame(width: 34, height: 34)
+                            .clipShape(Circle())
                     }
-                    .frame(width: 30, height: 30)
                 }
             }
             .toolbarBackground(.visible, for: .navigationBar)

GoInfoGame/GoInfoGame/UI/Map/QuestSyncButton.swift

@@ -18,8 +18,13 @@ struct QuestSyncButton: View {
     var body: some View {
         Button(action: action) {
             ZStack(alignment: .topTrailing) {
-                Image("sync")
+                Asset.sync.swiftUIImage
                     .rotationEffect(.degrees(rotationAngle))
+                    .padding(8)
+                    .background(Asset.Colors.e7E3EELightPurpuleBg.swiftUIColor)
+                    .foregroundStyle(Asset.Colors.huskyPurple.swiftUIColor)
+                    .frame(width: 34, height: 34)
+                    .clipShape(Circle())
                     .animation(isRotating ? .linear(duration: 1).repeatForever(autoreverses: false) : .default , value: isRotating)
                     .onChange(of: isSyncing) { newValue in
                         if newValue {

GoInfoGame/GoInfoGame/UI/Utils/FloatingActionButtonStack.swift

@@ -22,10 +22,10 @@ struct FloatingActionButtonStack: View {
                     }) {
                         Image(systemName: "slider.horizontal.3")
                             .font(.system(size: 25))
-                            .foregroundColor(.white)
-                            .frame(width: 40, height: 40)
-                            .background(Asset.Colors.huskyPurple.swiftUIColor)
-                            .cornerRadius(30)
+                            .foregroundColor(Asset.Colors.huskyPurple.swiftUIColor)
+                            .frame(width: 54, height: 54)
+                            .background(.white)
+                            .clipShape(Circle())
                             .shadow(radius: 10)
 
                     }

GoInfoGame/GoInfoGame/UI/Utils/UndoButton.swift

@@ -43,14 +43,15 @@ struct UndoButton: View {
                 }) {
                     ZStack {
                         Circle()
-                            .fill(Asset.Colors.huskyPurple.swiftUIColor)
-                            .frame(width: 40, height: 40)
+                            .fill(.white)
+                            .frame(width: 54, height: 54)
                             .shadow(radius: 5)
 
                         Image(systemName: "arrow.uturn.backward")
                             .font(.system(size: 28))
-                            .foregroundColor(.white)
+                            .foregroundColor(Asset.Colors.huskyPurple.swiftUIColor)
                     }
+                    .shadow(radius: 10)
                 }
                 .padding(.leading, 12)
                 .padding(.top, 20)

GoInfoGame/GoInfoGame/en.lproj/Localizable.strings

@@ -106,3 +106,4 @@
 "App Name" = "AVIV ScoutRoute";
 "Preferences" = "Preferences";
 "My Profile" = "My Profile";
+"Workspace" = "Workspace";