Skip to content
This repository was archived by the owner on Oct 12, 2025. It is now read-only.

Commit 2c9e96e

Browse files
nathannwangganushkasankaran
nathannwangg
and
anushkasankaran
authored
Event Location and Map Caching Fix (#634)
* 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 * Bumping up version * Update core data event refresh --------- Co-authored-by: anushkasankaran <anushka.sankaran@gmail.com>
1 parent 642dd03 commit 2c9e96e

File tree

4 files changed

+26
-22
lines changed

4 files changed

+26
-22
lines changed

‎HIAPI/Models/CartItem.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import Foundation
1010
import APIManager
1111

1212
public struct CartItemContainer: Decodable, APIReturnable {
13-
public let items: [String: Int]
1413
public let userId: String
14+
public let items: [String: Int]
1515

1616
public init(from decoder: Decoder) throws {
1717
let container = try decoder.container(keyedBy: CodingKeys.self)
@@ -20,7 +20,7 @@ public struct CartItemContainer: Decodable, APIReturnable {
2020
}
2121

2222
private enum CodingKeys: String, CodingKey {
23-
case items, userId
23+
case userId, items
2424
}
2525
}
2626

‎HackIllinois.xcodeproj/project.pbxproj‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1380,18 +1380,18 @@
13801380
"$(inherited)",
13811381
"@executable_path/Frameworks",
13821382
);
1383-
MARKETING_VERSION = 2024.11.1;
1383+
MARKETING_VERSION = 2025.1.1;
13841384
ONLY_ACTIVE_ARCH = YES;
13851385
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -Xfrontend -warn-long-expression-type-checking=150";
13861386
PRODUCT_BUNDLE_IDENTIFIER = org.hackillinois.ios;
13871387
PRODUCT_NAME = "$(TARGET_NAME)";
13881388
REGISTER_APP_GROUPS = NO;
13891389
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
13901390
SUPPORTS_MACCATALYST = NO;
1391-
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
1392-
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
1391+
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
1392+
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES;
13931393
SWIFT_VERSION = 5.0;
1394-
TARGETED_DEVICE_FAMILY = 1;
1394+
TARGETED_DEVICE_FAMILY = "1,2";
13951395
};
13961396
name = Debug;
13971397
};
@@ -1417,17 +1417,17 @@
14171417
"$(inherited)",
14181418
"@executable_path/Frameworks",
14191419
);
1420-
MARKETING_VERSION = 2024.11.1;
1420+
MARKETING_VERSION = 2025.1.1;
14211421
ONLY_ACTIVE_ARCH = YES;
14221422
PRODUCT_BUNDLE_IDENTIFIER = org.hackillinois.ios;
14231423
PRODUCT_NAME = "$(TARGET_NAME)";
14241424
REGISTER_APP_GROUPS = NO;
14251425
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
14261426
SUPPORTS_MACCATALYST = NO;
1427-
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
1428-
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
1427+
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
1428+
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES;
14291429
SWIFT_VERSION = 5.0;
1430-
TARGETED_DEVICE_FAMILY = 1;
1430+
TARGETED_DEVICE_FAMILY = "1,2";
14311431
};
14321432
name = Release;
14331433
};
@@ -1465,11 +1465,11 @@
14651465
SKIP_INSTALL = YES;
14661466
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
14671467
SUPPORTS_MACCATALYST = NO;
1468-
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
1469-
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
1468+
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
1469+
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES;
14701470
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
14711471
SWIFT_VERSION = 5.0;
1472-
TARGETED_DEVICE_FAMILY = 1;
1472+
TARGETED_DEVICE_FAMILY = "1,2";
14731473
VERSIONING_SYSTEM = "apple-generic";
14741474
VERSION_INFO_PREFIX = "";
14751475
};
@@ -1508,10 +1508,10 @@
15081508
SKIP_INSTALL = YES;
15091509
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
15101510
SUPPORTS_MACCATALYST = NO;
1511-
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
1512-
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
1511+
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
1512+
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES;
15131513
SWIFT_VERSION = 5.0;
1514-
TARGETED_DEVICE_FAMILY = 1;
1514+
TARGETED_DEVICE_FAMILY = "1,2";
15151515
VERSIONING_SYSTEM = "apple-generic";
15161516
VERSION_INFO_PREFIX = "";
15171517
};
@@ -1542,9 +1542,9 @@
15421542
SKIP_INSTALL = YES;
15431543
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
15441544
SUPPORTS_MACCATALYST = NO;
1545-
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
1546-
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
1547-
TARGETED_DEVICE_FAMILY = 1;
1545+
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
1546+
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES;
1547+
TARGETED_DEVICE_FAMILY = "1,2";
15481548
};
15491549
name = Debug;
15501550
};
@@ -1572,9 +1572,9 @@
15721572
SKIP_INSTALL = YES;
15731573
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
15741574
SUPPORTS_MACCATALYST = NO;
1575-
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
1576-
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
1577-
TARGETED_DEVICE_FAMILY = 1;
1575+
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
1576+
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES;
1577+
TARGETED_DEVICE_FAMILY = "1,2";
15781578
};
15791579
name = Release;
15801580
};

‎HackIllinois/DataSources/HIEventDataSource.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,10 @@ final class HIEventDataSource {
111111
coreDataEvent.endTime = apiEvent.endTime
112112
coreDataEvent.eventType = apiEvent.eventType
113113
coreDataEvent.info = apiEvent.info
114+
coreDataEvent.locations = []
114115
apiEvent.locations.forEach { apiLocation in
115116
guard let coreDataLocation = coreDataLocationsDicionary[apiLocation.name] else { fatalError("Event Location Error") }
117+
// coreDataEvent.removeFromLocations(coreDataLocation)
116118
coreDataEvent.addToLocations(coreDataLocation)
117119
}
118120
coreDataEvent.name = apiEvent.name

‎HackIllinois/ViewControllers/HIEventDetailViewController.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,8 @@ extension HIEventDetailViewController {
261261
imageUrlString = imageUrlString.replacingOccurrences(of: "svg", with: "png")
262262
}
263263

264+
self.mapView.image = nil
265+
264266
if let mapUrl = URL(string: imageUrlString) {
265267
let session = URLSession.shared
266268
self.mapView.image = nil

0 commit comments

Comments
 (0)