diff --git a/HackIllinois/Assets.xcassets/Home/HomePage/Contents.json b/HackIllinois/Assets.xcassets/Home/HomePage/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/HackIllinois/Assets.xcassets/Home/HomePage/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/HomePage/Contents.json b/HackIllinois/Assets.xcassets/HomePage/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/HackIllinois/Assets.xcassets/HomePage/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/Contents.json b/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/Contents.json new file mode 100644 index 00000000..1556d0c6 --- /dev/null +++ b/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "FINAL design profile mobile- initial start.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "FINAL design profile mobile- initial start@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "FINAL design profile mobile- initial start@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start.png b/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start.png new file mode 100644 index 00000000..d79215a2 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start@2x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start@2x.png new file mode 100644 index 00000000..e0679006 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start@2x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start@3x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start@3x.png new file mode 100644 index 00000000..5121bb5c Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage1.imageset/FINAL design profile mobile- initial start@3x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/Contents.json b/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/Contents.json new file mode 100644 index 00000000..1556d0c6 --- /dev/null +++ b/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "FINAL design profile mobile- initial start.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "FINAL design profile mobile- initial start@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "FINAL design profile mobile- initial start@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start.png b/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start.png new file mode 100644 index 00000000..a6b85f16 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start@2x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start@2x.png new file mode 100644 index 00000000..e64fd26c Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start@2x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start@3x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start@3x.png new file mode 100644 index 00000000..e3ef72e4 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage2.imageset/FINAL design profile mobile- initial start@3x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/Contents.json b/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/Contents.json new file mode 100644 index 00000000..1556d0c6 --- /dev/null +++ b/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "FINAL design profile mobile- initial start.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "FINAL design profile mobile- initial start@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "FINAL design profile mobile- initial start@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start.png b/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start.png new file mode 100644 index 00000000..bd6cadaf Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start@2x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start@2x.png new file mode 100644 index 00000000..8e02b658 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start@2x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start@3x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start@3x.png new file mode 100644 index 00000000..bc342472 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage3.imageset/FINAL design profile mobile- initial start@3x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/Contents.json b/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/Contents.json new file mode 100644 index 00000000..1556d0c6 --- /dev/null +++ b/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "FINAL design profile mobile- initial start.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "FINAL design profile mobile- initial start@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "FINAL design profile mobile- initial start@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start.png b/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start.png new file mode 100644 index 00000000..e12c1067 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start@2x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start@2x.png new file mode 100644 index 00000000..fbba1972 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start@2x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start@3x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start@3x.png new file mode 100644 index 00000000..15570101 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage4.imageset/FINAL design profile mobile- initial start@3x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/Contents.json b/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/Contents.json new file mode 100644 index 00000000..1556d0c6 --- /dev/null +++ b/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "FINAL design profile mobile- initial start.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "FINAL design profile mobile- initial start@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "FINAL design profile mobile- initial start@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start.png b/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start.png new file mode 100644 index 00000000..33edcc21 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start@2x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start@2x.png new file mode 100644 index 00000000..64405cb2 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start@2x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start@3x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start@3x.png new file mode 100644 index 00000000..b4ccdd76 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage5.imageset/FINAL design profile mobile- initial start@3x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/Contents.json b/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/Contents.json new file mode 100644 index 00000000..1556d0c6 --- /dev/null +++ b/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "FINAL design profile mobile- initial start.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "FINAL design profile mobile- initial start@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "FINAL design profile mobile- initial start@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start.png b/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start.png new file mode 100644 index 00000000..638a6faa Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start@2x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start@2x.png new file mode 100644 index 00000000..91ef75ac Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start@2x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start@3x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start@3x.png new file mode 100644 index 00000000..5ef3745b Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage6.imageset/FINAL design profile mobile- initial start@3x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/Contents.json b/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/Contents.json new file mode 100644 index 00000000..e35b0d38 --- /dev/null +++ b/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "FINAL design profile mobile.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "FINAL design profile mobile@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "FINAL design profile mobile@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile.png b/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile.png new file mode 100644 index 00000000..9e91b7a0 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile@2x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile@2x.png new file mode 100644 index 00000000..7d1e9237 Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile@2x.png differ diff --git a/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile@3x.png b/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile@3x.png new file mode 100644 index 00000000..ff6d83fb Binary files /dev/null and b/HackIllinois/Assets.xcassets/HomePage/HomePage7.imageset/FINAL design profile mobile@3x.png differ diff --git a/HackIllinois/GoogleService-Info.plist b/HackIllinois/GoogleService-Info.plist index 7a60ff06..02d8fb8b 100644 --- a/HackIllinois/GoogleService-Info.plist +++ b/HackIllinois/GoogleService-Info.plist @@ -26,6 +26,8 @@ GOOGLE_APP_ID 1:848675954156:ios:d43e052424b30ef97f34c9 + CFBundleIdentifier + DATABASE_URL https://hackillinois-3787e-default-rtdb.firebaseio.com diff --git a/HackIllinois/ViewControllers/HIHomeViewController.swift b/HackIllinois/ViewControllers/HIHomeViewController.swift index ef5115c2..09080273 100644 --- a/HackIllinois/ViewControllers/HIHomeViewController.swift +++ b/HackIllinois/ViewControllers/HIHomeViewController.swift @@ -175,54 +175,54 @@ extension HIHomeViewController { let hackEnd = HITimeDataSource.shared.eventTimes.hackEnd let projectShowcaseEnd = HITimeDataSource.shared.eventTimes.projectShowcaseEnd let closingCeremonyEnd = HITimeDataSource.shared.eventTimes.closingCeremonyEnd - + if now < checkInStart { if UIDevice.current.userInterfaceIdiom == .pad { - backgroundView.image = #imageLiteral(resourceName: "iPad_Home_Start") + backgroundView.image = #imageLiteral(resourceName:"HomePage1") } else { - backgroundView.image = #imageLiteral(resourceName: "Home_Start") + backgroundView.image = #imageLiteral(resourceName:"HomePage1") } } else if now < checkInEnd { if UIDevice.current.userInterfaceIdiom == .pad { - backgroundView.image = #imageLiteral(resourceName: "iPad_Home_1") + backgroundView.image = #imageLiteral(resourceName:"HomePage1") } else { - backgroundView.image = #imageLiteral(resourceName: "Home_1") + backgroundView.image = #imageLiteral(resourceName:"HomePage1") } } else if now < scavengerHuntEnd { if UIDevice.current.userInterfaceIdiom == .pad { - backgroundView.image = #imageLiteral(resourceName: "iPad_Home_2") + backgroundView.image = #imageLiteral(resourceName:"HomePage2") } else { - backgroundView.image = #imageLiteral(resourceName: "Home_2") + backgroundView.image = #imageLiteral(resourceName:"HomePage2") } } else if now < openingCeremonyEnd { if UIDevice.current.userInterfaceIdiom == .pad { - backgroundView.image = #imageLiteral(resourceName: "iPad_Home_3") + backgroundView.image = #imageLiteral(resourceName:"HomePage3") } else { - backgroundView.image = #imageLiteral(resourceName: "Home_3") + backgroundView.image = #imageLiteral(resourceName:"HomePage3") } } else if now < hackEnd { if UIDevice.current.userInterfaceIdiom == .pad { - backgroundView.image = #imageLiteral(resourceName: "iPad_Home_4") + backgroundView.image = #imageLiteral(resourceName:"HomePage4") } else { - backgroundView.image = #imageLiteral(resourceName: "Home_4") + backgroundView.image = #imageLiteral(resourceName:"HomePage4") } } else if now < projectShowcaseEnd { if UIDevice.current.userInterfaceIdiom == .pad { - backgroundView.image = #imageLiteral(resourceName: "iPad_Home_5") + backgroundView.image = #imageLiteral(resourceName:"HomePage5") } else { - backgroundView.image = #imageLiteral(resourceName: "Home_5") + backgroundView.image = #imageLiteral(resourceName:"HomePage5") } } else if now < closingCeremonyEnd { if UIDevice.current.userInterfaceIdiom == .pad { - backgroundView.image = #imageLiteral(resourceName: "iPad_Home_6") + backgroundView.image = #imageLiteral(resourceName:"HomePage6") } else { - backgroundView.image = #imageLiteral(resourceName: "Home_6") + backgroundView.image = #imageLiteral(resourceName:"HomePage6") } } else { if UIDevice.current.userInterfaceIdiom == .pad { - backgroundView.image = #imageLiteral(resourceName: "iPad_Home_Final") + backgroundView.image = #imageLiteral(resourceName:"HomePage7") } else { - backgroundView.image = #imageLiteral(resourceName: "Home_Final") + backgroundView.image = #imageLiteral(resourceName:"HomePage7") } } }