Merge remote-tracking branch 'upstream/main' into update-german-localization

Schr0eder · Schr0eder · commit fd6baa81c49a · 2024-03-11T18:57:44.000+01:00
diff --git a/.github/workflows/appcast.yml b/.github/workflows/appcast.yml
@@ -15,15 +15,15 @@ jobs:
         persist-credentials: false
 
     - name: Cache 📦
-      uses: actions/cache@v4.0.0
+      uses: actions/cache@v4.0.1
       with:
         path: AppCast/vendor/bundle
         key: ${{ runner.os }}-gems-v1.0-${{ hashFiles('AppCast/Gemfile') }}
         restore-keys: |
           ${{ runner.os }}-gems-
           
     - name: Setup Ruby, JRuby and TruffleRuby
-      uses: ruby/setup-ruby@v1.171.0
+      uses: ruby/setup-ruby@v1.172.0
       with:
         ruby-version: '3.0'
 
diff --git a/Xcodes/Backend/AppState+Runtimes.swift b/Xcodes/Backend/AppState+Runtimes.swift
@@ -15,10 +15,10 @@ extension AppState {
                     var updatedRuntime = runtime
                     
                     // This loops through and matches up the simulatorVersion to the mappings
-                    let simulatorBuildUpdate = downloadableRuntimes.sdkToSimulatorMappings.first { SDKToSimulatorMapping in
+                    let simulatorBuildUpdate = downloadableRuntimes.sdkToSimulatorMappings.filter { SDKToSimulatorMapping in
                         SDKToSimulatorMapping.simulatorBuildUpdate == runtime.simulatorVersion.buildUpdate
                     }
-                    updatedRuntime.sdkBuildUpdate = simulatorBuildUpdate?.sdkBuildUpdate
+                    updatedRuntime.sdkBuildUpdate = simulatorBuildUpdate.map { $0.sdkBuildUpdate }
                     return updatedRuntime
                 }
     
diff --git a/Xcodes/Frontend/About/AcknowledgementsView.swift b/Xcodes/Frontend/About/AcknowledgementsView.swift
@@ -10,7 +10,7 @@ struct AcknowledgmentsView: View {
             )!
             .addingAttribute(.foregroundColor, value: NSColor.labelColor)
         )
-        .frame(minWidth: 500, minHeight: 500)
+        .frame(minWidth: 600, minHeight: 500)
     }
 }
 
diff --git a/Xcodes/Frontend/InfoPane/CompilersView.swift b/Xcodes/Frontend/InfoPane/CompilersView.swift
@@ -16,7 +16,9 @@ struct CompilersView: View {
         if let compilers = compilers {
             VStack(alignment: .leading) {
                 Text("Compilers").font(.headline)
-                Text(Self.content(from: compilers)).font(.subheadline)
+                Text(Self.content(from: compilers))
+                    .font(.subheadline)
+                    .textSelection(.enabled)
             }
         } else {
             EmptyView()
diff --git a/Xcodes/Frontend/InfoPane/InfoPane.swift b/Xcodes/Frontend/InfoPane/InfoPane.swift
@@ -19,6 +19,7 @@ struct InfoPane: View {
                             Text(verbatim: "Xcode \(xcode.description) \(xcode.version.buildMetadataIdentifiersDisplay)")
                                 .font(.title)
                                 .frame(maxWidth: .infinity, alignment: .leading)
+                                .textSelection(.enabled)
                         }
                         InfoPaneControls(xcode: xcode)
                     }
@@ -146,12 +147,12 @@ var xcodeDict: [XcodePreviewName: Xcode] = [
 var downloadableRuntimes: [DownloadableRuntime] = {
     var runtimes = try! JSONDecoder().decode([DownloadableRuntime].self, from: Current.files.contents(atPath: Path.runtimeCacheFile.string)!)
     // set iOS to installed
-    let iOSIndex = runtimes.firstIndex { $0.sdkBuildUpdate == "19E239" }!
+    let iOSIndex = 0//runtimes.firstIndex { $0.sdkBuildUpdate.contains == "19E239" }!
     var iOSRuntime = runtimes[iOSIndex]
     iOSRuntime.installState = .installed
     runtimes[iOSIndex] = iOSRuntime
     
-    let watchOSIndex = runtimes.firstIndex { $0.sdkBuildUpdate == "20R362" }!
+    let watchOSIndex = 0//runtimes.firstIndex { $0.sdkBuildUpdate.first == "20R362" }!
     var runtime = runtimes[watchOSIndex]
     runtime.installState = .installing(
         RuntimeInstallationStep.downloading(
diff --git a/Xcodes/Frontend/InfoPane/PlatformsView.swift b/Xcodes/Frontend/InfoPane/PlatformsView.swift
@@ -19,7 +19,7 @@ struct PlatformsView: View {
         let builds = xcode.sdks?.allBuilds()
         let runtimes = builds?.flatMap { sdkBuild in
             appState.downloadableRuntimes.filter {
-                $0.sdkBuildUpdate == sdkBuild
+                $0.sdkBuildUpdate?.contains(sdkBuild) ?? false
             }
         }
 
diff --git a/Xcodes/Frontend/InfoPane/SDKsView.swift b/Xcodes/Frontend/InfoPane/SDKsView.swift
@@ -18,7 +18,9 @@ struct SDKsView: View {
         } else {
             VStack(alignment: .leading) {
                 Text("SDKs").font(.headline)
-                Text(content).font(.subheadline)
+                Text(content)
+                    .font(.subheadline)
+                    .textSelection(.enabled)
             }
         }
     }
diff --git a/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift b/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift
@@ -38,6 +38,7 @@ struct AdvancedPreferencePane: View {
                     }
                     Text("InstallPathDescription")
                         .font(.footnote)
+                        .foregroundStyle(.secondary)
                         .fixedSize(horizontal: false, vertical: true)
                 }
             }
@@ -73,6 +74,7 @@ struct AdvancedPreferencePane: View {
                     }
                     Text("LocalCachePathDescription")
                         .font(.footnote)
+                        .foregroundStyle(.secondary)
                         .fixedSize(horizontal: false, vertical: true)
                 }
             }
@@ -94,6 +96,7 @@ struct AdvancedPreferencePane: View {
                     
                     Text(appState.onSelectActionType.detailedDescription)
                         .font(.footnote)
+                        .foregroundStyle(.secondary)
                         .fixedSize(horizontal: false, vertical: true)
                     Spacer()
                         .frame(height: 20)
@@ -102,6 +105,7 @@ struct AdvancedPreferencePane: View {
                         .disabled(appState.createSymLinkOnSelectDisabled)
                     Text("AutomaticallyCreateSymbolicLinkDescription")
                         .font(.footnote)
+                        .foregroundStyle(.secondary)
                         .fixedSize(horizontal: false, vertical: true)
                 }
                 .fixedSize(horizontal: false, vertical: true)
@@ -114,6 +118,7 @@ struct AdvancedPreferencePane: View {
                         .disabled(appState.createSymLinkOnSelectDisabled)
                     Text("ShowOpenInRosettaDescription")
                         .font(.footnote)
+                        .foregroundStyle(.secondary)
                         .fixedSize(horizontal: false, vertical: true)
                 }
                 .groupBoxStyle(PreferencesGroupBoxStyle())
@@ -128,16 +133,18 @@ struct AdvancedPreferencePane: View {
                     case .installed:
                         Text("HelperInstalled")
                     case .notInstalled:
-                        HStack {
-                            Text("HelperNotInstalled")
+                        VStack(alignment: .leading) {
                             Button("InstallHelper") {
                                 appState.installHelperIfNecessary()
                             }
+                            Text("HelperNotInstalled")
+                                .font(.footnote)
                         }
                     }
                     
                     Text("PrivilegedHelperDescription")
                         .font(.footnote)
+                        .foregroundStyle(.secondary)
                         .fixedSize(horizontal: false, vertical: true)
                     
                     Spacer()
@@ -153,21 +160,18 @@ struct AdvancedPreferencePane_Previews: PreviewProvider {
         Group {
             AdvancedPreferencePane()
                 .environmentObject(AppState())
-                .frame(maxWidth: 500)
+                .frame(maxWidth: 600)
         }
-        .frame(width: 500, height: 700, alignment: .center)
+        .frame(width: 600, height: 700, alignment: .center)
     }
 }
 
 // A group style for the preferences
 struct PreferencesGroupBoxStyle: GroupBoxStyle {
     func makeBody(configuration: Configuration) -> some View {
         HStack(alignment: .top, spacing: 20) {
-            HStack {
-                Spacer()
-                configuration.label
-            }
-            .frame(width: 120)
+            configuration.label
+                .frame(width: 180, alignment: .trailing)
             
             VStack(alignment: .leading) {
                 configuration.content
diff --git a/Xcodes/Frontend/Preferences/DownloadPreferencePane.swift b/Xcodes/Frontend/Preferences/DownloadPreferencePane.swift
@@ -18,6 +18,7 @@ struct DownloadPreferencePane: View {
                         }
                     }
                     .labelsHidden()
+                    .fixedSize()
                     
                     AttributedText(dataSourceFootnote)
                 }
@@ -34,6 +35,7 @@ struct DownloadPreferencePane: View {
                         }
                     }
                     .labelsHidden()
+                    .fixedSize()
                     
                     AttributedText(downloaderFootnote)
                 }
@@ -50,7 +52,7 @@ struct DownloadPreferencePane: View {
             string: string,
             attributes: [
                 .font: NSFont.preferredFont(forTextStyle: .footnote, options: [:]),
-                .foregroundColor: NSColor.labelColor
+                .foregroundColor: NSColor.secondaryLabelColor
             ]
         )
         attributedString.addAttribute(.link, value: URL(string: "https://xcodereleases.com")!, range: NSRange(string.range(of: "Xcode Releases")!, in: string))
@@ -63,7 +65,7 @@ struct DownloadPreferencePane: View {
             string: string,
             attributes: [
                 .font: NSFont.preferredFont(forTextStyle: .footnote, options: [:]),
-                .foregroundColor: NSColor.labelColor
+                .foregroundColor: NSColor.secondaryLabelColor
             ]
         )
         attributedString.addAttribute(.link, value: URL(string: "https://github.com/aria2/aria2")!, range: NSRange(string.range(of: "aria2")!, in: string))
@@ -74,9 +76,10 @@ struct DownloadPreferencePane: View {
 struct DownloadPreferencePane_Previews: PreviewProvider {
     static var previews: some View {
         Group {
-            GeneralPreferencePane()
+            DownloadPreferencePane()
                 .environmentObject(AppState())
-                .frame(maxWidth: 500)
+                .frame(maxWidth: 600)
+                .frame(minHeight: 300)
         }
     }
 }
diff --git a/Xcodes/Frontend/Preferences/ExperiementsPreferencePane.swift b/Xcodes/Frontend/Preferences/ExperiementsPreferencePane.swift
@@ -18,8 +18,6 @@ struct ExperimentsPreferencePane: View {
                 .fixedSize(horizontal: false, vertical: true)
             }
             .groupBoxStyle(PreferencesGroupBoxStyle())
-            
-            Divider()
         }
     }
     
@@ -29,7 +27,7 @@ struct ExperimentsPreferencePane: View {
             string: string,
             attributes: [
                 .font: NSFont.preferredFont(forTextStyle: .footnote, options: [:]),
-                .foregroundColor: NSColor.labelColor
+                .foregroundColor: NSColor.secondaryLabelColor
             ]
         )
         attributedString.addAttribute(.link, value: URL(string: "https://twitter.com/_saagarjha")!, range: NSRange(string.range(of: "@_saagarjha")!, in: string))
@@ -43,7 +41,7 @@ struct ExperimentsPreferencePane_Previews: PreviewProvider {
         Group {
             ExperimentsPreferencePane()
                 .environmentObject(AppState())
-                .frame(maxWidth: 500)
+                .frame(maxWidth: 600)
         }
     }
 }
diff --git a/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift b/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift
@@ -29,7 +29,7 @@ struct GeneralPreferencePane_Previews: PreviewProvider {
         Group {
             GeneralPreferencePane()
                 .environmentObject(AppState())
-                .frame(maxWidth: 500)
+                .frame(maxWidth: 600)
         }
     }
 }
diff --git a/Xcodes/Frontend/Preferences/PreferencesView.swift b/Xcodes/Frontend/Preferences/PreferencesView.swift
@@ -39,6 +39,6 @@ struct PreferencesView: View {
                 .tag(Tabs.experiment)
         }
         .padding(20)
-        .frame(width: 500)
+        .frame(width: 600)
     }
 }
diff --git a/Xcodes/Frontend/Preferences/UpdatesPreferencePane.swift b/Xcodes/Frontend/Preferences/UpdatesPreferencePane.swift
@@ -43,9 +43,11 @@ struct UpdatesPreferencePane: View {
                     Button("CheckNow") {
                         updater.checkForUpdates()
                     }
+                    .padding(.top)
                     
                     Text(String(format: localizeString("LastChecked"), lastUpdatedString))
                         .font(.footnote)
+                        .foregroundStyle(.secondary)
                 }
                 .frame(maxWidth: .infinity, alignment: .leading)
             }
@@ -140,7 +142,9 @@ struct UpdatesPreferencePane_Previews: PreviewProvider {
         Group {
             UpdatesPreferencePane()
                 .environmentObject(AppState())
-                .frame(maxWidth: 500)
+                .environmentObject(ObservableUpdater())
+                .frame(maxWidth: 600)
+                .frame(minHeight: 300)
         }
     }
 }
diff --git a/Xcodes/Frontend/SignIn/SignInCredentialsView.swift b/Xcodes/Frontend/SignIn/SignInCredentialsView.swift
@@ -1,9 +1,14 @@
 import SwiftUI
 
 struct SignInCredentialsView: View {
+    private enum FocusedField {
+        case username, password
+    }
+    
     @EnvironmentObject var appState: AppState
     @State private var username: String = ""
     @State private var password: String = ""
+    @FocusState private var focusedField: FocusedField?
     
     var body: some View {
         VStack(alignment: .leading) {
@@ -16,11 +21,13 @@ struct SignInCredentialsView: View {
                 TextField(text: $username) {
                     Text(verbatim: "example@icloud.com")
                 }
+                .focused($focusedField, equals: .username)
             }
             HStack {
                 Text("Password")
                     .frame(minWidth: 100, alignment: .trailing)
                 SecureField("Required", text: $password)
+                    .focused($focusedField, equals: .password)
             }
             if appState.authError != nil {
                 HStack {
diff --git a/Xcodes/Resources/Localizable.xcstrings b/Xcodes/Resources/Localizable.xcstrings
diff --git a/Xcodes/XcodesKit/Sources/XcodesKit/Models/Runtimes/Runtimes.swift b/Xcodes/XcodesKit/Sources/XcodesKit/Models/Runtimes/Runtimes.swift

Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,10 @@ extension AppState {`
`15`	`15`	`var updatedRuntime = runtime`
`16`	`16`
`17`	`17`	`// This loops through and matches up the simulatorVersion to the mappings`
`18`		`- let simulatorBuildUpdate = downloadableRuntimes.sdkToSimulatorMappings.first { SDKToSimulatorMapping in`
	`18`	`+ let simulatorBuildUpdate = downloadableRuntimes.sdkToSimulatorMappings.filter { SDKToSimulatorMapping in`
`19`	`19`	`SDKToSimulatorMapping.simulatorBuildUpdate == runtime.simulatorVersion.buildUpdate`
`20`	`20`	`}`
`21`		`- updatedRuntime.sdkBuildUpdate = simulatorBuildUpdate?.sdkBuildUpdate`
	`21`	`+ updatedRuntime.sdkBuildUpdate = simulatorBuildUpdate.map { $0.sdkBuildUpdate }`
`22`	`22`	`return updatedRuntime`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ struct AcknowledgmentsView: View {`
`10`	`10`	`)!`
`11`	`11`	`.addingAttribute(.foregroundColor, value: NSColor.labelColor)`
`12`	`12`	`)`
`13`		`- .frame(minWidth: 500, minHeight: 500)`
	`13`	`+ .frame(minWidth: 600, minHeight: 500)`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ struct PlatformsView: View {`
`19`	`19`	`let builds = xcode.sdks?.allBuilds()`
`20`	`20`	`let runtimes = builds?.flatMap { sdkBuild in`
`21`	`21`	`appState.downloadableRuntimes.filter {`
`22`		`- $0.sdkBuildUpdate == sdkBuild`
	`22`	`+ $0.sdkBuildUpdate?.contains(sdkBuild) ?? false`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,9 @@ struct SDKsView: View {`
`18`	`18`	`} else {`
`19`	`19`	`VStack(alignment: .leading) {`
`20`	`20`	`Text("SDKs").font(.headline)`
`21`		`- Text(content).font(.subheadline)`
	`21`	`+ Text(content)`
	`22`	`+ .font(.subheadline)`
	`23`	`+ .textSelection(.enabled)`
`22`	`24`	`}`
`23`	`25`	`}`
`24`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ struct DownloadPreferencePane: View {`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`	`.labelsHidden()`
	`21`	`+ .fixedSize()`
`21`	`22`
`22`	`23`	`AttributedText(dataSourceFootnote)`
`23`	`24`	`}`
`@@ -34,6 +35,7 @@ struct DownloadPreferencePane: View {`
`34`	`35`	`}`
`35`	`36`	`}`
`36`	`37`	`.labelsHidden()`
	`38`	`+ .fixedSize()`
`37`	`39`
`38`	`40`	`AttributedText(downloaderFootnote)`
`39`	`41`	`}`
`@@ -50,7 +52,7 @@ struct DownloadPreferencePane: View {`
`50`	`52`	`string: string,`
`51`	`53`	`attributes: [`
`52`	`54`	`.font: NSFont.preferredFont(forTextStyle: .footnote, options: [:]),`
`53`		`- .foregroundColor: NSColor.labelColor`
	`55`	`+ .foregroundColor: NSColor.secondaryLabelColor`
`54`	`56`	`]`
`55`	`57`	`)`
`56`	`58`	`attributedString.addAttribute(.link, value: URL(string: "https://xcodereleases.com")!, range: NSRange(string.range(of: "Xcode Releases")!, in: string))`
`@@ -63,7 +65,7 @@ struct DownloadPreferencePane: View {`
`63`	`65`	`string: string,`
`64`	`66`	`attributes: [`
`65`	`67`	`.font: NSFont.preferredFont(forTextStyle: .footnote, options: [:]),`
`66`		`- .foregroundColor: NSColor.labelColor`
	`68`	`+ .foregroundColor: NSColor.secondaryLabelColor`
`67`	`69`	`]`
`68`	`70`	`)`
`69`	`71`	`attributedString.addAttribute(.link, value: URL(string: "https://github.com/aria2/aria2")!, range: NSRange(string.range(of: "aria2")!, in: string))`
`@@ -74,9 +76,10 @@ struct DownloadPreferencePane: View {`
`74`	`76`	`struct DownloadPreferencePane_Previews: PreviewProvider {`
`75`	`77`	`static var previews: some View {`
`76`	`78`	`Group {`
`77`		`- GeneralPreferencePane()`
	`79`	`+ DownloadPreferencePane()`
`78`	`80`	`.environmentObject(AppState())`
`79`		`- .frame(maxWidth: 500)`
	`81`	`+ .frame(maxWidth: 600)`
	`82`	`+ .frame(minHeight: 300)`
`80`	`83`	`}`
`81`	`84`	`}`
`82`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@ struct ExperimentsPreferencePane: View {`
`18`	`18`	`.fixedSize(horizontal: false, vertical: true)`
`19`	`19`	`}`
`20`	`20`	`.groupBoxStyle(PreferencesGroupBoxStyle())`
`21`		`-`
`22`		`- Divider()`
`23`	`21`	`}`
`24`	`22`	`}`
`25`	`23`
`@@ -29,7 +27,7 @@ struct ExperimentsPreferencePane: View {`
`29`	`27`	`string: string,`
`30`	`28`	`attributes: [`
`31`	`29`	`.font: NSFont.preferredFont(forTextStyle: .footnote, options: [:]),`
`32`		`- .foregroundColor: NSColor.labelColor`
	`30`	`+ .foregroundColor: NSColor.secondaryLabelColor`
`33`	`31`	`]`
`34`	`32`	`)`
`35`	`33`	`attributedString.addAttribute(.link, value: URL(string: "https://twitter.com/_saagarjha")!, range: NSRange(string.range(of: "@_saagarjha")!, in: string))`
`@@ -43,7 +41,7 @@ struct ExperimentsPreferencePane_Previews: PreviewProvider {`
`43`	`41`	`Group {`
`44`	`42`	`ExperimentsPreferencePane()`
`45`	`43`	`.environmentObject(AppState())`
`46`		`- .frame(maxWidth: 500)`
	`44`	`+ .frame(maxWidth: 600)`
`47`	`45`	`}`
`48`	`46`	`}`
`49`	`47`	`}`