Adding a second collection for Games

Author: AdamJ

CollectSomeMore.xctestplan

@@ -0,0 +1,26 @@
+{
+  "configurations" : [
+    {
+      "id" : "D3EAEF66-157F-4240-ACC9-D38E55C1CD83",
+      "name" : "Test Scheme Action",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "codeCoverage" : false,
+    "distributor" : "com.apple.TestFlight",
+    "language" : "en",
+    "region" : "US",
+    "targetForVariableExpansion" : {
+      "containerPath" : "container:GamesAndThings.xcodeproj",
+      "identifier" : "8DEC3A8E2C13D0C0004D57B7",
+      "name" : "CollectSomeMore"
+    }
+  },
+  "testTargets" : [
+
+  ],
+  "version" : 1
+}

CollectSomeMore/CollectSomeMoreApp.swift

@@ -8,26 +8,74 @@
 import SwiftUI
 import SwiftData
 
+@MainActor
+class GameData {
+    private(set) static var shared: GameData?
+    let modelContainer: ModelContainer
+
+    var context: ModelContext {
+        modelContainer.mainContext
+    }
+
+    init(modelContainer: ModelContainer) {
+        self.modelContainer = modelContainer
+        insertCollectionData(modelContext: context)
+        GameData.shared = self // Set the shared instance here
+    }
+
+    private init() { // Make the default init unavailable
+        fatalError("Use init(modelContainer:) instead")
+    }
+
+    func insertCollectionData(modelContext: ModelContext) {
+        // Check if any data already exists
+        let existingCollections = try? modelContext.fetch(FetchDescriptor<GameCollection>())
+
+        if let existingCollections = existingCollections, existingCollections.isEmpty {
+            // Insert sample data only if the database is empty
+            for collection in GameCollection.sampleGameCollectionData {
+                modelContext.insert(collection)
+            }
+
+            do {
+                try modelContext.save()
+                print("Sample data inserted successfully.")
+            } catch {
+                print("Sample data context failed to save: \(error)")
+            }
+        } else {
+            print("Sample data already exists. No need to insert.")
+        }
+    }
+
+    var collection: GameCollection {
+        GameCollection.sampleGameCollectionData[0]
+    }
+}
+
 @main
 struct GamesAndThings: App {
-    var sharedModelContainer: ModelContainer = {
+    let container: ModelContainer = {
         let schema = Schema([
-            Collection.self,
+            MovieCollection.self,
+            GameCollection.self
         ])
         let modelConfiguration = ModelConfiguration(schema: schema, isStoredInMemoryOnly: false)
-
         do {
             return try ModelContainer(for: schema, configurations: [modelConfiguration])
         } catch {
-            print("Error creating ModelContainer: \(error.localizedDescription)")
             fatalError("Could not create ModelContainer: \(error)")
         }
     }()
 
+    init() {
+        _ = GameData(modelContainer: container) // Initialize GameData and set shared
+    }
+
     var body: some Scene {
         WindowGroup {
             ContentView()
+                .environment(\.modelContext, container.mainContext)
         }
-        .modelContainer(sharedModelContainer)
     }
 }

CollectSomeMore/ContentView.swift

@@ -40,9 +40,7 @@ struct Constants {
 
 struct ContentView: View {
     @Environment(\.modelContext) private var modelContext
-    @Query(sort: \Collection.movieTitle) private var collections: [Collection]
-
-    @State private var newCollection: Collection?
+    
     @State private var searchText = ""
 
     var body: some View {
@@ -54,24 +52,26 @@ struct ContentView: View {
                             .labelStyle(.iconOnly)
                     }
                     .background(Gradient(colors: darkBottom))
-                MovieList(collection: CollectionData.shared.collection)
+                MovieList() // Removed passing movieCollection
                     .tabItem {
                         Label("Movies", systemImage: "books.vertical")
                             .labelStyle(.iconOnly)
                     }
-//                    .background(Gradient(colors: transparentGradient))
+                GameListView() // Removed passing gameCollection
+                    .tabItem {
+                        Label("Games", systemImage: "gamecontroller")
+                            .labelStyle(.iconOnly)
+                    }
                 SearchView()
                     .tabItem {
                         Label("Search", systemImage: "magnifyingglass")
                             .labelStyle(.iconOnly)
                     }
-//                    .background(Gradient(colors: transparentGradient))
                 AboutView()
                     .tabItem {
-                        Label("About", systemImage: "info.circle")
+                        Label("About", systemImage: "info")
                             .labelStyle(.iconOnly)
                     }
-//                    .background(Gradient(colors: darkBottom))
             }
             .toolbarBackground(.tabBar, for: .tabBar)
             .toolbarBackground(.visible, for: .tabBar)
@@ -83,6 +83,6 @@ struct ContentView: View {
 #Preview("Content View") {
     ContentView()
         .navigationTitle("Welcome to Game and Things")
-        .modelContainer(CollectionData.shared.modelContainer)
+        .modelContainer(MovieData.shared.modelContainer)
         .frame(maxHeight: .infinity)
 }

CollectSomeMore/CustomFonts.swift

@@ -6,7 +6,6 @@
 //  Copyright © 2025 AdamJolicoeur. All rights reserved.
 //
 
-import SwiftUICore
 import SwiftUI
 
 extension View {

CollectSomeMore/Data/GameData.swift

@@ -0,0 +1,82 @@
+//
+//  GameData.swift
+//  GamesAndThings
+//
+//  Created by Adam Jolicoeur on 3/26/25.
+//  Copyright © 2025 AdamJolicoeur. All rights reserved.
+//
+
+//import Foundation
+//import SwiftData
+//
+//@MainActor
+//class GameData {
+//    static let shared = GameData()
+//    
+//    let modelContainer: ModelContainer
+//    
+//    var context: ModelContext {
+//        modelContainer.mainContext
+//    }
+//    
+//    private init() {
+//        let schema = Schema([
+//            GameCollection.self,
+//            MovieCollection.self,
+//        ])
+//        let modelConfiguration = ModelConfiguration(schema: schema, isStoredInMemoryOnly: false)
+//        
+//        do {
+//            modelContainer = try ModelContainer(for: schema, configurations: [modelConfiguration])
+//            
+//            insertCollectionData(modelContext: ModelContext.init(modelContainer))
+//        } catch {
+//            fatalError("Could not create ModelContainer: \(error)")
+//        }
+//    }
+//import Foundation
+//import SwiftData
+//
+//@MainActor
+//class GameData {
+//    static let shared: GameData // Will be initialized in the App struct
+//    let modelContainer: ModelContainer
+//
+//    var context: ModelContext {
+//        modelContainer.mainContext
+//    }
+//
+//    init(modelContainer: ModelContainer) {
+//        self.modelContainer = modelContainer
+//        insertCollectionData(modelContext: context)
+//    }
+//
+//    private init() { // Make the default init unavailable
+//        fatalError("Use init(modelContainer:) instead")
+//    }
+//
+//    func insertCollectionData(modelContext: ModelContext) {
+//        // Check if any data already exists
+//        let existingCollections = try? modelContext.fetch(FetchDescriptor<GameCollection>())
+//
+//        if let existingCollections = existingCollections, existingCollections.isEmpty {
+//            // Insert sample data only if the database is empty
+//            for collection in GameCollection.sampleGameCollectionData {
+//                modelContext.insert(collection)
+//            }
+//
+//            do {
+//                try modelContext.save()
+//                print("Sample data inserted successfully.")
+//            } catch {
+//                print("Sample data context failed to save: \(error)")
+//            }
+//        } else {
+//            print("Sample data already exists. No need to insert.")
+//        }
+//    }
+//
+//    var collection: GameCollection {
+//        GameCollection.sampleGameCollectionData[0]
+//    }
+//}

CollectSomeMore/Movie/MovieData.swift renamed to CollectSomeMore/Data/MovieData.swift

@@ -9,8 +9,8 @@ import Foundation
 import SwiftData
 
 @MainActor
-class CollectionData {
-    static let shared = CollectionData()
+class MovieData {
+    static let shared = MovieData()
 
     let modelContainer: ModelContainer
 
@@ -20,7 +20,8 @@ class CollectionData {
 
     private init() {
         let schema = Schema([
-            Collection.self,
+            MovieCollection.self,
+            GameCollection.self,
         ])
         let modelConfiguration = ModelConfiguration(schema: schema, isStoredInMemoryOnly: false)
 
@@ -35,11 +36,11 @@ class CollectionData {
 
     func insertCollectionData(modelContext: ModelContext) {
         // Check if any data already exists
-        let existingCollections = try? modelContext.fetch(FetchDescriptor<Collection>())
+        let existingCollections = try? modelContext.fetch(FetchDescriptor<MovieCollection>())
 
         if let existingCollections = existingCollections, existingCollections.isEmpty {
             // Insert sample data only if the database is empty
-            for collection in Collection.sampleData {
+            for collection in MovieCollection.sampleCollectionData {
                 modelContext.insert(collection)
             }
 
@@ -54,7 +55,7 @@ class CollectionData {
         }
     }
 
-    var collection: Collection {
-        Collection.sampleData[0]
+    var collection: MovieCollection {
+        MovieCollection.sampleCollectionData[0]
     }
 }