From 6d0bccbfc1cf13a6b202943756920e91ad92c84b Mon Sep 17 00:00:00 2001 From: Sophia Liu Date: Tue, 13 Feb 2024 18:25:46 -0600 Subject: [PATCH] added UI fixes: launchscreen change for iPad, qr code tab color, and others --- .../TabBarIcons/QRCode.imageset/Contents.json | 4 ++-- .../TabBarIcons/QRCode.imageset/qr-code-1.png | Bin 372 -> 0 bytes .../TabBarIcons/QRCode.imageset/qr-code-2.png | Bin 233 -> 0 bytes .../TabBarIcons/QRCode.imageset/qr-code.png | Bin 546 -> 237 bytes .../TabBarIcons/QRCode.imageset/qr-code2x.png | Bin 0 -> 366 bytes .../TabBarIcons/QRCode.imageset/qr-code3x.png | Bin 0 -> 555 bytes .../Contents.json | 6 +++--- .../QRScannerPopupTabIcon.imageset/qr-code.png | Bin 0 -> 237 bytes .../qr-code2x.png | Bin 0 -> 366 bytes .../qr-code3x.png | Bin 0 -> 555 bytes .../qr-code@1x.png | Bin 233 -> 0 bytes .../qr-code@2x.png | Bin 372 -> 0 bytes .../qr-code@3x.png | Bin 546 -> 0 bytes HackIllinois/LaunchScreen.storyboard | 6 ++++-- HackIllinois/UI/HIAppearance.swift | 10 +++++----- .../ViewControllers/HIBaseViewController.swift | 6 +++++- .../HIOnboardingViewController.swift | 2 +- 17 files changed, 20 insertions(+), 14 deletions(-) delete mode 100644 HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code-1.png delete mode 100644 HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code-2.png create mode 100644 HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code2x.png create mode 100644 HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code3x.png create mode 100644 HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code.png create mode 100644 HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code2x.png create mode 100644 HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code3x.png delete mode 100644 HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code@1x.png delete mode 100644 HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code@2x.png delete mode 100644 HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code@3x.png diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/Contents.json b/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/Contents.json index ac23c5af..b8de64aa 100644 --- a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/Contents.json +++ b/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" } diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code-1.png b/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code-1.png deleted file mode 100644 index 1a883f1ad6aa2696e0a00d69bd33f70a275e11e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?2=RS;(M3{v?36l5$8 za(7}_cTVOdki(Mh=e{F{Fa=?F?JKCI^AmbY50f_Xlc6CReZt zZ#@>p-Pho5_)$ToaT43HrBhoUrr+fKw2w*1$Y#cw+nREM48Ps}+HuUEFC08qb6Ll; zz>KR~cB$x#?`rpxy#BJOf6I|yf6q+KOVG;EziJw2(){6Ln%d+3W7#j{G9I%89prc~ zwfCi0_`HTUv74XEzU&fKIJld6UiqTkKaCsMYMR+(djKn5%My@0!c$ac|0t&+npkF}#so zBE&Yq%jcr2mZOL2w3kX#Kk!O{Q4r@6A#O*li_Q4nJa0`PlBg3pY z5);kj>lvCnT^vIy7~f7g%iEy9EACy|%9$}6j=YtR6Wycr>S3tl$JgJ^v&sgS9)AAd#ATo> O89ZJ6T-G@yGywpFwp4lm delta 527 zcmaFMxQNB9Gr-TCmrII^fq{Y7)59eQNPB=V2OE$KeY@EmNO2Z;L>4nJC|ZCpqw6%o zgo$SI^^Ds+T^vIy7~kG<^gHAra_plyFQ<;}#J0&Vc#pW0WJXH)Op$)!*-@ofc4%3$ zw^KyvzHyz@cx>2&#v=N zE970v*gM_+{kcD9&aGV~cKdl|=FDpWTjZa<&tX`n@lLn?v6S0d_M0E4+&h=w%Yk<@s;D)!U`GoCO#;mAwTnNA4)USEtbge;`Fd%lt>mV* z7S(CjA`jiwx-Ye8dPGk8%S)O?>l%Hd6cid8SeS%3JfMt4`XaBp*Peao^tOQUnrrQu zV^u~eycg5!Cv472)vWoN3Nq?N!?w?vk@sEKe=9!`n{}&xebgUY-|FfTs}x?(e(SRS z-||-fH$URZN|-Fh;gJ!Wv~sRe*ow_h0-P__1tcx+5PhLjc}2jWF1r4T0tliVL0V9{e)78&qol`;+0G$5P`v3p{ diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code2x.png b/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code2x.png new file mode 100644 index 0000000000000000000000000000000000000000..6c825d0745bba9b6bc7f3d55c1872fc60e9f3469 GIT binary patch literal 366 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?2=RS;(M3{v?36l5$8 za(7}_cTVOdki(Mh=E~+sMFhF5yNqhIR{dHN<{O0R$k!m)_>Tj2qaTn%SI`?>V*IvZ*ZB?pc^&=U4KSbHl!m`3rAdxs$2a zS8|loBs6qZxMyGC(%;k56S~Y*r|92($dZ!pbz|@Dsd^07>?>PXmk1S?O!N{6>MY&m wp$ak*ghHAoc&%Yxd4%KCbiE)>2BqiR8cUBj+iCW>0E36Y)78&qol`;+03tVtUH||9 literal 0 HcmV?d00001 diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code3x.png b/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code3x.png new file mode 100644 index 0000000000000000000000000000000000000000..fd0aa8cd420c17df1f6db3ce859cb4c5709b2bd0 GIT binary patch literal 555 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ79h;%I?XTvD9BhG zBdk%Lt3Qu3xV}7CAL`xoAZi1H&7w z@NX&4_tZb1EB}Olci8@wpWjt}`&X6CnSNvYqlEs-4T=9YU6>ytUtGp5RX-@C;A{;{RglX?z!YybalqnV}=;~25f!RfRTOW8E9 zyINOy4r*uIjdTm!`?hR){*vOG@{zu?&IrUTxN$D%nr6^Bf#Ocq(rI0HwQlm{Tw-Ds z(wN}T$ik%(pwP&~DdN$wGjPtWUv00i^F~~K{OVFf+XK-jbLuy7+`HL*b;(JdgRHYs zZ=P7s6!zC-+0WPSpWm!VFwHb_zH(mnvrhE972C|`6tS6Q0!>Pt9+9)0!_?Q(`5{-= zTaksQth~7-x&B+k_^91DDb#-KU`(}LZ#(o@8lbj zB@9QJ)q))A4mB=$?{X;nm*^y>FMSn!lP~RNoT02Y@Aj@IyYv@dQVaU9^L*jb>X)AG zms55uIT)Lu`p`T05#NOw&v;J=->keSDe8PwQ!lfC#qNrGm$q_d%!VUx<>N&6XuWzE e`tkL*^Q^MLrH7wCIB^;18U{~SKbLh*2~7amzF6r1 literal 0 HcmV?d00001 diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code2x.png b/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code2x.png new file mode 100644 index 0000000000000000000000000000000000000000..6c825d0745bba9b6bc7f3d55c1872fc60e9f3469 GIT binary patch literal 366 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?2=RS;(M3{v?36l5$8 za(7}_cTVOdki(Mh=E~+sMFhF5yNqhIR{dHN<{O0R$k!m)_>Tj2qaTn%SI`?>V*IvZ*ZB?pc^&=U4KSbHl!m`3rAdxs$2a zS8|loBs6qZxMyGC(%;k56S~Y*r|92($dZ!pbz|@Dsd^07>?>PXmk1S?O!N{6>MY&m wp$ak*ghHAoc&%Yxd4%KCbiE)>2BqiR8cUBj+iCW>0E36Y)78&qol`;+03tVtUH||9 literal 0 HcmV?d00001 diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code3x.png b/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code3x.png new file mode 100644 index 0000000000000000000000000000000000000000..fd0aa8cd420c17df1f6db3ce859cb4c5709b2bd0 GIT binary patch literal 555 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ79h;%I?XTvD9BhG zBdk%Lt3Qu3xV}7CAL`xoAZi1H&7w z@NX&4_tZb1EB}Olci8@wpWjt}`&X6CnSNvYqlEs-4T=9YU6>ytUtGp5RX-@C;A{;{RglX?z!YybalqnV}=;~25f!RfRTOW8E9 zyINOy4r*uIjdTm!`?hR){*vOG@{zu?&IrUTxN$D%nr6^Bf#Ocq(rI0HwQlm{Tw-Ds z(wN}T$ik%(pwP&~DdN$wGjPtWUv00i^F~~K{OVFf+XK-jbLuy7+`HL*b;(JdgRHYs zZ=P7s6!zC-+0WPSpWm!VFwHb_zH(mnvrhE972C|`6tS6Q0!>Pt9+9)0!_?Q(`5{-= zTaksQth~7-x&B+k_^91e{F{Fa=?F?JKCI^AmbY50f_Xlc6CReZt zZ#@>p-Pho5_)$ToaT43HrBhoUrr+fKw2w*1$Y#cw+nREM48Ps}+HuUEFC08qb6Ll; zz>KR~cB$x#?`rpxy#BJOf6I|yf6q+KOVG;EziJw2(){6Ln%d+3W7#j{G9I%89prc~ zwfCi0_`HTUv74XEzU&fKIJld6UiqTkKaCsMYMR+(djKn5%My@0!c$ac|0t&+npkF}#so zBE&Yq%jcr2mZOL2w3kX#Kk!O{Q4r@6A#O*li_Q-^ISdDk-bPPc!5?$4QXYgdWgex8{*^IE_b`KRx57}jaL z(|s)EwwC?o$0_&DfAc6NFGTW|GtDK2LLMowjKfy+ZE@A3D7)V7%s9d*)b`Q3~(H^a-1@QZ;M7rh-g*(Xj1vX5@X>_20@*#Ae;9 zUmx|y*0;L4#43f?v){U`|F^u=|ILqhvJxhXad>3JCas*S6t-gXlK|(7bpc7sJ49dT zR9+Dv-Sit3xkO)cGvMz_7!IC&195G>VreK$1B`{px|cdmJ2?m_ra~ z_7 - + - + @@ -14,6 +14,7 @@ + @@ -23,5 +24,6 @@ + diff --git a/HackIllinois/UI/HIAppearance.swift b/HackIllinois/UI/HIAppearance.swift index 6bf6f14f..6f5098a5 100644 --- a/HackIllinois/UI/HIAppearance.swift +++ b/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, diff --git a/HackIllinois/ViewControllers/HIBaseViewController.swift b/HackIllinois/ViewControllers/HIBaseViewController.swift index 0f3aba91..9cb4e213 100644 --- a/HackIllinois/ViewControllers/HIBaseViewController.swift +++ b/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 diff --git a/HackIllinois/ViewControllers/HIOnboardingViewController.swift b/HackIllinois/ViewControllers/HIOnboardingViewController.swift index 07e0bb1d..fc1db787 100644 --- a/HackIllinois/ViewControllers/HIOnboardingViewController.swift +++ b/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") }