sjs/gh-XcodesOrg-XcodesApp
1
0
Fork 0
mirror of https://github.com/XcodesOrg/XcodesApp.git synced 2026-03-25 08:55:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add app icon to installed rows

Browse source
This commit is contained in:
Brandon Evans 2020-12-28 07:55:12 -07:00
parent 4d2600f821
commit 1fef255c3d
No known key found for this signature in database
GPG key ID: D58A4B8DB64F8E93
3 changed files with 41 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Xcodes/Backend/AppState.swift
View file

@ -236,7 +236,8 @@ class AppState: ObservableObject {
version: xcodeVersion,
installState: installedXcodes.contains(where: { xcodeVersion.isEquivalentForDeterminingIfInstalled(toInstalled: $0.version) }) ? .installed : .notInstalled,
selected: false,
path: installedXcode?.path.string
path: installedXcode?.path.string,
icon: (installedXcode?.path.string).map(NSWorkspace.shared.icon(forFile:))
)
}
}

2
Xcodes/Backend/Xcode.swift
View file

@ -1,3 +1,4 @@
import AppKit
import Foundation
import Version
@ -6,6 +7,7 @@ struct Xcode: Identifiable, CustomStringConvertible {
let installState: XcodeInstallState
let selected: Bool
let path: String?
let icon: NSImage?
var id: Version { version }
var installed: Bool { installState == .installed }

57
Xcodes/Frontend/XcodeList/XcodeListView.swift
View file

@ -41,25 +41,31 @@ struct XcodeListView: View {
var body: some View {
List(visibleXcodes, selection: $appState.selectedXcodeID) { xcode in
VStack(alignment: .leading) {
HStack {
HStack {
appIconView(for: xcode)
VStack(alignment: .leading) {
Text(xcode.description)
.font(.body)
if xcode.selected {
Tag(text: "SELECTED")
.foregroundColor(.green)
}
Spacer()
Button(xcode.installed ? "INSTALLED" : "INSTALL") {
print("Installing...")
}
.buttonStyle(AppStoreButtonStyle(installed: xcode.installed,
highlighted: appState.selectedXcodeID == xcode.id))
.disabled(xcode.installed)
Text(verbatim: xcode.path ?? "")
.font(.caption)
.foregroundColor(appState.selectedXcodeID == xcode.id ? Color(NSColor.selectedMenuItemTextColor) : Color(NSColor.secondaryLabelColor))
}
Text(verbatim: xcode.path ?? "")
.font(.caption)
.foregroundColor(appState.selectedXcodeID == xcode.id ? Color(NSColor.selectedMenuItemTextColor) : Color(NSColor.secondaryLabelColor))
if xcode.selected {
Tag(text: "SELECTED")
.foregroundColor(.green)
}
Spacer()
Button(xcode.installed ? "INSTALLED" : "INSTALL") {
print("Installing...")
}
.buttonStyle(AppStoreButtonStyle(installed: xcode.installed,
highlighted: appState.selectedXcodeID == xcode.id))
.disabled(xcode.installed)
}
.contextMenu {
InstallButton(xcode: xcode)
@ -143,6 +149,17 @@ struct XcodeListView: View {
return Text("")
}
}
@ViewBuilder
func appIconView(for xcode: Xcode) -> some View {
if let icon = xcode.icon {
Image(nsImage: icon)
} else {
Color.clear
.frame(width: 32, height: 32)
.foregroundColor(.secondary)
}
}
}
struct XcodeListView_Previews: PreviewProvider {
@ -152,10 +169,10 @@ struct XcodeListView_Previews: PreviewProvider {
.environmentObject({ () -> AppState in
let a = AppState()
a.allXcodes = [
Xcode(version: Version("12.3.0")!, installState: .installed, selected: true, path: nil),
Xcode(version: Version("12.2.0")!, installState: .notInstalled, selected: false, path: nil),
Xcode(version: Version("12.1.0")!, installState: .notInstalled, selected: false, path: nil),
Xcode(version: Version("12.0.0")!, installState: .installed, selected: false, path: nil),
Xcode(version: Version("12.3.0")!, installState: .installed, selected: true, path: nil, icon: nil),
Xcode(version: Version("12.2.0")!, installState: .notInstalled, selected: false, path: nil, icon: nil),
Xcode(version: Version("12.1.0")!, installState: .notInstalled, selected: false, path: nil, icon: nil),
Xcode(version: Version("12.0.0")!, installState: .installed, selected: false, path: nil, icon: nil),
]
return a
}())