diff --git a/ios/Approach/Sources/AnnouncementsLibrary/Views/Christmas2023AnnouncementView.swift b/ios/Approach/Sources/AnnouncementsLibrary/Views/Christmas2023AnnouncementView.swift index 0ed4e550f..458480f26 100644 --- a/ios/Approach/Sources/AnnouncementsLibrary/Views/Christmas2023AnnouncementView.swift +++ b/ios/Approach/Sources/AnnouncementsLibrary/Views/Christmas2023AnnouncementView.swift @@ -24,7 +24,7 @@ public struct Christmas2023AnnouncementView: View { .font(.headline) .multilineTextAlignment(.center) - Image(uiImage: UIImage(named: AppIcon.christmas.rawValue) ?? UIImage()) + Image(uiImage: AppIcon.christmas.image ?? UIImage()) .resizable() .scaledToFit() .frame(width: .extraLargeIcon) diff --git a/ios/Approach/Sources/AssetsLibrary/AppIcon.swift b/ios/Approach/Sources/AssetsLibrary/AppIcon.swift index ddda67625..e7c44fb77 100644 --- a/ios/Approach/Sources/AssetsLibrary/AppIcon.swift +++ b/ios/Approach/Sources/AssetsLibrary/AppIcon.swift @@ -1,3 +1,5 @@ +import UIKit + public enum AppIcon: String, CaseIterable, Identifiable { case primary = "AppIcon" case dark = "AppIcon-Dark" @@ -17,6 +19,14 @@ public enum AppIcon: String, CaseIterable, Identifiable { case .bisexual, .pride, .trans: return .pride } } + + public var previewName: String { + "\(id)-Preview" + } + + public var image: UIImage? { + UIImage(named: previewName) + } } extension AppIcon { diff --git a/ios/Approach/Sources/SettingsFeature/AppIcon/AppIconList+Extensions.swift b/ios/Approach/Sources/SettingsFeature/AppIcon/AppIconList+Extensions.swift index 0c8f8880c..b6ff74ad6 100644 --- a/ios/Approach/Sources/SettingsFeature/AppIcon/AppIconList+Extensions.swift +++ b/ios/Approach/Sources/SettingsFeature/AppIcon/AppIconList+Extensions.swift @@ -14,11 +14,11 @@ extension AppIconList { extension AppIconList.State { var appIconImage: UIImage { if let currentAppIcon { - return UIImage(named: currentAppIcon.rawValue) ?? UIImage() + return currentAppIcon.image ?? UIImage() } else if isLoadingAppIcon { return UIImage() } else { - return UIImage(named: "AppIcon") ?? UIImage() + return AppIcon.primary.image ?? UIImage() } } } diff --git a/ios/Approach/Sources/SettingsFeature/AppIcon/AppIconView.swift b/ios/Approach/Sources/SettingsFeature/AppIcon/AppIconView.swift index 292114185..3fe4d2cce 100644 --- a/ios/Approach/Sources/SettingsFeature/AppIcon/AppIconView.swift +++ b/ios/Approach/Sources/SettingsFeature/AppIcon/AppIconView.swift @@ -35,7 +35,7 @@ extension AppIconView { var image: UIImage { switch self { case let .appIcon(appIcon): - return UIImage(named: appIcon.rawValue) ?? UIImage() + return appIcon.image ?? UIImage() case let .image(image): return image } diff --git a/ios/Approach/Sources/SettingsFeature/SettingsView.swift b/ios/Approach/Sources/SettingsFeature/SettingsView.swift index addd2072b..59e60d614 100644 --- a/ios/Approach/Sources/SettingsFeature/SettingsView.swift +++ b/ios/Approach/Sources/SettingsFeature/SettingsView.swift @@ -144,9 +144,9 @@ public struct SettingsView: View { extension Settings.State { var appIconImage: UIImage { if let currentAppIcon { - return UIImage(named: currentAppIcon.rawValue) ?? UIImage() + return currentAppIcon.image ?? UIImage() } else { - return UIImage(named: "AppIcon") ?? UIImage() + return AppIcon.primary.image ?? UIImage() } } } diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Bisexual-Preview.imageset/Bisexual@0.5x.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Bisexual-Preview.imageset/Bisexual@0.5x.png new file mode 100644 index 000000000..8df44dcae Binary files /dev/null and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Bisexual-Preview.imageset/Bisexual@0.5x.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Bisexual-Preview.imageset/Contents.json b/ios/ApproachIOS/Assets.xcassets/AppIcon-Bisexual-Preview.imageset/Contents.json new file mode 100644 index 000000000..f9f7c8f39 --- /dev/null +++ b/ios/ApproachIOS/Assets.xcassets/AppIcon-Bisexual-Preview.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "Bisexual@0.5x.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Bisexual.appiconset/Bisexual.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Bisexual.appiconset/Bisexual.png index a7a4aa0bb..b555658c7 100644 Binary files a/ios/ApproachIOS/Assets.xcassets/AppIcon-Bisexual.appiconset/Bisexual.png and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Bisexual.appiconset/Bisexual.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Bisexual.appiconset/Dark.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Bisexual.appiconset/Dark.png index 09120579b..7591079cb 100644 Binary files a/ios/ApproachIOS/Assets.xcassets/AppIcon-Bisexual.appiconset/Dark.png and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Bisexual.appiconset/Dark.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Bisexual.appiconset/Tinted.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Bisexual.appiconset/Tinted.png index ff52ea7d4..3775b10d9 100644 Binary files a/ios/ApproachIOS/Assets.xcassets/AppIcon-Bisexual.appiconset/Tinted.png and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Bisexual.appiconset/Tinted.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Christmas-Preview.imageset/Christmas@0.5x.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Christmas-Preview.imageset/Christmas@0.5x.png new file mode 100644 index 000000000..716d43b51 Binary files /dev/null and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Christmas-Preview.imageset/Christmas@0.5x.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Christmas-Preview.imageset/Contents.json b/ios/ApproachIOS/Assets.xcassets/AppIcon-Christmas-Preview.imageset/Contents.json new file mode 100644 index 000000000..9e6ab6bc2 --- /dev/null +++ b/ios/ApproachIOS/Assets.xcassets/AppIcon-Christmas-Preview.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "Christmas@0.5x.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Christmas.appiconset/Christmas.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Christmas.appiconset/Christmas.png index 5480ce7a2..2fa8301cc 100644 Binary files a/ios/ApproachIOS/Assets.xcassets/AppIcon-Christmas.appiconset/Christmas.png and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Christmas.appiconset/Christmas.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Christmas.appiconset/Dark.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Christmas.appiconset/Dark.png index 6bc271a18..6a52b1551 100644 Binary files a/ios/ApproachIOS/Assets.xcassets/AppIcon-Christmas.appiconset/Dark.png and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Christmas.appiconset/Dark.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Christmas.appiconset/Tinted.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Christmas.appiconset/Tinted.png index 85cfdfa9b..f47bc5881 100644 Binary files a/ios/ApproachIOS/Assets.xcassets/AppIcon-Christmas.appiconset/Tinted.png and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Christmas.appiconset/Tinted.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Dark-Preview.imageset/Contents.json b/ios/ApproachIOS/Assets.xcassets/AppIcon-Dark-Preview.imageset/Contents.json new file mode 100644 index 000000000..f8bd80173 --- /dev/null +++ b/ios/ApproachIOS/Assets.xcassets/AppIcon-Dark-Preview.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "Dark@0.5x.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Dark-Preview.imageset/Dark@0.5x.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Dark-Preview.imageset/Dark@0.5x.png new file mode 100644 index 000000000..56d471909 Binary files /dev/null and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Dark-Preview.imageset/Dark@0.5x.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Dark.appiconset/Dark 1.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Dark.appiconset/Dark 1.png index 91ade8080..c0fbb1da0 100644 Binary files a/ios/ApproachIOS/Assets.xcassets/AppIcon-Dark.appiconset/Dark 1.png and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Dark.appiconset/Dark 1.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Dark.appiconset/Dark.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Dark.appiconset/Dark.png index 42e35014d..4a26220d1 100644 Binary files a/ios/ApproachIOS/Assets.xcassets/AppIcon-Dark.appiconset/Dark.png and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Dark.appiconset/Dark.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Dark.appiconset/Tinted.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Dark.appiconset/Tinted.png index ff52ea7d4..3775b10d9 100644 Binary files a/ios/ApproachIOS/Assets.xcassets/AppIcon-Dark.appiconset/Tinted.png and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Dark.appiconset/Tinted.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Debug.appiconset/Dark.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Debug.appiconset/Dark.png index b0a48494e..ef223d4f9 100644 Binary files a/ios/ApproachIOS/Assets.xcassets/AppIcon-Debug.appiconset/Dark.png and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Debug.appiconset/Dark.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Debug.appiconset/Purple.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Debug.appiconset/Purple.png index ddc10e0b4..762d656c1 100644 Binary files a/ios/ApproachIOS/Assets.xcassets/AppIcon-Debug.appiconset/Purple.png and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Debug.appiconset/Purple.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Debug.appiconset/Tinted.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Debug.appiconset/Tinted.png index 49b7434d6..2edeecaa3 100644 Binary files a/ios/ApproachIOS/Assets.xcassets/AppIcon-Debug.appiconset/Tinted.png and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Debug.appiconset/Tinted.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Default-Preview.imageset/Contents.json b/ios/ApproachIOS/Assets.xcassets/AppIcon-Default-Preview.imageset/Contents.json new file mode 100644 index 000000000..82e8146e1 --- /dev/null +++ b/ios/ApproachIOS/Assets.xcassets/AppIcon-Default-Preview.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "Original@0.5x.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Default-Preview.imageset/Original@0.5x.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Default-Preview.imageset/Original@0.5x.png new file mode 100644 index 000000000..91b8245c2 Binary files /dev/null and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Default-Preview.imageset/Original@0.5x.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Preview.imageset/Contents.json b/ios/ApproachIOS/Assets.xcassets/AppIcon-Preview.imageset/Contents.json new file mode 100644 index 000000000..82e8146e1 --- /dev/null +++ b/ios/ApproachIOS/Assets.xcassets/AppIcon-Preview.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "Original@0.5x.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Preview.imageset/Original@0.5x.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Preview.imageset/Original@0.5x.png new file mode 100644 index 000000000..91b8245c2 Binary files /dev/null and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Preview.imageset/Original@0.5x.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Pride-Preview.imageset/Contents.json b/ios/ApproachIOS/Assets.xcassets/AppIcon-Pride-Preview.imageset/Contents.json new file mode 100644 index 000000000..1432d15a0 --- /dev/null +++ b/ios/ApproachIOS/Assets.xcassets/AppIcon-Pride-Preview.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "Pride@0.5x.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Pride-Preview.imageset/Pride@0.5x.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Pride-Preview.imageset/Pride@0.5x.png new file mode 100644 index 000000000..c557ae41e Binary files /dev/null and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Pride-Preview.imageset/Pride@0.5x.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Pride.appiconset/Dark.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Pride.appiconset/Dark.png index e86de2e5b..a8566241e 100644 Binary files a/ios/ApproachIOS/Assets.xcassets/AppIcon-Pride.appiconset/Dark.png and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Pride.appiconset/Dark.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Pride.appiconset/Pride.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Pride.appiconset/Pride.png index 5297f2406..c42004a21 100644 Binary files a/ios/ApproachIOS/Assets.xcassets/AppIcon-Pride.appiconset/Pride.png and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Pride.appiconset/Pride.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Pride.appiconset/Tinted.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Pride.appiconset/Tinted.png index ec0fbb3b8..9b919760d 100644 Binary files a/ios/ApproachIOS/Assets.xcassets/AppIcon-Pride.appiconset/Tinted.png and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Pride.appiconset/Tinted.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Purple-Preview.imageset/Contents.json b/ios/ApproachIOS/Assets.xcassets/AppIcon-Purple-Preview.imageset/Contents.json new file mode 100644 index 000000000..6eb628b10 --- /dev/null +++ b/ios/ApproachIOS/Assets.xcassets/AppIcon-Purple-Preview.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "Purple@0.5x.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Purple-Preview.imageset/Purple@0.5x.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Purple-Preview.imageset/Purple@0.5x.png new file mode 100644 index 000000000..b4013678a Binary files /dev/null and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Purple-Preview.imageset/Purple@0.5x.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Purple.appiconset/Dark.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Purple.appiconset/Dark.png index 5966519e8..ca1a2b234 100644 Binary files a/ios/ApproachIOS/Assets.xcassets/AppIcon-Purple.appiconset/Dark.png and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Purple.appiconset/Dark.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Purple.appiconset/Purple.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Purple.appiconset/Purple.png index da9288178..6c3473812 100644 Binary files a/ios/ApproachIOS/Assets.xcassets/AppIcon-Purple.appiconset/Purple.png and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Purple.appiconset/Purple.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Purple.appiconset/Tinted.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Purple.appiconset/Tinted.png index 59a129719..c66a36e1f 100644 Binary files a/ios/ApproachIOS/Assets.xcassets/AppIcon-Purple.appiconset/Tinted.png and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Purple.appiconset/Tinted.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Trans-Preview.imageset/Contents.json b/ios/ApproachIOS/Assets.xcassets/AppIcon-Trans-Preview.imageset/Contents.json new file mode 100644 index 000000000..82ca25437 --- /dev/null +++ b/ios/ApproachIOS/Assets.xcassets/AppIcon-Trans-Preview.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "Trans@0.5x.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Trans-Preview.imageset/Trans@0.5x.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Trans-Preview.imageset/Trans@0.5x.png new file mode 100644 index 000000000..7c59d828f Binary files /dev/null and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Trans-Preview.imageset/Trans@0.5x.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Trans.appiconset/Dark.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Trans.appiconset/Dark.png index fe8d3a449..dc150435e 100644 Binary files a/ios/ApproachIOS/Assets.xcassets/AppIcon-Trans.appiconset/Dark.png and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Trans.appiconset/Dark.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Trans.appiconset/Tinted.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Trans.appiconset/Tinted.png index ff52ea7d4..3775b10d9 100644 Binary files a/ios/ApproachIOS/Assets.xcassets/AppIcon-Trans.appiconset/Tinted.png and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Trans.appiconset/Tinted.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon-Trans.appiconset/Trans.png b/ios/ApproachIOS/Assets.xcassets/AppIcon-Trans.appiconset/Trans.png index a9d76be54..3da3037ac 100644 Binary files a/ios/ApproachIOS/Assets.xcassets/AppIcon-Trans.appiconset/Trans.png and b/ios/ApproachIOS/Assets.xcassets/AppIcon-Trans.appiconset/Trans.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon.appiconset/Dark.png b/ios/ApproachIOS/Assets.xcassets/AppIcon.appiconset/Dark.png index 2e09d140d..6b331b75a 100644 Binary files a/ios/ApproachIOS/Assets.xcassets/AppIcon.appiconset/Dark.png and b/ios/ApproachIOS/Assets.xcassets/AppIcon.appiconset/Dark.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon.appiconset/Original.png b/ios/ApproachIOS/Assets.xcassets/AppIcon.appiconset/Original.png index b77ee58fa..1cbe5211f 100644 Binary files a/ios/ApproachIOS/Assets.xcassets/AppIcon.appiconset/Original.png and b/ios/ApproachIOS/Assets.xcassets/AppIcon.appiconset/Original.png differ diff --git a/ios/ApproachIOS/Assets.xcassets/AppIcon.appiconset/Tinted.png b/ios/ApproachIOS/Assets.xcassets/AppIcon.appiconset/Tinted.png index ff52ea7d4..3775b10d9 100644 Binary files a/ios/ApproachIOS/Assets.xcassets/AppIcon.appiconset/Tinted.png and b/ios/ApproachIOS/Assets.xcassets/AppIcon.appiconset/Tinted.png differ