Merge remote-tracking branch 'refs/remotes/origin/main'

2026-04-28 18:30:09 +00:00 · 2020-12-23 17:17:30 +01:00
parent e814749685 f759ce5f04
commit 1d209aae42
2 changed files with 28 additions and 8 deletions
@@ -14,7 +14,9 @@ struct ContentView: View {
    
    var body: some View {
        Group {
-            if(!settings.isFirstOpening) {
+            if(settings.isFirstOpening) {
+                FirstOpeningSettings()
+            } else {
                TabView(selection: $selection) {
                    HomeView()
                        .tabItem {
@@ -24,9 +26,15 @@ struct ContentView: View {
                            }
                        }
                        .tag(0)
+                    HomeView()
+                        .tabItem {
+                            VStack {
+                                Image(systemName: "gear")
+                                Text("Settings")
+                            }
+                        }
+                        .tag(1)
                }
-            } else {
-                FirstOpeningSettings()
            }
        }
    }
@@ -36,9 +44,17 @@ extension ContentView{
 }

 struct ContentView_Previews: PreviewProvider {
+    
+    static func getFirstOpening() -> LocalSettings {
+        let settings = LocalSettings();
+        settings.isFirstOpening = false;
+        return settings
+    }
+    
    static var previews: some View {
        ContentView()
            .preferredColorScheme(.dark)
-            .environmentObject(LocalSettings())
+            .environmentObject(getFirstOpening())
+            .environment(\.managedObjectContext, PersistenceController.preview.container.viewContext)
    }
 }