diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/Contents.json b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/Contents.json new file mode 100644 index 0000000000..73c00596a7 --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_1874.imageset/Contents.json b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_1874.imageset/Contents.json new file mode 100644 index 0000000000..01f8daa416 --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_1874.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ape@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ape@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_1874.imageset/ape@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_1874.imageset/ape@2x.png new file mode 100644 index 0000000000..99a131ee39 Binary files /dev/null and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_1874.imageset/ape@2x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_1874.imageset/ape@3x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_1874.imageset/ape@3x.png new file mode 100644 index 0000000000..77672bc8d8 Binary files /dev/null and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_1874.imageset/ape@3x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_8ball.imageset/8ball@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_8ball.imageset/8ball@2x.png new file mode 100644 index 0000000000..0c8f1e2bcb Binary files /dev/null and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_8ball.imageset/8ball@2x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_8ball.imageset/8ball@3x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_8ball.imageset/8ball@3x.png new file mode 100644 index 0000000000..5b4dcbb48a Binary files /dev/null and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_8ball.imageset/8ball@3x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_8ball.imageset/Contents.json b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_8ball.imageset/Contents.json new file mode 100644 index 0000000000..18d72bd910 --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_8ball.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "8ball@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "8ball@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_dark.imageset/Contents.json b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_dark.imageset/Contents.json new file mode 100644 index 0000000000..0be55bc45b --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_dark.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Dark@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Dark@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_dark.imageset/Dark@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_dark.imageset/Dark@2x.png new file mode 100644 index 0000000000..cda21e86d2 Binary files /dev/null and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_dark.imageset/Dark@2x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_dark.imageset/Dark@3x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_dark.imageset/Dark@3x.png new file mode 100644 index 0000000000..1517e2fd85 Binary files /dev/null and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_dark.imageset/Dark@3x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_duck.imageset/Contents.json b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_duck.imageset/Contents.json new file mode 100644 index 0000000000..34932bcabb --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_duck.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "duck1188@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "duck1188@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_duck.imageset/duck1188@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_duck.imageset/duck1188@2x.png new file mode 100644 index 0000000000..99f1586dba Binary files /dev/null and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_duck.imageset/duck1188@2x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_duck.imageset/duck1188@3x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_duck.imageset/duck1188@3x.png new file mode 100644 index 0000000000..74b465775a Binary files /dev/null and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_duck.imageset/duck1188@3x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_ivfun.imageset/Contents.json b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_ivfun.imageset/Contents.json new file mode 100644 index 0000000000..e11222badd --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_ivfun.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ivfun@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ivfun@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_ivfun.imageset/ivfun@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_ivfun.imageset/ivfun@2x.png new file mode 100644 index 0000000000..c9a043d184 Binary files /dev/null and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_ivfun.imageset/ivfun@2x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_ivfun.imageset/ivfun@3x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_ivfun.imageset/ivfun@3x.png new file mode 100644 index 0000000000..dbe2747321 Binary files /dev/null and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_ivfun.imageset/ivfun@3x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_leo.imageset/Contents.json b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_leo.imageset/Contents.json new file mode 100644 index 0000000000..64407667ba --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_leo.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "snow leo@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "snow leo@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_leo.imageset/snow leo@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_leo.imageset/snow leo@2x.png new file mode 100644 index 0000000000..d70d5325f2 Binary files /dev/null and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_leo.imageset/snow leo@2x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_leo.imageset/snow leo@3x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_leo.imageset/snow leo@3x.png new file mode 100644 index 0000000000..2a84bbb490 Binary files /dev/null and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_leo.imageset/snow leo@3x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_main.imageset/Contents.json b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_main.imageset/Contents.json new file mode 100644 index 0000000000..9378b5e6c0 --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_main.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "main@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "main@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_main.imageset/main@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_main.imageset/main@2x.png new file mode 100644 index 0000000000..de6175fbd2 Binary files /dev/null and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_main.imageset/main@2x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_main.imageset/main@3x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_main.imageset/main@3x.png new file mode 100644 index 0000000000..8bad814e83 Binary files /dev/null and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_main.imageset/main@3x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_mono.imageset/Contents.json b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_mono.imageset/Contents.json new file mode 100644 index 0000000000..046d26cdc0 --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_mono.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Mono@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Mono@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_mono.imageset/Mono@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_mono.imageset/Mono@2x.png new file mode 100644 index 0000000000..7c1e7deee3 Binary files /dev/null and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_mono.imageset/Mono@2x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_mono.imageset/Mono@3x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_mono.imageset/Mono@3x.png new file mode 100644 index 0000000000..f500218184 Binary files /dev/null and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_mono.imageset/Mono@3x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_mustang.imageset/Contents.json b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_mustang.imageset/Contents.json new file mode 100644 index 0000000000..7ee7724eda --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_mustang.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mustang@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mustang@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_mustang.imageset/mustang@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_mustang.imageset/mustang@2x.png new file mode 100644 index 0000000000..6b187cd772 Binary files /dev/null and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_mustang.imageset/mustang@2x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_mustang.imageset/mustang@3x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_mustang.imageset/mustang@3x.png new file mode 100644 index 0000000000..ba0c4bf2f3 Binary files /dev/null and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_mustang.imageset/mustang@3x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_punk.imageset/Contents.json b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_punk.imageset/Contents.json new file mode 100644 index 0000000000..1cbb46c24a --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_punk.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "punk@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "punk@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_punk.imageset/punk@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_punk.imageset/punk@2x.png new file mode 100644 index 0000000000..80fa582382 Binary files /dev/null and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_punk.imageset/punk@2x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_punk.imageset/punk@3x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_punk.imageset/punk@3x.png new file mode 100644 index 0000000000..f3bfa251b2 Binary files /dev/null and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_punk.imageset/punk@3x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_yak.imageset/Contents.json b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_yak.imageset/Contents.json new file mode 100644 index 0000000000..c7a9a369a3 --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_yak.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "yak@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "yak@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_yak.imageset/yak@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_yak.imageset/yak@2x.png new file mode 100644 index 0000000000..052ee9ebd0 Binary files /dev/null and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_yak.imageset/yak@2x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_yak.imageset/yak@3x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_yak.imageset/yak@3x.png new file mode 100644 index 0000000000..9f266a7e03 Binary files /dev/null and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/AppIcon/app_icon_yak.imageset/yak@3x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Core/Managers/AppIconManager.swift b/UnstoppableWallet/UnstoppableWallet/Core/Managers/AppIconManager.swift index ebd168de6f..734f0b3441 100644 --- a/UnstoppableWallet/UnstoppableWallet/Core/Managers/AppIconManager.swift +++ b/UnstoppableWallet/UnstoppableWallet/Core/Managers/AppIconManager.swift @@ -5,16 +5,16 @@ import UIKit class AppIconManager { static let allAppIcons: [AppIcon] = [ .main, - .alternate(name: "AppIconDark", title: "Dark"), - .alternate(name: "AppIconMono", title: "Mono"), - .alternate(name: "AppIconLeo", title: "Leo"), - .alternate(name: "AppIconMustang", title: "Mustang"), - .alternate(name: "AppIconYak", title: "Yak"), - .alternate(name: "AppIconPunk", title: "Punk"), - .alternate(name: "AppIcon1874", title: "#1874"), - .alternate(name: "AppIcon8ball", title: "8ball"), - .alternate(name: "AppIconIvfun", title: "Ivfun"), - .alternate(name: "AppIconDuck", title: "Duck"), + .alternate(name: "AppIconDark", imageName: "app_icon_dark", title: "Dark"), + .alternate(name: "AppIconMono", imageName: "app_icon_mono", title: "Mono"), + .alternate(name: "AppIconLeo", imageName: "app_icon_leo", title: "Leo"), + .alternate(name: "AppIconMustang", imageName: "app_icon_mustang", title: "Mustang"), + .alternate(name: "AppIconYak", imageName: "app_icon_yak", title: "Yak"), + .alternate(name: "AppIconPunk", imageName: "app_icon_punk", title: "Punk"), + .alternate(name: "AppIcon1874", imageName: "app_icon_1874", title: "#1874"), + .alternate(name: "AppIcon8ball", imageName: "app_icon_8ball", title: "8ball"), + .alternate(name: "AppIconIvfun", imageName: "app_icon_ivfun", title: "Ivfun"), + .alternate(name: "AppIconDuck", imageName: "app_icon_duck", title: "Duck"), ] private let appIconRelay = PublishRelay() diff --git a/UnstoppableWallet/UnstoppableWallet/Models/AppIcon.swift b/UnstoppableWallet/UnstoppableWallet/Models/AppIcon.swift index f967826a21..b2a4a1c964 100644 --- a/UnstoppableWallet/UnstoppableWallet/Models/AppIcon.swift +++ b/UnstoppableWallet/UnstoppableWallet/Models/AppIcon.swift @@ -1,25 +1,25 @@ enum AppIcon { case main - case alternate(name: String, title: String) + case alternate(name: String, imageName: String, title: String) var name: String? { switch self { case .main: return nil - case let .alternate(name, _): return name + case let .alternate(name, _, _): return name } } var title: String { switch self { case .main: return "Main" - case let .alternate(_, title): return title + case let .alternate(_, _, title): return title } } var imageName: String { switch self { - case .main: return "AppIcon" - case let .alternate(name, _): return name + case .main: return "app_icon_main" + case let .alternate(_, imageName, _): return imageName } } } @@ -29,7 +29,7 @@ extension AppIcon: Hashable { switch self { case .main: hasher.combine("main") - case let .alternate(name, _): + case let .alternate(name, _, _): hasher.combine("alternate") hasher.combine(name) } @@ -40,7 +40,7 @@ extension AppIcon: Equatable { public static func == (lhs: AppIcon, rhs: AppIcon) -> Bool { switch (lhs, rhs) { case (.main, .main): return true - case let (.alternate(lhsName, _), .alternate(rhsName, _)): return lhsName == rhsName + case let (.alternate(lhsName, _, _), .alternate(rhsName, _, _)): return lhsName == rhsName default: return false } } diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Settings/Appearance/AppearanceView.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Settings/Appearance/AppearanceView.swift index 1939287bf2..a6da9e0f02 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Settings/Appearance/AppearanceView.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Settings/Appearance/AppearanceView.swift @@ -136,7 +136,7 @@ struct AppearanceView: View { viewModel.appIcon = appIcon }) { VStack(spacing: .margin12) { - Image(uiImage: UIImage(named: appIcon.imageName) ?? UIImage()) + Image(appIcon.imageName) .resizable() .scaledToFit() .clipShape(RoundedRectangle(cornerRadius: .cornerRadius12, style: .continuous)) diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/Receive/Address/ReceiveAddressView.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/Receive/Address/ReceiveAddressView.swift index e05589779b..396682fe79 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/Receive/Address/ReceiveAddressView.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/Receive/Address/ReceiveAddressView.swift @@ -145,7 +145,7 @@ struct ReceiveAddressView: View { .padding(.margin2) .background(Color.white) - Image(uiImage: UIImage(named: AppIcon.main.imageName) ?? UIImage()) + Image(AppIcon.main.imageName) .resizable() .scaledToFit() .frame(width: appIconSize, height: appIconSize)