Merge pull request #506 from alladinian/feature/Settings-window-layout

MattKiazyk · web-flow · commit 21e2a10eec32 · 2024-03-08T14:21:56.000-06:00
Improvements in the layout of the Settings window
diff --git a/Xcodes/Frontend/About/AcknowledgementsView.swift b/Xcodes/Frontend/About/AcknowledgementsView.swift
@@ -10,7 +10,7 @@ struct AcknowledgmentsView: View {
             )!
             .addingAttribute(.foregroundColor, value: NSColor.labelColor)
         )
-        .frame(minWidth: 500, minHeight: 500)
+        .frame(minWidth: 600, minHeight: 500)
     }
 }
 
diff --git a/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift b/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift
@@ -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,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
diff --git a/Xcodes/Frontend/Preferences/DownloadPreferencePane.swift b/Xcodes/Frontend/Preferences/DownloadPreferencePane.swift
@@ -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)
         }
     }
 }
diff --git a/Xcodes/Frontend/Preferences/ExperiementsPreferencePane.swift b/Xcodes/Frontend/Preferences/ExperiementsPreferencePane.swift
@@ -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)
         }
     }
 }
diff --git a/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift b/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift
@@ -29,7 +29,7 @@ struct GeneralPreferencePane_Previews: PreviewProvider {
         Group {
             GeneralPreferencePane()
                 .environmentObject(AppState())
-                .frame(maxWidth: 500)
+                .frame(maxWidth: 600)
         }
     }
 }
diff --git a/Xcodes/Frontend/Preferences/PreferencesView.swift b/Xcodes/Frontend/Preferences/PreferencesView.swift
@@ -39,6 +39,6 @@ struct PreferencesView: View {
                 .tag(Tabs.experiment)
         }
         .padding(20)
-        .frame(width: 500)
+        .frame(width: 600)
     }
 }
diff --git a/Xcodes/Frontend/Preferences/UpdatesPreferencePane.swift b/Xcodes/Frontend/Preferences/UpdatesPreferencePane.swift
@@ -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)
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ struct AcknowledgmentsView: View {`
`10`	`10`	`)!`
`11`	`11`	`.addingAttribute(.foregroundColor, value: NSColor.labelColor)`
`12`	`12`	`)`
`13`		`- .frame(minWidth: 500, minHeight: 500)`
	`13`	`+ .frame(minWidth: 600, minHeight: 500)`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ struct DownloadPreferencePane: View {`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`	`.labelsHidden()`
	`21`	`+ .fixedSize()`
`21`	`22`
`22`	`23`	`AttributedText(dataSourceFootnote)`
`23`	`24`	`}`
`@@ -34,6 +35,7 @@ struct DownloadPreferencePane: View {`
`34`	`35`	`}`
`35`	`36`	`}`
`36`	`37`	`.labelsHidden()`
	`38`	`+ .fixedSize()`
`37`	`39`
`38`	`40`	`AttributedText(downloaderFootnote)`
`39`	`41`	`}`
`@@ -50,7 +52,7 @@ struct DownloadPreferencePane: View {`
`50`	`52`	`string: string,`
`51`	`53`	`attributes: [`
`52`	`54`	`.font: NSFont.preferredFont(forTextStyle: .footnote, options: [:]),`
`53`		`- .foregroundColor: NSColor.labelColor`
	`55`	`+ .foregroundColor: NSColor.secondaryLabelColor`
`54`	`56`	`]`
`55`	`57`	`)`
`56`	`58`	`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 {`
`63`	`65`	`string: string,`
`64`	`66`	`attributes: [`
`65`	`67`	`.font: NSFont.preferredFont(forTextStyle: .footnote, options: [:]),`
`66`		`- .foregroundColor: NSColor.labelColor`
	`68`	`+ .foregroundColor: NSColor.secondaryLabelColor`
`67`	`69`	`]`
`68`	`70`	`)`
`69`	`71`	`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 {`
`74`	`76`	`struct DownloadPreferencePane_Previews: PreviewProvider {`
`75`	`77`	`static var previews: some View {`
`76`	`78`	`Group {`
`77`		`- GeneralPreferencePane()`
	`79`	`+ DownloadPreferencePane()`
`78`	`80`	`.environmentObject(AppState())`
`79`		`- .frame(maxWidth: 500)`
	`81`	`+ .frame(maxWidth: 600)`
	`82`	`+ .frame(minHeight: 300)`
`80`	`83`	`}`
`81`	`84`	`}`
`82`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@ struct ExperimentsPreferencePane: View {`
`18`	`18`	`.fixedSize(horizontal: false, vertical: true)`
`19`	`19`	`}`
`20`	`20`	`.groupBoxStyle(PreferencesGroupBoxStyle())`
`21`		`-`
`22`		`- Divider()`
`23`	`21`	`}`
`24`	`22`	`}`
`25`	`23`
`@@ -29,7 +27,7 @@ struct ExperimentsPreferencePane: View {`
`29`	`27`	`string: string,`
`30`	`28`	`attributes: [`
`31`	`29`	`.font: NSFont.preferredFont(forTextStyle: .footnote, options: [:]),`
`32`		`- .foregroundColor: NSColor.labelColor`
	`30`	`+ .foregroundColor: NSColor.secondaryLabelColor`
`33`	`31`	`]`
`34`	`32`	`)`
`35`	`33`	`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 {`
`43`	`41`	`Group {`
`44`	`42`	`ExperimentsPreferencePane()`
`45`	`43`	`.environmentObject(AppState())`
`46`		`- .frame(maxWidth: 500)`
	`44`	`+ .frame(maxWidth: 600)`
`47`	`45`	`}`
`48`	`46`	`}`
`49`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ struct GeneralPreferencePane_Previews: PreviewProvider {`
`29`	`29`	`Group {`
`30`	`30`	`GeneralPreferencePane()`
`31`	`31`	`.environmentObject(AppState())`
`32`		`- .frame(maxWidth: 500)`
	`32`	`+ .frame(maxWidth: 600)`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,6 @@ struct PreferencesView: View {`
`39`	`39`	`.tag(Tabs.experiment)`
`40`	`40`	`}`
`41`	`41`	`.padding(20)`
`42`		`- .frame(width: 500)`
	`42`	`+ .frame(width: 600)`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,11 @@ struct UpdatesPreferencePane: View {`
`43`	`43`	`Button("CheckNow") {`
`44`	`44`	`updater.checkForUpdates()`
`45`	`45`	`}`
	`46`	`+ .padding(.top)`
`46`	`47`
`47`	`48`	`Text(String(format: localizeString("LastChecked"), lastUpdatedString))`
`48`	`49`	`.font(.footnote)`
	`50`	`+ .foregroundStyle(.secondary)`
`49`	`51`	`}`
`50`	`52`	`.frame(maxWidth: .infinity, alignment: .leading)`
`51`	`53`	`}`
`@@ -140,7 +142,9 @@ struct UpdatesPreferencePane_Previews: PreviewProvider {`
`140`	`142`	`Group {`
`141`	`143`	`UpdatesPreferencePane()`
`142`	`144`	`.environmentObject(AppState())`
`143`		`- .frame(maxWidth: 500)`
	`145`	`+ .environmentObject(ObservableUpdater())`
	`146`	`+ .frame(maxWidth: 600)`
	`147`	`+ .frame(minHeight: 300)`
`144`	`148`	`}`
`145`	`149`	`}`
`146`	`150`	`}`