Refactor LibraryIconView

6 files changed, 63 insertions, 41 deletions

diff --git a/Jel/Controllers/DatamodelController.swift b/Jel/Controllers/DatamodelController.swift
deleted file mode 100644
index 4beb173..0000000
--- a/Jel/Controllers/DatamodelController.swift
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-//  DatamodelController.swift
-//  Jel
-//
-//  Created by zerocool on 12/11/23.
-//
-
-import CoreData
-
-struct DatamodelController {
-  static let shared = DatamodelController()
-  
-  let container: NSPersistentContainer
-  
-  init() {
-    container = NSPersistentContainer(name: "Model")
-    
-    container.loadPersistentStores(completionHandler: {(storeDescription, error) in
-      if let error = error as NSError? {
-        fatalError("Unresolved error \(error), \(error.userInfo)")
-      }
-    })
-    container.viewContext.automaticallyMergesChangesFromParent = true
-  }
-}
diff --git a/Jel/JelApp.swift b/Jel/JelApp.swift
index ab7a74d..5dce28d 100644
--- a/Jel/JelApp.swift
+++ b/Jel/JelApp.swift
@@ -9,7 +9,6 @@ import SwiftUI
 
 @main
 struct JelApp: App {
-  let datamodelController = DatamodelController.shared
   let jellyfinClientController = JellyfinClientController(authHeaders: AuthHeaders(
     Client: "Jel",
     Device: UIDevice.current.systemName,
@@ -20,8 +19,6 @@ struct JelApp: App {
   var body: some Scene {
     WindowGroup {
       ContentView()
-        .environment(\.managedObjectContext,
-                      datamodelController.container.viewContext)
         .environmentObject(jellyfinClientController)
         .task {
           AuthStateController.shared.load()
diff --git a/Jel/Views/Dashboard/Library/LibraryView.swift b/Jel/Views/Dashboard/DashboardLibraryView.swift
index 63bfd64..98c92c0 100644
--- a/Jel/Views/Dashboard/Library/LibraryView.swift
+++ b/Jel/Views/Dashboard/DashboardLibraryView.swift
@@ -1,5 +1,5 @@
 //
-//  LibraryView.swift
+//  DashboardLibraryView.swift
 //  Jel
 //
 //  Created by zerocool on 12/15/23.
@@ -8,7 +8,7 @@
 import SwiftUI
 import JellyfinKit
 
-struct LibraryView: View {
+struct DashboardLibraryView: View {
   @EnvironmentObject var jellyfinClient: JellyfinClientController
   
   @StateObject var authState: AuthStateController = AuthStateController.shared
@@ -19,7 +19,12 @@ struct LibraryView: View {
       HStack {
         ForEach(libraries) {library in
           if library.collectionType == "movies" || library.collectionType == "tvshows" {
-            LibraryIconView(library: library)
+            NavigationLink {
+              LibraryDetailView(library: library)
+            } label: {
+              LibraryIconView(library: library, height: 200)
+                .padding()
+            }
           }
         }
       }
@@ -32,7 +37,6 @@ struct LibraryView: View {
             libraries = results
           }
         } catch {
-          print(error)
         }
       }
     }
diff --git a/Jel/Views/Dashboard/DashboardView.swift b/Jel/Views/Dashboard/DashboardView.swift
index 2658180..50d3538 100644
--- a/Jel/Views/Dashboard/DashboardView.swift
+++ b/Jel/Views/Dashboard/DashboardView.swift
@@ -14,10 +14,10 @@ struct DashboardView: View {
   var body: some View {
     NavigationStack {
       VStack {
-        LibraryView()
+        DashboardLibraryView()
       }
       .toolbar {
-        ToolbarItem {
+        ToolbarItem(placement: .topBarTrailing) {
           Button {
             showingSettingsSheet.toggle()
           } label: {
@@ -32,6 +32,6 @@ struct DashboardView: View {
   }
 }
 
-#Preview {
-  DashboardView()
-}
+//#Preview {
+//  DashboardView()
+//}
diff --git a/Jel/Views/Library/LibraryDetailView.swift b/Jel/Views/Library/LibraryDetailView.swift
new file mode 100644
index 0000000..3d5a04b
--- /dev/null
+++ b/Jel/Views/Library/LibraryDetailView.swift
@@ -0,0 +1,43 @@
+//
+//  LibraryDetailView.swift
+//  Jel
+//
+//  Created by zerocool on 12/22/23.
+//
+
+import SwiftUI
+import JellyfinKit
+
+struct LibraryDetailView: View {
+  @EnvironmentObject var jellyfinClient: JellyfinClientController
+  @StateObject var authState: AuthStateController = AuthStateController.shared
+  
+  @State var library: BaseItemDto
+  @State var items: [BaseItemDto]? = []
+  
+  var body: some View {
+    ScrollView {
+      ForEach(items ?? []) {item in
+        LibraryIconView(library: item, imageType: "Primary", width: 120)
+          .padding()
+      }
+    }
+    .navigationTitle(library.name ?? "Unknown")
+    .onAppear {
+      Task {
+        let params = Paths.GetItemsParameters(userID: authState.userId, parentID: library.id)
+        let request = Paths.getItems(parameters: params)
+        
+        do {
+          let res = try await jellyfinClient.send(request)
+          items = res.value.items
+        } catch {
+        }
+      }
+    }
+  }
+}
+
+#Preview {
+  LibraryDetailView(library: BaseItemDto())
+}
diff --git a/Jel/Views/Dashboard/Library/LibraryIconView.swift b/Jel/Views/Library/LibraryIconView.swift
index 0131ff7..e5f42b0 100644
--- a/Jel/Views/Dashboard/Library/LibraryIconView.swift
+++ b/Jel/Views/Library/LibraryIconView.swift
@@ -7,23 +7,26 @@
 
 import SwiftUI
 import JellyfinKit
-import BlurHashKit
 
 struct LibraryIconView: View {
   @EnvironmentObject var jellyfinClient: JellyfinClientController
   
   @State var library: BaseItemDto
+  
   @State var loadingImage: Bool = true
+  @State var imageType: String = "Primary"
+  var width: CGFloat?
+  var height: CGFloat?
   
   @State var loadedImageBinaryData: Data?
   
   var body: some View {
     VStack {
       AsyncImageView(imageId: library.id ?? "",
-                     blurhash: library.imageBlurHashes?.primary?[library.imageTags?["Primary"] ?? ""] ?? "",
-                     imageType: "Primary")
+                     blurhash: library.imageBlurHashes?.primary?[library.imageTags?[imageType] ?? ""] ?? "",
+                     imageType: imageType)
       .aspectRatio(contentMode: .fill)
-      .frame(width: 255, height: 150)
+      .frame(width: width, height: height)
       .clipShape(RoundedRectangle(cornerRadius: 5))