summaryrefslogtreecommitdiff
path: root/Jel/Views
diff options
context:
space:
mode:
Diffstat (limited to 'Jel/Views')
-rw-r--r--Jel/Views/Library/Item/ItemHeaderView.swift15
-rw-r--r--Jel/Views/Library/Item/ItemMediaView.swift64
-rw-r--r--Jel/Views/Library/Item/ItemView.swift24
-rw-r--r--Jel/Views/Library/Item/Types/ItemMovieView.swift42
-rw-r--r--Jel/Views/Utility/StickyHeaderView.swift13
5 files changed, 70 insertions, 88 deletions
diff --git a/Jel/Views/Library/Item/ItemHeaderView.swift b/Jel/Views/Library/Item/ItemHeaderView.swift
index afcc21e..44be776 100644
--- a/Jel/Views/Library/Item/ItemHeaderView.swift
+++ b/Jel/Views/Library/Item/ItemHeaderView.swift
@@ -22,11 +22,10 @@ struct ItemHeaderView: View {
var body: some View {
ZStack(alignment: .bottom) {
- StickyHeaderView(minHeight: 300) {
+ StickyHeaderView(minHeight: 400) {
ItemIconView(item: item, imageType: "Backdrop", contentMode: .fill)
.setCornerRadius(0)
.overlay(overlayGradient.opacity(0.8))
- .mask(overlayGradientMask)
}
HStack {
@@ -39,12 +38,12 @@ struct ItemHeaderView: View {
}
.padding([.leading, .trailing])
}
- .scrollTransition {content, phase in
- content
- .scaleEffect(phase.isIdentity ? 1 : 2)
- .opacity(phase.isIdentity ? 1 : 0.1)
- .blur(radius: phase.isIdentity ? 0 : 50)
- }
+// .scrollTransition {content, phase in
+// content
+// .scaleEffect(phase.isIdentity ? 1 : 2)
+// .opacity(phase.isIdentity ? 1 : 0.1)
+// .blur(radius: phase.isIdentity ? 0 : 50)
+// }
}
}
diff --git a/Jel/Views/Library/Item/ItemMediaView.swift b/Jel/Views/Library/Item/ItemMediaView.swift
index 2e6f133..1d1e53d 100644
--- a/Jel/Views/Library/Item/ItemMediaView.swift
+++ b/Jel/Views/Library/Item/ItemMediaView.swift
@@ -9,68 +9,24 @@ import SwiftUI
import JellyfinKit
import VisibilityTrackingScrollView
-struct ItemMediaView<Content: View>: View {
+struct ItemMediaView: View {
@EnvironmentObject var jellyfinClient: JellyfinClientController
@StateObject var authState: AuthStateController = AuthStateController.shared
- @State var item: BaseItemDto
- @ViewBuilder var playButton: () -> Content
+ var item: BaseItemDto
- @State var pageScrolled: Bool = false
var body: some View {
- GeometryReader {geo in
- 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
-
- pageScrolled = minY < 0
- }
- }
- }
-
- playButton()
-
- VStack(alignment: .leading) {
- Text(item.taglines?.count ?? 0 > 0 ? item.taglines?[0] ?? "" : "")
- .font(.headline)
- .frame(maxWidth: .infinity, alignment: .leading)
- .padding(.bottom)
-
- ForEach(item.overview?.components(separatedBy: "<br>") ?? [], id: \.self) {overview in
- Text(overview)
- }
-
- ItemGenresView(item: item)
- .padding(.vertical)
- }
- .if(max(geo.safeAreaInsets.leading, geo.safeAreaInsets.trailing) > 0) {view in
- view
- .padding(max(geo.safeAreaInsets.leading, geo.safeAreaInsets.trailing))
- }
- .if(max(geo.safeAreaInsets.leading, geo.safeAreaInsets.trailing) <= 0) {view in
- view
- .padding()
- }
+ VStack(alignment: .leading) {
+ Text(item.taglines?.count ?? 0 > 0 ? item.taglines?[0] ?? "" : "")
+ .font(.headline)
+ .frame(maxWidth: .infinity, alignment: .leading)
+ .padding(.bottom)
+
+ ForEach(item.overview?.components(separatedBy: "<br>") ?? [], id: \.self) {overview in
+ Text(overview)
}
- .ignoresSafeArea()
}
- .navigationBarTitleDisplayMode(.inline)
- .navigationTitle(item.name ?? "Untitled")
- .toolbarRole(.editor)
- .toolbar {
- ToolbarItem(placement: .principal) {
- Text(pageScrolled ? item.name ?? "Untitled" : "")
- .bold()
- }
- }
- .scrollIndicators(.hidden)
-
}
}
diff --git a/Jel/Views/Library/Item/ItemView.swift b/Jel/Views/Library/Item/ItemView.swift
index 21d6c77..de4dc1b 100644
--- a/Jel/Views/Library/Item/ItemView.swift
+++ b/Jel/Views/Library/Item/ItemView.swift
@@ -10,18 +10,20 @@ import JellyfinKit
struct ItemView: View {
@State var item: BaseItemDto
- var body: some View {
- switch item.type {
- case .movie:
- ItemMovieView(item: item)
- default:
- ItemMediaView(item: item) {
- EmptyView()
- }
+ var body: some View {
+ ScrollView {
+ VStack {
+ switch item.type {
+ case .movie:
+ ItemMovieView(item: item)
+ default:
+ ItemMediaView(item: item)
+ }
}
}
+ }
}
-#Preview {
- ItemView(item: BaseItemDto())
-}
+//#Preview {
+// ItemView(item: BaseItemDto())
+//}
diff --git a/Jel/Views/Library/Item/Types/ItemMovieView.swift b/Jel/Views/Library/Item/Types/ItemMovieView.swift
index b621d2e..fcf8c06 100644
--- a/Jel/Views/Library/Item/Types/ItemMovieView.swift
+++ b/Jel/Views/Library/Item/Types/ItemMovieView.swift
@@ -11,19 +11,43 @@ import JellyfinKit
struct ItemMovieView: View {
var item: BaseItemDto
- var body: some View {
- VStack {
- ItemMediaView(item: item) {
- Button("Play") {
-
+ @State var pageScrolled: Bool = false
+
+ var body: some View {
+ VStack {
+ ItemHeaderView(item: item)
+ .foregroundStyle(.white)
+ .background {
+ GeometryReader {geo in
+ EmptyView()
+ .onChange(of: geo.frame(in: .global).minY) {
+ let minY = geo.frame(in: .global).minY
+
+ pageScrolled = minY < 0
+ }
}
- .buttonStyle(.borderedProminent)
}
-
- ItemPeopleView(item: item)
+
+ ItemMediaView(item: item)
+ .padding()
+
+ ItemGenresView(item: item)
+ .padding()
+
+ ItemPeopleView(item: item)
+ .padding()
+ }
+ .navigationBarTitleDisplayMode(.inline)
+ .navigationTitle(item.name ?? "Untitled")
+ .toolbarRole(.editor)
+ .toolbar {
+ ToolbarItem(placement: .principal) {
+ Text(pageScrolled ? item.name ?? "Untitled" : "")
+ .bold()
}
- .padding()
}
+ .toolbarBackground(pageScrolled ? .visible : .hidden)
+ }
}
//#Preview {
diff --git a/Jel/Views/Utility/StickyHeaderView.swift b/Jel/Views/Utility/StickyHeaderView.swift
index 52dc26d..b3bfd02 100644
--- a/Jel/Views/Utility/StickyHeaderView.swift
+++ b/Jel/Views/Utility/StickyHeaderView.swift
@@ -27,12 +27,13 @@ struct StickyHeaderView<Content: View>: View {
.offset(y: -geo.frame(in: .global).minY)
.frame(width: geo.size.width, height: geo.size.height + geo.frame(in: .global).minY)
}
- }.frame(minHeight: minHeight)
+ }
+ .frame(minWidth: UIScreen.current?.bounds.width ?? 200, minHeight: minHeight)
}
}
-#Preview {
- StickyHeaderView {
- Text("Test")
- }
-}
+//#Preview {
+// StickyHeaderView {
+// Text("Test")
+// }
+//}
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-14 13:08:50 +0000