diff --git a/HackIllinois/Assets.xcassets/ScheduleBackground.imageset/Background@1x.png b/HackIllinois/Assets.xcassets/ScheduleBackground.imageset/Background@1x.png deleted file mode 100644 index 4bedf4f0..00000000 Binary files a/HackIllinois/Assets.xcassets/ScheduleBackground.imageset/Background@1x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/ScheduleBackground.imageset/Background@2x.png b/HackIllinois/Assets.xcassets/ScheduleBackground.imageset/Background@2x.png deleted file mode 100644 index 235fea61..00000000 Binary files a/HackIllinois/Assets.xcassets/ScheduleBackground.imageset/Background@2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/ScheduleBackground.imageset/Background@3x.png b/HackIllinois/Assets.xcassets/ScheduleBackground.imageset/Background@3x.png deleted file mode 100644 index cd7217f6..00000000 Binary files a/HackIllinois/Assets.xcassets/ScheduleBackground.imageset/Background@3x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/ScheduleBackground.imageset/Contents.json b/HackIllinois/Assets.xcassets/ScheduleBackground.imageset/Contents.json index c091139b..2f280efb 100644 --- a/HackIllinois/Assets.xcassets/ScheduleBackground.imageset/Contents.json +++ b/HackIllinois/Assets.xcassets/ScheduleBackground.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "Background@1x.png", + "filename" : "iPhone 16 - 1.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "Background@2x.png", + "filename" : "iPhone 16 - 1 (1).png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Background@3x.png", + "filename" : "iPhone 16 - 1 (2).png", "idiom" : "universal", "scale" : "3x" } diff --git a/HackIllinois/Assets.xcassets/ScheduleBackground.imageset/iPhone 16 - 1 (1).png b/HackIllinois/Assets.xcassets/ScheduleBackground.imageset/iPhone 16 - 1 (1).png new file mode 100644 index 00000000..584415a6 Binary files /dev/null and b/HackIllinois/Assets.xcassets/ScheduleBackground.imageset/iPhone 16 - 1 (1).png differ diff --git a/HackIllinois/Assets.xcassets/ScheduleBackground.imageset/iPhone 16 - 1 (2).png b/HackIllinois/Assets.xcassets/ScheduleBackground.imageset/iPhone 16 - 1 (2).png new file mode 100644 index 00000000..b88227d2 Binary files /dev/null and b/HackIllinois/Assets.xcassets/ScheduleBackground.imageset/iPhone 16 - 1 (2).png differ diff --git a/HackIllinois/Assets.xcassets/ScheduleBackground.imageset/iPhone 16 - 1.png b/HackIllinois/Assets.xcassets/ScheduleBackground.imageset/iPhone 16 - 1.png new file mode 100644 index 00000000..75b5a73f Binary files /dev/null and b/HackIllinois/Assets.xcassets/ScheduleBackground.imageset/iPhone 16 - 1.png differ diff --git a/HackIllinois/DataSources/HITimeDataSource.swift b/HackIllinois/DataSources/HITimeDataSource.swift index 6ecd8f75..4cd4d5d1 100644 --- a/HackIllinois/DataSources/HITimeDataSource.swift +++ b/HackIllinois/DataSources/HITimeDataSource.swift @@ -33,12 +33,13 @@ final class HITimeDataSource { eventEnd: Date(timeIntervalSince1970: 1708898400), // Sunday, February 25, 2024 4:00:00 PM CST hackStart: Date(timeIntervalSince1970: 1708736400), // Friday, February 23, 2024 7:00:00 PM CST hackEnd: Date(timeIntervalSince1970: 1708876800), // Sunday, February 25, 2024 10:00:00 AM CST - fridayStart: Date(timeIntervalSince1970: 1708668000), // Friday, February 23, 2024 12:00:00 AM CST - fridayEnd: Date(timeIntervalSince1970: 1708754399), // Friday, February 23, 2024 11:59:59 PM CST - saturdayStart: Date(timeIntervalSince1970: 1708754400), // Saturday, February 24, 2024 12:00:00 AM CST - saturdayEnd: Date(timeIntervalSince1970: 1708840799), // Saturday, February 24, 2024 11:59:59 PM CST - sundayStart: Date(timeIntervalSince1970: 1708840800), // Sunday, February 25, 2024 12:00:00 AM CST - sundayEnd: Date(timeIntervalSince1970: 1708927199) // Sunday, February 25, 2024 11:59:59 PM CST + // TODO: Need to get events + times for everything above + fridayStart: Date(timeIntervalSince1970: 1740722400), // Friday, February 28, 2025 12:00:00 AM CST + fridayEnd: Date(timeIntervalSince1970: 1740808799), // Friday, February 28, 2025 11:59:59 PM CST + saturdayStart: Date(timeIntervalSince1970: 1740808800), // Saturday, March 1, 2025 12:00:00 AM CST + saturdayEnd: Date(timeIntervalSince1970: 1740895199), // Saturday, March 1, 2025 11:59:59 PM CST + sundayStart: Date(timeIntervalSince1970: 1740895200), // Sunday, March 2, 2025 12:00:00 AM CST + sundayEnd: Date(timeIntervalSince1970: 1740981599) // Sunday, March 2, 2025 11:59:59 PM CST ) var eventTimes = HITimeDataSource.defaultTimes diff --git a/HackIllinois/Tests.playground/playground.xcworkspace/contents.xcworkspacedata b/HackIllinois/Tests.playground/playground.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..919434a6 --- /dev/null +++ b/HackIllinois/Tests.playground/playground.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/HackIllinois/ViewControllers/HIScheduleViewController.swift b/HackIllinois/ViewControllers/HIScheduleViewController.swift index 0477fd0a..70739695 100644 --- a/HackIllinois/ViewControllers/HIScheduleViewController.swift +++ b/HackIllinois/ViewControllers/HIScheduleViewController.swift @@ -78,7 +78,7 @@ class HIScheduleViewController: HIEventListViewController { @objc dynamic override func setUpBackgroundView() { super.setUpBackgroundView() - backgroundView.image = #imageLiteral(resourceName: "PurpleBackground") + backgroundView.image = #imageLiteral(resourceName: "ScheduleBackground") if UIDevice.current.userInterfaceIdiom == .pad { backgroundView.image = #imageLiteral(resourceName: "BackgroundPad") }