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

Add to playlist from video player, state fixes

Browse Source
This commit is contained in:
Arkadiusz Fal
2021-10-25 23:29:06 +02:00
parent 47ad6a4410
commit b50d915d8e
10 changed files with 129 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Shared/Playlists/AddToPlaylistView.swift
View File

@@ -27,7 +27,7 @@ struct AddToPlaylistView: View {
}
.onAppear {
model.load {
if let playlist = model.all.first {
if let playlist = model.find(id: Defaults[.lastUsedPlaylistID]) ?? model.all.first {
selectedPlaylistID = playlist.id
}
}
@@ -117,22 +117,22 @@ struct AddToPlaylistView: View {
HStack {
Spacer()
Button("Add to Playlist", action: addToPlaylist)
.disabled(selectedPlaylist.isNil)
.padding(.top, 30)
#if !os(tvOS)
.keyboardShortcut(.defaultAction)
#endif
.disabled(currentPlaylist.isNil)
.padding(.top, 30)
}
.padding(.horizontal)
}
private var selectPlaylistButton: some View {
Button(currentPlaylist?.title ?? "Select playlist") {
guard currentPlaylist != nil else {
Button(selectedPlaylist?.title ?? "Select playlist") {
guard selectedPlaylist != nil else {
return
}
selectedPlaylistID = model.all.next(after: currentPlaylist!)!.id
selectedPlaylistID = model.all.next(after: selectedPlaylist!)!.id
}
.contextMenu {
ForEach(model.all) { playlist in
@@ -146,16 +146,18 @@ struct AddToPlaylistView: View {
}
private func addToPlaylist() {
guard currentPlaylist != nil else {
guard let id = selectedPlaylist?.id else {
return
}
model.addVideo(playlistID: currentPlaylist!.id, videoID: video.videoID) {
Defaults[.lastUsedPlaylistID] = id
model.addVideo(playlistID: id, videoID: video.videoID) {
dismiss()
}
}
private var currentPlaylist: Playlist? {
private var selectedPlaylist: Playlist? {
model.find(id: selectedPlaylistID) ?? model.all.first
}
}