diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/Contents.json b/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/Contents.json index ac23c5af..b8de64aa 100644 --- a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/Contents.json +++ b/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/Contents.json @@ -6,12 +6,12 @@ "scale" : "1x" }, { - "filename" : "qr-code-1.png", + "filename" : "qr-code2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "qr-code-2.png", + "filename" : "qr-code3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code-1.png b/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code-1.png deleted file mode 100644 index 1a883f1a..00000000 Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code-1.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code-2.png b/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code-2.png deleted file mode 100644 index 4ba70613..00000000 Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code-2.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code.png b/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code.png index 354a305b..41eb86d2 100644 Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code.png and b/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code.png differ diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code2x.png b/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code2x.png new file mode 100644 index 00000000..6c825d07 Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code2x.png differ diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code3x.png b/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code3x.png new file mode 100644 index 00000000..fd0aa8cd Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code3x.png differ diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/Contents.json b/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/Contents.json index ca999c92..5a90aa61 100644 --- a/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/Contents.json +++ b/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "qr-code@1x.png", + "filename" : "qr-code.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "qr-code@2x.png", + "filename" : "qr-code2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "qr-code@3x.png", + "filename" : "qr-code3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code.png b/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code.png new file mode 100644 index 00000000..41eb86d2 Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code.png differ diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code2x.png b/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code2x.png new file mode 100644 index 00000000..6c825d07 Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code2x.png differ diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code3x.png b/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code3x.png new file mode 100644 index 00000000..fd0aa8cd Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code3x.png differ diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code@1x.png b/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code@1x.png deleted file mode 100644 index 4ba70613..00000000 Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code@1x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code@2x.png b/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code@2x.png deleted file mode 100644 index 1a883f1a..00000000 Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code@2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code@3x.png b/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code@3x.png deleted file mode 100644 index 354a305b..00000000 Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code@3x.png and /dev/null differ diff --git a/HackIllinois/LaunchScreen.storyboard b/HackIllinois/LaunchScreen.storyboard index b99e7b45..75b0ee29 100644 --- a/HackIllinois/LaunchScreen.storyboard +++ b/HackIllinois/LaunchScreen.storyboard @@ -1,9 +1,9 @@ - + - + @@ -14,6 +14,7 @@ + @@ -23,5 +24,6 @@ + diff --git a/HackIllinois/UI/HIAppearance.swift b/HackIllinois/UI/HIAppearance.swift index 6bf6f14f..6f5098a5 100644 --- a/HackIllinois/UI/HIAppearance.swift +++ b/HackIllinois/UI/HIAppearance.swift @@ -100,7 +100,7 @@ struct HIAppearance: Equatable { private static let mediumOrange = #colorLiteral(red: 0.9764705882, green: 0.5843137255, blue: 0.3411764706, alpha: 1) private static let darkBlue = #colorLiteral(red: 0.05098039216, green: 0.2196078431, blue: 0.4862745098, alpha: 1) private static let magenta = #colorLiteral(red: 0.9960784314, green: 0.4392156863, blue: 0.5960784314, alpha: 1) - private static let darkBlueGreeen = #colorLiteral(red: 0.03137254902, green: 0.5450980392, blue: 0.7568627451, alpha: 1) + private static let darkBlueGreen = #colorLiteral(red: 0.03137254902, green: 0.5450980392, blue: 0.7568627451, alpha: 1) private static let vegetarian = #colorLiteral(red: 0.2156862745, green: 0.8705882353, blue: 0.8039215686, alpha: 1) private static let vegan = #colorLiteral(red: 0.9882352941, green: 0.862745098, blue: 0.5607843137, alpha: 1) private static let glutenfree = #colorLiteral(red: 0.9764705882, green: 0.5843137255, blue: 0.3411764706, alpha: 1) @@ -166,7 +166,7 @@ struct HIAppearance: Equatable { overlay: #colorLiteral(red: 0.05882352941, green: 0.07058823529, blue: 0.1803921569, alpha: 0.33), frostedTint: #colorLiteral(red: 0, green: 0.3411764706, blue: 0.462745098, alpha: 0.6), codePopupTab: white, - greenCodePopupTab: darkGreen, + greenCodePopupTab: darkestGreen, navbarBackground: darkGreen, navbarTabTint: white, profileContainerTint: yellowWhite, @@ -187,7 +187,7 @@ struct HIAppearance: Equatable { buttonPurple: indigo, buttonDarkBlue: darkBlue, buttonMagenta: magenta, - buttonDarkBlueGreen: darkBlueGreeen, + buttonDarkBlueGreen: darkBlueGreen, buttonDarkGreen: darkGreen, favoriteStarBackground: yellowWhite, segmentedBackground: white, @@ -238,7 +238,7 @@ struct HIAppearance: Equatable { overlay: #colorLiteral(red: 0.05882352941, green: 0.07058823529, blue: 0.1803921569, alpha: 0.33), frostedTint: #colorLiteral(red: 0, green: 0.3411764706, blue: 0.462745098, alpha: 0.6), codePopupTab: white, - greenCodePopupTab: darkGreen, + greenCodePopupTab: darkestGreen, navbarBackground: darkGreen, navbarTabTint: white, profileContainerTint: yellowWhite, @@ -259,7 +259,7 @@ struct HIAppearance: Equatable { buttonPurple: indigo, buttonDarkBlue: darkBlue, buttonMagenta: magenta, - buttonDarkBlueGreen: darkBlueGreeen, + buttonDarkBlueGreen: darkBlueGreen, buttonDarkGreen: darkGreen, favoriteStarBackground: yellowWhite, segmentedBackground: white, diff --git a/HackIllinois/ViewControllers/HIBaseViewController.swift b/HackIllinois/ViewControllers/HIBaseViewController.swift index 0f3aba91..9cb4e213 100644 --- a/HackIllinois/ViewControllers/HIBaseViewController.swift +++ b/HackIllinois/ViewControllers/HIBaseViewController.swift @@ -52,7 +52,11 @@ extension HIBaseViewController { extension HIBaseViewController { @objc dynamic func setUpBackgroundView() { view.layer.backgroundColor = UIColor.clear.cgColor - backgroundView.image = #imageLiteral(resourceName: "Home_Start") + if UIDevice.current.userInterfaceIdiom == .pad { + backgroundView.image = UIImage(named: "LoginBackgroundPadNew") + } else { + backgroundView.image = UIImage(named: "Login") + } backgroundView.translatesAutoresizingMaskIntoConstraints = false backgroundView.isUserInteractionEnabled = true backgroundView.contentMode = .scaleAspectFill diff --git a/HackIllinois/ViewControllers/HIOnboardingViewController.swift b/HackIllinois/ViewControllers/HIOnboardingViewController.swift index 07e0bb1d..fc1db787 100644 --- a/HackIllinois/ViewControllers/HIOnboardingViewController.swift +++ b/HackIllinois/ViewControllers/HIOnboardingViewController.swift @@ -35,7 +35,7 @@ class HIOnboardingViewController: HIBaseViewController { super.setUpBackgroundView() if UIDevice.current.userInterfaceIdiom == .pad { - backgroundView.image = #imageLiteral(resourceName: "iPadLogin") + backgroundView.image = UIImage(named: "LoginBackgroundPadNew") } else { backgroundView.image = #imageLiteral(resourceName: "Login") }