diff options
Diffstat (limited to 'Jel/Views/Item')
-rw-r--r-- | Jel/Views/Item/ItemView.swift | 2 | ||||
-rw-r--r-- | Jel/Views/Item/Person/ItemPeopleView.swift | 6 | ||||
-rw-r--r-- | Jel/Views/Item/Person/ItemPersonDetailView.swift | 47 | ||||
-rw-r--r-- | Jel/Views/Item/Types/ItemPersonView.swift | 81 |
4 files changed, 131 insertions, 5 deletions
diff --git a/Jel/Views/Item/ItemView.swift b/Jel/Views/Item/ItemView.swift index da85f32..7611450 100644 --- a/Jel/Views/Item/ItemView.swift +++ b/Jel/Views/Item/ItemView.swift @@ -16,6 +16,8 @@ struct ItemView: View { switch item.type { case .movie: ItemMovieView(item: item) + case .person: + ItemPersonView(item: item) default: ItemMediaView(item: item) } diff --git a/Jel/Views/Item/Person/ItemPeopleView.swift b/Jel/Views/Item/Person/ItemPeopleView.swift index f007796..1a60ca2 100644 --- a/Jel/Views/Item/Person/ItemPeopleView.swift +++ b/Jel/Views/Item/Person/ItemPeopleView.swift @@ -7,7 +7,6 @@ import SwiftUI import JellyfinKit -import NukeUI struct ItemPeopleView: View { @@ -24,10 +23,7 @@ struct ItemPeopleView: View { HStack(alignment: .top) { ForEach(item.people ?? [], id: \.iterId) {person in NavigationLink { - VStack { - ItemPersonIconView(person: person) - Text("Subview") - } + ItemPersonDetailView(person: person) .navigationTitle(person.name ?? "Unnamed") } label: { ItemPersonIconView(person: person) diff --git a/Jel/Views/Item/Person/ItemPersonDetailView.swift b/Jel/Views/Item/Person/ItemPersonDetailView.swift new file mode 100644 index 0000000..5e0bddf --- /dev/null +++ b/Jel/Views/Item/Person/ItemPersonDetailView.swift @@ -0,0 +1,47 @@ +// +// ItemPersonDetailView.swift +// Jel +// +// Created by zerocool on 1/13/24. +// + +import SwiftUI +import JellyfinKit + +struct ItemPersonDetailView: View { + @StateObject var authState: AuthStateController = AuthStateController.shared + @EnvironmentObject var jellyfinClient: JellyfinClientController + + var person: BaseItemPerson + + @State var personItem: BaseItemDto? + @State var loading: Bool = true + + var body: some View { + VStack { + if loading { + ProgressView() + .progressViewStyle(.circular) + } + + if let personItem = personItem { + ItemView(item: personItem) + } + } + .onAppear { + Task { + let request = Paths.getItem(userID: authState.userId ?? "", itemID: person.id ?? "") + + do { + let res = try await jellyfinClient.send(request) + personItem = res.value + loading = false + } catch {} + } + } + } +} + +//#Preview { +// ItemPersonDetailView() +//} diff --git a/Jel/Views/Item/Types/ItemPersonView.swift b/Jel/Views/Item/Types/ItemPersonView.swift new file mode 100644 index 0000000..b827480 --- /dev/null +++ b/Jel/Views/Item/Types/ItemPersonView.swift @@ -0,0 +1,81 @@ +// +// ItemPersonView.swift +// Jel +// +// Created by zerocool on 1/13/24. +// + +import SwiftUI +import JellyfinKit + +struct ItemPersonView: View { + @EnvironmentObject var jellyfinClient: JellyfinClientController + + var item: BaseItemDto + + @State var items: [BaseItemDto]? + + var body: some View { + VStack(alignment: .leading) { + Text(item.name ?? "---") + .font(.title) + .padding() + + if let overview = item.overview { + Text(overview) + .padding([.horizontal, .bottom]) + } + + if let items = items { + // TODO: Extract to view to maintain DRY + let movies = items.filter({$0.type == .movie}) + if movies.count > 0 { + Text("Movies") + .font(.title2) + .padding(.horizontal) + ScrollView(.horizontal) { + LazyHStack { + ForEach(movies) {movie in + Text(movie.name ?? "") + } + } + .padding(.horizontal) + } + } + + let shows = items.filter({$0.type == .series}) + if shows.count > 0 { + Text("Shows") + .font(.title2) + .padding(.horizontal) + ScrollView(.horizontal) { + LazyHStack { + ForEach(shows) {show in + Text(show.name ?? "") + } + } + .padding(.horizontal) + } + } + } + } + .onAppear { + Task { + let parameters = Paths.GetItemsParameters( + isRecursive: true, + personIDs: [item.id ?? ""] + ) + let request = Paths.getItems(parameters: parameters) + + do { + let res = try await jellyfinClient.send(request) + items = res.value.items ?? [] + } catch {} + } + } + } +} + +//#Preview { +// ItemPersonView() +//} |