FINALLLL ADJUSTMENTTTT

client/Unimap.xcodeproj/project.pbxproj

@@ -38,7 +38,9 @@
 		566A853E2D2F7FC5008EFFEF /* Exceptions for "Unimap" folder in "Unimap" target */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
+				Configs/Dev.xcconfig,
 				Configs/Info.plist,
+				Configs/Prod.xcconfig,
 			);
 			target = 56D0FC782D236A59005B296A /* Unimap */;
 		};
@@ -193,7 +195,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1620;
-				LastUpgradeCheck = 1620;
+				LastUpgradeCheck = 1630;
 				TargetAttributes = {
 					56D0FC782D236A59005B296A = {
 						CreatedOnToolsVersion = 16.2;
@@ -328,6 +330,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -391,6 +394,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "Apple Distribution";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
@@ -421,27 +425,36 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"Unimap/Configs/Preview Content\"";
+				DEVELOPMENT_TEAM = GS2W3KQ9KF;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = Unimap/Configs/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = Unimap;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.news";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Unimap;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
 		};
@@ -452,27 +465,36 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"Unimap/Configs/Preview Content\"";
+				DEVELOPMENT_TEAM = GS2W3KQ9KF;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = Unimap/Configs/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = Unimap;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.news";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Unimap;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;
 		};

client/Unimap.xcodeproj/xcshareddata/xcschemes/Unimap.xcscheme

@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1630"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "56D0FC782D236A59005B296A"
+               BuildableName = "Unimap.app"
+               BlueprintName = "Unimap"
+               ReferencedContainer = "container:Unimap.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "56D0FC882D236A5A005B296A"
+               BuildableName = "UnimapTests.xctest"
+               BlueprintName = "UnimapTests"
+               ReferencedContainer = "container:Unimap.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "56D0FC922D236A5A005B296A"
+               BuildableName = "UnimapUITests.xctest"
+               BlueprintName = "UnimapUITests"
+               ReferencedContainer = "container:Unimap.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "56D0FC782D236A59005B296A"
+            BuildableName = "Unimap.app"
+            BlueprintName = "Unimap"
+            ReferencedContainer = "container:Unimap.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "OS_ACTIVITY_MODE"
+            value = "disable"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "56D0FC782D236A59005B296A"
+            BuildableName = "Unimap.app"
+            BlueprintName = "Unimap"
+            ReferencedContainer = "container:Unimap.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

client/Unimap.xcodeproj/xcuserdata/tonynguyen.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -4,11 +4,34 @@
 <dict>
 	<key>SchemeUserState</key>
 	<dict>
+		<key>JWTDecode (Playground).xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
 		<key>Unimap.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
 			<integer>0</integer>
 		</dict>
 	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>56D0FC782D236A59005B296A</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>56D0FC882D236A5A005B296A</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>56D0FC922D236A5A005B296A</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
 </dict>
 </plist>

client/Unimap/Components/Elements/EventBoxes/RectangleComponent.swift

@@ -20,12 +20,19 @@ struct RectangleComponent: View {
     var body: some View {
         VStack(alignment: .leading, spacing: 10) {
             if showHeader {
-                Button(action: {showProfilePage = true}) {
+                NavigationLink {
+                    ProfilePage(
+                        username: username,
+                        PFPURL: userPFP.imageUrl,
+                        userID: userID
+                    )
+                } label: {
                     BoxHeaderComponent(
                         pfp: userPFP.showPlusIcon(false),
                         username: username
                     )
                 }
+                .buttonStyle(.plain)
             }
 
             Button (action: {showSheet.toggle()}) {
@@ -39,6 +46,8 @@ struct RectangleComponent: View {
                 )
             }
             .buttonStyle(PlainButtonStyle())
+            .contentShape(Rectangle())
+            .buttonStyle(.plain)
         }
         .sheet(
             isPresented: $showSheet,
@@ -59,9 +68,6 @@ struct RectangleComponent: View {
                 }
             }
         )
-        .navigationDestination(isPresented: $showProfilePage) {
-            ProfilePage(username: username, PFPURL: userPFP.imageUrl, userID: userID)
-        }
         .onAppear {
             imageLoaderService.url = eventImageURL
             Task {

client/Unimap/Components/Elements/FilterButton/MSFilterBtn.swift

@@ -56,7 +56,7 @@ private struct MSFilterBtnSheet<Item: NamedIdentifiable>: View {
 
             // Displaying each option
             ScrollView {
-                LazyVStack(spacing: 0) {
+                VStack(spacing: 0) {
                     ForEach(options) { option in
                         Button {
                             // Toggle inside the *local* copy

client/Unimap/Components/Elements/FilterButton/SSFilterBtn.swift

@@ -55,7 +55,7 @@ private struct SSFilterBtnSheet<E: StringIdentifiableEnum>: View {
 
             // Displaying each option
             ScrollView {
-                LazyVStack(spacing: 0, pinnedViews: []) {
+                VStack(spacing: 0) {
                     ForEach(options) { option in
                         Button {
                             if let onSelection = onSelection {

client/Unimap/Components/Layouts/MedSquareHorLayout.swift

@@ -5,7 +5,7 @@ struct MedSquareHorLayout: View {
 
     var body: some View {
         ScrollView(.horizontal, showsIndicators: false) {
-            LazyHStack(spacing: 16) {
+            HStack(spacing: 16) {
                 ForEach(events) { event in
                     MediumSquareCard(
                         username: event.user.name,

client/Unimap/Components/Layouts/RectangleHorLayout.swift

@@ -5,7 +5,7 @@ struct RectangleHorLayout: View {
 
     var body: some View {
         ScrollView(.horizontal, showsIndicators: false) {
-            LazyHStack(spacing: 16) {
+            HStack(spacing: 16) {
                 ForEach(events) { event in
                     RectangleComponent(
                         username: event.user.name,

client/Unimap/Components/Layouts/RectangleVerLayout.swift

@@ -3,11 +3,14 @@ import SwiftUI
 struct RectangleVerLayout: View {
     let events: [Event]?
     var showHeader: Bool = true
+    var lastItemAction: (() -> Void)? = nil
 
     var body: some View {
         ScrollView(showsIndicators: false) {
             LazyVStack(spacing: 5) {
                 ForEach(events ?? []) { event in
+                    let isLast = event.id == events?.last?.id
+
                     RectangleComponent(
                         userID: event.user.id,
                         username: event.user.name,
@@ -22,6 +25,11 @@ struct RectangleVerLayout: View {
                         showHeader: showHeader
                     )
                     .padding(.bottom, showHeader ? 8 : 16)
+                    .onAppear {
+                        if isLast {
+                            lastItemAction?()
+                        }
+                    }
                 }
             }
             .padding(.horizontal, 16)

client/Unimap/Components/Layouts/SmallSquareHorLayout.swift

@@ -5,7 +5,7 @@ struct SmallSquareHorLayout: View {
 
     var body: some View {
         ScrollView(.horizontal, showsIndicators: false) {
-            LazyHStack(spacing: 16) {
+            HStack(spacing: 16) {
                 ForEach(events) { event in
                     SmallSquareCard(
                         username: event.user.name,