added UI fixes: launchscreen change for iPad, qr code tab color, and …

…others

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"
     }

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"
     }

HackIllinois/LaunchScreen.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<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"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -14,6 +14,7 @@
                     <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"/>
                         <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,5 +24,6 @@
     </scenes>
     <resources>
         <image name="Login" width="390" height="844"/>
+        <image name="iPadLogin" width="512" height="683"/>
     </resources>
 </document>

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,

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

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")
         }