From f3202561d3c55f94c055938a0610d40469b60d00 Mon Sep 17 00:00:00 2001 From: Satindar Dhillon Date: Wed, 2 Mar 2022 10:47:01 -0800 Subject: [PATCH 1/2] bump swift package deps --- .../xcshareddata/swiftpm/Package.resolved | 8 ++++---- apple/OmnivoreKit/Package.swift | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apple/Omnivore.xcworkspace/xcshareddata/swiftpm/Package.resolved b/apple/Omnivore.xcworkspace/xcshareddata/swiftpm/Package.resolved index d4a24a186..69cd45615 100644 --- a/apple/Omnivore.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/apple/Omnivore.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -150,8 +150,8 @@ "repositoryURL": "https://github.com/maticzav/swift-graphql", "state": { "branch": null, - "revision": "716973b9af4fcce8cb5dd6ac5fda80aff1458b84", - "version": "2.3.0" + "revision": "b1fad45d10194e865685150fedad9ef0845fb254", + "version": "2.3.1" } }, { @@ -177,8 +177,8 @@ "repositoryURL": "https://github.com/siteline/SwiftUI-Introspect.git", "state": { "branch": null, - "revision": "2e09be8af614401bc9f87d40093ec19ce56ccaf2", - "version": "0.1.3" + "revision": "f2616860a41f9d9932da412a8978fec79c06fe24", + "version": "0.1.4" } }, { diff --git a/apple/OmnivoreKit/Package.swift b/apple/OmnivoreKit/Package.swift index 8a5dce02d..9ea66fc10 100644 --- a/apple/OmnivoreKit/Package.swift +++ b/apple/OmnivoreKit/Package.swift @@ -19,8 +19,8 @@ let package = Package( dependencies: [ .package(name: "AppAuth", url: "https://github.com/openid/AppAuth-iOS.git", .upToNextMajor(from: "1.4.0")), .package(url: "https://github.com/Square/Valet", from: "4.1.2"), - .package(url: "https://github.com/maticzav/swift-graphql", from: "2.3.0"), - .package(url: "https://github.com/siteline/SwiftUI-Introspect.git", from: "0.1.3") + .package(url: "https://github.com/maticzav/swift-graphql", from: "2.3.1"), + .package(url: "https://github.com/siteline/SwiftUI-Introspect.git", from: "0.1.4") ], targets: [ .target(name: "App", dependencies: ["Views", "Services", "Models", "Utils"]), From 3af09d95581d66a25c6a7f969cbab279ffb5bf13 Mon Sep 17 00:00:00 2001 From: Satindar Dhillon Date: Wed, 2 Mar 2022 11:39:53 -0800 Subject: [PATCH 2/2] use hiding nav bar on iPad reader view --- .../Sources/App/Views/LinkItemDetailView.swift | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apple/OmnivoreKit/Sources/App/Views/LinkItemDetailView.swift b/apple/OmnivoreKit/Sources/App/Views/LinkItemDetailView.swift index 7753cd4b6..04f1e7e1c 100644 --- a/apple/OmnivoreKit/Sources/App/Views/LinkItemDetailView.swift +++ b/apple/OmnivoreKit/Sources/App/Views/LinkItemDetailView.swift @@ -137,13 +137,13 @@ struct LinkItemDetailView: View { var body: some View { #if os(iOS) - if UIDevice.isIPhone, !viewModel.item.isPDF { - compactInnerBody + if viewModel.item.isPDF { + fixedNavBarReader } else { - innerBody + hidingNavBarReader } #else - innerBody + fixedNavBarReader #endif } @@ -176,7 +176,7 @@ struct LinkItemDetailView: View { } #if os(iOS) - @ViewBuilder private var compactInnerBody: some View { + @ViewBuilder private var hidingNavBarReader: some View { if let webAppWrapperViewModel = viewModel.webAppWrapperViewModel { ZStack { WebAppWrapperView( @@ -232,7 +232,7 @@ struct LinkItemDetailView: View { } #endif - @ViewBuilder private var innerBody: some View { + @ViewBuilder private var fixedNavBarReader: some View { if let pdfURL = viewModel.item.pdfURL { #if os(iOS) PDFProvider.pdfViewerProvider?(pdfURL, viewModel.item)