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

Fix opening channels and playlists

Browse Source
This commit is contained in:
Arkadiusz Fal 2023-05-21 14:01:33 +02:00
parent 4c5ef920b4
commit 97af5a6e0c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Shared/Channels/ChannelPlaylistView.swift
View File

@ -85,7 +85,6 @@ struct ChannelPlaylistView: View {
} }
} }
#endif #endif
#if os(macOS)
.toolbar { .toolbar {
ToolbarItem(placement: .cancellationAction) { ToolbarItem(placement: .cancellationAction) {
if showCloseButton { if showCloseButton {
@ -97,7 +96,9 @@ struct ChannelPlaylistView: View {
.buttonStyle(.plain) .buttonStyle(.plain)
} }
} }
}
#if os(macOS)
.toolbar {
ToolbarItem(placement: playlistButtonsPlacement) { ToolbarItem(placement: playlistButtonsPlacement) {
HStack { HStack {
ListingStyleButtons(listingStyle: $channelPlaylistListingStyle) ListingStyleButtons(listingStyle: $channelPlaylistListingStyle)

2
Shared/Navigation/ContentView.swift
View File

@ -102,7 +102,7 @@ struct ContentView: View {
} }
.onOpenURL { url in .onOpenURL { url in
URLBookmarkModel.shared.saveBookmark(url) URLBookmarkModel.shared.saveBookmark(url)
OpenURLHandler.shared.handle(url) OpenURLHandler(navigationStyle: navigationStyle).handle(url)
} }
.background( .background(
EmptyView().sheet(isPresented: $navigation.presentingAddToPlaylist) { EmptyView().sheet(isPresented: $navigation.presentingAddToPlaylist) {

3
Shared/OpenURLHandler.swift
View File

@ -4,7 +4,6 @@ import Siesta
struct OpenURLHandler { struct OpenURLHandler {
static var firstHandle = true static var firstHandle = true
static var shared = Self()
static let yatteeProtocol = "yattee://" static let yatteeProtocol = "yattee://"
var accounts: AccountsModel { .shared } var accounts: AccountsModel { .shared }
@ -12,7 +11,7 @@ struct OpenURLHandler {
var recents: RecentsModel { .shared } var recents: RecentsModel { .shared }
var player: PlayerModel { .shared } var player: PlayerModel { .shared }
var search: SearchModel { .shared } var search: SearchModel { .shared }
var navigationStyle = NavigationStyle.sidebar var navigationStyle: NavigationStyle
func handle(_ url: URL) { func handle(_ url: URL) {
if accounts.current.isNil { if accounts.current.isNil {