Skip to content

Commit

Permalink
Merge pull request #564 from HackIllinois/anushka/update-login-page
Browse files Browse the repository at this point in the history
Anushka/update login page
  • Loading branch information
anushkasankaran authored Jan 14, 2024
2 parents 49a5bb4 + 42da737 commit cd4cd21
Show file tree
Hide file tree
Showing 17 changed files with 53 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "iPad Pro 11_ - 1.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "iPad Pro 11_ - 1 (1).png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "iPad Pro 11_ - 1 (2).png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions HackIllinois/Assets.xcassets/LoginLogo.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "Group 618.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Group 618 (1).png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Group 618 (2).png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"images" : [
{
"filename" : "Group 199.png",
"filename" : "Logo (1).png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Group 199@2x.png",
"filename" : "Logo (2).png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Group 199@3x.png",
"filename" : "Logo (3).png",
"idiom" : "universal",
"scale" : "3x"
}
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions HackIllinois/UI/HIAppearance.swift
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ struct HIAppearance: Equatable {
scrollViewIndicatorStyle: .black,
loginDefault: white,
loginTitleBackground: white,
loginLogo: #imageLiteral(resourceName: "HILogo"),
loginLogo: #imageLiteral(resourceName: "LoginLogo"),
loginLogoPad: UIImage(named: "LoginLogoPad")!,
loginSelectionText: white,
attendeeText: white,
Expand Down Expand Up @@ -231,7 +231,7 @@ struct HIAppearance: Equatable {
scrollViewIndicatorStyle: .black,
loginDefault: white,
loginTitleBackground: white,
loginLogo: #imageLiteral(resourceName: "HILogo"),
loginLogo: #imageLiteral(resourceName: "LoginLogo"),
loginLogoPad: UIImage(named: "LoginLogoPad")!,
loginSelectionText: white,
attendeeText: white,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ class HILoginSelectionViewController: HIBaseViewController {
@objc dynamic override func setUpBackgroundView() {
super.setUpBackgroundView()
if UIDevice.current.userInterfaceIdiom == .pad {
backgroundView.image = UIImage(named: "LoginBackgroundPad")
backgroundView.image = UIImage(named: "LoginBackgroundPadNew")
} else {
backgroundView.image = UIImage(named: "LoginBackgroundPhone")
backgroundView.image = UIImage(named: "Login")
}
}
}
Expand Down

0 comments on commit cd4cd21

Please sign in to comment.