neon443/ShhShell
1
0
Fork 0
mirror of https://github.com/neon443/ShhShell.git synced 2026-03-11 05:19:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Awdjfghkahdsgjf;h

Browse Source 
id and name were swapped loll
switch back to icloud defaults for hostsmanager
update xcode* themes to camel case
This commit is contained in:
neon443
2025-06-29 11:15:22 +01:00
parent 331b21b23f
commit 4ca3bc035f
17 changed files with 43 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Resources/themes/0x96f.plist
View File

@@ -3,9 +3,9 @@
<plist version="1.0">
<dict>
<key>id</key>
<string>0x96f</string>
<string>BF34203A-CD73-45F3-B46F-F209B8A8E5D1</string>
<key>name</key>
<string>28093A65-866F-42F7-9CB0-49D1D1097A1E</string>
<string>0x96f</string>
<key>Ansi 0 Color</key>
<dict>
<key>Alpha Component</key>

4
Resources/themes/catppuccinFrappe.plist
View File

@@ -3,9 +3,9 @@
<plist version="1.0">
<dict>
<key>id</key>
<string>catppuccinFrappe</string>
<string>4DB15A11-5996-409D-9196-2233576E5437</string>
<key>name</key>
<string>130DF195-4925-45E6-A251-7602E53DB1F4</string>
<string>catppuccinFrappe</string>
<key>Ansi 0 Color</key>
<dict>
<key>Alpha Component</key>

4
Resources/themes/catppuccinMocha.plist
View File

@@ -3,9 +3,9 @@
<plist version="1.0">
<dict>
<key>id</key>
<string>catppuccinMocha</string>
<string>194ECC91-03A8-4A8F-9B41-C0F4E8D0A63F</string>
<key>name</key>
<string>D7CCC116-0AFA-49CD-8E4C-BDFADE06877C</string>
<string>catppuccinMocha</string>
<key>Ansi 0 Color</key>
<dict>
<key>Alpha Component</key>

4
Resources/themes/defaultTheme.plist
View File

@@ -3,9 +3,9 @@
<plist version="1.0">
<dict>
<key>id</key>
<string>defaultTheme</string>
<string>CF4964F1-2F0D-4388-9C83-8594E3F17989</string>
<key>name</key>
<string>907AC82C-F31D-4625-BE99-539ABA97C7E7</string>
<string>defaultTheme</string>
<key>Ansi 0 Color</key>
<dict>
<key>Red Component</key>

4
Resources/themes/dracula.plist
View File

@@ -3,9 +3,9 @@
<plist version="1.0">
<dict>
<key>id</key>
<string>dracula</string>
<string>6A65000B-E8C9-4691-A2EB-3E3981AE0BCB</string>
<key>name</key>
<string>41FD85F7-2129-4494-930A-BAE08D51F517</string>
<string>dracula</string>
<key>Ansi 0 Color</key>
<dict>
<key>Alpha Component</key>

4
Resources/themes/gruvboxDark.plist
View File

@@ -3,9 +3,9 @@
<plist version="1.0">
<dict>
<key>id</key>
<string>gruvboxDark</string>
<string>94BCC2DD-8F77-4C1C-85C0-D391A74324A9</string>
<key>name</key>
<string>EDAB6C07-3244-495D-8773-FDF3B8777139</string>
<string>gruvboxDark</string>
<key>Ansi 0 Color</key>
<dict>
<key>Alpha Component</key>

4
Resources/themes/iTerm2SolarizedDark.plist
View File

@@ -3,9 +3,9 @@
<plist version="1.0">
<dict>
<key>id</key>
<string>iTerm2SolarizedDark</string>
<string>67A5D068-DC42-4C24-8058-775D7D24F8FE</string>
<key>name</key>
<string>92F1B72C-221F-4780-906C-4498D6C7EEC5</string>
<string>iTerm2SolarizedDar</string>
<key>Ansi 0 Color</key>
<dict>
<key>Alpha Component</key>

4
Resources/themes/iTerm2SolarizedLight.plist
View File

@@ -3,9 +3,9 @@
<plist version="1.0">
<dict>
<key>id</key>
<string>iTerm2SolarizedLight</string>
<string>262CB71A-C253-4A78-959E-6E080A458EBB</string>
<key>name</key>
<string>3B37ACD2-C3CF-49B4-9B9D-27E76244E108</string>
<string>iTerm2SolarizedLight</string>
<key>Ansi 0 Color</key>
<dict>
<key>Alpha Component</key>

4
Resources/themes/tomorrowNight.plist
View File

@@ -3,9 +3,9 @@
<plist version="1.0">
<dict>
<key>id</key>
<string>tomorrowNight</string>
<string>18AF7BA2-F401-4F48-A7A9-9CBA5534643B</string>
<key>name</key>
<string>FC93B1E7-BB8B-4F73-B6AA-DEF2AF201B61</string>
<string>tomorrowNight</string>
<key>Ansi 0 Color</key>
<dict>
<key>Blue Component</key>

4
Resources/themes/ubuntu.plist
View File

@@ -3,9 +3,9 @@
<plist version="1.0">
<dict>
<key>id</key>
<string>ubuntu</string>
<string>97679C4F-6617-43EB-B622-F9F86A2DD929</string>
<key>name</key>
<string>7B93836A-54AE-4AB0-A41D-7473D72A5419</string>
<string>ubuntu</string>
<key>Ansi 0 Color</key>
<dict>
<key>Blue Component</key>

4
Resources/themes/xcodedark.plist → Resources/themes/xcodeDark.plist
View File

@@ -3,9 +3,9 @@
<plist version="1.0">
<dict>
<key>id</key>
<string>xcodedark</string>
<string>E30BF6AF-AA6C-4E85-AE0B-42D576790669</string>
<key>name</key>
<string>0D6242BB-8961-4A1D-BD08-81BCC1B24528</string>
<string>xcodeDark</string>
<key>Ansi 0 Color</key>
<dict>
<key>Alpha Component</key>

4
Resources/themes/xcodedarkhc.plist → Resources/themes/xcodeDarkHC.plist
View File

@@ -3,9 +3,9 @@
<plist version="1.0">
<dict>
<key>id</key>
<string>xcodedarkhc</string>
<string>57AD52E8-C995-4A3C-ABEF-8A50757FA146</string>
<key>name</key>
<string>C95378B5-F183-4E40-B8F8-3CDD681E6B9A</string>
<string>xcodeDarkHC</string>
<key>Ansi 0 Color</key>
<dict>
<key>Alpha Component</key>

4
Resources/themes/xcodewwdc.plist → Resources/themes/xcodeWWDC.plist
View File

@@ -3,9 +3,9 @@
<plist version="1.0">
<dict>
<key>id</key>
<string>xcodewwdc</string>
<string>E34D7B03-8E07-4F3A-B250-9D3714299B16</string>
<key>name</key>
<string>884DB359-9154-4038-AD54-C15001FA59BA</string>
<string>xcodeWWDC</string>
<key>Ansi 0 Color</key>
<dict>
<key>Alpha Component</key>

24
ShhShell.xcodeproj/project.pbxproj
View File

@@ -29,15 +29,15 @@
A96BE6972E10846B00C0FEE9 /* catppuccinMocha.plist in Resources */ = {isa = PBXBuildFile; fileRef = A96BE68D2E10846B00C0FEE9 /* catppuccinMocha.plist */; };
A96BE6982E10846B00C0FEE9 /* ubuntu.plist in Resources */ = {isa = PBXBuildFile; fileRef = A96BE6932E10846B00C0FEE9 /* ubuntu.plist */; };
A96BE6992E10846B00C0FEE9 /* iTerm2SolarizedDark.plist in Resources */ = {isa = PBXBuildFile; fileRef = A96BE6902E10846B00C0FEE9 /* iTerm2SolarizedDark.plist */; };
A96BE69A2E10846B00C0FEE9 /* xcodedark.plist in Resources */ = {isa = PBXBuildFile; fileRef = A96BE6942E10846B00C0FEE9 /* xcodedark.plist */; };
A96BE69A2E10846B00C0FEE9 /* xcodeDark.plist in Resources */ = {isa = PBXBuildFile; fileRef = A96BE6942E10846B00C0FEE9 /* xcodeDark.plist */; };
A96BE69B2E10846B00C0FEE9 /* iTerm2SolarizedLight.plist in Resources */ = {isa = PBXBuildFile; fileRef = A96BE6912E10846B00C0FEE9 /* iTerm2SolarizedLight.plist */; };
A96BE69C2E10846B00C0FEE9 /* 0x96f.plist in Resources */ = {isa = PBXBuildFile; fileRef = A96BE68B2E10846B00C0FEE9 /* 0x96f.plist */; };
A96BE69D2E10846B00C0FEE9 /* gruvboxDark.plist in Resources */ = {isa = PBXBuildFile; fileRef = A96BE68F2E10846B00C0FEE9 /* gruvboxDark.plist */; };
A96BE69E2E10846B00C0FEE9 /* xcodedarkhc.plist in Resources */ = {isa = PBXBuildFile; fileRef = A96BE6952E10846B00C0FEE9 /* xcodedarkhc.plist */; };
A96BE69E2E10846B00C0FEE9 /* xcodeDarkHC.plist in Resources */ = {isa = PBXBuildFile; fileRef = A96BE6952E10846B00C0FEE9 /* xcodeDarkHC.plist */; };
A96BE69F2E10846B00C0FEE9 /* tomorrowNight.plist in Resources */ = {isa = PBXBuildFile; fileRef = A96BE6922E10846B00C0FEE9 /* tomorrowNight.plist */; };
A96BE6A02E10846B00C0FEE9 /* dracula.plist in Resources */ = {isa = PBXBuildFile; fileRef = A96BE68E2E10846B00C0FEE9 /* dracula.plist */; };
A96BE6A12E10846B00C0FEE9 /* catppuccinFrappe.plist in Resources */ = {isa = PBXBuildFile; fileRef = A96BE68C2E10846B00C0FEE9 /* catppuccinFrappe.plist */; };
A96BE6A22E10846B00C0FEE9 /* xcodewwdc.plist in Resources */ = {isa = PBXBuildFile; fileRef = A96BE6962E10846B00C0FEE9 /* xcodewwdc.plist */; };
A96BE6A22E10846B00C0FEE9 /* xcodeWWDC.plist in Resources */ = {isa = PBXBuildFile; fileRef = A96BE6962E10846B00C0FEE9 /* xcodeWWDC.plist */; };
A96BE6A42E113D9400C0FEE9 /* ThemeCodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = A96BE6A32E113D9400C0FEE9 /* ThemeCodable.swift */; };
A96BE6A62E113DB000C0FEE9 /* ColorCodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = A96BE6A52E113DB000C0FEE9 /* ColorCodable.swift */; };
A96C6A8A2E0C0B1100F377FE /* SSHState.swift in Sources */ = {isa = PBXBuildFile; fileRef = A96C6A892E0C0B1100F377FE /* SSHState.swift */; };
@@ -128,9 +128,9 @@
A96BE6912E10846B00C0FEE9 /* iTerm2SolarizedLight.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = iTerm2SolarizedLight.plist; sourceTree = "<group>"; };
A96BE6922E10846B00C0FEE9 /* tomorrowNight.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = tomorrowNight.plist; sourceTree = "<group>"; };
A96BE6932E10846B00C0FEE9 /* ubuntu.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = ubuntu.plist; sourceTree = "<group>"; };
A96BE6942E10846B00C0FEE9 /* xcodedark.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = xcodedark.plist; sourceTree = "<group>"; };
A96BE6952E10846B00C0FEE9 /* xcodedarkhc.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = xcodedarkhc.plist; sourceTree = "<group>"; };
A96BE6962E10846B00C0FEE9 /* xcodewwdc.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = xcodewwdc.plist; sourceTree = "<group>"; };
A96BE6942E10846B00C0FEE9 /* xcodeDark.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = xcodeDark.plist; sourceTree = "<group>"; };
A96BE6952E10846B00C0FEE9 /* xcodeDarkHC.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = xcodeDarkHC.plist; sourceTree = "<group>"; };
A96BE6962E10846B00C0FEE9 /* xcodeWWDC.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = xcodeWWDC.plist; sourceTree = "<group>"; };
A96BE6A32E113D9400C0FEE9 /* ThemeCodable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeCodable.swift; sourceTree = "<group>"; };
A96BE6A52E113DB000C0FEE9 /* ColorCodable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorCodable.swift; sourceTree = "<group>"; };
A96C6A892E0C0B1100F377FE /* SSHState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SSHState.swift; sourceTree = "<group>"; };
@@ -275,9 +275,9 @@
isa = PBXGroup;
children = (
A92DDDE12E104CB300A87DB2 /* defaultTheme.plist */,
A96BE6942E10846B00C0FEE9 /* xcodedark.plist */,
A96BE6952E10846B00C0FEE9 /* xcodedarkhc.plist */,
A96BE6962E10846B00C0FEE9 /* xcodewwdc.plist */,
A96BE6942E10846B00C0FEE9 /* xcodeDark.plist */,
A96BE6952E10846B00C0FEE9 /* xcodeDarkHC.plist */,
A96BE6962E10846B00C0FEE9 /* xcodeWWDC.plist */,
A96BE6922E10846B00C0FEE9 /* tomorrowNight.plist */,
A96BE68B2E10846B00C0FEE9 /* 0x96f.plist */,
A96BE6902E10846B00C0FEE9 /* iTerm2SolarizedDark.plist */,
@@ -510,15 +510,15 @@
A96BE6972E10846B00C0FEE9 /* catppuccinMocha.plist in Resources */,
A96BE6982E10846B00C0FEE9 /* ubuntu.plist in Resources */,
A96BE6992E10846B00C0FEE9 /* iTerm2SolarizedDark.plist in Resources */,
A96BE69A2E10846B00C0FEE9 /* xcodedark.plist in Resources */,
A96BE69A2E10846B00C0FEE9 /* xcodeDark.plist in Resources */,
A96BE69B2E10846B00C0FEE9 /* iTerm2SolarizedLight.plist in Resources */,
A96BE69C2E10846B00C0FEE9 /* 0x96f.plist in Resources */,
A96BE69D2E10846B00C0FEE9 /* gruvboxDark.plist in Resources */,
A96BE69E2E10846B00C0FEE9 /* xcodedarkhc.plist in Resources */,
A96BE69E2E10846B00C0FEE9 /* xcodeDarkHC.plist in Resources */,
A96BE69F2E10846B00C0FEE9 /* tomorrowNight.plist in Resources */,
A96BE6A02E10846B00C0FEE9 /* dracula.plist in Resources */,
A96BE6A12E10846B00C0FEE9 /* catppuccinFrappe.plist in Resources */,
A96BE6A22E10846B00C0FEE9 /* xcodewwdc.plist in Resources */,
A96BE6A22E10846B00C0FEE9 /* xcodeWWDC.plist in Resources */,
A95FAA472DF3884B00DE2F5A /* Config.xcconfig in Resources */,
A92538CA2DEE0742007E0A18 /* Assets.xcassets in Resources */,
A92DDDE22E104CB300A87DB2 /* defaultTheme.plist in Resources */,

2
ShhShell/Host/HostsManager.swift
View File

@@ -10,7 +10,7 @@ import LocalAuthentication
import SwiftUI
class HostsManager: ObservableObject, @unchecked Sendable {
private let userDefaults = UserDefaults.standard
private let userDefaults = NSUbiquitousKeyValueStore.default
@Published var hosts: [Host] = []
@Published var themes: [Theme] = []

9
ShhShell/Themes/Theme.swift
View File

@@ -66,10 +66,7 @@ struct Theme: Hashable, Equatable, Identifiable {
static func decodeLocalTheme(fileName: String) -> Theme? {
guard let path = Bundle.main.url(forResource: fileName, withExtension: "plist") else { return nil }
let themeName = path.lastPathComponent.replacingOccurrences(of: ".plist", with: "")
guard let fileContents = try? Data(contentsOf: path) else { return nil }
return Theme.decodeTheme(data: fileContents)
}
@@ -95,9 +92,9 @@ struct Theme: Hashable, Equatable, Identifiable {
enum ThemesBuiltin: String, CaseIterable, Hashable, Equatable {
case defaultTheme = "defaultTheme"
case xcodedark = "xcodedark"
case xcodedarkhc = "xcodedarkhc"
case xcodewwdc = "xcodewwdc"
case xcodeDark = "xcodeDark"
case xcodeDarkHC = "xcodeDarkHC"
case xcodeWWDC = "xcodeWWDC"
case tomorrowNight = "tomorrowNight"
case zeroXNineSixF = "0x96f"
case iTerm2SolarizedDark = "iTerm2SolarizedDark"

2
ShhShell/Themes/ThemeCodable.swift
View File

@@ -74,7 +74,7 @@ extension ThemeCodable {
extension ThemeCodable {
func toTheme() -> Theme {
return Theme(
id: id ?? UUID().uuidString,
id: self.id ?? UUID().uuidString,
name: self.name ?? "",
ansi: self.ansi,
foreground: self.foreground.stColor,