diff --git a/Mist/Assets.xcassets/AccentColor.colorset/Contents.json b/Mist/Assets.xcassets/AccentColor.colorset/Contents.json index c6595b5..8627684 100644 --- a/Mist/Assets.xcassets/AccentColor.colorset/Contents.json +++ b/Mist/Assets.xcassets/AccentColor.colorset/Contents.json @@ -2,12 +2,12 @@ "colors" : [ { "color" : { - "color-space" : "display-p3", + "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0.269", - "green" : "0.647", - "red" : "0.946" + "blue" : "0.149", + "green" : "0.663", + "red" : "0.467" } }, "idiom" : "mac" @@ -20,12 +20,12 @@ } ], "color" : { - "color-space" : "display-p3", + "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0.269", - "green" : "0.647", - "red" : "0.946" + "blue" : "0.149", + "green" : "0.663", + "red" : "0.467" } }, "idiom" : "mac" @@ -38,12 +38,12 @@ } ], "color" : { - "color-space" : "display-p3", + "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0.269", - "green" : "0.647", - "red" : "0.946" + "blue" : "0.149", + "green" : "0.663", + "red" : "0.467" } }, "idiom" : "mac" diff --git a/Mist/Assets.xcassets/AppIcon.appiconset/icon_128x128.png b/Mist/Assets.xcassets/AppIcon.appiconset/icon_128x128.png index 3a0ad6a..60410e4 100644 Binary files a/Mist/Assets.xcassets/AppIcon.appiconset/icon_128x128.png and b/Mist/Assets.xcassets/AppIcon.appiconset/icon_128x128.png differ diff --git a/Mist/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png b/Mist/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png index 76ff6bd..e8b6074 100644 Binary files a/Mist/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png and b/Mist/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png differ diff --git a/Mist/Assets.xcassets/AppIcon.appiconset/icon_16x16.png b/Mist/Assets.xcassets/AppIcon.appiconset/icon_16x16.png index 1739f62..9aa2d92 100644 Binary files a/Mist/Assets.xcassets/AppIcon.appiconset/icon_16x16.png and b/Mist/Assets.xcassets/AppIcon.appiconset/icon_16x16.png differ diff --git a/Mist/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png b/Mist/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png index a1b03b0..bc30fe3 100644 Binary files a/Mist/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png and b/Mist/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png differ diff --git a/Mist/Assets.xcassets/AppIcon.appiconset/icon_256x256.png b/Mist/Assets.xcassets/AppIcon.appiconset/icon_256x256.png index 0ac426c..db71bd5 100644 Binary files a/Mist/Assets.xcassets/AppIcon.appiconset/icon_256x256.png and b/Mist/Assets.xcassets/AppIcon.appiconset/icon_256x256.png differ diff --git a/Mist/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png b/Mist/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png index fb5bccc..076e3c8 100644 Binary files a/Mist/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png and b/Mist/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png differ diff --git a/Mist/Assets.xcassets/AppIcon.appiconset/icon_32x32.png b/Mist/Assets.xcassets/AppIcon.appiconset/icon_32x32.png index a1b03b0..bc30fe3 100644 Binary files a/Mist/Assets.xcassets/AppIcon.appiconset/icon_32x32.png and b/Mist/Assets.xcassets/AppIcon.appiconset/icon_32x32.png differ diff --git a/Mist/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png b/Mist/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png index 5112184..b7c2907 100644 Binary files a/Mist/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png and b/Mist/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png differ diff --git a/Mist/Assets.xcassets/AppIcon.appiconset/icon_512x512.png b/Mist/Assets.xcassets/AppIcon.appiconset/icon_512x512.png index fb5bccc..076e3c8 100644 Binary files a/Mist/Assets.xcassets/AppIcon.appiconset/icon_512x512.png and b/Mist/Assets.xcassets/AppIcon.appiconset/icon_512x512.png differ diff --git a/Mist/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png b/Mist/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png index 49f7ebd..34a08b7 100644 Binary files a/Mist/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png and b/Mist/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png differ diff --git a/Mist/Assets.xcassets/macOS Sonoma.imageset/Contents.json b/Mist/Assets.xcassets/macOS Sonoma.imageset/Contents.json new file mode 100644 index 0000000..efea540 --- /dev/null +++ b/Mist/Assets.xcassets/macOS Sonoma.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "macOS Sonoma.png", + "idiom" : "mac" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Mist/Assets.xcassets/macOS Sonoma.imageset/macOS Sonoma.png b/Mist/Assets.xcassets/macOS Sonoma.imageset/macOS Sonoma.png new file mode 100644 index 0000000..6210220 Binary files /dev/null and b/Mist/Assets.xcassets/macOS Sonoma.imageset/macOS Sonoma.png differ diff --git a/Mist/Model/CatalogType.swift b/Mist/Model/CatalogType.swift index 956f8e1..16fbd22 100644 --- a/Mist/Model/CatalogType.swift +++ b/Mist/Model/CatalogType.swift @@ -6,6 +6,7 @@ // enum CatalogType: String, CaseIterable, Comparable, Decodable { + case sonoma = "macOS Sonoma" case ventura = "macOS Ventura" case monterey = "macOS Monterey" case bigSur = "macOS Big Sur" @@ -20,12 +21,14 @@ enum CatalogType: String, CaseIterable, Comparable, Decodable { private var sortOrder: Int { switch self { - case .ventura: + case .sonoma: return 0 - case .monterey: + case .ventura: return 1 - case .bigSur: + case .monterey: return 2 + case .bigSur: + return 3 } } @@ -37,6 +40,20 @@ enum CatalogType: String, CaseIterable, Comparable, Decodable { func url(for seedType: CatalogSeedType) -> String { switch self { + case .sonoma: + switch seedType { + case .standard: + return "https://swscan.apple.com/content/catalogs/others/index-14-13-12-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog.gz" + case .customer: + // swiftlint:disable:next line_length + return "https://swscan.apple.com/content/catalogs/others/index-14customerseed-14-13-12-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog.gz" + case .developer: + // swiftlint:disable:next line_length + return "https://swscan.apple.com/content/catalogs/others/index-14seed-14-13-12-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog.gz" + case .public: + // swiftlint:disable:next line_length + return "https://swscan.apple.com/content/catalogs/others/index-14beta-14-13-12-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog.gz" + } case .ventura: switch seedType { case .standard: diff --git a/Mist/Model/Firmware.swift b/Mist/Model/Firmware.swift index 91a4937..5a98a7b 100644 --- a/Mist/Model/Firmware.swift +++ b/Mist/Model/Firmware.swift @@ -52,7 +52,9 @@ struct Firmware: Decodable, Hashable, Identifiable { var name: String = "" - if version.range(of: "^13", options: .regularExpression) != nil { + if version.range(of: "^14", options: .regularExpression) != nil { + name = "macOS Sonoma" + } else if version.range(of: "^13", options: .regularExpression) != nil { name = "macOS Ventura" } else if version.range(of: "^12", options: .regularExpression) != nil { name = "macOS Monterey" diff --git a/Mist/Model/Installer.swift b/Mist/Model/Installer.swift index 27ddf08..8a22270 100644 --- a/Mist/Model/Installer.swift +++ b/Mist/Model/Installer.swift @@ -271,7 +271,9 @@ struct Installer: Decodable, Hashable, Identifiable { var name: String = "" - if version.range(of: "^13", options: .regularExpression) != nil { + if version.range(of: "^14", options: .regularExpression) != nil { + name = "macOS Sonoma" + } else if version.range(of: "^13", options: .regularExpression) != nil { name = "macOS Ventura" } else if version.range(of: "^12", options: .regularExpression) != nil { name = "macOS Monterey" diff --git a/Mist/Views/Settings/SettingsInstallersCatalogsView.swift b/Mist/Views/Settings/SettingsInstallersCatalogsView.swift index 6aa59bb..81ae4ac 100644 --- a/Mist/Views/Settings/SettingsInstallersCatalogsView.swift +++ b/Mist/Views/Settings/SettingsInstallersCatalogsView.swift @@ -11,7 +11,7 @@ struct SettingsInstallersCatalogsView: View { @Binding var catalogs: [Catalog] // swiftlint:disable:next line_length private let description: String = "Apple Software Update Catalogs are used to determine available macOS Installers.\n\n- **Standard:** The default catalog that ships with macOS\n- **Customer Seed:** The catalog available as part of the [AppleSeed Program](https://appleseed.apple.com/)\n- **Developer Seed:** The catalog available as part of the [Apple Developer Program](https://developer.apple.com/programs/)\n- **Public Seed:** The catalog available as part of the [Apple Beta Software Program](https://beta.apple.com/)\n\n**Note:** Catalogs from the Seed Programs may contain beta / unreleased versions of macOS. Ensure you are a member of these programs before proceeding." - private let height: CGFloat = 120 + private let height: CGFloat = 126 private let width: CGFloat = 150 private let length: CGFloat = 16