From 5f474ca9cdcbbc491a160a04c94aa0202228911e Mon Sep 17 00:00:00 2001 From: oliverhnat Date: Fri, 23 Feb 2024 14:17:35 +0100 Subject: [PATCH] Add environment object to all views and delete unused code from MainView --- WordAX/AnkiView.swift | 2 ++ WordAX/MainView.swift | 4 ++-- WordAX/SettingsView.swift | 1 + WordAX/WordAXApp.swift | 4 +++- WordAX/WordAXModelView.swift | 6 ++++++ 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/WordAX/AnkiView.swift b/WordAX/AnkiView.swift index d784c6e..3d3772e 100644 --- a/WordAX/AnkiView.swift +++ b/WordAX/AnkiView.swift @@ -8,6 +8,7 @@ import SwiftUI struct AnkiView: View { + @EnvironmentObject var model: WordAXModelView var body: some View { Text("This is Anki View") } @@ -15,4 +16,5 @@ struct AnkiView: View { #Preview { AnkiView() + .environmentObject(WordAXModelView()) } diff --git a/WordAX/MainView.swift b/WordAX/MainView.swift index eae77ba..f70e448 100644 --- a/WordAX/MainView.swift +++ b/WordAX/MainView.swift @@ -29,9 +29,8 @@ struct MainView: View { Text("Settings") } } - .toolbar(.visible, for: .tabBar) - .toolbarBackground(Color.yellow, for: .tabBar) } + } } @@ -39,4 +38,5 @@ struct MainView: View { #Preview { MainView() + .environmentObject(WordAXModelView()) } diff --git a/WordAX/SettingsView.swift b/WordAX/SettingsView.swift index 1d26cd3..a2f82f3 100644 --- a/WordAX/SettingsView.swift +++ b/WordAX/SettingsView.swift @@ -15,4 +15,5 @@ struct SettingsView: View { #Preview { SettingsView() + .environmentObject(WordAXModelView()) } diff --git a/WordAX/WordAXApp.swift b/WordAX/WordAXApp.swift index 14002ce..da4c172 100644 --- a/WordAX/WordAXApp.swift +++ b/WordAX/WordAXApp.swift @@ -9,9 +9,11 @@ import SwiftUI @main struct WordAXApp: App { + @StateObject var model = WordAXModelView() var body: some Scene { WindowGroup { - ContentView() + MainView() + .environmentObject(model) } } } diff --git a/WordAX/WordAXModelView.swift b/WordAX/WordAXModelView.swift index 972e181..ebb0ca9 100644 --- a/WordAX/WordAXModelView.swift +++ b/WordAX/WordAXModelView.swift @@ -6,3 +6,9 @@ // import Foundation + +class WordAXModelView: ObservableObject { + init() { + + } +}