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

Layout adjustments for the Settings window

Browse source
This commit is contained in:
Vasilis Akoinoglou 2024-02-20 13:14:20 +02:00
parent 6b6088d58d
commit b4e598fc49
7 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Xcodes/Frontend/About/AcknowledgementsView.swift
View file

@ -10,7 +10,7 @@ struct AcknowledgmentsView: View {
)!
.addingAttribute(.foregroundColor, value: NSColor.labelColor)
)
.frame(minWidth: 500, minHeight: 500)
.frame(minWidth: 600, minHeight: 500)
}
}

22
Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift
View file

@ -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,9 +160,9 @@ 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)
}
}
@ -163,11 +170,8 @@ struct AdvancedPreferencePane_Previews: PreviewProvider {
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

11
Xcodes/Frontend/Preferences/DownloadPreferencePane.swift
View file

@ -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)
}
}
}

6
Xcodes/Frontend/Preferences/ExperiementsPreferencePane.swift
View file

@ -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)
}
}
}

2
Xcodes/Frontend/Preferences/GeneralPreferencePane.swift
View file

@ -29,7 +29,7 @@ struct GeneralPreferencePane_Previews: PreviewProvider {
Group {
GeneralPreferencePane()
.environmentObject(AppState())
.frame(maxWidth: 500)
.frame(maxWidth: 600)
}
}
}

2
Xcodes/Frontend/Preferences/PreferencesView.swift
View file

@ -39,6 +39,6 @@ struct PreferencesView: View {
.tag(Tabs.experiment)
}
.padding(20)
.frame(width: 500)
.frame(width: 600)
}
}

6
Xcodes/Frontend/Preferences/UpdatesPreferencePane.swift
View file

@ -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)
}
}
}