From 8f08674527ad6c88dbc833f1a4a8176c38bdb68e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toni=20F=C3=B6rster?= Date: Mon, 27 Nov 2023 12:13:51 +0100 Subject: [PATCH] vertical chapters with images are always collapsed --- .../Player/Video Details/ChaptersView.swift | 63 +++++++++---------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/Shared/Player/Video Details/ChaptersView.swift b/Shared/Player/Video Details/ChaptersView.swift index d0c29b7f..8aa2251f 100644 --- a/Shared/Player/Video Details/ChaptersView.swift +++ b/Shared/Player/Video Details/ChaptersView.swift @@ -15,47 +15,44 @@ struct ChaptersView: View { } var body: some View { - if expand && !chapters.isEmpty { - #if os(tvOS) - List { - Section { - ForEach(chapters) { chapter in - ChapterView(chapter: chapter) - } - } - .listRowBackground(Color.clear) - } - .listStyle(.plain) - #else - if chaptersHaveImages { - ScrollView(.horizontal) { - LazyHStack(spacing: 20) { + if !chapters.isEmpty { + if expand || chaptersHaveImages { + #if os(tvOS) + List { + Section { ForEach(chapters) { chapter in ChapterView(chapter: chapter) } } - .padding(.horizontal, 15) + .listRowBackground(Color.clear) } - .frame(minHeight: ChapterView.thumbnailHeight + 100) - } else { - Section { - ForEach(chapters) { chapter in - ChapterView(chapter: chapter) + .listStyle(.plain) + #else + if chaptersHaveImages { + ScrollView(.horizontal) { + LazyHStack(spacing: 20) { + ForEach(chapters) { chapter in + ChapterView(chapter: chapter) + } + } + .padding(.horizontal, 15) } + .frame(minHeight: ChapterView.thumbnailHeight + 100) + } else { + contents } - .padding(.horizontal) - } - #endif - } else if !chapters.isEmpty { - #if os(iOS) - Button(action: { - self.expand.toggle() // Use your expanding logic here - }) { + #endif + } else { + #if os(iOS) + Button(action: { + self.expand.toggle() + }) { + contents + } + #else contents - } - #else - contents - #endif + #endif + } } }