diff --git a/Resources/Assets.xcassets/blueprint.imageset/Contents.json b/Resources/Assets.xcassets/blueprint.imageset/Contents.json new file mode 100644 index 0000000..b77836d --- /dev/null +++ b/Resources/Assets.xcassets/blueprint.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "ShhShell Blueprint@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ShhShell Blueprint@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ShhShell Blueprint@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Resources/Assets.xcassets/blueprint.imageset/ShhShell Blueprint@1x.png b/Resources/Assets.xcassets/blueprint.imageset/ShhShell Blueprint@1x.png new file mode 100644 index 0000000..11746c2 Binary files /dev/null and b/Resources/Assets.xcassets/blueprint.imageset/ShhShell Blueprint@1x.png differ diff --git a/Resources/Assets.xcassets/blueprint.imageset/ShhShell Blueprint@2x.png b/Resources/Assets.xcassets/blueprint.imageset/ShhShell Blueprint@2x.png new file mode 100644 index 0000000..71c3eac Binary files /dev/null and b/Resources/Assets.xcassets/blueprint.imageset/ShhShell Blueprint@2x.png differ diff --git a/Resources/Assets.xcassets/blueprint.imageset/ShhShell Blueprint@3x.png b/Resources/Assets.xcassets/blueprint.imageset/ShhShell Blueprint@3x.png new file mode 100644 index 0000000..6955ae4 Binary files /dev/null and b/Resources/Assets.xcassets/blueprint.imageset/ShhShell Blueprint@3x.png differ diff --git a/Resources/Assets.xcassets/Icon.imageset/Contents.json b/Resources/Assets.xcassets/regular.imageset/Contents.json similarity index 100% rename from Resources/Assets.xcassets/Icon.imageset/Contents.json rename to Resources/Assets.xcassets/regular.imageset/Contents.json diff --git a/Resources/Assets.xcassets/Icon.imageset/ShhShell 1.png b/Resources/Assets.xcassets/regular.imageset/ShhShell 1.png similarity index 100% rename from Resources/Assets.xcassets/Icon.imageset/ShhShell 1.png rename to Resources/Assets.xcassets/regular.imageset/ShhShell 1.png diff --git a/Resources/Assets.xcassets/Icon.imageset/ShhShell 2.png b/Resources/Assets.xcassets/regular.imageset/ShhShell 2.png similarity index 100% rename from Resources/Assets.xcassets/Icon.imageset/ShhShell 2.png rename to Resources/Assets.xcassets/regular.imageset/ShhShell 2.png diff --git a/Resources/Assets.xcassets/Icon.imageset/ShhShell 3.png b/Resources/Assets.xcassets/regular.imageset/ShhShell 3.png similarity index 100% rename from Resources/Assets.xcassets/Icon.imageset/ShhShell 3.png rename to Resources/Assets.xcassets/regular.imageset/ShhShell 3.png diff --git a/ShhShell Blueprint.pxd b/ShhShell Blueprint.pxd index 0a25506..1e86f34 100644 Binary files a/ShhShell Blueprint.pxd and b/ShhShell Blueprint.pxd differ diff --git a/ShhShell/Settings/AppSettings.swift b/ShhShell/Settings/AppSettings.swift index 7352758..fca3a24 100644 --- a/ShhShell/Settings/AppSettings.swift +++ b/ShhShell/Settings/AppSettings.swift @@ -35,10 +35,8 @@ enum AppIcon: Codable, CaseIterable, Equatable { var image: Image { switch self { - case .regular: - Image("Icon") - case .blueprint: - Image(uiImage: UIImage()) + case .regular, .blueprint: + Image("\(self)") } } } diff --git a/ShhShell/Views/Settings/SettingsView.swift b/ShhShell/Views/Settings/SettingsView.swift index cd68585..85bccb8 100644 --- a/ShhShell/Views/Settings/SettingsView.swift +++ b/ShhShell/Views/Settings/SettingsView.swift @@ -67,10 +67,11 @@ struct SettingsView: View { .frame(maxWidth: 85) .clipShape(RoundedRectangle(cornerRadius: 16.5)) .padding(5) - Spacer(minLength: 10) + Spacer() Text("\(icon)").tag(icon) .font(.caption) .padding(5) + Spacer() } } .frame(maxWidth: 85)