Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added onboarding ipad designs #562

Merged
merged 1 commit into from
Jan 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
23 changes: 23 additions & 0 deletions HackIllinois/Assets.xcassets/iPadLogin.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -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
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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"
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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"
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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"
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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
}
}
10 changes: 5 additions & 5 deletions HackIllinois/SwiftUI/HIOnboardingViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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!"),
Expand Down
18 changes: 11 additions & 7 deletions HackIllinois/ViewControllers/HIOnboardingViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
}

Expand All @@ -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!"))
Expand Down
Loading