Anushka/onboarding

HackIllinois.xcodeproj/project.pbxproj

@@ -153,9 +153,9 @@
 		D1D3351D2B81E11500BBB596 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = D1D3351C2B81E11500BBB596 /* GoogleService-Info.plist */; };
 		D1D3351E2B81E11500BBB596 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = D1D3351C2B81E11500BBB596 /* GoogleService-Info.plist */; };
 		D1D3351F2B81E11500BBB596 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = D1D3351C2B81E11500BBB596 /* GoogleService-Info.plist */; };
-		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 */; };
+		D75837902D65B10000B37D10 /* Hack25 Loading 2.json in Resources */ = {isa = PBXBuildFile; fileRef = D758378F2D65B10000B37D10 /* Hack25 Loading 2.json */; };
 		D7713B5D2D5FDEAA00389128 /* CartItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7713B5C2D5FDEA100389128 /* CartItem.swift */; };
 		DAACDC322D3B8F5E00D15118 /* HIEventListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAACDC312D3B8F5E00D15118 /* HIEventListViewController.swift */; };
 		DF3706382925DDAA000B4278 /* GoogleMapsBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF3706372925DDAA000B4278 /* GoogleMapsBase.framework */; };
@@ -373,9 +373,9 @@
 		D1D335182B81DEF600BBB596 /* Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notification.swift; sourceTree = "<group>"; };
 		D1D3351A2B81DF0300BBB596 /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = "<group>"; };
 		D1D3351C2B81E11500BBB596 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
-		D1F146392B605C57004E7FC9 /* Hack_Mushroom_Loading.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = Hack_Mushroom_Loading.json; sourceTree = "<group>"; };
 		D3A309BA221116A600CBA351 /* HackIllinois.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = HackIllinois.entitlements; sourceTree = "<group>"; };
 		D3A309BB2211175200CBA351 /* PassKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PassKit.framework; path = System/Library/Frameworks/PassKit.framework; sourceTree = SDKROOT; };
+		D758378F2D65B10000B37D10 /* Hack25 Loading 2.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "Hack25 Loading 2.json"; sourceTree = "<group>"; };
 		D7713B5C2D5FDEA100389128 /* CartItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CartItem.swift; sourceTree = "<group>"; };
 		DAACDC312D3B8F5E00D15118 /* HIEventListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HIEventListViewController.swift; sourceTree = "<group>"; };
 		DF3706372925DDAA000B4278 /* GoogleMapsBase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = GoogleMapsBase.framework; sourceTree = "<group>"; };
@@ -842,7 +842,7 @@
 		E1E4A5D5291C9BF700780BA1 /* UI */ = {
 			isa = PBXGroup;
 			children = (
-				D1F146392B605C57004E7FC9 /* Hack_Mushroom_Loading.json */,
+				D758378F2D65B10000B37D10 /* Hack25 Loading 2.json */,
 				E1E4A5D6291C9BF700780BA1 /* HICarouselSwiftUIView.swift */,
 			);
 			path = UI;
@@ -1022,8 +1022,8 @@
 				1C7561A3278E96600004D739 /* DarkVespaText.json in Resources */,
 				951827A91EA35DB800049F79 /* Assets.xcassets in Resources */,
 				952D1542220D453D0041383A /* countdown-60.json in Resources */,
-				D1F1463A2B605C57004E7FC9 /* Hack_Mushroom_Loading.json in Resources */,
 				951827B41EA35E8B00049F79 /* LaunchScreen.storyboard in Resources */,
+				D75837902D65B10000B37D10 /* Hack25 Loading 2.json in Resources */,
 				1C7561A5278E96750004D739 /* LightVespaText.json in Resources */,
 				D134D30F296B3F56006EA589 /* Montserrat-VariableFont_wght.ttf in Resources */,
 				D1D3351D2B81E11500BBB596 /* GoogleService-Info.plist in Resources */,

HackIllinois/Assets.xcassets/Image.imageset/Contents.json → HackIllinois/Assets.xcassets/LoadingBackground.imageset/Contents.json

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

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

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

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

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

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

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

HackIllinois/Assets.xcassets/Onboarding/Onboarding0.imageset/Contents.json

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

HackIllinois/Assets.xcassets/Onboarding/Onboarding1.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "Rectangle 895.png",
+      "filename" : "FINAL design profile mobile.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Rectangle 895@2x.png",
+      "filename" : "FINAL design profile mobile (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Rectangle 895@3x.png",
+      "filename" : "FINAL design profile mobile (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/Onboarding/Onboarding2.imageset/Contents.json

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

HackIllinois/Assets.xcassets/Onboarding/Onboarding3.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "actualqrscreen_screenshot 1.png",
+      "filename" : "Scanner Menu - Attendee.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "actualqrscreen_screenshot 1@2x.png",
+      "filename" : "Scanner Menu - Attendee (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "actualqrscreen_screenshot 1@3x.png",
+      "filename" : "Scanner Menu - Attendee (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/Onboarding/Onboarding4.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "Rectangle 895.png",
+      "filename" : "Point Shop - Finalized.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Rectangle 895@2x.png",
+      "filename" : "Point Shop - Finalized (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Rectangle 895@3x.png",
+      "filename" : "Point Shop - Finalized (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/Onboarding/Onboarding5.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "Rectangle 895.png",
+      "filename" : "INVENTORY - Finalized.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Rectangle 895@2x.png",
+      "filename" : "INVENTORY - Finalized (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Rectangle 895@3x.png",
+      "filename" : "INVENTORY - Finalized (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/LoginBackgroundPad.imageset/Contents.json → HackIllinois/Assets.xcassets/Onboarding/Onboarding6.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "Background.png",
+      "filename" : "INVENTORY QR- Finalized.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Background@2x.png",
+      "filename" : "INVENTORY QR- Finalized (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Background@3x.png",
+      "filename" : "INVENTORY QR- Finalized (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/LoginBackgroundPhone.imageset/Contents.json → HackIllinois/Assets.xcassets/Onboarding/Onboarding7.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "Background.png",
+      "filename" : "FINAL design profile mobile.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Background@2x.png",
+      "filename" : "FINAL design profile mobile (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Background@3x.png",
+      "filename" : "FINAL design profile mobile (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/Image 1.imageset/Contents.json → HackIllinois/Assets.xcassets/Onboarding/OnboardingNext.imageset/Contents.json

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

HackIllinois/LaunchScreen.storyboard

@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <device id="retina4_7" orientation="portrait" appearance="light"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina6_5" orientation="portrait" appearance="light"/>
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
         <scene sceneID="EHf-IW-A2E">
             <objects>
                 <viewController id="01J-lp-oVM" sceneMemberID="viewController">
-                    <imageView key="view" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Login" id="pHM-yB-ysD">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                    <imageView key="view" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LoadingBackground" id="bqw-zM-W9v">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <variation key="heightClass=regular-widthClass=regular" image="iPadLogin"/>
                     </imageView>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -23,7 +21,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="Login" width="390" height="844"/>
-        <image name="iPadLogin" width="512" height="683"/>
+        <image name="LoadingBackground" width="393" height="852.33331298828125"/>
     </resources>
 </document>