diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/29 1.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/29 1.png deleted file mode 100644 index 1cdae295..00000000 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/29 1.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/29.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/29.png deleted file mode 100644 index 1cdae295..00000000 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/29.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/App Store iOS (1).png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/App Store iOS (1).png deleted file mode 100644 index 4934e06b..00000000 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/App Store iOS (1).png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/App Store iOS.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/App Store iOS.png new file mode 100644 index 00000000..d4b9a52b Binary files /dev/null and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/App Store iOS.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/Contents.json b/HackIllinois/Assets.xcassets/AppIcon.appiconset/Contents.json index 789d7ffb..54d0a2c5 100644 --- a/HackIllinois/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/HackIllinois/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "iPad Spotlight 40pt @1x 1.png", + "filename" : "iPhone Notifications 20pt @2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" @@ -13,19 +13,19 @@ "size" : "20x20" }, { - "filename" : "29.png", + "filename" : "iPhone Settings 29x29pt @1x.png", "idiom" : "iphone", "scale" : "1x", "size" : "29x29" }, { - "filename" : "iPhone Settings 29x29pt @2x (2).png", + "filename" : "iPhone Settings 29x29pt @2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { - "filename" : "iPhone Settings 29x29pt @ 3x (1).png", + "filename" : "iPhone Settings 29x29pt @ 3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" @@ -79,7 +79,7 @@ "size" : "20x20" }, { - "filename" : "29 1.png", + "filename" : "iPad Settings 29pt @1x.png", "idiom" : "ipad", "scale" : "1x", "size" : "29x29" @@ -139,13 +139,13 @@ "size" : "76x76" }, { - "filename" : "iPad Pro (12.9in) App 83.5pt @ 2x (1).png", + "filename" : "iPad Pro (12.9in) App 83.5pt @ 2x.png", "idiom" : "ipad", "scale" : "2x", "size" : "83.5x83.5" }, { - "filename" : "App Store iOS (1).png", + "filename" : "App Store iOS.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad App 76pt @ 1x.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad App 76pt @ 1x.png index 4b5f7691..9ba10bfa 100644 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad App 76pt @ 1x.png and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad App 76pt @ 1x.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad App 76pt @ 2x.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad App 76pt @ 2x.png index 0009b08f..0453a6b3 100644 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad App 76pt @ 2x.png and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad App 76pt @ 2x.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad App iOS 5,6 72pt @ 1x.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad App iOS 5,6 72pt @ 1x.png index 8dc775e2..35f83e60 100644 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad App iOS 5,6 72pt @ 1x.png and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad App iOS 5,6 72pt @ 1x.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad App iOS 5,6 72pt @ 2x.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad App iOS 5,6 72pt @ 2x.png index 2e395592..6f568916 100644 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad App iOS 5,6 72pt @ 2x.png and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad App iOS 5,6 72pt @ 2x.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Notifications 20pt @1x.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Notifications 20pt @1x.png index d8502e07..80d2c531 100644 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Notifications 20pt @1x.png and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Notifications 20pt @1x.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Notifications 20pt @2x.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Notifications 20pt @2x.png index 8fd96d4a..3e2bd50e 100644 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Notifications 20pt @2x.png and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Notifications 20pt @2x.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Pro (12.9in) App 83.5pt @ 2x (1).png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Pro (12.9in) App 83.5pt @ 2x (1).png deleted file mode 100644 index d821b817..00000000 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Pro (12.9in) App 83.5pt @ 2x (1).png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Pro (12.9in) App 83.5pt @ 2x.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Pro (12.9in) App 83.5pt @ 2x.png new file mode 100644 index 00000000..4fc7c993 Binary files /dev/null and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Pro (12.9in) App 83.5pt @ 2x.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Settings 29pt @1x.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Settings 29pt @1x.png new file mode 100644 index 00000000..bf70be0f Binary files /dev/null and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Settings 29pt @1x.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Settings 29pt @2x.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Settings 29pt @2x.png index 7a507c79..ae02c8c7 100644 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Settings 29pt @2x.png and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Settings 29pt @2x.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Spotlight 40pt @1x 1.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Spotlight 40pt @1x 1.png deleted file mode 100644 index 8fd96d4a..00000000 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Spotlight 40pt @1x 1.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Spotlight 40pt @1x.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Spotlight 40pt @1x.png index 8fd96d4a..3e2bd50e 100644 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Spotlight 40pt @1x.png and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Spotlight 40pt @1x.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Spotlight 40pt @2x.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Spotlight 40pt @2x.png index e208d086..a5bc4320 100644 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Spotlight 40pt @2x.png and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Spotlight 40pt @2x.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Spotlight iOS 5,6 50pt @1x.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Spotlight iOS 5,6 50pt @1x.png index c66af767..7c89aa0d 100644 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Spotlight iOS 5,6 50pt @1x.png and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Spotlight iOS 5,6 50pt @1x.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Spotlight iOS 5,6 50pt @2x.png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Spotlight iOS 5,6 50pt @2x.png index bb8c9a74..a3e1d508 100644 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Spotlight iOS 5,6 50pt @2x.png and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPad Spotlight iOS 5,6 50pt @2x.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 index 0257c2bc..fed08eb0 100644 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone App 60pt @ 2x.png and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone App 60pt @ 2x.png 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 index fa29b218..5d66519e 100644 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone App 60pt @ 3x.png and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone App 60pt @ 3x.png 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 index 4c180610..7e9afc8a 100644 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone App iOS 5,6 57pt @ 1x.png and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone App iOS 5,6 57pt @ 1x.png 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 index 83e3ee8f..4dc1a8bd 100644 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone App iOS 5,6 57pt @ 2x.png and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone App iOS 5,6 57pt @ 2x.png 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 new file mode 100644 index 00000000..2435391c Binary files /dev/null and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Notifications 20pt @2x.png 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 index 05a13659..738bf456 100644 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Notifications 20pt @3x.png and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Notifications 20pt @3x.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Settings 29x29pt @ 3x (1).png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Settings 29x29pt @ 3x (1).png deleted file mode 100644 index f316c48e..00000000 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Settings 29x29pt @ 3x (1).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 new file mode 100644 index 00000000..3093bec8 Binary files /dev/null and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Settings 29x29pt @ 3x.png 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 new file mode 100644 index 00000000..7d025f8b Binary files /dev/null and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Settings 29x29pt @1x.png differ diff --git a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Settings 29x29pt @2x (2).png b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Settings 29x29pt @2x (2).png deleted file mode 100644 index 5d501448..00000000 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Settings 29x29pt @2x (2).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 new file mode 100644 index 00000000..ae02c8c7 Binary files /dev/null and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Settings 29x29pt @2x.png 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 index dd5e0f89..a5bc4320 100644 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Spotlight 40pt @ 2x.png and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Spotlight 40pt @ 2x.png 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 index 217990a9..fed08eb0 100644 Binary files a/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Spotlight 40pt @ 3x.png and b/HackIllinois/Assets.xcassets/AppIcon.appiconset/iPhone Spotlight 40pt @ 3x.png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding0.imageset/Group 8.png b/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding0.imageset/Group 8.png deleted file mode 100644 index 2d683938..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding0.imageset/Group 8.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding0.imageset/Group 8@2x.png b/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding0.imageset/Group 8@2x.png deleted file mode 100644 index a4598cc5..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding0.imageset/Group 8@2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding0.imageset/Group 8@3x.png b/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding0.imageset/Group 8@3x.png deleted file mode 100644 index 895ae186..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding0.imageset/Group 8@3x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding1.imageset/Group 9.png b/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding1.imageset/Group 9.png deleted file mode 100644 index 536800b8..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding1.imageset/Group 9.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding1.imageset/Group 9@2x.png b/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding1.imageset/Group 9@2x.png deleted file mode 100644 index c047df8d..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding1.imageset/Group 9@2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding1.imageset/Group 9@3x.png b/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding1.imageset/Group 9@3x.png deleted file mode 100644 index 003050bd..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding1.imageset/Group 9@3x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding2.imageset/Group 12.png b/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding2.imageset/Group 12.png deleted file mode 100644 index e13ef7d9..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding2.imageset/Group 12.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding2.imageset/Group 12@2x.png b/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding2.imageset/Group 12@2x.png deleted file mode 100644 index 3bee8e80..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding2.imageset/Group 12@2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding2.imageset/Group 12@3x.png b/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding2.imageset/Group 12@3x.png deleted file mode 100644 index f913b721..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding2.imageset/Group 12@3x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding3.imageset/Group 11.png b/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding3.imageset/Group 11.png deleted file mode 100644 index 0a8ce86a..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding3.imageset/Group 11.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding3.imageset/Group 11@2x.png b/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding3.imageset/Group 11@2x.png deleted file mode 100644 index 5cf1e259..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding3.imageset/Group 11@2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding3.imageset/Group 11@3x.png b/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding3.imageset/Group 11@3x.png deleted file mode 100644 index 6d1e1534..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding3.imageset/Group 11@3x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding4.imageset/Contents.json b/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding4.imageset/Contents.json deleted file mode 100644 index c3bf0a44..00000000 --- a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding4.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "Group 10.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group 10@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group 10@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding4.imageset/Group 10.png b/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding4.imageset/Group 10.png deleted file mode 100644 index 5e6da603..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding4.imageset/Group 10.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding4.imageset/Group 10@2x.png b/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding4.imageset/Group 10@2x.png deleted file mode 100644 index 2ae21a98..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding4.imageset/Group 10@2x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding4.imageset/Group 10@3x.png b/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding4.imageset/Group 10@3x.png deleted file mode 100644 index a29e5403..00000000 Binary files a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding4.imageset/Group 10@3x.png and /dev/null differ diff --git a/HackIllinois/Assets.xcassets/iPadLogin.imageset/Contents.json b/HackIllinois/Assets.xcassets/iPadLogin.imageset/Contents.json new file mode 100644 index 00000000..0956b19c --- /dev/null +++ b/HackIllinois/Assets.xcassets/iPadLogin.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "iPad Pro 11_ - 1.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "iPad Pro 11_ - 1@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "iPad Pro 11_ - 1@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/iPadLogin.imageset/iPad Pro 11_ - 1.png b/HackIllinois/Assets.xcassets/iPadLogin.imageset/iPad Pro 11_ - 1.png new file mode 100644 index 00000000..06e2a7ae Binary files /dev/null and b/HackIllinois/Assets.xcassets/iPadLogin.imageset/iPad Pro 11_ - 1.png differ diff --git a/HackIllinois/Assets.xcassets/iPadLogin.imageset/iPad Pro 11_ - 1@2x.png b/HackIllinois/Assets.xcassets/iPadLogin.imageset/iPad Pro 11_ - 1@2x.png new file mode 100644 index 00000000..986b0416 Binary files /dev/null and b/HackIllinois/Assets.xcassets/iPadLogin.imageset/iPad Pro 11_ - 1@2x.png differ diff --git a/HackIllinois/Assets.xcassets/iPadLogin.imageset/iPad Pro 11_ - 1@3x.png b/HackIllinois/Assets.xcassets/iPadLogin.imageset/iPad Pro 11_ - 1@3x.png new file mode 100644 index 00000000..a5389391 Binary files /dev/null and b/HackIllinois/Assets.xcassets/iPadLogin.imageset/iPad Pro 11_ - 1@3x.png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding2.imageset/Contents.json b/HackIllinois/Assets.xcassets/iPadOnboarding1.imageset/Contents.json similarity index 67% rename from HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding2.imageset/Contents.json rename to HackIllinois/Assets.xcassets/iPadOnboarding1.imageset/Contents.json index 19c53ad1..c231fe15 100644 --- a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding2.imageset/Contents.json +++ b/HackIllinois/Assets.xcassets/iPadOnboarding1.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "Group 12.png", + "filename" : "homepage_ipad 1.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "Group 12@2x.png", + "filename" : "homepage_ipad 1@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group 12@3x.png", + "filename" : "homepage_ipad 1@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/HackIllinois/Assets.xcassets/iPadOnboarding1.imageset/homepage_ipad 1.png b/HackIllinois/Assets.xcassets/iPadOnboarding1.imageset/homepage_ipad 1.png new file mode 100644 index 00000000..2e819c1e Binary files /dev/null and b/HackIllinois/Assets.xcassets/iPadOnboarding1.imageset/homepage_ipad 1.png differ diff --git a/HackIllinois/Assets.xcassets/iPadOnboarding1.imageset/homepage_ipad 1@2x.png b/HackIllinois/Assets.xcassets/iPadOnboarding1.imageset/homepage_ipad 1@2x.png new file mode 100644 index 00000000..5c883dcf Binary files /dev/null and b/HackIllinois/Assets.xcassets/iPadOnboarding1.imageset/homepage_ipad 1@2x.png differ diff --git a/HackIllinois/Assets.xcassets/iPadOnboarding1.imageset/homepage_ipad 1@3x.png b/HackIllinois/Assets.xcassets/iPadOnboarding1.imageset/homepage_ipad 1@3x.png new file mode 100644 index 00000000..108ff24c Binary files /dev/null and b/HackIllinois/Assets.xcassets/iPadOnboarding1.imageset/homepage_ipad 1@3x.png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding3.imageset/Contents.json b/HackIllinois/Assets.xcassets/iPadOnboarding2.imageset/Contents.json similarity index 67% rename from HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding3.imageset/Contents.json rename to HackIllinois/Assets.xcassets/iPadOnboarding2.imageset/Contents.json index b57870b0..c9c160b3 100644 --- a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding3.imageset/Contents.json +++ b/HackIllinois/Assets.xcassets/iPadOnboarding2.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "Group 11.png", + "filename" : "schedule_ipad 1.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "Group 11@2x.png", + "filename" : "schedule_ipad 1@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group 11@3x.png", + "filename" : "schedule_ipad 1@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/HackIllinois/Assets.xcassets/iPadOnboarding2.imageset/schedule_ipad 1.png b/HackIllinois/Assets.xcassets/iPadOnboarding2.imageset/schedule_ipad 1.png new file mode 100644 index 00000000..f0b31de4 Binary files /dev/null and b/HackIllinois/Assets.xcassets/iPadOnboarding2.imageset/schedule_ipad 1.png differ diff --git a/HackIllinois/Assets.xcassets/iPadOnboarding2.imageset/schedule_ipad 1@2x.png b/HackIllinois/Assets.xcassets/iPadOnboarding2.imageset/schedule_ipad 1@2x.png new file mode 100644 index 00000000..6107e0a1 Binary files /dev/null and b/HackIllinois/Assets.xcassets/iPadOnboarding2.imageset/schedule_ipad 1@2x.png differ diff --git a/HackIllinois/Assets.xcassets/iPadOnboarding2.imageset/schedule_ipad 1@3x.png b/HackIllinois/Assets.xcassets/iPadOnboarding2.imageset/schedule_ipad 1@3x.png new file mode 100644 index 00000000..95acf3db Binary files /dev/null and b/HackIllinois/Assets.xcassets/iPadOnboarding2.imageset/schedule_ipad 1@3x.png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding0.imageset/Contents.json b/HackIllinois/Assets.xcassets/iPadOnboarding3.imageset/Contents.json similarity index 68% rename from HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding0.imageset/Contents.json rename to HackIllinois/Assets.xcassets/iPadOnboarding3.imageset/Contents.json index 609a5917..4220e54f 100644 --- a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding0.imageset/Contents.json +++ b/HackIllinois/Assets.xcassets/iPadOnboarding3.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "Group 8.png", + "filename" : "scanqr_ipad 2.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "Group 8@2x.png", + "filename" : "scanqr_ipad 2@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group 8@3x.png", + "filename" : "scanqr_ipad 2@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/HackIllinois/Assets.xcassets/iPadOnboarding3.imageset/scanqr_ipad 2.png b/HackIllinois/Assets.xcassets/iPadOnboarding3.imageset/scanqr_ipad 2.png new file mode 100644 index 00000000..757d8d7e Binary files /dev/null and b/HackIllinois/Assets.xcassets/iPadOnboarding3.imageset/scanqr_ipad 2.png differ diff --git a/HackIllinois/Assets.xcassets/iPadOnboarding3.imageset/scanqr_ipad 2@2x.png b/HackIllinois/Assets.xcassets/iPadOnboarding3.imageset/scanqr_ipad 2@2x.png new file mode 100644 index 00000000..145dd4ad Binary files /dev/null and b/HackIllinois/Assets.xcassets/iPadOnboarding3.imageset/scanqr_ipad 2@2x.png differ diff --git a/HackIllinois/Assets.xcassets/iPadOnboarding3.imageset/scanqr_ipad 2@3x.png b/HackIllinois/Assets.xcassets/iPadOnboarding3.imageset/scanqr_ipad 2@3x.png new file mode 100644 index 00000000..d40e1e13 Binary files /dev/null and b/HackIllinois/Assets.xcassets/iPadOnboarding3.imageset/scanqr_ipad 2@3x.png differ diff --git a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding1.imageset/Contents.json b/HackIllinois/Assets.xcassets/iPadOnboarding4.imageset/Contents.json similarity index 67% rename from HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding1.imageset/Contents.json rename to HackIllinois/Assets.xcassets/iPadOnboarding4.imageset/Contents.json index 2c2154a8..90e55395 100644 --- a/HackIllinois/Assets.xcassets/Onboarding/iPadOnboarding1.imageset/Contents.json +++ b/HackIllinois/Assets.xcassets/iPadOnboarding4.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "Group 9.png", + "filename" : "Profile_ipad 2.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "Group 9@2x.png", + "filename" : "Profile_ipad 2@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group 9@3x.png", + "filename" : "Profile_ipad 2@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/HackIllinois/Assets.xcassets/iPadOnboarding4.imageset/Profile_ipad 2.png b/HackIllinois/Assets.xcassets/iPadOnboarding4.imageset/Profile_ipad 2.png new file mode 100644 index 00000000..17ec8c24 Binary files /dev/null and b/HackIllinois/Assets.xcassets/iPadOnboarding4.imageset/Profile_ipad 2.png differ diff --git a/HackIllinois/Assets.xcassets/iPadOnboarding4.imageset/Profile_ipad 2@2x.png b/HackIllinois/Assets.xcassets/iPadOnboarding4.imageset/Profile_ipad 2@2x.png new file mode 100644 index 00000000..bc81fd46 Binary files /dev/null and b/HackIllinois/Assets.xcassets/iPadOnboarding4.imageset/Profile_ipad 2@2x.png differ diff --git a/HackIllinois/Assets.xcassets/iPadOnboarding4.imageset/Profile_ipad 2@3x.png b/HackIllinois/Assets.xcassets/iPadOnboarding4.imageset/Profile_ipad 2@3x.png new file mode 100644 index 00000000..86638456 Binary files /dev/null and b/HackIllinois/Assets.xcassets/iPadOnboarding4.imageset/Profile_ipad 2@3x.png differ diff --git a/HackIllinois/Assets.xcassets/iPadOnboarding5.imageset/Contents.json b/HackIllinois/Assets.xcassets/iPadOnboarding5.imageset/Contents.json new file mode 100644 index 00000000..617ba2fb --- /dev/null +++ b/HackIllinois/Assets.xcassets/iPadOnboarding5.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "pointshop_ipad 2.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "pointshop_ipad 2@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "pointshop_ipad 2@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/HackIllinois/Assets.xcassets/iPadOnboarding5.imageset/pointshop_ipad 2.png b/HackIllinois/Assets.xcassets/iPadOnboarding5.imageset/pointshop_ipad 2.png new file mode 100644 index 00000000..1a2e1236 Binary files /dev/null and b/HackIllinois/Assets.xcassets/iPadOnboarding5.imageset/pointshop_ipad 2.png differ diff --git a/HackIllinois/Assets.xcassets/iPadOnboarding5.imageset/pointshop_ipad 2@2x.png b/HackIllinois/Assets.xcassets/iPadOnboarding5.imageset/pointshop_ipad 2@2x.png new file mode 100644 index 00000000..b58e0087 Binary files /dev/null and b/HackIllinois/Assets.xcassets/iPadOnboarding5.imageset/pointshop_ipad 2@2x.png differ diff --git a/HackIllinois/Assets.xcassets/iPadOnboarding5.imageset/pointshop_ipad 2@3x.png b/HackIllinois/Assets.xcassets/iPadOnboarding5.imageset/pointshop_ipad 2@3x.png new file mode 100644 index 00000000..01f498f5 Binary files /dev/null and b/HackIllinois/Assets.xcassets/iPadOnboarding5.imageset/pointshop_ipad 2@3x.png differ diff --git a/HackIllinois/SwiftUI/HIOnboardingViewModel.swift b/HackIllinois/SwiftUI/HIOnboardingViewModel.swift index 2f68a22f..ab488075 100644 --- a/HackIllinois/SwiftUI/HIOnboardingViewModel.swift +++ b/HackIllinois/SwiftUI/HIOnboardingViewModel.swift @@ -15,11 +15,11 @@ import SwiftUI class HIOnboardingViewModel: ObservableObject { @Published var data: [CarouselData] = UIDevice.current.userInterfaceIdiom == .pad ? [ CarouselData(image: #imageLiteral(resourceName: "Onboarding0"), titleText: "Welcome", descriptionText: "Swipe to see what our app has to offer!"), - CarouselData(image: UIImage(named: "iPadOnboarding0"), titleText: "Countdown", descriptionText: "See how much time you have left to hack!"), - CarouselData(image: UIImage(named: "iPadOnboarding1"), titleText: "Schedule", descriptionText: "See the times and details of all of our events."), - CarouselData(image: UIImage(named: "iPadOnboarding2"), titleText: "Scanner", descriptionText: "Scan QR codes to obtain points and redeem items from the point shop."), - CarouselData(image: UIImage(named: "iPadOnboarding3"), titleText: "Profile", descriptionText: "View your QR code, food wave, and other personal information."), - CarouselData(image: UIImage(named: "iPadOnboarding4"), titleText: "Point Shop", descriptionText: "View the available prizes you can redeem using your earned coins!") + CarouselData(image: UIImage(named: "iPadOnboarding1"), titleText: "Countdown", descriptionText: "See how much time you have left to hack!"), + CarouselData(image: UIImage(named: "iPadOnboarding2"), titleText: "Schedule", descriptionText: "See the times and details of all of our events."), + CarouselData(image: UIImage(named: "iPadOnboarding3"), titleText: "Scanner", descriptionText: "Scan QR codes to obtain points and redeem items from the point shop."), + CarouselData(image: UIImage(named: "iPadOnboarding4"), titleText: "Profile", descriptionText: "View your QR code, food wave, and other personal information."), + CarouselData(image: UIImage(named: "iPadOnboarding5"), titleText: "Point Shop", descriptionText: "View the available prizes you can redeem using your earned coins!") ] : [ CarouselData(image: #imageLiteral(resourceName: "Onboarding0"), titleText: "Welcome", descriptionText: "Swipe to see what our app has to offer!"), CarouselData(image: UIImage(named: "Onboarding1"), titleText: "Countdown", descriptionText: "See how much time you have left to hack!"), diff --git a/HackIllinois/ViewControllers/HIOnboardingViewController.swift b/HackIllinois/ViewControllers/HIOnboardingViewController.swift index 1f83d137..07e0bb1d 100644 --- a/HackIllinois/ViewControllers/HIOnboardingViewController.swift +++ b/HackIllinois/ViewControllers/HIOnboardingViewController.swift @@ -33,7 +33,12 @@ class HIOnboardingViewController: HIBaseViewController { } @objc dynamic override func setUpBackgroundView() { super.setUpBackgroundView() - backgroundView.image = #imageLiteral(resourceName: "Login") + + if UIDevice.current.userInterfaceIdiom == .pad { + backgroundView.image = #imageLiteral(resourceName: "iPadLogin") + } else { + backgroundView.image = #imageLiteral(resourceName: "Login") + } } } @@ -44,12 +49,11 @@ extension HIOnboardingViewController { carouselView = HICarouselView(pages: 6) if UIDevice.current.userInterfaceIdiom == .pad { carouselData.append(.init(image: #imageLiteral(resourceName: "Onboarding0"), titleText: "Welcome", descriptionText: "Swipe to see what our app has to offer!")) - carouselData.append(.init(image: UIImage(named: "iPadOnboarding0"), titleText: "Countdown", descriptionText: "See how much time you have left to hack!")) - carouselData.append(.init(image: UIImage(named: "iPadOnboarding1"), titleText: "Schedule", descriptionText: "See the times and details of all of our events.")) - carouselData.append(.init(image: UIImage(named: "iPadOnboarding2"), titleText: "Scanner", descriptionText: "Scan QR codes to obtain points and redeem items from the point shop.")) - carouselData.append(.init(image: UIImage(named: "iPadOnboarding3"), titleText: "Profile", descriptionText: "View your QR code, food wave, and other personal information.")) - carouselData.append(.init(image: UIImage(named: "iPadOnboarding4"), titleText: "Point Shop", - descriptionText: "View the available prizes you can redeem using your earned coins!")) + carouselData.append(.init(image: UIImage(named: "iPadOnboarding1"), titleText: "Countdown", descriptionText: "See how much time you have left to hack!")) + carouselData.append(.init(image: UIImage(named: "iPadOnboarding2"), titleText: "Schedule", descriptionText: "See the times and details of all of our events.")) + carouselData.append(.init(image: UIImage(named: "iPadOnboarding3"), titleText: "Scanner", descriptionText: "Scan QR codes to obtain points and redeem items from the point shop.")) + carouselData.append(.init(image: UIImage(named: "iPadOnboarding4"), titleText: "Profile", descriptionText: "View your QR code, food wave, and other personal information.")) + carouselData.append(.init(image: UIImage(named: "iPadOnboarding5"), titleText: "Point Shop", descriptionText: "View the available prizes you can redeem using your earned coins!")) } else { carouselData.append(.init(image: #imageLiteral(resourceName: "Onboarding0"), titleText: "Welcome", descriptionText: "Swipe to see what our app has to offer!")) carouselData.append(.init(image: UIImage(named: "Onboarding1"), titleText: "Countdown", descriptionText: "See how much time you have left to hack!")) diff --git a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/App Store iOS.png b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/App Store iOS.png index 4934e06b..d4b9a52b 100644 Binary files a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/App Store iOS.png and b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/App Store iOS.png differ diff --git a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Contents.json b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Contents.json index 5168b31d..1a2cc3f5 100644 --- a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Contents.json +++ b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "iPhone Settings 29x29pt @1x.png", + "filename" : "iPhone Settings 29x29pt @2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" @@ -49,7 +49,7 @@ "size" : "1024x1024" }, { - "filename" : "Messages 27x20pt @2x (3).png", + "filename" : "Messages 27x20pt @2x.png", "idiom" : "universal", "platform" : "ios", "scale" : "2x", diff --git a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages 27x20pt @ 3x.png b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages 27x20pt @ 3x.png index 4f525b5f..e3d0aaa5 100644 Binary files a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages 27x20pt @ 3x.png and b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages 27x20pt @ 3x.png differ diff --git a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages 27x20pt @2x (3).png b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages 27x20pt @2x (3).png deleted file mode 100644 index 218764b0..00000000 Binary files a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages 27x20pt @2x (3).png and /dev/null differ diff --git a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages 27x20pt @2x.png b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages 27x20pt @2x.png new file mode 100644 index 00000000..c0070c51 Binary files /dev/null and b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages 27x20pt @2x.png differ diff --git a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages 32x24pt @ 2x.png b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages 32x24pt @ 2x.png index 7a58109c..6fea37c5 100644 Binary files a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages 32x24pt @ 2x.png and b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages 32x24pt @ 2x.png differ diff --git a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages 32x24pt @ 3x.png b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages 32x24pt @ 3x.png index 0bf4565a..c3db9515 100644 Binary files a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages 32x24pt @ 3x.png and b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages 32x24pt @ 3x.png differ diff --git a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages App Store.png b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages App Store.png index 49f642d9..25b321e8 100644 Binary files a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages App Store.png and b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages App Store.png differ diff --git a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages iPad Pro.png b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages iPad Pro.png index 49022d11..9fa307cd 100644 Binary files a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages iPad Pro.png and b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages iPad Pro.png differ diff --git a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages iPad.png b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages iPad.png index 67e66b6d..39e4616c 100644 Binary files a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages iPad.png and b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages iPad.png differ diff --git a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages iPhone 60x45pt @ 2x.png b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages iPhone 60x45pt @ 2x.png index 3ec18b75..470bf16b 100644 Binary files a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages iPhone 60x45pt @ 2x.png and b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages iPhone 60x45pt @ 2x.png differ diff --git a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages iPhone 60x45pt @ 3x.png b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages iPhone 60x45pt @ 3x.png index c74cfe27..b33738aa 100644 Binary files a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages iPhone 60x45pt @ 3x.png and b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/Messages iPhone 60x45pt @ 3x.png differ diff --git a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/iPad Settings.png b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/iPad Settings.png index 9ed92345..ae02c8c7 100644 Binary files a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/iPad Settings.png and b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/iPad Settings.png differ diff --git a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/iPhone Settings 29x29pt @ 3x.png b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/iPhone Settings 29x29pt @ 3x.png index f316c48e..3093bec8 100644 Binary files a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/iPhone Settings 29x29pt @ 3x.png and b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/iPhone Settings 29x29pt @ 3x.png differ diff --git a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/iPhone Settings 29x29pt @1x.png b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/iPhone Settings 29x29pt @1x.png deleted file mode 100644 index 5d501448..00000000 Binary files a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/iPhone Settings 29x29pt @1x.png and /dev/null differ diff --git a/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/iPhone Settings 29x29pt @2x.png b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/iPhone Settings 29x29pt @2x.png new file mode 100644 index 00000000..ae02c8c7 Binary files /dev/null and b/Stickers/Stickers.xcassets/iMessage App Icon.stickersiconset/iPhone Settings 29x29pt @2x.png differ