diff --git a/HackIllinois/Assets.xcassets/Pink Background.imageset/Contents.json b/HackIllinois/Assets.xcassets/Pink Background.imageset/Contents.json new file mode 100644 index 00000000..87f294ad --- /dev/null +++ b/HackIllinois/Assets.xcassets/Pink Background.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Pink Background 1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Pink Background 2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Pink Background 3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/Pink Background.imageset/Pink Background 1x.png b/HackIllinois/Assets.xcassets/Pink Background.imageset/Pink Background 1x.png new file mode 100644 index 00000000..c4b7de88 Binary files /dev/null and b/HackIllinois/Assets.xcassets/Pink Background.imageset/Pink Background 1x.png differ diff --git a/HackIllinois/Assets.xcassets/Pink Background.imageset/Pink Background 2x.png b/HackIllinois/Assets.xcassets/Pink Background.imageset/Pink Background 2x.png new file mode 100644 index 00000000..7093ac4a Binary files /dev/null and b/HackIllinois/Assets.xcassets/Pink Background.imageset/Pink Background 2x.png differ diff --git a/HackIllinois/Assets.xcassets/Pink Background.imageset/Pink Background 3x.png b/HackIllinois/Assets.xcassets/Pink Background.imageset/Pink Background 3x.png new file mode 100644 index 00000000..ba0547bd Binary files /dev/null and b/HackIllinois/Assets.xcassets/Pink Background.imageset/Pink Background 3x.png differ diff --git a/HackIllinois/Assets.xcassets/PurpleBackground.imageset/Contents.json b/HackIllinois/Assets.xcassets/PurpleBackground.imageset/Contents.json new file mode 100644 index 00000000..f88bac6c --- /dev/null +++ b/HackIllinois/Assets.xcassets/PurpleBackground.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Purple Background 1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Purple Background 2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Purple Background 3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/PurpleBackground.imageset/Purple Background 1x.png b/HackIllinois/Assets.xcassets/PurpleBackground.imageset/Purple Background 1x.png new file mode 100644 index 00000000..ad36ec0a Binary files /dev/null and b/HackIllinois/Assets.xcassets/PurpleBackground.imageset/Purple Background 1x.png differ diff --git a/HackIllinois/Assets.xcassets/PurpleBackground.imageset/Purple Background 2x.png b/HackIllinois/Assets.xcassets/PurpleBackground.imageset/Purple Background 2x.png new file mode 100644 index 00000000..6aece83d Binary files /dev/null and b/HackIllinois/Assets.xcassets/PurpleBackground.imageset/Purple Background 2x.png differ diff --git a/HackIllinois/Assets.xcassets/PurpleBackground.imageset/Purple Background 3x.png b/HackIllinois/Assets.xcassets/PurpleBackground.imageset/Purple Background 3x.png new file mode 100644 index 00000000..d09c96cd Binary files /dev/null and b/HackIllinois/Assets.xcassets/PurpleBackground.imageset/Purple Background 3x.png differ diff --git a/HackIllinois/UI/HIAppearance.swift b/HackIllinois/UI/HIAppearance.swift index 854beebb..250a22fa 100644 --- a/HackIllinois/UI/HIAppearance.swift +++ b/HackIllinois/UI/HIAppearance.swift @@ -87,18 +87,11 @@ struct HIAppearance: Equatable { private static let yellowWhite = #colorLiteral(red: 0.9647058824, green: 0.9568627451, blue: 0.831372549, alpha: 1) private static let lightYellow = #colorLiteral(red: 0.9882352941, green: 0.862745098, blue: 0.5607843137, alpha: 1) private static let tan = #colorLiteral(red: 0.9098039216, green: 0.8431372549, blue: 0.6470588235, alpha: 1) - private static let orange = #colorLiteral(red: 0.9294117647, green: 0.6078431373, blue: 0.1294117647, alpha: 1) private static let blue = #colorLiteral(red: 0.03137254902, green: 0.5450980392, blue: 0.7568627451, alpha: 1) - private static let pink = #colorLiteral(red: 0.9960784314, green: 0.4392156863, blue: 0.5960784314, alpha: 1) private static let mediumOrange = #colorLiteral(red: 0.9764705882, green: 0.5843137255, blue: 0.3411764706, alpha: 1) - private static let teal = #colorLiteral(red: 0.2156862745, green: 0.8705882353, blue: 0.8039215686, alpha: 1) - private static let lightBlue = #colorLiteral(red: 0.7921568627, green: 0.8235294118, blue: 0.8980392157, alpha: 1) - private static let white = #colorLiteral(red: 1, green: 1, blue: 1, alpha: 1) private static let darkBlue = #colorLiteral(red: 0.05098039216, green: 0.2196078431, blue: 0.4862745098, alpha: 1) - private static let transparent = #colorLiteral(red: 1, green: 1, blue: 1, alpha: 0) 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 darknavy = #colorLiteral(red: 0.1137254902, green: 0.1490196078, blue: 0.2666666667, 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) @@ -113,7 +106,26 @@ struct HIAppearance: Equatable { private static let icyBlue = #colorLiteral(red: 0.8235294118, green: 0.968627451, blue: 1, alpha: 1) private static let bLightYellow = #colorLiteral(red: 1, green: 0.9803921569, blue: 0.8, alpha: 1) private static let bYellow = #colorLiteral(red: 1, green: 0.9568627451, blue: 0.5529411765, alpha: 1) + private static let mediumYellow = #colorLiteral(red: 0.9607843137, green: 0.9176470588, blue: 0.5137254902, alpha: 1) + private static let orange = #colorLiteral(red: 1, green: 0.6980392157, blue: 0.2431372549, alpha: 1) + private static let darkOrange = #colorLiteral(red: 0.8705882353, green: 0.5568627451, blue: 0.2705882353, alpha: 1) + private static let red = #colorLiteral(red: 0.6509803922, green: 0.1176470588, blue: 0, alpha: 1) + private static let lightGreen = #colorLiteral(red: 0.7019607843, green: 0.8392156863, blue: 0.537254902, alpha: 1) + private static let lightBlue = #colorLiteral(red: 0.7176470588, green: 0.8392156863, blue: 0.8392156863, alpha: 1) + private static let teal = #colorLiteral(red: 0.537254902, green: 0.7450980392, blue: 0.6666666667, alpha: 1) private static let darkGreen = #colorLiteral(red: 0.05098039216, green: 0.2470588235, blue: 0.2549019608, alpha: 1) + private static let lightBrown = #colorLiteral(red: 0.5882352941, green: 0.2980392157, blue: 0.1019607843, alpha: 1) + private static let brown = #colorLiteral(red: 0.4, green: 0.168627451, blue: 0.07450980392, alpha: 1) + private static let darkBrown = #colorLiteral(red: 0.337254902, green: 0.1411764706, blue: 0.06666666667, alpha: 1) + private static let lightPink = #colorLiteral(red: 0.9215686275, green: 0.8235294118, blue: 0.8235294118, alpha: 1) + private static let pink = #colorLiteral(red: 0.7921568627, green: 0.431372549, blue: 0.568627451, alpha: 1) + private static let darkPink = #colorLiteral(red: 0.7882352941, green: 0.2039215686, blue: 0.3529411765, alpha: 1) + private static let lightPurple = #colorLiteral(red: 0.662745098, green: 0.4666666667, blue: 0.6705882353, alpha: 1) + private static let indigo = #colorLiteral(red: 0.3568627451, green: 0.3803921569, blue: 0.6078431373, alpha: 1) + private static let darknavy = #colorLiteral(red: 0.1137254902, green: 0.1490196078, blue: 0.2666666667, alpha: 1) + private static let transparent = #colorLiteral(red: 1, green: 1, blue: 1, alpha: 0) + private static let white = #colorLiteral(red: 1, green: 1, blue: 1, alpha: 1) + private static let black = #colorLiteral(red: 0, green: 0, blue: 0, alpha: 1) private static let transparent2 = #colorLiteral(red: 1, green: 1, blue: 1, alpha: 0) private static var statusBarWhite: UIStatusBarStyle { @@ -141,7 +153,7 @@ struct HIAppearance: Equatable { frostedTint: #colorLiteral(red: 0, green: 0.3411764706, blue: 0.462745098, alpha: 0.6), codePopupTab: white, greenCodePopupTab: darkGreen, - navbarBackground: darkBlue, + navbarBackground: darkGreen, navbarTabTint: white, profileContainerTint: yellowWhite, preferredStatusBarStyle: statusBarBlack, @@ -205,7 +217,7 @@ struct HIAppearance: Equatable { frostedTint: #colorLiteral(red: 0, green: 0.3411764706, blue: 0.462745098, alpha: 0.6), codePopupTab: white, greenCodePopupTab: darkGreen, - navbarBackground: darkBlue, + navbarBackground: darkGreen, navbarTabTint: white, profileContainerTint: yellowWhite, preferredStatusBarStyle: statusBarBlack, @@ -264,65 +276,58 @@ struct HIAppearance: Equatable { } enum Font { - // Fonts ending with "Pad" correspond to the iPad - // Glyph fonts correspond to the point/event type label texts and "Memories Made" (2023 app) text - static let glyphPad = UIFont(name: "MontserratRoman-Bold", size: 24) - static let glyph = UIFont(name: "MontserratRoman-Bold", size: 16) + // Fonts ending with "Pad" correspond to the iPad font sizes + // Glyph font corresponds to the time texts that separate the event cells on the schedule page and the "Memories Made" (2023 app) text + static let glyph = UIFont(name: "MontserratRoman-Bold", size: UIDevice.current.userInterfaceIdiom == .pad ? 24 : 16) + + // Home segemented control fonts + static let homeSegmentedTitle = UIFont(name: "MontserratRoman-Bold", size: UIDevice.current.userInterfaceIdiom == .pad ? 40 : 24) - // Segemented control fonts - static let homeSegmentedTitlePad = UIFont(name: "MontserratRoman-Bold", size: 40) - static let homeSegmentedTitle = UIFont(name: "MontserratRoman-Bold", size: 24) - static let scheduleSegmentedNumberPad = UIFont(name: "MontserratRoman-SemiBold", size: 36) - static let segmentedNumberText = UIFont(name: "MontserratRoman-SemiBold", size: 18) + // Schedule page segmented control fonts + static let segmentedNumberText = UIFont(name: "MontserratRoman-SemiBold", size: UIDevice.current.userInterfaceIdiom == .pad ? 36 : 18) // Dates static let scheduleSegmentedPad = UIFont(name: "MontserratRoman-SemiBold", size: 32) static let segmentedTitle = UIFont(name: "MontserratRoman-Bold", size: 16) - - // Schedule fonts + // More Schedule page fonts static let timeIndicator = UIFont(name: "MontserratRoman-Bold", size: 32) static let happeningEventTitle = UIFont(name: "MontserratRoman-Bold", size: 25) - // Main header for each page (Profile, Schedule, etc) - static let viewTitlePad = UIFont(name: "MontserratRoman-Bold", size: 48) - static let viewTitle = UIFont(name: "MontserratRoman-Bold", size: 24) + // Main header title for each page (Profile, Schedule, etc) + static let viewTitle = UIFont(name: "MontserratRoman-Bold", size: UIDevice.current.userInterfaceIdiom == .pad ? 48 : 24) - // Event cell fonts + // Event bubble cell fonts static let eventTitlePad = UIFont(name: "MontserratRoman-Bold", size: 36) static let eventTitle = UIFont(name: "MontserratRoman-SemiBold", size: 18) - - static let locationTextPad = UIFont(name: "MontserratRoman-SemiBold", size: 24) - static let locationText = UIFont(name: "MontserratRoman-SemiBold", size: 12) - - static let sponsorTextPad = UIFont(name: "MontserratRoman-SemiBold", size: 24) - static let bubbleSponsorText = UIFont(name: "MontserratRoman-SemiBold", size: 12) - static let sponsorText = UIFont(name: "MontserratRoman-Regular", size: 16) - + static let locationText = UIFont(name: "MontserratRoman-SemiBold", size: UIDevice.current.userInterfaceIdiom == .pad ? 24 : 12) + static let sponsorText = UIFont(name: "MontserratRoman-SemiBold", size: UIDevice.current.userInterfaceIdiom == .pad ? 24 : 12) + static let timeText = UIFont(name: "MontserratRoman-SemiBold", size: UIDevice.current.userInterfaceIdiom == .pad ? 28 : 14) static let descriptionTextPad = UIFont(name: "MontserratRoman-SemiBold", size: 18) - static let contentSubtitle = UIFont(name: "MontserratRoman-Light", size: 13) - // Content Text specifies description - static let contentText = UIFont(name: "MontserratRoman-Regular", size: 14) + + // Event card popup + static let contentText = UIFont(name: "MontserratRoman-Regular", size: 14) // Location text static let contentTextPad = UIFont(name: "MontserratRoman-SemiBold", size: 18) - static let contentTitle = UIFont(name: "MontserratRoman-Medium", size: 18) static let detailTitle = UIFont(name: "MontserratRoman-SemiBold", size: 24) static let detailTextPad = UIFont(name: "MontserratRoman-Regular", size: 24) static let detailSubtitle = UIFont(name: "MontserratRoman-Medium", size: 16) static let detailText = UIFont(name: "MontserratRoman-Regular", size: UIDevice.current.userInterfaceIdiom == .pad ? 19 : 16) - - static let timeText = UIFont(name: "MontserratRoman-SemiBold", size: 14) - static let timeTextPad = UIFont(name: "MontserratRoman-SemiBold", size: 28) static let eventTime = UIFont(name: "MontserratRoman-Regular", size: 15) static let eventDetails = UIFont(name: "MontserratRoman-Regular", size: 14) static let eventButtonText = UIFont(name: "MontserratRoman-SemiBold", size: UIDevice.current.userInterfaceIdiom == .pad ? 18 : 14) static let eventCategoryText = UIFont(name: "MontserratRoman-Regular", size: 16) static let clockText = UIFont(name: "MontserratRoman-SemiBold", size: 48) static let descriptionText = UIFont(name: "MontserratRoman-Regular", size: 16) + static let contentSubtitle = UIFont(name: "MontserratRoman-Light", size: 13) + static let contentTitle = UIFont(name: "MontserratRoman-Medium", size: 18) + // Navigation fonts static let navigationSubtitle = UIFont(name: "MontserratRoman-Medium", size: 14) static let navigationTitle = UIFont(name: "MontserratRoman-SemiBold", size: 22) static let navigationInfoText = UIFont(name: "MontserratRoman-Regular", size: 12) + // Login fonts static let loginTitle = UIFont(name: "MontserratRoman-Bold", size: UIDevice.current.userInterfaceIdiom == .pad ? 32: 24) static let loginOrTitle = UIFont(name: "MontserratRoman-Bold", size: UIDevice.current.userInterfaceIdiom == .pad ? 20 : 16) static let loginSelection = UIFont(name: "MontserratRoman-SemiBold", size: UIDevice.current.userInterfaceIdiom == .pad ? 26: 16) + // Profile-related fonts static let profileName = UIFont(name: "MontserratRoman-Bold", size: UIDevice.current.userInterfaceIdiom == .pad ? 40 : 20) static let profileSubtitle = UIFont(name: "MontserratRoman-Bold", size: UIDevice.current.userInterfaceIdiom == .pad ? 24 : 12) @@ -332,15 +337,19 @@ struct HIAppearance: Equatable { static let profileNumberFigure = UIFont(name: "MontserratRoman-SemiBold", size: 24) static let profileUsername = UIFont(name: "MontserratRoman-Bold", size: 16) static let profileInterests = UIFont(name: "MontserratRoman-SemiBold", size: 14) + // QR code fonts static let QRCheckInFont = UIFont(name: "MontserratRoman-SemiBold", size: 14) - // Countdown fonts + + // Home page countdown fonts static let newCountdownText = UIFont(name: "MontserratRoman-Bold", size: 48) // Hack 2023 static let countdownText = UIFont(name: "MontserratRoman-Bold", size: 25) + // Onboarding fonts static let onboardingGetStartedText = UIFont(name: "MontserratRoman-SemiBold", size: 25) static let onboardingTitle = UIFont(name: "MontserratRoman-Bold", size: 30) static let onboardingDescription = UIFont(name: "MontserratRoman-Regular", size: 20) + // Leaderboard fonts static let leaderboardPoints = UIFont(name: "MontserratRoman-Semibold", size: 12) static let leaderboardName = UIFont(name: "MontserratRoman-SemiBold", size: 16) @@ -348,11 +357,13 @@ struct HIAppearance: Equatable { static let leaderboardPointsPad = UIFont(name: "MontserratRoman-Bold", size: 24) static let leaderboardNamePad = UIFont(name: "MontserratRoman-SemiBold", size: 32) static let leaderboardRankPad = UIFont(name: "MontserratRoman-Bold", size: 48) + // Misc static let sectionHeader = UIFont(name: "MontserratRoman-Bold", size: 13) static let button = UIFont(name: "MontserratRoman-Regular", size: 15) static let welcomeTitle = UIFont(name: "MontserratRoman-Bold", size: UIDevice.current.userInterfaceIdiom == .pad ? 40: 24) - // For Staff QR code selection + + // Font for Staff QR code selection static let QRSelection = UIFont(name: "MontserratRoman-SemiBold", size: 20) } } diff --git a/HackIllinois/UI/HIHomeSegmentedControl.swift b/HackIllinois/UI/HIHomeSegmentedControl.swift index 711b81d7..c03988a5 100644 --- a/HackIllinois/UI/HIHomeSegmentedControl.swift +++ b/HackIllinois/UI/HIHomeSegmentedControl.swift @@ -22,7 +22,6 @@ class HIHomeSegmentedControl: HISegmentedControl { private var titleLabels = [UILabel]() private let titleFont = HIAppearance.Font.homeSegmentedTitle - private let titleFontPad = HIAppearance.Font.homeSegmentedTitlePad private let numberFont = HIAppearance.Font.segmentedNumberText private var viewPadding: CGFloat = 35 @@ -100,11 +99,7 @@ class HIHomeSegmentedControl: HISegmentedControl { private func setupViewForItem(at index: Int) { let view = UIView() let titleLabel = UILabel() - if UIDevice.current.userInterfaceIdiom == .pad { - titleLabel.font = titleFontPad - } else { - titleLabel.font = titleFont - } + titleLabel.font = titleFont titleLabel.textAlignment = .center titleLabel.text = items[index] diff --git a/HackIllinois/UI/HILabel.swift b/HackIllinois/UI/HILabel.swift index 500b7db4..ba4bc2e7 100644 --- a/HackIllinois/UI/HILabel.swift +++ b/HackIllinois/UI/HILabel.swift @@ -54,9 +54,8 @@ class HILabel: UILabel { case leaderboardPoints case neonCountdown // Cases used on bubble event cell - case newSponsor case newLocation - case newTime + case time case QRSelection } @@ -143,11 +142,7 @@ class HILabel: UILabel { textHIColor = \.whiteText backgroundHIColor = \.clear textAlignment = .center - if UIDevice.current.userInterfaceIdiom == .pad { - font = HIAppearance.Font.viewTitlePad - } else { - font = HIAppearance.Font.viewTitle - } + font = HIAppearance.Font.viewTitle case .viewTitleGreen: textHIColor = \.viewTitleGreen @@ -262,7 +257,7 @@ class HILabel: UILabel { textHIColor = \.white backgroundHIColor = \.clear if UIDevice.current.userInterfaceIdiom == .pad { - font = HIAppearance.Font.glyphPad + font = HIAppearance.Font.glyph } else { font = HIAppearance.Font.eventButtonText } @@ -332,35 +327,17 @@ class HILabel: UILabel { } // Case for event bubble cell time info - case .newTime: + case .time: textHIColor = \.black backgroundHIColor = \.clear - if UIDevice.current.userInterfaceIdiom == .pad { - font = HIAppearance.Font.timeTextPad - } else { - font = HIAppearance.Font.timeText - } - - // Case for event bubble cell sponsor info - case .newSponsor: - textHIColor = \.black - backgroundHIColor = \.clear - font = HIAppearance.Font.bubbleSponsorText - if UIDevice.current.userInterfaceIdiom == .pad { - font = HIAppearance.Font.sponsorTextPad - } else { - font = HIAppearance.Font.bubbleSponsorText - } + font = HIAppearance.Font.timeText // Case for event bubble cell location info case .newLocation: textHIColor = \.black backgroundHIColor = \.clear - if UIDevice.current.userInterfaceIdiom == .pad { - font = HIAppearance.Font.locationTextPad - } else { - font = HIAppearance.Font.locationText - } + font = HIAppearance.Font.locationText + case .QRSelection: textHIColor = \.black backgroundHIColor = \.clear diff --git a/HackIllinois/UI/HIScheduleSegmentedControl.swift b/HackIllinois/UI/HIScheduleSegmentedControl.swift index 479993bf..72a98a7a 100644 --- a/HackIllinois/UI/HIScheduleSegmentedControl.swift +++ b/HackIllinois/UI/HIScheduleSegmentedControl.swift @@ -25,7 +25,6 @@ class HIScheduleSegmentedControl: HISegmentedControl { private let titleFont = HIAppearance.Font.segmentedTitle private let titleFontPad = HIAppearance.Font.scheduleSegmentedPad private let numberFont = HIAppearance.Font.segmentedNumberText - private let numberFontPad = HIAppearance.Font.scheduleSegmentedNumberPad private let viewPadding: CGFloat = 65 private let indicatorCornerRadiusProp: CGFloat = 0.15 @@ -112,11 +111,10 @@ class HIScheduleSegmentedControl: HISegmentedControl { titleLabel.textAlignment = .center if UIDevice.current.userInterfaceIdiom == .pad { titleLabel.font = titleFontPad - numberLabel.font = numberFontPad } else { titleLabel.font = titleFont - numberLabel.font = numberFont } + numberLabel.font = numberFont titleLabel.text = items[index] titleLabel.textColor <- \.whiteText diff --git a/HackIllinois/UI/TableView/Cells/HIBubbleCell/HIEventCell.swift b/HackIllinois/UI/TableView/Cells/HIBubbleCell/HIEventCell.swift index 2b995602..8f13271b 100644 --- a/HackIllinois/UI/TableView/Cells/HIBubbleCell/HIEventCell.swift +++ b/HackIllinois/UI/TableView/Cells/HIBubbleCell/HIEventCell.swift @@ -134,7 +134,7 @@ extension HIEventCell { lhs.contentStackView.addArrangedSubview($0) $0.translatesAutoresizingMaskIntoConstraints = false } - let timeLabel = HILabel(style: .newTime) + let timeLabel = HILabel(style: .time) // We can check for async events by checking if the event start and end time is 1970-01-01 00:00:00 +0000 if rhs.startTime.timeIntervalSince1970 == 0 || rhs.endTime.timeIntervalSince1970 == 0 { timeLabel.text = HIConstants.ASYNC_EVENT_TIME_TEXT @@ -170,7 +170,7 @@ extension HIEventCell { timeLabel.leadingAnchor.constraint(equalTo: timeImageView.trailingAnchor, constant: eventCellSpacing + 1).isActive = true timeLabel.centerYAnchor.constraint(equalTo: timeImageView.centerYAnchor).isActive = true if !rhs.sponsor.isEmpty { - let sponsorLabel = HILabel(style: .newSponsor) + let sponsorLabel = HILabel(style: .sponsor) middleContainerView.addSubview(sponsorImageView) middleContainerView.addSubview(sponsorLabel) sponsorImageView.translatesAutoresizingMaskIntoConstraints = false diff --git a/HackIllinois/ViewControllers/HIBannerViewController.swift b/HackIllinois/ViewControllers/HIBannerViewController.swift index cf1b55b2..5ea5af77 100644 --- a/HackIllinois/ViewControllers/HIBannerViewController.swift +++ b/HackIllinois/ViewControllers/HIBannerViewController.swift @@ -20,9 +20,6 @@ class HIBannerViewController: UIViewController { $0.backgroundHIColor = \.clear $0.textAlignment = .center $0.font = HIAppearance.Font.glyph - if UIDevice.current.userInterfaceIdiom == .pad { - $0.font = HIAppearance.Font.glyphPad - } } } diff --git a/HackIllinois/ViewControllers/HIBaseViewController.swift b/HackIllinois/ViewControllers/HIBaseViewController.swift index 4826ca0a..dba1b560 100644 --- a/HackIllinois/ViewControllers/HIBaseViewController.swift +++ b/HackIllinois/ViewControllers/HIBaseViewController.swift @@ -52,7 +52,7 @@ extension HIBaseViewController { extension HIBaseViewController { @objc dynamic func setUpBackgroundView() { view.layer.backgroundColor = UIColor.clear.cgColor - backgroundView.image = #imageLiteral(resourceName: "ScheduleBackground") + backgroundView.image = #imageLiteral(resourceName: "PurpleBackground") backgroundView.translatesAutoresizingMaskIntoConstraints = false backgroundView.isUserInteractionEnabled = true backgroundView.contentMode = .scaleAspectFill diff --git a/HackIllinois/ViewControllers/HIQRScannerSelection.swift b/HackIllinois/ViewControllers/HIQRScannerSelection.swift index 4f7df39a..906cda7e 100644 --- a/HackIllinois/ViewControllers/HIQRScannerSelection.swift +++ b/HackIllinois/ViewControllers/HIQRScannerSelection.swift @@ -32,9 +32,6 @@ class HIQRScannerSelection: HIBaseViewController { $0.backgroundHIColor = \.clear $0.textAlignment = .center $0.font = HIAppearance.Font.glyph - if UIDevice.current.userInterfaceIdiom == .pad { - $0.font = HIAppearance.Font.glyphPad - } } private let meetingButton = HIButton { $0.tintHIColor = \.action