diff --git a/Feels.xcodeproj/project.pbxproj b/Feels.xcodeproj/project.pbxproj index cd5ee1a..967c339 100644 --- a/Feels.xcodeproj/project.pbxproj +++ b/Feels.xcodeproj/project.pbxproj @@ -50,6 +50,8 @@ 1C361F1127C03C3D00E832FC /* OnboardingTime.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CA03772279A293D00D26164 /* OnboardingTime.swift */; }; 1C361F1427C03C8600E832FC /* OnboardingDataDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C361F1327C03C8600E832FC /* OnboardingDataDataManager.swift */; }; 1C361F1727C046D800E832FC /* MonthDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C361F1627C046D800E832FC /* MonthDetailView.swift */; }; + 1C414BF127D3CAB300BC1720 /* OnboardingData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C5F4975279C84090092F1B4 /* OnboardingData.swift */; }; + 1C414BF527D3CB2200BC1720 /* OnboardingDay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CA03774279A294800D26164 /* OnboardingDay.swift */; }; 1C4FF3BB27BEDDF000BE8F34 /* ShowBasedOnVoteLogics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4FF3BA27BEDDF000BE8F34 /* ShowBasedOnVoteLogics.swift */; }; 1C4FF3BC27BEDF6600BE8F34 /* ShowBasedOnVoteLogics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4FF3BA27BEDDF000BE8F34 /* ShowBasedOnVoteLogics.swift */; }; 1C4FF3BE27BEDF9100BE8F34 /* PersistenceHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4FF3BD27BEDF9100BE8F34 /* PersistenceHelper.swift */; }; @@ -66,7 +68,6 @@ 1C658D7827C0744D003231EE /* PersistenceUPDATE.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C658D7627C0744D003231EE /* PersistenceUPDATE.swift */; }; 1C683FCA2792281400745862 /* Stats.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C683FC92792281400745862 /* Stats.swift */; }; 1C683FCB2792281400745862 /* Stats.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C683FC92792281400745862 /* Stats.swift */; }; - 1C683FCC2792281400745862 /* Stats.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C683FC92792281400745862 /* Stats.swift */; }; 1C744F2C278CE15600953A57 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C744F2B278CE15600953A57 /* AppDelegate.swift */; }; 1C747CC9279F06EB00762CBD /* CloudKitSyncMonitor in Frameworks */ = {isa = PBXBuildFile; productRef = 1C747CC8279F06EB00762CBD /* CloudKitSyncMonitor */; }; 1C76E86E27C882A400ADEE1F /* SharingImageModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C76E86D27C882A400ADEE1F /* SharingImageModels.swift */; }; @@ -111,7 +112,6 @@ 1CD90B53278C7E7A001C4FEA /* FeelsWidget.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B4E278C7E7A001C4FEA /* FeelsWidget.intentdefinition */; }; 1CD90B56278C7E7A001C4FEA /* FeelsWidgetExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 1CD90B45278C7E7A001C4FEA /* FeelsWidgetExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 1CD90B5D278C7EAD001C4FEA /* Random.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B5C278C7EAD001C4FEA /* Random.swift */; }; - 1CD90B5E278C7EAD001C4FEA /* Random.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B5C278C7EAD001C4FEA /* Random.swift */; }; 1CD90B5F278C7EAD001C4FEA /* Random.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B5C278C7EAD001C4FEA /* Random.swift */; }; 1CD90B63278C7EBA001C4FEA /* Mood.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B61278C7EBA001C4FEA /* Mood.swift */; }; 1CD90B64278C7EBA001C4FEA /* Mood.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B61278C7EBA001C4FEA /* Mood.swift */; }; @@ -855,7 +855,6 @@ 1CD90B64278C7EBA001C4FEA /* Mood.swift in Sources */, 1CD90B17278C7DE0001C4FEA /* Feels.xcdatamodeld in Sources */, 1CD90B67278C7EBA001C4FEA /* MoodEntryExtension.swift in Sources */, - 1CD90B5E278C7EAD001C4FEA /* Random.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -863,9 +862,10 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 1C414BF127D3CAB300BC1720 /* OnboardingData.swift in Sources */, 1CD90B09278C7DE0001C4FEA /* Tests_iOSLaunchTests.swift in Sources */, - 1C683FCC2792281400745862 /* Stats.swift in Sources */, 1CD90B07278C7DE0001C4FEA /* Tests_iOS.swift in Sources */, + 1C414BF527D3CB2200BC1720 /* OnboardingDay.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1076,7 +1076,7 @@ CODE_SIGN_ENTITLEMENTS = "Feels (iOS)Dev.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = V3PF3M6B6U; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; @@ -1112,7 +1112,7 @@ CODE_SIGN_ENTITLEMENTS = "Feels (iOS).entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = V3PF3M6B6U; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; diff --git a/FeelsWidget/FeelsWidget.swift b/FeelsWidget/FeelsWidget.swift index 707de57..507ab01 100644 --- a/FeelsWidget/FeelsWidget.swift +++ b/FeelsWidget/FeelsWidget.swift @@ -32,7 +32,7 @@ struct TimeLineCreator { var timeLineView = [WatchTimelineView]() var startDayOffset = 0 - if !UserDefaultsStore.getOnboarding().ableToVoteBasedOnCurentTime() { + if !ShowBasedOnVoteLogics.ableToVoteBasedOnCurentTime(voteDate: UserDefaultsStore.getOnboarding().date) { startDayOffset = 1 } @@ -267,7 +267,8 @@ struct SmallGraphicWidgetView: View { IconView(iconViewModel: IconViewModel(backgroundImage: first.graphic, bgColor: first.color, bgOverlayColor: first.secondaryColor, - centerImage: first.graphic)) + centerImage: first.graphic, + innerColor: first.color)) } else { IconView(iconViewModel: IconViewModel.great) } diff --git a/Shared/AppDelegate.swift b/Shared/AppDelegate.swift index c478ad3..0f962d5 100644 --- a/Shared/AppDelegate.swift +++ b/Shared/AppDelegate.swift @@ -16,6 +16,7 @@ class AppDelegate: NSObject, UIApplicationDelegate { func application(_ application: UIApplication, willFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool { // PersistenceController.shared.clearDB() +// PersistenceController.shared.deleteLast(numberOfEntries: 5) PersistenceController.shared.removeNoForDates() PersistenceController.shared.fillInMissingDates() UNUserNotificationCenter.current().delegate = self diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/100.png b/Shared/Assets.xcassets/AppIcon.appiconset/100.png deleted file mode 100644 index 76d1e10..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/100.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/1024.png b/Shared/Assets.xcassets/AppIcon.appiconset/1024.png deleted file mode 100644 index f698582..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/1024.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/114.png b/Shared/Assets.xcassets/AppIcon.appiconset/114.png deleted file mode 100644 index 5ac8d06..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/114.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/120.png b/Shared/Assets.xcassets/AppIcon.appiconset/120.png deleted file mode 100644 index 05f4ae0..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/120.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/128.png b/Shared/Assets.xcassets/AppIcon.appiconset/128.png deleted file mode 100644 index 6d33342..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/128.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/144.png b/Shared/Assets.xcassets/AppIcon.appiconset/144.png deleted file mode 100644 index 50044d5..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/144.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/152.png b/Shared/Assets.xcassets/AppIcon.appiconset/152.png deleted file mode 100644 index 0efe3da..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/152.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/16.png b/Shared/Assets.xcassets/AppIcon.appiconset/16.png deleted file mode 100644 index 1953cca..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/16.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/167.png b/Shared/Assets.xcassets/AppIcon.appiconset/167.png deleted file mode 100644 index af62278..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/167.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/172.png b/Shared/Assets.xcassets/AppIcon.appiconset/172.png deleted file mode 100644 index ba56ff5..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/172.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/180.png b/Shared/Assets.xcassets/AppIcon.appiconset/180.png deleted file mode 100644 index db4e55c..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/180.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/196.png b/Shared/Assets.xcassets/AppIcon.appiconset/196.png deleted file mode 100644 index 9b7551f..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/196.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/20.png b/Shared/Assets.xcassets/AppIcon.appiconset/20.png deleted file mode 100644 index c029149..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/20.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/216.png b/Shared/Assets.xcassets/AppIcon.appiconset/216.png deleted file mode 100644 index da482c8..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/216.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/256.png b/Shared/Assets.xcassets/AppIcon.appiconset/256.png deleted file mode 100644 index f4523a8..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/256.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/29.png b/Shared/Assets.xcassets/AppIcon.appiconset/29.png deleted file mode 100644 index 87d2405..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/29.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/32.png b/Shared/Assets.xcassets/AppIcon.appiconset/32.png deleted file mode 100644 index 4583a37..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/32.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/40.png b/Shared/Assets.xcassets/AppIcon.appiconset/40.png deleted file mode 100644 index f31117b..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/40.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/48.png b/Shared/Assets.xcassets/AppIcon.appiconset/48.png deleted file mode 100644 index c58a1ac..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/48.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/50.png b/Shared/Assets.xcassets/AppIcon.appiconset/50.png deleted file mode 100644 index d5eadf0..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/50.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/512.png b/Shared/Assets.xcassets/AppIcon.appiconset/512.png deleted file mode 100644 index a646907..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/512.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/55.png b/Shared/Assets.xcassets/AppIcon.appiconset/55.png deleted file mode 100644 index 907f5cc..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/55.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/57.png b/Shared/Assets.xcassets/AppIcon.appiconset/57.png deleted file mode 100644 index ecc807f..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/57.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/58.png b/Shared/Assets.xcassets/AppIcon.appiconset/58.png deleted file mode 100644 index c8bbf5b..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/58.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/60.png b/Shared/Assets.xcassets/AppIcon.appiconset/60.png deleted file mode 100644 index beec75f..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/60.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/64.png b/Shared/Assets.xcassets/AppIcon.appiconset/64.png deleted file mode 100644 index bf9e91a..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/64.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/72.png b/Shared/Assets.xcassets/AppIcon.appiconset/72.png deleted file mode 100644 index 6bf2427..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/72.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/76.png b/Shared/Assets.xcassets/AppIcon.appiconset/76.png deleted file mode 100644 index d7e4d4c..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/76.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/80.png b/Shared/Assets.xcassets/AppIcon.appiconset/80.png deleted file mode 100644 index 6297cf4..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/80.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/87.png b/Shared/Assets.xcassets/AppIcon.appiconset/87.png deleted file mode 100644 index 8ca0d5d..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/87.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/88.png b/Shared/Assets.xcassets/AppIcon.appiconset/88.png deleted file mode 100644 index c153421..0000000 Binary files a/Shared/Assets.xcassets/AppIcon.appiconset/88.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/AppIcon.png b/Shared/Assets.xcassets/AppIcon.appiconset/AppIcon.png new file mode 100644 index 0000000..f564135 Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/AppIcon.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/Contents.json b/Shared/Assets.xcassets/AppIcon.appiconset/Contents.json index 04de9d4..2e47aab 100644 --- a/Shared/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Shared/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,326 +1,112 @@ { "images" : [ { - "filename" : "40.png", + "filename" : "iPhone-Notification-20@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { - "filename" : "60.png", + "filename" : "iPhone-Notification-20@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { - "filename" : "29.png", - "idiom" : "iphone", - "scale" : "1x", - "size" : "29x29" - }, - { - "filename" : "58.png", + "filename" : "iPhone-29@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { - "filename" : "87.png", + "filename" : "iPhone-29@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { - "filename" : "80.png", + "filename" : "iPhone-Spotlight-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { - "filename" : "120.png", + "filename" : "iPhone-Spotlight-40@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { - "filename" : "57.png", - "idiom" : "iphone", - "scale" : "1x", - "size" : "57x57" - }, - { - "filename" : "114.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "57x57" - }, - { - "filename" : "120.png", + "filename" : "iPhone-App-60@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { - "filename" : "180.png", + "filename" : "iPhone-App-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "filename" : "20.png", + "filename" : "iPad-Notification-20@1x.png", "idiom" : "ipad", "scale" : "1x", "size" : "20x20" }, { - "filename" : "40.png", + "filename" : "iPad-Notification-20@2x.png", "idiom" : "ipad", "scale" : "2x", "size" : "20x20" }, { - "filename" : "29.png", + "filename" : "iPad-Settings-29@1x.png", "idiom" : "ipad", "scale" : "1x", "size" : "29x29" }, { - "filename" : "58.png", + "filename" : "iPad-Settings-29@2x.png", "idiom" : "ipad", "scale" : "2x", "size" : "29x29" }, { - "filename" : "40.png", + "filename" : "iPad-Spotlight-40@1x.png", "idiom" : "ipad", "scale" : "1x", "size" : "40x40" }, { - "filename" : "80.png", + "filename" : "iPad-Spotlight-40@2x.png", "idiom" : "ipad", "scale" : "2x", "size" : "40x40" }, { - "filename" : "50.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "50x50" - }, - { - "filename" : "100.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "50x50" - }, - { - "filename" : "72.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "72x72" - }, - { - "filename" : "144.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "72x72" - }, - { - "filename" : "76.png", + "filename" : "iPad-Spotlight-76@1x.png", "idiom" : "ipad", "scale" : "1x", "size" : "76x76" }, { - "filename" : "152.png", + "filename" : "iPad-Spotlight-76@2x.png", "idiom" : "ipad", "scale" : "2x", "size" : "76x76" }, { - "filename" : "167.png", + "filename" : "iPad-Pro-83.5@2x.png", "idiom" : "ipad", "scale" : "2x", "size" : "83.5x83.5" }, { - "filename" : "1024.png", + "filename" : "AppIcon.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" - }, - { - "filename" : "48.png", - "idiom" : "watch", - "role" : "notificationCenter", - "scale" : "2x", - "size" : "24x24", - "subtype" : "38mm" - }, - { - "filename" : "55.png", - "idiom" : "watch", - "role" : "notificationCenter", - "scale" : "2x", - "size" : "27.5x27.5", - "subtype" : "42mm" - }, - { - "filename" : "58.png", - "idiom" : "watch", - "role" : "companionSettings", - "scale" : "2x", - "size" : "29x29" - }, - { - "filename" : "87.png", - "idiom" : "watch", - "role" : "companionSettings", - "scale" : "3x", - "size" : "29x29" - }, - { - "idiom" : "watch", - "role" : "notificationCenter", - "scale" : "2x", - "size" : "33x33", - "subtype" : "45mm" - }, - { - "filename" : "80.png", - "idiom" : "watch", - "role" : "appLauncher", - "scale" : "2x", - "size" : "40x40", - "subtype" : "38mm" - }, - { - "filename" : "88.png", - "idiom" : "watch", - "role" : "appLauncher", - "scale" : "2x", - "size" : "44x44", - "subtype" : "40mm" - }, - { - "idiom" : "watch", - "role" : "appLauncher", - "scale" : "2x", - "size" : "46x46", - "subtype" : "41mm" - }, - { - "filename" : "100.png", - "idiom" : "watch", - "role" : "appLauncher", - "scale" : "2x", - "size" : "50x50", - "subtype" : "44mm" - }, - { - "idiom" : "watch", - "role" : "appLauncher", - "scale" : "2x", - "size" : "51x51", - "subtype" : "45mm" - }, - { - "filename" : "172.png", - "idiom" : "watch", - "role" : "quickLook", - "scale" : "2x", - "size" : "86x86", - "subtype" : "38mm" - }, - { - "filename" : "196.png", - "idiom" : "watch", - "role" : "quickLook", - "scale" : "2x", - "size" : "98x98", - "subtype" : "42mm" - }, - { - "filename" : "216.png", - "idiom" : "watch", - "role" : "quickLook", - "scale" : "2x", - "size" : "108x108", - "subtype" : "44mm" - }, - { - "idiom" : "watch", - "role" : "quickLook", - "scale" : "2x", - "size" : "117x117", - "subtype" : "45mm" - }, - { - "filename" : "1024.png", - "idiom" : "watch-marketing", - "scale" : "1x", - "size" : "1024x1024" - }, - { - "filename" : "16.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "16x16" - }, - { - "filename" : "32.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "16x16" - }, - { - "filename" : "32.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "32x32" - }, - { - "filename" : "64.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "32x32" - }, - { - "filename" : "128.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "128x128" - }, - { - "filename" : "256.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "128x128" - }, - { - "filename" : "256.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "256x256" - }, - { - "filename" : "512.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "256x256" - }, - { - "filename" : "512.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "512x512" - }, - { - "filename" : "1024.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "512x512" } ], "info" : { diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Notification-20@1x.png new file mode 100644 index 0000000..8ee6763 Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Notification-20@1x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Notification-20@2x.png new file mode 100644 index 0000000..1547543 Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Pro-83.5@2x.png new file mode 100644 index 0000000..c851ea3 Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Pro-83.5@2x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Settings-29@1x.png new file mode 100644 index 0000000..51264c7 Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Settings-29@1x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Settings-29@2x.png new file mode 100644 index 0000000..5dc216f Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Settings-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-40@1x.png new file mode 100644 index 0000000..13383ed Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-40@1x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-40@2x.png new file mode 100644 index 0000000..8d45431 Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-76@1x.png new file mode 100644 index 0000000..af39cde Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-76@1x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-76@2x.png new file mode 100644 index 0000000..8da949a Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-76@2x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-29@2x.png new file mode 100644 index 0000000..e848d7f Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-29@3x.png new file mode 100644 index 0000000..9cfec82 Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-29@3x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-App-60@2x.png new file mode 100644 index 0000000..597460c Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-App-60@2x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-App-60@3x.png new file mode 100644 index 0000000..0b679b1 Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-App-60@3x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-Notification-20@2x.png new file mode 100644 index 0000000..1547543 Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-Notification-20@3x.png new file mode 100644 index 0000000..4db0e84 Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-Notification-20@3x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-Spotlight-40@2x.png new file mode 100644 index 0000000..99632b6 Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-Spotlight-40@3x.png new file mode 100644 index 0000000..597460c Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-Spotlight-40@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/AppIconAverage.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/AppIconAverage.png new file mode 100644 index 0000000..3481e6d Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/AppIconAverage.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconAverage.appiconset/Contents.json new file mode 100644 index 0000000..edebf0c --- /dev/null +++ b/Shared/Assets.xcassets/AppIconAverage.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images" : [ + { + "filename" : "iPhone-Notification-20@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPhone-Notification-20@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "iPhone-29@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPhone-29@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "iPhone-Spotlight-40@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPhone-Spotlight-40@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "iPhone-App-60@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "iPhone-App-60@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "iPad-Notification-20@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "iPad-Notification-20@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPad-Settings-29@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "iPad-Settings-29@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPad-Spotlight-40@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-40@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-76@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "iPad-Spotlight-76@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "iPad-Pro-83.5@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "AppIconAverage.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Notification-20@1x.png new file mode 100644 index 0000000..217dfb0 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Notification-20@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Notification-20@2x.png new file mode 100644 index 0000000..a8491d0 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Pro-83.5@2x.png new file mode 100644 index 0000000..723bba3 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Pro-83.5@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Settings-29@1x.png new file mode 100644 index 0000000..87067da Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Settings-29@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Settings-29@2x.png new file mode 100644 index 0000000..c73d6fc Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Settings-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-40@1x.png new file mode 100644 index 0000000..a8491d0 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-40@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-40@2x.png new file mode 100644 index 0000000..b680cb3 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-76@1x.png new file mode 100644 index 0000000..309c839 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-76@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-76@2x.png new file mode 100644 index 0000000..7d3e769 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-76@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-29@2x.png new file mode 100644 index 0000000..b0324e3 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-29@3x.png new file mode 100644 index 0000000..b6cf2eb Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-29@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-App-60@2x.png new file mode 100644 index 0000000..75caba2 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-App-60@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-App-60@3x.png new file mode 100644 index 0000000..1ddfe22 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-App-60@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-Notification-20@2x.png new file mode 100644 index 0000000..9a043c4 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-Notification-20@3x.png new file mode 100644 index 0000000..a8b61f1 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-Notification-20@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-Spotlight-40@2x.png new file mode 100644 index 0000000..4972e79 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-Spotlight-40@3x.png new file mode 100644 index 0000000..75caba2 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-Spotlight-40@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverageImage.imageset/AppIconAverage.png b/Shared/Assets.xcassets/AppIconAverageImage.imageset/AppIconAverage.png new file mode 100644 index 0000000..3481e6d Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverageImage.imageset/AppIconAverage.png differ diff --git a/Shared/Assets.xcassets/RedFeelsAppIcon.imageset/Contents.json b/Shared/Assets.xcassets/AppIconAverageImage.imageset/Contents.json similarity index 86% rename from Shared/Assets.xcassets/RedFeelsAppIcon.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconAverageImage.imageset/Contents.json index 2bb8aa5..5afa85a 100644 --- a/Shared/Assets.xcassets/RedFeelsAppIcon.imageset/Contents.json +++ b/Shared/Assets.xcassets/AppIconAverageImage.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "RedFeelsAppIcon.png", + "filename" : "AppIconAverage.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/AppIconBad.png b/Shared/Assets.xcassets/AppIconBad.appiconset/AppIconBad.png new file mode 100644 index 0000000..049fe6b Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/AppIconBad.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconBad.appiconset/Contents.json new file mode 100644 index 0000000..26f651f --- /dev/null +++ b/Shared/Assets.xcassets/AppIconBad.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images" : [ + { + "filename" : "iPhone-Notification-20@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPhone-Notification-20@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "iPhone-29@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPhone-29@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "iPhone-Spotlight-40@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPhone-Spotlight-40@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "iPhone-App-60@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "iPhone-App-60@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "iPad-Notification-20@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "iPad-Notification-20@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPad-Settings-29@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "iPad-Settings-29@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPad-Spotlight-40@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-40@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-76@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "iPad-Spotlight-76@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "iPad-Pro-83.5@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "AppIconBad.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Notification-20@1x.png new file mode 100644 index 0000000..4f6f49b Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Notification-20@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Notification-20@2x.png new file mode 100644 index 0000000..02fd6e5 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Pro-83.5@2x.png new file mode 100644 index 0000000..8778a21 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Pro-83.5@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Settings-29@1x.png new file mode 100644 index 0000000..28dc298 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Settings-29@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Settings-29@2x.png new file mode 100644 index 0000000..be5e33c Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Settings-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-40@1x.png new file mode 100644 index 0000000..02fd6e5 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-40@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-40@2x.png new file mode 100644 index 0000000..cc068c7 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-76@1x.png new file mode 100644 index 0000000..a587a2b Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-76@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-76@2x.png new file mode 100644 index 0000000..4a3de99 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-76@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-29@2x.png new file mode 100644 index 0000000..be5e33c Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-29@3x.png new file mode 100644 index 0000000..ad82a8c Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-29@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-App-60@2x.png new file mode 100644 index 0000000..52560c0 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-App-60@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-App-60@3x.png new file mode 100644 index 0000000..56ac067 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-App-60@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-Notification-20@2x.png new file mode 100644 index 0000000..02fd6e5 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-Notification-20@3x.png new file mode 100644 index 0000000..0c2c0db Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-Notification-20@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-Spotlight-40@2x.png new file mode 100644 index 0000000..cc068c7 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-Spotlight-40@3x.png new file mode 100644 index 0000000..52560c0 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-Spotlight-40@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconBadImage.imageset/AppIconBad.png b/Shared/Assets.xcassets/AppIconBadImage.imageset/AppIconBad.png new file mode 100644 index 0000000..049fe6b Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBadImage.imageset/AppIconBad.png differ diff --git a/Shared/Assets.xcassets/FeelsAppIcon.imageset/Contents.json b/Shared/Assets.xcassets/AppIconBadImage.imageset/Contents.json similarity index 87% rename from Shared/Assets.xcassets/FeelsAppIcon.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconBadImage.imageset/Contents.json index a6ae92c..6bfb89a 100644 --- a/Shared/Assets.xcassets/FeelsAppIcon.imageset/Contents.json +++ b/Shared/Assets.xcassets/AppIconBadImage.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "FeelsAppIcon.png", + "filename" : "AppIconBad.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/AppIconBlueGreen.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/AppIconBlueGreen.png new file mode 100644 index 0000000..14385af Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/AppIconBlueGreen.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/Contents.json new file mode 100644 index 0000000..10f1dc1 --- /dev/null +++ b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images" : [ + { + "filename" : "iPhone-Notification-20@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPhone-Notification-20@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "iPhone-29@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPhone-29@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "iPhone-Spotlight-40@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPhone-Spotlight-40@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "iPhone-App-60@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "iPhone-App-60@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "iPad-Notification-20@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "iPad-Notification-20@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPad-Settings-29@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "iPad-Settings-29@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPad-Spotlight-40@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-40@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-76@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "iPad-Spotlight-76@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "iPad-Pro-83.5@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "AppIconBlueGreen.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Notification-20@1x.png new file mode 100644 index 0000000..b29317c Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Notification-20@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Notification-20@2x.png new file mode 100644 index 0000000..511301e Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Pro-83.5@2x.png new file mode 100644 index 0000000..44cdbab Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Pro-83.5@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Settings-29@1x.png new file mode 100644 index 0000000..96f0844 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Settings-29@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Settings-29@2x.png new file mode 100644 index 0000000..d2aaa56 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Settings-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-40@1x.png new file mode 100644 index 0000000..511301e Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-40@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-40@2x.png new file mode 100644 index 0000000..6e4f441 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-76@1x.png new file mode 100644 index 0000000..1be1cb0 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-76@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-76@2x.png new file mode 100644 index 0000000..f82c843 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-76@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-29@2x.png new file mode 100644 index 0000000..2d9dba6 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-29@3x.png new file mode 100644 index 0000000..a04aa43 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-29@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-App-60@2x.png new file mode 100644 index 0000000..e50aea7 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-App-60@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-App-60@3x.png new file mode 100644 index 0000000..a327403 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-App-60@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Notification-20@2x.png new file mode 100644 index 0000000..63503bc Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Notification-20@3x.png new file mode 100644 index 0000000..9cfea9b Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Notification-20@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Spotlight-40@2x.png new file mode 100644 index 0000000..904ed36 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Spotlight-40@3x.png new file mode 100644 index 0000000..a8da8ba Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Spotlight-40@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreenImage.imageset/AppIconBlueGreen.png b/Shared/Assets.xcassets/AppIconBlueGreenImage.imageset/AppIconBlueGreen.png new file mode 100644 index 0000000..14385af Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreenImage.imageset/AppIconBlueGreen.png differ diff --git a/Shared/Assets.xcassets/PurpleFeelsAppIcon.imageset/Contents.json b/Shared/Assets.xcassets/AppIconBlueGreenImage.imageset/Contents.json similarity index 85% rename from Shared/Assets.xcassets/PurpleFeelsAppIcon.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconBlueGreenImage.imageset/Contents.json index 1ce14e8..bafde75 100644 --- a/Shared/Assets.xcassets/PurpleFeelsAppIcon.imageset/Contents.json +++ b/Shared/Assets.xcassets/AppIconBlueGreenImage.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "PurpleFeelsAppIcon.png", + "filename" : "AppIconBlueGreen.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/AppIconGood.png b/Shared/Assets.xcassets/AppIconGood.appiconset/AppIconGood.png new file mode 100644 index 0000000..77af65b Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/AppIconGood.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconGood.appiconset/Contents.json new file mode 100644 index 0000000..8af81e2 --- /dev/null +++ b/Shared/Assets.xcassets/AppIconGood.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images" : [ + { + "filename" : "iPhone-Notification-20@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPhone-Notification-20@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "iPhone-29@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPhone-29@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "iPhone-Spotlight-40@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPhone-Spotlight-40@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "iPhone-App-60@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "iPhone-App-60@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "iPad-Notification-20@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "iPad-Notification-20@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPad-Settings-29@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "iPad-Settings-29@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPad-Spotlight-40@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-40@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-76@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "iPad-Spotlight-76@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "iPad-Pro-83.5@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "AppIconGood.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Notification-20@1x.png new file mode 100644 index 0000000..1113f12 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Notification-20@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Notification-20@2x.png new file mode 100644 index 0000000..7bcd1a7 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Pro-83.5@2x.png new file mode 100644 index 0000000..029cc2e Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Pro-83.5@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Settings-29@1x.png new file mode 100644 index 0000000..c80b7bc Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Settings-29@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Settings-29@2x.png new file mode 100644 index 0000000..d005855 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Settings-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-40@1x.png new file mode 100644 index 0000000..7bcd1a7 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-40@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-40@2x.png new file mode 100644 index 0000000..ab0a363 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-76@1x.png new file mode 100644 index 0000000..3803ae0 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-76@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-76@2x.png new file mode 100644 index 0000000..6924b97 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-76@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-29@2x.png new file mode 100644 index 0000000..6fa35db Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-29@3x.png new file mode 100644 index 0000000..1ef27f1 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-29@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-App-60@2x.png new file mode 100644 index 0000000..08e546a Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-App-60@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-App-60@3x.png new file mode 100644 index 0000000..8ef213e Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-App-60@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-Notification-20@2x.png new file mode 100644 index 0000000..415ca9c Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-Notification-20@3x.png new file mode 100644 index 0000000..41121df Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-Notification-20@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-Spotlight-40@2x.png new file mode 100644 index 0000000..ab0a363 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-Spotlight-40@3x.png new file mode 100644 index 0000000..08e546a Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-Spotlight-40@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconGoodImage.imageset/AppIconGood.png b/Shared/Assets.xcassets/AppIconGoodImage.imageset/AppIconGood.png new file mode 100644 index 0000000..77af65b Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGoodImage.imageset/AppIconGood.png differ diff --git a/Shared/Assets.xcassets/AppIconGoodImage.imageset/Contents.json b/Shared/Assets.xcassets/AppIconGoodImage.imageset/Contents.json new file mode 100644 index 0000000..00c3215 --- /dev/null +++ b/Shared/Assets.xcassets/AppIconGoodImage.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "AppIconGood.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/AppIconHorrible.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/AppIconHorrible.png new file mode 100644 index 0000000..25340a9 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/AppIconHorrible.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconHorrible.appiconset/Contents.json new file mode 100644 index 0000000..e606adb --- /dev/null +++ b/Shared/Assets.xcassets/AppIconHorrible.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images" : [ + { + "filename" : "iPhone-Notification-20@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPhone-Notification-20@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "iPhone-29@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPhone-29@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "iPhone-Spotlight-40@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPhone-Spotlight-40@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "iPhone-App-60@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "iPhone-App-60@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "iPad-Notification-20@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "iPad-Notification-20@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPad-Settings-29@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "iPad-Settings-29@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPad-Spotlight-40@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-40@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-76@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "iPad-Spotlight-76@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "iPad-Pro-83.5@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "AppIconHorrible.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Notification-20@1x.png new file mode 100644 index 0000000..7d0aca3 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Notification-20@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Notification-20@2x.png new file mode 100644 index 0000000..6b89b41 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Pro-83.5@2x.png new file mode 100644 index 0000000..97ae2f9 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Pro-83.5@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Settings-29@1x.png new file mode 100644 index 0000000..4fa636c Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Settings-29@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Settings-29@2x.png new file mode 100644 index 0000000..8728d80 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Settings-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-40@1x.png new file mode 100644 index 0000000..6b89b41 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-40@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-40@2x.png new file mode 100644 index 0000000..ee7346c Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-76@1x.png new file mode 100644 index 0000000..dc1faee Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-76@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-76@2x.png new file mode 100644 index 0000000..61af921 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-76@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-29@2x.png new file mode 100644 index 0000000..032b270 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-29@3x.png new file mode 100644 index 0000000..15a9068 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-29@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-App-60@2x.png new file mode 100644 index 0000000..7176348 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-App-60@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-App-60@3x.png new file mode 100644 index 0000000..36dc66b Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-App-60@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Notification-20@2x.png new file mode 100644 index 0000000..40319a3 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Notification-20@3x.png new file mode 100644 index 0000000..e576677 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Notification-20@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Spotlight-40@2x.png new file mode 100644 index 0000000..b6f37c8 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Spotlight-40@3x.png new file mode 100644 index 0000000..7176348 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Spotlight-40@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorribleImage.imageset/AppIconHorrible.png b/Shared/Assets.xcassets/AppIconHorribleImage.imageset/AppIconHorrible.png new file mode 100644 index 0000000..25340a9 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorribleImage.imageset/AppIconHorrible.png differ diff --git a/Shared/Assets.xcassets/AppIconHorribleImage.imageset/Contents.json b/Shared/Assets.xcassets/AppIconHorribleImage.imageset/Contents.json new file mode 100644 index 0000000..f60efc4 --- /dev/null +++ b/Shared/Assets.xcassets/AppIconHorribleImage.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "AppIconHorrible.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconImage.imageset/AppIcon.png b/Shared/Assets.xcassets/AppIconImage.imageset/AppIcon.png new file mode 100644 index 0000000..f564135 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconImage.imageset/AppIcon.png differ diff --git a/Shared/Assets.xcassets/AppIconImage.imageset/Contents.json b/Shared/Assets.xcassets/AppIconImage.imageset/Contents.json new file mode 100644 index 0000000..df110f9 --- /dev/null +++ b/Shared/Assets.xcassets/AppIconImage.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "AppIcon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/AppIconNeonGreen.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/AppIconNeonGreen.png new file mode 100644 index 0000000..ce441c3 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/AppIconNeonGreen.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/Contents.json new file mode 100644 index 0000000..1740e39 --- /dev/null +++ b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images" : [ + { + "filename" : "iPhone-Notification-20@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPhone-Notification-20@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "iPhone-29@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPhone-29@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "iPhone-Spotlight-40@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPhone-Spotlight-40@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "iPhone-App-60@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "iPhone-App-60@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "iPad-Notification-20@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "iPad-Notification-20@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPad-Settings-29@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "iPad-Settings-29@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPad-Spotlight-40@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-40@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-76@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "iPad-Spotlight-76@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "iPad-Pro-83.5@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "AppIconNeonGreen.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Notification-20@1x.png new file mode 100644 index 0000000..7ae2532 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Notification-20@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Notification-20@2x.png new file mode 100644 index 0000000..6aa8a07 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Pro-83.5@2x.png new file mode 100644 index 0000000..21dcd0b Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Pro-83.5@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Settings-29@1x.png new file mode 100644 index 0000000..2a7a59e Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Settings-29@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Settings-29@2x.png new file mode 100644 index 0000000..22bb417 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Settings-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-40@1x.png new file mode 100644 index 0000000..6aa8a07 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-40@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-40@2x.png new file mode 100644 index 0000000..1ae1477 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-76@1x.png new file mode 100644 index 0000000..41d7572 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-76@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-76@2x.png new file mode 100644 index 0000000..313a498 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-76@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-29@2x.png new file mode 100644 index 0000000..22bb417 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-29@3x.png new file mode 100644 index 0000000..61f801d Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-29@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-App-60@2x.png new file mode 100644 index 0000000..156724a Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-App-60@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-App-60@3x.png new file mode 100644 index 0000000..5dd37be Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-App-60@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Notification-20@2x.png new file mode 100644 index 0000000..6aa8a07 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Notification-20@3x.png new file mode 100644 index 0000000..0943b90 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Notification-20@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Spotlight-40@2x.png new file mode 100644 index 0000000..1ae1477 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Spotlight-40@3x.png new file mode 100644 index 0000000..156724a Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Spotlight-40@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreenImage.imageset/AppIconNeonGreen.png b/Shared/Assets.xcassets/AppIconNeonGreenImage.imageset/AppIconNeonGreen.png new file mode 100644 index 0000000..ce441c3 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreenImage.imageset/AppIconNeonGreen.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreenImage.imageset/Contents.json b/Shared/Assets.xcassets/AppIconNeonGreenImage.imageset/Contents.json new file mode 100644 index 0000000..523210b --- /dev/null +++ b/Shared/Assets.xcassets/AppIconNeonGreenImage.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "AppIconNeonGreen.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/AppIconPink.png b/Shared/Assets.xcassets/AppIconPink.appiconset/AppIconPink.png new file mode 100644 index 0000000..de02b11 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/AppIconPink.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconPink.appiconset/Contents.json new file mode 100644 index 0000000..a1c2777 --- /dev/null +++ b/Shared/Assets.xcassets/AppIconPink.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images" : [ + { + "filename" : "iPhone-Notification-20@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPhone-Notification-20@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "iPhone-29@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPhone-29@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "iPhone-Spotlight-40@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPhone-Spotlight-40@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "iPhone-App-60@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "iPhone-App-60@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "iPad-Notification-20@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "iPad-Notification-20@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPad-Settings-29@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "iPad-Settings-29@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPad-Spotlight-40@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-40@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-76@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "iPad-Spotlight-76@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "iPad-Pro-83.5@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "AppIconPink.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Notification-20@1x.png new file mode 100644 index 0000000..2e961df Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Notification-20@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Notification-20@2x.png new file mode 100644 index 0000000..068b338 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Pro-83.5@2x.png new file mode 100644 index 0000000..20886a0 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Pro-83.5@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Settings-29@1x.png new file mode 100644 index 0000000..976c4b4 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Settings-29@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Settings-29@2x.png new file mode 100644 index 0000000..def5ce6 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Settings-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-40@1x.png new file mode 100644 index 0000000..b6fe156 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-40@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-40@2x.png new file mode 100644 index 0000000..7d1e7f6 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-76@1x.png new file mode 100644 index 0000000..223d113 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-76@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-76@2x.png new file mode 100644 index 0000000..4cd2ecc Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-76@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-29@2x.png new file mode 100644 index 0000000..81ea718 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-29@3x.png new file mode 100644 index 0000000..a15cb70 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-29@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-App-60@2x.png new file mode 100644 index 0000000..a3376ae Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-App-60@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-App-60@3x.png new file mode 100644 index 0000000..f6c411d Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-App-60@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-Notification-20@2x.png new file mode 100644 index 0000000..068b338 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-Notification-20@3x.png new file mode 100644 index 0000000..d8c79e0 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-Notification-20@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-Spotlight-40@2x.png new file mode 100644 index 0000000..fe7f8ce Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-Spotlight-40@3x.png new file mode 100644 index 0000000..a3376ae Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-Spotlight-40@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconPinkImage.imageset/AppIconPink.png b/Shared/Assets.xcassets/AppIconPinkImage.imageset/AppIconPink.png new file mode 100644 index 0000000..de02b11 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPinkImage.imageset/AppIconPink.png differ diff --git a/Shared/Assets.xcassets/AppIconPinkImage.imageset/Contents.json b/Shared/Assets.xcassets/AppIconPinkImage.imageset/Contents.json new file mode 100644 index 0000000..5d5c281 --- /dev/null +++ b/Shared/Assets.xcassets/AppIconPinkImage.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "AppIconPink.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/AppIconPurple.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/AppIconPurple.png new file mode 100644 index 0000000..b8e5a59 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/AppIconPurple.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconPurple.appiconset/Contents.json new file mode 100644 index 0000000..d11fbe5 --- /dev/null +++ b/Shared/Assets.xcassets/AppIconPurple.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images" : [ + { + "filename" : "iPhone-Notification-20@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPhone-Notification-20@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "iPhone-29@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPhone-29@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "iPhone-Spotlight-40@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPhone-Spotlight-40@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "iPhone-App-60@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "iPhone-App-60@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "iPad-Notification-20@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "iPad-Notification-20@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPad-Settings-29@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "iPad-Settings-29@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPad-Spotlight-40@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-40@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-76@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "iPad-Spotlight-76@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "iPad-Pro-83.5@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "AppIconPurple.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Notification-20@1x.png new file mode 100644 index 0000000..6476abf Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Notification-20@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Notification-20@2x.png new file mode 100644 index 0000000..8769e24 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Pro-83.5@2x.png new file mode 100644 index 0000000..e52cf9b Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Pro-83.5@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Settings-29@1x.png new file mode 100644 index 0000000..e30d17a Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Settings-29@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Settings-29@2x.png new file mode 100644 index 0000000..1ad0ad6 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Settings-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-40@1x.png new file mode 100644 index 0000000..8769e24 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-40@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-40@2x.png new file mode 100644 index 0000000..12e06d0 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-76@1x.png new file mode 100644 index 0000000..e14adf1 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-76@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-76@2x.png new file mode 100644 index 0000000..03ef10c Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-76@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-29@2x.png new file mode 100644 index 0000000..15e931b Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-29@3x.png new file mode 100644 index 0000000..875ac4b Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-29@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-App-60@2x.png new file mode 100644 index 0000000..32ef805 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-App-60@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-App-60@3x.png new file mode 100644 index 0000000..e6e1bbf Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-App-60@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-Notification-20@2x.png new file mode 100644 index 0000000..ad009c9 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-Notification-20@3x.png new file mode 100644 index 0000000..1f8843d Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-Notification-20@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-Spotlight-40@2x.png new file mode 100644 index 0000000..73893bc Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-Spotlight-40@3x.png new file mode 100644 index 0000000..32ef805 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-Spotlight-40@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurpleImage.imageset/AppIconPurple.png b/Shared/Assets.xcassets/AppIconPurpleImage.imageset/AppIconPurple.png new file mode 100644 index 0000000..b8e5a59 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurpleImage.imageset/AppIconPurple.png differ diff --git a/Shared/Assets.xcassets/AppIconPurpleImage.imageset/Contents.json b/Shared/Assets.xcassets/AppIconPurpleImage.imageset/Contents.json new file mode 100644 index 0000000..03d52c8 --- /dev/null +++ b/Shared/Assets.xcassets/AppIconPurpleImage.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "AppIconPurple.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/FeelsAppIcon.imageset/FeelsAppIcon.png b/Shared/Assets.xcassets/FeelsAppIcon.imageset/FeelsAppIcon.png deleted file mode 100644 index 5726843..0000000 Binary files a/Shared/Assets.xcassets/FeelsAppIcon.imageset/FeelsAppIcon.png and /dev/null differ diff --git a/Shared/Assets.xcassets/AverageGraphic.imageset/AverageGraphic.png b/Shared/Assets.xcassets/Graphics/AverageGraphic.imageset/AverageGraphic.png similarity index 100% rename from Shared/Assets.xcassets/AverageGraphic.imageset/AverageGraphic.png rename to Shared/Assets.xcassets/Graphics/AverageGraphic.imageset/AverageGraphic.png diff --git a/Shared/Assets.xcassets/AverageGraphic.imageset/Contents.json b/Shared/Assets.xcassets/Graphics/AverageGraphic.imageset/Contents.json similarity index 100% rename from Shared/Assets.xcassets/AverageGraphic.imageset/Contents.json rename to Shared/Assets.xcassets/Graphics/AverageGraphic.imageset/Contents.json diff --git a/Shared/Assets.xcassets/BadGraphic.imageset/BadGraphic.png b/Shared/Assets.xcassets/Graphics/BadGraphic.imageset/BadGraphic.png similarity index 100% rename from Shared/Assets.xcassets/BadGraphic.imageset/BadGraphic.png rename to Shared/Assets.xcassets/Graphics/BadGraphic.imageset/BadGraphic.png diff --git a/Shared/Assets.xcassets/BadGraphic.imageset/Contents.json b/Shared/Assets.xcassets/Graphics/BadGraphic.imageset/Contents.json similarity index 100% rename from Shared/Assets.xcassets/BadGraphic.imageset/Contents.json rename to Shared/Assets.xcassets/Graphics/BadGraphic.imageset/Contents.json diff --git a/Shared/Assets.xcassets/Graphics/Contents.json b/Shared/Assets.xcassets/Graphics/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Shared/Assets.xcassets/Graphics/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/GoodGraphic.imageset/Contents.json b/Shared/Assets.xcassets/Graphics/GoodGraphic.imageset/Contents.json similarity index 100% rename from Shared/Assets.xcassets/GoodGraphic.imageset/Contents.json rename to Shared/Assets.xcassets/Graphics/GoodGraphic.imageset/Contents.json diff --git a/Shared/Assets.xcassets/GoodGraphic.imageset/GoodGraphic.png b/Shared/Assets.xcassets/Graphics/GoodGraphic.imageset/GoodGraphic.png similarity index 100% rename from Shared/Assets.xcassets/GoodGraphic.imageset/GoodGraphic.png rename to Shared/Assets.xcassets/Graphics/GoodGraphic.imageset/GoodGraphic.png diff --git a/Shared/Assets.xcassets/GreatGraphic.imageset/Contents.json b/Shared/Assets.xcassets/Graphics/GreatGraphic.imageset/Contents.json similarity index 100% rename from Shared/Assets.xcassets/GreatGraphic.imageset/Contents.json rename to Shared/Assets.xcassets/Graphics/GreatGraphic.imageset/Contents.json diff --git a/Shared/Assets.xcassets/GreatGraphic.imageset/GreatGraphic.png b/Shared/Assets.xcassets/Graphics/GreatGraphic.imageset/GreatGraphic.png similarity index 100% rename from Shared/Assets.xcassets/GreatGraphic.imageset/GreatGraphic.png rename to Shared/Assets.xcassets/Graphics/GreatGraphic.imageset/GreatGraphic.png diff --git a/Shared/Assets.xcassets/HorribleGraphic.imageset/Contents.json b/Shared/Assets.xcassets/Graphics/HorribleGraphic.imageset/Contents.json similarity index 100% rename from Shared/Assets.xcassets/HorribleGraphic.imageset/Contents.json rename to Shared/Assets.xcassets/Graphics/HorribleGraphic.imageset/Contents.json diff --git a/Shared/Assets.xcassets/HorribleGraphic.imageset/HorribleGraphic.png b/Shared/Assets.xcassets/Graphics/HorribleGraphic.imageset/HorribleGraphic.png similarity index 100% rename from Shared/Assets.xcassets/HorribleGraphic.imageset/HorribleGraphic.png rename to Shared/Assets.xcassets/Graphics/HorribleGraphic.imageset/HorribleGraphic.png diff --git a/Shared/Assets.xcassets/MissingGraphic.imageset/Contents.json b/Shared/Assets.xcassets/Graphics/MissingGraphic.imageset/Contents.json similarity index 100% rename from Shared/Assets.xcassets/MissingGraphic.imageset/Contents.json rename to Shared/Assets.xcassets/Graphics/MissingGraphic.imageset/Contents.json diff --git a/Shared/Assets.xcassets/MissingGraphic.imageset/MissingGraphic.png b/Shared/Assets.xcassets/Graphics/MissingGraphic.imageset/MissingGraphic.png similarity index 100% rename from Shared/Assets.xcassets/MissingGraphic.imageset/MissingGraphic.png rename to Shared/Assets.xcassets/Graphics/MissingGraphic.imageset/MissingGraphic.png diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/100.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/100.png deleted file mode 100644 index 994d32e..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/100.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/1024.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/1024.png deleted file mode 100644 index 55e6575..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/1024.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/114.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/114.png deleted file mode 100644 index d594165..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/114.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/120.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/120.png deleted file mode 100644 index c3409db..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/120.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/128.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/128.png deleted file mode 100644 index 0ced321..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/128.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/144.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/144.png deleted file mode 100644 index 5c645f5..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/144.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/152.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/152.png deleted file mode 100644 index b56375b..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/152.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/16.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/16.png deleted file mode 100644 index e0c4463..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/16.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/167.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/167.png deleted file mode 100644 index 0f9f4fa..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/167.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/172.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/172.png deleted file mode 100644 index 82afa63..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/172.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/180.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/180.png deleted file mode 100644 index bcff658..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/180.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/196.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/196.png deleted file mode 100644 index 4c2e13a..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/196.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/20.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/20.png deleted file mode 100644 index f87ceef..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/20.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/216.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/216.png deleted file mode 100644 index 1faec86..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/216.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/256.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/256.png deleted file mode 100644 index 7ad1448..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/256.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/29.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/29.png deleted file mode 100644 index 0c06db4..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/29.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/32.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/32.png deleted file mode 100644 index f457fcd..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/32.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/40.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/40.png deleted file mode 100644 index 0f7399d..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/40.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/48.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/48.png deleted file mode 100644 index afe00be..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/48.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/50.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/50.png deleted file mode 100644 index 3a7d3c4..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/50.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/512.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/512.png deleted file mode 100644 index 977121a..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/512.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/55.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/55.png deleted file mode 100644 index 51be185..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/55.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/57.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/57.png deleted file mode 100644 index df3b9bf..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/57.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/58.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/58.png deleted file mode 100644 index b2b9188..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/58.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/60.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/60.png deleted file mode 100644 index f8a738a..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/60.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/64.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/64.png deleted file mode 100644 index f4012dc..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/64.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/72.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/72.png deleted file mode 100644 index 3df0bbb..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/72.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/76.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/76.png deleted file mode 100644 index f69c876..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/76.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/80.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/80.png deleted file mode 100644 index 8d840b2..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/80.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/87.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/87.png deleted file mode 100644 index c2f1569..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/87.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/88.png b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/88.png deleted file mode 100644 index 3abf5df..0000000 Binary files a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/88.png and /dev/null differ diff --git a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/Contents.json b/Shared/Assets.xcassets/PurpleAppIcon.appiconset/Contents.json deleted file mode 100644 index 04de9d4..0000000 --- a/Shared/Assets.xcassets/PurpleAppIcon.appiconset/Contents.json +++ /dev/null @@ -1,330 +0,0 @@ -{ - "images" : [ - { - "filename" : "40.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "20x20" - }, - { - "filename" : "60.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "20x20" - }, - { - "filename" : "29.png", - "idiom" : "iphone", - "scale" : "1x", - "size" : "29x29" - }, - { - "filename" : "58.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "29x29" - }, - { - "filename" : "87.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "29x29" - }, - { - "filename" : "80.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "40x40" - }, - { - "filename" : "120.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "40x40" - }, - { - "filename" : "57.png", - "idiom" : "iphone", - "scale" : "1x", - "size" : "57x57" - }, - { - "filename" : "114.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "57x57" - }, - { - "filename" : "120.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "60x60" - }, - { - "filename" : "180.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "60x60" - }, - { - "filename" : "20.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "filename" : "40.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "filename" : "29.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "filename" : "58.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "filename" : "40.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "filename" : "80.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "filename" : "50.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "50x50" - }, - { - "filename" : "100.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "50x50" - }, - { - "filename" : "72.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "72x72" - }, - { - "filename" : "144.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "72x72" - }, - { - "filename" : "76.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "filename" : "152.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "filename" : "167.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { - "filename" : "1024.png", - "idiom" : "ios-marketing", - "scale" : "1x", - "size" : "1024x1024" - }, - { - "filename" : "48.png", - "idiom" : "watch", - "role" : "notificationCenter", - "scale" : "2x", - "size" : "24x24", - "subtype" : "38mm" - }, - { - "filename" : "55.png", - "idiom" : "watch", - "role" : "notificationCenter", - "scale" : "2x", - "size" : "27.5x27.5", - "subtype" : "42mm" - }, - { - "filename" : "58.png", - "idiom" : "watch", - "role" : "companionSettings", - "scale" : "2x", - "size" : "29x29" - }, - { - "filename" : "87.png", - "idiom" : "watch", - "role" : "companionSettings", - "scale" : "3x", - "size" : "29x29" - }, - { - "idiom" : "watch", - "role" : "notificationCenter", - "scale" : "2x", - "size" : "33x33", - "subtype" : "45mm" - }, - { - "filename" : "80.png", - "idiom" : "watch", - "role" : "appLauncher", - "scale" : "2x", - "size" : "40x40", - "subtype" : "38mm" - }, - { - "filename" : "88.png", - "idiom" : "watch", - "role" : "appLauncher", - "scale" : "2x", - "size" : "44x44", - "subtype" : "40mm" - }, - { - "idiom" : "watch", - "role" : "appLauncher", - "scale" : "2x", - "size" : "46x46", - "subtype" : "41mm" - }, - { - "filename" : "100.png", - "idiom" : "watch", - "role" : "appLauncher", - "scale" : "2x", - "size" : "50x50", - "subtype" : "44mm" - }, - { - "idiom" : "watch", - "role" : "appLauncher", - "scale" : "2x", - "size" : "51x51", - "subtype" : "45mm" - }, - { - "filename" : "172.png", - "idiom" : "watch", - "role" : "quickLook", - "scale" : "2x", - "size" : "86x86", - "subtype" : "38mm" - }, - { - "filename" : "196.png", - "idiom" : "watch", - "role" : "quickLook", - "scale" : "2x", - "size" : "98x98", - "subtype" : "42mm" - }, - { - "filename" : "216.png", - "idiom" : "watch", - "role" : "quickLook", - "scale" : "2x", - "size" : "108x108", - "subtype" : "44mm" - }, - { - "idiom" : "watch", - "role" : "quickLook", - "scale" : "2x", - "size" : "117x117", - "subtype" : "45mm" - }, - { - "filename" : "1024.png", - "idiom" : "watch-marketing", - "scale" : "1x", - "size" : "1024x1024" - }, - { - "filename" : "16.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "16x16" - }, - { - "filename" : "32.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "16x16" - }, - { - "filename" : "32.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "32x32" - }, - { - "filename" : "64.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "32x32" - }, - { - "filename" : "128.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "128x128" - }, - { - "filename" : "256.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "128x128" - }, - { - "filename" : "256.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "256x256" - }, - { - "filename" : "512.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "256x256" - }, - { - "filename" : "512.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "512x512" - }, - { - "filename" : "1024.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "512x512" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Shared/Assets.xcassets/PurpleFeelsAppIcon.imageset/PurpleFeelsAppIcon.png b/Shared/Assets.xcassets/PurpleFeelsAppIcon.imageset/PurpleFeelsAppIcon.png deleted file mode 100644 index 4af97ba..0000000 Binary files a/Shared/Assets.xcassets/PurpleFeelsAppIcon.imageset/PurpleFeelsAppIcon.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/100.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/100.png deleted file mode 100644 index e824835..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/100.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/1024.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/1024.png deleted file mode 100644 index 18054e1..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/1024.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/114.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/114.png deleted file mode 100644 index 91aef33..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/114.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/120.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/120.png deleted file mode 100644 index 136035f..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/120.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/128.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/128.png deleted file mode 100644 index 168a25f..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/128.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/144.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/144.png deleted file mode 100644 index 541a7ee..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/144.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/152.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/152.png deleted file mode 100644 index a358760..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/152.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/16.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/16.png deleted file mode 100644 index f320140..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/16.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/167.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/167.png deleted file mode 100644 index 74aa345..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/167.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/172.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/172.png deleted file mode 100644 index 3bc0d0e..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/172.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/180.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/180.png deleted file mode 100644 index 73dda3e..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/180.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/196.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/196.png deleted file mode 100644 index 3d84fdb..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/196.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/20.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/20.png deleted file mode 100644 index 87552b6..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/20.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/216.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/216.png deleted file mode 100644 index 698038a..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/216.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/256.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/256.png deleted file mode 100644 index 8f9c11c..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/256.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/29.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/29.png deleted file mode 100644 index fc6e505..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/29.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/32.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/32.png deleted file mode 100644 index ee171ea..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/32.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/40.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/40.png deleted file mode 100644 index b28c0a7..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/40.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/48.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/48.png deleted file mode 100644 index 2da7d21..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/48.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/50.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/50.png deleted file mode 100644 index 615c047..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/50.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/512.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/512.png deleted file mode 100644 index 14574bf..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/512.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/55.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/55.png deleted file mode 100644 index 6e93055..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/55.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/57.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/57.png deleted file mode 100644 index d678417..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/57.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/58.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/58.png deleted file mode 100644 index def331a..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/58.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/60.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/60.png deleted file mode 100644 index a4b6673..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/60.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/64.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/64.png deleted file mode 100644 index d5f294e..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/64.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/72.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/72.png deleted file mode 100644 index c010c4f..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/72.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/76.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/76.png deleted file mode 100644 index f2ab78c..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/76.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/80.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/80.png deleted file mode 100644 index 8b8799b..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/80.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/87.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/87.png deleted file mode 100644 index 10552e0..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/87.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/88.png b/Shared/Assets.xcassets/RedAppIcon.appiconset/88.png deleted file mode 100644 index 8e415ae..0000000 Binary files a/Shared/Assets.xcassets/RedAppIcon.appiconset/88.png and /dev/null differ diff --git a/Shared/Assets.xcassets/RedAppIcon.appiconset/Contents.json b/Shared/Assets.xcassets/RedAppIcon.appiconset/Contents.json deleted file mode 100644 index 04de9d4..0000000 --- a/Shared/Assets.xcassets/RedAppIcon.appiconset/Contents.json +++ /dev/null @@ -1,330 +0,0 @@ -{ - "images" : [ - { - "filename" : "40.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "20x20" - }, - { - "filename" : "60.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "20x20" - }, - { - "filename" : "29.png", - "idiom" : "iphone", - "scale" : "1x", - "size" : "29x29" - }, - { - "filename" : "58.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "29x29" - }, - { - "filename" : "87.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "29x29" - }, - { - "filename" : "80.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "40x40" - }, - { - "filename" : "120.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "40x40" - }, - { - "filename" : "57.png", - "idiom" : "iphone", - "scale" : "1x", - "size" : "57x57" - }, - { - "filename" : "114.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "57x57" - }, - { - "filename" : "120.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "60x60" - }, - { - "filename" : "180.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "60x60" - }, - { - "filename" : "20.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "filename" : "40.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "filename" : "29.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "filename" : "58.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "filename" : "40.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "filename" : "80.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "filename" : "50.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "50x50" - }, - { - "filename" : "100.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "50x50" - }, - { - "filename" : "72.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "72x72" - }, - { - "filename" : "144.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "72x72" - }, - { - "filename" : "76.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "filename" : "152.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "filename" : "167.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { - "filename" : "1024.png", - "idiom" : "ios-marketing", - "scale" : "1x", - "size" : "1024x1024" - }, - { - "filename" : "48.png", - "idiom" : "watch", - "role" : "notificationCenter", - "scale" : "2x", - "size" : "24x24", - "subtype" : "38mm" - }, - { - "filename" : "55.png", - "idiom" : "watch", - "role" : "notificationCenter", - "scale" : "2x", - "size" : "27.5x27.5", - "subtype" : "42mm" - }, - { - "filename" : "58.png", - "idiom" : "watch", - "role" : "companionSettings", - "scale" : "2x", - "size" : "29x29" - }, - { - "filename" : "87.png", - "idiom" : "watch", - "role" : "companionSettings", - "scale" : "3x", - "size" : "29x29" - }, - { - "idiom" : "watch", - "role" : "notificationCenter", - "scale" : "2x", - "size" : "33x33", - "subtype" : "45mm" - }, - { - "filename" : "80.png", - "idiom" : "watch", - "role" : "appLauncher", - "scale" : "2x", - "size" : "40x40", - "subtype" : "38mm" - }, - { - "filename" : "88.png", - "idiom" : "watch", - "role" : "appLauncher", - "scale" : "2x", - "size" : "44x44", - "subtype" : "40mm" - }, - { - "idiom" : "watch", - "role" : "appLauncher", - "scale" : "2x", - "size" : "46x46", - "subtype" : "41mm" - }, - { - "filename" : "100.png", - "idiom" : "watch", - "role" : "appLauncher", - "scale" : "2x", - "size" : "50x50", - "subtype" : "44mm" - }, - { - "idiom" : "watch", - "role" : "appLauncher", - "scale" : "2x", - "size" : "51x51", - "subtype" : "45mm" - }, - { - "filename" : "172.png", - "idiom" : "watch", - "role" : "quickLook", - "scale" : "2x", - "size" : "86x86", - "subtype" : "38mm" - }, - { - "filename" : "196.png", - "idiom" : "watch", - "role" : "quickLook", - "scale" : "2x", - "size" : "98x98", - "subtype" : "42mm" - }, - { - "filename" : "216.png", - "idiom" : "watch", - "role" : "quickLook", - "scale" : "2x", - "size" : "108x108", - "subtype" : "44mm" - }, - { - "idiom" : "watch", - "role" : "quickLook", - "scale" : "2x", - "size" : "117x117", - "subtype" : "45mm" - }, - { - "filename" : "1024.png", - "idiom" : "watch-marketing", - "scale" : "1x", - "size" : "1024x1024" - }, - { - "filename" : "16.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "16x16" - }, - { - "filename" : "32.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "16x16" - }, - { - "filename" : "32.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "32x32" - }, - { - "filename" : "64.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "32x32" - }, - { - "filename" : "128.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "128x128" - }, - { - "filename" : "256.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "128x128" - }, - { - "filename" : "256.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "256x256" - }, - { - "filename" : "512.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "256x256" - }, - { - "filename" : "512.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "512x512" - }, - { - "filename" : "1024.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "512x512" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Shared/Assets.xcassets/RedFeelsAppIcon.imageset/RedFeelsAppIcon.png b/Shared/Assets.xcassets/RedFeelsAppIcon.imageset/RedFeelsAppIcon.png deleted file mode 100644 index 1b1e062..0000000 Binary files a/Shared/Assets.xcassets/RedFeelsAppIcon.imageset/RedFeelsAppIcon.png and /dev/null differ diff --git a/Shared/Date+Extensions.swift b/Shared/Date+Extensions.swift index 984a24b..6287db7 100644 --- a/Shared/Date+Extensions.swift +++ b/Shared/Date+Extensions.swift @@ -56,15 +56,25 @@ extension Date: RawRepresentable { Calendar.current.dateComponents([.calendar, .year,.month], from: self).date! } - static func dates(from fromDate: Date, to toDate: Date) -> [Date] { + static public func dates(from fromDate: Date, toDate: Date, includingToDate: Bool = false) -> [Date] { var dates: [Date] = [] - var date = fromDate + var date = Calendar.current.date(bySettingHour: 0, minute: 0, second: 0, of: fromDate)! + let toDate = Calendar.current.date(bySettingHour: 0, minute: 0, second: 0, of: toDate)! - while date <= toDate { - dates.append(date) - guard let newDate = Calendar.current.date(byAdding: .day, value: 1, to: date) else { break } - date = newDate + if includingToDate { + while date <= toDate { + dates.append(date) + guard let newDate = Calendar.current.date(byAdding: .day, value: 1, to: date) else { break } + date = newDate + } + } else { + while date < toDate { + dates.append(date) + guard let newDate = Calendar.current.date(byAdding: .day, value: 1, to: date) else { break } + date = newDate + } } + return dates } diff --git a/Shared/MoodEntryFunctions.swift b/Shared/MoodEntryFunctions.swift index c01ef92..814c09e 100644 --- a/Shared/MoodEntryFunctions.swift +++ b/Shared/MoodEntryFunctions.swift @@ -41,7 +41,7 @@ class MoodEntryFunctions { var startOfMonth = date.startOfMonth startOfMonth = Calendar.current.date(byAdding: .hour, value: 9, to: startOfMonth)! let lastMissingDate = mutableEntries.first?.forDate ?? date.endOfMonth - var missingDates = Date.dates(from: startOfMonth, to: lastMissingDate) + var missingDates = Date.dates(from: startOfMonth, toDate: lastMissingDate, includingToDate: true) missingDates = missingDates.dropLast() for date in missingDates { diff --git a/Shared/Onboarding/OnboardingData.swift b/Shared/Onboarding/OnboardingData.swift index b70570a..87b815c 100644 --- a/Shared/Onboarding/OnboardingData.swift +++ b/Shared/Onboarding/OnboardingData.swift @@ -31,28 +31,7 @@ final class OnboardingData: NSObject, ObservableObject, Codable { date = try container.decode(Date.self, forKey: .date) inputDay = try container.decode(DayOptions.self, forKey: .inputDay) } - - func ableToVoteBasedOnCurentTime() -> Bool { - let currentDateComp = Calendar.current.dateComponents([.hour, .minute], from: Date()) - let savedDateComp = Calendar.current.dateComponents([.hour, .minute], from: self.date) - - if let currentHour = currentDateComp.hour, - let currentMin = currentDateComp.minute, - let savedHour = savedDateComp.hour, - let savedMin = savedDateComp.minute { - - if currentHour > savedHour { - return true - } - - if currentHour == savedHour { - return currentMin >= savedMin - } - } - return false - } - override init() { } } diff --git a/Shared/Persisence/PersistenceADD.swift b/Shared/Persisence/PersistenceADD.swift index b8a8897..6b886e9 100644 --- a/Shared/Persisence/PersistenceADD.swift +++ b/Shared/Persisence/PersistenceADD.swift @@ -35,7 +35,7 @@ extension PersistenceController { let entries = try! viewContext.fetch(fetchRequest) if let firstEntry = entries.last?.forDate { - let allDates: [Date] = Date.dates(from: firstEntry, to: endDate).map({ + let allDates: [Date] = Date.dates(from: firstEntry, toDate: endDate, includingToDate: true).map({ let zeroDate = Calendar.current.date(bySettingHour: 0, minute: 0, second: 0, of: $0)! return zeroDate }) diff --git a/Shared/Persisence/PersistenceDELETE.swift b/Shared/Persisence/PersistenceDELETE.swift index cc1550f..59bc3bc 100644 --- a/Shared/Persisence/PersistenceDELETE.swift +++ b/Shared/Persisence/PersistenceDELETE.swift @@ -19,4 +19,14 @@ extension PersistenceController { fatalError("Unresolved error \(error), \(error.userInfo)") } } + + func deleteLast(numberOfEntries: Int) { + let entries = PersistenceController.shared.getData(startDate: Calendar.current.date(byAdding: .day, value: -numberOfEntries, to: Date())!, + endDate: Date(), + includedDays: []) + for entry in entries { + viewContext.delete(entry) + } + try! viewContext.save() + } } diff --git a/Shared/Random.swift b/Shared/Random.swift index 1d9d0e4..3052150 100644 --- a/Shared/Random.swift +++ b/Shared/Random.swift @@ -189,3 +189,21 @@ extension UIColor { return self } } + +extension Bundle { + var appName: String { + return infoDictionary?["CFBundleName"] as! String + } + + var bundleId: String { + return bundleIdentifier! + } + + var versionNumber: String { + return infoDictionary?["CFBundleShortVersionString"] as! String + } + + var buildNumber: String { + return infoDictionary?["CFBundleVersion"] as! String + } +} diff --git a/Shared/ShowBasedOnVoteLogics.swift b/Shared/ShowBasedOnVoteLogics.swift index 0051ef0..71d1267 100644 --- a/Shared/ShowBasedOnVoteLogics.swift +++ b/Shared/ShowBasedOnVoteLogics.swift @@ -9,33 +9,48 @@ import CoreData import SwiftUI -//if this is being shown we're missing an entry -// voting time is noon - // vote for current day - // today at 11 am -> How as yesterday - // today at 1 pm -> How is today - // vote for previous day - // today at 11 am -> How as 2 days ago - // today at 1 pm -> How was yesterday +/* + current day 3/5/22 + + day option = .today + ------- + voting for 3/4 | voting for 3/5 + ------------------------*------------------------- + db should contain 3/3 | db should contain 3/4 + + ---------------------------------------------------------------------------- + + day option = .yesterday + -------- + voting for 3/3 | voting for 3/4 + ------------------------*------------------------- + db should contain 3/2 | db should contain 3/3 + + */ class ShowBasedOnVoteLogics { - static func isMissingCurrentVote(onboardingData: OnboardingData) -> Bool { - let passedTimeToVote = onboardingData.ableToVoteBasedOnCurentTime() - let inputDay = onboardingData.inputDay + static func returnCurrentVoteStatus(onboardingData: OnboardingData) -> (Bool, DayOptions) { + let passedTimeToVote = ShowBasedOnVoteLogics.ableToVoteBasedOnCurentTime(voteDate: onboardingData.date) + let inputDay: DayOptions = onboardingData.inputDay + return (passedTimeToVote, inputDay) + } + + static func isMissingCurrentVote(onboardingData: OnboardingData) -> Bool { var startDate: Date? - switch (passedTimeToVote, inputDay) { - case (true, .Previous): - // if we're passed time to vote and the voting type is previous - last vote should be -1 + switch ShowBasedOnVoteLogics.returnCurrentVoteStatus(onboardingData: onboardingData) { + case (false, .Today): + // if we're NOT passed time to vote and the voting type is previous - last vote should be -1 startDate = Calendar.current.date(byAdding: .day, value: -1, to: Date())! case (true, .Today): // if we're passed time to vote and the voting type is today - last vote should be current date startDate = Date() + case (false, .Previous): // if we're NOT passed time to vote and the voting type is previous - last vote should be 2 days ago startDate = Calendar.current.date(byAdding: .day, value: -2, to: Date())! - case (false, .Today): - // if we're NOT passed time to vote and the voting type is previous - last vote should be -1 + case (true, .Previous): + // if we're passed time to vote and the voting type is previous - last vote should be -1 startDate = Calendar.current.date(byAdding: .day, value: -1, to: Date())! } @@ -54,43 +69,35 @@ class ShowBasedOnVoteLogics { } static func getVotingTitle(onboardingData: OnboardingData) -> String { - let passedTimeToVote = onboardingData.ableToVoteBasedOnCurentTime() - let inputDay = onboardingData.inputDay - - switch (passedTimeToVote, inputDay) { - case (true, .Previous): - // if we're passed time to vote and the voting type is previous - last vote should be -1 - return "how was yesterday" - case (true, .Today): - // if we're passed time to vote and the voting type is previous - last vote should be today - return "how is today" - case (false, .Previous): - // if we're passed time to vote and the voting type is previous - last vote should be -2 - let lastDayVoteShouldExist = ShowBasedOnVoteLogics.getLastDateVoteShouldExist(onboardingData: onboardingData) - return "how was \(Random.weekdayName(fromDate: lastDayVoteShouldExist))" + switch ShowBasedOnVoteLogics.returnCurrentVoteStatus(onboardingData: onboardingData) { case (false, .Today): - // if we're passed time to vote and the voting type is previous - last vote should be -1 return "how as yesterday" + case (true, .Today): + return "how is today" + + case (false, .Previous): + let date = Calendar.current.date(byAdding: .day, value: -2, to: Date())! + return "how was \(Random.weekdayName(fromDate: date))" + case (true, .Previous): + return "how was yesterday" } } static func dateForHeaderVote(onboardingData: OnboardingData) -> Date? { - let passedTimeToVote = onboardingData.ableToVoteBasedOnCurentTime() - let inputDay = onboardingData.inputDay - var date: Date? - switch (passedTimeToVote, inputDay) { - case (true, .Previous): + switch ShowBasedOnVoteLogics.returnCurrentVoteStatus(onboardingData: onboardingData) { + case (false, .Today): // if we're passed time to vote and the voting type is previous - last vote should be -1 date = Calendar.current.date(byAdding: .day, value: -1, to: Date()) case (true, .Today): // if we're passed time to vote and the voting type is previous - last vote should be today date = Date() + case (false, .Previous): // if we're passed time to vote and the voting type is previous - last vote should be -2 date = Calendar.current.date(byAdding: .day, value: -2, to: Date()) - case (false, .Today): + case (true, .Previous): // if we're passed time to vote and the voting type is previous - last vote should be -1 date = Calendar.current.date(byAdding: .day, value: -1, to: Date()) } @@ -103,26 +110,45 @@ class ShowBasedOnVoteLogics { } static func getLastDateVoteShouldExist(onboardingData: OnboardingData) -> Date { - let passedTimeToVote = onboardingData.ableToVoteBasedOnCurentTime() - let inputDay = onboardingData.inputDay + var date: Date? - var endDate: Date? - - switch (passedTimeToVote, inputDay) { - case (true, .Previous): - // if we're passed time to vote and the voting type is previous - last vote should -1 - endDate = Calendar.current.date(byAdding: .day, value: -1, to: Date())! - case (true, .Today): - // if we're passed time to vote and the voting type is previous - last vote should be today - endDate = Date() - case (false, .Previous): - // if we're passed time to vote and the voting type is previous - last vote should be -2 - endDate = Calendar.current.date(byAdding: .day, value: -2, to: Date())! + switch ShowBasedOnVoteLogics.returnCurrentVoteStatus(onboardingData: onboardingData) { case (false, .Today): + // if we're passed time to vote and the voting type is previous - last vote should be -2 + date = Calendar.current.date(byAdding: .day, value: -2, to: Date())! + case (true, .Today): // if we're passed time to vote and the voting type is previous - last vote should be -1 - endDate = Calendar.current.date(byAdding: .day, value: -1, to: Date())! + date = Calendar.current.date(byAdding: .day, value: -1, to: Date())! + + case (false, .Previous): + // if we're passed time to vote and the voting type is previous - last vote should be -3 + date = Calendar.current.date(byAdding: .day, value: -3, to: Date())! + case (true, .Previous): + // if we're passed time to vote and the voting type is previous - last vote should -2 + date = Calendar.current.date(byAdding: .day, value: -2, to: Date())! } - return endDate! + return date! + } + + static func ableToVoteBasedOnCurentTime(voteDate: Date) -> Bool { + let currentDateComp = Calendar.current.dateComponents([.hour, .minute], from: Date()) + let savedDateComp = Calendar.current.dateComponents([.hour, .minute], from: voteDate) + + if let currentHour = currentDateComp.hour, + let currentMin = currentDateComp.minute, + let savedHour = savedDateComp.hour, + let savedMin = savedDateComp.minute { + + if currentHour > savedHour { + return true + } + + if currentHour == savedHour { + return currentMin >= savedMin + } + } + + return false } } diff --git a/Shared/views/CustomIcon/IconView.swift b/Shared/views/CustomIcon/IconView.swift index b0003bc..be1af86 100644 --- a/Shared/views/CustomIcon/IconView.swift +++ b/Shared/views/CustomIcon/IconView.swift @@ -50,7 +50,16 @@ struct IconView: View { Circle() .strokeBorder(iconViewModel.bgColor, lineWidth: geo.size.width * 0.045) - .background(Circle().fill(iconViewModel.bgColor)) + .background(Circle().fill(.clear)) + .frame(width: geo.size.width*facePercSize, + height: geo.size.height*facePercSize, + alignment: .center) + .alignmentGuide(.top, computeValue: { _ in + return geo.size.width/2 + }) + + Circle() + .fill(iconViewModel.innerColor) .frame(width: geo.size.width*facePercSize, height: geo.size.height*facePercSize, alignment: .center) @@ -82,17 +91,17 @@ struct IconView_Previews: PreviewProvider { IconView(iconViewModel: IconViewModel.great) .frame(width: 256, height: 256, alignment: .center) -// IconView(iconViewModel: IconViewModel.good, isPreview: true) -// .frame(width: 256, height: 256, alignment: .center) -// -// IconView(iconViewModel: IconViewModel.average, isPreview: true) -// .frame(width: 256, height: 256, alignment: .center) -// -// IconView(iconViewModel: IconViewModel.bad, isPreview: true) -// .frame(width: 256, height: 256, alignment: .center) -// -// IconView(iconViewModel: IconViewModel.horrible, isPreview: true) -// .frame(width: 256, height: 256, alignment: .center) + IconView(iconViewModel: IconViewModel.good) + .frame(width: 256, height: 256, alignment: .center) + + IconView(iconViewModel: IconViewModel.average) + .frame(width: 256, height: 256, alignment: .center) + + IconView(iconViewModel: IconViewModel.bad) + .frame(width: 256, height: 256, alignment: .center) + + IconView(iconViewModel: IconViewModel.horrible) + .frame(width: 256, height: 256, alignment: .center) // // IconView(iconViewModel: IconViewModel(backgroundImage: EmojiMoodImages.icon(forMood: .horrible), // bgColor: MoodTints.Neon.color(forMood: .horrible), diff --git a/Shared/views/CustomIcon/IconViewModel.swift b/Shared/views/CustomIcon/IconViewModel.swift index dc07bbe..2fca0ad 100644 --- a/Shared/views/CustomIcon/IconViewModel.swift +++ b/Shared/views/CustomIcon/IconViewModel.swift @@ -11,34 +11,40 @@ class IconViewModel: ObservableObject { static let numberOfBGItems = 109 static let great = IconViewModel(backgroundImage: MoodImages.FontAwesome.icon(forMood: .great), - bgColor: Color(hex: "31d158"), - bgOverlayColor: Color(hex: "208939"), - centerImage: MoodImages.FontAwesome.icon(forMood: .great)) + bgColor: Color(hex: "31d158"), + bgOverlayColor: Color(hex: "208939"), + centerImage: MoodImages.FontAwesome.icon(forMood: .great), + innerColor: Color(hex: "31d158")) static let good = IconViewModel(backgroundImage: MoodImages.FontAwesome.icon(forMood: .good), - bgColor: Color(hex: "ffd709"), - bgOverlayColor: Color(hex: "9d8405"), - centerImage: MoodImages.FontAwesome.icon(forMood: .good)) + bgColor: Color(hex: "ffd709"), + bgOverlayColor: Color(hex: "9d8405"), + centerImage: MoodImages.FontAwesome.icon(forMood: .good), + innerColor: Color(hex: "ffd709")) static let average = IconViewModel(backgroundImage: MoodImages.FontAwesome.icon(forMood: .average), - bgColor: Color(hex: "0b84ff"), - bgOverlayColor: Color(hex: "074f9a"), - centerImage: MoodImages.FontAwesome.icon(forMood: .average)) + bgColor: Color(hex: "0b84ff"), + bgOverlayColor: Color(hex: "074f9a"), + centerImage: MoodImages.FontAwesome.icon(forMood: .average), + innerColor: Color(hex: "0b84ff")) static let bad = IconViewModel(backgroundImage: MoodImages.FontAwesome.icon(forMood: .bad), bgColor: Color(hex: "ff9f0b"), bgOverlayColor: Color(hex: "a06407"), - centerImage: MoodImages.FontAwesome.icon(forMood: .bad)) + centerImage: MoodImages.FontAwesome.icon(forMood: .bad), + innerColor: Color(hex: "ff9f0b")) static let horrible = IconViewModel(backgroundImage: MoodImages.FontAwesome.icon(forMood: .horrible), - bgColor: Color(hex: "fe5257"), - bgOverlayColor: Color(hex: "a92b26"), - centerImage: MoodImages.FontAwesome.icon(forMood: .horrible)) + bgColor: Color(hex: "fe5257"), + bgOverlayColor: Color(hex: "a92b26"), + centerImage: MoodImages.FontAwesome.icon(forMood: .horrible), + innerColor: Color(hex: "fe5257")) init(backgroundImage: Image, bgColor: Color, bgOverlayColor: Color, - centerImage: Image + centerImage: Image, + innerColor: Color ) { var blah = [(Image, UUID)]() @@ -50,12 +56,14 @@ class IconViewModel: ObservableObject { self.bgColor = bgColor self.bgOverlayColor = bgOverlayColor self.centerImage = centerImage + self.innerColor = innerColor } @Published var background: [(Image, UUID)] @Published var bgColor: Color @Published var bgOverlayColor: Color @Published var centerImage: Image + @Published var innerColor: Color } enum CustomIconBackGroundOptions: String, CaseIterable, Codable { diff --git a/Shared/views/CustomizeView/CustomizeView.swift b/Shared/views/CustomizeView/CustomizeView.swift index 557b645..74de176 100644 --- a/Shared/views/CustomizeView/CustomizeView.swift +++ b/Shared/views/CustomizeView/CustomizeView.swift @@ -28,8 +28,13 @@ struct CustomizeView: View { @StateObject private var selectedWidget = StupidAssCustomWidgetObservableObject() let iconSets: [(String,String)] = [ - ("PurpleFeelsAppIcon", "PurpleAppIcon"), - ("RedFeelsAppIcon", "RedAppIcon") + ("AppIconGoodImage", "AppIconGood"), + ("AppIconAverageImage", "AppIconAverage"), + ("AppIconBadImage", "AppIconBad"), + ("AppIconBlueGreenImage", "AppIconBlueGreen"), + ("AppIconNeonGreenImage", "AppIconNeonGreen"), + ("AppIconPinkImage", "AppIconPink"), + ("AppIconPurpleImage", "AppIconPurple") ] var body: some View { @@ -64,11 +69,12 @@ struct CustomizeView: View { Button(action: { UIApplication.shared.setAlternateIconName(nil) }, label: { - Image("FeelsAppIcon", bundle: .main) + Image("AppIconImage", bundle: .main) .resizable() .frame(width: 50, height:50) .cornerRadius(10) }) + ForEach(iconSets, id: \.self.0){ iconSet in Button(action: { diff --git a/Shared/views/SettingsView/SettingsView.swift b/Shared/views/SettingsView/SettingsView.swift index ec4d8d3..fd4152b 100644 --- a/Shared/views/SettingsView/SettingsView.swift +++ b/Shared/views/SettingsView/SettingsView.swift @@ -38,12 +38,16 @@ struct SettingsView: View { Group { addTestDataCell clearDB + randomIcons if useCloudKit { cloudKitStatus } } Spacer() + + Text("\(Bundle.main.appName) v \(Bundle.main.versionNumber) (Build \(Bundle.main.buildNumber))") + .font(.body) } .padding() }.sheet(isPresented: $showOnboarding) { @@ -216,6 +220,137 @@ struct SettingsView: View { .fixedSize(horizontal: false, vertical: true) .cornerRadius(10, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight]) } + + private var randomIcons: some View { + ZStack { + theme.currentTheme.secondaryBGColor + Button(action: { + var iconViews = [UIImage]() + +// for _ in 0...300 { +// iconViews.append( +// IconView(iconViewModel: IconViewModel( +// backgroundImage: MoodImages.FontAwesome.icon(forMood: .great), +// bgColor: Color.random(), +// bgOverlayColor: Color.random(), +// centerImage: MoodImages.FontAwesome.icon(forMood: .great), +// innerColor: Color.random()) +// ).asImage(size: CGSize(width: 1024, height: 1024))) +// } + + iconViews.append( + IconView(iconViewModel: IconViewModel( + backgroundImage: MoodImages.FontAwesome.icon(forMood: .great), + bgColor: IconViewModel.great.bgColor, + bgOverlayColor: IconViewModel.great.bgOverlayColor, + centerImage: MoodImages.FontAwesome.icon(forMood: .great), + innerColor: IconViewModel.great.innerColor) + ).asImage(size: CGSize(width: 1024, height: 1024)) + ) + + iconViews.append( + IconView(iconViewModel: IconViewModel( + backgroundImage: MoodImages.FontAwesome.icon(forMood: .great), + bgColor: IconViewModel.good.bgColor, + bgOverlayColor: IconViewModel.good.bgOverlayColor, + centerImage: MoodImages.FontAwesome.icon(forMood: .great), + innerColor: IconViewModel.good.innerColor) + ).asImage(size: CGSize(width: 1024, height: 1024)) + ) + + iconViews.append( + IconView(iconViewModel: IconViewModel( + backgroundImage: MoodImages.FontAwesome.icon(forMood: .great), + bgColor: IconViewModel.average.bgColor, + bgOverlayColor: IconViewModel.average.bgOverlayColor, + centerImage: MoodImages.FontAwesome.icon(forMood: .great), + innerColor: IconViewModel.average.innerColor) + ).asImage(size: CGSize(width: 1024, height: 1024)) + ) + + iconViews.append( + IconView(iconViewModel: IconViewModel( + backgroundImage: MoodImages.FontAwesome.icon(forMood: .great), + bgColor: IconViewModel.bad.bgColor, + bgOverlayColor: IconViewModel.bad.bgOverlayColor, + centerImage: MoodImages.FontAwesome.icon(forMood: .great), + innerColor: IconViewModel.bad.innerColor) + ).asImage(size: CGSize(width: 1024, height: 1024)) + ) + + iconViews.append( + IconView(iconViewModel: IconViewModel( + backgroundImage: MoodImages.FontAwesome.icon(forMood: .great), + bgColor: IconViewModel.horrible.bgColor, + bgOverlayColor: IconViewModel.horrible.bgOverlayColor, + centerImage: MoodImages.FontAwesome.icon(forMood: .great), + innerColor: IconViewModel.horrible.innerColor) + ).asImage(size: CGSize(width: 1024, height: 1024)) + ) + + +// iconViews.append( +// IconView(iconViewModel: IconViewModel( +// backgroundImage: MoodImages.FontAwesome.icon(forMood: .great), +// bgColor: Color(hex: "EF0CF3"), +// bgOverlayColor: Color(hex: "EF0CF3").darker(by: 40), +// centerImage: MoodImages.FontAwesome.icon(forMood: .great), +// innerColor: Color(hex: "EF0CF3")) +// ).asImage(size: CGSize(width: 1024, height: 1024)) +// ) +// +// iconViews.append( +// IconView(iconViewModel: IconViewModel( +// backgroundImage: MoodImages.FontAwesome.icon(forMood: .great), +// bgColor: Color(hex: "1AE5D6"), +// bgOverlayColor: Color(hex: "1AE5D6").darker(by: 40), +// centerImage: MoodImages.FontAwesome.icon(forMood: .great), +// innerColor: Color(hex: "1AE5D6")) +// ).asImage(size: CGSize(width: 1024, height: 1024)) +// ) +// +// iconViews.append( +// IconView(iconViewModel: IconViewModel( +// backgroundImage: MoodImages.FontAwesome.icon(forMood: .great), +// bgColor: Color(hex: "633EC1"), +// bgOverlayColor: Color(hex: "633EC1").darker(by: 40), +// centerImage: MoodImages.FontAwesome.icon(forMood: .great), +// innerColor: Color(hex: "633EC1")) +// ).asImage(size: CGSize(width: 1024, height: 1024)) +// ) +// +// iconViews.append( +// IconView(iconViewModel: IconViewModel( +// backgroundImage: MoodImages.FontAwesome.icon(forMood: .great), +// bgColor: Color(hex: "10F30C"), +// bgOverlayColor: Color(hex: "10F30C").darker(by: 40), +// centerImage: MoodImages.FontAwesome.icon(forMood: .great), +// innerColor: Color(hex: "10F30C")) +// ).asImage(size: CGSize(width: 1024, height: 1024)) +// ) + + for (idx, image) in iconViews.enumerated() { + let paths = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask) + var path = paths[0].appendingPathComponent("icons").path + path = path.appending("\(idx).jpg") + let url = URL(fileURLWithPath: path) + do { + try image.jpegData(compressionQuality: 1.0)?.write(to: url, options: .atomic) + print(url) + } catch { + print(error.localizedDescription) + } + } + + }, label: { + Text("Create random icons") + .foregroundColor(theme.currentTheme.labelColor) + }) + .padding() + } + .fixedSize(horizontal: false, vertical: true) + .cornerRadius(10, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight]) + } } struct SettingsView_Previews: PreviewProvider { diff --git a/Tests iOS/Tests_iOS.swift b/Tests iOS/Tests_iOS.swift index dcbea43..1456654 100644 --- a/Tests iOS/Tests_iOS.swift +++ b/Tests iOS/Tests_iOS.swift @@ -6,9 +6,9 @@ // import XCTest +@testable import iFeel class Tests_iOS: XCTestCase { - override func setUpWithError() throws { // Put setup code here. This method is called before the invocation of each test method in the class. @@ -22,21 +22,36 @@ class Tests_iOS: XCTestCase { // Put teardown code here. This method is called after the invocation of each test method in the class. } - func testExample() throws { - // UI tests must launch the application that they test. - let app = XCUIApplication() - app.launch() - - // Use recording to get started writing UI tests. - // Use XCTAssert and related functions to verify your tests produce the correct results. + func testDatesBetween() { + let today = Calendar.current.date(bySettingHour: 0, minute: 0, second: 0, of: Date())! + let yesterday = Calendar.current.date(byAdding: .day, value: -1, to: today)! + let tenDaysAgo = Calendar.current.date(byAdding: .day, value: -10, to: today)! + + let dates = Date.dates(from: Calendar.current.date(byAdding: .day, value: -10, to: Date())!, toDate: Date()) + + XCTAssertTrue(dates.last == yesterday) + XCTAssertTrue(dates.first == tenDaysAgo) } + + func testDatesIncluding() { + let today = Calendar.current.date(bySettingHour: 0, minute: 0, second: 0, of: Date())! + let yesterday = Calendar.current.date(bySettingHour: 0, minute: 0, second: 0, of: Date())! + let tenDaysAgo = Calendar.current.date(byAdding: .day, value: -10, to: today)! - func testLaunchPerformance() throws { - if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 7.0, *) { - // This measures how long it takes to launch your application. - measure(metrics: [XCTApplicationLaunchMetric()]) { - XCUIApplication().launch() - } - } + let dates = Date.dates(from: Calendar.current.date(byAdding: .day, value: -10, to: Date())!, toDate: Date(), includingToDate: true) + + XCTAssertTrue(dates.last == today) + XCTAssertTrue(dates.first == tenDaysAgo) } + +// func testLastVoteShouldExist() { +// let todayOneHourAhead = Calendar.current.date(byAdding: .day, value: 1, to: Date())! +// let fakeOnboarding = OnboardingData() +// fakeOnboarding.inputDay = DayOptions.Today +// fakeOnboarding.date = todayOneHourAhead +// +// let lastDay = ShowBasedOnVoteLogics.getLastDateVoteShouldExist(onboardingData: fakeOnboarding) +// let yesterday = Calendar.current.date(byAdding: .day, value: -1, to: Date())! +// XCTAssertTrue(lastDay == yesterday) +// } } diff --git a/Tests iOS/Tests_iOSLaunchTests.swift b/Tests iOS/Tests_iOSLaunchTests.swift index 111f2d6..9e75cb5 100644 --- a/Tests iOS/Tests_iOSLaunchTests.swift +++ b/Tests iOS/Tests_iOSLaunchTests.swift @@ -17,7 +17,7 @@ class Tests_iOSLaunchTests: XCTestCase { continueAfterFailure = false } - func testLaunch() throws { + func _testLaunch() throws { let app = XCUIApplication() app.launch()