From f6da7d62512135a9cc1e2b6140399c36f0b7d428 Mon Sep 17 00:00:00 2001 From: Satindar Dhillon Date: Wed, 29 Jun 2022 22:57:06 -0700 Subject: [PATCH] enable pdfreader for macos --- .../App/Views/LinkItemDetailView.swift | 38 +++++++++---------- .../WebReader/WebReaderLoadingContainer.swift | 5 ++- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/apple/OmnivoreKit/Sources/App/Views/LinkItemDetailView.swift b/apple/OmnivoreKit/Sources/App/Views/LinkItemDetailView.swift index 8ba1a95b1..029bf1c4a 100644 --- a/apple/OmnivoreKit/Sources/App/Views/LinkItemDetailView.swift +++ b/apple/OmnivoreKit/Sources/App/Views/LinkItemDetailView.swift @@ -106,29 +106,25 @@ struct LinkItemDetailView: View { @State var hideNavBar = false var body: some View { - #if os(iOS) - if viewModel.pdfItem != nil { - fixedNavBarReader - .navigationBarHidden(hideNavBar) - .task { - hideNavBar = true - viewModel.trackReadEvent() - } - } else if let item = viewModel.item { - WebReaderContainerView(item: item) - .navigationBarHidden(hideNavBar) - .task { - hideNavBar = true - viewModel.trackReadEvent() - } + if viewModel.pdfItem != nil { + fixedNavBarReader + #if os(iOS) + .navigationBarHidden(hideNavBar) + #endif + .task { + hideNavBar = true + viewModel.trackReadEvent() } - #else - // TODO: make pdf item work for macos - if let item = viewModel.item { - WebReaderContainerView(item: item) - .task { viewModel.trackReadEvent() } + } else if let item = viewModel.item { + WebReaderContainerView(item: item) + #if os(iOS) + .navigationBarHidden(hideNavBar) + #endif + .task { + hideNavBar = true + viewModel.trackReadEvent() } - #endif + } } var navBar: some View { diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderLoadingContainer.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderLoadingContainer.swift index a89b39bef..49f3665f3 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderLoadingContainer.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderLoadingContainer.swift @@ -3,6 +3,7 @@ import Models import Services import SwiftUI import Utils +import Views @MainActor final class WebReaderLoadingContainerViewModel: ObservableObject { @Published var item: LinkedItem? @@ -42,7 +43,9 @@ public struct WebReaderLoadingContainer: View { .accentColor(.appGrayTextContrast) .task { viewModel.trackReadEvent() } #else - // TODO: implement pdf view for macOS + if let pdfURL = pdfItem.pdfURL { + PDFWrapperView(pdfURL: pdfURL) + } #endif } else { WebReaderContainerView(item: item)