diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/Contents.json b/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/Contents.json index 1556d0c6..057a2337 100644 --- a/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/Contents.json +++ b/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" } diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start (1).png b/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start (1).png new file mode 100644 index 00000000..4e1751b4 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start (1).png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start (2).png b/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start (2).png new file mode 100644 index 00000000..11ac8584 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start (2).png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start.png b/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start.png index d79215a2..698a4ba5 100644 Binary files a/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start.png and b/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start@2x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start@2x.png deleted file mode 100644 index e0679006..00000000 Binary files a/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start@2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start@3x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start@3x.png deleted file mode 100644 index 5121bb5c..00000000 Binary files a/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start@3x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/Contents.json b/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/Contents.json index 1556d0c6..057a2337 100644 --- a/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/Contents.json +++ b/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" } diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start (1).png b/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start (1).png new file mode 100644 index 00000000..7d320d8c Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start (1).png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start (2).png b/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start (2).png new file mode 100644 index 00000000..a7df3156 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start (2).png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start.png b/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start.png index a6b85f16..60270282 100644 Binary files a/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start.png and b/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start@2x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start@2x.png deleted file mode 100644 index e64fd26c..00000000 Binary files a/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start@2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start@3x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start@3x.png deleted file mode 100644 index e3ef72e4..00000000 Binary files a/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start@3x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/Contents.json b/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/Contents.json index 1556d0c6..057a2337 100644 --- a/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/Contents.json +++ b/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" } diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start (1).png b/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start (1).png new file mode 100644 index 00000000..d083932d Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start (1).png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start (2).png b/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start (2).png new file mode 100644 index 00000000..7c7e52db Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start (2).png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start.png b/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start.png index bd6cadaf..54945504 100644 Binary files a/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start.png and b/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start@2x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start@2x.png deleted file mode 100644 index 8e02b658..00000000 Binary files a/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start@2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start@3x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start@3x.png deleted file mode 100644 index bc342472..00000000 Binary files a/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start@3x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/Contents.json b/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/Contents.json index 1556d0c6..057a2337 100644 --- a/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/Contents.json +++ b/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" } diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start (1).png b/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start (1).png new file mode 100644 index 00000000..af078654 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start (1).png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start (2).png b/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start (2).png new file mode 100644 index 00000000..c055316b Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start (2).png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start.png b/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start.png index e12c1067..6540304d 100644 Binary files a/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start.png and b/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start@2x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start@2x.png deleted file mode 100644 index fbba1972..00000000 Binary files a/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start@2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start@3x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start@3x.png deleted file mode 100644 index 15570101..00000000 Binary files a/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start@3x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/Contents.json b/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/Contents.json index 1556d0c6..057a2337 100644 --- a/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/Contents.json +++ b/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" } diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start (1).png b/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start (1).png new file mode 100644 index 00000000..e40833b6 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start (1).png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start (2).png b/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start (2).png new file mode 100644 index 00000000..a3442041 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start (2).png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start.png b/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start.png index 33edcc21..928bbcf1 100644 Binary files a/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start.png and b/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start@2x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start@2x.png deleted file mode 100644 index 64405cb2..00000000 Binary files a/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start@2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start@3x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start@3x.png deleted file mode 100644 index b4ccdd76..00000000 Binary files a/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start@3x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/Contents.json b/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/Contents.json index 1556d0c6..057a2337 100644 --- a/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/Contents.json +++ b/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" } diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start (1).png b/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start (1).png new file mode 100644 index 00000000..1c33e001 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start (1).png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start (2).png b/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start (2).png new file mode 100644 index 00000000..6fee6635 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start (2).png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start.png b/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start.png index 638a6faa..ea69eb3b 100644 Binary files a/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start.png and b/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start@2x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start@2x.png deleted file mode 100644 index 91ef75ac..00000000 Binary files a/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start@2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start@3x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start@3x.png deleted file mode 100644 index 5ef3745b..00000000 Binary files a/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start@3x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/Contents.json b/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/Contents.json index e35b0d38..f571c821 100644 --- a/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/Contents.json +++ b/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" } diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile (1).png b/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile (1).png new file mode 100644 index 00000000..a06baec4 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile (1).png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile (2).png b/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile (2).png new file mode 100644 index 00000000..6eca6f5d Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile (2).png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile.png b/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile.png index 9e91b7a0..3a4bd80c 100644 Binary files a/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile.png and b/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile@2x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile@2x.png deleted file mode 100644 index 7d1e9237..00000000 Binary files a/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile@2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile@3x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile@3x.png deleted file mode 100644 index ff6d83fb..00000000 Binary files a/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile@3x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/HomepageTags.imageset/Contents.json b/HackIllinois/Assets.xcassets/HomepageTags.imageset/Contents.json new file mode 100644 index 00000000..057a2337 --- /dev/null +++ b/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 + } +} diff --git a/HackIllinois/Assets.xcassets/HomepageTags.imageset/FINAL design profile mobile- initial start (1).png b/HackIllinois/Assets.xcassets/HomepageTags.imageset/FINAL design profile mobile- initial start (1).png new file mode 100644 index 00000000..261ea5ca Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomepageTags.imageset/FINAL design profile mobile- initial start (1).png differ diff --git a/HackIllinois/Assets.xcassets/HomepageTags.imageset/FINAL design profile mobile- initial start (2).png b/HackIllinois/Assets.xcassets/HomepageTags.imageset/FINAL design profile mobile- initial start (2).png new file mode 100644 index 00000000..160d6b4e Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomepageTags.imageset/FINAL design profile mobile- initial start (2).png differ diff --git a/HackIllinois/Assets.xcassets/HomepageTags.imageset/FINAL design profile mobile- initial start.png b/HackIllinois/Assets.xcassets/HomepageTags.imageset/FINAL design profile mobile- initial start.png new file mode 100644 index 00000000..14d13012 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomepageTags.imageset/FINAL design profile mobile- initial start.png differ diff --git a/HackIllinois/UI/HILabel.swift b/HackIllinois/UI/HILabel.swift index f8fc71c9..844ea4f0 100644 --- a/HackIllinois/UI/HILabel.swift +++ b/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: diff --git a/HackIllinois/ViewControllers/HICountdownViewController.swift b/HackIllinois/ViewControllers/HICountdownViewController.swift index 1d749c18..75a719c4 100644 --- a/HackIllinois/ViewControllers/HICountdownViewController.swift +++ b/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) diff --git a/HackIllinois/ViewControllers/HIHomeViewController.swift b/HackIllinois/ViewControllers/HIHomeViewController.swift index 8251ee65..a62a5624 100644 --- a/HackIllinois/ViewControllers/HIHomeViewController.swift +++ b/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) }