diff --git a/Shared/Preferences/PreferencesView.swift b/Shared/Preferences/PreferencesView.swift index 5af0a5e..8a8f9ee 100644 --- a/Shared/Preferences/PreferencesView.swift +++ b/Shared/Preferences/PreferencesView.swift @@ -1,32 +1,29 @@ import SwiftUI struct PreferencesView: View { @State private var appearance: Int = 0 var body: some View { #if os(iOS) Picker(selection: $appearance, label: Text("Appearance")) { Text("System").tag(0) Text("Light Mode").tag(1) Text("Dark Mode").tag(2) } .pickerStyle(SegmentedPickerStyle()) #elseif os(macOS) - Form { - Picker(selection: $appearance, label: Text("Appearance")) { - Text("System").tag(0) - Text("Light Mode").tag(1) - Text("Dark Mode").tag(2) - } - .frame(width: 200, height: 100, alignment: .topLeading) - .pickerStyle(RadioGroupPickerStyle()) + Picker(selection: $appearance, label: EmptyView()) { + Text("System").tag(0) + Text("Light Mode").tag(1) + Text("Dark Mode").tag(2) } + .pickerStyle(RadioGroupPickerStyle()) #endif } } struct SwiftUIView_Previews: PreviewProvider { static var previews: some View { PreferencesView() } } diff --git a/macOS/Settings/SettingsView.swift b/macOS/Settings/SettingsView.swift index f330196..b60095a 100644 --- a/macOS/Settings/SettingsView.swift +++ b/macOS/Settings/SettingsView.swift @@ -1,34 +1,43 @@ import SwiftUI struct SettingsView: View { @State var selectedView = 0 var body: some View { TabView(selection: $selectedView) { - AccountView() - .tabItem { - Image(systemName: "person.crop.circle") - Text("Account") + Form { + Section(header: Text("Log in to your account")) { + AccountView() } - .tag(0) - PreferencesView() - .tabItem { - Image(systemName: "gear") - Text("Preferences") + } + .tabItem { + Image(systemName: "person.crop.circle") + Text("Account") + } + .tag(0) + Form { + Section(header: Text("Appearance")) { + PreferencesView() + Spacer() } - .tag(1) + } + .tabItem { + Image(systemName: "gear") + Text("Preferences") + } + .tag(1) } } } struct SettingsView_AccountTabPreviews: PreviewProvider { static var previews: some View { SettingsView(selectedView: 0) } } struct SettingsView_PreferencesTabPreviews: PreviewProvider { static var previews: some View { SettingsView(selectedView: 1) } }