Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

On iPhone allow saving links from the reader

Browse Source
This commit is contained in:
Jackson Harper
2022-12-28 15:51:03 +08:00
parent bc924f7b12
commit 0c7b8f5036
3 changed files with 48 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift
View File

@ -6,6 +6,7 @@ import Utils
import Views
import WebKit
// swiftlint:disable:next type_body_length
struct WebReaderContainerView: View {
let item: LinkedItem
@ -16,7 +17,6 @@ struct WebReaderContainerView: View {
@State private var showHighlightsView = false
@State private var hasPerformedHighlightMutations = false
@State var showHighlightAnnotationModal = false
@State var safariWebLink: SafariWebLink?
@State private var navBarVisibilityRatio = 1.0
@State private var showDeleteConfirmation = false
@State private var progressViewOpacity = 0.0
@ -31,6 +31,10 @@ struct WebReaderContainerView: View {
@State private var showErrorAlertMessage = false
@State private var showRecommendSheet = false
@State var safariWebLink: SafariWebLink?
@State var displayLinkSheet = false
@State var linkToOpen: URL?
@EnvironmentObject var dataService: DataService
@EnvironmentObject var audioController: AudioController
@Environment(\.presentationMode) var presentationMode: Binding<PresentationMode>
@ -326,7 +330,12 @@ struct WebReaderContainerView: View {
#if os(macOS)
NSWorkspace.shared.open($0)
#elseif os(iOS)
safariWebLink = SafariWebLink(id: UUID(), url: $0)
if UIDevice.current.userInterfaceIdiom == .phone, $0.absoluteString != item.unwrappedPageURLString {
linkToOpen = $0
displayLinkSheet = true
} else {
safariWebLink = SafariWebLink(id: UUID(), url: $0)
}
#endif
},
webViewActionHandler: webViewActionHandler,
@ -347,6 +356,22 @@ struct WebReaderContainerView: View {
showNavBarActionID = UUID()
}
}
.confirmationDialog(linkToOpen?.absoluteString ?? "", isPresented: $displayLinkSheet) {
Button(action: {
if let linkToOpen = linkToOpen {
safariWebLink = SafariWebLink(id: UUID(), url: linkToOpen)
}
}, label: { Text("Open") })
Button(action: {
UIPasteboard.general.string = item.unwrappedPageURLString
showInSnackbar("Link Copied")
}, label: { Text("Copy Link") })
Button(action: {
if let linkToOpen = linkToOpen {
viewModel.saveLink(dataService: dataService, url: linkToOpen)
}
}, label: { Text("Save to Omnivore") })
}
#if os(iOS)
.fullScreenCover(item: $safariWebLink) {
SafariView(url: $0.url)