Quick UI Fixes (#574)

* minor ui adjustments on points shop page

* minor ui adjustments on point shop & home pg

* more ui fixes on home and schedule page

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

HackIllinois/Assets.xcassets/Big Selected Bookmark.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "Big Selected Bookmark 1x.png",
+      "filename" : "bookmarkPad1x.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Big Selected Bookmark 2x.png",
+      "filename" : "bookmarkPad2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Big Selected Bookmark 3x.png",
+      "filename" : "bookmarkPad3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/Big Unselected Bookmark.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "Big Unselected Bookmark 1x.png",
+      "filename" : "bookmarkPadUnselected1x.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Big Unselected Bookmark 2x.png",
+      "filename" : "bookmarkPadUnselected2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Big Unselected Bookmark 3x.png",
+      "filename" : "bookmarkPadUnselected3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

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

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "Group 293.png",
+      "filename" : "coin.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Group 294.png",
+      "filename" : "coin2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Group 295.png",
+      "filename" : "coin3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

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/Assets.xcassets/TabBarIcons/shop.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "PointShopIcon1x.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "PointShopIcon2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "PointShopIcon3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

HackIllinois/Assets.xcassets/TabBarIcons/shopSelected.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "shop1x.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "shop2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "shop3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

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/UI/TableView/Cells/HIBubbleCell/HIEventCell.swift

@@ -26,8 +26,8 @@ class HIEventCell: HIBubbleCell {
         $0.activeImage = #imageLiteral(resourceName: "Selected Bookmark")
         $0.baseImage = #imageLiteral(resourceName: "Unselected Bookmark")
         if UIDevice.current.userInterfaceIdiom == .pad {
-            $0.activeImage = #imageLiteral(resourceName: "FavoritedPad")
-            $0.baseImage = #imageLiteral(resourceName: "UnFavoritedPad")
+            $0.activeImage = #imageLiteral(resourceName: "Big Selected Bookmark")
+            $0.baseImage = #imageLiteral(resourceName: "Big Unselected Bookmark")
         }
     }
     var headerView = UIStackView()

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/HIHomeViewController.swift

@@ -89,7 +89,9 @@ extension HIHomeViewController {
         view.addSubview(legendButton)
 
         if UIDevice.current.userInterfaceIdiom != .pad {
-            legendButton.constrain(width: 20, height: 20)
+            legendButton.constrain(width: 25, height: 25)
+        } else {
+            legendButton.constrain(width: 50, height: 50)
         }
 
         legendButton.translatesAutoresizingMaskIntoConstraints = false

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

HackIllinois/ViewControllers/HIPointsShopSwiftUIView.swift

@@ -40,18 +40,18 @@ struct HIPointShopSwiftUIView: View {
                         }
                         .padding(.horizontal, 11)
                         .padding(.vertical, 3)
-                        .background(Color(red: 0.05, green: 0.25, blue: 0.25).opacity(0.5))
+                        .background(Color(red: 0.1647, green: 0.1647, blue: 0.1647))
                         .cornerRadius(1000)
                         .frame(maxWidth: .infinity, alignment: .trailing)
-                        .offset(y: -35)
-
+                        .offset(y: -38)
                         Spacer()
                     }
                     Image("KnickKnacks")
                         .resizable()
-                        .frame(width: isIpad ? 590 : 370, height:isIpad ? 191 :  120)
-                    Spacer()
-                        .frame(height:50)
+                        .frame(width: isIpad ? 590 : 355, height:isIpad ? 185 :  105)
+                        .offset(y: -25)
+                    //Spacer()
+                        //.frame(height: 10)
                     VStack(spacing: 0) {
                         CustomTopTabBar(tabIndex: $tabIndex)
                         ScrollView(showsIndicators: false) {
@@ -64,7 +64,7 @@ struct HIPointShopSwiftUIView: View {
                                     }
                                     Rectangle()
                                         .foregroundColor(.clear)
-                                        .frame(width: isIpad ? 600 : 380, height: 10)
+                                        .frame(width: UIScreen.main.bounds.width > 850 ? 800 : (isIpad ? 700 : 360), height: 10)
                                         .background(Color(red: 0.4, green: 0.17, blue: 0.07))
                                         .cornerRadius(1)
                                 }
@@ -82,7 +82,7 @@ struct HIPointShopSwiftUIView: View {
                                     }
                                     Rectangle()
                                         .foregroundColor(.clear)
-                                        .frame(width: isIpad ? 600 : 380, height: 10)
+                                        .frame(width: UIScreen.main.bounds.width > 850 ? 800 : (isIpad ? 700 : 360), height: 10)
                                         .background(Color(red: 0.4, green: 0.17, blue: 0.07))
                                         .cornerRadius(1)
                                 }
@@ -139,18 +139,20 @@ struct PointShopItemCell: View {
             //brown bar
             Rectangle()
                 .foregroundColor(.clear)
-                .frame(width: isIpad ? 600 : 380, height: 10)//TODO: Change width
+                .frame(width: UIScreen.main.bounds.width > 850 ? 800 : (isIpad ? 700 : 360), height: 10)
+                //.frame(width: isIpad ? 600 : 360, height: 10)//TODO: Change width
                 .background(Color(red: 0.4, green: 0.17, blue: 0.07))
                 .cornerRadius(1)
             //transparent pane
             ZStack {
                 Rectangle()
                     .fill(.white)
-                    .frame(width: isIpad ? 590 : 370, height: 157)//TODO: Change width
+                    .frame(width: UIScreen.main.bounds.width > 850 ? 790 : (isIpad ? 690 : 350), height: 157)
+                    //.frame(width: isIpad ? 590 : 350, height: 157)//TODO: Change width
                     .opacity(0.4)
                 HStack {
                     Spacer()
-                        .frame(width:isIpad ? 120 : 50)
+                        .frame(width: UIScreen.main.bounds.width > 850 ? 210 : (isIpad ? 120 : 30))
                     //IMAGE
                         Image(systemName: "Profile0")
                             .data(url: URL(string: item.imageURL)!)
@@ -162,23 +164,28 @@ struct PointShopItemCell: View {
                     //bubble-thing
                     VStack {
                         HStack{
+                            Spacer()
+                                .frame(width:15)
                             Text(item.name)
                                 .font(
                                     Font.custom("Montserrat", size: 16)
                                         .weight(.semibold)
                                 )
                                 .foregroundColor(Color(red: 0.05, green: 0.25, blue: 0.25))
-                            //                            .frame(width: 130, height: 24)
                                 .multilineTextAlignment(.center)
                                 .lineLimit(nil)
-                            Spacer()
-                                .frame(width:20)
+                                .fixedSize(horizontal: false, vertical: true)
+                                .frame(maxWidth: .infinity)
+                                .padding(.trailing, 20)
+
+                            /*Spacer()
+                                .frame(width:20)*/
                         }
 
                         HStack(alignment: .center, spacing: 7) {
                             Image("Coin")
                                 .resizable()
-                                .frame(width:25, height: 25)
+                                .frame(width: 25, height: 25)
                             if(item.isRaffle) {
                                 Text("\(item.price)")
                                     .font(Font.custom("Montserrat", size: 16).weight(.bold))
@@ -193,8 +200,6 @@ struct PointShopItemCell: View {
                                         .foregroundColor(.white)
                                 }
                             }
-//                            Spacer()
-//                                .frame(width:20)
 
                         }
                         .padding(.horizontal, 11)
@@ -238,12 +243,14 @@ struct TabBarButton: View {
             if isSelected {
                 Rectangle()
                     .fill(Color(red: 0.85, green: 0.25, blue: 0.47))
-                    .frame(width:  isIpad ? 250: 170, height: isIpad ? 90: 50)//190
+                    .frame(width: UIScreen.main.bounds.width > 850 ? 350 : (isIpad ? 295 : 155), height: isIpad ? 90: 50)
+                    //.frame(width:  isIpad ? 250: 155, height: isIpad ? 90: 50)//190
                     .cornerRadius(10, corners: [.topLeft, .topRight])
             }else{
                 Rectangle()
                     .fill(Color(red: 0.85, green: 0.25, blue: 0.47))
-                    .frame(width:  isIpad ? 250: 170, height: isIpad ? 90: 50)//190
+                    .frame(width: UIScreen.main.bounds.width > 850 ? 350 : (isIpad ? 295 : 155), height: isIpad ? 90: 50)
+                    //.frame(width:  isIpad ? 250: 155, height: isIpad ? 90: 50)//190
                     .cornerRadius(10, corners: [.topLeft, .topRight])
                     .opacity(0)
             }

HackIllinois/ViewControllers/HIPointsShopViewController.swift

@@ -21,7 +21,7 @@ class HIPointsShopViewController: HIBaseViewController {
 // MARK: - UITabBarItem Setup
 extension HIPointsShopViewController {
     override func setupTabBarItem() {
-        tabBarItem = UITabBarItem(title: "", image: #imageLiteral(resourceName: "leaderboard"), selectedImage: #imageLiteral(resourceName: "LeaderboardSelected"))
+        tabBarItem = UITabBarItem(title: "", image: #imageLiteral(resourceName: "shop"), selectedImage: #imageLiteral(resourceName: "shopSelected"))
     }
 }