diff --git a/HackIllinois.xcodeproj/project.pbxproj b/HackIllinois.xcodeproj/project.pbxproj index 16d620f9..121c7f3d 100644 --- a/HackIllinois.xcodeproj/project.pbxproj +++ b/HackIllinois.xcodeproj/project.pbxproj @@ -85,7 +85,6 @@ 95C18DC52009618C004784B5 /* HIHomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C18DC42009618C004784B5 /* HIHomeViewController.swift */; }; 95C18DCA20096539004784B5 /* HIEventDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C18DC720096539004784B5 /* HIEventDetailViewController.swift */; }; 95C18DCB20096539004784B5 /* HIScheduleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C18DC820096539004784B5 /* HIScheduleViewController.swift */; }; - 95C18DCC20096539004784B5 /* HIEventListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C18DC920096539004784B5 /* HIEventListViewController.swift */; }; 95C3BE302008B99C0008ED79 /* HIBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C3BE2F2008B99C0008ED79 /* HIBaseViewController.swift */; }; 95CA9230201E60D300C46037 /* UIImage+QRCode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95CA922F201E60D300C46037 /* UIImage+QRCode.swift */; }; 95CCEA1F203D6B3600E3E28C /* HINavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95CCEA1E203D6B3600E3E28C /* HINavigationController.swift */; }; @@ -157,6 +156,7 @@ D1F1463A2B605C57004E7FC9 /* Hack_Mushroom_Loading.json in Resources */ = {isa = PBXBuildFile; fileRef = D1F146392B605C57004E7FC9 /* Hack_Mushroom_Loading.json */; }; D3A309BC2211175200CBA351 /* PassKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3A309BB2211175200CBA351 /* PassKit.framework */; }; D704DB322C73A8E200355019 /* URLImage in Frameworks */ = {isa = PBXBuildFile; productRef = D704DB312C73A8E200355019 /* URLImage */; }; + DAACDC322D3B8F5E00D15118 /* HIEventListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAACDC312D3B8F5E00D15118 /* HIEventListViewController.swift */; }; DF3706382925DDAA000B4278 /* GoogleMapsBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF3706372925DDAA000B4278 /* GoogleMapsBase.framework */; }; DF37063B2925DDB8000B4278 /* GoogleMaps.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF3706392925DDB7000B4278 /* GoogleMaps.framework */; }; DF37063C2925DDB8000B4278 /* GoogleMapsCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF37063A2925DDB8000B4278 /* GoogleMapsCore.framework */; }; @@ -306,7 +306,6 @@ 95C18DC42009618C004784B5 /* HIHomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HIHomeViewController.swift; sourceTree = ""; }; 95C18DC720096539004784B5 /* HIEventDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HIEventDetailViewController.swift; sourceTree = ""; }; 95C18DC820096539004784B5 /* HIScheduleViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HIScheduleViewController.swift; sourceTree = ""; }; - 95C18DC920096539004784B5 /* HIEventListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HIEventListViewController.swift; sourceTree = ""; }; 95C3BE2F2008B99C0008ED79 /* HIBaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HIBaseViewController.swift; sourceTree = ""; }; 95CA922F201E60D300C46037 /* UIImage+QRCode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+QRCode.swift"; sourceTree = ""; }; 95CCEA1E203D6B3600E3E28C /* HINavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HINavigationController.swift; sourceTree = ""; }; @@ -376,6 +375,7 @@ D1F146392B605C57004E7FC9 /* Hack_Mushroom_Loading.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = Hack_Mushroom_Loading.json; sourceTree = ""; }; D3A309BA221116A600CBA351 /* HackIllinois.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = HackIllinois.entitlements; sourceTree = ""; }; D3A309BB2211175200CBA351 /* PassKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PassKit.framework; path = System/Library/Frameworks/PassKit.framework; sourceTree = SDKROOT; }; + DAACDC312D3B8F5E00D15118 /* HIEventListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HIEventListViewController.swift; sourceTree = ""; }; DF3706372925DDAA000B4278 /* GoogleMapsBase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = GoogleMapsBase.framework; sourceTree = ""; }; DF3706392925DDB7000B4278 /* GoogleMaps.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = GoogleMaps.framework; sourceTree = ""; }; DF37063A2925DDB8000B4278 /* GoogleMapsCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = GoogleMapsCore.framework; sourceTree = ""; }; @@ -606,7 +606,7 @@ D14D3AE2295FBDA100EB7995 /* HIBannerViewController.swift */, D158EC302B5A2D440003D799 /* HIQRAttendeeScannerSelection.swift */, 95C18DC720096539004784B5 /* HIEventDetailViewController.swift */, - 95C18DC920096539004784B5 /* HIEventListViewController.swift */, + DAACDC312D3B8F5E00D15118 /* HIEventListViewController.swift */, 9515E43622093E1300BCAF92 /* HIEventScannerViewController.swift */, 95C18DC42009618C004784B5 /* HIHomeViewController.swift */, 954EE1D21FD0F1680078F39E /* HILoginSelectionViewController.swift */, @@ -997,6 +997,7 @@ 951E67F723C1C88200477703 /* XCRemoteSwiftPackageReference "lottie-ios" */, D1D335152B81DEBA00BBB596 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, D704DB302C73A8E200355019 /* XCRemoteSwiftPackageReference "url-image" */, + DADFD71E2D3311C200F1CE5D /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */, ); productRefGroup = 951827801EA35AF100049F79 /* Products */; projectDirPath = ""; @@ -1092,6 +1093,7 @@ 9521A6AA20191737009059C6 /* HIAnnouncementDataSource.swift in Sources */, D19D4C932B794F9100376E1B /* HIScanMentorViewController.swift in Sources */, 95C18DCB20096539004784B5 /* HIScheduleViewController.swift in Sources */, + DAACDC322D3B8F5E00D15118 /* HIEventListViewController.swift in Sources */, ACCB199D25F56DF100F88379 /* HIInterestCell.swift in Sources */, 95CCEA1F203D6B3600E3E28C /* HINavigationController.swift in Sources */, 957D7CAC1FC2940800C4332A /* HackIllinois.xcdatamodeld in Sources */, @@ -1115,7 +1117,6 @@ 1C9045D2274F048A00DDA74E /* HICarouselView.swift in Sources */, AC3B621625E8611C002386A2 /* HIProfileDataSource.swift in Sources */, BF0FDA3925F4DCCD003B5DB1 /* HIScheduleSegmentedControl.swift in Sources */, - 95C18DCC20096539004784B5 /* HIEventListViewController.swift in Sources */, 95A7D28A203D4F54005EAEAF /* HIButton.swift in Sources */, 95A7D28E203D4F54005EAEAF /* HIView.swift in Sources */, 3CF8DB1323B419980035ECAE /* HIProjectCell.swift in Sources */, @@ -1375,7 +1376,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2024.2.3; + MARKETING_VERSION = 2024.11.1; ONLY_ACTIVE_ARCH = YES; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -Xfrontend -warn-long-expression-type-checking=150"; PRODUCT_BUNDLE_IDENTIFIER = org.hackillinois.ios; @@ -1407,7 +1408,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2024.2.3; + MARKETING_VERSION = 2024.11.1; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.hackillinois.ios; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1631,6 +1632,14 @@ minimumVersion = 3.1.1; }; }; + DADFD71E2D3311C200F1CE5D /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/SimplyDanny/SwiftLintPlugins"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 0.57.1; + }; + }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ diff --git a/HackIllinois.xcodeproj/xcshareddata/xcschemes/HIAPI.xcscheme b/HackIllinois.xcodeproj/xcshareddata/xcschemes/HIAPI.xcscheme new file mode 100644 index 00000000..e1a1f6df --- /dev/null +++ b/HackIllinois.xcodeproj/xcshareddata/xcschemes/HIAPI.xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HackIllinois/Assets.xcassets/BackButton.imageset/Contents.json b/HackIllinois/Assets.xcassets/BackButton.imageset/Contents.json index 6cad6d6b..4a47f1f8 100644 --- a/HackIllinois/Assets.xcassets/BackButton.imageset/Contents.json +++ b/HackIllinois/Assets.xcassets/BackButton.imageset/Contents.json @@ -1,26 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "BackButton.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "BackButton@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "BackButton@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 }, "properties" : { "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/HackIllinois/Assets.xcassets/Background.imageset/Background (1).png b/HackIllinois/Assets.xcassets/Background 1.imageset/Background (1).png similarity index 100% rename from HackIllinois/Assets.xcassets/Background.imageset/Background (1).png rename to HackIllinois/Assets.xcassets/Background 1.imageset/Background (1).png diff --git a/HackIllinois/Assets.xcassets/Background.imageset/Background (2).png b/HackIllinois/Assets.xcassets/Background 1.imageset/Background (2).png similarity index 100% rename from HackIllinois/Assets.xcassets/Background.imageset/Background (2).png rename to HackIllinois/Assets.xcassets/Background 1.imageset/Background (2).png diff --git a/HackIllinois/Assets.xcassets/Background.imageset/Background.png b/HackIllinois/Assets.xcassets/Background 1.imageset/Background.png similarity index 100% rename from HackIllinois/Assets.xcassets/Background.imageset/Background.png rename to HackIllinois/Assets.xcassets/Background 1.imageset/Background.png diff --git a/HackIllinois/Assets.xcassets/Background 1.imageset/Contents.json b/HackIllinois/Assets.xcassets/Background 1.imageset/Contents.json new file mode 100644 index 00000000..06503aac --- /dev/null +++ b/HackIllinois/Assets.xcassets/Background 1.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Background.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Background (1).png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Background (2).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/Background.imageset/Contents.json b/HackIllinois/Assets.xcassets/Background.imageset/Contents.json index 06503aac..c9fe4d49 100644 --- a/HackIllinois/Assets.xcassets/Background.imageset/Contents.json +++ b/HackIllinois/Assets.xcassets/Background.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "Background.png", + "filename" : "Group 954.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "Background (1).png", + "filename" : "Group 954@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Background (2).png", + "filename" : "Group 954@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/HackIllinois/Assets.xcassets/Background.imageset/Group 954.png b/HackIllinois/Assets.xcassets/Background.imageset/Group 954.png new file mode 100644 index 00000000..ce67a283 Binary files /dev/null and b/HackIllinois/Assets.xcassets/Background.imageset/Group 954.png differ diff --git a/HackIllinois/Assets.xcassets/Background.imageset/Group 954@2x.png b/HackIllinois/Assets.xcassets/Background.imageset/Group 954@2x.png new file mode 100644 index 00000000..93eaf5aa Binary files /dev/null and b/HackIllinois/Assets.xcassets/Background.imageset/Group 954@2x.png differ diff --git a/HackIllinois/Assets.xcassets/Background.imageset/Group 954@3x.png b/HackIllinois/Assets.xcassets/Background.imageset/Group 954@3x.png new file mode 100644 index 00000000..9679e471 Binary files /dev/null and b/HackIllinois/Assets.xcassets/Background.imageset/Group 954@3x.png differ diff --git a/HackIllinois/Assets.xcassets/BackgroundShifts.imageset/Contents.json b/HackIllinois/Assets.xcassets/BackgroundShifts.imageset/Contents.json new file mode 100644 index 00000000..c9fe4d49 --- /dev/null +++ b/HackIllinois/Assets.xcassets/BackgroundShifts.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Group 954.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Group 954@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Group 954@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/BackgroundShifts.imageset/Group 954.png b/HackIllinois/Assets.xcassets/BackgroundShifts.imageset/Group 954.png new file mode 100644 index 00000000..467394cc Binary files /dev/null and b/HackIllinois/Assets.xcassets/BackgroundShifts.imageset/Group 954.png differ diff --git a/HackIllinois/Assets.xcassets/BackgroundShifts.imageset/Group 954@2x.png b/HackIllinois/Assets.xcassets/BackgroundShifts.imageset/Group 954@2x.png new file mode 100644 index 00000000..6f686945 Binary files /dev/null and b/HackIllinois/Assets.xcassets/BackgroundShifts.imageset/Group 954@2x.png differ diff --git a/HackIllinois/Assets.xcassets/BackgroundShifts.imageset/Group 954@3x.png b/HackIllinois/Assets.xcassets/BackgroundShifts.imageset/Group 954@3x.png new file mode 100644 index 00000000..ca0bb948 Binary files /dev/null and b/HackIllinois/Assets.xcassets/BackgroundShifts.imageset/Group 954@3x.png differ diff --git a/HackIllinois/Assets.xcassets/CountdownPillar.imageset/Contents.json b/HackIllinois/Assets.xcassets/CountdownPillar.imageset/Contents.json new file mode 100644 index 00000000..df240cf1 --- /dev/null +++ b/HackIllinois/Assets.xcassets/CountdownPillar.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Vector.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Vector@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Vector@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/CountdownPillar.imageset/Vector.png b/HackIllinois/Assets.xcassets/CountdownPillar.imageset/Vector.png new file mode 100644 index 00000000..bda5a861 Binary files /dev/null and b/HackIllinois/Assets.xcassets/CountdownPillar.imageset/Vector.png differ diff --git a/HackIllinois/Assets.xcassets/CountdownPillar.imageset/Vector@2x.png b/HackIllinois/Assets.xcassets/CountdownPillar.imageset/Vector@2x.png new file mode 100644 index 00000000..3d8a8529 Binary files /dev/null and b/HackIllinois/Assets.xcassets/CountdownPillar.imageset/Vector@2x.png differ diff --git a/HackIllinois/Assets.xcassets/CountdownPillar.imageset/Vector@3x.png b/HackIllinois/Assets.xcassets/CountdownPillar.imageset/Vector@3x.png new file mode 100644 index 00000000..765806f2 Binary files /dev/null and b/HackIllinois/Assets.xcassets/CountdownPillar.imageset/Vector@3x.png differ diff --git a/HackIllinois/Assets.xcassets/DisclosureIndicator.imageset/Contents.json b/HackIllinois/Assets.xcassets/DisclosureIndicator.imageset/Contents.json index 9aea4df7..4c487471 100644 --- a/HackIllinois/Assets.xcassets/DisclosureIndicator.imageset/Contents.json +++ b/HackIllinois/Assets.xcassets/DisclosureIndicator.imageset/Contents.json @@ -1,26 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "DisclosureIndicator@1x.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "DisclosureIndicator@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "DisclosureIndicator@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 }, "properties" : { "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/HackIllinois/Assets.xcassets/Favorited.imageset/Contents.json b/HackIllinois/Assets.xcassets/Favorited.imageset/Contents.json index b253ca2e..8e79598e 100644 --- a/HackIllinois/Assets.xcassets/Favorited.imageset/Contents.json +++ b/HackIllinois/Assets.xcassets/Favorited.imageset/Contents.json @@ -1,26 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "Favorited.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "Favorited@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "Favorited@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 }, "properties" : { "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/HackIllinois/Assets.xcassets/GreyBlock.imageset/Contents.json b/HackIllinois/Assets.xcassets/GreyBlock.imageset/Contents.json new file mode 100644 index 00000000..1fef46c4 --- /dev/null +++ b/HackIllinois/Assets.xcassets/GreyBlock.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Group 903.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Group 903@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Group 903@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/GreyBlock.imageset/Group 903.png b/HackIllinois/Assets.xcassets/GreyBlock.imageset/Group 903.png new file mode 100644 index 00000000..ba7b4634 Binary files /dev/null and b/HackIllinois/Assets.xcassets/GreyBlock.imageset/Group 903.png differ diff --git a/HackIllinois/Assets.xcassets/GreyBlock.imageset/Group 903@2x.png b/HackIllinois/Assets.xcassets/GreyBlock.imageset/Group 903@2x.png new file mode 100644 index 00000000..138ca1b9 Binary files /dev/null and b/HackIllinois/Assets.xcassets/GreyBlock.imageset/Group 903@2x.png differ diff --git a/HackIllinois/Assets.xcassets/GreyBlock.imageset/Group 903@3x.png b/HackIllinois/Assets.xcassets/GreyBlock.imageset/Group 903@3x.png new file mode 100644 index 00000000..9f633a41 Binary files /dev/null and b/HackIllinois/Assets.xcassets/GreyBlock.imageset/Group 903@3x.png differ diff --git a/HackIllinois/Assets.xcassets/Home/HomePage/Contents.json b/HackIllinois/Assets.xcassets/Home/HomePage/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/HackIllinois/Assets.xcassets/Home/HomePage/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/HomePage/Contents.json b/HackIllinois/Assets.xcassets/HomePage/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/HackIllinois/Assets.xcassets/HomePage/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/Contents.json b/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/Contents.json new file mode 100644 index 00000000..1556d0c6 --- /dev/null +++ b/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "FINAL design profile mobile- initial start.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "FINAL design profile mobile- initial start@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "FINAL design profile mobile- initial start@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start.png b/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start.png new file mode 100644 index 00000000..d79215a2 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start@2x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start@2x.png new file mode 100644 index 00000000..e0679006 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start@2x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start@3x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start@3x.png new file mode 100644 index 00000000..5121bb5c Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start@3x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/Contents.json b/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/Contents.json new file mode 100644 index 00000000..1556d0c6 --- /dev/null +++ b/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "FINAL design profile mobile- initial start.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "FINAL design profile mobile- initial start@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "FINAL design profile mobile- initial start@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start.png b/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start.png new file mode 100644 index 00000000..a6b85f16 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start@2x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start@2x.png new file mode 100644 index 00000000..e64fd26c Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start@2x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start@3x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start@3x.png new file mode 100644 index 00000000..e3ef72e4 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start@3x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/Contents.json b/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/Contents.json new file mode 100644 index 00000000..1556d0c6 --- /dev/null +++ b/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "FINAL design profile mobile- initial start.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "FINAL design profile mobile- initial start@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "FINAL design profile mobile- initial start@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start.png b/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start.png new file mode 100644 index 00000000..bd6cadaf Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start@2x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start@2x.png new file mode 100644 index 00000000..8e02b658 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start@2x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start@3x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start@3x.png new file mode 100644 index 00000000..bc342472 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start@3x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/Contents.json b/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/Contents.json new file mode 100644 index 00000000..1556d0c6 --- /dev/null +++ b/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "FINAL design profile mobile- initial start.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "FINAL design profile mobile- initial start@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "FINAL design profile mobile- initial start@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start.png b/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start.png new file mode 100644 index 00000000..e12c1067 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start@2x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start@2x.png new file mode 100644 index 00000000..fbba1972 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start@2x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start@3x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start@3x.png new file mode 100644 index 00000000..15570101 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start@3x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/Contents.json b/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/Contents.json new file mode 100644 index 00000000..1556d0c6 --- /dev/null +++ b/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "FINAL design profile mobile- initial start.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "FINAL design profile mobile- initial start@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "FINAL design profile mobile- initial start@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start.png b/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start.png new file mode 100644 index 00000000..33edcc21 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start@2x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start@2x.png new file mode 100644 index 00000000..64405cb2 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start@2x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start@3x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start@3x.png new file mode 100644 index 00000000..b4ccdd76 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start@3x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/Contents.json b/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/Contents.json new file mode 100644 index 00000000..1556d0c6 --- /dev/null +++ b/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "FINAL design profile mobile- initial start.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "FINAL design profile mobile- initial start@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "FINAL design profile mobile- initial start@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start.png b/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start.png new file mode 100644 index 00000000..638a6faa Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start@2x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start@2x.png new file mode 100644 index 00000000..91ef75ac Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start@2x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start@3x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start@3x.png new file mode 100644 index 00000000..5ef3745b Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start@3x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/Contents.json b/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/Contents.json new file mode 100644 index 00000000..e35b0d38 --- /dev/null +++ b/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "FINAL design profile mobile.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "FINAL design profile mobile@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "FINAL design profile mobile@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile.png b/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile.png new file mode 100644 index 00000000..9e91b7a0 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile@2x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile@2x.png new file mode 100644 index 00000000..7d1e9237 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile@2x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile@3x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile@3x.png new file mode 100644 index 00000000..ff6d83fb Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile@3x.png differ diff --git a/HackIllinois/Assets.xcassets/HomeTagsToggle.imageset/Contents.json b/HackIllinois/Assets.xcassets/HomeTagsToggle.imageset/Contents.json new file mode 100644 index 00000000..2dcf126b --- /dev/null +++ b/HackIllinois/Assets.xcassets/HomeTagsToggle.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Home_Tags_Transparent.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Home_Tags_Transparent@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Home_Tags_Transparent@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/HomeTagsToggle.imageset/Home_Tags_Transparent.png b/HackIllinois/Assets.xcassets/HomeTagsToggle.imageset/Home_Tags_Transparent.png new file mode 100644 index 00000000..3cbae1a3 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomeTagsToggle.imageset/Home_Tags_Transparent.png differ diff --git a/HackIllinois/Assets.xcassets/HomeTagsToggle.imageset/Home_Tags_Transparent@2x.png b/HackIllinois/Assets.xcassets/HomeTagsToggle.imageset/Home_Tags_Transparent@2x.png new file mode 100644 index 00000000..2cc457ec Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomeTagsToggle.imageset/Home_Tags_Transparent@2x.png differ diff --git a/HackIllinois/Assets.xcassets/HomeTagsToggle.imageset/Home_Tags_Transparent@3x.png b/HackIllinois/Assets.xcassets/HomeTagsToggle.imageset/Home_Tags_Transparent@3x.png new file mode 100644 index 00000000..b6c1085a Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomeTagsToggle.imageset/Home_Tags_Transparent@3x.png differ diff --git a/HackIllinois/Assets.xcassets/HomeTagsToggle1.imageset/Contents.json b/HackIllinois/Assets.xcassets/HomeTagsToggle1.imageset/Contents.json new file mode 100644 index 00000000..2dcf126b --- /dev/null +++ b/HackIllinois/Assets.xcassets/HomeTagsToggle1.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Home_Tags_Transparent.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Home_Tags_Transparent@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Home_Tags_Transparent@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/HomeTagsToggle1.imageset/Home_Tags_Transparent.png b/HackIllinois/Assets.xcassets/HomeTagsToggle1.imageset/Home_Tags_Transparent.png new file mode 100644 index 00000000..cb48bbf4 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomeTagsToggle1.imageset/Home_Tags_Transparent.png differ diff --git a/HackIllinois/Assets.xcassets/HomeTagsToggle1.imageset/Home_Tags_Transparent@2x.png b/HackIllinois/Assets.xcassets/HomeTagsToggle1.imageset/Home_Tags_Transparent@2x.png new file mode 100644 index 00000000..a70b54a8 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomeTagsToggle1.imageset/Home_Tags_Transparent@2x.png differ diff --git a/HackIllinois/Assets.xcassets/HomeTagsToggle1.imageset/Home_Tags_Transparent@3x.png b/HackIllinois/Assets.xcassets/HomeTagsToggle1.imageset/Home_Tags_Transparent@3x.png new file mode 100644 index 00000000..83745926 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomeTagsToggle1.imageset/Home_Tags_Transparent@3x.png differ diff --git a/HackIllinois/Assets.xcassets/Image 1.imageset/Contents.json b/HackIllinois/Assets.xcassets/Image 1.imageset/Contents.json new file mode 100644 index 00000000..a19a5492 --- /dev/null +++ b/HackIllinois/Assets.xcassets/Image 1.imageset/Contents.json @@ -0,0 +1,20 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/Image.imageset/Contents.json b/HackIllinois/Assets.xcassets/Image.imageset/Contents.json new file mode 100644 index 00000000..a19a5492 --- /dev/null +++ b/HackIllinois/Assets.xcassets/Image.imageset/Contents.json @@ -0,0 +1,20 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/Location.imageset/Contents.json b/HackIllinois/Assets.xcassets/Location.imageset/Contents.json new file mode 100644 index 00000000..df240cf1 --- /dev/null +++ b/HackIllinois/Assets.xcassets/Location.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Vector.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Vector@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Vector@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/Location.imageset/Vector.png b/HackIllinois/Assets.xcassets/Location.imageset/Vector.png new file mode 100644 index 00000000..55f0261e Binary files /dev/null and b/HackIllinois/Assets.xcassets/Location.imageset/Vector.png differ diff --git a/HackIllinois/Assets.xcassets/Location.imageset/Vector@2x.png b/HackIllinois/Assets.xcassets/Location.imageset/Vector@2x.png new file mode 100644 index 00000000..1ff9b209 Binary files /dev/null and b/HackIllinois/Assets.xcassets/Location.imageset/Vector@2x.png differ diff --git a/HackIllinois/Assets.xcassets/Location.imageset/Vector@3x.png b/HackIllinois/Assets.xcassets/Location.imageset/Vector@3x.png new file mode 100644 index 00000000..744e4c8b Binary files /dev/null and b/HackIllinois/Assets.xcassets/Location.imageset/Vector@3x.png differ diff --git a/HackIllinois/Assets.xcassets/MenuClose.imageset/Contents.json b/HackIllinois/Assets.xcassets/MenuClose.imageset/Contents.json index 6d6040e4..bfc25a03 100644 --- a/HackIllinois/Assets.xcassets/MenuClose.imageset/Contents.json +++ b/HackIllinois/Assets.xcassets/MenuClose.imageset/Contents.json @@ -1,26 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "CloseMenu.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "CloseMenu@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "CloseMenu@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 }, "properties" : { "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/HackIllinois/Assets.xcassets/MenuOpen.imageset/Contents.json b/HackIllinois/Assets.xcassets/MenuOpen.imageset/Contents.json index 06a9a652..b3646417 100644 --- a/HackIllinois/Assets.xcassets/MenuOpen.imageset/Contents.json +++ b/HackIllinois/Assets.xcassets/MenuOpen.imageset/Contents.json @@ -1,26 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "Menu.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "Menu@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "Menu@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 }, "properties" : { "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/HackIllinois/Assets.xcassets/Pillar.imageset/Contents.json b/HackIllinois/Assets.xcassets/Pillar.imageset/Contents.json new file mode 100644 index 00000000..bf65f2b6 --- /dev/null +++ b/HackIllinois/Assets.xcassets/Pillar.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Isolation_Mode.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Isolation_Mode@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Isolation_Mode@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/Pillar.imageset/Isolation_Mode.png b/HackIllinois/Assets.xcassets/Pillar.imageset/Isolation_Mode.png new file mode 100644 index 00000000..9f6ac091 Binary files /dev/null and b/HackIllinois/Assets.xcassets/Pillar.imageset/Isolation_Mode.png differ diff --git a/HackIllinois/Assets.xcassets/Pillar.imageset/Isolation_Mode@2x.png b/HackIllinois/Assets.xcassets/Pillar.imageset/Isolation_Mode@2x.png new file mode 100644 index 00000000..3b3a2f1b Binary files /dev/null and b/HackIllinois/Assets.xcassets/Pillar.imageset/Isolation_Mode@2x.png differ diff --git a/HackIllinois/Assets.xcassets/Pillar.imageset/Isolation_Mode@3x.png b/HackIllinois/Assets.xcassets/Pillar.imageset/Isolation_Mode@3x.png new file mode 100644 index 00000000..cfea5039 Binary files /dev/null and b/HackIllinois/Assets.xcassets/Pillar.imageset/Isolation_Mode@3x.png differ diff --git a/HackIllinois/Assets.xcassets/ProfileIcons/Profile0.imageset/Contents.json b/HackIllinois/Assets.xcassets/ProfileIcons/Profile0.imageset/Contents.json index 769d55f9..ff6ea102 100644 --- a/HackIllinois/Assets.xcassets/ProfileIcons/Profile0.imageset/Contents.json +++ b/HackIllinois/Assets.xcassets/ProfileIcons/Profile0.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "idiom" : "universal", "filename" : "Profile0@1x.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "Profile0@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "Profile0@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/HackIllinois/Assets.xcassets/ProfileIcons/Profile1.imageset/Contents.json b/HackIllinois/Assets.xcassets/ProfileIcons/Profile1.imageset/Contents.json index 7f84ceb4..07e95b2b 100644 --- a/HackIllinois/Assets.xcassets/ProfileIcons/Profile1.imageset/Contents.json +++ b/HackIllinois/Assets.xcassets/ProfileIcons/Profile1.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "idiom" : "universal", "filename" : "Profile1@1x.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "Profile1@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "Profile1@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/HackIllinois/Assets.xcassets/ProfileIcons/Profile10.imageset/Contents.json b/HackIllinois/Assets.xcassets/ProfileIcons/Profile10.imageset/Contents.json index 218b97b5..ce0904e9 100644 --- a/HackIllinois/Assets.xcassets/ProfileIcons/Profile10.imageset/Contents.json +++ b/HackIllinois/Assets.xcassets/ProfileIcons/Profile10.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "idiom" : "universal", "filename" : "Profile10@1x.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "Profile10@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "Profile10@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/HackIllinois/Assets.xcassets/ProfileIcons/Profile2.imageset/Contents.json b/HackIllinois/Assets.xcassets/ProfileIcons/Profile2.imageset/Contents.json index 45c2e4d9..76162654 100644 --- a/HackIllinois/Assets.xcassets/ProfileIcons/Profile2.imageset/Contents.json +++ b/HackIllinois/Assets.xcassets/ProfileIcons/Profile2.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "idiom" : "universal", "filename" : "Profile2@1x.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "Profile2@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "Profile2@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/HackIllinois/Assets.xcassets/ProfileIcons/Profile3.imageset/Contents.json b/HackIllinois/Assets.xcassets/ProfileIcons/Profile3.imageset/Contents.json index fd344dbe..99fa57e6 100644 --- a/HackIllinois/Assets.xcassets/ProfileIcons/Profile3.imageset/Contents.json +++ b/HackIllinois/Assets.xcassets/ProfileIcons/Profile3.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "idiom" : "universal", "filename" : "Profile3@1x.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "Profile3@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "Profile3@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/HackIllinois/Assets.xcassets/ProfileIcons/Profile4.imageset/Contents.json b/HackIllinois/Assets.xcassets/ProfileIcons/Profile4.imageset/Contents.json index ddb87701..8d800072 100644 --- a/HackIllinois/Assets.xcassets/ProfileIcons/Profile4.imageset/Contents.json +++ b/HackIllinois/Assets.xcassets/ProfileIcons/Profile4.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "idiom" : "universal", "filename" : "Profile4@1x.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "Profile4@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "Profile4@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/HackIllinois/Assets.xcassets/ProfileIcons/Profile5.imageset/Contents.json b/HackIllinois/Assets.xcassets/ProfileIcons/Profile5.imageset/Contents.json index 0a3beb58..7391e5d1 100644 --- a/HackIllinois/Assets.xcassets/ProfileIcons/Profile5.imageset/Contents.json +++ b/HackIllinois/Assets.xcassets/ProfileIcons/Profile5.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "idiom" : "universal", "filename" : "Profile5@1x.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "Profile5@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "Profile5@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/HackIllinois/Assets.xcassets/ProfileIcons/Profile6.imageset/Contents.json b/HackIllinois/Assets.xcassets/ProfileIcons/Profile6.imageset/Contents.json index 9e9d9b41..9f243ac5 100644 --- a/HackIllinois/Assets.xcassets/ProfileIcons/Profile6.imageset/Contents.json +++ b/HackIllinois/Assets.xcassets/ProfileIcons/Profile6.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "idiom" : "universal", "filename" : "Profile6@1x.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "Profile6@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "Profile6@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/HackIllinois/Assets.xcassets/ProfileIcons/Profile7.imageset/Contents.json b/HackIllinois/Assets.xcassets/ProfileIcons/Profile7.imageset/Contents.json index 04c12001..119db683 100644 --- a/HackIllinois/Assets.xcassets/ProfileIcons/Profile7.imageset/Contents.json +++ b/HackIllinois/Assets.xcassets/ProfileIcons/Profile7.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "idiom" : "universal", "filename" : "Profile7@1x.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "Profile7@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "Profile7@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/HackIllinois/Assets.xcassets/ProfileIcons/Profile8.imageset/Contents.json b/HackIllinois/Assets.xcassets/ProfileIcons/Profile8.imageset/Contents.json index 06762cf3..71b75923 100644 --- a/HackIllinois/Assets.xcassets/ProfileIcons/Profile8.imageset/Contents.json +++ b/HackIllinois/Assets.xcassets/ProfileIcons/Profile8.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "idiom" : "universal", "filename" : "Profile8@1x.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "Profile8@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "Profile8@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/HackIllinois/Assets.xcassets/ProfileIcons/Profile9.imageset/Contents.json b/HackIllinois/Assets.xcassets/ProfileIcons/Profile9.imageset/Contents.json index 2c752737..bc0c97be 100644 --- a/HackIllinois/Assets.xcassets/ProfileIcons/Profile9.imageset/Contents.json +++ b/HackIllinois/Assets.xcassets/ProfileIcons/Profile9.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "idiom" : "universal", "filename" : "Profile9@1x.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "Profile9@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "Profile9@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/HackIllinois/Assets.xcassets/SandTimer.imageset/Contents.json b/HackIllinois/Assets.xcassets/SandTimer.imageset/Contents.json new file mode 100644 index 00000000..4deeb872 --- /dev/null +++ b/HackIllinois/Assets.xcassets/SandTimer.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "noun-hourglass-3018663 1.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "noun-hourglass-3018663 1@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "noun-hourglass-3018663 1@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/SandTimer.imageset/noun-hourglass-3018663 1.png b/HackIllinois/Assets.xcassets/SandTimer.imageset/noun-hourglass-3018663 1.png new file mode 100644 index 00000000..59ec63b4 Binary files /dev/null and b/HackIllinois/Assets.xcassets/SandTimer.imageset/noun-hourglass-3018663 1.png differ diff --git a/HackIllinois/Assets.xcassets/SandTimer.imageset/noun-hourglass-3018663 1@2x.png b/HackIllinois/Assets.xcassets/SandTimer.imageset/noun-hourglass-3018663 1@2x.png new file mode 100644 index 00000000..79d63daa Binary files /dev/null and b/HackIllinois/Assets.xcassets/SandTimer.imageset/noun-hourglass-3018663 1@2x.png differ diff --git a/HackIllinois/Assets.xcassets/SandTimer.imageset/noun-hourglass-3018663 1@3x.png b/HackIllinois/Assets.xcassets/SandTimer.imageset/noun-hourglass-3018663 1@3x.png new file mode 100644 index 00000000..8e85a368 Binary files /dev/null and b/HackIllinois/Assets.xcassets/SandTimer.imageset/noun-hourglass-3018663 1@3x.png differ diff --git a/HackIllinois/Assets.xcassets/Sponsor.imageset/Contents.json b/HackIllinois/Assets.xcassets/Sponsor.imageset/Contents.json new file mode 100644 index 00000000..df240cf1 --- /dev/null +++ b/HackIllinois/Assets.xcassets/Sponsor.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Vector.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Vector@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Vector@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/Sponsor.imageset/Vector.png b/HackIllinois/Assets.xcassets/Sponsor.imageset/Vector.png new file mode 100644 index 00000000..72210685 Binary files /dev/null and b/HackIllinois/Assets.xcassets/Sponsor.imageset/Vector.png differ diff --git a/HackIllinois/Assets.xcassets/Sponsor.imageset/Vector@2x.png b/HackIllinois/Assets.xcassets/Sponsor.imageset/Vector@2x.png new file mode 100644 index 00000000..b7a5cac9 Binary files /dev/null and b/HackIllinois/Assets.xcassets/Sponsor.imageset/Vector@2x.png differ diff --git a/HackIllinois/Assets.xcassets/Sponsor.imageset/Vector@3x.png b/HackIllinois/Assets.xcassets/Sponsor.imageset/Vector@3x.png new file mode 100644 index 00000000..44482687 Binary files /dev/null and b/HackIllinois/Assets.xcassets/Sponsor.imageset/Vector@3x.png differ diff --git a/HackIllinois/Assets.xcassets/ToggleHomePage.imageset/Contents.json b/HackIllinois/Assets.xcassets/ToggleHomePage.imageset/Contents.json new file mode 100644 index 00000000..df240cf1 --- /dev/null +++ b/HackIllinois/Assets.xcassets/ToggleHomePage.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Vector.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Vector@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Vector@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/ToggleHomePage.imageset/Vector.png b/HackIllinois/Assets.xcassets/ToggleHomePage.imageset/Vector.png new file mode 100644 index 00000000..6558d429 Binary files /dev/null and b/HackIllinois/Assets.xcassets/ToggleHomePage.imageset/Vector.png differ diff --git a/HackIllinois/Assets.xcassets/ToggleHomePage.imageset/Vector@2x.png b/HackIllinois/Assets.xcassets/ToggleHomePage.imageset/Vector@2x.png new file mode 100644 index 00000000..c6e2ef21 Binary files /dev/null and b/HackIllinois/Assets.xcassets/ToggleHomePage.imageset/Vector@2x.png differ diff --git a/HackIllinois/Assets.xcassets/ToggleHomePage.imageset/Vector@3x.png b/HackIllinois/Assets.xcassets/ToggleHomePage.imageset/Vector@3x.png new file mode 100644 index 00000000..990b6ca9 Binary files /dev/null and b/HackIllinois/Assets.xcassets/ToggleHomePage.imageset/Vector@3x.png differ diff --git a/HackIllinois/Assets.xcassets/Unfavorited.imageset/Contents.json b/HackIllinois/Assets.xcassets/Unfavorited.imageset/Contents.json index f32b4dc7..a1414b37 100644 --- a/HackIllinois/Assets.xcassets/Unfavorited.imageset/Contents.json +++ b/HackIllinois/Assets.xcassets/Unfavorited.imageset/Contents.json @@ -1,26 +1,26 @@ { "images" : [ { - "idiom" : "universal", "filename" : "Unfavorited.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "Unfavorited@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "Unfavorited@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 }, "properties" : { "template-rendering-intent" : "template" } -} \ No newline at end of file +} diff --git a/HackIllinois/Assets.xcassets/Vase.imageset/Contents.json b/HackIllinois/Assets.xcassets/Vase.imageset/Contents.json new file mode 100644 index 00000000..a030dd7c --- /dev/null +++ b/HackIllinois/Assets.xcassets/Vase.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Other Day.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Other Day@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Other Day@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/Vase.imageset/Other Day.png b/HackIllinois/Assets.xcassets/Vase.imageset/Other Day.png new file mode 100644 index 00000000..efe89ceb Binary files /dev/null and b/HackIllinois/Assets.xcassets/Vase.imageset/Other Day.png differ diff --git a/HackIllinois/Assets.xcassets/Vase.imageset/Other Day@2x.png b/HackIllinois/Assets.xcassets/Vase.imageset/Other Day@2x.png new file mode 100644 index 00000000..4a4400cf Binary files /dev/null and b/HackIllinois/Assets.xcassets/Vase.imageset/Other Day@2x.png differ diff --git a/HackIllinois/Assets.xcassets/Vase.imageset/Other Day@3x.png b/HackIllinois/Assets.xcassets/Vase.imageset/Other Day@3x.png new file mode 100644 index 00000000..5c120e17 Binary files /dev/null and b/HackIllinois/Assets.xcassets/Vase.imageset/Other Day@3x.png differ diff --git a/HackIllinois/Assets.xcassets/VaseClicked.imageset/Contents.json b/HackIllinois/Assets.xcassets/VaseClicked.imageset/Contents.json new file mode 100644 index 00000000..0c604303 --- /dev/null +++ b/HackIllinois/Assets.xcassets/VaseClicked.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Vase (Active).png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Vase (Active)@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Vase (Active)@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/VaseClicked.imageset/Vase (Active).png b/HackIllinois/Assets.xcassets/VaseClicked.imageset/Vase (Active).png new file mode 100644 index 00000000..57193f6c Binary files /dev/null and b/HackIllinois/Assets.xcassets/VaseClicked.imageset/Vase (Active).png differ diff --git a/HackIllinois/Assets.xcassets/VaseClicked.imageset/Vase (Active)@2x.png b/HackIllinois/Assets.xcassets/VaseClicked.imageset/Vase (Active)@2x.png new file mode 100644 index 00000000..15c3ac83 Binary files /dev/null and b/HackIllinois/Assets.xcassets/VaseClicked.imageset/Vase (Active)@2x.png differ diff --git a/HackIllinois/Assets.xcassets/VaseClicked.imageset/Vase (Active)@3x.png b/HackIllinois/Assets.xcassets/VaseClicked.imageset/Vase (Active)@3x.png new file mode 100644 index 00000000..16818cf1 Binary files /dev/null and b/HackIllinois/Assets.xcassets/VaseClicked.imageset/Vase (Active)@3x.png differ diff --git a/HackIllinois/GoogleService-Info.plist b/HackIllinois/GoogleService-Info.plist index 7a60ff06..02d8fb8b 100644 --- a/HackIllinois/GoogleService-Info.plist +++ b/HackIllinois/GoogleService-Info.plist @@ -26,6 +26,8 @@ GOOGLE_APP_ID 1:848675954156:ios:d43e052424b30ef97f34c9 + CFBundleIdentifier + DATABASE_URL https://hackillinois-3787e-default-rtdb.firebaseio.com diff --git a/HackIllinois/SwiftUI/HIOnboardingViewModel.swift b/HackIllinois/SwiftUI/HIOnboardingViewModel.swift index 0b9e39f3..97b45e9a 100644 --- a/HackIllinois/SwiftUI/HIOnboardingViewModel.swift +++ b/HackIllinois/SwiftUI/HIOnboardingViewModel.swift @@ -1,5 +1,5 @@ // -// HIOnboardingViewModel.swift +// HIOnboardingp.swift // HackIllinois // // Created by HackIllinois Team on 10/30/22. diff --git a/HackIllinois/UI/HIAppearance.swift b/HackIllinois/UI/HIAppearance.swift index 6d5b5351..351856c2 100644 --- a/HackIllinois/UI/HIAppearance.swift +++ b/HackIllinois/UI/HIAppearance.swift @@ -14,6 +14,7 @@ import UIKit +// swiftlint:disable type_body_length struct HIAppearance: Equatable { let neonCountdownText: UIColor let titleText: UIColor @@ -46,12 +47,15 @@ struct HIAppearance: Equatable { let interestBackground: UIColor let buttonGreen: UIColor let buttonBrown: UIColor + let buttonBlue: UIColor let buttonLightPink: UIColor let buttonPurple: UIColor + let buttonSienna: UIColor let buttonDarkBlue: UIColor let buttonMagenta: UIColor let buttonDarkBlueGreen: UIColor let buttonDarkGreen: UIColor + let buttonOrange: UIColor let favoriteStarBackground: UIColor let segmentedBackground: UIColor let buttonYellow: UIColor @@ -88,6 +92,7 @@ struct HIAppearance: Equatable { let scannerButtonBorder: UIColor let scannerButtonShadow: UIColor let proBackground: UIColor + let buttonPro: UIColor let eventCard: UIColor let clear: UIColor = .clear let black: UIColor = .black @@ -130,8 +135,17 @@ struct HIAppearance: Equatable { private static let buttonYellow = #colorLiteral(red: 1, green: 0.7882352941, blue: 0.3568627451, alpha: 1) private static let offWhite = #colorLiteral(red: 1, green: 0.9725490196, blue: 0.9607843137, alpha: 1) private static let transparent2 = #colorLiteral(red: 1, green: 1, blue: 1, alpha: 0) + // Hack 2025 color palette (color name + hex code) + private static let rawSienna = #colorLiteral(red: 0.8705882353, green: 0.5568627451, blue: 0.2705882353, alpha: 1) // #DE8E45 + private static let neptune = #colorLiteral(red: 0.5176470588, green: 0.737254902, blue: 0.7254901961, alpha: 1) // #84BCB9 + private static let lightningYellow = #colorLiteral(red: 0.9764705882, green: 0.7568627451, blue: 0.1490196078, alpha: 1) // #F9C126 + private static let copper = #colorLiteral(red: 0.7725490196, green: 0.4039215686, blue: 0.2470588235, alpha: 1) // #C5673F + private static let metallicCopper = #colorLiteral(red: 0.4274509804, green: 0.1607843137, blue: 0.1019607843, alpha: 1) // #6D291A + private static let yellowOrange = #colorLiteral(red: 1.0, green: 0.6980392157, blue: 0.2431372549, alpha: 1) // #FFB23E + private static let muleFawn = #colorLiteral(red: 0.537254902, green: 0.2470588235, blue: 0.1843137255, alpha: 1) // #893F2F + private static let elephant = #colorLiteral(red: 0.05098039216, green: 0.2470588235, blue: 0.2549019608, alpha: 1) // #0D3F41 + private static let doveGray = #colorLiteral(red: 0.4235294118, green: 0.4235294118, blue: 0.4235294118, alpha: 1) // #6C6C6C private static let navBarYellow = #colorLiteral(red: 0.9603472352, green: 0.9405072331, blue: 0.8672463298, alpha: 1) - private static var statusBarWhite: UIStatusBarStyle { return .lightContent } @@ -173,12 +187,15 @@ struct HIAppearance: Equatable { interestBackground: orange, buttonGreen: yellowGreen, buttonBrown: lightBrown, + buttonBlue: neptune, buttonLightPink: other, buttonPurple: indigo, + buttonSienna: rawSienna, buttonDarkBlue: darkBlue, buttonMagenta: magenta, buttonDarkBlueGreen: darkBlueGreen, buttonDarkGreen: darkGreen, + buttonOrange: orange, favoriteStarBackground: yellowWhite, segmentedBackground: white, buttonYellow: bLightYellow, @@ -215,6 +232,7 @@ struct HIAppearance: Equatable { scannerButtonBorder: medBrown, scannerButtonShadow: darkBrown, proBackground: medTeal, + buttonPro: copper, eventCard: offWhite ) @@ -250,12 +268,15 @@ struct HIAppearance: Equatable { interestBackground: orange, buttonGreen: yellowGreen, buttonBrown: lightBrown, + buttonBlue: neptune, buttonLightPink: other, buttonPurple: indigo, + buttonSienna: rawSienna, buttonDarkBlue: darkBlue, buttonMagenta: magenta, buttonDarkBlueGreen: darkBlueGreen, buttonDarkGreen: darkGreen, + buttonOrange: orange, favoriteStarBackground: yellowWhite, segmentedBackground: white, buttonYellow: bLightYellow, @@ -292,6 +313,7 @@ struct HIAppearance: Equatable { scannerButtonBorder: medBrown, scannerButtonShadow: darkBrown, proBackground: medTeal, + buttonPro: copper, eventCard: offWhite ) @@ -372,8 +394,8 @@ struct HIAppearance: Equatable { // Home page countdown fonts // static let newCountdownText = UIFont(name: "MontserratRoman-Bold", size: 48) // Hack 2023 - static let newCountdownText = UIFont(name: "MontserratRoman-Bold", size: 42) // Hack 2024 - static let newCountdownTextPad = UIFont(name: "MontserratRoman-Bold", size: 56) // Hack 2024 + static let newCountdownText = UIFont(name: "MontserratRoman-Bold", size: 28) // Hack 2024 + static let newCountdownTextPad = UIFont(name: "MontserratRoman-Bold", size: 42) // Hack 2024 static let countdownText = UIFont(name: "MontserratRoman-Bold", size: 25) // Onboarding fonts diff --git a/HackIllinois/UI/HIScheduleSegmentedControl.swift b/HackIllinois/UI/HIScheduleSegmentedControl.swift index 49aa994f..1a3998ed 100644 --- a/HackIllinois/UI/HIScheduleSegmentedControl.swift +++ b/HackIllinois/UI/HIScheduleSegmentedControl.swift @@ -31,7 +31,7 @@ class HIScheduleSegmentedControl: HISegmentedControl { private var indicatorView = UIImageView(image: #imageLiteral(resourceName: "Indicator")) - private var selectedPotionView: UIImageView? // Keep track of the selected potion + private var selectedVaseView: UIImageView? // Keep track of the selected vase let padConstant = (UIDevice.current.userInterfaceIdiom == .pad) ? 2.0 : 1 // MARK: - Init @@ -105,31 +105,52 @@ class HIScheduleSegmentedControl: HISegmentedControl { items.indices.forEach { setupViewForItem(at: $0) } constrain(views: views) - // Highlight the initially selected potion - highlightSelectedPotion() + // Highlight the initially selected vase + highlightSelectedVase() } private func setupViewForItem(at index: Int) { let view = UIView() let titleLabel = UILabel() let numberLabel = UILabel() - var potionView = UIImageView(image: #imageLiteral(resourceName: "Purple Potion")) + var vaseView = UIImageView(image: #imageLiteral(resourceName: "Vase")) if UIDevice.current.userInterfaceIdiom == .pad { - potionView = UIImageView(image: #imageLiteral(resourceName: "PurplePotionPad")) + vaseView = UIImageView(image: #imageLiteral(resourceName: "Vase")) } + + if index == selectedIndex { - // If it's the selected index, set the potion view color to pink + // If it's the selected index, set the vase color to clicked if UIDevice.current.userInterfaceIdiom == .pad { - potionView.image = #imageLiteral(resourceName: "PinkPotionPad") + vaseView = UIImageView(image: #imageLiteral(resourceName: "VaseClicked")) + } else { - potionView.image = #imageLiteral(resourceName: "Pink Potion") + + vaseView = UIImageView(image: #imageLiteral(resourceName: "VaseClicked")) } - selectedPotionView = potionView + selectedVaseView = vaseView + } + + vaseView.translatesAutoresizingMaskIntoConstraints = false + vaseView.contentMode = .scaleAspectFit // Prevent stretching + vaseView.clipsToBounds = true + + let dynamicWidth: CGFloat + if UIDevice.current.userInterfaceIdiom == .pad { + dynamicWidth = UIScreen.main.bounds.width * 0.2 // 30% for iPads + } else { + dynamicWidth = UIScreen.main.bounds.width * 0.2 // 20% for iPhones } + let dynamicHeight = dynamicWidth * (74 / 68.351) // Maintain aspect ratio + + vaseView.widthAnchor.constraint(equalToConstant: dynamicWidth).isActive = true + vaseView.heightAnchor.constraint(equalToConstant: dynamicHeight).isActive = true + + // Set up titleLabel and numberLabel - potionView.addSubview(titleLabel) - potionView.addSubview(numberLabel) - view.addSubview(potionView) + vaseView.addSubview(titleLabel) + vaseView.addSubview(numberLabel) + view.addSubview(vaseView) titleLabel.textAlignment = .center if UIDevice.current.userInterfaceIdiom == .pad { titleLabel.font = titleFontPad @@ -145,15 +166,17 @@ class HIScheduleSegmentedControl: HISegmentedControl { numberLabel.textColor <- \.darkGreenText titleLabel.translatesAutoresizingMaskIntoConstraints = false numberLabel.translatesAutoresizingMaskIntoConstraints = false - potionView.translatesAutoresizingMaskIntoConstraints = false + vaseView.translatesAutoresizingMaskIntoConstraints = false var segmentedControlConstant = -10.0 if UIDevice.current.userInterfaceIdiom == .pad { segmentedControlConstant = 0 } - numberLabel.constrain(to: potionView, topInset: 30 * padConstant, trailingInset: 0, leadingInset: 0) - titleLabel.constrain(to: potionView, trailingInset: 0, bottomInset: 0, leadingInset: 0) + + numberLabel.constrain(to: vaseView, topInset: 20 * padConstant, trailingInset: 0, leadingInset: 0) + titleLabel.constrain(to: vaseView, trailingInset: 0, bottomInset: 0, leadingInset: 0) titleLabel.topAnchor.constraint(equalTo: numberLabel.bottomAnchor, constant: segmentedControlConstant).isActive = true titleLabel.heightAnchor.constraint(equalTo: numberLabel.heightAnchor).isActive = true + view.isUserInteractionEnabled = false titleLabel.isUserInteractionEnabled = false @@ -168,35 +191,35 @@ class HIScheduleSegmentedControl: HISegmentedControl { override func didSetSelectedIndex(oldValue: Int) { if oldValue != selectedIndex { - selectedPotionView?.image = #imageLiteral(resourceName: "Purple Potion") + selectedVaseView?.image = #imageLiteral(resourceName: "Vase") if UIDevice.current.userInterfaceIdiom == .pad { - selectedPotionView?.image = #imageLiteral(resourceName: "PurplePotionPad") + selectedVaseView?.image = #imageLiteral(resourceName: "Vase") } else { - selectedPotionView?.image = #imageLiteral(resourceName: "Purple Potion") + selectedVaseView?.image = #imageLiteral(resourceName: "Vase") } - // Update the color of the newly selected potion - if let potionView = views[selectedIndex].subviews.first as? UIImageView { + // Update the color of the newly selected vase + if let vaseView = views[selectedIndex].subviews.first as? UIImageView { if UIDevice.current.userInterfaceIdiom == .pad { - potionView.image = #imageLiteral(resourceName: "PinkPotionPad") + vaseView.image = #imageLiteral(resourceName: "VaseClicked") } else { - potionView.image = #imageLiteral(resourceName: "Pink Potion") + vaseView.image = #imageLiteral(resourceName: "VaseClicked") } - selectedPotionView = potionView + selectedVaseView = vaseView } displayNewSelectedIndex() sendActions(for: .valueChanged) } } - private func highlightSelectedPotion() { - if let potionView = views[selectedIndex].subviews.first as? UIImageView { + private func highlightSelectedVase() { + if let vaseView = views[selectedIndex].subviews.first as? UIImageView { if UIDevice.current.userInterfaceIdiom == .pad { - selectedPotionView?.image = #imageLiteral(resourceName: "PinkPotionPad") + selectedVaseView?.image = #imageLiteral(resourceName: "VaseClicked") } else { - potionView.image = #imageLiteral(resourceName: "Pink Potion") + vaseView.image = #imageLiteral(resourceName: "VaseClicked") } - selectedPotionView = potionView + selectedVaseView = vaseView } } diff --git a/HackIllinois/UI/TableView/Cells/HIBubbleCell/HIEventCell.swift b/HackIllinois/UI/TableView/Cells/HIBubbleCell/HIEventCell.swift index 72abad41..42162821 100644 --- a/HackIllinois/UI/TableView/Cells/HIBubbleCell/HIEventCell.swift +++ b/HackIllinois/UI/TableView/Cells/HIBubbleCell/HIEventCell.swift @@ -102,20 +102,23 @@ extension HIEventCell { } return height + 5 } + // swiftlint:disable function_body_length static func <- (lhs: HIEventCell, rhs: Event) { lhs.favoritedButton.isActive = rhs.favorite var contentStackViewHeight: CGFloat = 0.0; var eventCellSpacing: CGFloat = 8.0 var stackViewSpacing: CGFloat = 4.7; var bubbleConstant: CGFloat = 1.0 - var locationImageView = UIImageView(image: #imageLiteral(resourceName: "LocationSign")); var timeImageView = UIImageView(image: #imageLiteral(resourceName: "Clock")) - var sponsorImageView = UIImageView(image: #imageLiteral(resourceName: "Vector")); let titleLabel = HILabel(style: .event) + var locationImageView = UIImageView(image: #imageLiteral(resourceName: "Location")); var timeImageView = UIImageView(image: #imageLiteral(resourceName: "SandTimer")) + var sponsorImageView = UIImageView(image: #imageLiteral(resourceName: "Sponsor")); let titleLabel = HILabel(style: .event) titleLabel.numberOfLines = 2; titleLabel.text = rhs.name + titleLabel.textColor = UIColor(red: 0x6D / 255.0, green: 0x29 / 255.0, blue: 0x1A / 255.0, alpha: 1.0) + lhs.headerView.addArrangedSubview(titleLabel) lhs.headerView.setCustomSpacing(9, after: titleLabel) if UIDevice.current.userInterfaceIdiom == .pad { eventCellSpacing = 12.0; stackViewSpacing = 15.0; bubbleConstant = 2.0 - locationImageView = UIImageView(image: #imageLiteral(resourceName: "VectorPad")) - timeImageView = UIImageView(image: #imageLiteral(resourceName: "TimePad")) - sponsorImageView = UIImageView(image: #imageLiteral(resourceName: "SponsorPad")) + locationImageView = UIImageView(image: #imageLiteral(resourceName: "Location")) + timeImageView = UIImageView(image: #imageLiteral(resourceName: "SandTimer")) + sponsorImageView = UIImageView(image: #imageLiteral(resourceName: "Sponsor")) lhs.headerView.setCustomSpacing(18, after: titleLabel) } titleLabel.constrain(width: lhs.contentView.frame.width - 120, height: (HILabel.heightForView(text: rhs.name, font: HIAppearance.Font.eventTitle!, width: lhs.contentView.frame.width - 137)) * bubbleConstant) @@ -128,6 +131,7 @@ extension HIEventCell { $0.translatesAutoresizingMaskIntoConstraints = false } let timeLabel = HILabel(style: .time) + timeLabel.textColor = UIColor(red: 0x0D / 255.0, green: 0x3F / 255.0, blue: 0x41 / 255.0, alpha: 1.0) // Set time text to #0D3F41 // We can check for async events by checking if the event start and end time is 1970-01-01 00:00:00 +0000 if rhs.startTime.timeIntervalSince1970 == 0 || rhs.endTime.timeIntervalSince1970 == 0 { timeLabel.text = HIConstants.ASYNC_EVENT_TIME_TEXT @@ -135,24 +139,27 @@ extension HIEventCell { timeLabel.text = Formatter.simpleTime.string(from: rhs.startTime) + " - " + Formatter.simpleTime.string(from: rhs.endTime) } let pointsView = HIView { (view) in - view.layer.cornerRadius = 10.5 * bubbleConstant; view.backgroundHIColor = \.buttonBrown + view.layer.cornerRadius = 10.5 * bubbleConstant; view.backgroundHIColor = \.buttonBlue view.translatesAutoresizingMaskIntoConstraints = false } let eventTypeView = HIView { (view) in - view.layer.cornerRadius = 10.5 * bubbleConstant; view.backgroundHIColor = \.buttonPurple + view.layer.cornerRadius = 10.5 * bubbleConstant; view.backgroundHIColor = \.buttonSienna view.translatesAutoresizingMaskIntoConstraints = false } let proTypeView = HIView { (view) in - view.layer.cornerRadius = 10.5 * bubbleConstant; view.backgroundHIColor = \.proBackground + view.layer.cornerRadius = 10.5 * bubbleConstant; view.backgroundHIColor = \.buttonPro view.translatesAutoresizingMaskIntoConstraints = false } let proLabel = HILabel(style: .pointsText); proLabel.text = "Pro" + proLabel.textColor = .black let pointsLabel = HILabel(style: .pointsText) + pointsLabel.textColor = .black upperContainerView.addSubview(pointsView) pointsView.addSubview(pointsLabel) pointsLabel.constrain(to: pointsView, topInset: 4, trailingInset: -8 * bubbleConstant, bottomInset: -4, leadingInset: 8 * bubbleConstant) pointsLabel.text = "+ \(rhs.points) pts" let typeLabel = HILabel(style: .pointsText) + typeLabel.textColor = .black lhs.headerView.addArrangedSubview(eventTypeView) eventTypeView.addSubview(typeLabel) typeLabel.constrain(to: eventTypeView, topInset: 4, trailingInset: -8, bottomInset: -4, leadingInset: 8) @@ -173,6 +180,7 @@ extension HIEventCell { timeLabel.centerYAnchor.constraint(equalTo: timeImageView.centerYAnchor).isActive = true if !rhs.sponsor.isEmpty { let sponsorLabel = HILabel(style: .sponsor) + sponsorLabel.textColor = UIColor(red: 0x0D / 255.0, green: 0x3F / 255.0, blue: 0x41 / 255.0, alpha: 1.0) // Set location text to #0D3F41 middleContainerView.addSubview(sponsorImageView) middleContainerView.addSubview(sponsorLabel) sponsorImageView.translatesAutoresizingMaskIntoConstraints = false @@ -183,6 +191,8 @@ extension HIEventCell { sponsorLabel.centerYAnchor.constraint(equalTo: sponsorImageView.centerYAnchor).isActive = true } let locationLabel = HILabel(style: .newLocation); locationLabel.text = "Online" + locationLabel.textColor = UIColor(red: 0x0D / 255.0, green: 0x3F / 255.0, blue: 0x41 / 255.0, alpha: 1.0) // Set location text to #0D3F41 + if rhs.locations.count > 0 { locationLabel.text = rhs.locations.map({ ($0 as AnyObject).name }).joined(separator: ", ") } @@ -198,6 +208,7 @@ extension HIEventCell { locationLabel.leadingAnchor.constraint(equalTo: timeLabel.leadingAnchor).isActive = true locationLabel.centerYAnchor.constraint(equalTo: locationImageView.centerYAnchor).isActive = true let descriptionLabel = HILabel(style: .cellDescription) + descriptionLabel.textColor = UIColor(red: 0x0D / 255.0, green: 0x3F / 255.0, blue: 0x41 / 255.0, alpha: 1.0) // Set location text to #0D3F41 descriptionLabel.numberOfLines = 2 descriptionLabel.text = "\(rhs.info)" lhs.contentStackView.addArrangedSubview(descriptionLabel) diff --git a/HackIllinois/UI/TableView/Headers/HIDateHeader.swift b/HackIllinois/UI/TableView/Headers/HIDateHeader.swift index 09d8e5c1..222a8b2d 100644 --- a/HackIllinois/UI/TableView/Headers/HIDateHeader.swift +++ b/HackIllinois/UI/TableView/Headers/HIDateHeader.swift @@ -21,7 +21,7 @@ class HIDateHeader: UITableViewHeaderFooterView { } let dateView = HIView { (view) in view.layer.cornerRadius = 15 - view.backgroundHIColor = \.buttonDarkGreen + view.backgroundHIColor = \.buttonOrange } override init(reuseIdentifier: String?) { diff --git a/HackIllinois/ViewControllers/HIBannerViewController.swift b/HackIllinois/ViewControllers/HIBannerViewController.swift index 66f069dd..45543ddd 100644 --- a/HackIllinois/ViewControllers/HIBannerViewController.swift +++ b/HackIllinois/ViewControllers/HIBannerViewController.swift @@ -42,12 +42,17 @@ extension HIBannerViewController { func bannerView(with label: HILabel) -> UIView { let bannerView = UIView() bannerView.addSubview(label) + + bannerView.widthAnchor.constraint(equalToConstant: 200).isActive = true + label.constrain(to: bannerView, topInset: 0, trailingInset: 0, bottomInset: 0, leadingInset: 0) label.widthAnchor.constraint(equalTo: bannerView.widthAnchor).isActive = true bannerView.layer.cornerRadius = 7.5 bannerView.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner] - bannerView.backgroundColor = bannerBackground.value +// bannerView.backgroundColor = bannerBackground.value + bannerView.backgroundColor = UIColor(red: 224/255, green: 198/255, blue: 159/255, alpha: 1.0) // #E0C69F + return bannerView } diff --git a/HackIllinois/ViewControllers/HICountdownViewController.swift b/HackIllinois/ViewControllers/HICountdownViewController.swift index d17f8843..1d749c18 100644 --- a/HackIllinois/ViewControllers/HICountdownViewController.swift +++ b/HackIllinois/ViewControllers/HICountdownViewController.swift @@ -23,6 +23,8 @@ class HICountdownViewController: UIViewController { // MARK: - Constants private let FRAMES_PER_TICK = 8 + private let customCountdownBackground = UIColor(red: 224/255, green: 198/255, blue: 159/255, alpha: 1.0) // #E0C69F + // MARK: - Properties private let days = HILabel(style: .newCountdown) @@ -93,6 +95,9 @@ extension HICountdownViewController { let countdownStackView = UIStackView() countdownStackView.distribution = .fillEqually + + countdownStackView.spacing = 12 + countdownStackView.translatesAutoresizingMaskIntoConstraints = false view.addSubview(countdownStackView) countdownStackView.topAnchor.constraint(equalTo: view.topAnchor).isActive = true @@ -113,10 +118,19 @@ extension HICountdownViewController { countdownStackView.setCustomSpacing(countdownSpacingConstant, after: hoursContent) countdownStackView.setCustomSpacing(countdownSpacingConstant, after: minutesContent) } + func containerView(with labelString: String, and countDownView: HILabel) -> UIView { - countDownView.backgroundColor <- backgroundHIColor + let containerView = UIView() + + // Create background image view with combined asset + let backgroundImageView = UIImageView(image: #imageLiteral(resourceName: "CountdownPillar")) + backgroundImageView.translatesAutoresizingMaskIntoConstraints = false + backgroundImageView.contentMode = .scaleToFill + + // Set up views + countDownView.backgroundColor = .clear // Since we're using image background countDownView.translatesAutoresizingMaskIntoConstraints = false - + let label = HILabel { $0.textHIColor = \.countdownTextColor $0.backgroundHIColor = \.clear @@ -127,24 +141,39 @@ extension HICountdownViewController { $0.font = HIAppearance.Font.glyph } $0.text = labelString - $0.text } - - let containerView = UIView() + + // Add subviews + containerView.addSubview(backgroundImageView) containerView.addSubview(countDownView) containerView.addSubview(label) - countDownView.centerXAnchor.constraint(equalTo: containerView.centerXAnchor).isActive = true - countDownView.topAnchor.constraint(equalTo: containerView.topAnchor, constant: 4).isActive = true - countDownView.bottomAnchor.constraint(equalTo: label.topAnchor, constant: 4).isActive = true - countDownView.widthAnchor.constraint(equalTo: containerView.widthAnchor, constant: -8).isActive = true - label.widthAnchor.constraint(equalTo: containerView.widthAnchor, constant: -8).isActive = true - label.centerXAnchor.constraint(equalTo: containerView.centerXAnchor).isActive = true - containerView.layer.cornerRadius = 7.5 - containerView.backgroundColor = countdownBackground.value + + // Set up constraints + NSLayoutConstraint.activate([ + + containerView.heightAnchor.constraint(equalToConstant: 150), + containerView.widthAnchor.constraint(equalToConstant: 90), + + // Background image constraints + backgroundImageView.topAnchor.constraint(equalTo: containerView.topAnchor), + backgroundImageView.bottomAnchor.constraint(equalTo: containerView.bottomAnchor), + backgroundImageView.leadingAnchor.constraint(equalTo: containerView.leadingAnchor), + backgroundImageView.trailingAnchor.constraint(equalTo: containerView.trailingAnchor), + + // CountDownView constraints + countDownView.centerXAnchor.constraint(equalTo: containerView.centerXAnchor), + countDownView.topAnchor.constraint(equalTo: containerView.topAnchor, constant: 4), + countDownView.bottomAnchor.constraint(equalTo: label.topAnchor, constant: 4), + countDownView.widthAnchor.constraint(equalTo: containerView.widthAnchor, constant: -8), + + // Label constraints + label.widthAnchor.constraint(equalTo: containerView.widthAnchor, constant: -8), + label.centerXAnchor.constraint(equalTo: containerView.centerXAnchor) + ]) return containerView } - + override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) } diff --git a/HackIllinois/ViewControllers/HIEventDetailViewController.swift b/HackIllinois/ViewControllers/HIEventDetailViewController.swift index 0fbdfa01..2eef3d9e 100644 --- a/HackIllinois/ViewControllers/HIEventDetailViewController.swift +++ b/HackIllinois/ViewControllers/HIEventDetailViewController.swift @@ -40,15 +40,15 @@ class HIEventDetailViewController: HIBaseViewController, UIGestureRecognizerDele } else { view.layer.cornerRadius = 8 } - view.backgroundHIColor = \.buttonPurple + view.backgroundHIColor = \.buttonSienna view.translatesAutoresizingMaskIntoConstraints = false } private let eventTypeLabel = HILabel(style: .eventType) private let sponsorLabel = HILabel(style: .sponsor) - private let timeImageView = UIImageView(image: UIImage(named: "Clock")) + private let timeImageView = UIImageView(image: UIImage(named: "SandTimer")) private let timeLabel = HILabel(style: .description) private let locationLabel = HILabel(style: .location) - private let locationImageView = UIImageView(image: UIImage(named: "LocationSign")) + private let locationImageView = UIImageView(image: UIImage(named: "Location")) private let descriptionLabel = HILabel(style: .detailText) let pointsView = HIView { (view) in if UIDevice.current.userInterfaceIdiom == .pad { @@ -56,7 +56,7 @@ class HIEventDetailViewController: HIBaseViewController, UIGestureRecognizerDele } else { view.layer.cornerRadius = 8 } - view.backgroundHIColor = \.buttonBrown + view.backgroundHIColor = \.buttonBlue view.translatesAutoresizingMaskIntoConstraints = false } private let pointsLabel = HILabel(style: .eventType) @@ -215,6 +215,8 @@ extension HIEventDetailViewController { titleLabel.leadingAnchor.constraint(equalTo: closeButton.leadingAnchor).isActive = true titleLabel.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor, constant: -12).isActive = true titleLabel.topAnchor.constraint(equalTo: upperContainerView.topAnchor).isActive = true + titleLabel.textColor = UIColor(red: 0x6D / 255.0, green: 0x29 / 255.0, blue: 0x1A / 255.0, alpha: 1.0) + } func setupTime() { upperContainerView.addSubview(timeImageView) diff --git a/HackIllinois/ViewControllers/HIHomeViewController.swift b/HackIllinois/ViewControllers/HIHomeViewController.swift index ef5115c2..8251ee65 100644 --- a/HackIllinois/ViewControllers/HIHomeViewController.swift +++ b/HackIllinois/ViewControllers/HIHomeViewController.swift @@ -63,20 +63,28 @@ extension HIHomeViewController { setupRefreshControl() // Initialize the UIImageView - transparentImageView = UIImageView(frame: view.bounds) - transparentImageView.contentMode = .scaleAspectFill + transparentImageView = UIImageView() + transparentImageView.translatesAutoresizingMaskIntoConstraints = false // Enable Auto Layout + transparentImageView.contentMode = .scaleAspectFit transparentImageView.alpha = 0 - +// #imageLiteral(resourceName: "HomeTagsToggle") if UIDevice.current.userInterfaceIdiom == .pad { - transparentImageView.image = UIImage(named: "iPad_Tags_Transparent") + transparentImageView.image = #imageLiteral(resourceName:"HomeTagsToggle1") } else { - transparentImageView.image = UIImage(named: "Home_Tags_Transparent") + transparentImageView.image = #imageLiteral(resourceName:"HomeTagsToggle1") } - // Add the UIImageView to your view hierarchy + + // Add the UIImageView to the view hierarchy view.addSubview(transparentImageView) - view.bringSubviewToFront(transparentImageView) + + // Set Auto Layout constraints for desired size and position + NSLayoutConstraint.activate([ + transparentImageView.centerXAnchor.constraint(equalTo: view.centerXAnchor), + transparentImageView.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor, constant: 60) + ]) } + override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) countdownViewController.startUpCountdown() @@ -112,8 +120,8 @@ extension HIHomeViewController { } countdownFrameView.topAnchor.constraint(equalTo: bannerFrameView.bottomAnchor, constant: 7.5).isActive = true countdownFrameView.centerXAnchor.constraint(equalTo: view.safeAreaLayoutGuide.centerXAnchor).isActive = true - let widthConstant: CGFloat = 329 * countdownFrameConstant - let heightConstant: CGFloat = 263 * countdownFrameConstant + let widthConstant: CGFloat = 280 * countdownFrameConstant + let heightConstant: CGFloat = 220 * countdownFrameConstant countdownFrameView.widthAnchor.constraint(equalToConstant: widthConstant).isActive = true countdownFrameView.heightAnchor.constraint(equalToConstant: heightConstant).isActive = true countdownFrameView.addSubview(countdownViewController.view) @@ -175,54 +183,56 @@ extension HIHomeViewController { let hackEnd = HITimeDataSource.shared.eventTimes.hackEnd let projectShowcaseEnd = HITimeDataSource.shared.eventTimes.projectShowcaseEnd let closingCeremonyEnd = HITimeDataSource.shared.eventTimes.closingCeremonyEnd - + // #imageLitera(resourceName:"HomePage7") + + if now < checkInStart { if UIDevice.current.userInterfaceIdiom == .pad { - backgroundView.image = #imageLiteral(resourceName: "iPad_Home_Start") + backgroundView.image = #imageLiteral(resourceName:"HomePage1") } else { - backgroundView.image = #imageLiteral(resourceName: "Home_Start") + backgroundView.image = #imageLiteral(resourceName:"HomePage1") } } else if now < checkInEnd { if UIDevice.current.userInterfaceIdiom == .pad { - backgroundView.image = #imageLiteral(resourceName: "iPad_Home_1") + backgroundView.image = #imageLiteral(resourceName:"HomePage1") } else { - backgroundView.image = #imageLiteral(resourceName: "Home_1") + backgroundView.image = #imageLiteral(resourceName:"HomePage1") } } else if now < scavengerHuntEnd { if UIDevice.current.userInterfaceIdiom == .pad { - backgroundView.image = #imageLiteral(resourceName: "iPad_Home_2") + backgroundView.image = #imageLiteral(resourceName:"HomePage2") } else { - backgroundView.image = #imageLiteral(resourceName: "Home_2") + backgroundView.image = #imageLiteral(resourceName:"HomePage2") } } else if now < openingCeremonyEnd { if UIDevice.current.userInterfaceIdiom == .pad { - backgroundView.image = #imageLiteral(resourceName: "iPad_Home_3") + backgroundView.image = #imageLiteral(resourceName:"HomePage3") } else { - backgroundView.image = #imageLiteral(resourceName: "Home_3") + backgroundView.image = #imageLiteral(resourceName:"HomePage3") } } else if now < hackEnd { if UIDevice.current.userInterfaceIdiom == .pad { - backgroundView.image = #imageLiteral(resourceName: "iPad_Home_4") + backgroundView.image = #imageLiteral(resourceName:"HomePage4") } else { - backgroundView.image = #imageLiteral(resourceName: "Home_4") + backgroundView.image = #imageLiteral(resourceName:"HomePage4") } } else if now < projectShowcaseEnd { if UIDevice.current.userInterfaceIdiom == .pad { - backgroundView.image = #imageLiteral(resourceName: "iPad_Home_5") + backgroundView.image = #imageLiteral(resourceName:"HomePage5") } else { - backgroundView.image = #imageLiteral(resourceName: "Home_5") + backgroundView.image = #imageLiteral(resourceName:"HomePage5") } } else if now < closingCeremonyEnd { if UIDevice.current.userInterfaceIdiom == .pad { - backgroundView.image = #imageLiteral(resourceName: "iPad_Home_6") + backgroundView.image = #imageLiteral(resourceName:"HomePage6") } else { - backgroundView.image = #imageLiteral(resourceName: "Home_6") + backgroundView.image = #imageLiteral(resourceName:"HomePage6") } } else { if UIDevice.current.userInterfaceIdiom == .pad { - backgroundView.image = #imageLiteral(resourceName: "iPad_Home_Final") + backgroundView.image = #imageLiteral(resourceName:"HomePage7") } else { - backgroundView.image = #imageLiteral(resourceName: "Home_Final") + backgroundView.image = #imageLiteral(resourceName:"HomePage7") } } } diff --git a/HackIllinois/ViewControllers/HIOnboardingViewController.swift b/HackIllinois/ViewControllers/HIOnboardingViewController.swift index fc1db787..0f28e3c6 100644 --- a/HackIllinois/ViewControllers/HIOnboardingViewController.swift +++ b/HackIllinois/ViewControllers/HIOnboardingViewController.swift @@ -29,7 +29,14 @@ class HIOnboardingViewController: HIBaseViewController { $0.backgroundHIColor = \.buttonViewBackground $0.titleHIColor = \.whiteText $0.title = "Get Started" - $0.titleEdgeInsets = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 10) + + if #available(iOS 15.0, *) { + var config = UIButton.Configuration.plain() + config.contentInsets = NSDirectionalEdgeInsets(top: 0, leading: 10, bottom: 0, trailing: 10) + $0.configuration = config + } else { + $0.titleEdgeInsets = UIEdgeInsets(top: 0, left: 10, bottom: 0, right: 10) + } } @objc dynamic override func setUpBackgroundView() { super.setUpBackgroundView() diff --git a/HackIllinois/ViewControllers/HIQRScannerSelection.swift b/HackIllinois/ViewControllers/HIQRScannerSelection.swift index b09e0a5d..8a047e33 100644 --- a/HackIllinois/ViewControllers/HIQRScannerSelection.swift +++ b/HackIllinois/ViewControllers/HIQRScannerSelection.swift @@ -59,7 +59,7 @@ class HIQRScannerSelection: HIBaseViewController { @objc dynamic override func setUpBackgroundView() { super.setUpBackgroundView() if UIDevice.current.userInterfaceIdiom == .pad { - backgroundView.image = #imageLiteral(resourceName: "Pink Background") + backgroundView.image = #imageLiteral(resourceName: "BackgroundShifts") } else { backgroundView.image = #imageLiteral(resourceName: "Staff") } diff --git a/HackIllinois/ViewControllers/HIScheduleViewController.swift b/HackIllinois/ViewControllers/HIScheduleViewController.swift index 70739695..c0982ae1 100644 --- a/HackIllinois/ViewControllers/HIScheduleViewController.swift +++ b/HackIllinois/ViewControllers/HIScheduleViewController.swift @@ -78,9 +78,9 @@ class HIScheduleViewController: HIEventListViewController { @objc dynamic override func setUpBackgroundView() { super.setUpBackgroundView() - backgroundView.image = #imageLiteral(resourceName: "ScheduleBackground") + backgroundView.image = #imageLiteral(resourceName: "Background") if UIDevice.current.userInterfaceIdiom == .pad { - backgroundView.image = #imageLiteral(resourceName: "BackgroundPad") + backgroundView.image = #imageLiteral(resourceName: "Background") } } } @@ -176,7 +176,7 @@ extension HIScheduleViewController { tableView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor).isActive = true tableView.bottomAnchor.constraint(equalTo: view.bottomAnchor).isActive = true tableView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor).isActive = true - tableView.contentInset = UIEdgeInsets(top: 60, left: 0, bottom: 0, right: 0) + tableView.contentInset = UIEdgeInsets(top: 20, left: 0, bottom: 0, right: 0) tableView.scrollIndicatorInsets = UIEdgeInsets(top: 17, left: 0, bottom: 0, right: 0) self.tableView = tableView @@ -206,31 +206,159 @@ extension HIScheduleViewController { let customFontSize = UIDevice.current.userInterfaceIdiom == .pad ? 48 : 24 let customFont = UIFont(name: "MontserratRoman-Bold", size: CGFloat(customFontSize)) - // Create flexible space items to add space to the left - let flexibleSpaceLeft1 = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil) - let flexibleSpaceLeft2 = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil) - let flexibleSpaceLeft3 = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil) - - let scheduleButton = UIBarButtonItem(title: "SCHEDULE", style: .plain, target: self, action: #selector(scheduleButtonTapped(_:))) - scheduleButton.setTitleTextAttributes([NSAttributedString.Key.font: customFont, NSAttributedString.Key.foregroundColor: labelColor], for: .normal) - - // Add the flexible space items and custom button to the leftBarButtonItems array - navigationItem.leftBarButtonItems = [flexibleSpaceLeft1, flexibleSpaceLeft2, flexibleSpaceLeft3, scheduleButton] + let containerView = UIView() + containerView.translatesAutoresizingMaskIntoConstraints = false + + let stackView = UIStackView() + stackView.axis = .horizontal + stackView.alignment = .center + stackView.distribution = .equalSpacing + stackView.spacing = 8 + stackView.translatesAutoresizingMaskIntoConstraints = false + + let scheduleButton = UIButton(type: .system) + scheduleButton.setTitle("SCHEDULE", for: .normal) + scheduleButton.titleLabel?.font = customFont + scheduleButton.addTarget(self, action: #selector(scheduleButtonTapped(_:)), for: .touchUpInside) + + let shiftsButton = UIButton(type: .system) + shiftsButton.setTitle("SHIFTS", for: .normal) + shiftsButton.titleLabel?.font = customFont + shiftsButton.addTarget(self, action: #selector(shiftsButtonTapped(_:)), for: .touchUpInside) + + stackView.addArrangedSubview(scheduleButton) + stackView.addArrangedSubview(shiftsButton) + containerView.addSubview(stackView) + + NSLayoutConstraint.activate([ + stackView.topAnchor.constraint(equalTo: containerView.topAnchor), + stackView.bottomAnchor.constraint(equalTo: containerView.bottomAnchor), + stackView.leadingAnchor.constraint(equalTo: containerView.leadingAnchor, constant: 40), + stackView.trailingAnchor.constraint(equalTo: containerView.trailingAnchor, constant: -40) + ]) + + if let navBarWidth = navigationController?.navigationBar.frame.size.width { + containerView.widthAnchor.constraint(equalToConstant: navBarWidth).isActive = true + } else { + containerView.widthAnchor.constraint(equalToConstant: UIScreen.main.bounds.width).isActive = true + } + containerView.heightAnchor.constraint(equalToConstant: 44).isActive = true + + // Underline View + let underlineView = UIView() + underlineView.translatesAutoresizingMaskIntoConstraints = false + containerView.addSubview(underlineView) + + // Determine which button is active + let activeButton = onlyShifts ? shiftsButton : scheduleButton + let inactiveButton = onlyShifts ? scheduleButton : shiftsButton + + // Style the active button (white text, underlined) + activeButton.setTitleColor(UIColor(red: 1.0, green: 0.956, blue: 0.890, alpha: 1.0), for: .normal) + underlineView.backgroundColor = activeButton.titleColor(for: .normal) + NSLayoutConstraint.activate([ + underlineView.bottomAnchor.constraint(equalTo: containerView.bottomAnchor, constant: -2), + underlineView.heightAnchor.constraint(equalToConstant: 3), + underlineView.centerXAnchor.constraint(equalTo: activeButton.centerXAnchor), + underlineView.widthAnchor.constraint(equalTo: activeButton.widthAnchor, multiplier: 1.1) + ]) + + // Style the inactive button + inactiveButton.setTitleColor(UIColor(red: 0x0A / 255.0, green: 0x3A / 255.0, blue: 0x3C / 255.0, alpha: 1.0), for: .normal) + + navigationItem.titleView = containerView + navigationItem.leftBarButtonItems = nil + navigationItem.rightBarButtonItems = nil + } - // Create flexible space items to add space to the right - let flexibleSpaceRight1 = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil) - let flexibleSpaceRight2 = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil) - // Create custom right bar button item - let customButton = UIBarButtonItem(title: "SHIFTS", style: .plain, target: self, action: #selector(shiftsButtonTapped(_:))) - customButton.setTitleTextAttributes([NSAttributedString.Key.font: customFont, NSAttributedString.Key.foregroundColor: labelColor], for: .normal) + @objc func setScheduleSavedControl() { + let customFontSize = UIDevice.current.userInterfaceIdiom == .pad ? 48 : 24 + let customFont = UIFont(name: "MontserratRoman-Bold", size: CGFloat(customFontSize)) - // Add the flexible space items and custom button to the rightBarButtonItems array - navigationItem.rightBarButtonItems = [flexibleSpaceRight1, flexibleSpaceRight2, customButton] + let container = UIView() + container.translatesAutoresizingMaskIntoConstraints = false + + let stackView = UIStackView() + stackView.axis = .horizontal + stackView.alignment = .center + stackView.distribution = .equalSpacing + stackView.spacing = 8 + stackView.translatesAutoresizingMaskIntoConstraints = false + + let scheduleButton = UIButton(type: .system) + scheduleButton.setTitle("SCHEDULE", for: .normal) + scheduleButton.titleLabel?.font = customFont + scheduleButton.setTitleColor(labelColor, for: .normal) + scheduleButton.addTarget(self, action: #selector(scheduleButtonTappedForNonStaff(_:)), for: .touchUpInside) + + let savedButton = UIButton(type: .system) + savedButton.setTitle("SAVED", for: .normal) + savedButton.titleLabel?.font = customFont + savedButton.setTitleColor(labelColor, for: .normal) + savedButton.addTarget(self, action: #selector(savedButtonTappedForNonStaff(_:)), for: .touchUpInside) + + stackView.addArrangedSubview(scheduleButton) + stackView.addArrangedSubview(savedButton) + container.addSubview(stackView) + + NSLayoutConstraint.activate([ + stackView.topAnchor.constraint(equalTo: container.topAnchor), + stackView.bottomAnchor.constraint(equalTo: container.bottomAnchor), + stackView.leadingAnchor.constraint(equalTo: container.leadingAnchor, constant: 40), + stackView.trailingAnchor.constraint(equalTo: container.trailingAnchor, constant: -40) + ]) + + if let navBarWidth = navigationController?.navigationBar.frame.size.width { + container.widthAnchor.constraint(equalToConstant: navBarWidth).isActive = true + } else { + container.widthAnchor.constraint(equalToConstant: UIScreen.main.bounds.width).isActive = true + } + container.heightAnchor.constraint(equalToConstant: 44).isActive = true + + // Underline View + let underlineView = UIView() + let activeButton = onlyFavorites ? savedButton : scheduleButton + + underlineView.backgroundColor = activeButton.titleColor(for: .normal) + underlineView.translatesAutoresizingMaskIntoConstraints = false + container.addSubview(underlineView) + + NSLayoutConstraint.activate([ + underlineView.bottomAnchor.constraint(equalTo: container.bottomAnchor, constant: -2), + underlineView.heightAnchor.constraint(equalToConstant: 3), + underlineView.centerXAnchor.constraint(equalTo: activeButton.centerXAnchor), + underlineView.widthAnchor.constraint(equalTo: activeButton.widthAnchor, multiplier: 1.1) + ]) + + navigationItem.titleView = container + navigationItem.leftBarButtonItems = nil + navigationItem.rightBarButtonItems = nil + } + + @objc func scheduleButtonTappedForNonStaff(_ sender: UIButton) { + if onlyFavorites { + onlyFavorites = false + backgroundView.image = #imageLiteral(resourceName: "ScheduleBackground") + labelColor = .white + setScheduleSavedControl() + updatePredicate() + animateReload() + } + } - self.navigationItem.leftItemsSupplementBackButton = true + @objc func savedButtonTappedForNonStaff(_ sender: UIButton) { + if !onlyFavorites { + onlyFavorites = true + backgroundView.image = #imageLiteral(resourceName: "ScheduleBackground") + labelColor = .white + setScheduleSavedControl() + updatePredicate() + animateReload() + } } + func removeStaffShiftContainerViews() { // Iterate through all subviews and remove container views for staff shifts for subview in self.view.subviews { @@ -244,7 +372,7 @@ extension HIScheduleViewController { @objc func scheduleButtonTapped(_ sender: UIButton) { if onlyShifts { onlyShifts = false - backgroundView.image = #imageLiteral(resourceName: "PurpleBackground") + backgroundView.image = #imageLiteral(resourceName: "Background") labelColor = .white // Set label color to brown setStaffShiftsControl() // Call removeStaffShiftContainerViews to remove container views for staff shifts @@ -258,7 +386,7 @@ extension HIScheduleViewController { @objc func shiftsButtonTapped(_ sender: UIButton) { if !onlyShifts { onlyShifts = !onlyShifts - backgroundView.image = #imageLiteral(resourceName: "Pink Background") + backgroundView.image = #imageLiteral(resourceName: "BackgroundShifts") hasSelectedShift = true labelColor = #colorLiteral(red: 0.337254902, green: 0.1411764706, blue: 0.06666666667, alpha: 1) // Set label color to brown setStaffShiftsControl() @@ -475,7 +603,7 @@ extension HIScheduleViewController { section < sections.count, let date = Formatter.coreData.date(from: sections[section].name) { header.titleLabel.text = Formatter.simpleTime.string(from: date) - header.titleLabel.textColor <- \.white + header.titleLabel.textColor = #colorLiteral(red: 0.4902, green: 0.2078, blue: 0.1451, alpha: 1) header.titleLabel.textAlignment = .center if UIDevice.current.userInterfaceIdiom == .pad { header.titleLabel.font = HIAppearance.Font.timeIndicator diff --git a/HackIllinois/ViewControllers/HIShiftDetailViewController.swift b/HackIllinois/ViewControllers/HIShiftDetailViewController.swift index d2b0e801..6425b41c 100644 --- a/HackIllinois/ViewControllers/HIShiftDetailViewController.swift +++ b/HackIllinois/ViewControllers/HIShiftDetailViewController.swift @@ -43,7 +43,7 @@ class HIShiftDetailViewController: HIBaseViewController { } else { view.layer.cornerRadius = 8 } - view.backgroundHIColor = \.buttonPurple + view.backgroundHIColor = \.buttonSienna view.translatesAutoresizingMaskIntoConstraints = false } private let eventTypeLabel = HILabel(style: .eventType)