From 69bed7745833add72cfe1b1516a61f62460b1765 Mon Sep 17 00:00:00 2001 From: Shav Kinderlehrer Date: Sun, 24 Dec 2023 20:01:52 -0500 Subject: Implement movieDetailView --- Jel/Views/Library/Item/ItemMovieView.swift | 82 ++++++++++++++---------------- 1 file changed, 37 insertions(+), 45 deletions(-) (limited to 'Jel/Views/Library/Item/ItemMovieView.swift') diff --git a/Jel/Views/Library/Item/ItemMovieView.swift b/Jel/Views/Library/Item/ItemMovieView.swift index 68ba1b2..be12696 100644 --- a/Jel/Views/Library/Item/ItemMovieView.swift +++ b/Jel/Views/Library/Item/ItemMovieView.swift @@ -18,59 +18,50 @@ struct ItemMovieView: View { @State var navigationTitle: String = "" var body: some View { - ScrollView { - // ItemHeaderView(item: item) - // .scrollTransition {content, phase in - // content - // .scaleEffect(phase.isIdentity ? 1 : 2) - // .opacity(phase.isIdentity ? 1 : 0.1) - // .blur(radius: phase.isIdentity ? 0 : 50) - // } - ItemHeaderView(item: item) - .opacity(0) // this is the jankiest thing in existence - .background { - GeometryReader {geo in - ItemHeaderView(item: item) - .onChange(of: geo.frame(in: .global).minY) { - navigationTitle = geo.frame(in: .global).minY < 0 ? item.name ?? "Unknown" : "" - } - .scaleEffect(1 + (geo.frame(in: .global).minY > 0 ? geo.frame(in: .global).minY * 0.001 : 0)) - .offset(y: 1 + (geo.frame(in: .global).minY > 0 ? geo.frame(in: .global).minY * 0.001 : 0)) - .scrollTransition {content, phase in - content - .scaleEffect(phase.isIdentity ? 1 : 2) - .opacity(phase.isIdentity ? 1 : 0.1) - .blur(radius: phase.isIdentity ? 0 : 50) + 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) + + Text(item.overview ?? "---") } - } - - VStack { - Text(item.taglines?[0] ?? "Unknown") - .font(.headline) - .padding(.top, 20) - - Text(item.overview ?? "Unknown") - .padding() - Text(item.overview ?? "Unknown") - .padding() - Text(item.overview ?? "Unknown") - .padding() - Text(item.overview ?? "Unknown") .padding() + } } } - .redacted(reason: loading ? .placeholder : []) - .ignoresSafeArea(edges: .top) - .scrollIndicators(.hidden) .toolbarRole(.editor) - .navigationTitle(navigationTitle) .navigationBarTitleDisplayMode(.inline) + .navigationTitle(navigationTitle) + .ignoresSafeArea(edges: .bottom) + .scrollIndicators(.hidden) .onAppear { Task { do { let request = Paths.getItem(userID: authState.userId ?? "", itemID: item.id ?? "") - item = try await jellyfinClient.send(request).value + let response = try await jellyfinClient.send(request) + item = response.value loading = false } catch { } @@ -79,6 +70,7 @@ struct ItemMovieView: View { } } -#Preview { - ItemMovieView(item: BaseItemDto()) -} +//#Preview { +// ItemMovieView(item: BaseItemDto()) + +//} -- cgit v1.2.3