Anushka/homepage update

HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/Contents.json

@@ -6,12 +6,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "FINAL design profile mobile- initial start@2x.png",
+      "filename" : "FINAL design profile mobile- initial start (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "FINAL design profile mobile- initial start@3x.png",
+      "filename" : "FINAL design profile mobile- initial start (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/Contents.json

@@ -6,12 +6,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "FINAL design profile mobile- initial start@2x.png",
+      "filename" : "FINAL design profile mobile- initial start (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "FINAL design profile mobile- initial start@3x.png",
+      "filename" : "FINAL design profile mobile- initial start (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/Contents.json

@@ -6,12 +6,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "FINAL design profile mobile- initial start@2x.png",
+      "filename" : "FINAL design profile mobile- initial start (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "FINAL design profile mobile- initial start@3x.png",
+      "filename" : "FINAL design profile mobile- initial start (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/Contents.json

@@ -6,12 +6,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "FINAL design profile mobile- initial start@2x.png",
+      "filename" : "FINAL design profile mobile- initial start (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "FINAL design profile mobile- initial start@3x.png",
+      "filename" : "FINAL design profile mobile- initial start (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/Contents.json

@@ -6,12 +6,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "FINAL design profile mobile- initial start@2x.png",
+      "filename" : "FINAL design profile mobile- initial start (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "FINAL design profile mobile- initial start@3x.png",
+      "filename" : "FINAL design profile mobile- initial start (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/Contents.json

@@ -6,12 +6,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "FINAL design profile mobile- initial start@2x.png",
+      "filename" : "FINAL design profile mobile- initial start (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "FINAL design profile mobile- initial start@3x.png",
+      "filename" : "FINAL design profile mobile- initial start (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/Contents.json

@@ -6,12 +6,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "FINAL design profile mobile@2x.png",
+      "filename" : "FINAL design profile mobile (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "FINAL design profile mobile@3x.png",
+      "filename" : "FINAL design profile mobile (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

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

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "FINAL design profile mobile- initial start.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "FINAL design profile mobile- initial start (1).png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "FINAL design profile mobile- initial start (2).png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

HackIllinois/UI/HILabel.swift

@@ -84,7 +84,7 @@ class HILabel: UILabel {
             if UIDevice.current.userInterfaceIdiom == .pad {
                 font = HIAppearance.Font.newCountdownTextPad
             } else {
-                font = HIAppearance.Font.newCountdownText
+                font = UIFont(name: "MontserratRoman-Bold", size: 30)
             }
 
         case .location:

HackIllinois/ViewControllers/HICountdownViewController.swift

@@ -127,7 +127,7 @@ extension HICountdownViewController {
         backgroundImageView.translatesAutoresizingMaskIntoConstraints = false
         backgroundImageView.contentMode = .scaleToFill
 
-        // Set up views
+        // Set up countdown view
         countDownView.backgroundColor = .clear  // Since we're using image background
         countDownView.translatesAutoresizingMaskIntoConstraints = false
 
@@ -138,19 +138,24 @@ extension HICountdownViewController {
             if UIDevice.current.userInterfaceIdiom == .pad {
                 $0.font = HIAppearance.Font.timeIndicator
             } else {
-                $0.font = HIAppearance.Font.glyph
+                $0.font = UIFont(name: "MontserratRoman-Bold", size: 10.5)
             }
             $0.text = labelString
         }
 
+        // Create a vertical stack view for proper alignment
+        let stackView = UIStackView(arrangedSubviews: [countDownView, label])
+        stackView.axis = .vertical
+        stackView.alignment = .center
+        stackView.spacing = -2
+        stackView.translatesAutoresizingMaskIntoConstraints = false
+
         // Add subviews
         containerView.addSubview(backgroundImageView)
-        containerView.addSubview(countDownView)
-        containerView.addSubview(label)
+        containerView.addSubview(stackView)
 
         // Set up constraints
         NSLayoutConstraint.activate([
-
             containerView.heightAnchor.constraint(equalToConstant: 150),
             containerView.widthAnchor.constraint(equalToConstant: 90),
 
@@ -160,19 +165,15 @@ extension HICountdownViewController {
             backgroundImageView.leadingAnchor.constraint(equalTo: containerView.leadingAnchor),
             backgroundImageView.trailingAnchor.constraint(equalTo: containerView.trailingAnchor),
 
-            // CountDownView constraints
-            countDownView.centerXAnchor.constraint(equalTo: containerView.centerXAnchor),
-            countDownView.topAnchor.constraint(equalTo: containerView.topAnchor, constant: 4),
-            countDownView.bottomAnchor.constraint(equalTo: label.topAnchor, constant: 4),
-            countDownView.widthAnchor.constraint(equalTo: containerView.widthAnchor, constant: -8),
-
-            // Label constraints
-            label.widthAnchor.constraint(equalTo: containerView.widthAnchor, constant: -8),
-            label.centerXAnchor.constraint(equalTo: containerView.centerXAnchor)
+            // Stack view constraints (centering the countdown view and label)
+            stackView.centerXAnchor.constraint(equalTo: containerView.centerXAnchor),
+            stackView.centerYAnchor.constraint(equalTo: containerView.centerYAnchor),
+            stackView.widthAnchor.constraint(equalTo: containerView.widthAnchor, constant: -8)
         ])
 
         return containerView
     }
+
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)

HackIllinois/ViewControllers/HIHomeViewController.swift

@@ -63,25 +63,18 @@ extension HIHomeViewController {
         setupRefreshControl()
 
         // Initialize the UIImageView
-        transparentImageView = UIImageView()
-        transparentImageView.translatesAutoresizingMaskIntoConstraints = false // Enable Auto Layout
-        transparentImageView.contentMode = .scaleAspectFit
+        transparentImageView = UIImageView(frame: view.bounds)
+        transparentImageView.contentMode = .scaleAspectFill
         transparentImageView.alpha = 0
-//        #imageLiteral(resourceName: "HomeTagsToggle")
+
         if UIDevice.current.userInterfaceIdiom == .pad {
-            transparentImageView.image = #imageLiteral(resourceName:"HomeTagsToggle1")
+            transparentImageView.image = UIImage(named: "HomepageTags")
         } else {
-            transparentImageView.image = #imageLiteral(resourceName:"HomeTagsToggle1")
+            transparentImageView.image = UIImage(named: "HomepageTags")
         }
-
-        // Add the UIImageView to the view hierarchy
+        // Add the UIImageView to your view hierarchy
         view.addSubview(transparentImageView)
-
-        // Set Auto Layout constraints for desired size and position
-        NSLayoutConstraint.activate([
-            transparentImageView.centerXAnchor.constraint(equalTo: view.centerXAnchor),
-            transparentImageView.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor, constant: 60)
-        ])
+        view.bringSubviewToFront(transparentImageView)
     }