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 crash on opening player in iOS 14 (fixes #20)

Browse Source
This commit is contained in:
Arkadiusz Fal 2021-12-01 12:22:19 +01:00
parent 500c55689b
commit ff83abd103
1 changed files with 10 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Shared/Player/PlayerQueueView.swift
View File

@ -44,18 +44,11 @@ struct PlayerQueueView: View {
} }
ForEach(player.queue) { item in ForEach(player.queue) { item in
let row = PlayerQueueRow(item: item, fullScreen: $fullScreen) PlayerQueueRow(item: item, fullScreen: $fullScreen)
.contextMenu { .contextMenu {
removeButton(item, history: false) removeButton(item, history: false)
removeAllButton(history: false) removeAllButton(history: false)
} }
if #available(iOS 15.0, macOS 12.0, tvOS 15.0, *) {
row.swipeActions(edge: .trailing, allowsFullSwipe: true) {
removeButton(item, history: false)
}
} else {
row
}
} }
} }
} }
@ -65,20 +58,11 @@ struct PlayerQueueView: View {
if !player.history.isEmpty { if !player.history.isEmpty {
Section(header: Text("Played Previously")) { Section(header: Text("Played Previously")) {
ForEach(player.history) { item in ForEach(player.history) { item in
let row = PlayerQueueRow(item: item, history: true, fullScreen: $fullScreen) PlayerQueueRow(item: item, history: true, fullScreen: $fullScreen)
.contextMenu { .contextMenu {
removeButton(item, history: true) removeButton(item, history: true)
removeAllButton(history: true) removeAllButton(history: true)
} }
#if os(iOS)
if #available(iOS 15.0, macOS 12.0, tvOS 15.0, *) {
row.swipeActions(edge: .trailing, allowsFullSwipe: true) {
removeButton(item, history: true)
}
} else {
row
}
#endif
} }
} }
} }
@ -106,19 +90,11 @@ struct PlayerQueueView: View {
} }
private func removeButton(_ item: PlayerQueueItem, history: Bool) -> some View { private func removeButton(_ item: PlayerQueueItem, history: Bool) -> some View {
if #available(iOS 15.0, macOS 12.0, tvOS 15.0, *) { Button {
return Button(role: .destructive) {
removeButtonAction(item, history: history) removeButtonAction(item, history: history)
} label: { } label: {
Label("Remove", systemImage: "trash") Label("Remove", systemImage: "trash")
} }
} else {
return Button {
removeButtonAction(item, history: history)
} label: {
Label("Remove", systemImage: "trash")
}
}
} }
private func removeButtonAction(_ item: PlayerQueueItem, history: Bool) { private func removeButtonAction(_ item: PlayerQueueItem, history: Bool) {
@ -126,19 +102,11 @@ struct PlayerQueueView: View {
} }
private func removeAllButton(history: Bool) -> some View { private func removeAllButton(history: Bool) -> some View {
if #available(iOS 15.0, macOS 12.0, tvOS 15.0, *) { Button {
return Button(role: .destructive) {
removeAllButtonAction(history: history) removeAllButtonAction(history: history)
} label: { } label: {
Label("Remove All", systemImage: "trash.fill") Label("Remove All", systemImage: "trash.fill")
} }
} else {
return Button {
removeAllButtonAction(history: history)
} label: {
Label("Remove All", systemImage: "trash.fill")
}
}
} }
private func removeAllButtonAction(history: Bool) { private func removeAllButtonAction(history: Bool) {