diff --git a/HomeAssistant.xcodeproj/project.pbxproj b/HomeAssistant.xcodeproj/project.pbxproj index 28d782a13..fbb74d02b 100644 --- a/HomeAssistant.xcodeproj/project.pbxproj +++ b/HomeAssistant.xcodeproj/project.pbxproj @@ -217,9 +217,7 @@ 11810D4C249EAF8D00E741A4 /* trans@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 11810D42249EAF8C00E741A4 /* trans@2x.png */; }; 11810D4D249EAF8D00E741A4 /* rainbow@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 11810D43249EAF8C00E741A4 /* rainbow@3x.png */; }; 11810D4E249EAF8D00E741A4 /* bi_pride@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 11810D44249EAF8C00E741A4 /* bi_pride@2x.png */; }; - 11810D4F249EAF8D00E741A4 /* rainbow_invert@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 11810D45249EAF8C00E741A4 /* rainbow_invert@2x.png */; }; 11810D50249EAF8D00E741A4 /* POC_pride@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 11810D46249EAF8C00E741A4 /* POC_pride@2x.png */; }; - 11810D51249EAF8D00E741A4 /* rainbow_invert@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 11810D47249EAF8C00E741A4 /* rainbow_invert@3x.png */; }; 11810D52249EAF8D00E741A4 /* bi_pride@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 11810D48249EAF8C00E741A4 /* bi_pride@3x.png */; }; 11810D53249EAF8D00E741A4 /* POC_pride@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 11810D49249EAF8D00E741A4 /* POC_pride@3x.png */; }; 118261F524F8C7C1000795C6 /* SceneManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 118261F424F8C7C1000795C6 /* SceneManager.swift */; }; @@ -505,6 +503,14 @@ 20226C5AB77E1229852ADDC8 /* Pods_iOS_Extensions_Widgets.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D27653D385E4CEB58E52A350 /* Pods_iOS_Extensions_Widgets.framework */; }; 237993F7E11DC585E29EDC7C /* Pods-iOS-Extensions-NotificationService-metadata.plist in Resources */ = {isa = PBXBuildFile; fileRef = 592EED7A6C2444872F11C17B /* Pods-iOS-Extensions-NotificationService-metadata.plist */; }; 2F50FC61669812D485E608EC /* Pods-iOS-Extensions-PushProvider-metadata.plist in Resources */ = {isa = PBXBuildFile; fileRef = E3D5CF14402325076CA105EB /* Pods-iOS-Extensions-PushProvider-metadata.plist */; }; + 3090BEDE2ACDA30100030356 /* non-binary@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3090BEDA2ACDA30100030356 /* non-binary@3x.png */; }; + 3090BEDF2ACDA30100030356 /* non-binary@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3090BEDA2ACDA30100030356 /* non-binary@3x.png */; }; + 3090BEE02ACDA30100030356 /* non-binary@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3090BEDB2ACDA30100030356 /* non-binary@2x.png */; }; + 3090BEE12ACDA30100030356 /* non-binary@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3090BEDB2ACDA30100030356 /* non-binary@2x.png */; }; + 3090BEE22ACDA30100030356 /* classic@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3090BEDC2ACDA30100030356 /* classic@2x.png */; }; + 3090BEE32ACDA30100030356 /* classic@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3090BEDC2ACDA30100030356 /* classic@2x.png */; }; + 3090BEE42ACDA30100030356 /* classic@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3090BEDD2ACDA30100030356 /* classic@3x.png */; }; + 3090BEE52ACDA30100030356 /* classic@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3090BEDD2ACDA30100030356 /* classic@3x.png */; }; 368048FC64829A4E4B82B631 /* Pods_watchOS_WatchExtension_Watch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A90DD8FC6E4726B7E7187C59 /* Pods_watchOS_WatchExtension_Watch.framework */; }; 38A4EBA18ADEEE555AD14F52 /* Pods-iOS-App-metadata.plist in Resources */ = {isa = PBXBuildFile; fileRef = 553A33E097387AA44265DB13 /* Pods-iOS-App-metadata.plist */; }; 491E98FF25D543560077BBE3 /* LogbookEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 491E98FE25D543560077BBE3 /* LogbookEntry.swift */; }; @@ -688,7 +694,6 @@ B64E754923F3BFF200472C04 /* crimson@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B64E752123F3BFE900472C04 /* crimson@3x.png */; }; B64E754A23F3BFF200472C04 /* purple@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B64E752223F3BFEA00472C04 /* purple@2x.png */; }; B64E754B23F3BFF200472C04 /* fire-orange@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B64E752323F3BFEB00472C04 /* fire-orange@2x.png */; }; - B64E754C23F3BFF200472C04 /* ha-blue@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B64E752423F3BFEB00472C04 /* ha-blue@3x.png */; }; B64E754D23F3BFF200472C04 /* release@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B64E752523F3BFEC00472C04 /* release@2x.png */; }; B64E754E23F3BFF200472C04 /* orange@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B64E752623F3BFEC00472C04 /* orange@2x.png */; }; B64E754F23F3BFF200472C04 /* electric-violet@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B64E752723F3BFEC00472C04 /* electric-violet@3x.png */; }; @@ -705,7 +710,6 @@ B64E755A23F3BFF200472C04 /* caribbean-green@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B64E753223F3BFED00472C04 /* caribbean-green@2x.png */; }; B64E755B23F3BFF200472C04 /* old-dev@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B64E753323F3BFEE00472C04 /* old-dev@3x.png */; }; B64E755C23F3BFF200472C04 /* release@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B64E753423F3BFEE00472C04 /* release@3x.png */; }; - B64E755D23F3BFF200472C04 /* ha-blue@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B64E753523F3BFEF00472C04 /* ha-blue@2x.png */; }; B64E755E23F3BFF200472C04 /* cornflower-blue@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B64E753623F3BFEF00472C04 /* cornflower-blue@3x.png */; }; B64E755F23F3BFF200472C04 /* green@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B64E753723F3BFEF00472C04 /* green@2x.png */; }; B64E756023F3BFF200472C04 /* black@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B64E753823F3BFF000472C04 /* black@3x.png */; }; @@ -1344,9 +1348,7 @@ 11810D42249EAF8C00E741A4 /* trans@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "trans@2x.png"; sourceTree = ""; }; 11810D43249EAF8C00E741A4 /* rainbow@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "rainbow@3x.png"; sourceTree = ""; }; 11810D44249EAF8C00E741A4 /* bi_pride@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bi_pride@2x.png"; sourceTree = ""; }; - 11810D45249EAF8C00E741A4 /* rainbow_invert@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "rainbow_invert@2x.png"; sourceTree = ""; }; 11810D46249EAF8C00E741A4 /* POC_pride@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "POC_pride@2x.png"; sourceTree = ""; }; - 11810D47249EAF8C00E741A4 /* rainbow_invert@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "rainbow_invert@3x.png"; sourceTree = ""; }; 11810D48249EAF8C00E741A4 /* bi_pride@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bi_pride@3x.png"; sourceTree = ""; }; 11810D49249EAF8D00E741A4 /* POC_pride@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "POC_pride@3x.png"; sourceTree = ""; }; 118261F424F8C7C1000795C6 /* SceneManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneManager.swift; sourceTree = ""; }; @@ -1558,6 +1560,10 @@ 213EF66D14F92AF8BF2E9E98 /* Pods_iOS_Shared_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iOS_Shared_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 287FA864ED0E47B2BB71E1C8 /* Pods-iOS-Shared-iOS-Tests-Shared.beta.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS-Shared-iOS-Tests-Shared.beta.xcconfig"; path = "Pods/Target Support Files/Pods-iOS-Shared-iOS-Tests-Shared/Pods-iOS-Shared-iOS-Tests-Shared.beta.xcconfig"; sourceTree = ""; }; 29FC93E25AB875716E2F35D4 /* Pods_iOS_Extensions_Intents.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iOS_Extensions_Intents.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 3090BEDA2ACDA30100030356 /* non-binary@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "non-binary@3x.png"; sourceTree = ""; }; + 3090BEDB2ACDA30100030356 /* non-binary@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "non-binary@2x.png"; sourceTree = ""; }; + 3090BEDC2ACDA30100030356 /* classic@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "classic@2x.png"; sourceTree = ""; }; + 3090BEDD2ACDA30100030356 /* classic@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "classic@3x.png"; sourceTree = ""; }; 32DB55A889E2163C52C335D2 /* Pods-iOS-Shared-iOS-Tests-Shared.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS-Shared-iOS-Tests-Shared.debug.xcconfig"; path = "Pods/Target Support Files/Pods-iOS-Shared-iOS-Tests-Shared/Pods-iOS-Shared-iOS-Tests-Shared.debug.xcconfig"; sourceTree = ""; }; 392B0C44197C98E2653932A5 /* Pods-iOS-Extensions-Matter-metadata.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "Pods-iOS-Extensions-Matter-metadata.plist"; path = "Pods/Pods-iOS-Extensions-Matter-metadata.plist"; sourceTree = ""; }; 3F4DFB087A3A43F9A526B851 /* Pods_iOS_Shared_iOS_Tests_Shared.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iOS_Shared_iOS_Tests_Shared.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1808,7 +1814,6 @@ B64E752123F3BFE900472C04 /* crimson@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "crimson@3x.png"; sourceTree = ""; }; B64E752223F3BFEA00472C04 /* purple@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "purple@2x.png"; sourceTree = ""; }; B64E752323F3BFEB00472C04 /* fire-orange@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "fire-orange@2x.png"; sourceTree = ""; }; - B64E752423F3BFEB00472C04 /* ha-blue@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ha-blue@3x.png"; sourceTree = ""; }; B64E752523F3BFEC00472C04 /* release@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "release@2x.png"; sourceTree = ""; }; B64E752623F3BFEC00472C04 /* orange@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "orange@2x.png"; sourceTree = ""; }; B64E752723F3BFEC00472C04 /* electric-violet@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "electric-violet@3x.png"; sourceTree = ""; }; @@ -1825,7 +1830,6 @@ B64E753223F3BFED00472C04 /* caribbean-green@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "caribbean-green@2x.png"; sourceTree = ""; }; B64E753323F3BFEE00472C04 /* old-dev@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "old-dev@3x.png"; sourceTree = ""; }; B64E753423F3BFEE00472C04 /* release@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "release@3x.png"; sourceTree = ""; }; - B64E753523F3BFEF00472C04 /* ha-blue@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ha-blue@2x.png"; sourceTree = ""; }; B64E753623F3BFEF00472C04 /* cornflower-blue@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "cornflower-blue@3x.png"; sourceTree = ""; }; B64E753723F3BFEF00472C04 /* green@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "green@2x.png"; sourceTree = ""; }; B64E753823F3BFF000472C04 /* black@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "black@3x.png"; sourceTree = ""; }; @@ -3350,13 +3354,15 @@ B64E752F23F3BFED00472C04 /* fire-orange@3x.png */, B64E753723F3BFEF00472C04 /* green@2x.png */, B64E753023F3BFED00472C04 /* green@3x.png */, - B64E753523F3BFEF00472C04 /* ha-blue@2x.png */, - B64E752423F3BFEB00472C04 /* ha-blue@3x.png */, B64E752C23F3BFED00472C04 /* old-beta@2x.png */, B64E751F23F3BFE900472C04 /* old-beta@3x.png */, B64E751A23F3BFE700472C04 /* old-dev@2x.png */, B64E753323F3BFEE00472C04 /* old-dev@3x.png */, B64E751D23F3BFE800472C04 /* old-release@2x.png */, + 3090BEDC2ACDA30100030356 /* classic@2x.png */, + 3090BEDD2ACDA30100030356 /* classic@3x.png */, + 3090BEDB2ACDA30100030356 /* non-binary@2x.png */, + 3090BEDA2ACDA30100030356 /* non-binary@3x.png */, B64E751E23F3BFE800472C04 /* old-release@3x.png */, B64E752623F3BFEC00472C04 /* orange@2x.png */, B64E752D23F3BFED00472C04 /* orange@3x.png */, @@ -3366,8 +3372,6 @@ 11810D49249EAF8D00E741A4 /* POC_pride@3x.png */, B64E752223F3BFEA00472C04 /* purple@2x.png */, B64E752023F3BFE900472C04 /* purple@3x.png */, - 11810D45249EAF8C00E741A4 /* rainbow_invert@2x.png */, - 11810D47249EAF8C00E741A4 /* rainbow_invert@3x.png */, 11810D40249EAF8B00E741A4 /* rainbow@2x.png */, 11810D43249EAF8C00E741A4 /* rainbow@3x.png */, B64E753D23F3BFF100472C04 /* red@2x.png */, @@ -4478,7 +4482,11 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 3090BEDF2ACDA30100030356 /* non-binary@3x.png in Resources */, + 3090BEE32ACDA30100030356 /* classic@2x.png in Resources */, 11DE9F3A25B614EB0081C0ED /* Application.xib in Resources */, + 3090BEE12ACDA30100030356 /* non-binary@2x.png in Resources */, + 3090BEE52ACDA30100030356 /* classic@3x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4519,16 +4527,14 @@ B64E754B23F3BFF200472C04 /* fire-orange@2x.png in Resources */, B64E754523F3BFF200472C04 /* old-release@2x.png in Resources */, B606167B1D1F117700249C11 /* US-EN-Alexa-Back-Door-Opened.wav in Resources */, - B64E754C23F3BFF200472C04 /* ha-blue@3x.png in Resources */, - 11810D51249EAF8D00E741A4 /* rainbow_invert@3x.png in Resources */, B60616481D1F117700249C11 /* US-EN-Morgan-Freeman-Turning-On-The-Air-Conditioner.wav in Resources */, B60616911D1F117700249C11 /* US-EN-Alexa-Patio-Door-Unlocked.wav in Resources */, B606164F1D1F117700249C11 /* US-EN-Morgan-Freeman-Turning-On-The-Lights.wav in Resources */, B606169C1D1F117800249C11 /* US-EN-Alexa-Wife-Is-Arriving.wav in Resources */, B60616211D1F117700249C11 /* US-EN-Morgan-Freeman-Liquor-Cabinet-Opened.wav in Resources */, - B64E755D23F3BFF200472C04 /* ha-blue@2x.png in Resources */, B60616331D1F117700249C11 /* US-EN-Morgan-Freeman-Smartthings-Detected-Carbon-Monoxide.wav in Resources */, B606164E1D1F117700249C11 /* US-EN-Morgan-Freeman-Turning-On-The-Light.wav in Resources */, + 3090BEE42ACDA30100030356 /* classic@3x.png in Resources */, B60616AD1D1F117800249C11 /* US-EN-Daisy-Back-Door-Motion.wav in Resources */, B60616BA1D1F117800249C11 /* US-EN-Daisy-Refrigerator-Leak.wav in Resources */, B60616251D1F117700249C11 /* US-EN-Morgan-Freeman-Motion-In-Game-Room.wav in Resources */, @@ -4568,6 +4574,7 @@ B64E755223F3BFF200472C04 /* blue@3x.png in Resources */, B606161C1D1F117700249C11 /* US-EN-Morgan-Freeman-Garage-Door-Closed.wav in Resources */, 11810D4E249EAF8D00E741A4 /* bi_pride@2x.png in Resources */, + 3090BEE22ACDA30100030356 /* classic@2x.png in Resources */, B60616291D1F117700249C11 /* US-EN-Morgan-Freeman-Motion-In-Theater.wav in Resources */, B60616141D1F117700249C11 /* US-EN-Morgan-Freeman-Cleaning-Supplies-Closet-Opened.wav in Resources */, B60616881D1F117700249C11 /* US-EN-Alexa-Mail-Has-Arrived.wav in Resources */, @@ -4668,6 +4675,7 @@ B60616271D1F117700249C11 /* US-EN-Morgan-Freeman-Motion-In-Kitchen.wav in Resources */, B606167C1D1F117700249C11 /* US-EN-Alexa-Back-Door-Unlocked.wav in Resources */, B60615BB1D1F117700249C11 /* MorganFreemanSounds.csv in Resources */, + 3090BEE02ACDA30100030356 /* non-binary@2x.png in Resources */, B606160F1D1F117700249C11 /* US-EN-Morgan-Freeman-Basement-Door-Locked.wav in Resources */, B64E754423F3BFF200472C04 /* dev@2x.png in Resources */, B606161B1D1F117700249C11 /* US-EN-Morgan-Freeman-Front-Door-Unlocked.wav in Resources */, @@ -4675,6 +4683,7 @@ B64E756523F3BFF200472C04 /* red@2x.png in Resources */, B606168F1D1F117700249C11 /* US-EN-Alexa-Motion-In-Garage.wav in Resources */, B60616311D1F117700249C11 /* US-EN-Morgan-Freeman-Setting-The-Mood.wav in Resources */, + 3090BEDE2ACDA30100030356 /* non-binary@3x.png in Resources */, D0FF79D520D87DB10034574D /* ClientEvents.storyboard in Resources */, B606162F1D1F117700249C11 /* US-EN-Morgan-Freeman-Roommate-Is-Arriving.wav in Resources */, B64E755823F3BFF200472C04 /* green@3x.png in Resources */, @@ -4684,7 +4693,6 @@ B606163E1D1F117700249C11 /* US-EN-Morgan-Freeman-Turning-Off-The-Air-Conditioner.wav in Resources */, B60616551D1F117700249C11 /* US-EN-Morgan-Freeman-Water-Detected-In-Kitchen.wav in Resources */, 11810D50249EAF8D00E741A4 /* POC_pride@2x.png in Resources */, - 11810D4F249EAF8D00E741A4 /* rainbow_invert@2x.png in Resources */, B60616871D1F117700249C11 /* US-EN-Alexa-Husband-Is-Arriving.wav in Resources */, B60616501D1F117700249C11 /* US-EN-Morgan-Freeman-Turning-On-The-Mood-Lights.wav in Resources */, B64E754723F3BFF200472C04 /* old-beta@3x.png in Resources */, diff --git a/Sources/App/Resources/Alternate Icons/POC_pride@2x.png b/Sources/App/Resources/Alternate Icons/POC_pride@2x.png index eeac72e37..3e6b4663e 100644 Binary files a/Sources/App/Resources/Alternate Icons/POC_pride@2x.png and b/Sources/App/Resources/Alternate Icons/POC_pride@2x.png differ diff --git a/Sources/App/Resources/Alternate Icons/POC_pride@3x.png b/Sources/App/Resources/Alternate Icons/POC_pride@3x.png index f3e673919..a93221957 100644 Binary files a/Sources/App/Resources/Alternate Icons/POC_pride@3x.png and b/Sources/App/Resources/Alternate Icons/POC_pride@3x.png differ diff --git a/Sources/App/Resources/Alternate Icons/beta@2x.png b/Sources/App/Resources/Alternate Icons/beta@2x.png index 5cbe4383d..d84f22319 100644 Binary files a/Sources/App/Resources/Alternate Icons/beta@2x.png and b/Sources/App/Resources/Alternate Icons/beta@2x.png differ diff --git a/Sources/App/Resources/Alternate Icons/beta@3x.png b/Sources/App/Resources/Alternate Icons/beta@3x.png index 8db994e61..07a720aa3 100644 Binary files a/Sources/App/Resources/Alternate Icons/beta@3x.png and b/Sources/App/Resources/Alternate Icons/beta@3x.png differ diff --git a/Sources/App/Resources/Alternate Icons/bi_pride@2x.png b/Sources/App/Resources/Alternate Icons/bi_pride@2x.png index fd5cfb80f..f9a0e079b 100644 Binary files a/Sources/App/Resources/Alternate Icons/bi_pride@2x.png and b/Sources/App/Resources/Alternate Icons/bi_pride@2x.png differ diff --git a/Sources/App/Resources/Alternate Icons/bi_pride@3x.png b/Sources/App/Resources/Alternate Icons/bi_pride@3x.png index 8004e62f0..ca7ff80f3 100644 Binary files a/Sources/App/Resources/Alternate Icons/bi_pride@3x.png and b/Sources/App/Resources/Alternate Icons/bi_pride@3x.png differ diff --git a/Sources/App/Resources/Alternate Icons/black@2x.png b/Sources/App/Resources/Alternate Icons/black@2x.png index b6fdf93b5..89bb3ae24 100644 Binary files a/Sources/App/Resources/Alternate Icons/black@2x.png and b/Sources/App/Resources/Alternate Icons/black@2x.png differ diff --git a/Sources/App/Resources/Alternate Icons/black@3x.png b/Sources/App/Resources/Alternate Icons/black@3x.png index 8e4919e8c..9579ed1d7 100644 Binary files a/Sources/App/Resources/Alternate Icons/black@3x.png and b/Sources/App/Resources/Alternate Icons/black@3x.png differ diff --git a/Sources/App/Resources/Alternate Icons/blue@2x.png b/Sources/App/Resources/Alternate Icons/blue@2x.png index 874650792..0e5cb44da 100644 Binary files a/Sources/App/Resources/Alternate Icons/blue@2x.png and b/Sources/App/Resources/Alternate Icons/blue@2x.png differ diff --git a/Sources/App/Resources/Alternate Icons/blue@3x.png b/Sources/App/Resources/Alternate Icons/blue@3x.png index b3f7644b6..eb56c455a 100644 Binary files a/Sources/App/Resources/Alternate Icons/blue@3x.png and b/Sources/App/Resources/Alternate Icons/blue@3x.png differ diff --git a/Sources/App/Resources/Alternate Icons/caribbean-green@2x.png b/Sources/App/Resources/Alternate Icons/caribbean-green@2x.png index b11ca970f..a4e874234 100644 Binary files a/Sources/App/Resources/Alternate Icons/caribbean-green@2x.png and b/Sources/App/Resources/Alternate Icons/caribbean-green@2x.png differ diff --git a/Sources/App/Resources/Alternate Icons/caribbean-green@3x.png b/Sources/App/Resources/Alternate Icons/caribbean-green@3x.png index 82a5aba69..9bc9cab85 100644 Binary files a/Sources/App/Resources/Alternate Icons/caribbean-green@3x.png and b/Sources/App/Resources/Alternate Icons/caribbean-green@3x.png differ diff --git a/Sources/App/Resources/Alternate Icons/classic@2x.png b/Sources/App/Resources/Alternate Icons/classic@2x.png new file mode 100644 index 000000000..b69145f54 Binary files /dev/null and b/Sources/App/Resources/Alternate Icons/classic@2x.png differ diff --git a/Sources/App/Resources/Alternate Icons/classic@3x.png b/Sources/App/Resources/Alternate Icons/classic@3x.png new file mode 100644 index 000000000..97d107e8d Binary files /dev/null and b/Sources/App/Resources/Alternate Icons/classic@3x.png differ diff --git a/Sources/App/Resources/Alternate Icons/cornflower-blue@2x.png b/Sources/App/Resources/Alternate Icons/cornflower-blue@2x.png index cb601abf8..a9385acf8 100644 Binary files a/Sources/App/Resources/Alternate Icons/cornflower-blue@2x.png and b/Sources/App/Resources/Alternate Icons/cornflower-blue@2x.png differ diff --git a/Sources/App/Resources/Alternate Icons/cornflower-blue@3x.png b/Sources/App/Resources/Alternate Icons/cornflower-blue@3x.png index 5431dfebe..aec5f1067 100644 Binary files a/Sources/App/Resources/Alternate Icons/cornflower-blue@3x.png and b/Sources/App/Resources/Alternate Icons/cornflower-blue@3x.png differ diff --git a/Sources/App/Resources/Alternate Icons/crimson@2x.png b/Sources/App/Resources/Alternate Icons/crimson@2x.png index 1183700f4..d5c5ef1a2 100644 Binary files a/Sources/App/Resources/Alternate Icons/crimson@2x.png and b/Sources/App/Resources/Alternate Icons/crimson@2x.png differ diff --git a/Sources/App/Resources/Alternate Icons/crimson@3x.png b/Sources/App/Resources/Alternate Icons/crimson@3x.png index 446aa2163..5e4812284 100644 Binary files a/Sources/App/Resources/Alternate Icons/crimson@3x.png and b/Sources/App/Resources/Alternate Icons/crimson@3x.png differ diff --git a/Sources/App/Resources/Alternate Icons/dev@2x.png b/Sources/App/Resources/Alternate Icons/dev@2x.png index 9fbde97ea..666c6144e 100644 Binary files a/Sources/App/Resources/Alternate Icons/dev@2x.png and b/Sources/App/Resources/Alternate Icons/dev@2x.png differ diff --git a/Sources/App/Resources/Alternate Icons/dev@3x.png b/Sources/App/Resources/Alternate Icons/dev@3x.png index 35290d90f..c9f7ad9a6 100644 Binary files a/Sources/App/Resources/Alternate Icons/dev@3x.png and b/Sources/App/Resources/Alternate Icons/dev@3x.png differ diff --git a/Sources/App/Resources/Alternate Icons/electric-violet@2x.png b/Sources/App/Resources/Alternate Icons/electric-violet@2x.png index 238e8c870..a148cd103 100644 Binary files a/Sources/App/Resources/Alternate Icons/electric-violet@2x.png and b/Sources/App/Resources/Alternate Icons/electric-violet@2x.png differ diff --git a/Sources/App/Resources/Alternate Icons/electric-violet@3x.png b/Sources/App/Resources/Alternate Icons/electric-violet@3x.png index 31e923d4d..8488ed45d 100644 Binary files a/Sources/App/Resources/Alternate Icons/electric-violet@3x.png and b/Sources/App/Resources/Alternate Icons/electric-violet@3x.png differ diff --git a/Sources/App/Resources/Alternate Icons/fire-orange@2x.png b/Sources/App/Resources/Alternate Icons/fire-orange@2x.png index d3fa77676..866e0160f 100644 Binary files a/Sources/App/Resources/Alternate Icons/fire-orange@2x.png and b/Sources/App/Resources/Alternate Icons/fire-orange@2x.png differ diff --git a/Sources/App/Resources/Alternate Icons/fire-orange@3x.png b/Sources/App/Resources/Alternate Icons/fire-orange@3x.png index 0a2ab8947..179b80fea 100644 Binary files a/Sources/App/Resources/Alternate Icons/fire-orange@3x.png and b/Sources/App/Resources/Alternate Icons/fire-orange@3x.png differ diff --git a/Sources/App/Resources/Alternate Icons/green@2x.png b/Sources/App/Resources/Alternate Icons/green@2x.png index 0218741e2..52de9b035 100644 Binary files a/Sources/App/Resources/Alternate Icons/green@2x.png and b/Sources/App/Resources/Alternate Icons/green@2x.png differ diff --git a/Sources/App/Resources/Alternate Icons/green@3x.png b/Sources/App/Resources/Alternate Icons/green@3x.png index 283e625bb..8404cb478 100644 Binary files a/Sources/App/Resources/Alternate Icons/green@3x.png and b/Sources/App/Resources/Alternate Icons/green@3x.png differ diff --git a/Sources/App/Resources/Alternate Icons/ha-blue@2x.png b/Sources/App/Resources/Alternate Icons/ha-blue@2x.png deleted file mode 100644 index a6331fa06..000000000 Binary files a/Sources/App/Resources/Alternate Icons/ha-blue@2x.png and /dev/null differ diff --git a/Sources/App/Resources/Alternate Icons/ha-blue@3x.png b/Sources/App/Resources/Alternate Icons/ha-blue@3x.png deleted file mode 100644 index fefa5f10c..000000000 Binary files a/Sources/App/Resources/Alternate Icons/ha-blue@3x.png and /dev/null differ diff --git a/Sources/App/Resources/Alternate Icons/non-binary@2x.png b/Sources/App/Resources/Alternate Icons/non-binary@2x.png new file mode 100644 index 000000000..11c66ea25 Binary files /dev/null and b/Sources/App/Resources/Alternate Icons/non-binary@2x.png differ diff --git a/Sources/App/Resources/Alternate Icons/non-binary@3x.png b/Sources/App/Resources/Alternate Icons/non-binary@3x.png new file mode 100644 index 000000000..8322ea952 Binary files /dev/null and b/Sources/App/Resources/Alternate Icons/non-binary@3x.png differ diff --git a/Sources/App/Resources/Alternate Icons/old-beta@2x.png b/Sources/App/Resources/Alternate Icons/old-beta@2x.png index 198020321..19c850c21 100644 Binary files a/Sources/App/Resources/Alternate Icons/old-beta@2x.png and b/Sources/App/Resources/Alternate Icons/old-beta@2x.png differ diff --git a/Sources/App/Resources/Alternate Icons/old-beta@3x.png b/Sources/App/Resources/Alternate Icons/old-beta@3x.png index 6d9c208f2..85cbcabc4 100644 Binary files a/Sources/App/Resources/Alternate Icons/old-beta@3x.png and b/Sources/App/Resources/Alternate Icons/old-beta@3x.png differ diff --git a/Sources/App/Resources/Alternate Icons/old-dev@2x.png b/Sources/App/Resources/Alternate Icons/old-dev@2x.png index 6392f7955..69e562eb6 100644 Binary files a/Sources/App/Resources/Alternate Icons/old-dev@2x.png and b/Sources/App/Resources/Alternate Icons/old-dev@2x.png differ diff --git a/Sources/App/Resources/Alternate Icons/old-dev@3x.png b/Sources/App/Resources/Alternate Icons/old-dev@3x.png index 11f4d7623..4b998939b 100644 Binary files a/Sources/App/Resources/Alternate Icons/old-dev@3x.png and b/Sources/App/Resources/Alternate Icons/old-dev@3x.png differ diff --git a/Sources/App/Resources/Alternate Icons/old-release@2x.png b/Sources/App/Resources/Alternate Icons/old-release@2x.png index 555645df4..b627e8649 100644 Binary files a/Sources/App/Resources/Alternate Icons/old-release@2x.png and b/Sources/App/Resources/Alternate Icons/old-release@2x.png differ diff --git a/Sources/App/Resources/Alternate Icons/old-release@3x.png b/Sources/App/Resources/Alternate Icons/old-release@3x.png index 57d86582e..89052c4ca 100644 Binary files a/Sources/App/Resources/Alternate Icons/old-release@3x.png and b/Sources/App/Resources/Alternate Icons/old-release@3x.png differ diff --git a/Sources/App/Resources/Alternate Icons/orange@2x.png b/Sources/App/Resources/Alternate Icons/orange@2x.png index 2939d69e7..0d4179308 100644 Binary files a/Sources/App/Resources/Alternate Icons/orange@2x.png and b/Sources/App/Resources/Alternate Icons/orange@2x.png differ diff --git a/Sources/App/Resources/Alternate Icons/orange@3x.png b/Sources/App/Resources/Alternate Icons/orange@3x.png index 1441367ae..b7528f651 100644 Binary files a/Sources/App/Resources/Alternate Icons/orange@3x.png and b/Sources/App/Resources/Alternate Icons/orange@3x.png differ diff --git a/Sources/App/Resources/Alternate Icons/pink@2x.png b/Sources/App/Resources/Alternate Icons/pink@2x.png index f70cd3c19..231d925fa 100644 Binary files a/Sources/App/Resources/Alternate Icons/pink@2x.png and b/Sources/App/Resources/Alternate Icons/pink@2x.png differ diff --git a/Sources/App/Resources/Alternate Icons/pink@3x.png b/Sources/App/Resources/Alternate Icons/pink@3x.png index ed727ea35..1cc001b02 100644 Binary files a/Sources/App/Resources/Alternate Icons/pink@3x.png and b/Sources/App/Resources/Alternate Icons/pink@3x.png differ diff --git a/Sources/App/Resources/Alternate Icons/purple@2x.png b/Sources/App/Resources/Alternate Icons/purple@2x.png index 361e8db53..6c07320a4 100644 Binary files a/Sources/App/Resources/Alternate Icons/purple@2x.png and b/Sources/App/Resources/Alternate Icons/purple@2x.png differ diff --git a/Sources/App/Resources/Alternate Icons/purple@3x.png b/Sources/App/Resources/Alternate Icons/purple@3x.png index 1175c3b28..93192e475 100644 Binary files a/Sources/App/Resources/Alternate Icons/purple@3x.png and b/Sources/App/Resources/Alternate Icons/purple@3x.png differ diff --git a/Sources/App/Resources/Alternate Icons/rainbow@2x.png b/Sources/App/Resources/Alternate Icons/rainbow@2x.png index a3440bea1..11a42ff9b 100644 Binary files a/Sources/App/Resources/Alternate Icons/rainbow@2x.png and b/Sources/App/Resources/Alternate Icons/rainbow@2x.png differ diff --git a/Sources/App/Resources/Alternate Icons/rainbow@3x.png b/Sources/App/Resources/Alternate Icons/rainbow@3x.png index dca10b766..364e386bb 100644 Binary files a/Sources/App/Resources/Alternate Icons/rainbow@3x.png and b/Sources/App/Resources/Alternate Icons/rainbow@3x.png differ diff --git a/Sources/App/Resources/Alternate Icons/rainbow_invert@2x.png b/Sources/App/Resources/Alternate Icons/rainbow_invert@2x.png deleted file mode 100644 index 7c5bc4cef..000000000 Binary files a/Sources/App/Resources/Alternate Icons/rainbow_invert@2x.png and /dev/null differ diff --git a/Sources/App/Resources/Alternate Icons/rainbow_invert@3x.png b/Sources/App/Resources/Alternate Icons/rainbow_invert@3x.png deleted file mode 100644 index 0d34052ee..000000000 Binary files a/Sources/App/Resources/Alternate Icons/rainbow_invert@3x.png and /dev/null differ diff --git a/Sources/App/Resources/Alternate Icons/red@2x.png b/Sources/App/Resources/Alternate Icons/red@2x.png index 07f831f27..2873f9bbb 100644 Binary files a/Sources/App/Resources/Alternate Icons/red@2x.png and b/Sources/App/Resources/Alternate Icons/red@2x.png differ diff --git a/Sources/App/Resources/Alternate Icons/red@3x.png b/Sources/App/Resources/Alternate Icons/red@3x.png index fb2adb03b..93c019358 100644 Binary files a/Sources/App/Resources/Alternate Icons/red@3x.png and b/Sources/App/Resources/Alternate Icons/red@3x.png differ diff --git a/Sources/App/Resources/Alternate Icons/release@2x.png b/Sources/App/Resources/Alternate Icons/release@2x.png index bd53e0c6a..122fb1b0b 100644 Binary files a/Sources/App/Resources/Alternate Icons/release@2x.png and b/Sources/App/Resources/Alternate Icons/release@2x.png differ diff --git a/Sources/App/Resources/Alternate Icons/release@3x.png b/Sources/App/Resources/Alternate Icons/release@3x.png index 301bf5d84..b32bdbb18 100644 Binary files a/Sources/App/Resources/Alternate Icons/release@3x.png and b/Sources/App/Resources/Alternate Icons/release@3x.png differ diff --git a/Sources/App/Resources/Alternate Icons/trans@2x.png b/Sources/App/Resources/Alternate Icons/trans@2x.png index 4226ed636..e8be90164 100644 Binary files a/Sources/App/Resources/Alternate Icons/trans@2x.png and b/Sources/App/Resources/Alternate Icons/trans@2x.png differ diff --git a/Sources/App/Resources/Alternate Icons/trans@3x.png b/Sources/App/Resources/Alternate Icons/trans@3x.png index 20a9edaa2..e3bd9d51d 100644 Binary files a/Sources/App/Resources/Alternate Icons/trans@3x.png and b/Sources/App/Resources/Alternate Icons/trans@3x.png differ diff --git a/Sources/App/Resources/Alternate Icons/white@2x.png b/Sources/App/Resources/Alternate Icons/white@2x.png index a44094bbb..54ca33fa4 100644 Binary files a/Sources/App/Resources/Alternate Icons/white@2x.png and b/Sources/App/Resources/Alternate Icons/white@2x.png differ diff --git a/Sources/App/Resources/Alternate Icons/white@3x.png b/Sources/App/Resources/Alternate Icons/white@3x.png index 33b2c105c..28feeb542 100644 Binary files a/Sources/App/Resources/Alternate Icons/white@3x.png and b/Sources/App/Resources/Alternate Icons/white@3x.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json index d1221eff7..7b3a9d515 100644 --- a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,176 +1,176 @@ { - "images" : [ + "images": [ { - "filename" : "release-40x40-small-logo.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "20x20" + "idiom": "ios-marketing", + "filename": "release-1024x1024.png", + "scale": "1x", + "size": "1024x1024" }, { - "filename" : "release-60x60.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "20x20" + "idiom": "mac", + "filename": "release-1024x1024.png", + "scale": "2x", + "size": "512x512" }, { - "filename" : "release-58x58.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "29x29" + "idiom": "mac", + "filename": "release-512x512.png", + "scale": "2x", + "size": "256x256" }, { - "filename" : "release-87x87.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "29x29" + "idiom": "mac", + "filename": "release-512x512.png", + "scale": "1x", + "size": "512x512" }, { - "filename" : "release-80x80.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "40x40" + "idiom": "mac", + "filename": "release-256x256.png", + "scale": "1x", + "size": "256x256" }, { - "filename" : "release-120x120.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "40x40" + "idiom": "mac", + "filename": "release-256x256.png", + "scale": "2x", + "size": "128x128" }, { - "filename" : "release-120x120.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "60x60" + "idiom": "iphone", + "filename": "release-180x180.png", + "scale": "3x", + "size": "60x60" }, { - "filename" : "release-180x180.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "60x60" + "idiom": "ipad", + "filename": "release-167x167.png", + "scale": "2x", + "size": "83.5x83.5" }, { - "filename" : "release-20x20.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" + "idiom": "ipad", + "filename": "release-152x152.png", + "scale": "2x", + "size": "76x76" }, { - "filename" : "release-40x40-small-logo.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" + "idiom": "mac", + "filename": "release-128x128.png", + "scale": "1x", + "size": "128x128" }, { - "filename" : "release-29x29.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" + "idiom": "iphone", + "filename": "release-120x120.png", + "scale": "3x", + "size": "40x40" }, { - "filename" : "release-58x58.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" + "idiom": "iphone", + "filename": "release-120x120.png", + "scale": "2x", + "size": "60x60" }, { - "filename" : "release-40x40.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" + "idiom": "iphone", + "filename": "release-87x87.png", + "scale": "3x", + "size": "29x29" }, { - "filename" : "release-80x80.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" + "idiom": "iphone", + "filename": "release-80x80.png", + "scale": "2x", + "size": "40x40" }, { - "filename" : "release-76x76.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" + "idiom": "ipad", + "filename": "release-80x80.png", + "scale": "2x", + "size": "40x40" }, { - "filename" : "release-152x152.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" + "idiom": "ipad", + "filename": "release-76x76.png", + "scale": "1x", + "size": "76x76" }, { - "filename" : "release-167x167.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" + "idiom": "mac", + "filename": "release-64x64.png", + "scale": "2x", + "size": "32x32" }, { - "filename" : "release-1024x1024.png", - "idiom" : "ios-marketing", - "scale" : "1x", - "size" : "1024x1024" + "idiom": "iphone", + "filename": "release-60x60.png", + "scale": "3x", + "size": "20x20" }, { - "filename" : "icon_16x16.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "16x16" + "idiom": "ipad", + "filename": "release-58x58.png", + "scale": "2x", + "size": "29x29" }, { - "filename" : "icon_16x16@2x.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "16x16" + "idiom": "iphone", + "filename": "release-58x58.png", + "scale": "2x", + "size": "29x29" }, { - "filename" : "icon_32x32.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "32x32" + "idiom": "iphone", + "filename": "release-40x40.png", + "scale": "2x", + "size": "20x20" }, { - "filename" : "icon_32x32@2x.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "32x32" + "idiom": "ipad", + "filename": "release-40x40.png", + "scale": "2x", + "size": "20x20" }, { - "filename" : "icon_128x128.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "128x128" + "idiom": "ipad", + "filename": "release-40x40.png", + "scale": "1x", + "size": "40x40" }, { - "filename" : "icon_128x128@2x.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "128x128" + "idiom": "mac", + "filename": "release-32x32.png", + "scale": "1x", + "size": "32x32" }, { - "filename" : "icon_256x256.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "256x256" + "idiom": "mac", + "filename": "release-32x32.png", + "scale": "2x", + "size": "16x16" }, { - "filename" : "icon_256x256@2x.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "256x256" + "idiom": "ipad", + "filename": "release-29x29.png", + "scale": "1x", + "size": "29x29" }, { - "filename" : "icon_512x512.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "512x512" + "idiom": "ipad", + "filename": "release-20x20.png", + "scale": "1x", + "size": "20x20" }, { - "filename" : "icon_512x512@2x.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "512x512" + "idiom": "mac", + "filename": "release-16x16.png", + "scale": "1x", + "size": "16x16" } ], - "info" : { - "author" : "xcode", - "version" : 1 + "info": { + "version": 1, + "author": "fastlane" } } diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_128x128.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_128x128.png deleted file mode 100644 index 483620a9f..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_128x128.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png deleted file mode 100644 index 6da6c3063..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_16x16.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_16x16.png deleted file mode 100644 index 88159e262..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_16x16.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png deleted file mode 100644 index 0a8a2bd0b..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_256x256.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_256x256.png deleted file mode 100644 index 835bd82dc..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_256x256.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png deleted file mode 100644 index 968bd3a99..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_32x32.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_32x32.png deleted file mode 100644 index 0a8a2bd0b..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_32x32.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png deleted file mode 100644 index 846d7f1b8..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_512x512.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_512x512.png deleted file mode 100644 index 968bd3a99..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_512x512.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png deleted file mode 100644 index 0c366d4bf..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-1024x1024.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-1024x1024.png index c6ae93b2d..e437d6cd8 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-1024x1024.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-1024x1024.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-120x120.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-120x120.png index 88c971fed..09129b862 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-120x120.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-120x120.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-128x128.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-128x128.png new file mode 100644 index 000000000..d24e5da36 Binary files /dev/null and b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-128x128.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-152x152.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-152x152.png index afb7eec66..69286aa91 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-152x152.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-152x152.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-167x167.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-167x167.png index 970cae2a6..ec1dee19d 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-167x167.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-167x167.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-16x16.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-16x16.png new file mode 100644 index 000000000..2e0c813f8 Binary files /dev/null and b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-16x16.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-180x180.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-180x180.png index 5bb3c0b2b..3af8e9add 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-180x180.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-180x180.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-20x20.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-20x20.png index 8045f2789..c75e16ae1 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-20x20.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-20x20.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-256x256.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-256x256.png new file mode 100644 index 000000000..ad31e1f51 Binary files /dev/null and b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-256x256.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-29x29.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-29x29.png index 59fc37589..3e7e5876e 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-29x29.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-29x29.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-32x32.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-32x32.png new file mode 100644 index 000000000..21ba6cf2b Binary files /dev/null and b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-32x32.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-40x40-small-logo.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-40x40-small-logo.png deleted file mode 100644 index 0f9bebb40..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-40x40-small-logo.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-40x40.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-40x40.png index 15fa5a893..549528e58 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-40x40.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-40x40.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-512x512.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-512x512.png new file mode 100644 index 000000000..b822c7526 Binary files /dev/null and b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-512x512.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-58x58.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-58x58.png index 4d9398244..43d151999 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-58x58.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-58x58.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-60x60.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-60x60.png index 2112b910a..4b5ac5d82 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-60x60.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-60x60.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-64x64.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-64x64.png new file mode 100644 index 000000000..a994c7f0d Binary files /dev/null and b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-64x64.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-76x76.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-76x76.png index 6f5c70f62..fe4e9ec96 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-76x76.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-76x76.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-80x80.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-80x80.png index d947c05da..f6285f3cc 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-80x80.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-80x80.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-87x87.png b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-87x87.png index a74dd8546..998a59fc9 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-87x87.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.appiconset/release-87x87.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/Contents.json b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/Contents.json index 3cfd6ce03..29a4e0bd0 100644 --- a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/Contents.json +++ b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/Contents.json @@ -1,176 +1,176 @@ { - "images" : [ + "images": [ { - "filename" : "beta-40x40.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "20x20" + "idiom": "ios-marketing", + "filename": "beta-1024x1024.png", + "scale": "1x", + "size": "1024x1024" }, { - "filename" : "beta-60x60.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "20x20" + "idiom": "mac", + "filename": "beta-1024x1024.png", + "scale": "2x", + "size": "512x512" }, { - "filename" : "beta-58x58.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "29x29" + "idiom": "mac", + "filename": "beta-512x512.png", + "scale": "2x", + "size": "256x256" }, { - "filename" : "beta-87x87.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "29x29" + "idiom": "mac", + "filename": "beta-512x512.png", + "scale": "1x", + "size": "512x512" }, { - "filename" : "beta-80x80.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "40x40" + "idiom": "mac", + "filename": "beta-256x256.png", + "scale": "1x", + "size": "256x256" }, { - "filename" : "beta-120x120.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "40x40" + "idiom": "mac", + "filename": "beta-256x256.png", + "scale": "2x", + "size": "128x128" }, { - "filename" : "beta-120x120.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "60x60" + "idiom": "iphone", + "filename": "beta-180x180.png", + "scale": "3x", + "size": "60x60" }, { - "filename" : "beta-180x180.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "60x60" + "idiom": "ipad", + "filename": "beta-167x167.png", + "scale": "2x", + "size": "83.5x83.5" }, { - "filename" : "beta-20x20.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" + "idiom": "ipad", + "filename": "beta-152x152.png", + "scale": "2x", + "size": "76x76" }, { - "filename" : "beta-40x40.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" + "idiom": "mac", + "filename": "beta-128x128.png", + "scale": "1x", + "size": "128x128" }, { - "filename" : "beta-29x29.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" + "idiom": "iphone", + "filename": "beta-120x120.png", + "scale": "3x", + "size": "40x40" }, { - "filename" : "beta-58x58.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" + "idiom": "iphone", + "filename": "beta-120x120.png", + "scale": "2x", + "size": "60x60" }, { - "filename" : "beta-40x40.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" + "idiom": "iphone", + "filename": "beta-87x87.png", + "scale": "3x", + "size": "29x29" }, { - "filename" : "beta-80x80.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" + "idiom": "iphone", + "filename": "beta-80x80.png", + "scale": "2x", + "size": "40x40" }, { - "filename" : "beta-76x76.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" + "idiom": "ipad", + "filename": "beta-80x80.png", + "scale": "2x", + "size": "40x40" }, { - "filename" : "beta-152x152.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" + "idiom": "ipad", + "filename": "beta-76x76.png", + "scale": "1x", + "size": "76x76" }, { - "filename" : "beta-167x167.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" + "idiom": "mac", + "filename": "beta-64x64.png", + "scale": "2x", + "size": "32x32" }, { - "filename" : "beta-1024x1024.png", - "idiom" : "ios-marketing", - "scale" : "1x", - "size" : "1024x1024" + "idiom": "iphone", + "filename": "beta-60x60.png", + "scale": "3x", + "size": "20x20" }, { - "filename" : "icon_16x16.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "16x16" + "idiom": "ipad", + "filename": "beta-58x58.png", + "scale": "2x", + "size": "29x29" }, { - "filename" : "icon_16x16@2x.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "16x16" + "idiom": "iphone", + "filename": "beta-58x58.png", + "scale": "2x", + "size": "29x29" }, { - "filename" : "icon_32x32.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "32x32" + "idiom": "iphone", + "filename": "beta-40x40.png", + "scale": "2x", + "size": "20x20" }, { - "filename" : "icon_32x32@2x.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "32x32" + "idiom": "ipad", + "filename": "beta-40x40.png", + "scale": "2x", + "size": "20x20" }, { - "filename" : "icon_128x128.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "128x128" + "idiom": "ipad", + "filename": "beta-40x40.png", + "scale": "1x", + "size": "40x40" }, { - "filename" : "icon_128x128@2x.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "128x128" + "idiom": "mac", + "filename": "beta-32x32.png", + "scale": "1x", + "size": "32x32" }, { - "filename" : "icon_256x256.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "256x256" + "idiom": "mac", + "filename": "beta-32x32.png", + "scale": "2x", + "size": "16x16" }, { - "filename" : "icon_256x256@2x.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "256x256" + "idiom": "ipad", + "filename": "beta-29x29.png", + "scale": "1x", + "size": "29x29" }, { - "filename" : "icon_512x512.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "512x512" + "idiom": "ipad", + "filename": "beta-20x20.png", + "scale": "1x", + "size": "20x20" }, { - "filename" : "icon_512x512@2x.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "512x512" + "idiom": "mac", + "filename": "beta-16x16.png", + "scale": "1x", + "size": "16x16" } ], - "info" : { - "author" : "xcode", - "version" : 1 + "info": { + "version": 1, + "author": "fastlane" } } diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-1024x1024.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-1024x1024.png index 51c934b9c..2ba4c1ff3 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-1024x1024.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-1024x1024.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-120x120.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-120x120.png index be83105ab..a70ac4304 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-120x120.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-120x120.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-128x128.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-128x128.png new file mode 100644 index 000000000..b3a80ae2d Binary files /dev/null and b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-128x128.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-152x152.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-152x152.png index aa9993c81..74d97db50 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-152x152.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-152x152.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-167x167.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-167x167.png index ae3572147..c602f4872 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-167x167.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-167x167.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-16x16.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-16x16.png new file mode 100644 index 000000000..ccb94b475 Binary files /dev/null and b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-16x16.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-180x180.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-180x180.png index 1bae1643b..b083b624c 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-180x180.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-180x180.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-20x20.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-20x20.png index 6049fa422..60884e041 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-20x20.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-20x20.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-256x256.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-256x256.png new file mode 100644 index 000000000..69e294ad0 Binary files /dev/null and b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-256x256.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-29x29.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-29x29.png index 64dc63c10..7e5a5cc2f 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-29x29.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-29x29.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-32x32.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-32x32.png new file mode 100644 index 000000000..282e2add5 Binary files /dev/null and b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-32x32.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-40x40.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-40x40.png index f1605b454..7d0321fe3 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-40x40.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-40x40.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-512x512.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-512x512.png new file mode 100644 index 000000000..1a94003b5 Binary files /dev/null and b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-512x512.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-58x58.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-58x58.png index 822ffab25..79c0a3a51 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-58x58.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-58x58.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-60x60.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-60x60.png index b37678625..40dfc64c4 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-60x60.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-60x60.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-64x64.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-64x64.png new file mode 100644 index 000000000..2fbb182d1 Binary files /dev/null and b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-64x64.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-76x76.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-76x76.png index f441d989e..f658df42b 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-76x76.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-76x76.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-80x80.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-80x80.png index 79df4ee50..893f29893 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-80x80.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-80x80.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-87x87.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-87x87.png index 3b496b0dc..dad846b9c 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-87x87.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/beta-87x87.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_128x128.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_128x128.png deleted file mode 100644 index b51be67a7..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_128x128.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_128x128@2x.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_128x128@2x.png deleted file mode 100644 index 767f091bd..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_128x128@2x.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_16x16.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_16x16.png deleted file mode 100644 index 0bf99f01b..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_16x16.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_16x16@2x.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_16x16@2x.png deleted file mode 100644 index 24e47fbda..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_16x16@2x.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_256x256.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_256x256.png deleted file mode 100644 index 399057a45..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_256x256.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_256x256@2x.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_256x256@2x.png deleted file mode 100644 index 1b38a29b8..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_256x256@2x.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_32x32.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_32x32.png deleted file mode 100644 index 24e47fbda..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_32x32.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_32x32@2x.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_32x32@2x.png deleted file mode 100644 index a61ca0fa3..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_32x32@2x.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_512x512.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_512x512.png deleted file mode 100644 index 1b38a29b8..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_512x512.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_512x512@2x.png b/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_512x512@2x.png deleted file mode 100644 index 092f446e4..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.beta.appiconset/icon_512x512@2x.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/Contents.json b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/Contents.json index 3138be70d..6aea862c3 100644 --- a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/Contents.json +++ b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/Contents.json @@ -1,176 +1,176 @@ { - "images" : [ + "images": [ { - "filename" : "dev-40x40.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "20x20" + "idiom": "ios-marketing", + "filename": "dev-1024x1024.png", + "scale": "1x", + "size": "1024x1024" }, { - "filename" : "dev-60x60.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "20x20" + "idiom": "mac", + "filename": "dev-1024x1024.png", + "scale": "2x", + "size": "512x512" }, { - "filename" : "dev-58x58.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "29x29" + "idiom": "mac", + "filename": "dev-512x512.png", + "scale": "2x", + "size": "256x256" }, { - "filename" : "dev-87x87.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "29x29" + "idiom": "mac", + "filename": "dev-512x512.png", + "scale": "1x", + "size": "512x512" }, { - "filename" : "dev-80x80.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "40x40" + "idiom": "mac", + "filename": "dev-256x256.png", + "scale": "1x", + "size": "256x256" }, { - "filename" : "dev-120x120.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "40x40" + "idiom": "mac", + "filename": "dev-256x256.png", + "scale": "2x", + "size": "128x128" }, { - "filename" : "dev-120x120.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "60x60" + "idiom": "iphone", + "filename": "dev-180x180.png", + "scale": "3x", + "size": "60x60" }, { - "filename" : "dev-180x180.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "60x60" + "idiom": "ipad", + "filename": "dev-167x167.png", + "scale": "2x", + "size": "83.5x83.5" }, { - "filename" : "dev-20x20.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" + "idiom": "ipad", + "filename": "dev-152x152.png", + "scale": "2x", + "size": "76x76" }, { - "filename" : "dev-40x40.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" + "idiom": "mac", + "filename": "dev-128x128.png", + "scale": "1x", + "size": "128x128" }, { - "filename" : "dev-29x29.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" + "idiom": "iphone", + "filename": "dev-120x120.png", + "scale": "3x", + "size": "40x40" }, { - "filename" : "dev-58x58.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" + "idiom": "iphone", + "filename": "dev-120x120.png", + "scale": "2x", + "size": "60x60" }, { - "filename" : "dev-40x40.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" + "idiom": "iphone", + "filename": "dev-87x87.png", + "scale": "3x", + "size": "29x29" }, { - "filename" : "dev-80x80.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" + "idiom": "iphone", + "filename": "dev-80x80.png", + "scale": "2x", + "size": "40x40" }, { - "filename" : "dev-76x76.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" + "idiom": "ipad", + "filename": "dev-80x80.png", + "scale": "2x", + "size": "40x40" }, { - "filename" : "dev-152x152.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" + "idiom": "ipad", + "filename": "dev-76x76.png", + "scale": "1x", + "size": "76x76" }, { - "filename" : "dev-167x167.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" + "idiom": "mac", + "filename": "dev-64x64.png", + "scale": "2x", + "size": "32x32" }, { - "filename" : "dev-1024x1024.png", - "idiom" : "ios-marketing", - "scale" : "1x", - "size" : "1024x1024" + "idiom": "iphone", + "filename": "dev-60x60.png", + "scale": "3x", + "size": "20x20" }, { - "filename" : "icon_16x16.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "16x16" + "idiom": "ipad", + "filename": "dev-58x58.png", + "scale": "2x", + "size": "29x29" }, { - "filename" : "icon_16x16@2x.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "16x16" + "idiom": "iphone", + "filename": "dev-58x58.png", + "scale": "2x", + "size": "29x29" }, { - "filename" : "icon_32x32.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "32x32" + "idiom": "iphone", + "filename": "dev-40x40.png", + "scale": "2x", + "size": "20x20" }, { - "filename" : "icon_32x32@2x.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "32x32" + "idiom": "ipad", + "filename": "dev-40x40.png", + "scale": "2x", + "size": "20x20" }, { - "filename" : "icon_128x128.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "128x128" + "idiom": "ipad", + "filename": "dev-40x40.png", + "scale": "1x", + "size": "40x40" }, { - "filename" : "icon_128x128@2x.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "128x128" + "idiom": "mac", + "filename": "dev-32x32.png", + "scale": "1x", + "size": "32x32" }, { - "filename" : "icon_256x256.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "256x256" + "idiom": "mac", + "filename": "dev-32x32.png", + "scale": "2x", + "size": "16x16" }, { - "filename" : "icon_256x256@2x.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "256x256" + "idiom": "ipad", + "filename": "dev-29x29.png", + "scale": "1x", + "size": "29x29" }, { - "filename" : "icon_512x512.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "512x512" + "idiom": "ipad", + "filename": "dev-20x20.png", + "scale": "1x", + "size": "20x20" }, { - "filename" : "icon_512x512@2x.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "512x512" + "idiom": "mac", + "filename": "dev-16x16.png", + "scale": "1x", + "size": "16x16" } ], - "info" : { - "author" : "xcode", - "version" : 1 + "info": { + "version": 1, + "author": "fastlane" } } diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-1024x1024.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-1024x1024.png index 7b016490a..4753866ea 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-1024x1024.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-1024x1024.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-120x120.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-120x120.png index caca21a3d..33c41dd9c 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-120x120.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-120x120.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-128x128.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-128x128.png new file mode 100644 index 000000000..2339c401e Binary files /dev/null and b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-128x128.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-152x152.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-152x152.png index dd27c0291..47871a2a8 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-152x152.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-152x152.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-167x167.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-167x167.png index 9423c6c5f..1dcfad7b9 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-167x167.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-167x167.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-16x16.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-16x16.png new file mode 100644 index 000000000..6ee40cfdb Binary files /dev/null and b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-16x16.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-180x180.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-180x180.png index b57c15447..ba3e1878d 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-180x180.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-180x180.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-20x20.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-20x20.png index 0f16316c2..813ca86bc 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-20x20.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-20x20.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-256x256.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-256x256.png new file mode 100644 index 000000000..87641efc9 Binary files /dev/null and b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-256x256.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-29x29.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-29x29.png index 0b3d02e77..d2723e42e 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-29x29.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-29x29.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-32x32.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-32x32.png new file mode 100644 index 000000000..8fe54482f Binary files /dev/null and b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-32x32.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-40x40.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-40x40.png index eb42820f5..aabab88be 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-40x40.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-40x40.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-512x512.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-512x512.png new file mode 100644 index 000000000..e4b8d727a Binary files /dev/null and b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-512x512.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-58x58.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-58x58.png index 0f33669d7..b75d192fa 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-58x58.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-58x58.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-60x60.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-60x60.png index 7c7f01815..1fe04b9e0 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-60x60.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-60x60.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-64x64.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-64x64.png new file mode 100644 index 000000000..203270106 Binary files /dev/null and b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-64x64.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-76x76.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-76x76.png index db8193522..4b96f7ed3 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-76x76.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-76x76.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-80x80.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-80x80.png index f51fed75d..9ba71eebe 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-80x80.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-80x80.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-87x87.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-87x87.png index bb1f11b98..f51bfa2e4 100644 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-87x87.png and b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/dev-87x87.png differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_128x128.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_128x128.png deleted file mode 100644 index 7d77e2ff2..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_128x128.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_128x128@2x.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_128x128@2x.png deleted file mode 100644 index 04c354932..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_128x128@2x.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_16x16.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_16x16.png deleted file mode 100644 index 76e73fbf5..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_16x16.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_16x16@2x.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_16x16@2x.png deleted file mode 100644 index 1d449485d..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_16x16@2x.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_256x256.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_256x256.png deleted file mode 100644 index 512737bab..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_256x256.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_256x256@2x.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_256x256@2x.png deleted file mode 100644 index 008cd820f..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_256x256@2x.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_32x32.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_32x32.png deleted file mode 100644 index 1d449485d..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_32x32.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_32x32@2x.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_32x32@2x.png deleted file mode 100644 index c4b30708d..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_32x32@2x.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_512x512.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_512x512.png deleted file mode 100644 index 008cd820f..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_512x512.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_512x512@2x.png b/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_512x512@2x.png deleted file mode 100644 index 40fee94eb..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/AppIcon.dev.appiconset/icon_512x512@2x.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/LaunchScreen/launchScreen-background.colorset/Contents.json b/Sources/App/Resources/Assets.xcassets/LaunchScreen/launchScreen-background.colorset/Contents.json index 7ab7e6a86..6f7b6e2ec 100644 --- a/Sources/App/Resources/Assets.xcassets/LaunchScreen/launchScreen-background.colorset/Contents.json +++ b/Sources/App/Resources/Assets.xcassets/LaunchScreen/launchScreen-background.colorset/Contents.json @@ -5,9 +5,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "247", - "green" : "167", - "red" : "0" + "blue" : "250", + "green" : "250", + "red" : "250" } }, "idiom" : "universal" @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0.580", - "green" : "0.392", - "red" : "0.000" + "blue" : "17", + "green" : "17", + "red" : "17" } }, "idiom" : "universal" diff --git a/Sources/App/Resources/Assets.xcassets/LaunchScreen/launchScreen-logo.imageset/Contents.json b/Sources/App/Resources/Assets.xcassets/LaunchScreen/launchScreen-logo.imageset/Contents.json index 09f8316ec..95114a068 100644 --- a/Sources/App/Resources/Assets.xcassets/LaunchScreen/launchScreen-logo.imageset/Contents.json +++ b/Sources/App/Resources/Assets.xcassets/LaunchScreen/launchScreen-logo.imageset/Contents.json @@ -1,7 +1,17 @@ { "images" : [ { - "filename" : "logo-white.pdf", + "filename" : "home-assistant-wordmark-vertical-color-on-light.pdf", + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "home-assistant-wordmark-vertical-color-on-dark.pdf", "idiom" : "universal" } ], diff --git a/Sources/App/Resources/Assets.xcassets/LaunchScreen/launchScreen-logo.imageset/home-assistant-wordmark-vertical-color-on-dark.pdf b/Sources/App/Resources/Assets.xcassets/LaunchScreen/launchScreen-logo.imageset/home-assistant-wordmark-vertical-color-on-dark.pdf new file mode 100644 index 000000000..3653a3480 Binary files /dev/null and b/Sources/App/Resources/Assets.xcassets/LaunchScreen/launchScreen-logo.imageset/home-assistant-wordmark-vertical-color-on-dark.pdf differ diff --git a/Sources/App/Resources/Assets.xcassets/LaunchScreen/launchScreen-logo.imageset/home-assistant-wordmark-vertical-color-on-light.pdf b/Sources/App/Resources/Assets.xcassets/LaunchScreen/launchScreen-logo.imageset/home-assistant-wordmark-vertical-color-on-light.pdf new file mode 100644 index 000000000..6f49fa48a Binary files /dev/null and b/Sources/App/Resources/Assets.xcassets/LaunchScreen/launchScreen-logo.imageset/home-assistant-wordmark-vertical-color-on-light.pdf differ diff --git a/Sources/App/Resources/Assets.xcassets/LaunchScreen/launchScreen-logo.imageset/logo-white.pdf b/Sources/App/Resources/Assets.xcassets/LaunchScreen/launchScreen-logo.imageset/logo-white.pdf deleted file mode 100644 index f29b9b8bc..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/LaunchScreen/launchScreen-logo.imageset/logo-white.pdf and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/Logo.imageset/Contents.json b/Sources/App/Resources/Assets.xcassets/Logo.imageset/Contents.json index b86d43385..6fde7e938 100644 --- a/Sources/App/Resources/Assets.xcassets/Logo.imageset/Contents.json +++ b/Sources/App/Resources/Assets.xcassets/Logo.imageset/Contents.json @@ -5,8 +5,8 @@ "scale" : "1x" }, { + "filename" : "home-assistant-logomark-color-on-light.pdf", "idiom" : "universal", - "filename" : "logo-1024x1024.png", "scale" : "2x" }, { @@ -15,7 +15,7 @@ } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Sources/App/Resources/Assets.xcassets/Logo.imageset/home-assistant-logomark-color-on-light.pdf b/Sources/App/Resources/Assets.xcassets/Logo.imageset/home-assistant-logomark-color-on-light.pdf new file mode 100644 index 000000000..b54f26ef6 Binary files /dev/null and b/Sources/App/Resources/Assets.xcassets/Logo.imageset/home-assistant-logomark-color-on-light.pdf differ diff --git a/Sources/App/Resources/Assets.xcassets/Logo.imageset/logo-1024x1024.png b/Sources/App/Resources/Assets.xcassets/Logo.imageset/logo-1024x1024.png deleted file mode 100644 index 4bcc79247..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/Logo.imageset/logo-1024x1024.png and /dev/null differ diff --git a/Sources/App/Resources/Assets.xcassets/statusItemIcon.imageset/Contents.json b/Sources/App/Resources/Assets.xcassets/statusItemIcon.imageset/Contents.json index 66eb383ab..7695c7e79 100644 --- a/Sources/App/Resources/Assets.xcassets/statusItemIcon.imageset/Contents.json +++ b/Sources/App/Resources/Assets.xcassets/statusItemIcon.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "logo-small-black.pdf", + "filename" : "home-assistant-logomark-monochrome-on-light.pdf", "idiom" : "universal" } ], diff --git a/Sources/App/Resources/Assets.xcassets/statusItemIcon.imageset/home-assistant-logomark-monochrome-on-light.pdf b/Sources/App/Resources/Assets.xcassets/statusItemIcon.imageset/home-assistant-logomark-monochrome-on-light.pdf new file mode 100644 index 000000000..c7d8ab807 Binary files /dev/null and b/Sources/App/Resources/Assets.xcassets/statusItemIcon.imageset/home-assistant-logomark-monochrome-on-light.pdf differ diff --git a/Sources/App/Resources/Assets.xcassets/statusItemIcon.imageset/logo-small-black.pdf b/Sources/App/Resources/Assets.xcassets/statusItemIcon.imageset/logo-small-black.pdf deleted file mode 100644 index 5ef2e3637..000000000 Binary files a/Sources/App/Resources/Assets.xcassets/statusItemIcon.imageset/logo-small-black.pdf and /dev/null differ diff --git a/Sources/App/Resources/Base.lproj/LaunchScreen.storyboard b/Sources/App/Resources/Base.lproj/LaunchScreen.storyboard index 6defda1e4..a3c67380d 100644 --- a/Sources/App/Resources/Base.lproj/LaunchScreen.storyboard +++ b/Sources/App/Resources/Base.lproj/LaunchScreen.storyboard @@ -1,9 +1,9 @@ - + - + @@ -17,8 +17,8 @@ - - + + @@ -40,13 +40,13 @@ - + - + - + diff --git a/Sources/App/Resources/Info.plist b/Sources/App/Resources/Info.plist index 964f4a55e..64d04bb0b 100644 --- a/Sources/App/Resources/Info.plist +++ b/Sources/App/Resources/Info.plist @@ -66,6 +66,15 @@ UIPrerenderedIcon + classic + + CFBundleIconFiles + + classic + + UIPrerenderedIcon + + cornflower-blue CFBundleIconFiles @@ -124,7 +133,16 @@ CFBundleIconFiles - ha-blue + release + + UIPrerenderedIcon + + + non-binary + + CFBundleIconFiles + + non-binary UIPrerenderedIcon @@ -196,7 +214,7 @@ CFBundleIconFiles - rainbow_invert + rainbow UIPrerenderedIcon @@ -306,6 +324,15 @@ UIPrerenderedIcon + classic + + CFBundleIconFiles + + classic + + UIPrerenderedIcon + + cornflower-blue CFBundleIconFiles @@ -364,7 +391,16 @@ CFBundleIconFiles - ha-blue + default + + UIPrerenderedIcon + + + non-binary + + CFBundleIconFiles + + non-binary UIPrerenderedIcon @@ -436,7 +472,7 @@ CFBundleIconFiles - rainbow_invert + rainbow UIPrerenderedIcon @@ -602,15 +638,20 @@ Locate and communicate with your Home Assistant instance. NSLocationAlwaysAndWhenInUseUsageDescription We suggest selecting "Always Allow" for the best location experience. - Selecting "Only While Using the App" will disable iBeacons, geofences, background location updates and accurate reporting. + Selecting "Only While Using the App" will disable iBeacons, geofences, + background location updates and accurate reporting. NSLocationAlwaysUsageDescription - We always need access to your location for features like iBeacons, geofences, background location updates and accurate reporting. + We always need access to your location for features like iBeacons, geofences, + background location updates and accurate reporting. NSLocationWhenInUseUsageDescription - Only allowing location access while app is in use will disable iBeacons, geofences, background location updates and accurate reporting. + Only allowing location access while app is in use will disable iBeacons, geofences, + background location updates and accurate reporting. NSLocationUsageDescription - When enabled, your device location is sent to your Home Assistant server as a device tracker. + When enabled, your device location is sent to your Home Assistant server as a device + tracker. NSMotionUsageDescription - Motion is used to improve location updates with current motion type, as well as provide basic pedometer data. + Motion is used to improve location updates with current motion type, as well as + provide basic pedometer data. NSPhotoLibraryAddUsageDescription Photo Library access is needed to allow saving photos from the web view. NSPhotoLibraryUsageDescription diff --git a/Sources/App/Resources/en.lproj/Localizable.strings b/Sources/App/Resources/en.lproj/Localizable.strings index 224ec1061..33fbc5bb8 100644 --- a/Sources/App/Resources/en.lproj/Localizable.strings +++ b/Sources/App/Resources/en.lproj/Localizable.strings @@ -366,23 +366,23 @@ Home Assistant is free and open source home automation software with a focus on "settings_details.general.app_icon.enum.black" = "Black"; "settings_details.general.app_icon.enum.blue" = "Blue"; "settings_details.general.app_icon.enum.caribbean_green" = "Caribbean Green"; +"settings_details.general.app_icon.enum.classic" = "Classic"; "settings_details.general.app_icon.enum.cornflower_blue" = "Cornflower Blue"; "settings_details.general.app_icon.enum.crimson" = "Crimson"; "settings_details.general.app_icon.enum.dev" = "Dev"; "settings_details.general.app_icon.enum.electric_violet" = "Electric Violet"; "settings_details.general.app_icon.enum.fire_orange" = "Fire Orange"; "settings_details.general.app_icon.enum.green" = "Green"; -"settings_details.general.app_icon.enum.ha_blue" = "Home Assistant Blue"; "settings_details.general.app_icon.enum.old_beta" = "Old Beta"; "settings_details.general.app_icon.enum.old_dev" = "Old Dev"; "settings_details.general.app_icon.enum.old_release" = "Old Release"; "settings_details.general.app_icon.enum.orange" = "Orange"; "settings_details.general.app_icon.enum.pink" = "Pink"; "settings_details.general.app_icon.enum.pride_bi" = "Pride: Bi"; -"settings_details.general.app_icon.enum.pride_poc" = "Pride: 8-Color"; +"settings_details.general.app_icon.enum.pride_poc" = "Pride: Progress"; "settings_details.general.app_icon.enum.pride_rainbow" = "Pride: Rainbow"; -"settings_details.general.app_icon.enum.pride_rainbow_invert" = "Pride: Rainbow (Inverted)"; "settings_details.general.app_icon.enum.pride_trans" = "Pride: Trans"; +"settings_details.general.app_icon.enum.pride_non_binary" = "Pride: Non Binary"; "settings_details.general.app_icon.enum.purple" = "Purple"; "settings_details.general.app_icon.enum.red" = "Red"; "settings_details.general.app_icon.enum.release" = "Release"; diff --git a/Sources/App/Settings/SettingsDetailViewController.swift b/Sources/App/Settings/SettingsDetailViewController.swift index 93847c780..8052bdd7a 100644 --- a/Sources/App/Settings/SettingsDetailViewController.swift +++ b/Sources/App/Settings/SettingsDetailViewController.swift @@ -835,7 +835,7 @@ enum AppIcon: String, CaseIterable { case ElectricViolet = "electric-violet" case FireOrange = "fire-orange" case Green = "green" - case HaBlue = "ha-blue" + case Classic = "classic" case OldBeta = "old-beta" case OldDev = "old-dev" case OldRelease = "old-release" @@ -846,8 +846,8 @@ enum AppIcon: String, CaseIterable { case White = "white" case BiPride = "bi_pride" case POCPride = "POC_pride" + case NonBinary = "non-binary" case Rainbow = "rainbow" - case RainbowInvert = "rainbow_invert" case Trans = "trans" var title: String { @@ -874,8 +874,8 @@ enum AppIcon: String, CaseIterable { return L10n.SettingsDetails.General.AppIcon.Enum.fireOrange case .Green: return L10n.SettingsDetails.General.AppIcon.Enum.green - case .HaBlue: - return L10n.SettingsDetails.General.AppIcon.Enum.haBlue + case .Classic: + return L10n.SettingsDetails.General.AppIcon.Enum.classic case .OldBeta: return L10n.SettingsDetails.General.AppIcon.Enum.oldBeta case .OldDev: @@ -898,10 +898,10 @@ enum AppIcon: String, CaseIterable { return L10n.SettingsDetails.General.AppIcon.Enum.pridePoc case .Rainbow: return L10n.SettingsDetails.General.AppIcon.Enum.prideRainbow - case .RainbowInvert: - return L10n.SettingsDetails.General.AppIcon.Enum.prideRainbowInvert case .Trans: return L10n.SettingsDetails.General.AppIcon.Enum.prideTrans + case .NonBinary: + return L10n.SettingsDetails.General.AppIcon.Enum.prideNonBinary } } diff --git a/Sources/Shared/Resources/Swiftgen/Strings.swift b/Sources/Shared/Resources/Swiftgen/Strings.swift index 94f34f80e..48fa0ce00 100644 --- a/Sources/Shared/Resources/Swiftgen/Strings.swift +++ b/Sources/Shared/Resources/Swiftgen/Strings.swift @@ -1246,6 +1246,8 @@ public enum L10n { public static var blue: String { return L10n.tr("Localizable", "settings_details.general.app_icon.enum.blue") } /// Caribbean Green public static var caribbeanGreen: String { return L10n.tr("Localizable", "settings_details.general.app_icon.enum.caribbean_green") } + /// Classic + public static var classic: String { return L10n.tr("Localizable", "settings_details.general.app_icon.enum.classic") } /// Cornflower Blue public static var cornflowerBlue: String { return L10n.tr("Localizable", "settings_details.general.app_icon.enum.cornflower_blue") } /// Crimson @@ -1258,8 +1260,6 @@ public enum L10n { public static var fireOrange: String { return L10n.tr("Localizable", "settings_details.general.app_icon.enum.fire_orange") } /// Green public static var green: String { return L10n.tr("Localizable", "settings_details.general.app_icon.enum.green") } - /// Home Assistant Blue - public static var haBlue: String { return L10n.tr("Localizable", "settings_details.general.app_icon.enum.ha_blue") } /// Old Beta public static var oldBeta: String { return L10n.tr("Localizable", "settings_details.general.app_icon.enum.old_beta") } /// Old Dev @@ -1272,12 +1272,12 @@ public enum L10n { public static var pink: String { return L10n.tr("Localizable", "settings_details.general.app_icon.enum.pink") } /// Pride: Bi public static var prideBi: String { return L10n.tr("Localizable", "settings_details.general.app_icon.enum.pride_bi") } - /// Pride: 8-Color + /// Pride: Non Binary + public static var prideNonBinary: String { return L10n.tr("Localizable", "settings_details.general.app_icon.enum.pride_non_binary") } + /// Pride: Progress public static var pridePoc: String { return L10n.tr("Localizable", "settings_details.general.app_icon.enum.pride_poc") } /// Pride: Rainbow public static var prideRainbow: String { return L10n.tr("Localizable", "settings_details.general.app_icon.enum.pride_rainbow") } - /// Pride: Rainbow (Inverted) - public static var prideRainbowInvert: String { return L10n.tr("Localizable", "settings_details.general.app_icon.enum.pride_rainbow_invert") } /// Pride: Trans public static var prideTrans: String { return L10n.tr("Localizable", "settings_details.general.app_icon.enum.pride_trans") } /// Purple diff --git a/WatchApp/Assets.xcassets/WatchIcon.appiconset/Contents.json b/WatchApp/Assets.xcassets/WatchIcon.appiconset/Contents.json new file mode 100644 index 000000000..6dc32b628 --- /dev/null +++ b/WatchApp/Assets.xcassets/WatchIcon.appiconset/Contents.json @@ -0,0 +1,92 @@ +{ + "images": [ + { + "idiom": "watch-marketing", + "filename": "release-1024x1024.png", + "scale": "1x", + "size": "1024x1024" + }, + { + "idiom": "watch", + "filename": "release-216x216.png", + "scale": "2x", + "size": "108x108", + "role": "quickLook", + "subtype": "44mm" + }, + { + "idiom": "watch", + "filename": "release-196x196.png", + "scale": "2x", + "size": "98x98", + "role": "quickLook", + "subtype": "42mm" + }, + { + "idiom": "watch", + "filename": "release-172x172.png", + "scale": "2x", + "size": "86x86", + "role": "quickLook", + "subtype": "38mm" + }, + { + "idiom": "watch", + "filename": "release-100x100.png", + "scale": "2x", + "size": "50x50", + "role": "appLauncher", + "subtype": "44mm" + }, + { + "idiom": "watch", + "filename": "release-88x88.png", + "scale": "2x", + "size": "44x44", + "role": "appLauncher", + "subtype": "40mm" + }, + { + "idiom": "watch", + "filename": "release-87x87.png", + "scale": "3x", + "size": "29x29", + "role": "companionSettings" + }, + { + "idiom": "watch", + "filename": "release-80x80.png", + "scale": "2x", + "size": "40x40", + "role": "appLauncher", + "subtype": "38mm" + }, + { + "idiom": "watch", + "filename": "release-58x58.png", + "scale": "2x", + "size": "29x29", + "role": "companionSettings" + }, + { + "idiom": "watch", + "filename": "release-55x55.png", + "scale": "2x", + "size": "27.5x27.5", + "role": "notificationCenter", + "subtype": "42mm" + }, + { + "idiom": "watch", + "filename": "release-48x48.png", + "scale": "2x", + "size": "24x24", + "role": "notificationCenter", + "subtype": "38mm" + } + ], + "info": { + "version": 1, + "author": "fastlane" + } +} \ No newline at end of file diff --git a/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-100x100.png b/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-100x100.png new file mode 100644 index 000000000..db94daa16 Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-100x100.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-1024x1024.png b/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-1024x1024.png new file mode 100644 index 000000000..e437d6cd8 Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-1024x1024.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-172x172.png b/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-172x172.png new file mode 100644 index 000000000..ac414e2f8 Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-172x172.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-196x196.png b/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-196x196.png new file mode 100644 index 000000000..aebad2293 Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-196x196.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-216x216.png b/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-216x216.png new file mode 100644 index 000000000..bd1683cc0 Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-216x216.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-48x48.png b/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-48x48.png new file mode 100644 index 000000000..52d619ebe Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-48x48.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-55x55.png b/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-55x55.png new file mode 100644 index 000000000..aea1cd4fe Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-55x55.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-58x58.png b/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-58x58.png new file mode 100644 index 000000000..ecd3ac121 Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-58x58.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-80x80.png b/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-80x80.png new file mode 100644 index 000000000..545857fa0 Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-80x80.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-87x87.png b/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-87x87.png new file mode 100644 index 000000000..61c409dac Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-87x87.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-88x88.png b/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-88x88.png new file mode 100644 index 000000000..0e09d7339 Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.appiconset/release-88x88.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/Contents.json b/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/Contents.json new file mode 100644 index 000000000..1b293aee8 --- /dev/null +++ b/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/Contents.json @@ -0,0 +1,92 @@ +{ + "images": [ + { + "idiom": "watch-marketing", + "filename": "beta-1024x1024.png", + "scale": "1x", + "size": "1024x1024" + }, + { + "idiom": "watch", + "filename": "beta-216x216.png", + "scale": "2x", + "size": "108x108", + "role": "quickLook", + "subtype": "44mm" + }, + { + "idiom": "watch", + "filename": "beta-196x196.png", + "scale": "2x", + "size": "98x98", + "role": "quickLook", + "subtype": "42mm" + }, + { + "idiom": "watch", + "filename": "beta-172x172.png", + "scale": "2x", + "size": "86x86", + "role": "quickLook", + "subtype": "38mm" + }, + { + "idiom": "watch", + "filename": "beta-100x100.png", + "scale": "2x", + "size": "50x50", + "role": "appLauncher", + "subtype": "44mm" + }, + { + "idiom": "watch", + "filename": "beta-88x88.png", + "scale": "2x", + "size": "44x44", + "role": "appLauncher", + "subtype": "40mm" + }, + { + "idiom": "watch", + "filename": "beta-87x87.png", + "scale": "3x", + "size": "29x29", + "role": "companionSettings" + }, + { + "idiom": "watch", + "filename": "beta-80x80.png", + "scale": "2x", + "size": "40x40", + "role": "appLauncher", + "subtype": "38mm" + }, + { + "idiom": "watch", + "filename": "beta-58x58.png", + "scale": "2x", + "size": "29x29", + "role": "companionSettings" + }, + { + "idiom": "watch", + "filename": "beta-55x55.png", + "scale": "2x", + "size": "27.5x27.5", + "role": "notificationCenter", + "subtype": "42mm" + }, + { + "idiom": "watch", + "filename": "beta-48x48.png", + "scale": "2x", + "size": "24x24", + "role": "notificationCenter", + "subtype": "38mm" + } + ], + "info": { + "version": 1, + "author": "fastlane" + } +} \ No newline at end of file diff --git a/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-100x100.png b/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-100x100.png new file mode 100644 index 000000000..bc025418d Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-100x100.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-1024x1024.png b/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-1024x1024.png new file mode 100644 index 000000000..2ba4c1ff3 Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-1024x1024.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-172x172.png b/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-172x172.png new file mode 100644 index 000000000..85bc16558 Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-172x172.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-196x196.png b/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-196x196.png new file mode 100644 index 000000000..546280930 Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-196x196.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-216x216.png b/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-216x216.png new file mode 100644 index 000000000..67433e05a Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-216x216.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-48x48.png b/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-48x48.png new file mode 100644 index 000000000..09df0ddda Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-48x48.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-55x55.png b/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-55x55.png new file mode 100644 index 000000000..2edb7bcf3 Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-55x55.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-58x58.png b/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-58x58.png new file mode 100644 index 000000000..1ba32f646 Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-58x58.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-80x80.png b/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-80x80.png new file mode 100644 index 000000000..70f068852 Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-80x80.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-87x87.png b/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-87x87.png new file mode 100644 index 000000000..c16f3cd78 Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-87x87.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-88x88.png b/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-88x88.png new file mode 100644 index 000000000..8a63dbe8c Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.beta.appiconset/beta-88x88.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/Contents.json b/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/Contents.json new file mode 100644 index 000000000..dda669fa4 --- /dev/null +++ b/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/Contents.json @@ -0,0 +1,92 @@ +{ + "images": [ + { + "idiom": "watch-marketing", + "filename": "dev-1024x1024.png", + "scale": "1x", + "size": "1024x1024" + }, + { + "idiom": "watch", + "filename": "dev-216x216.png", + "scale": "2x", + "size": "108x108", + "role": "quickLook", + "subtype": "44mm" + }, + { + "idiom": "watch", + "filename": "dev-196x196.png", + "scale": "2x", + "size": "98x98", + "role": "quickLook", + "subtype": "42mm" + }, + { + "idiom": "watch", + "filename": "dev-172x172.png", + "scale": "2x", + "size": "86x86", + "role": "quickLook", + "subtype": "38mm" + }, + { + "idiom": "watch", + "filename": "dev-100x100.png", + "scale": "2x", + "size": "50x50", + "role": "appLauncher", + "subtype": "44mm" + }, + { + "idiom": "watch", + "filename": "dev-88x88.png", + "scale": "2x", + "size": "44x44", + "role": "appLauncher", + "subtype": "40mm" + }, + { + "idiom": "watch", + "filename": "dev-87x87.png", + "scale": "3x", + "size": "29x29", + "role": "companionSettings" + }, + { + "idiom": "watch", + "filename": "dev-80x80.png", + "scale": "2x", + "size": "40x40", + "role": "appLauncher", + "subtype": "38mm" + }, + { + "idiom": "watch", + "filename": "dev-58x58.png", + "scale": "2x", + "size": "29x29", + "role": "companionSettings" + }, + { + "idiom": "watch", + "filename": "dev-55x55.png", + "scale": "2x", + "size": "27.5x27.5", + "role": "notificationCenter", + "subtype": "42mm" + }, + { + "idiom": "watch", + "filename": "dev-48x48.png", + "scale": "2x", + "size": "24x24", + "role": "notificationCenter", + "subtype": "38mm" + } + ], + "info": { + "version": 1, + "author": "fastlane" + } +} \ No newline at end of file diff --git a/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-100x100.png b/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-100x100.png new file mode 100644 index 000000000..04cf19fe4 Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-100x100.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-1024x1024.png b/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-1024x1024.png new file mode 100644 index 000000000..4753866ea Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-1024x1024.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-172x172.png b/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-172x172.png new file mode 100644 index 000000000..dc75e02d3 Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-172x172.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-196x196.png b/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-196x196.png new file mode 100644 index 000000000..6c5bf529e Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-196x196.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-216x216.png b/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-216x216.png new file mode 100644 index 000000000..7241c203b Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-216x216.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-48x48.png b/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-48x48.png new file mode 100644 index 000000000..62de30a54 Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-48x48.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-55x55.png b/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-55x55.png new file mode 100644 index 000000000..fb2ac8c35 Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-55x55.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-58x58.png b/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-58x58.png new file mode 100644 index 000000000..cf6d47d7f Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-58x58.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-80x80.png b/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-80x80.png new file mode 100644 index 000000000..03b6eb257 Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-80x80.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-87x87.png b/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-87x87.png new file mode 100644 index 000000000..e412f0af0 Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-87x87.png differ diff --git a/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-88x88.png b/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-88x88.png new file mode 100644 index 000000000..36e03d377 Binary files /dev/null and b/WatchApp/Assets.xcassets/WatchIcon.dev.appiconset/dev-88x88.png differ diff --git a/icons/Alternates/AlternateGenerator.sh b/icons/Alternates/AlternateGenerator.sh index c87ccb4f2..74708ee78 100644 --- a/icons/Alternates/AlternateGenerator.sh +++ b/icons/Alternates/AlternateGenerator.sh @@ -1,7 +1,7 @@ #!/bin/bash for filename in *.png; do - sips -Z 120x120 "$filename" --out "../../Sources/App/Resources/Alternate Icons/${filename%.png}@2x.png" - sips -Z 180x180 "$filename" --out "../../Sources/App/Resources/Alternate Icons/${filename%.png}@3x.png" + sips -Z 120x120 "$filename" --out "../../Sources/App/Resources/Alternate Icons/${filename%.png}@2x.png" > /dev/null + sips -Z 180x180 "$filename" --out "../../Sources/App/Resources/Alternate Icons/${filename%.png}@3x.png" > /dev/null echo "${filename%.png} diff --git a/icons/Alternates/POC_pride.png b/icons/Alternates/POC_pride.png index 3cb04a898..17a2adc78 100644 Binary files a/icons/Alternates/POC_pride.png and b/icons/Alternates/POC_pride.png differ diff --git a/icons/Alternates/beta.png b/icons/Alternates/beta.png index 2a1aa99a5..d892898bd 100644 Binary files a/icons/Alternates/beta.png and b/icons/Alternates/beta.png differ diff --git a/icons/Alternates/bi_pride.png b/icons/Alternates/bi_pride.png index e5ed1d332..f24438092 100644 Binary files a/icons/Alternates/bi_pride.png and b/icons/Alternates/bi_pride.png differ diff --git a/icons/Alternates/black.png b/icons/Alternates/black.png index 7ffab40ca..daac01df1 100644 Binary files a/icons/Alternates/black.png and b/icons/Alternates/black.png differ diff --git a/icons/Alternates/blue.png b/icons/Alternates/blue.png index 057c98572..80196afbb 100644 Binary files a/icons/Alternates/blue.png and b/icons/Alternates/blue.png differ diff --git a/icons/Alternates/caribbean-green.png b/icons/Alternates/caribbean-green.png index 341a2ce22..935f709d8 100644 Binary files a/icons/Alternates/caribbean-green.png and b/icons/Alternates/caribbean-green.png differ diff --git a/icons/Alternates/classic.png b/icons/Alternates/classic.png new file mode 100644 index 000000000..22119d866 Binary files /dev/null and b/icons/Alternates/classic.png differ diff --git a/icons/Alternates/cornflower-blue.png b/icons/Alternates/cornflower-blue.png index 34c5750a7..28a831126 100644 Binary files a/icons/Alternates/cornflower-blue.png and b/icons/Alternates/cornflower-blue.png differ diff --git a/icons/Alternates/crimson.png b/icons/Alternates/crimson.png index a3e0559a3..fe70807a3 100644 Binary files a/icons/Alternates/crimson.png and b/icons/Alternates/crimson.png differ diff --git a/icons/Alternates/dev.png b/icons/Alternates/dev.png index b99b447ea..32b45550c 100644 Binary files a/icons/Alternates/dev.png and b/icons/Alternates/dev.png differ diff --git a/icons/Alternates/electric-violet.png b/icons/Alternates/electric-violet.png index 5e637f5b7..ef24b4046 100644 Binary files a/icons/Alternates/electric-violet.png and b/icons/Alternates/electric-violet.png differ diff --git a/icons/Alternates/fire-orange.png b/icons/Alternates/fire-orange.png index d1c366f60..bc7d28c15 100644 Binary files a/icons/Alternates/fire-orange.png and b/icons/Alternates/fire-orange.png differ diff --git a/icons/Alternates/green.png b/icons/Alternates/green.png index 1d99338bc..b200b4dda 100644 Binary files a/icons/Alternates/green.png and b/icons/Alternates/green.png differ diff --git a/icons/Alternates/ha-blue.png b/icons/Alternates/ha-blue.png deleted file mode 100644 index 671b31f81..000000000 Binary files a/icons/Alternates/ha-blue.png and /dev/null differ diff --git a/icons/Alternates/non-binary.png b/icons/Alternates/non-binary.png new file mode 100644 index 000000000..915744960 Binary files /dev/null and b/icons/Alternates/non-binary.png differ diff --git a/icons/Alternates/orange.png b/icons/Alternates/orange.png index cccf4077c..296e1a95f 100644 Binary files a/icons/Alternates/orange.png and b/icons/Alternates/orange.png differ diff --git a/icons/Alternates/pink.png b/icons/Alternates/pink.png index ff1bcbea6..f29cb7bb9 100644 Binary files a/icons/Alternates/pink.png and b/icons/Alternates/pink.png differ diff --git a/icons/Alternates/purple.png b/icons/Alternates/purple.png index 2c152d84c..c2eb8a101 100644 Binary files a/icons/Alternates/purple.png and b/icons/Alternates/purple.png differ diff --git a/icons/Alternates/rainbow.png b/icons/Alternates/rainbow.png index 09e310065..1b2ee6520 100644 Binary files a/icons/Alternates/rainbow.png and b/icons/Alternates/rainbow.png differ diff --git a/icons/Alternates/rainbow_invert.png b/icons/Alternates/rainbow_invert.png deleted file mode 100644 index 9f11186e7..000000000 Binary files a/icons/Alternates/rainbow_invert.png and /dev/null differ diff --git a/icons/Alternates/red.png b/icons/Alternates/red.png index f0be5bd92..87c42c7b7 100644 Binary files a/icons/Alternates/red.png and b/icons/Alternates/red.png differ diff --git a/icons/Alternates/release.png b/icons/Alternates/release.png index 22119d866..d2c7f23b0 100644 Binary files a/icons/Alternates/release.png and b/icons/Alternates/release.png differ diff --git a/icons/Alternates/trans.png b/icons/Alternates/trans.png index c75ec949a..30e20c424 100644 Binary files a/icons/Alternates/trans.png and b/icons/Alternates/trans.png differ diff --git a/icons/Alternates/white.png b/icons/Alternates/white.png index 37877ac66..b1ad82108 100644 Binary files a/icons/Alternates/white.png and b/icons/Alternates/white.png differ diff --git a/icons/beta.png b/icons/beta.png index 8b1960c25..d892898bd 100644 Binary files a/icons/beta.png and b/icons/beta.png differ diff --git a/icons/dev.png b/icons/dev.png index 980700a1a..32b45550c 100644 Binary files a/icons/dev.png and b/icons/dev.png differ diff --git a/icons/release.png b/icons/release.png index 58311511a..d2c7f23b0 100644 Binary files a/icons/release.png and b/icons/release.png differ