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

Various minor fixes

Browse Source
This commit is contained in:
Arkadiusz Fal
2022-11-13 00:07:23 +01:00
parent 4657af2f3d
commit 61d235780d
12 changed files with 71 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Shared/Views/OpenVideosView.swift
View File

@@ -21,18 +21,20 @@ struct OpenVideosView: View {
.frame(minWidth: 600, maxWidth: 800, minHeight: 350, maxHeight: 500)
#else
NavigationView {
openVideos
.toolbar {
ToolbarItem(placement: .navigationBarLeading) {
Button(action: { presentationMode.wrappedValue.dismiss() }) {
Label("Close", systemImage: "xmark")
}
#if !os(tvOS)
.keyboardShortcut(.cancelAction)
#endif
ScrollView(.vertical, showsIndicators: false) {
openVideos
}
.toolbar {
ToolbarItem(placement: .navigationBarLeading) {
Button(action: { presentationMode.wrappedValue.dismiss() }) {
Label("Close", systemImage: "xmark")
}
#if !os(tvOS)
.keyboardShortcut(.cancelAction)
#endif
}
.navigationTitle("Open Videos")
}
.navigationTitle("Open Videos")
#if os(iOS)
.navigationBarTitleDisplayMode(.inline)
#endif

16
Shared/Views/VideoContextMenuView.swift
View File

@@ -226,12 +226,13 @@ struct VideoContextMenuView: View {
}
#if os(iOS)
private var removeDocumentButton: some View {
Button {
@ViewBuilder private var removeDocumentButton: some View {
let action = {
if let url = video.localStream?.localURL {
NavigationModel.shared.presentAlert(
Alert(
title: Text("Are you sure you want to remove this document?"),
message: Text(String(format: "\"%@\" will be irreversibly removed from this device.", video.displayTitle)),
primaryButton: .destructive(Text("Remove")) {
do {
try DocumentsModel.shared.removeDocument(url)
@@ -243,9 +244,14 @@ struct VideoContextMenuView: View {
)
)
}
} label: {
Label("Remove...", systemImage: "trash.fill")
.foregroundColor(Color("AppRedColor"))
}
let label = Label("Remove...", systemImage: "trash.fill")
.foregroundColor(Color("AppRedColor"))
if #available(iOS 15, macOS 12, *) {
Button(role: .destructive, action: action) { label }
} else {
Button(action: action) { label }
}
}
#endif