diff --git a/Shared/WriteFreely_MultiPlatformApp.swift b/Shared/WriteFreely_MultiPlatformApp.swift index 26834e3..84a24d8 100644 --- a/Shared/WriteFreely_MultiPlatformApp.swift +++ b/Shared/WriteFreely_MultiPlatformApp.swift @@ -1,29 +1,29 @@ import SwiftUI @main struct WriteFreely_MultiPlatformApp: App { @StateObject private var preferences = PreferencesModel() @StateObject private var account = AccountModel() #if DEBUG @StateObject private var store = testPostStore #else @StateObject private var store = PostStore() #endif var body: some Scene { WindowGroup { ContentView(postStore: store, preferences: preferences, account: account) .preferredColorScheme(preferences.preferredColorScheme) } #if os(macOS) Settings { - SettingsView(preferences: preferences) + SettingsView(preferences: preferences, account: account) .frame(minWidth: 300, maxWidth: 300, minHeight: 200, maxHeight: 200) .padding() .preferredColorScheme(preferences.preferredColorScheme) } #endif } } diff --git a/macOS/Settings/SettingsView.swift b/macOS/Settings/SettingsView.swift index b4b9393..83f29e8 100644 --- a/macOS/Settings/SettingsView.swift +++ b/macOS/Settings/SettingsView.swift @@ -1,43 +1,44 @@ import SwiftUI struct SettingsView: View { @ObservedObject var preferences: PreferencesModel + @ObservedObject var account: AccountModel @State var selectedView = 0 var body: some View { TabView(selection: $selectedView) { Form { Section(header: Text("Login Details")) { - AccountView() + AccountView(account: account) } } .tabItem { Image(systemName: "person.crop.circle") Text("Account") } .tag(0) VStack { PreferencesView(preferences: preferences) Spacer() } .tabItem { Image(systemName: "gear") Text("Preferences") } .tag(1) } } } struct SettingsView_AccountTabPreviews: PreviewProvider { static var previews: some View { - SettingsView(preferences: PreferencesModel(), selectedView: 0) + SettingsView(preferences: PreferencesModel(), account: AccountModel(), selectedView: 0) } } struct SettingsView_PreferencesTabPreviews: PreviewProvider { static var previews: some View { - SettingsView(preferences: PreferencesModel(), selectedView: 1) + SettingsView(preferences: PreferencesModel(), account: AccountModel(), selectedView: 1) } }