Merge branch 'main' into main

Author: huihuisang

Xcodes/Frontend/Common/NavigationSplitViewWrapper.swift

@@ -26,18 +26,20 @@ struct NavigationSplitViewWrapper<Sidebar, Detail>: View where Sidebar: View, De
 
                 if #available(macOS 14, *) {
                     sidebar
-                        .toolbar(removing: .sidebarToggle)
+                        .navigationSplitViewColumnWidth(min: 250, ideal: 300)
                 } else {
                     sidebar
                 }
             } detail: {
                 detail
             }
+            .navigationSplitViewStyle(.balanced)
         } else {
             // Alternative code for earlier versions of OS.
             NavigationView {
                 // The first column is the sidebar.
                 sidebar
+                    .frame(minWidth: 250)
                 detail
             }
             .navigationViewStyle(.columns)

Xcodes/Frontend/InfoPane/CornerRadiusModifier.swift

@@ -29,7 +29,7 @@ extension View {
 struct Previews_CornerRadius_Previews: PreviewProvider {
     static var previews: some View {
         HStack {
-        Text("XCODES RULES!")
+            Text(verbatim: "XCODES RULES!")
         }.xcodesBackground()
     }
 }

Xcodes/Frontend/InfoPane/IdenticalBuildView.swift

@@ -29,7 +29,7 @@ struct IdenticalBuildsView: View {
                 .font(.headline)
 
                 ForEach(builds, id: \.description) { version in
-                    Text("• \(version.appleDescription)")
+                    Text(verbatim: "• \(version.appleDescription)")
                         .font(.subheadline)
                 }
             }

Xcodes/Frontend/MainWindow.swift

@@ -20,7 +20,6 @@ struct MainWindow: View {
     var body: some View {
         NavigationSplitViewWrapper {
             XcodeListView(selectedXcodeID: $selectedXcodeID, searchText: searchText, category: category, isInstalledOnly: isInstalledOnly)
-                .frame(minWidth: 260)
                 .layoutPriority(1)
                 .alert(item: $appState.xcodeBeingConfirmedForUninstallation) { xcode in
                     Alert(title: Text(String(format: localizeString("Alert.Uninstall.Title"), xcode.description)),

Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift

@@ -80,12 +80,14 @@ struct AdvancedPreferencePane: View {
 
             GroupBox(label: Text("Active/Select")) {
                 VStack(alignment: .leading) {
-                    Picker("OnSelect", selection: $appState.onSelectActionType) {
+                    Picker(selection: $appState.onSelectActionType) {
 
                         Text(SelectedActionType.none.description)
                             .tag(SelectedActionType.none)
                         Text(SelectedActionType.rename.description)
                             .tag(SelectedActionType.rename)
+                    } label: {
+                        Text(verbatim: "OnSelect")
                     }
                     .labelsHidden()
                     .pickerStyle(.inline)

Xcodes/Frontend/SignIn/SignInCredentialsView.swift

@@ -13,7 +13,9 @@ struct SignInCredentialsView: View {
             HStack {
                 Text("AppleID")
                     .frame(minWidth: 100, alignment: .trailing)
-                TextField("example@icloud.com", text: $username)
+                TextField(text: $username) {
+                    Text(verbatim: "example@icloud.com")
+                }
             }
             HStack {
                 Text("Password")

Xcodes/Frontend/View+IsHidden.swift

@@ -14,10 +14,10 @@ extension View {
 struct View_IsHidden_Previews: PreviewProvider {
     static var previews: some View {
         Group {
-            Text("Not Hidden")
+            Text(verbatim: "Not Hidden")
                 .isHidden(false)
 
-            Text("Hidden")
+            Text(verbatim: "Hidden")
                 .isHidden(true)
         }
     }

Xcodes/Frontend/XcodeList/AppStoreButtonStyle.swift

@@ -97,33 +97,45 @@ struct AppStoreButtonStyle_Previews: PreviewProvider {
         Group {
             ForEach([ColorScheme.light, .dark], id: \.self) { colorScheme in
                 Group {
-                    Button("OPEN", action: {})
+                    Button{ } label: {
+                        Text(verbatim: "OPEN")
+                    }
                         .buttonStyle(AppStoreButtonStyle(primary: true, highlighted: false))
                         .padding()
                         .background(Color(.textBackgroundColor))
                         .previewDisplayName("Primary")
-                    Button("OPEN", action: {})
+                    Button{ } label: {
+                        Text(verbatim: "OPEN")
+                    }
                         .buttonStyle(AppStoreButtonStyle(primary: true, highlighted: true))
                         .padding()
                         .background(Color(.controlAccentColor))
                         .previewDisplayName("Primary, Highlighted")
-                    Button("OPEN", action: {})
+                    Button{ } label: {
+                        Text(verbatim: "OPEN")
+                    }
                         .buttonStyle(AppStoreButtonStyle(primary: true, highlighted: false))
                         .padding()
                         .disabled(true)
                         .background(Color(.textBackgroundColor))
                         .previewDisplayName("Primary, Disabled")
-                    Button("INSTALL", action: {})
+                    Button{ } label: {
+                        Text(verbatim: "INSTALL")
+                    }
                         .buttonStyle(AppStoreButtonStyle(primary: false, highlighted: false))
                         .padding()
                         .background(Color(.textBackgroundColor))
                         .previewDisplayName("Secondary")
-                    Button("INSTALL", action: {})
+                    Button{ } label: {
+                        Text(verbatim: "INSTALL")
+                    }
                         .buttonStyle(AppStoreButtonStyle(primary: false, highlighted: true))
                         .padding()
                         .background(Color(.controlAccentColor))
                         .previewDisplayName("Secondary, Highlighted")
-                    Button("INSTALL", action: {})
+                    Button{ } label: {
+                        Text(verbatim: "INSTALL")
+                    }
                         .buttonStyle(AppStoreButtonStyle(primary: false, highlighted: false))
                         .padding()
                         .disabled(true)