Skip to content

Improvements in the layout of the Settings window #506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MattKiazyk merged 2 commits into from
Mar 8, 2024
Merged

Improvements in the layout of the Settings window #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b6088d
Greek language localization
alladinian Feb 19, 2024
b4e598f
Layout adjustments for the Settings window
alladinian Feb 20, 2024
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
2 changes: 1 addition & 1 deletion Xcodes/Frontend/About/AcknowledgementsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ struct AcknowledgmentsView: View {
)!
.addingAttribute(.foregroundColor, value: NSColor.labelColor)
)
.frame(minWidth: 500, minHeight: 500)
.frame(minWidth: 600, minHeight: 500)
}
}

Expand Down
22 changes: 13 additions & 9 deletions Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ struct AdvancedPreferencePane: View {
}
Text("InstallPathDescription")
.font(.footnote)
.foregroundStyle(.secondary)
.fixedSize(horizontal: false, vertical: true)
}
}
Expand Down Expand Up @@ -73,6 +74,7 @@ struct AdvancedPreferencePane: View {
}
Text("LocalCachePathDescription")
.font(.footnote)
.foregroundStyle(.secondary)
.fixedSize(horizontal: false, vertical: true)
}
}
Expand All @@ -94,6 +96,7 @@ struct AdvancedPreferencePane: View {

Text(appState.onSelectActionType.detailedDescription)
.font(.footnote)
.foregroundStyle(.secondary)
.fixedSize(horizontal: false, vertical: true)
Spacer()
.frame(height: 20)
Expand All @@ -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)
Expand All @@ -114,6 +118,7 @@ struct AdvancedPreferencePane: View {
.disabled(appState.createSymLinkOnSelectDisabled)
Text("ShowOpenInRosettaDescription")
.font(.footnote)
.foregroundStyle(.secondary)
.fixedSize(horizontal: false, vertical: true)
}
.groupBoxStyle(PreferencesGroupBoxStyle())
Expand All @@ -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()
Expand All @@ -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
Expand Down
11 changes: 7 additions & 4 deletions Xcodes/Frontend/Preferences/DownloadPreferencePane.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ struct DownloadPreferencePane: View {
}
}
.labelsHidden()
.fixedSize()

AttributedText(dataSourceFootnote)
}
Expand All @@ -34,6 +35,7 @@ struct DownloadPreferencePane: View {
}
}
.labelsHidden()
.fixedSize()

AttributedText(downloaderFootnote)
}
Expand All @@ -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))
Expand All @@ -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))
Expand All @@ -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 changes: 2 additions & 4 deletions Xcodes/Frontend/Preferences/ExperiementsPreferencePane.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ struct ExperimentsPreferencePane: View {
.fixedSize(horizontal: false, vertical: true)
}
.groupBoxStyle(PreferencesGroupBoxStyle())

Divider()
}
}

Expand All @@ -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))
Expand All @@ -43,7 +41,7 @@ struct ExperimentsPreferencePane_Previews: PreviewProvider {
Group {
ExperimentsPreferencePane()
.environmentObject(AppState())
.frame(maxWidth: 500)
.frame(maxWidth: 600)
}
}
}
2 changes: 1 addition & 1 deletion Xcodes/Frontend/Preferences/GeneralPreferencePane.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ struct GeneralPreferencePane_Previews: PreviewProvider {
Group {
GeneralPreferencePane()
.environmentObject(AppState())
.frame(maxWidth: 500)
.frame(maxWidth: 600)
}
}
}
2 changes: 1 addition & 1 deletion Xcodes/Frontend/Preferences/PreferencesView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ struct PreferencesView: View {
.tag(Tabs.experiment)
}
.padding(20)
.frame(width: 500)
.frame(width: 600)
}
}
6 changes: 5 additions & 1 deletion Xcodes/Frontend/Preferences/UpdatesPreferencePane.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -140,7 +142,9 @@ struct UpdatesPreferencePane_Previews: PreviewProvider {
Group {
UpdatesPreferencePane()
.environmentObject(AppState())
.frame(maxWidth: 500)
.environmentObject(ObservableUpdater())
.frame(maxWidth: 600)
.frame(minHeight: 300)
}
}
}
Loading