Merge pull request #168 from TaskarCenterAtUW/feature-FloatingActionButton

iAKM · web-flow · commit 1930bdbd3394 · 2025-01-17T17:47:47.000+05:30
Add floating button
diff --git a/GoInfoGame/GoInfoGame.xcodeproj/project.pbxproj b/GoInfoGame/GoInfoGame.xcodeproj/project.pbxproj
@@ -218,6 +218,7 @@
 		FAD5C5142AFCBE720040C61A /* GoInfoGameUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAD5C5132AFCBE720040C61A /* GoInfoGameUITests.swift */; };
 		FAD5C5162AFCBE720040C61A /* GoInfoGameUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAD5C5152AFCBE720040C61A /* GoInfoGameUITestsLaunchTests.swift */; };
 		FAE2584F2D39819300D2BB12 /* QuestCategoryListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAE2584E2D39819300D2BB12 /* QuestCategoryListView.swift */; };
+		FAE258522D3A780F00D2BB12 /* FloatingActionButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAE258512D3A780F00D2BB12 /* FloatingActionButton.swift */; };
 		FAF44FBD2B3084EC004FE664 /* OnboardingView1.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAF44FBC2B3084EC004FE664 /* OnboardingView1.swift */; };
 		FAF44FBF2B3084FB004FE664 /* OnboardingView2.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAF44FBE2B3084FB004FE664 /* OnboardingView2.swift */; };
 		FAF44FC12B30850A004FE664 /* OnboardingView3.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAF44FC02B30850A004FE664 /* OnboardingView3.swift */; };
@@ -531,6 +532,7 @@
 		FAD5C5132AFCBE720040C61A /* GoInfoGameUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoInfoGameUITests.swift; sourceTree = "<group>"; };
 		FAD5C5152AFCBE720040C61A /* GoInfoGameUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoInfoGameUITestsLaunchTests.swift; sourceTree = "<group>"; };
 		FAE2584E2D39819300D2BB12 /* QuestCategoryListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuestCategoryListView.swift; sourceTree = "<group>"; };
+		FAE258512D3A780F00D2BB12 /* FloatingActionButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FloatingActionButton.swift; sourceTree = "<group>"; };
 		FAF44FBC2B3084EC004FE664 /* OnboardingView1.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingView1.swift; sourceTree = "<group>"; };
 		FAF44FBE2B3084FB004FE664 /* OnboardingView2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingView2.swift; sourceTree = "<group>"; };
 		FAF44FC02B30850A004FE664 /* OnboardingView3.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingView3.swift; sourceTree = "<group>"; };
@@ -1279,6 +1281,7 @@
 			isa = PBXGroup;
 			children = (
 				FA87A80F2B68142F000A6BEA /* LoadingView.swift */,
+				FAE258512D3A780F00D2BB12 /* FloatingActionButton.swift */,
 			);
 			path = Utils;
 			sourceTree = "<group>";
@@ -2053,6 +2056,7 @@
 				05DBBB622B164D9A00B6F110 /* RealOPElement.swift in Sources */,
 				973FC0422B59467A00878269 /* BusStopLit.swift in Sources */,
 				97AC1C0A2B6B7F10004F0BF4 /* CustomVerticalButtonsList.swift in Sources */,
+				FAE258522D3A780F00D2BB12 /* FloatingActionButton.swift in Sources */,
 				973FC0352B592C0F00878269 /* StairNumberForm.swift in Sources */,
 				FA8C74C22C4E89C800D28220 /* LongForm.swift in Sources */,
 				FAC9E60F2B04F9C800E2C608 /* OverpassRequestManager.swift in Sources */,
diff --git a/GoInfoGame/GoInfoGame/UI/InitialView/InitialView.swift b/GoInfoGame/GoInfoGame/UI/InitialView/InitialView.swift
@@ -26,6 +26,7 @@ struct InitialView: View {
                                    .resizable()
                                    .frame(width: 27, height: 27)
                                    .padding([.leading], 18)
+                                   .foregroundStyle(Color(red: 135/255, green: 62/255, blue: 242/255))
                                 
                            }
                            Spacer()
diff --git a/GoInfoGame/GoInfoGame/UI/Map/MapView.swift b/GoInfoGame/GoInfoGame/UI/Map/MapView.swift
@@ -76,6 +76,9 @@ struct MapView: View {
                         }
                     }
                 }
+                
+                FloatingActionButton()
+                .padding([.bottom], 50)
             }
             .environmentObject(contextualInfo)
             .navigationBarHidden(isPresented)
@@ -84,6 +87,7 @@ struct MapView: View {
                 ToolbarItem(placement: .navigationBarLeading) {
                     NavigationLink(destination: UserProfileView()) {
                         Image(systemName: "person.crop.circle.fill")
+                            .foregroundStyle(Color(red: 135/255, green: 62/255, blue: 242/255))
                     }
                 }
                 ToolbarItem(placement: .navigationBarTrailing) {
@@ -93,6 +97,7 @@ struct MapView: View {
                     }) {
                         Image(systemName: "arrow.2.circlepath")
                             .frame(width: 20, height: 20)
+                            .foregroundStyle(Color(red: 135/255, green: 62/255, blue: 242/255))
                     }
                 }
 
diff --git a/GoInfoGame/GoInfoGame/UI/Utils/FloatingActionButton.swift b/GoInfoGame/GoInfoGame/UI/Utils/FloatingActionButton.swift
@@ -0,0 +1,33 @@
+//
+//  FloatingActionButton.swift
+//  GoInfoGame
+//
+//  Created by Achyut Kumar M on 17/01/25.
+//
+
+import SwiftUI
+
+struct FloatingActionButton: View {
+    
+    var body: some View {
+        VStack {
+            Spacer()
+            HStack {
+                Spacer()
+                NavigationLink(destination: QuestCategoryListView()) {
+                    Image(systemName: "slider.horizontal.3")
+                        .font(.system(size: 25))
+                        .foregroundColor(.white)
+                }
+                .frame(width: 40, height: 40)
+                .background(Color(red: 135/255, green: 62/255, blue: 242/255))
+                .cornerRadius(30)
+                .shadow(radius: 10)
+                .offset(x: -25, y: 10)
+            }
+        }
+    }
+}
+#Preview {
+    FloatingActionButton()
+}
diff --git a/GoInfoGame/GoInfoGame/quests/QuestCategory/UI/QuestCategoryListView.swift b/GoInfoGame/GoInfoGame/quests/QuestCategory/UI/QuestCategoryListView.swift
@@ -15,18 +15,17 @@ struct QuestCategoryListView: View {
             List {
                 ForEach(questManager.allQuests.indices, id: \.self) { index in
                     HStack {
-                        Image(uiImage: questManager.allQuests[index].quest.icon)
-                            .resizable()
-                            .aspectRatio(contentMode: .fit)
-                            .frame(width: 30, height: 30)
-                        
-                        Text(questManager.allQuests[index].quest.title)
-                        
                         Button(action: {
                             questManager.allQuests[index].toggleIsDefault()
                         }) {
                             CheckBoxView(isChecked: questManager.allQuests[index].isDefault)
                         }
+                        
+                        Image(uiImage: questManager.allQuests[index].quest.icon)
+                            .resizable()
+                            .aspectRatio(contentMode: .fit)
+                            .frame(width: 30, height: 30)
+                        Text(questManager.allQuests[index].quest.title == "" ? questManager.longQuestModels[index].elementType : questManager.allQuests[index].quest.title)
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ struct InitialView: View {`
`26`	`26`	`.resizable()`
`27`	`27`	`.frame(width: 27, height: 27)`
`28`	`28`	`.padding([.leading], 18)`
	`29`	`+ .foregroundStyle(Color(red: 135/255, green: 62/255, blue: 242/255))`
`29`	`30`
`30`	`31`	`}`
`31`	`32`	`Spacer()`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,9 @@ struct MapView: View {`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`}`
	`79`	`+`
	`80`	`+ FloatingActionButton()`
	`81`	`+ .padding([.bottom], 50)`
`79`	`82`	`}`
`80`	`83`	`.environmentObject(contextualInfo)`
`81`	`84`	`.navigationBarHidden(isPresented)`
`@@ -84,6 +87,7 @@ struct MapView: View {`
`84`	`87`	`ToolbarItem(placement: .navigationBarLeading) {`
`85`	`88`	`NavigationLink(destination: UserProfileView()) {`
`86`	`89`	`Image(systemName: "person.crop.circle.fill")`
	`90`	`+ .foregroundStyle(Color(red: 135/255, green: 62/255, blue: 242/255))`
`87`	`91`	`}`
`88`	`92`	`}`
`89`	`93`	`ToolbarItem(placement: .navigationBarTrailing) {`
`@@ -93,6 +97,7 @@ struct MapView: View {`
`93`	`97`	`}) {`
`94`	`98`	`Image(systemName: "arrow.2.circlepath")`
`95`	`99`	`.frame(width: 20, height: 20)`
	`100`	`+ .foregroundStyle(Color(red: 135/255, green: 62/255, blue: 242/255))`
`96`	`101`	`}`
`97`	`102`	`}`
`98`	`103`