Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-08-09 20:24:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Playlists handling improvements

Browse Source
This commit is contained in:
Arkadiusz Fal
2021-10-24 23:36:24 +02:00
parent 19bb4955a2
commit 1ca7b04e89
7 changed files with 81 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Shared/Playlists/AddToPlaylistView.swift
View File

@@ -3,11 +3,12 @@ import Siesta
import SwiftUI
struct AddToPlaylistView: View {
@EnvironmentObject<PlaylistsModel> private var model
let video: Video
@State private var selectedPlaylistID: Playlist.ID = ""
@Environment(\.dismiss) private var dismiss
@EnvironmentObject<PlaylistsModel> private var model
var body: some View {
Group {
@@ -27,7 +28,7 @@ struct AddToPlaylistView: View {
.onAppear {
model.load {
if let playlist = model.all.first {
model.selectedPlaylistID = playlist.id
selectedPlaylistID = playlist.id
}
}
}
@@ -86,7 +87,7 @@ struct AddToPlaylistView: View {
#if os(tvOS)
selectPlaylistButton
#else
Picker("Playlist", selection: $model.selectedPlaylistID) {
Picker("Playlist", selection: $selectedPlaylistID) {
ForEach(model.all) { playlist in
Text(playlist.title).tag(playlist.id)
}
@@ -119,24 +120,24 @@ struct AddToPlaylistView: View {
#if !os(tvOS)
.keyboardShortcut(.defaultAction)
#endif
.disabled(model.currentPlaylist.isNil)
.disabled(currentPlaylist.isNil)
.padding(.top, 30)
}
.padding(.horizontal)
}
private var selectPlaylistButton: some View {
Button(model.currentPlaylist?.title ?? "Select playlist") {
guard model.currentPlaylist != nil else {
Button(currentPlaylist?.title ?? "Select playlist") {
guard currentPlaylist != nil else {
return
}
model.selectedPlaylistID = model.all.next(after: model.currentPlaylist!)!.id
selectedPlaylistID = model.all.next(after: currentPlaylist!)!.id
}
.contextMenu {
ForEach(model.all) { playlist in
Button(playlist.title) {
model.selectedPlaylistID = playlist.id
selectedPlaylistID = playlist.id
}
}
@@ -145,14 +146,18 @@ struct AddToPlaylistView: View {
}
private func addToPlaylist() {
guard model.currentPlaylist != nil else {
guard currentPlaylist != nil else {
return
}
model.addVideoToCurrentPlaylist(videoID: video.id) {
model.addVideo(playlistID: currentPlaylist!.id, videoID: video.videoID) {
dismiss()
}
}
private var currentPlaylist: Playlist? {
model.find(id: selectedPlaylistID) ?? model.all.first
}
}
struct AddToPlaylistView_Previews: PreviewProvider {