merge conflict

HackIllinois/Assets.xcassets/TabBarIcons/HomeSelected.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "HomeSelected@1x.png",
+      "filename" : "Group 977.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "HomeSelected@2x.png",
+      "filename" : "Group 977 (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "HomeSelected@3x.png",
+      "filename" : "Group 977 (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/TabBarIcons/LeaderboardSelected.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "LeaderboardSelected@1x.png",
+      "filename" : "Group 978.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "LeaderboardSelected@2x.png",
+      "filename" : "Group 978 (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "LeaderboardSelected@3x.png",
+      "filename" : "Group 978 (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/TabBarIcons/ProfileSelected.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "ProfileSelected@1x.png",
+      "filename" : "Group 977 (3).png",
       "idiom" : "universal",
       "scale" : "1x"
     },

HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "qr-code.png",
+      "filename" : "Camera.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "qr-code2x.png",
+      "filename" : "Camera (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "qr-code3x.png",
+      "filename" : "Camera (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "qr-code.png",
+      "filename" : "Camera.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "qr-code2x.png",
+      "filename" : "Camera (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "qr-code3x.png",
+      "filename" : "Camera (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "ScheduleSelected@1x.png",
+      "filename" : "Group 979.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "ScheduleSelected@2x.png",
+      "filename" : "Group 979 (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "ScheduleSelected@3x.png",
+      "filename" : "Group 979 (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/TabBarIcons/home.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "home@1x.png",
+      "filename" : "Battle.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "home@2x.png",
+      "filename" : "Battle (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "home@3x.png",
+      "filename" : "Battle (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "leaderboard@1x.png",
+      "filename" : "image.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "leaderboard@2x.png",
+      "filename" : "image (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "leaderboard@3x.png",
+      "filename" : "image (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/TabBarIcons/profile.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "profile@1x.png",
+      "filename" : "image (3).png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "profile@2x.png",
+      "filename" : "image (4).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "profile@3x.png",
+      "filename" : "image (5).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "schedule@1x.png",
+      "filename" : "Group 974.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "schedule@2x.png",
+      "filename" : "Group 974 (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "schedule@3x.png",
+      "filename" : "Group 974 (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/TabBarIcons/shop.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "PointShopIcon1x.png",
+      "filename" : "image.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "PointShopIcon2x.png",
+      "filename" : "image (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "PointShopIcon3x.png",
+      "filename" : "image (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/TabBarIcons/shopSelected.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "shop1x.png",
+      "filename" : "Group 978.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "shop2x.png",
+      "filename" : "Group 978 (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "shop3x.png",
+      "filename" : "Group 978 (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/DataSources/HITimeDataSource.swift

@@ -18,21 +18,21 @@ final class HITimeDataSource {
     static var shared = HITimeDataSource()
 
     public static let defaultTimes = EventTimes(
-        checkInStart: Date(timeIntervalSince1970: 1708723800), // Friday, February 23, 2024 3:30:00 PM CST
-        checkInEnd: Date(timeIntervalSince1970: 1708725600), // Friday, February 23, 2024 4:00:00 PM CST
-        scavengerHuntStart: Date(timeIntervalSince1970: 1708725600), // Friday, February 23, 2024 4:00:00 PM CST
-        scavengerHuntEnd: Date(timeIntervalSince1970: 1708732800), // Friday, February 23, 2024 6:00:00 PM CST
-        openingCeremonyStart: Date(timeIntervalSince1970: 1708732800), // Friday, February 23, 2024 6:00:00 PM CST
-        openingCeremonyEnd: Date(timeIntervalSince1970: 1708736400), // Friday, February 23, 2024 7:00:00 PM CST
-        projectShowcaseStart: Date(timeIntervalSince1970: 1708880400), // Sunday, February 25, 2024 11:00:00 AM CST
-        projectShowcaseEnd: Date(timeIntervalSince1970: 1708894800), // Sunday, February 25, 2024 3:00:00 PM CST
-        closingCeremonyStart: Date(timeIntervalSince1970: 1708894800), // Sunday, February 25, 2024 3:00:00 PM CST
-        closingCeremonyEnd: Date(timeIntervalSince1970: 1708898400), // Sunday, February 25, 2024 4:00:00 PM CST
-
-        eventStart: Date(timeIntervalSince1970: 1708732800), // Friday, February 23, 2024 6:00:00 PM CST
-        eventEnd: Date(timeIntervalSince1970: 1708898400), // Sunday, February 25, 2024 4:00:00 PM CST
-        hackStart: Date(timeIntervalSince1970: 1708736400), // Friday, February 23, 2024 7:00:00 PM CST
-        hackEnd: Date(timeIntervalSince1970: 1708876800), // Sunday, February 25, 2024 10:00:00 AM CST
+        checkInStart: Date(timeIntervalSince1970: 1740774600), // Friday, February 28, 2025 2:30:00 PM CST
+        checkInEnd: Date(timeIntervalSince1970: 1740783600), // Friday, February 28, 2025 5:00:00 PM CST
+        scavengerHuntStart: Date(timeIntervalSince1970: 1740776400), // Friday, February 28, 2024 3:00:00 PM CST
+        scavengerHuntEnd: Date(timeIntervalSince1970: 1740783600), // Friday, February 28, 2025 5:00:00 PM CST
+        openingCeremonyStart: Date(timeIntervalSince1970: 1740783600), // Friday, February 28, 2025 5:00:00 PM CST
+        openingCeremonyEnd: Date(timeIntervalSince1970: 1740787200), // Friday, February 28, 2025 6:00:00 PM CST
+        projectShowcaseStart: Date(timeIntervalSince1970: 1740927600), // Sunday, March 2, 2025 9:00:00 AM CST
+        projectShowcaseEnd: Date(timeIntervalSince1970: 1740942000), // Sunday, March 2, 2025 1:00:00 PM CST
+        closingCeremonyStart: Date(timeIntervalSince1970: 1740949200), // Sunday, March 2, 2025 3:00:00 PM CST
+        closingCeremonyEnd: Date(timeIntervalSince1970: 1740952800), // Sunday, March 2, 2025 4:00:00 PM CST
+               
+        eventStart: Date(timeIntervalSince1970: 1740774600), // Friday, February 28, 2025 2:30:00 PM CST
+        eventEnd: Date(timeIntervalSince1970: 1740952800), // Sunday, March 2, 2025 4:00:00 PM CST
+        hackStart: Date(timeIntervalSince1970: 1740787200), // Friday, February 28, 2025 6:00:00 PM CST
+        hackEnd: Date(timeIntervalSince1970: 1740920400), // Sunday, March 2, 2025 7:00:00 AM CST
         // TODO: Need to get events + times for everything above
         fridayStart: Date(timeIntervalSince1970: 1740722400), // Friday, February 28, 2025 12:00:00 AM CST
         fridayEnd: Date(timeIntervalSince1970: 1740808799), // Friday, February 28, 2025 11:59:59 PM CST

HackIllinois/FlowControllers/HITabBarController.swift

@@ -1,3 +1,4 @@
+
 //
 //  HITabBarController.swift
 //  HackIllinois
@@ -71,8 +72,8 @@ class HITabBarController: UITabBarController {
         let qrScannerPopupButton = UIButton()
         view.addSubview(qrScannerPopupButton)
         qrScannerPopupButton.translatesAutoresizingMaskIntoConstraints = false
-        qrScannerPopupButton.frame.size = CGSize(width: 54, height: 54)
-        qrScannerPopupButton.layer.cornerRadius = 28
+        qrScannerPopupButton.frame.size = CGSize(width: 75, height: 75)
+        qrScannerPopupButton.layer.cornerRadius = 38
         qrScannerPopupButton.center = CGPoint(x: view.center.x, y: 0)
         if self.selectedViewController is HIQRScannerSelection {
             qrScannerPopupButton.backgroundColor = (\HIAppearance.greenCodePopupTab).value
@@ -83,16 +84,16 @@ class HITabBarController: UITabBarController {
         qrScannerPopupButton.imageView?.contentMode = .scaleAspectFill
 
         // Button Shadow
-        qrScannerPopupButton.layer.shadowColor = UIColor(red: 0, green: 0, blue: 0, alpha: 0.25).cgColor
+        qrScannerPopupButton.layer.shadowColor = UIColor(red: 0, green: 0, blue: 0, alpha: 0.45).cgColor
         qrScannerPopupButton.layer.shadowOpacity = 1
-        qrScannerPopupButton.layer.shadowRadius = 15
+        qrScannerPopupButton.layer.shadowRadius = 20
         qrScannerPopupButton.layer.masksToBounds = false
         qrScannerPopupButton.layer.shadowOffset = CGSize(width: 0, height: 0)
 
         //QR Scanner PopupButton Constraints
         qrScannerPopupButton.centerXAnchor.constraint(equalTo: view.centerXAnchor).isActive = true
         qrScannerPopupButton.centerYAnchor.constraint(equalTo: tabBar.topAnchor, constant: 0).isActive = true
-        qrScannerPopupButton.constrain(width: 54, height: 54)
+        qrScannerPopupButton.constrain(width: 75, height: 75)
 
         //QR Scanner PopupAction
         qrScannerPopupButton.addTarget(self, action: #selector(qrScannerPopupButtonPressed(_:)), for: .touchUpInside)
@@ -123,7 +124,7 @@ class HITabBarController: UITabBarController {
     }
 
     func createPath() -> CGPath {
-        let radius: CGFloat = 32.0
+        let radius: CGFloat = 43.0
         let smallRadius: CGFloat = 8.0
         let path = UIBezierPath()
 
@@ -190,3 +191,6 @@ class HITabBarController: UITabBarController {
         }
     }
 }
+
+
+