From d7cb18400106d21a82e7d3dca8114676a9bed63e Mon Sep 17 00:00:00 2001 From: nathannwangg Date: Sat, 22 Feb 2025 20:36:05 -0600 Subject: [PATCH 1/3] set self.mapView.image to nil before the if let mapUrl = URL(string: imageUrlString) check in HIEventDetailViewController.swift. Added coreDataEvent.removeFromLocations before coreDataEvent.addToLocations in HIEventDataSource.swift --- HackIllinois/DataSources/HIEventDataSource.swift | 1 + HackIllinois/ViewControllers/HIEventDetailViewController.swift | 2 ++ 2 files changed, 3 insertions(+) diff --git a/HackIllinois/DataSources/HIEventDataSource.swift b/HackIllinois/DataSources/HIEventDataSource.swift index a7ff21e8..556d1a41 100644 --- a/HackIllinois/DataSources/HIEventDataSource.swift +++ b/HackIllinois/DataSources/HIEventDataSource.swift @@ -113,6 +113,7 @@ final class HIEventDataSource { coreDataEvent.info = apiEvent.info apiEvent.locations.forEach { apiLocation in guard let coreDataLocation = coreDataLocationsDicionary[apiLocation.name] else { fatalError("Event Location Error") } + coreDataEvent.removeFromLocations(coreDataLocation) coreDataEvent.addToLocations(coreDataLocation) } coreDataEvent.name = apiEvent.name diff --git a/HackIllinois/ViewControllers/HIEventDetailViewController.swift b/HackIllinois/ViewControllers/HIEventDetailViewController.swift index 2eef3d9e..89e5267b 100644 --- a/HackIllinois/ViewControllers/HIEventDetailViewController.swift +++ b/HackIllinois/ViewControllers/HIEventDetailViewController.swift @@ -261,6 +261,8 @@ extension HIEventDetailViewController { imageUrlString = imageUrlString.replacingOccurrences(of: "svg", with: "png") } + self.mapView.image = nil + if let mapUrl = URL(string: imageUrlString) { let session = URLSession.shared self.mapView.image = nil From f399ccec797e76f933182fbfef806705e7040348 Mon Sep 17 00:00:00 2001 From: anushkasankaran Date: Sun, 23 Feb 2025 12:25:39 -0600 Subject: [PATCH 2/3] Bumping up version --- HIAPI/Models/CartItem.swift | 4 +-- HackIllinois.xcodeproj/project.pbxproj | 40 +++++++++++++------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/HIAPI/Models/CartItem.swift b/HIAPI/Models/CartItem.swift index 1fb58635..9622a9eb 100644 --- a/HIAPI/Models/CartItem.swift +++ b/HIAPI/Models/CartItem.swift @@ -10,8 +10,8 @@ import Foundation import APIManager public struct CartItemContainer: Decodable, APIReturnable { - public let items: [String: Int] public let userId: String + public let items: [String: Int] public init(from decoder: Decoder) throws { let container = try decoder.container(keyedBy: CodingKeys.self) @@ -20,7 +20,7 @@ public struct CartItemContainer: Decodable, APIReturnable { } private enum CodingKeys: String, CodingKey { - case items, userId + case userId, items } } diff --git a/HackIllinois.xcodeproj/project.pbxproj b/HackIllinois.xcodeproj/project.pbxproj index dc3ac035..a4012740 100644 --- a/HackIllinois.xcodeproj/project.pbxproj +++ b/HackIllinois.xcodeproj/project.pbxproj @@ -1380,7 +1380,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2024.11.1; + MARKETING_VERSION = 2025.1.1; ONLY_ACTIVE_ARCH = YES; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -Xfrontend -warn-long-expression-type-checking=150"; PRODUCT_BUNDLE_IDENTIFIER = org.hackillinois.ios; @@ -1388,10 +1388,10 @@ REGISTER_APP_GROUPS = NO; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; - SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -1417,17 +1417,17 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2024.11.1; + MARKETING_VERSION = 2025.1.1; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.hackillinois.ios; PRODUCT_NAME = "$(TARGET_NAME)"; REGISTER_APP_GROUPS = NO; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; - SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; @@ -1465,11 +1465,11 @@ SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; - SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1508,10 +1508,10 @@ SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; - SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1542,9 +1542,9 @@ SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; - SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; - TARGETED_DEVICE_FAMILY = 1; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -1572,9 +1572,9 @@ SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; - SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; - TARGETED_DEVICE_FAMILY = 1; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; From d73b5ebf4e9d03ee9acacf7fb9e06005d1c6cd53 Mon Sep 17 00:00:00 2001 From: anushkasankaran Date: Sun, 23 Feb 2025 12:35:17 -0600 Subject: [PATCH 3/3] Update core data event refresh --- HackIllinois/DataSources/HIEventDataSource.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/HackIllinois/DataSources/HIEventDataSource.swift b/HackIllinois/DataSources/HIEventDataSource.swift index 556d1a41..4e9e9017 100644 --- a/HackIllinois/DataSources/HIEventDataSource.swift +++ b/HackIllinois/DataSources/HIEventDataSource.swift @@ -111,9 +111,10 @@ final class HIEventDataSource { coreDataEvent.endTime = apiEvent.endTime coreDataEvent.eventType = apiEvent.eventType coreDataEvent.info = apiEvent.info + coreDataEvent.locations = [] apiEvent.locations.forEach { apiLocation in guard let coreDataLocation = coreDataLocationsDicionary[apiLocation.name] else { fatalError("Event Location Error") } - coreDataEvent.removeFromLocations(coreDataLocation) +// coreDataEvent.removeFromLocations(coreDataLocation) coreDataEvent.addToLocations(coreDataLocation) } coreDataEvent.name = apiEvent.name