Skip to content
This repository was archived by the owner on Oct 12, 2025. It is now read-only.

Update schedule background #606

Closed
anushkasankaran wants to merge 3 commits into from
Closed

Update schedule background #606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3d17fc
Update schedule background
anushkasankaran Jan 17, 2025
9617cfe
Update staff schedule background
anushkasankaran Jan 17, 2025
6671bb7
Revert irrelevant changes
anushkasankaran Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed HackIllinois/Assets.xcassets/ScheduleBackground.imageset/[email protected]
View file
Open in desktop
Binary file not shown.
Binary file removed HackIllinois/Assets.xcassets/ScheduleBackground.imageset/[email protected]
View file
Open in desktop
Binary file not shown.
Binary file removed HackIllinois/Assets.xcassets/ScheduleBackground.imageset/[email protected]
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions HackIllinois/Assets.xcassets/ScheduleBackground.imageset/Contents.json
View file
Open in desktop
Copy link

@AydanPirani AydanPirani Jan 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's rename the files to be more descriptive, so we know what each file respresents.

IMO we keep the config filename fields the same, but we change the actual filenames to match what is in the config

Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"images" : [
{
"filename" : "Background@1x.png",
"filename" : "iPhone 16 - 1 10.52.16 AM.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Background@2x.png",
"filename" : "iPhone 16 - 1 (1) 10.52.16 AM.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Background@3x.png",
"filename" : "iPhone 16 - 1 (2) 10.52.16 AM.png",
"idiom" : "universal",
"scale" : "3x"
}
Expand Down
Binary file added ...s/Assets.xcassets/ScheduleBackground.imageset/iPhone 16 - 1 (1) 10.52.16 AM.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...s/Assets.xcassets/ScheduleBackground.imageset/iPhone 16 - 1 (2) 10.52.16 AM.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...inois/Assets.xcassets/ScheduleBackground.imageset/iPhone 16 - 1 10.52.16 AM.png
View file
Open in desktop
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/ViewControllers/HIScheduleViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class HIScheduleViewController: HIEventListViewController {

@objc dynamic override func setUpBackgroundView() {
super.setUpBackgroundView()
backgroundView.image = #imageLiteral(resourceName: "PurpleBackground")
backgroundView.image = #imageLiteral(resourceName: "ScheduleBackground")
if UIDevice.current.userInterfaceIdiom == .pad {
backgroundView.image = #imageLiteral(resourceName: "BackgroundPad")
}
Expand Down Expand Up @@ -244,7 +244,7 @@ extension HIScheduleViewController {
@objc func scheduleButtonTapped(_ sender: UIButton) {
if onlyShifts {
onlyShifts = false
backgroundView.image = #imageLiteral(resourceName: "PurpleBackground")
backgroundView.image = #imageLiteral(resourceName: "ScheduleBackground")
labelColor = .white // Set label color to brown
setStaffShiftsControl()
// Call removeStaffShiftContainerViews to remove container views for staff shifts
Expand Down
Loading