Pulled updates from dev

HackIllinois/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "iPad Spotlight 40pt @1x 1.png",
+      "filename" : "iPhone Notifications 20pt @2x.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "20x20"
@@ -13,19 +13,19 @@
       "size" : "20x20"
     },
     {
-      "filename" : "29.png",
+      "filename" : "iPhone Settings 29x29pt @1x.png",
       "idiom" : "iphone",
       "scale" : "1x",
       "size" : "29x29"
     },
     {
-      "filename" : "iPhone Settings 29x29pt @2x (2).png",
+      "filename" : "iPhone Settings 29x29pt @2x.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
-      "filename" : "iPhone Settings 29x29pt @ 3x (1).png",
+      "filename" : "iPhone Settings 29x29pt @ 3x.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "29x29"
@@ -79,7 +79,7 @@
       "size" : "20x20"
     },
     {
-      "filename" : "29 1.png",
+      "filename" : "iPad Settings 29pt @1x.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "29x29"
@@ -139,13 +139,13 @@
       "size" : "76x76"
     },
     {
-      "filename" : "iPad Pro (12.9in) App 83.5pt @ 2x (1).png",
+      "filename" : "iPad Pro (12.9in) App 83.5pt @ 2x.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "83.5x83.5"
     },
     {
-      "filename" : "App Store iOS (1).png",
+      "filename" : "App Store iOS.png",
       "idiom" : "ios-marketing",
       "scale" : "1x",
       "size" : "1024x1024"

HackIllinois/Assets.xcassets/iPadLogin.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "iPad Pro 11_ - 1.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "iPad Pro 11_ - [email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "iPad Pro 11_ - [email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding2.imageset/Contents.json → HackIllinois/Assets.xcassets/iPadOnboarding1.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "Group 12.png",
+      "filename" : "homepage_ipad 1.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Group 12@2x.png",
+      "filename" : "homepage_ipad 1@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Group 12@3x.png",
+      "filename" : "homepage_ipad 1@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding3.imageset/Contents.json → HackIllinois/Assets.xcassets/iPadOnboarding2.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "Group 11.png",
+      "filename" : "schedule_ipad 1.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Group 11@2x.png",
+      "filename" : "schedule_ipad 1@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Group 11@3x.png",
+      "filename" : "schedule_ipad 1@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding0.imageset/Contents.json → HackIllinois/Assets.xcassets/iPadOnboarding3.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "Group 8.png",
+      "filename" : "scanqr_ipad 2.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Group 8@2x.png",
+      "filename" : "scanqr_ipad 2@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Group 8@3x.png",
+      "filename" : "scanqr_ipad 2@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding1.imageset/Contents.json → HackIllinois/Assets.xcassets/iPadOnboarding4.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "Group 9.png",
+      "filename" : "Profile_ipad 2.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Group 9@2x.png",
+      "filename" : "Profile_ipad 2@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Group 9@3x.png",
+      "filename" : "Profile_ipad 2@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/iPadOnboarding5.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "pointshop_ipad 2.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "pointshop_ipad [email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "pointshop_ipad [email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

HackIllinois/SwiftUI/HIOnboardingViewModel.swift

@@ -15,11 +15,11 @@ import SwiftUI
 class HIOnboardingViewModel: ObservableObject {
     @Published var data: [CarouselData] = UIDevice.current.userInterfaceIdiom == .pad ? [
         CarouselData(image: #imageLiteral(resourceName: "Onboarding0"), titleText: "Welcome", descriptionText: "Swipe to see what our app has to offer!"),
-        CarouselData(image: UIImage(named: "iPadOnboarding0"), titleText: "Countdown", descriptionText: "See how much time you have left to hack!"),
-        CarouselData(image: UIImage(named: "iPadOnboarding1"), titleText: "Schedule", descriptionText: "See the times and details of all of our events."),
-        CarouselData(image: UIImage(named: "iPadOnboarding2"), titleText: "Scanner", descriptionText: "Scan QR codes to obtain points and redeem items from the point shop."),
-        CarouselData(image: UIImage(named: "iPadOnboarding3"), titleText: "Profile", descriptionText: "View your QR code, food wave, and other personal information."),
-        CarouselData(image: UIImage(named: "iPadOnboarding4"), titleText: "Point Shop", descriptionText: "View the available prizes you can redeem using your earned coins!")
+        CarouselData(image: UIImage(named: "iPadOnboarding1"), titleText: "Countdown", descriptionText: "See how much time you have left to hack!"),
+        CarouselData(image: UIImage(named: "iPadOnboarding2"), titleText: "Schedule", descriptionText: "See the times and details of all of our events."),
+        CarouselData(image: UIImage(named: "iPadOnboarding3"), titleText: "Scanner", descriptionText: "Scan QR codes to obtain points and redeem items from the point shop."),
+        CarouselData(image: UIImage(named: "iPadOnboarding4"), titleText: "Profile", descriptionText: "View your QR code, food wave, and other personal information."),
+        CarouselData(image: UIImage(named: "iPadOnboarding5"), titleText: "Point Shop", descriptionText: "View the available prizes you can redeem using your earned coins!")
     ] : [
         CarouselData(image: #imageLiteral(resourceName: "Onboarding0"), titleText: "Welcome", descriptionText: "Swipe to see what our app has to offer!"),
         CarouselData(image: UIImage(named: "Onboarding1"), titleText: "Countdown", descriptionText: "See how much time you have left to hack!"),

HackIllinois/ViewControllers/HIOnboardingViewController.swift

@@ -33,7 +33,12 @@ class HIOnboardingViewController: HIBaseViewController {
     }
     @objc dynamic override func setUpBackgroundView() {
         super.setUpBackgroundView()
-        backgroundView.image = #imageLiteral(resourceName: "Login")
+
+        if UIDevice.current.userInterfaceIdiom == .pad {
+            backgroundView.image = #imageLiteral(resourceName: "iPadLogin")
+        } else {
+            backgroundView.image = #imageLiteral(resourceName: "Login")
+        }
     }
 }
 
@@ -44,12 +49,11 @@ extension HIOnboardingViewController {
         carouselView = HICarouselView(pages: 6)
         if UIDevice.current.userInterfaceIdiom == .pad {
             carouselData.append(.init(image: #imageLiteral(resourceName: "Onboarding0"), titleText: "Welcome", descriptionText: "Swipe to see what our app has to offer!"))
-            carouselData.append(.init(image: UIImage(named: "iPadOnboarding0"), titleText: "Countdown", descriptionText: "See how much time you have left to hack!"))
-            carouselData.append(.init(image: UIImage(named: "iPadOnboarding1"), titleText: "Schedule", descriptionText: "See the times and details of all of our events."))
-            carouselData.append(.init(image: UIImage(named: "iPadOnboarding2"), titleText: "Scanner", descriptionText: "Scan QR codes to obtain points and redeem items from the point shop."))
-            carouselData.append(.init(image: UIImage(named: "iPadOnboarding3"), titleText: "Profile", descriptionText: "View your QR code, food wave, and other personal information."))
-            carouselData.append(.init(image: UIImage(named: "iPadOnboarding4"), titleText: "Point Shop",
-                                          descriptionText: "View the available prizes you can redeem using your earned coins!"))
+            carouselData.append(.init(image: UIImage(named: "iPadOnboarding1"), titleText: "Countdown", descriptionText: "See how much time you have left to hack!"))
+            carouselData.append(.init(image: UIImage(named: "iPadOnboarding2"), titleText: "Schedule", descriptionText: "See the times and details of all of our events."))
+            carouselData.append(.init(image: UIImage(named: "iPadOnboarding3"), titleText: "Scanner", descriptionText: "Scan QR codes to obtain points and redeem items from the point shop."))
+            carouselData.append(.init(image: UIImage(named: "iPadOnboarding4"), titleText: "Profile", descriptionText: "View your QR code, food wave, and other personal information."))
+            carouselData.append(.init(image: UIImage(named: "iPadOnboarding5"), titleText: "Point Shop", descriptionText: "View the available prizes you can redeem using your earned coins!"))
         } else {
             carouselData.append(.init(image: #imageLiteral(resourceName: "Onboarding0"), titleText: "Welcome", descriptionText: "Swipe to see what our app has to offer!"))
             carouselData.append(.init(image: UIImage(named: "Onboarding1"), titleText: "Countdown", descriptionText: "See how much time you have left to hack!"))

Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "iPhone Settings 29x29pt @1x.png",
+      "filename" : "iPhone Settings 29x29pt @2x.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "29x29"
@@ -49,7 +49,7 @@
       "size" : "1024x1024"
     },
     {
-      "filename" : "Messages 27x20pt @2x (3).png",
+      "filename" : "Messages 27x20pt @2x.png",
       "idiom" : "universal",
       "platform" : "ios",
       "scale" : "2x",