Merge pull request #561 from HackIllinois/ishaan/home-page-ipad

added ipad designs
HackIllinois · Jan 11, 2024 · be42af2 · be42af2
2 parents 44275b8 + bb85851
commit be42af2
Show file tree

Hide file tree

Showing 39 changed files with 278 additions and 50 deletions.
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_1.imageset/Contents.json b/HackIllinois/Assets.xcassets/Home/iPad_Home_1.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Home.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_1.imageset/Home.png b/HackIllinois/Assets.xcassets/Home/iPad_Home_1.imageset/Home.png
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_1.imageset/[email protected] b/HackIllinois/Assets.xcassets/Home/iPad_Home_1.imageset/[email protected]
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_1.imageset/[email protected] b/HackIllinois/Assets.xcassets/Home/iPad_Home_1.imageset/[email protected]
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_2.imageset/Contents.json b/HackIllinois/Assets.xcassets/Home/iPad_Home_2.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "iPad_Home_2.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_2.imageset/iPad_Home_2.png b/HackIllinois/Assets.xcassets/Home/iPad_Home_2.imageset/iPad_Home_2.png
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_2.imageset/[email protected] b/HackIllinois/Assets.xcassets/Home/iPad_Home_2.imageset/[email protected]
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_2.imageset/[email protected] b/HackIllinois/Assets.xcassets/Home/iPad_Home_2.imageset/[email protected]
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_3.imageset/Contents.json b/HackIllinois/Assets.xcassets/Home/iPad_Home_3.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "iPad_Home_3.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_3.imageset/iPad_Home_3.png b/HackIllinois/Assets.xcassets/Home/iPad_Home_3.imageset/iPad_Home_3.png
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_3.imageset/[email protected] b/HackIllinois/Assets.xcassets/Home/iPad_Home_3.imageset/[email protected]
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_3.imageset/[email protected] b/HackIllinois/Assets.xcassets/Home/iPad_Home_3.imageset/[email protected]
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_4.imageset/Contents.json b/HackIllinois/Assets.xcassets/Home/iPad_Home_4.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "iPad_Home_4.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_4.imageset/iPad_Home_4.png b/HackIllinois/Assets.xcassets/Home/iPad_Home_4.imageset/iPad_Home_4.png
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_4.imageset/[email protected] b/HackIllinois/Assets.xcassets/Home/iPad_Home_4.imageset/[email protected]
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_4.imageset/[email protected] b/HackIllinois/Assets.xcassets/Home/iPad_Home_4.imageset/[email protected]
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_5.imageset/Contents.json b/HackIllinois/Assets.xcassets/Home/iPad_Home_5.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "iPad_Home_5.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_5.imageset/iPad_Home_5.png b/HackIllinois/Assets.xcassets/Home/iPad_Home_5.imageset/iPad_Home_5.png
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_5.imageset/[email protected] b/HackIllinois/Assets.xcassets/Home/iPad_Home_5.imageset/[email protected]
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_5.imageset/[email protected] b/HackIllinois/Assets.xcassets/Home/iPad_Home_5.imageset/[email protected]
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_6.imageset/Contents.json b/HackIllinois/Assets.xcassets/Home/iPad_Home_6.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "iPad_Home_6.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_6.imageset/iPad_Home_6.png b/HackIllinois/Assets.xcassets/Home/iPad_Home_6.imageset/iPad_Home_6.png
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_6.imageset/[email protected] b/HackIllinois/Assets.xcassets/Home/iPad_Home_6.imageset/[email protected]
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_6.imageset/[email protected] b/HackIllinois/Assets.xcassets/Home/iPad_Home_6.imageset/[email protected]
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_Final.imageset/Contents.json b/HackIllinois/Assets.xcassets/Home/iPad_Home_Final.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "iPad_Home_Final.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_Final.imageset/iPad_Home_Final.png b/HackIllinois/Assets.xcassets/Home/iPad_Home_Final.imageset/iPad_Home_Final.png
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_Final.imageset/[email protected] b/HackIllinois/Assets.xcassets/Home/iPad_Home_Final.imageset/[email protected]
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_Final.imageset/[email protected] b/HackIllinois/Assets.xcassets/Home/iPad_Home_Final.imageset/[email protected]
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_Start.imageset/Contents.json b/HackIllinois/Assets.xcassets/Home/iPad_Home_Start.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "iPad_Home_Start.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_Start.imageset/iPad_Home_Start.png b/HackIllinois/Assets.xcassets/Home/iPad_Home_Start.imageset/iPad_Home_Start.png
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_Start.imageset/[email protected] b/HackIllinois/Assets.xcassets/Home/iPad_Home_Start.imageset/[email protected]
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Home_Start.imageset/[email protected] b/HackIllinois/Assets.xcassets/Home/iPad_Home_Start.imageset/[email protected]
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Tags_Transparent.imageset/Contents.json b/HackIllinois/Assets.xcassets/Home/iPad_Tags_Transparent.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "iPad Tags.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "iPad [email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "iPad [email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Tags_Transparent.imageset/iPad Tags.png b/HackIllinois/Assets.xcassets/Home/iPad_Tags_Transparent.imageset/iPad Tags.png
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Tags_Transparent.imageset/iPad [email protected] b/HackIllinois/Assets.xcassets/Home/iPad_Tags_Transparent.imageset/iPad [email protected]
diff --git a/HackIllinois/Assets.xcassets/Home/iPad_Tags_Transparent.imageset/iPad [email protected] b/HackIllinois/Assets.xcassets/Home/iPad_Tags_Transparent.imageset/iPad [email protected]
diff --git a/HackIllinois/UI/HIAppearance.swift b/HackIllinois/UI/HIAppearance.swift
@@ -354,6 +354,7 @@ struct HIAppearance: Equatable {
         // Home page countdown fonts
 //        static let newCountdownText = UIFont(name: "MontserratRoman-Bold", size: 48) // Hack 2023
         static let newCountdownText = UIFont(name: "MontserratRoman-Bold", size: 42) // Hack 2024
+        static let newCountdownTextPad = UIFont(name: "MontserratRoman-Bold", size: 56) // Hack 2024
         static let countdownText = UIFont(name: "MontserratRoman-Bold", size: 25)
 
         // Onboarding fonts

diff --git a/HackIllinois/UI/HILabel.swift b/HackIllinois/UI/HILabel.swift
@@ -80,7 +80,11 @@ class HILabel: UILabel {
         case .newCountdown:
             textHIColor = \.countdownTextColor
             backgroundHIColor = \.countdownBackground
-            font = HIAppearance.Font.newCountdownText
+            if UIDevice.current.userInterfaceIdiom == .pad {
+                font = HIAppearance.Font.newCountdownTextPad
+            } else {
+                font = HIAppearance.Font.newCountdownText
+            }
 
         case .location:
             textHIColor = \.baseText