diff --git a/Resources/Assets.xcassets/ShhShell.imageset/Contents.json b/Resources/Assets.xcassets/ShhShell.imageset/Contents.json new file mode 100644 index 0000000..1c465b3 --- /dev/null +++ b/Resources/Assets.xcassets/ShhShell.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "filename" : "ShhShell-iOS-Default-1024x1024@1x.png", + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "ShhShell-iOS-Dark-1024x1024@1x.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Resources/Assets.xcassets/ShhShell.imageset/ShhShell-iOS-Dark-1024x1024@1x.png b/Resources/Assets.xcassets/ShhShell.imageset/ShhShell-iOS-Dark-1024x1024@1x.png new file mode 100644 index 0000000..9f5578d Binary files /dev/null and b/Resources/Assets.xcassets/ShhShell.imageset/ShhShell-iOS-Dark-1024x1024@1x.png differ diff --git a/Resources/Assets.xcassets/ShhShell.imageset/ShhShell-iOS-Default-1024x1024@1x.png b/Resources/Assets.xcassets/ShhShell.imageset/ShhShell-iOS-Default-1024x1024@1x.png new file mode 100644 index 0000000..2297c0c Binary files /dev/null and b/Resources/Assets.xcassets/ShhShell.imageset/ShhShell-iOS-Default-1024x1024@1x.png differ diff --git a/Resources/Assets.xcassets/regular.appiconset/Contents.json b/Resources/Assets.xcassets/regular.appiconset/Contents.json deleted file mode 100644 index 8b7e047..0000000 --- a/Resources/Assets.xcassets/regular.appiconset/Contents.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "images" : [ - { - "filename" : "ShhShell.png", - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "tinted" - } - ], - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Resources/Assets.xcassets/regular.appiconset/ShhShell.png b/Resources/Assets.xcassets/regular.appiconset/ShhShell.png deleted file mode 100644 index 28636ee..0000000 Binary files a/Resources/Assets.xcassets/regular.appiconset/ShhShell.png and /dev/null differ diff --git a/Resources/Assets.xcassets/regular.imageset/Contents.json b/Resources/Assets.xcassets/regular.imageset/Contents.json deleted file mode 100644 index 8f02628..0000000 --- a/Resources/Assets.xcassets/regular.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "ShhShell@1x.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "ShhShell@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "ShhShell@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Resources/Assets.xcassets/regular.imageset/ShhShell@1x.png b/Resources/Assets.xcassets/regular.imageset/ShhShell@1x.png deleted file mode 100644 index cfb71f6..0000000 Binary files a/Resources/Assets.xcassets/regular.imageset/ShhShell@1x.png and /dev/null differ diff --git a/Resources/Assets.xcassets/regular.imageset/ShhShell@2x.png b/Resources/Assets.xcassets/regular.imageset/ShhShell@2x.png deleted file mode 100644 index 28636ee..0000000 Binary files a/Resources/Assets.xcassets/regular.imageset/ShhShell@2x.png and /dev/null differ diff --git a/Resources/Assets.xcassets/regular.imageset/ShhShell@3x.png b/Resources/Assets.xcassets/regular.imageset/ShhShell@3x.png deleted file mode 100644 index 4ccbb05..0000000 Binary files a/Resources/Assets.xcassets/regular.imageset/ShhShell@3x.png and /dev/null differ diff --git a/Resources/ShhShell.icon/Assets/$.png b/Resources/ShhShell.icon/Assets/$.png new file mode 100644 index 0000000..a35b676 Binary files /dev/null and b/Resources/ShhShell.icon/Assets/$.png differ diff --git a/Resources/ShhShell.icon/Assets/>.png b/Resources/ShhShell.icon/Assets/>.png new file mode 100644 index 0000000..03bb2a5 Binary files /dev/null and b/Resources/ShhShell.icon/Assets/>.png differ diff --git a/Resources/ShhShell.icon/Assets/Image Layer.png b/Resources/ShhShell.icon/Assets/Image Layer.png new file mode 100644 index 0000000..03088b5 Binary files /dev/null and b/Resources/ShhShell.icon/Assets/Image Layer.png differ diff --git a/Resources/ShhShell.icon/Assets/Rectangle.png b/Resources/ShhShell.icon/Assets/Rectangle.png new file mode 100644 index 0000000..8a74099 Binary files /dev/null and b/Resources/ShhShell.icon/Assets/Rectangle.png differ diff --git a/Resources/ShhShell.icon/Assets/scanlines.png b/Resources/ShhShell.icon/Assets/scanlines.png new file mode 100644 index 0000000..2432c84 Binary files /dev/null and b/Resources/ShhShell.icon/Assets/scanlines.png differ diff --git a/Resources/ShhShell.icon/Assets/▮.png b/Resources/ShhShell.icon/Assets/▮.png new file mode 100644 index 0000000..0549491 Binary files /dev/null and b/Resources/ShhShell.icon/Assets/▮.png differ diff --git a/Resources/ShhShell.icon/icon.json b/Resources/ShhShell.icon/icon.json new file mode 100644 index 0000000..4440d8f --- /dev/null +++ b/Resources/ShhShell.icon/icon.json @@ -0,0 +1,78 @@ +{ + "fill" : { + "automatic-gradient" : "extended-srgb:0.00000,0.53333,1.00000,1.00000" + }, + "groups" : [ + { + "layers" : [ + { + "glass" : false, + "image-name" : "scanlines.png", + "name" : "scanlines", + "opacity" : 0.4 + }, + { + "glass" : false, + "image-name" : "$.png", + "name" : "$", + "position" : { + "scale" : 1, + "translation-in-points" : [ + -210, + -160 + ] + } + }, + { + "glass" : false, + "image-name" : ">.png", + "name" : ">", + "position" : { + "scale" : 1, + "translation-in-points" : [ + -210, + 210 + ] + } + }, + { + "glass" : false, + "image-name" : "▮.png", + "name" : "▮", + "position" : { + "scale" : 1, + "translation-in-points" : [ + 70, + 210 + ] + } + }, + { + "glass" : true, + "hidden" : false, + "image-name" : "Image Layer.png", + "name" : "Image Layer 4" + }, + { + "glass" : false, + "image-name" : "Rectangle.png", + "name" : "Rectangle 3" + } + ], + "shadow" : { + "kind" : "neutral", + "opacity" : 0.5 + }, + "translucency" : { + "enabled" : true, + "value" : 0.5 + } + } + ], + "supported-platforms" : { + "circles" : [ + "watchOS" + ], + "squares" : "shared" + } +} \ No newline at end of file diff --git a/ShhShell.pxd b/ShhShell.pxd index a96b251..725f049 100644 Binary files a/ShhShell.pxd and b/ShhShell.pxd differ diff --git a/ShhShell.xcodeproj/project.pbxproj b/ShhShell.xcodeproj/project.pbxproj index bd40d1a..cfa3f56 100644 --- a/ShhShell.xcodeproj/project.pbxproj +++ b/ShhShell.xcodeproj/project.pbxproj @@ -85,6 +85,7 @@ A994D64A2E5C94E200672395 /* ShaderTestingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A994D6492E5C94E200672395 /* ShaderTestingView.swift */; }; A99D9F7B2E63513E00259166 /* SwiftTerm in Frameworks */ = {isa = PBXBuildFile; productRef = A99D9F7A2E63513E00259166 /* SwiftTerm */; }; A99D9F7E2E6351D100259166 /* SwiftTerm in Frameworks */ = {isa = PBXBuildFile; productRef = A99D9F7D2E6351D100259166 /* SwiftTerm */; }; + A99E76202E7AD4BD00720621 /* ShhShell.icon in Resources */ = {isa = PBXBuildFile; fileRef = A99E761F2E7AD4BD00720621 /* ShhShell.icon */; }; A9A2F4F62E3001D300D0AE9B /* AddSnippetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9A2F4F52E3001D300D0AE9B /* AddSnippetView.swift */; }; A9B1E5852E5F8E86009309E5 /* WelcomeChunk.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9B1E5842E5F8E86009309E5 /* WelcomeChunk.swift */; }; A9BA1D192E1D9AE1005BDCEF /* SwiftTerm.Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9BA1D182E1D9AE1005BDCEF /* SwiftTerm.Color.swift */; }; @@ -227,6 +228,7 @@ A98CAB432E4229F7005E4C42 /* HostSymbolPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HostSymbolPicker.swift; sourceTree = ""; }; A9921DE02E5F5710009F72A8 /* WelcomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeView.swift; sourceTree = ""; }; A994D6492E5C94E200672395 /* ShaderTestingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShaderTestingView.swift; sourceTree = ""; }; + A99E761F2E7AD4BD00720621 /* ShhShell.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = ShhShell.icon; sourceTree = ""; }; A9A2F4F52E3001D300D0AE9B /* AddSnippetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddSnippetView.swift; sourceTree = ""; }; A9B1E5842E5F8E86009309E5 /* WelcomeChunk.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeChunk.swift; sourceTree = ""; }; A9BA1D182E1D9AE1005BDCEF /* SwiftTerm.Color.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftTerm.Color.swift; sourceTree = ""; }; @@ -459,6 +461,7 @@ A90936822E1AC31100856059 /* fonts */, A92DDDE02E104CA400A87DB2 /* themes */, A92538C42DEE0742007E0A18 /* Assets.xcassets */, + A99E761F2E7AD4BD00720621 /* ShhShell.icon */, ); path = Resources; sourceTree = ""; @@ -813,6 +816,7 @@ A96BE6A12E10846B00C0FEE9 /* catppuccinFrappe.plist in Resources */, A90936A72E1AE9AB00856059 /* CascadiaMono.ttf in Resources */, A90936A92E1AE9AB00856059 /* SF-Mono-Regular.otf in Resources */, + A99E76202E7AD4BD00720621 /* ShhShell.icon in Resources */, A90936AA2E1AE9AB00856059 /* SF-Mono-RegularItalic.otf in Resources */, A90936AB2E1AE9AB00856059 /* MesloLGS NF Regular.ttf in Resources */, A90936AC2E1AE9AB00856059 /* MesloLGS NF Bold Italic.ttf in Resources */, @@ -1077,7 +1081,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "beta betaBlueprint"; - ASSETCATALOG_COMPILER_APPICON_NAME = regular; + ASSETCATALOG_COMPILER_APPICON_NAME = ShhShell; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CODE_SIGN_ENTITLEMENTS = ShhShell/ShhShell.entitlements; @@ -1121,7 +1125,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "beta betaBlueprint"; - ASSETCATALOG_COMPILER_APPICON_NAME = regular; + ASSETCATALOG_COMPILER_APPICON_NAME = ShhShell; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CODE_SIGN_ENTITLEMENTS = ShhShell/ShhShell.entitlements; diff --git a/ShhShell/Host/HostsManager.swift b/ShhShell/Host/HostsManager.swift index d028c28..c651db2 100644 --- a/ShhShell/Host/HostsManager.swift +++ b/ShhShell/Host/HostsManager.swift @@ -58,7 +58,7 @@ class HostsManager: ObservableObject, @unchecked Sendable { func setAppIcon() { Task { @MainActor in guard UIApplication.shared.supportsAlternateIcons else { return } - guard settings.appIcon.name != "regular" else { + guard settings.appIcon.name != "ShhShell" else { UIApplication.shared.setAlternateIconName(nil) return } diff --git a/ShhShell/Settings/AppSettings.swift b/ShhShell/Settings/AppSettings.swift index b9f0d42..c6570b7 100644 --- a/ShhShell/Settings/AppSettings.swift +++ b/ShhShell/Settings/AppSettings.swift @@ -84,7 +84,7 @@ enum AppIcon: Codable, CaseIterable, Equatable, CustomStringConvertible { var name: String { switch self { case .regular: - return "regular" + return "ShhShell" case .beta: return "beta" case .betaBlueprint: