Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2024-12-23 05:53:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Favorited playlists belong to account

Browse Source
This commit is contained in:
Arkadiusz Fal 2022-12-11 23:30:28 +01:00
parent 115f9fea67
commit 09ff16d464
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Model/FavoriteItem.swift
View File

@ -7,7 +7,7 @@ struct FavoriteItem: Codable, Equatable, Identifiable, Defaults.Serializable {
case popular case popular
case trending(String, String?) case trending(String, String?)
case channel(String, String, String) case channel(String, String, String)
case playlist(String) case playlist(String, String)
case channelPlaylist(String, String, String) case channelPlaylist(String, String, String)
case searchQuery(String, String, String, String) case searchQuery(String, String, String, String)

15
Shared/Home/FavoriteItemView.swift
View File

@ -124,7 +124,7 @@ struct FavoriteItemView: View {
ChannelVideosView(channel: .init(id: id, name: name)) ChannelVideosView(channel: .init(id: id, name: name))
case let .channelPlaylist(_, id, title): case let .channelPlaylist(_, id, title):
ChannelPlaylistView(playlist: .init(id: id, title: title)) ChannelPlaylistView(playlist: .init(id: id, title: title))
case let .playlist(id): case let .playlist(_, id):
ChannelPlaylistView(playlist: .init(id: id, title: label)) ChannelPlaylistView(playlist: .init(id: id, title: label))
case .subscriptions: case .subscriptions:
SubscriptionsView() SubscriptionsView()
@ -157,7 +157,7 @@ struct FavoriteItemView: View {
case let .searchQuery(text, _, _, _): case let .searchQuery(text, _, _, _):
navigation.hideViewsAboveBrowser() navigation.hideViewsAboveBrowser()
navigation.openSearchQuery(text) navigation.openSearchQuery(text)
case let .playlist(id): case let .playlist(_, id):
navigation.tabSelection = .playlist(id) navigation.tabSelection = .playlist(id)
} }
} }
@ -193,6 +193,8 @@ struct FavoriteItemView: View {
case let .channelPlaylist(appType, _, _): case let .channelPlaylist(appType, _, _):
guard let appType = VideosApp.AppType(rawValue: appType) else { return false } guard let appType = VideosApp.AppType(rawValue: appType) else { return false }
return accounts.app.appType == appType return accounts.app.appType == appType
case let .playlist(accountID, _):
return accounts.current?.id == accountID
default: default:
return true return true
} }
@ -222,7 +224,7 @@ struct FavoriteItemView: View {
case let .channelPlaylist(_, id, _): case let .channelPlaylist(_, id, _):
return accounts.api.channelPlaylist(id) return accounts.api.channelPlaylist(id)
case let .playlist(id): case let .playlist(_, id):
return accounts.api.playlist(id) return accounts.api.playlist(id)
case let .searchQuery(text, date, duration, order): case let .searchQuery(text, date, duration, order):
@ -241,13 +243,14 @@ struct FavoriteItemView: View {
} }
private var label: String { private var label: String {
if case let .playlist(id) = item.section { switch item.section {
case let .playlist(_, id):
return playlists.find(id: id)?.title ?? "Playlist".localized() return playlists.find(id: id)?.title ?? "Playlist".localized()
} default:
return item.section.label.localized() return item.section.label.localized()
} }
} }
}
struct FavoriteItemView_Previews: PreviewProvider { struct FavoriteItemView_Previews: PreviewProvider {
static var previews: some View { static var previews: some View {

4
Shared/Playlists/PlaylistsView.swift
View File

@ -197,10 +197,12 @@ struct PlaylistsView: View {
editPlaylistButton editPlaylistButton
FavoriteButton(item: FavoriteItem(section: .playlist(currentPlaylist.id))) if let account = accounts.current {
FavoriteButton(item: FavoriteItem(section: .playlist(account.id, currentPlaylist.id)))
.labelStyle(.iconOnly) .labelStyle(.iconOnly)
} }
} }
}
if accounts.signedIn { if accounts.signedIn {
newPlaylistButton newPlaylistButton

7
Shared/Settings/EditFavorites.swift
View File

@ -102,13 +102,14 @@ struct EditFavorites: View {
} }
func label(_ item: FavoriteItem) -> String { func label(_ item: FavoriteItem) -> String {
if case let .playlist(id) = item.section { switch item.section {
case let .playlist(_, id):
return playlistsModel.find(id: id)?.title ?? "Playlist".localized() return playlistsModel.find(id: id)?.title ?? "Playlist".localized()
} default:
return item.section.label.localized() return item.section.label.localized()
} }
} }
}
struct EditFavorites_Previews: PreviewProvider { struct EditFavorites_Previews: PreviewProvider {
static var previews: some View { static var previews: some View {