From 7aa602f19dec3cf526c4550c5e63a8fc6dfac723 Mon Sep 17 00:00:00 2001
From: Shav Kinderlehrer <shav@trinket.icu>
Date: Wed, 27 Dec 2023 08:25:35 -0500
Subject: Implement auto aspect ratio for LibraryIconViews

---
 Jel/Views/Library/Item/ItemInfoView.swift        |  4 +-
 Jel/Views/Library/Item/ItemMediaView.swift       | 77 ++++++++++++++++++++++++
 Jel/Views/Library/Item/ItemMovieView.swift       | 77 ------------------------
 Jel/Views/Library/Item/Types/ItemMovieView.swift | 22 +++++++
 4 files changed, 101 insertions(+), 79 deletions(-)
 create mode 100644 Jel/Views/Library/Item/ItemMediaView.swift
 delete mode 100644 Jel/Views/Library/Item/ItemMovieView.swift
 create mode 100644 Jel/Views/Library/Item/Types/ItemMovieView.swift

(limited to 'Jel/Views/Library/Item')

diff --git a/Jel/Views/Library/Item/ItemInfoView.swift b/Jel/Views/Library/Item/ItemInfoView.swift
index d48dfef..103acf9 100644
--- a/Jel/Views/Library/Item/ItemInfoView.swift
+++ b/Jel/Views/Library/Item/ItemInfoView.swift
@@ -14,9 +14,9 @@ struct ItemInfoView: View {
   var body: some View {
     VStack(alignment: .leading) {
       HStack {
-        Text(item.genres?.first ?? "---")
-        Text("•")
         Text((item.productionYear != nil) ? String(item.productionYear!) : "---")
+        Text("•")
+        Text(item.genres?.first ?? "---")
       }
       Text(item.getRuntime() ?? "-:--")
     }
diff --git a/Jel/Views/Library/Item/ItemMediaView.swift b/Jel/Views/Library/Item/ItemMediaView.swift
new file mode 100644
index 0000000..38c242d
--- /dev/null
+++ b/Jel/Views/Library/Item/ItemMediaView.swift
@@ -0,0 +1,77 @@
+//
+//  ItemMediaView.swift
+//  Jel
+//
+//  Created by zerocool on 12/23/23.
+//
+
+import SwiftUI
+import JellyfinKit
+
+struct ItemMediaView: View {
+  @EnvironmentObject var jellyfinClient: JellyfinClientController
+  @StateObject var authState: AuthStateController = AuthStateController.shared
+  
+  @State var item: BaseItemDto
+  @State var loading: Bool = true
+  
+  @State var navigationTitle: String = ""
+  
+  var body: some View {
+    VStack {
+      if loading {
+        ProgressView()
+          .progressViewStyle(.circular)
+      } else {
+        ScrollView {
+          ItemHeaderView(item: item)
+            .padding(.bottom)
+            .background {
+              GeometryReader {geo in
+                EmptyView()
+                  .onChange(of: geo.frame(in: .global).minY) {
+                    let minY = geo.frame(in: .global).minY
+                    if minY < 0 {
+                      navigationTitle = item.name ?? ""
+                    } else {
+                      navigationTitle = ""
+                    }
+                  }
+              }
+            }
+          
+          VStack(alignment: .leading) {
+            Text(item.taglines?.count ?? 0 > 0 ? item.taglines?[0] ?? "" : "")
+              .font(.headline)
+              .frame(maxWidth: .infinity, alignment: .leading)
+              .padding(.bottom)
+            
+            Text(item.overview ?? "---")
+          }
+          .padding()
+        }
+      }
+    }
+    .toolbarRole(.editor)
+    .navigationBarTitleDisplayMode(.inline)
+    .navigationTitle(navigationTitle)
+    .ignoresSafeArea()
+    .scrollIndicators(.hidden)
+    .onAppear {
+      Task {
+        do {
+          let request = Paths.getItem(userID: authState.userId ?? "", itemID: item.id ?? "")
+          let response = try await jellyfinClient.send(request)
+          item = response.value
+          loading = false
+        } catch {
+        }
+      }
+    }
+  }
+}
+
+//#Preview {
+//  ItemMovieView(item: BaseItemDto())
+
+//}
diff --git a/Jel/Views/Library/Item/ItemMovieView.swift b/Jel/Views/Library/Item/ItemMovieView.swift
deleted file mode 100644
index eed083e..0000000
--- a/Jel/Views/Library/Item/ItemMovieView.swift
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-//  ItemMovieView.swift
-//  Jel
-//
-//  Created by zerocool on 12/23/23.
-//
-
-import SwiftUI
-import JellyfinKit
-
-struct ItemMovieView: View {
-  @EnvironmentObject var jellyfinClient: JellyfinClientController
-  @StateObject var authState: AuthStateController = AuthStateController.shared
-  
-  @State var item: BaseItemDto
-  @State var loading: Bool = true
-  
-  @State var navigationTitle: String = ""
-  
-  var body: some View {
-    VStack {
-      if loading {
-        ProgressView()
-          .progressViewStyle(.circular)
-      } else {
-        ScrollView {
-          ItemHeaderView(item: item)
-            .padding(.bottom)
-            .background {
-              GeometryReader {geo in
-                EmptyView()
-                  .onChange(of: geo.frame(in: .global).minY) {
-                    let minY = geo.frame(in: .global).minY
-                    if minY < 0 {
-                      navigationTitle = item.name ?? ""
-                    } else {
-                      navigationTitle = ""
-                    }
-                  }
-              }
-            }
-          
-          VStack(alignment: .leading) {
-            Text(item.taglines?.count ?? 0 > 0 ? item.taglines?[0] ?? "" : "")
-              .font(.headline)
-              .frame(maxWidth: .infinity, alignment: .leading)
-              .padding(.bottom)
-            
-            Text(item.overview ?? "---")
-          }
-          .padding()
-        }
-      }
-    }
-    .toolbarRole(.editor)
-    .navigationBarTitleDisplayMode(.inline)
-    .navigationTitle(navigationTitle)
-    .ignoresSafeArea()
-    .scrollIndicators(.hidden)
-    .onAppear {
-      Task {
-        do {
-          let request = Paths.getItem(userID: authState.userId ?? "", itemID: item.id ?? "")
-          let response = try await jellyfinClient.send(request)
-          item = response.value
-          loading = false
-        } catch {
-        }
-      }
-    }
-  }
-}
-
-//#Preview {
-//  ItemMovieView(item: BaseItemDto())
-
-//}
diff --git a/Jel/Views/Library/Item/Types/ItemMovieView.swift b/Jel/Views/Library/Item/Types/ItemMovieView.swift
new file mode 100644
index 0000000..22de82d
--- /dev/null
+++ b/Jel/Views/Library/Item/Types/ItemMovieView.swift
@@ -0,0 +1,22 @@
+//
+//  ItemMovieView.swift
+//  Jel
+//
+//  Created by zerocool on 12/26/23.
+//
+
+import SwiftUI
+import JellyfinKit
+
+struct ItemMovieView: View {
+  @State var item: BaseItemDto
+    var body: some View {
+      VStack {
+        ItemMediaView(item: item)
+      }
+    }
+}
+
+//#Preview {
+//    ItemMovieView()
+//}
-- 
cgit v1.2.3