Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Xcodes/Frontend/Common/NavigationSplitViewWrapper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ struct NavigationSplitViewWrapper<Sidebar, Detail>: View where Sidebar: View, De

if #available(macOS 14, *) {
sidebar
.navigationSplitViewColumnWidth(min: 250, ideal: 300)
.navigationSplitViewColumnWidth(min: 290, ideal: 290)
} else {
sidebar
}
Expand All @@ -39,7 +39,7 @@ struct NavigationSplitViewWrapper<Sidebar, Detail>: View where Sidebar: View, De
NavigationView {
// The first column is the sidebar.
sidebar
.frame(minWidth: 250)
.frame(minWidth: 300)
detail
}
.navigationViewStyle(.columns)
Expand Down
2 changes: 1 addition & 1 deletion Xcodes/Frontend/MainWindow.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ struct MainWindow: View {
@AppStorage("isShowingInfoPane") private var isShowingInfoPane = false
@AppStorage("xcodeListCategory") private var category: XcodeListCategory = .all
@AppStorage("isInstalledOnly") private var isInstalledOnly = false

var body: some View {
NavigationSplitViewWrapper {
XcodeListView(selectedXcodeID: $selectedXcodeID, searchText: searchText, category: category, isInstalledOnly: isInstalledOnly)
Expand Down
12 changes: 5 additions & 7 deletions Xcodes/Frontend/XcodeList/MainToolbar.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,24 @@ struct MainToolbarModifier: ViewModifier {
@Binding var category: XcodeListCategory
@Binding var isInstalledOnly: Bool
@Binding var isShowingInfoPane: Bool

func body(content: Content) -> some View {
content
.toolbar { toolbar }
}

private var toolbar: some ToolbarContent {
ToolbarItemGroup {

ProgressButton(
isInProgress: appState.isUpdating,
isInProgress: appState.isUpdating,
action: appState.update
) {
Label("Refresh", systemImage: "arrow.clockwise")
}
.keyboardShortcut(KeyEquivalent("r"))
.help("RefreshDescription")
Spacer()

Button(action: {
switch category {
case .all: category = .release
Expand Down Expand Up @@ -56,7 +56,7 @@ struct MainToolbarModifier: ViewModifier {
}
}
.help("FilterAvailableDescription")

Button(action: {
isInstalledOnly.toggle()
}) {
Expand All @@ -65,11 +65,9 @@ struct MainToolbarModifier: ViewModifier {
.foregroundColor(.accentColor)
} else {
Label("Filter", systemImage: "arrow.down.app")

}
}
.help("FilterInstalledDescription")

}
}
}
Expand All @@ -80,7 +78,7 @@ extension View {
isInstalledOnly: Binding<Bool>,
isShowingInfoPane: Binding<Bool>
) -> some View {
self.modifier(
modifier(
MainToolbarModifier(
category: category,
isInstalledOnly: isInstalledOnly,
Expand Down
25 changes: 14 additions & 11 deletions Xcodes/Frontend/XcodeList/XcodeListView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ struct XcodeListView: View {
.listStyle(.sidebar)
.safeAreaInset(edge: .bottom, spacing: 0) {
PlatformsPocket()
.padding()
.padding(.horizontal)
.padding(.vertical, 8)
}
}
}
Expand All @@ -54,19 +55,21 @@ struct PlatformsPocket: View {
@SwiftUI.Environment(\.openWindow) private var openWindow

var body: some View {
Button(action: {
openWindow(id: "platforms") }
Button(action: {
openWindow(id: "platforms")
}
) {
VStack(spacing: 5) {
HStack(spacing: 5) {
Image(systemName: "square.3.layers.3d")
.font(.title)
Text("Platforms")
.font(.callout)
.font(.title3.weight(.medium))
Text("PlatformsDescription")
}
.frame(width: 70, height: 70)
.background(.quaternary)
.clipShape(RoundedRectangle(cornerRadius: 5, style: .continuous))

.font(.body.weight(.medium))
.padding(.horizontal)
.padding(.vertical, 12)
.frame(maxWidth: .infinity, alignment: .leading)
.background(.quaternary.opacity(0.75))
.clipShape(RoundedRectangle(cornerRadius: 8, style: .continuous))
}
.buttonStyle(.plain)
}
Expand Down
9 changes: 4 additions & 5 deletions Xcodes/Frontend/XcodeList/XcodeListViewRow.swift
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ struct XcodeListViewRow: View {
Text(verbatim: path.string)
.font(.caption)
.foregroundColor(.secondary)
} else {
Text(verbatim: "")
.font(.caption)
}
}

Expand All @@ -42,6 +39,7 @@ struct XcodeListViewRow: View {
.padding(.trailing, 16)
installControl(for: xcode)
}
.padding(.vertical, 4)
.contextMenu {
switch xcode.installState {
case .notInstalled:
Expand Down Expand Up @@ -75,9 +73,10 @@ struct XcodeListViewRow: View {
if let icon = xcode.icon {
Image(nsImage: icon)
} else {
Color.clear
Image(xcode.version.isPrerelease ? "xcode-beta" : "xcode")
.resizable()
.frame(width: 32, height: 32)
.foregroundColor(.secondary)
.opacity(0.2)
}
}

Expand Down
12 changes: 12 additions & 0 deletions Xcodes/Resources/Assets.xcassets/xcode-beta.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "Image.png",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions Xcodes/Resources/Assets.xcassets/xcode.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "xcode.png",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions Xcodes/Resources/Localizable.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -14462,6 +14462,16 @@
}
}
},
"PlatformsDescription" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Installed Platforms"
}
}
}
},
"PlatformsList.Title" : {
"extractionState" : "manual",
"localizations" : {
Expand Down