diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/App Store iOS.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/App Store iOS.png deleted file mode 100644 index d4b9a52b..00000000 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/App Store iOS.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/Contents.json b/HackIllinois/Assets.xcassets/AppIcon.appiconset/Contents.json index 54d0a2c5..f21d8d3a 100644 --- a/HackIllinois/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/HackIllinois/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,67 +1,67 @@ { "images" : [ { - "filename" : "iPhone Notifications 20pt @2x.png", + "filename" : "favicon.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { - "filename" : "iPhone Notifications 20pt @3x.png", + "filename" : "favicon 1.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { - "filename" : "iPhone Settings 29x29pt @1x.png", + "filename" : "favicon (1).png", "idiom" : "iphone", "scale" : "1x", "size" : "29x29" }, { - "filename" : "iPhone Settings 29x29pt @2x.png", + "filename" : "favicon 2.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { - "filename" : "iPhone Settings 29x29pt @ 3x.png", + "filename" : "favicon (1) 1.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { - "filename" : "iPhone Spotlight 40pt @ 2x.png", + "filename" : "favicon 3.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { - "filename" : "iPhone Spotlight 40pt @ 3x.png", + "filename" : "favicon (1) 2.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { - "filename" : "iPhone App iOS 5,6 57pt @ 1x.png", + "filename" : "favicon 4.png", "idiom" : "iphone", "scale" : "1x", "size" : "57x57" }, { - "filename" : "iPhone App iOS 5,6 57pt @ 2x.png", + "filename" : "favicon (1) 3.png", "idiom" : "iphone", "scale" : "2x", "size" : "57x57" }, { - "filename" : "iPhone App 60pt @ 2x.png", + "filename" : "favicon 5.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { - "filename" : "iPhone App 60pt @ 3x.png", + "filename" : "favicon (1) 4.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" @@ -145,7 +145,7 @@ "size" : "83.5x83.5" }, { - "filename" : "App Store iOS.png", + "filename" : "favicon 6.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon (1) 1.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon (1) 1.png new file mode 100644 index 00000000..415496cd Binary files /dev/null and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon (1) 1.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon (1) 2.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon (1) 2.png new file mode 100644 index 00000000..e7933f86 Binary files /dev/null and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon (1) 2.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon (1) 3.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon (1) 3.png new file mode 100644 index 00000000..962d69f0 Binary files /dev/null and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon (1) 3.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon (1) 4.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon (1) 4.png new file mode 100644 index 00000000..3e4aa40d Binary files /dev/null and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon (1) 4.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon (1).png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon (1).png new file mode 100644 index 00000000..16701451 Binary files /dev/null and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon (1).png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon 1.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon 1.png new file mode 100644 index 00000000..35d98336 Binary files /dev/null and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon 1.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon 2.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon 2.png new file mode 100644 index 00000000..002442fe Binary files /dev/null and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon 2.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon 3.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon 3.png new file mode 100644 index 00000000..0aec6cc7 Binary files /dev/null and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon 3.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon 4.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon 4.png new file mode 100644 index 00000000..33ee59cc Binary files /dev/null and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon 4.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon 5.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon 5.png new file mode 100644 index 00000000..e7933f86 Binary files /dev/null and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon 5.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon 6.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon 6.png new file mode 100644 index 00000000..a3424d70 Binary files /dev/null and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon 6.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon.png new file mode 100644 index 00000000..47303700 Binary files /dev/null and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/favicon.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone App 60pt @ 2x.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone App 60pt @ 2x.png deleted file mode 100644 index fed08eb0..00000000 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone App 60pt @ 2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone App 60pt @ 3x.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone App 60pt @ 3x.png deleted file mode 100644 index 5d66519e..00000000 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone App 60pt @ 3x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone App iOS 5,6 57pt @ 1x.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone App iOS 5,6 57pt @ 1x.png deleted file mode 100644 index 7e9afc8a..00000000 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone App iOS 5,6 57pt @ 1x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone App iOS 5,6 57pt @ 2x.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone App iOS 5,6 57pt @ 2x.png deleted file mode 100644 index 4dc1a8bd..00000000 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone App iOS 5,6 57pt @ 2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Notifications 20pt @2x.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Notifications 20pt @2x.png deleted file mode 100644 index 2435391c..00000000 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Notifications 20pt @2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Notifications 20pt @3x.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Notifications 20pt @3x.png deleted file mode 100644 index 738bf456..00000000 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Notifications 20pt @3x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Settings 29x29pt @ 3x.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Settings 29x29pt @ 3x.png deleted file mode 100644 index 3093bec8..00000000 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Settings 29x29pt @ 3x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Settings 29x29pt @1x.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Settings 29x29pt @1x.png deleted file mode 100644 index 7d025f8b..00000000 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Settings 29x29pt @1x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Settings 29x29pt @2x.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Settings 29x29pt @2x.png deleted file mode 100644 index ae02c8c7..00000000 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Settings 29x29pt @2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Spotlight 40pt @ 2x.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Spotlight 40pt @ 2x.png deleted file mode 100644 index a5bc4320..00000000 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Spotlight 40pt @ 2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Spotlight 40pt @ 3x.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Spotlight 40pt @ 3x.png deleted file mode 100644 index fed08eb0..00000000 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Spotlight 40pt @ 3x.png and /dev/null differ diff --git a/HackIllinois/ViewControllers/HIScheduleViewController.swift b/HackIllinois/ViewControllers/HIScheduleViewController.swift index cbea0acf..4c237fc6 100644 --- a/HackIllinois/ViewControllers/HIScheduleViewController.swift +++ b/HackIllinois/ViewControllers/HIScheduleViewController.swift @@ -156,7 +156,7 @@ extension HIScheduleViewController { super.loadView() let items = dataStore.map { $0.displayText } - segmentedControl = HIScheduleSegmentedControl(titles: items, nums: [23, 24, 25]) + segmentedControl = HIScheduleSegmentedControl(titles: items, nums: [28, 1, 2]) segmentedControl.addTarget(self, action: #selector(didSelectTab(_:)), for: .valueChanged) segmentedControl.translatesAutoresizingMaskIntoConstraints = false view.addSubview(segmentedControl) @@ -443,11 +443,11 @@ extension HIScheduleViewController { let calendar = Calendar.current let dayComponent = calendar.component(.day, from: dateString) var curr_idx = segmentedControl.selectedIndex - if curr_idx == 0 && dayComponent != 23 { + if curr_idx == 0 && dayComponent != 28 { continue - } else if curr_idx == 1 && dayComponent != 24 { + } else if curr_idx == 1 && dayComponent != 1 { continue - } else if curr_idx == 2 && dayComponent != 25 { + } else if curr_idx == 2 && dayComponent != 2 { continue } // Set fixed width and height for the container view