diff --git a/HackIllinois.xcodeproj/project.pbxproj b/HackIllinois.xcodeproj/project.pbxproj index eaa5adaa..c3bf09d0 100644 --- a/HackIllinois.xcodeproj/project.pbxproj +++ b/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 = ""; }; D1D3351A2B81DF0300BBB596 /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = ""; }; D1D3351C2B81E11500BBB596 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; - 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; }; + D758378F2D65B10000B37D10 /* Hack25 Loading 2.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "Hack25 Loading 2.json"; sourceTree = ""; }; D7713B5C2D5FDEA100389128 /* CartItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CartItem.swift; sourceTree = ""; }; DAACDC312D3B8F5E00D15118 /* HIEventListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HIEventListViewController.swift; sourceTree = ""; }; DF3706372925DDAA000B4278 /* GoogleMapsBase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = GoogleMapsBase.framework; sourceTree = ""; }; @@ -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 */, diff --git a/HackIllinois/Assets.xcassets/Image.imageset/Contents.json b/HackIllinois/Assets.xcassets/LoadingBackground.imageset/Contents.json similarity index 67% rename from HackIllinois/Assets.xcassets/Image.imageset/Contents.json rename to HackIllinois/Assets.xcassets/LoadingBackground.imageset/Contents.json index a19a5492..5fed9f5d 100644 --- a/HackIllinois/Assets.xcassets/Image.imageset/Contents.json +++ b/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" } diff --git a/HackIllinois/Assets.xcassets/LoadingBackground.imageset/loading screen (1).png b/HackIllinois/Assets.xcassets/LoadingBackground.imageset/loading screen (1).png new file mode 100644 index 00000000..8dbb9d2f Binary files /dev/null and b/HackIllinois/Assets.xcassets/LoadingBackground.imageset/loading screen (1).png differ diff --git a/HackIllinois/Assets.xcassets/LoadingBackground.imageset/loading screen (2).png b/HackIllinois/Assets.xcassets/LoadingBackground.imageset/loading screen (2).png new file mode 100644 index 00000000..bea86a06 Binary files /dev/null and b/HackIllinois/Assets.xcassets/LoadingBackground.imageset/loading screen (2).png differ diff --git a/HackIllinois/Assets.xcassets/LoadingBackground.imageset/loading screen.png b/HackIllinois/Assets.xcassets/LoadingBackground.imageset/loading screen.png new file mode 100644 index 00000000..390da3b8 Binary files /dev/null and b/HackIllinois/Assets.xcassets/LoadingBackground.imageset/loading screen.png differ diff --git a/HackIllinois/Assets.xcassets/Login.imageset/Contents.json b/HackIllinois/Assets.xcassets/Login.imageset/Contents.json index 2ba90bc1..347e4ba8 100644 --- a/HackIllinois/Assets.xcassets/Login.imageset/Contents.json +++ b/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" } diff --git a/HackIllinois/Assets.xcassets/Login.imageset/Onboarding (1).png b/HackIllinois/Assets.xcassets/Login.imageset/Onboarding (1).png new file mode 100644 index 00000000..a633aeec Binary files /dev/null and b/HackIllinois/Assets.xcassets/Login.imageset/Onboarding (1).png differ diff --git a/HackIllinois/Assets.xcassets/Login.imageset/Onboarding (2).png b/HackIllinois/Assets.xcassets/Login.imageset/Onboarding (2).png new file mode 100644 index 00000000..d1a24ff7 Binary files /dev/null and b/HackIllinois/Assets.xcassets/Login.imageset/Onboarding (2).png differ diff --git a/HackIllinois/Assets.xcassets/Login.imageset/Onboarding.png b/HackIllinois/Assets.xcassets/Login.imageset/Onboarding.png new file mode 100644 index 00000000..795e5dbf Binary files /dev/null and b/HackIllinois/Assets.xcassets/Login.imageset/Onboarding.png differ diff --git a/HackIllinois/Assets.xcassets/Login.imageset/Purple Background-1.png b/HackIllinois/Assets.xcassets/Login.imageset/Purple Background-1.png deleted file mode 100644 index 42189fa4..00000000 Binary files a/HackIllinois/Assets.xcassets/Login.imageset/Purple Background-1.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Login.imageset/Purple Background.png b/HackIllinois/Assets.xcassets/Login.imageset/Purple Background.png deleted file mode 100644 index 66ddcdd7..00000000 Binary files a/HackIllinois/Assets.xcassets/Login.imageset/Purple Background.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Login.imageset/Purple Background@2x.png b/HackIllinois/Assets.xcassets/Login.imageset/Purple Background@2x.png deleted file mode 100644 index a6b01b8f..00000000 Binary files a/HackIllinois/Assets.xcassets/Login.imageset/Purple Background@2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/LoginBackgroundPad.imageset/Background.png b/HackIllinois/Assets.xcassets/LoginBackgroundPad.imageset/Background.png deleted file mode 100644 index 26c85aac..00000000 Binary files a/HackIllinois/Assets.xcassets/LoginBackgroundPad.imageset/Background.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/LoginBackgroundPad.imageset/Background@2x.png b/HackIllinois/Assets.xcassets/LoginBackgroundPad.imageset/Background@2x.png deleted file mode 100644 index 42667729..00000000 Binary files a/HackIllinois/Assets.xcassets/LoginBackgroundPad.imageset/Background@2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/LoginBackgroundPad.imageset/Background@3x.png b/HackIllinois/Assets.xcassets/LoginBackgroundPad.imageset/Background@3x.png deleted file mode 100644 index 02bc7019..00000000 Binary files a/HackIllinois/Assets.xcassets/LoginBackgroundPad.imageset/Background@3x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/LoginBackgroundPhone.imageset/Background.png b/HackIllinois/Assets.xcassets/LoginBackgroundPhone.imageset/Background.png deleted file mode 100644 index 585a105a..00000000 Binary files a/HackIllinois/Assets.xcassets/LoginBackgroundPhone.imageset/Background.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/LoginBackgroundPhone.imageset/Background@2x.png b/HackIllinois/Assets.xcassets/LoginBackgroundPhone.imageset/Background@2x.png deleted file mode 100644 index bc6b1f0f..00000000 Binary files a/HackIllinois/Assets.xcassets/LoginBackgroundPhone.imageset/Background@2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/LoginBackgroundPhone.imageset/Background@3x.png b/HackIllinois/Assets.xcassets/LoginBackgroundPhone.imageset/Background@3x.png deleted file mode 100644 index 1dc3e5d0..00000000 Binary files a/HackIllinois/Assets.xcassets/LoginBackgroundPhone.imageset/Background@3x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/LoginLogo.imageset/Contents.json b/HackIllinois/Assets.xcassets/LoginLogo.imageset/Contents.json index b1752688..6805cd67 100644 --- a/HackIllinois/Assets.xcassets/LoginLogo.imageset/Contents.json +++ b/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" } diff --git a/HackIllinois/Assets.xcassets/LoginLogo.imageset/Group 618 (1).png b/HackIllinois/Assets.xcassets/LoginLogo.imageset/Group 618 (1).png deleted file mode 100644 index 597d5164..00000000 Binary files a/HackIllinois/Assets.xcassets/LoginLogo.imageset/Group 618 (1).png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/LoginLogo.imageset/Group 618 (2).png b/HackIllinois/Assets.xcassets/LoginLogo.imageset/Group 618 (2).png deleted file mode 100644 index 0ef5d523..00000000 Binary files a/HackIllinois/Assets.xcassets/LoginLogo.imageset/Group 618 (2).png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/LoginLogo.imageset/Group 618.png b/HackIllinois/Assets.xcassets/LoginLogo.imageset/Group 618.png deleted file mode 100644 index f5b084b7..00000000 Binary files a/HackIllinois/Assets.xcassets/LoginLogo.imageset/Group 618.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/LoginLogo.imageset/HackIllinois Login Logo (1).png b/HackIllinois/Assets.xcassets/LoginLogo.imageset/HackIllinois Login Logo (1).png new file mode 100644 index 00000000..e17dd68b Binary files /dev/null and b/HackIllinois/Assets.xcassets/LoginLogo.imageset/HackIllinois Login Logo (1).png differ diff --git a/HackIllinois/Assets.xcassets/LoginLogo.imageset/HackIllinois Login Logo (2).png b/HackIllinois/Assets.xcassets/LoginLogo.imageset/HackIllinois Login Logo (2).png new file mode 100644 index 00000000..4d35568d Binary files /dev/null and b/HackIllinois/Assets.xcassets/LoginLogo.imageset/HackIllinois Login Logo (2).png differ diff --git a/HackIllinois/Assets.xcassets/LoginLogo.imageset/HackIllinois Login Logo.png b/HackIllinois/Assets.xcassets/LoginLogo.imageset/HackIllinois Login Logo.png new file mode 100644 index 00000000..a0912f51 Binary files /dev/null and b/HackIllinois/Assets.xcassets/LoginLogo.imageset/HackIllinois Login Logo.png differ diff --git a/HackIllinois/Assets.xcassets/LoginLogoPad.imageset/Contents.json b/HackIllinois/Assets.xcassets/LoginLogoPad.imageset/Contents.json index 39004a94..2593183b 100644 --- a/HackIllinois/Assets.xcassets/LoginLogoPad.imageset/Contents.json +++ b/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" } diff --git a/HackIllinois/Assets.xcassets/LoginLogoPad.imageset/Logo (1).png b/HackIllinois/Assets.xcassets/LoginLogoPad.imageset/Logo (1).png deleted file mode 100644 index 54d736f4..00000000 Binary files a/HackIllinois/Assets.xcassets/LoginLogoPad.imageset/Logo (1).png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/LoginLogoPad.imageset/Logo (2).png b/HackIllinois/Assets.xcassets/LoginLogoPad.imageset/Logo (2).png deleted file mode 100644 index 1c72ebd2..00000000 Binary files a/HackIllinois/Assets.xcassets/LoginLogoPad.imageset/Logo (2).png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/LoginLogoPad.imageset/Logo (3).png b/HackIllinois/Assets.xcassets/LoginLogoPad.imageset/Logo (3).png deleted file mode 100644 index 42e8c8ca..00000000 Binary files a/HackIllinois/Assets.xcassets/LoginLogoPad.imageset/Logo (3).png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/LoginLogoPad.imageset/OnboardingLogo 2x.png b/HackIllinois/Assets.xcassets/LoginLogoPad.imageset/OnboardingLogo 2x.png new file mode 100644 index 00000000..19dc976e Binary files /dev/null and b/HackIllinois/Assets.xcassets/LoginLogoPad.imageset/OnboardingLogo 2x.png differ diff --git a/HackIllinois/Assets.xcassets/LoginLogoPad.imageset/OnboardingLogo 3x.png b/HackIllinois/Assets.xcassets/LoginLogoPad.imageset/OnboardingLogo 3x.png new file mode 100644 index 00000000..fe7a0216 Binary files /dev/null and b/HackIllinois/Assets.xcassets/LoginLogoPad.imageset/OnboardingLogo 3x.png differ diff --git a/HackIllinois/Assets.xcassets/LoginLogoPad.imageset/OnboardingLogo.png b/HackIllinois/Assets.xcassets/LoginLogoPad.imageset/OnboardingLogo.png new file mode 100644 index 00000000..08dc2448 Binary files /dev/null and b/HackIllinois/Assets.xcassets/LoginLogoPad.imageset/OnboardingLogo.png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding0.imageset/Contents.json b/HackIllinois/Assets.xcassets/Onboarding/Onboarding0.imageset/Contents.json index c75069e2..6805cd67 100644 --- a/HackIllinois/Assets.xcassets/Onboarding/Onboarding0.imageset/Contents.json +++ b/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" } diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding0.imageset/HackIllinois Login Logo (1).png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding0.imageset/HackIllinois Login Logo (1).png new file mode 100644 index 00000000..e17dd68b Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/Onboarding0.imageset/HackIllinois Login Logo (1).png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding0.imageset/HackIllinois Login Logo (2).png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding0.imageset/HackIllinois Login Logo (2).png new file mode 100644 index 00000000..4d35568d Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/Onboarding0.imageset/HackIllinois Login Logo (2).png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding0.imageset/HackIllinois Login Logo.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding0.imageset/HackIllinois Login Logo.png new file mode 100644 index 00000000..a0912f51 Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/Onboarding0.imageset/HackIllinois Login Logo.png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding0.imageset/Logo.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding0.imageset/Logo.png deleted file mode 100644 index 6a3dad7b..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/Onboarding0.imageset/Logo.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding0.imageset/Logo@2x.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding0.imageset/Logo@2x.png deleted file mode 100644 index 797658f9..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/Onboarding0.imageset/Logo@2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding0.imageset/Logo@3x.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding0.imageset/Logo@3x.png deleted file mode 100644 index 102323e0..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/Onboarding0.imageset/Logo@3x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding1.imageset/Contents.json b/HackIllinois/Assets.xcassets/Onboarding/Onboarding1.imageset/Contents.json index f86af93d..f571c821 100644 --- a/HackIllinois/Assets.xcassets/Onboarding/Onboarding1.imageset/Contents.json +++ b/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" } diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding1.imageset/FINAL design profile mobile (1).png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding1.imageset/FINAL design profile mobile (1).png new file mode 100644 index 00000000..6177961e Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/Onboarding1.imageset/FINAL design profile mobile (1).png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding1.imageset/FINAL design profile mobile (2).png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding1.imageset/FINAL design profile mobile (2).png new file mode 100644 index 00000000..d3e52e8d Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/Onboarding1.imageset/FINAL design profile mobile (2).png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding1.imageset/FINAL design profile mobile.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding1.imageset/FINAL design profile mobile.png new file mode 100644 index 00000000..8cccdac2 Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/Onboarding1.imageset/FINAL design profile mobile.png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding1.imageset/Rectangle 895.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding1.imageset/Rectangle 895.png deleted file mode 100644 index d3a873e0..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/Onboarding1.imageset/Rectangle 895.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding1.imageset/Rectangle 895@2x.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding1.imageset/Rectangle 895@2x.png deleted file mode 100644 index ceba7c54..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/Onboarding1.imageset/Rectangle 895@2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding1.imageset/Rectangle 895@3x.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding1.imageset/Rectangle 895@3x.png deleted file mode 100644 index ccb3629a..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/Onboarding1.imageset/Rectangle 895@3x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding2.imageset/Contents.json b/HackIllinois/Assets.xcassets/Onboarding/Onboarding2.imageset/Contents.json index f86af93d..89fa0ea6 100644 --- a/HackIllinois/Assets.xcassets/Onboarding/Onboarding2.imageset/Contents.json +++ b/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" } diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding2.imageset/Rectangle 895.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding2.imageset/Rectangle 895.png deleted file mode 100644 index 26fde700..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/Onboarding2.imageset/Rectangle 895.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding2.imageset/Rectangle 895@2x.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding2.imageset/Rectangle 895@2x.png deleted file mode 100644 index dc0d0a0d..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/Onboarding2.imageset/Rectangle 895@2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding2.imageset/Rectangle 895@3x.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding2.imageset/Rectangle 895@3x.png deleted file mode 100644 index 975b50dd..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/Onboarding2.imageset/Rectangle 895@3x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding2.imageset/schedule - attendee (1).png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding2.imageset/schedule - attendee (1).png new file mode 100644 index 00000000..8c09a0dd Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/Onboarding2.imageset/schedule - attendee (1).png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding2.imageset/schedule - attendee (2).png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding2.imageset/schedule - attendee (2).png new file mode 100644 index 00000000..ffbcf9c4 Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/Onboarding2.imageset/schedule - attendee (2).png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding2.imageset/schedule - attendee.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding2.imageset/schedule - attendee.png new file mode 100644 index 00000000..ebe50e6a Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/Onboarding2.imageset/schedule - attendee.png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding3.imageset/Contents.json b/HackIllinois/Assets.xcassets/Onboarding/Onboarding3.imageset/Contents.json index cba15290..c6a1f799 100644 --- a/HackIllinois/Assets.xcassets/Onboarding/Onboarding3.imageset/Contents.json +++ b/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" } diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding3.imageset/Scanner Menu - Attendee (1).png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding3.imageset/Scanner Menu - Attendee (1).png new file mode 100644 index 00000000..73d11a52 Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/Onboarding3.imageset/Scanner Menu - Attendee (1).png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding3.imageset/Scanner Menu - Attendee (2).png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding3.imageset/Scanner Menu - Attendee (2).png new file mode 100644 index 00000000..71eda369 Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/Onboarding3.imageset/Scanner Menu - Attendee (2).png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding3.imageset/Scanner Menu - Attendee.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding3.imageset/Scanner Menu - Attendee.png new file mode 100644 index 00000000..01f8ebda Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/Onboarding3.imageset/Scanner Menu - Attendee.png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding3.imageset/actualqrscreen_screenshot 1.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding3.imageset/actualqrscreen_screenshot 1.png deleted file mode 100644 index e2747346..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/Onboarding3.imageset/actualqrscreen_screenshot 1.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding3.imageset/actualqrscreen_screenshot 1@2x.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding3.imageset/actualqrscreen_screenshot 1@2x.png deleted file mode 100644 index 6294caa5..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/Onboarding3.imageset/actualqrscreen_screenshot 1@2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding3.imageset/actualqrscreen_screenshot 1@3x.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding3.imageset/actualqrscreen_screenshot 1@3x.png deleted file mode 100644 index bc4ed966..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/Onboarding3.imageset/actualqrscreen_screenshot 1@3x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding4.imageset/Contents.json b/HackIllinois/Assets.xcassets/Onboarding/Onboarding4.imageset/Contents.json index f86af93d..fc5d31a4 100644 --- a/HackIllinois/Assets.xcassets/Onboarding/Onboarding4.imageset/Contents.json +++ b/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" } diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding4.imageset/Point Shop - Finalized (1).png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding4.imageset/Point Shop - Finalized (1).png new file mode 100644 index 00000000..3de13016 Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/Onboarding4.imageset/Point Shop - Finalized (1).png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding4.imageset/Point Shop - Finalized (2).png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding4.imageset/Point Shop - Finalized (2).png new file mode 100644 index 00000000..c9f1bd6b Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/Onboarding4.imageset/Point Shop - Finalized (2).png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding4.imageset/Point Shop - Finalized.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding4.imageset/Point Shop - Finalized.png new file mode 100644 index 00000000..fa7bc920 Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/Onboarding4.imageset/Point Shop - Finalized.png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding4.imageset/Rectangle 895.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding4.imageset/Rectangle 895.png deleted file mode 100644 index c5d67d23..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/Onboarding4.imageset/Rectangle 895.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding4.imageset/Rectangle 895@2x.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding4.imageset/Rectangle 895@2x.png deleted file mode 100644 index e65fdd61..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/Onboarding4.imageset/Rectangle 895@2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding4.imageset/Rectangle 895@3x.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding4.imageset/Rectangle 895@3x.png deleted file mode 100644 index 18c92506..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/Onboarding4.imageset/Rectangle 895@3x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding5.imageset/Contents.json b/HackIllinois/Assets.xcassets/Onboarding/Onboarding5.imageset/Contents.json index f86af93d..aba0655a 100644 --- a/HackIllinois/Assets.xcassets/Onboarding/Onboarding5.imageset/Contents.json +++ b/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" } diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding5.imageset/INVENTORY - Finalized (1).png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding5.imageset/INVENTORY - Finalized (1).png new file mode 100644 index 00000000..3d18aba5 Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/Onboarding5.imageset/INVENTORY - Finalized (1).png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding5.imageset/INVENTORY - Finalized (2).png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding5.imageset/INVENTORY - Finalized (2).png new file mode 100644 index 00000000..2177890e Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/Onboarding5.imageset/INVENTORY - Finalized (2).png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding5.imageset/INVENTORY - Finalized.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding5.imageset/INVENTORY - Finalized.png new file mode 100644 index 00000000..1cfa52dd Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/Onboarding5.imageset/INVENTORY - Finalized.png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding5.imageset/Rectangle 895.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding5.imageset/Rectangle 895.png deleted file mode 100644 index b4657b08..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/Onboarding5.imageset/Rectangle 895.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding5.imageset/Rectangle 895@2x.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding5.imageset/Rectangle 895@2x.png deleted file mode 100644 index 53b85ffa..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/Onboarding5.imageset/Rectangle 895@2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding5.imageset/Rectangle 895@3x.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding5.imageset/Rectangle 895@3x.png deleted file mode 100644 index ce8dccb1..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/Onboarding5.imageset/Rectangle 895@3x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/LoginBackgroundPad.imageset/Contents.json b/HackIllinois/Assets.xcassets/Onboarding/Onboarding6.imageset/Contents.json similarity index 63% rename from HackIllinois/Assets.xcassets/LoginBackgroundPad.imageset/Contents.json rename to HackIllinois/Assets.xcassets/Onboarding/Onboarding6.imageset/Contents.json index 58812d2b..c91541b3 100644 --- a/HackIllinois/Assets.xcassets/LoginBackgroundPad.imageset/Contents.json +++ b/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" } diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding6.imageset/INVENTORY QR- Finalized (1).png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding6.imageset/INVENTORY QR- Finalized (1).png new file mode 100644 index 00000000..4cf36693 Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/Onboarding6.imageset/INVENTORY QR- Finalized (1).png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding6.imageset/INVENTORY QR- Finalized (2).png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding6.imageset/INVENTORY QR- Finalized (2).png new file mode 100644 index 00000000..5ef67b3b Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/Onboarding6.imageset/INVENTORY QR- Finalized (2).png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding6.imageset/INVENTORY QR- Finalized.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding6.imageset/INVENTORY QR- Finalized.png new file mode 100644 index 00000000..8d557164 Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/Onboarding6.imageset/INVENTORY QR- Finalized.png differ diff --git a/HackIllinois/Assets.xcassets/LoginBackgroundPhone.imageset/Contents.json b/HackIllinois/Assets.xcassets/Onboarding/Onboarding7.imageset/Contents.json similarity index 61% rename from HackIllinois/Assets.xcassets/LoginBackgroundPhone.imageset/Contents.json rename to HackIllinois/Assets.xcassets/Onboarding/Onboarding7.imageset/Contents.json index 58812d2b..f571c821 100644 --- a/HackIllinois/Assets.xcassets/LoginBackgroundPhone.imageset/Contents.json +++ b/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" } diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding7.imageset/FINAL design profile mobile (1).png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding7.imageset/FINAL design profile mobile (1).png new file mode 100644 index 00000000..1e359dcc Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/Onboarding7.imageset/FINAL design profile mobile (1).png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding7.imageset/FINAL design profile mobile (2).png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding7.imageset/FINAL design profile mobile (2).png new file mode 100644 index 00000000..ad925d9e Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/Onboarding7.imageset/FINAL design profile mobile (2).png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/Onboarding7.imageset/FINAL design profile mobile.png b/HackIllinois/Assets.xcassets/Onboarding/Onboarding7.imageset/FINAL design profile mobile.png new file mode 100644 index 00000000..414c1e1b Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/Onboarding7.imageset/FINAL design profile mobile.png differ diff --git a/HackIllinois/Assets.xcassets/Image 1.imageset/Contents.json b/HackIllinois/Assets.xcassets/Onboarding/OnboardingNext.imageset/Contents.json similarity index 67% rename from HackIllinois/Assets.xcassets/Image 1.imageset/Contents.json rename to HackIllinois/Assets.xcassets/Onboarding/OnboardingNext.imageset/Contents.json index a19a5492..aca6450b 100644 --- a/HackIllinois/Assets.xcassets/Image 1.imageset/Contents.json +++ b/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" } diff --git a/HackIllinois/Assets.xcassets/Onboarding/OnboardingNext.imageset/OnboardingNext 2x.png b/HackIllinois/Assets.xcassets/Onboarding/OnboardingNext.imageset/OnboardingNext 2x.png new file mode 100644 index 00000000..7512cb42 Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/OnboardingNext.imageset/OnboardingNext 2x.png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/OnboardingNext.imageset/OnboardingNext 3x.png b/HackIllinois/Assets.xcassets/Onboarding/OnboardingNext.imageset/OnboardingNext 3x.png new file mode 100644 index 00000000..0b96a0b0 Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/OnboardingNext.imageset/OnboardingNext 3x.png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/OnboardingNext.imageset/OnboardingNext.png b/HackIllinois/Assets.xcassets/Onboarding/OnboardingNext.imageset/OnboardingNext.png new file mode 100644 index 00000000..661d020c Binary files /dev/null and b/HackIllinois/Assets.xcassets/Onboarding/OnboardingNext.imageset/OnboardingNext.png differ diff --git a/HackIllinois/LaunchScreen.storyboard b/HackIllinois/LaunchScreen.storyboard index 75b0ee29..9b2952f7 100644 --- a/HackIllinois/LaunchScreen.storyboard +++ b/HackIllinois/LaunchScreen.storyboard @@ -1,9 +1,8 @@ - - + + - - + @@ -11,10 +10,9 @@ - - + + - @@ -23,7 +21,6 @@ - - + diff --git a/HackIllinois/SwiftUI/HIOnboardingView.swift b/HackIllinois/SwiftUI/HIOnboardingView.swift index 96ba555f..e22508ec 100644 --- a/HackIllinois/SwiftUI/HIOnboardingView.swift +++ b/HackIllinois/SwiftUI/HIOnboardingView.swift @@ -19,40 +19,32 @@ struct HIOnboardingView: View { @StateObject private var viewModel = HIOnboardingViewModel() var body: some View { ZStack { - Image(getBackgroundImageName()) - .resizable() - .ignoresSafeArea() - .zIndex(-1) if viewModel.shouldDisplayAnimationOnNextAppearance { + Image("LoadingBackground") + .resizable() + .ignoresSafeArea() + .frame(width: UIScreen.main.bounds.width, height: UIScreen.main.bounds.height) + .offset(y: -0.5) + .zIndex(-1) VStack { LottieView(shouldDisplayAnimationOnNextAppearance: $viewModel.shouldDisplayAnimationOnNextAppearance) + .ignoresSafeArea() } } else { + Image("Login") + .resizable() + .ignoresSafeArea() + .frame(width: UIScreen.main.bounds.width, height: UIScreen.main.bounds.height) + .offset(y: -0.5) + .zIndex(-1) VStack { HICarouselSwiftUIView(carouselData: viewModel.data) - Button { - NotificationCenter.default.post(name: .getStarted, object: nil) - }label: { - Text("GET STARTED") - .font(.title2.bold()) - .tracking(2) -// .onAppear { -// print("This screen height is \(UIScreen.main.bounds.height)") -// } - } - .padding() - .font(.title3.bold()) - .frame(width: 215, height: 40) - .foregroundColor(.white) - .background(Color.clear) - .overlay(RoundedRectangle(cornerRadius: 50) - .stroke(.white, lineWidth: 3)) - .padding(.top, 20) - .padding(.bottom, UIScreen.main.bounds.height < 750 ? 10 : 75) Spacer() } + .padding(.bottom, 30 * (UIScreen.main.bounds.height/852)) } } + .ignoresSafeArea(.all) } func getBackgroundImageName() -> String { @@ -69,7 +61,7 @@ struct LottieView: UIViewRepresentable { @Binding var shouldDisplayAnimationOnNextAppearance: Bool func makeUIView(context: UIViewRepresentableContext) -> UIView { let view = UIView(frame: .zero) - let animationView = LottieAnimationView(name: "Hack_Mushroom_Loading") + let animationView = LottieAnimationView(name: "Hack25 Loading 2") animationView.contentMode = .scaleAspectFit animationView.frame = view.frame animationView.autoresizingMask = [.flexibleWidth, .flexibleHeight] diff --git a/HackIllinois/SwiftUI/HIOnboardingViewModel.swift b/HackIllinois/SwiftUI/HIOnboardingViewModel.swift index 97b45e9a..48c88fd4 100644 --- a/HackIllinois/SwiftUI/HIOnboardingViewModel.swift +++ b/HackIllinois/SwiftUI/HIOnboardingViewModel.swift @@ -22,11 +22,13 @@ class HIOnboardingViewModel: ObservableObject { 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!"), + CarouselData(image: UIImage(named: "Onboarding1"), titleText: "Overview", descriptionText: "View the hackathon’s major events and how much time is left to hack!"), CarouselData(image: UIImage(named: "Onboarding2"), titleText: "Schedule", descriptionText: "See the times and details of all of our events."), - CarouselData(image: UIImage(named: "Onboarding3"), titleText: "Scanner", descriptionText: "Scan QR codes to obtain points and redeem items from the point shop."), - CarouselData(image: UIImage(named: "Onboarding4"), titleText: "Profile", descriptionText: "View your QR code, food wave, and other personal information."), - CarouselData(image: UIImage(named: "Onboarding5"), titleText: "Point Shop", descriptionText: "View the available prizes you can redeem using your earned coins!") + CarouselData(image: UIImage(named: "Onboarding3"), titleText: "Check-In", descriptionText: "Quickly scan QR code to check in to events and earn points!"), + CarouselData(image: UIImage(named: "Onboarding4"), titleText: "Point Shop", descriptionText: "View the available prizes you can redeem using your earned coins!"), + CarouselData(image: UIImage(named: "Onboarding5"), titleText: "Cart", descriptionText: "Modify your prize inventory before redemption."), + CarouselData(image: UIImage(named: "Onboarding6"), titleText: "Scanner", descriptionText: "Scan QR codes and redeem items from the point shop."), + CarouselData(image: UIImage(named: "Onboarding7"), titleText: "Profile", descriptionText: "View your QR code, food wave and other personal information.") ] @Published var shouldDisplayAnimationOnNextAppearance = true } diff --git a/HackIllinois/SwiftUI/UI/HICarouselSwiftUIView.swift b/HackIllinois/SwiftUI/UI/HICarouselSwiftUIView.swift index 9dea11ef..1ac6044b 100644 --- a/HackIllinois/SwiftUI/UI/HICarouselSwiftUIView.swift +++ b/HackIllinois/SwiftUI/UI/HICarouselSwiftUIView.swift @@ -22,36 +22,83 @@ struct CarouselData: Hashable { struct HICarouselSwiftUIView: View { var carouselData: [CarouselData] @State private var currentIndex = 0 + let resizeFactor = [(UIScreen.main.bounds.width/428), (UIScreen.main.bounds.height/926)] + var body: some View { - VStack { - Spacer() - TabView(selection: $currentIndex) { - ForEach(0.. 2 { //After "- OR -" cell roles cell.titleLabel.text = HIAPI.AuthService.OAuthProvider.all[indexPath.row - 2].displayName cell.defaultColor = .clear cell.titleLabel.layer.borderColor = (\HIAppearance.loginDefault).value.cgColor - cell.activeTextColor = (\HIAppearance.loginDefault).value + cell.defaultTextColor = .black + cell.activeTextColor = .black } - cell.defaultTextColor = (\HIAppearance.attendeeText).value cell.backgroundColor = .clear cell.contentView.backgroundColor = .clear cell.titleLabel.layer.cornerRadius = cell.frame.height*(3/8) diff --git a/HackIllinois/ViewControllers/HIOnboardingViewController.swift b/HackIllinois/ViewControllers/HIOnboardingViewController.swift index 0f28e3c6..11328460 100644 --- a/HackIllinois/ViewControllers/HIOnboardingViewController.swift +++ b/HackIllinois/ViewControllers/HIOnboardingViewController.swift @@ -73,7 +73,7 @@ extension HIOnboardingViewController { let viewAlphaValue = shouldDisplayAnimationOnNextAppearance ? 0.0 : 1.0 carouselView?.alpha = CGFloat(viewAlphaValue) - getStartedButton.alpha = CGFloat(viewAlphaValue) +// getStartedButton.alpha = CGFloat(viewAlphaValue) } override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) @@ -92,7 +92,7 @@ extension HIOnboardingViewController { animationView.play { _ in // Smooth out background transition into login page - UIView.animate(withDuration: 1.0, animations: {self.animationView.alpha = 0.0; self.carouselView?.alpha = 1.0; self.getStartedButton.alpha = 1.0}, + UIView.animate(withDuration: 1.0, animations: {self.animationView.alpha = 0.0; self.carouselView?.alpha = 1.0}, completion: { _ in self.animationView.removeFromSuperview() }) @@ -109,20 +109,20 @@ extension HIOnboardingViewController { private extension HIOnboardingViewController { func setupUI() { - getStartedButton.addTarget(self, action: #selector(didSelectGetStarted(_:)), for: .touchUpInside) - view.addSubview(getStartedButton) - getStartedButton.translatesAutoresizingMaskIntoConstraints = false - getStartedButton.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: 0).isActive = true - getStartedButton.heightAnchor.constraint(equalToConstant: 50).isActive = true - getStartedButton.widthAnchor.constraint(equalTo: view.widthAnchor, multiplier: 0.6).isActive = true - getStartedButton.centerXAnchor.constraint(equalTo: view.centerXAnchor).isActive = true +// getStartedButton.addTarget(self, action: #selector(didSelectGetStarted(_:)), for: .touchUpInside) +// view.addSubview(getStartedButton) +// getStartedButton.translatesAutoresizingMaskIntoConstraints = false +// getStartedButton.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: 0).isActive = true +// getStartedButton.heightAnchor.constraint(equalToConstant: 50).isActive = true +// getStartedButton.widthAnchor.constraint(equalTo: view.widthAnchor, multiplier: 0.6).isActive = true +// getStartedButton.centerXAnchor.constraint(equalTo: view.centerXAnchor).isActive = true guard let carouselView = carouselView else { return } view.addSubview(carouselView) carouselView.translatesAutoresizingMaskIntoConstraints = false carouselView.topAnchor.constraint(equalTo: view.topAnchor, constant: 20).isActive = true carouselView.leftAnchor.constraint(equalTo: view.leftAnchor).isActive = true carouselView.rightAnchor.constraint(equalTo: view.rightAnchor).isActive = true - carouselView.bottomAnchor.constraint(equalTo: getStartedButton.topAnchor).isActive = true +// carouselView.bottomAnchor.constraint(equalTo: getStartedButton.topAnchor).isActive = true } }