Add view options to playlists list view

List/grid layout toggle with row size and grid columns options,
persisted per-view. PlaylistRowView now scales with VideoRowStyle;
new LocalPlaylistCardView provides the grid card with edit/delete
context menu.
This commit is contained in:
Arkadiusz Fal
2026-08-01 21:34:50 +02:00
parent 3f3709a37e
commit 25f15a1b3e
3 changed files with 241 additions and 18 deletions

View File

@@ -0,0 +1,97 @@
//
// LocalPlaylistCardView.swift
// Yattee
//
// A local playlist card component for grid layouts.
//
import SwiftUI
import NukeUI
/// A local playlist card for grid layouts.
///
/// Displays thumbnail with video count badge, title, and count/duration line.
struct LocalPlaylistCardView: View {
let playlist: LocalPlaylist
var isCompact: Bool = false
private var titleFont: Font { isCompact ? .caption : .subheadline }
private var metadataFont: Font { isCompact ? .caption2 : .caption }
private var metadataHeight: CGFloat {
#if os(tvOS)
isCompact ? 90 : 110
#else
isCompact ? 50 : 58
#endif
}
var body: some View {
VStack(alignment: .leading, spacing: isCompact ? 4 : 8) {
// Thumbnail with video count badge - fixed 16:9 aspect ratio container
Color.clear
.aspectRatio(16/9, contentMode: .fit)
.overlay {
LazyImage(url: playlist.thumbnailURL) { state in
if let image = state.image {
image
.resizable()
.aspectRatio(contentMode: .fill)
} else {
thumbnailPlaceholder
}
}
}
.clipped()
.clipShape(RoundedRectangle(cornerRadius: isCompact ? 6 : 8))
.overlay(alignment: .bottomTrailing) {
if playlist.videoCount > 0 {
HStack(spacing: 4) {
Image(systemName: "play.square.stack")
.font(.caption2)
Text("\(playlist.videoCount)")
.font(.caption2)
.fontWeight(.medium)
}
.padding(.horizontal, 6)
.padding(.vertical, 3)
.background(.black.opacity(0.75))
.foregroundStyle(.white)
.clipShape(RoundedRectangle(cornerRadius: 4))
.padding(6)
}
}
// Metadata - fixed height to ensure consistent card sizes in grid
VStack(alignment: .leading, spacing: 2) {
Text(playlist.title)
.font(titleFont)
.fontWeight(.medium)
.lineLimit(2)
.multilineTextAlignment(.leading)
.fixedSize(horizontal: false, vertical: true)
.frame(maxWidth: .infinity, alignment: .leading)
Text("playlist.videoCountDuration \(playlist.videoCount) \(playlist.formattedTotalDuration)")
.font(metadataFont.monospacedDigit())
.foregroundStyle(.secondary)
.lineLimit(1)
Spacer(minLength: 0)
}
.frame(height: metadataHeight)
}
.contentShape(Rectangle())
}
private var thumbnailPlaceholder: some View {
RoundedRectangle(cornerRadius: isCompact ? 6 : 8)
.fill(.quaternary)
.aspectRatio(16/9, contentMode: .fill)
.overlay {
Image(systemName: "music.note.list")
.font(.title2)
.foregroundStyle(.secondary)
}
}
}

View File

@@ -10,6 +10,11 @@ import NukeUI
struct PlaylistRowView: View { struct PlaylistRowView: View {
let playlist: LocalPlaylist let playlist: LocalPlaylist
var style: VideoRowStyle = .regular
private var titleFont: Font {
style == .compact ? .subheadline : .headline
}
var body: some View { var body: some View {
HStack(spacing: 12) { HStack(spacing: 12) {
@@ -28,14 +33,14 @@ struct PlaylistRowView: View {
} }
} }
} }
.frame(width: 80, height: 45) .frame(width: style.thumbnailWidth, height: style.thumbnailHeight)
.clipShape(RoundedRectangle(cornerRadius: 6)) .clipShape(RoundedRectangle(cornerRadius: 6))
// Info // Info
VStack(alignment: .leading, spacing: 4) { VStack(alignment: .leading, spacing: 4) {
Text(playlist.title) Text(playlist.title)
.font(.headline) .font(titleFont)
.lineLimit(1) .lineLimit(style == .large ? 2 : 1)
Text("playlist.videoCountDuration \(playlist.videoCount) \(playlist.formattedTotalDuration)") Text("playlist.videoCountDuration \(playlist.videoCount) \(playlist.formattedTotalDuration)")
.font(.caption.monospacedDigit()) .font(.caption.monospacedDigit())

View File

@@ -9,6 +9,7 @@ import SwiftUI
struct PlaylistsListView: View { struct PlaylistsListView: View {
@Environment(\.appEnvironment) private var appEnvironment @Environment(\.appEnvironment) private var appEnvironment
@Namespace private var sheetTransition
@State private var playlists: [LocalPlaylist] = [] @State private var playlists: [LocalPlaylist] = []
@State private var searchText = "" @State private var searchText = ""
@State private var showingNewPlaylist = false @State private var showingNewPlaylist = false
@@ -17,6 +18,20 @@ struct PlaylistsListView: View {
@FocusState private var focusedPlaylistID: UUID? @FocusState private var focusedPlaylistID: UUID?
#endif #endif
// View options (persisted)
@AppStorage("playlists.layout") private var layout: VideoListLayout = .list
@AppStorage("playlists.rowStyle") private var rowStyle: VideoRowStyle = .regular
@AppStorage("playlists.gridColumns") private var gridColumns = 2
// UI state
@State private var showViewOptions = false
@State private var viewWidth: CGFloat = 0
// Grid layout configuration
private var gridConfig: GridLayoutConfiguration {
GridLayoutConfiguration(viewWidth: viewWidth, gridColumns: gridColumns)
}
private var dataManager: DataManager? { appEnvironment?.dataManager } private var dataManager: DataManager? { appEnvironment?.dataManager }
/// List style from centralized settings. /// List style from centralized settings.
@@ -24,6 +39,24 @@ struct PlaylistsListView: View {
appEnvironment?.settingsManager.listStyle ?? .inset appEnvironment?.settingsManager.listStyle ?? .inset
} }
private var viewOptionsSheetContent: some View {
ViewOptionsSheet(
layout: $layout,
rowStyle: $rowStyle,
gridColumns: $gridColumns,
maxGridColumns: gridConfig.maxColumns
)
}
/// View options button lives on the leading edge on macOS, trailing elsewhere.
private var viewOptionsPlacement: ToolbarItemPlacement {
#if os(macOS)
.navigation
#else
.primaryAction
#endif
}
/// Playlists filtered by search. /// Playlists filtered by search.
private var filteredPlaylists: [LocalPlaylist] { private var filteredPlaylists: [LocalPlaylist] {
guard !searchText.isEmpty else { return playlists } guard !searchText.isEmpty else { return playlists }
@@ -35,6 +68,7 @@ struct PlaylistsListView: View {
} }
var body: some View { var body: some View {
GeometryReader { geometry in
Group { Group {
#if os(tvOS) #if os(tvOS)
tvOSContent tvOSContent
@@ -42,10 +76,19 @@ struct PlaylistsListView: View {
if filteredPlaylists.isEmpty { if filteredPlaylists.isEmpty {
emptyView emptyView
} else { } else {
switch layout {
case .list:
listContent listContent
case .grid:
gridContent
}
} }
#endif #endif
} }
.onChange(of: geometry.size.width, initial: true) { _, newWidth in
viewWidth = newWidth
}
}
#if !os(tvOS) #if !os(tvOS)
.navigationTitle(String(localized: "home.playlists.title")) .navigationTitle(String(localized: "home.playlists.title"))
.toolbarTitleDisplayMode(.inlineLarge) .toolbarTitleDisplayMode(.inlineLarge)
@@ -58,6 +101,19 @@ struct PlaylistsListView: View {
ToolbarSpacer(.flexible, placement: .primaryAction) ToolbarSpacer(.flexible, placement: .primaryAction)
} }
#endif #endif
ToolbarItem(placement: viewOptionsPlacement) {
Button {
showViewOptions = true
} label: {
Label(String(localized: "viewOptions.title"), systemImage: "slider.horizontal.3")
}
.liquidGlassTransitionSource(id: "playlistsViewOptions", in: sheetTransition)
#if os(macOS)
.popover(isPresented: $showViewOptions, arrowEdge: .bottom) {
viewOptionsSheetContent
}
#endif
}
ToolbarItem(placement: .primaryAction) { ToolbarItem(placement: .primaryAction) {
Button { Button {
showingNewPlaylist = true showingNewPlaylist = true
@@ -67,6 +123,12 @@ struct PlaylistsListView: View {
} }
} }
#endif #endif
#if !os(macOS)
.sheet(isPresented: $showViewOptions) {
viewOptionsSheetContent
.liquidGlassSheetContent(sourceID: "playlistsViewOptions", in: sheetTransition)
}
#endif
.sheet(isPresented: $showingNewPlaylist) { .sheet(isPresented: $showingNewPlaylist) {
PlaylistFormSheet(mode: .create) { title, description in PlaylistFormSheet(mode: .create) { title, description in
_ = dataManager?.createPlaylist(title: title, description: description) _ = dataManager?.createPlaylist(title: title, description: description)
@@ -101,6 +163,12 @@ struct PlaylistsListView: View {
} label: { } label: {
Label(String(localized: "home.playlists.new"), systemImage: "plus") Label(String(localized: "home.playlists.new"), systemImage: "plus")
} }
Button {
showViewOptions = true
} label: {
Label(String(localized: "viewOptions.title"), systemImage: "slider.horizontal.3")
}
} }
.focusSection() .focusSection()
.padding(.horizontal, 48) .padding(.horizontal, 48)
@@ -111,7 +179,12 @@ struct PlaylistsListView: View {
if filteredPlaylists.isEmpty { if filteredPlaylists.isEmpty {
emptyView emptyView
} else { } else {
switch layout {
case .list:
listContent listContent
case .grid:
gridContent
}
} }
} }
.focusSection() .focusSection()
@@ -157,16 +230,16 @@ struct PlaylistsListView: View {
// MARK: - List Content // MARK: - List Content
private var listContent: some View { private var listContent: some View {
VideoListContainer(listStyle: listStyle, rowStyle: .regular) { VideoListContainer(listStyle: listStyle, rowStyle: rowStyle) {
Spacer() Spacer()
.frame(height: 16) .frame(height: 16)
} content: { } content: {
ForEach(Array(filteredPlaylists.enumerated()), id: \.element.id) { index, playlist in ForEach(Array(filteredPlaylists.enumerated()), id: \.element.id) { index, playlist in
VideoListRow( VideoListRow(
isLast: index == filteredPlaylists.count - 1, isLast: index == filteredPlaylists.count - 1,
rowStyle: .regular, rowStyle: rowStyle,
listStyle: listStyle, listStyle: listStyle,
contentWidth: 80 // PlaylistRowView thumbnail width contentWidth: rowStyle.thumbnailWidth
) { ) {
playlistRow(playlist: playlist) playlistRow(playlist: playlist)
} }
@@ -195,13 +268,28 @@ struct PlaylistsListView: View {
} }
} }
// MARK: - Grid Layout
private var gridContent: some View {
ScrollView {
VideoGridContent(columns: gridConfig.effectiveColumns) {
ForEach(filteredPlaylists, id: \.id) { playlist in
playlistCard(playlist: playlist)
}
}
}
#if os(tvOS)
.scrollClipDisabled()
#endif
}
// MARK: - Helper Views // MARK: - Helper Views
@ViewBuilder @ViewBuilder
private func playlistRow(playlist: LocalPlaylist) -> some View { private func playlistRow(playlist: LocalPlaylist) -> some View {
#if os(tvOS) #if os(tvOS)
NavigationLink(value: NavigationDestination.playlist(.local(playlist.id, title: playlist.title))) { NavigationLink(value: NavigationDestination.playlist(.local(playlist.id, title: playlist.title))) {
PlaylistRowView(playlist: playlist) PlaylistRowView(playlist: playlist, style: rowStyle)
.frame(maxWidth: .infinity, alignment: .leading) .frame(maxWidth: .infinity, alignment: .leading)
.contentShape(Rectangle()) .contentShape(Rectangle())
} }
@@ -209,7 +297,7 @@ struct PlaylistsListView: View {
.zoomTransitionSource(id: playlist.id) .zoomTransitionSource(id: playlist.id)
.focused($focusedPlaylistID, equals: playlist.id) .focused($focusedPlaylistID, equals: playlist.id)
#else #else
PlaylistRowView(playlist: playlist) PlaylistRowView(playlist: playlist, style: rowStyle)
.frame(maxWidth: .infinity, alignment: .leading) .frame(maxWidth: .infinity, alignment: .leading)
.contentShape(Rectangle()) .contentShape(Rectangle())
.onTapGesture { .onTapGesture {
@@ -219,6 +307,39 @@ struct PlaylistsListView: View {
#endif #endif
} }
@ViewBuilder
private func playlistCard(playlist: LocalPlaylist) -> some View {
#if os(tvOS)
NavigationLink(value: NavigationDestination.playlist(.local(playlist.id, title: playlist.title))) {
LocalPlaylistCardView(playlist: playlist, isCompact: gridConfig.isCompactCards)
.frame(maxHeight: .infinity, alignment: .top)
}
.buttonStyle(.plain)
.zoomTransitionSource(id: playlist.id)
.focused($focusedPlaylistID, equals: playlist.id)
#else
LocalPlaylistCardView(playlist: playlist, isCompact: gridConfig.isCompactCards)
.frame(maxHeight: .infinity, alignment: .top)
.onTapGesture {
appEnvironment?.navigationCoordinator.navigate(to: .playlist(.local(playlist.id, title: playlist.title)))
}
.zoomTransitionSource(id: playlist.id)
.contextMenu {
Button {
playlistToEdit = playlist
} label: {
Label(String(localized: "playlist.edit"), systemImage: "pencil")
}
Button(role: .destructive) {
dataManager?.deletePlaylist(playlist)
loadPlaylists()
} label: {
Label(String(localized: "playlist.delete"), systemImage: "trash")
}
}
#endif
}
private func loadPlaylists() { private func loadPlaylists() {
playlists = (dataManager?.playlists() ?? []).sorted { $0.title.localizedCaseInsensitiveCompare($1.title) == .orderedAscending } playlists = (dataManager?.playlists() ?? []).sorted { $0.title.localizedCaseInsensitiveCompare($1.title) == .orderedAscending }
} }