From 6a41484bca4a775912e8492c231f5646c60bb895 Mon Sep 17 00:00:00 2001 From: Satindar Dhillon Date: Wed, 23 Feb 2022 21:24:05 -0800 Subject: [PATCH] set navBarHeight in one place --- .../Sources/Binders/Views/LinkItemDetailView.swift | 2 +- apple/OmnivoreKit/Sources/Views/Article/WebAppView.swift | 6 ++++-- .../Sources/Views/Article/WebAppViewCoordinator.swift | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apple/OmnivoreKit/Sources/Binders/Views/LinkItemDetailView.swift b/apple/OmnivoreKit/Sources/Binders/Views/LinkItemDetailView.swift index ac491a6cb..68fe931bb 100644 --- a/apple/OmnivoreKit/Sources/Binders/Views/LinkItemDetailView.swift +++ b/apple/OmnivoreKit/Sources/Binders/Views/LinkItemDetailView.swift @@ -180,7 +180,7 @@ struct LinkItemDetailView: View { .padding(.horizontal) .scaleEffect(navBarVisibilityRatio) } - .frame(height: LinkItemDetailView.navBarHeight * navBarVisibilityRatio) + .frame(height: readerViewNavBarHeight * navBarVisibilityRatio) .opacity(navBarVisibilityRatio) .background(Color.systemBackground) } diff --git a/apple/OmnivoreKit/Sources/Views/Article/WebAppView.swift b/apple/OmnivoreKit/Sources/Views/Article/WebAppView.swift index bc131ad93..2ab5680ef 100644 --- a/apple/OmnivoreKit/Sources/Views/Article/WebAppView.swift +++ b/apple/OmnivoreKit/Sources/Views/Article/WebAppView.swift @@ -3,6 +3,8 @@ import SwiftUI import Utils import WebKit +public let readerViewNavBarHeight = 50.0 + #if os(iOS) struct WebAppView: UIViewRepresentable { let request: URLRequest @@ -34,8 +36,8 @@ import WebKit webView.backgroundColor = UIColor.clear webView.configuration.userContentController = contentController webView.scrollView.delegate = context.coordinator - webView.scrollView.contentInset.top = 50.0 // TODO: LinkItemDetailView.navBarHeight - webView.scrollView.verticalScrollIndicatorInsets.top = 50.0 // TODO: LinkItemDetailView.navBarHeight + webView.scrollView.contentInset.top = readerViewNavBarHeight + webView.scrollView.verticalScrollIndicatorInsets.top = readerViewNavBarHeight for action in WebViewAction.allCases { webView.configuration.userContentController.add(context.coordinator, name: action.rawValue) diff --git a/apple/OmnivoreKit/Sources/Views/Article/WebAppViewCoordinator.swift b/apple/OmnivoreKit/Sources/Views/Article/WebAppViewCoordinator.swift index a14acfb53..96ab85343 100644 --- a/apple/OmnivoreKit/Sources/Views/Article/WebAppViewCoordinator.swift +++ b/apple/OmnivoreKit/Sources/Views/Article/WebAppViewCoordinator.swift @@ -2,7 +2,6 @@ import SwiftUI import WebKit final class WebAppViewCoordinator: NSObject { - let navBarHeight = 50.0 // TODO: LinkItemDetailView.navBarHeight var webViewActionHandler: (WKScriptMessage) -> Void = { _ in } var linkHandler: (URL) -> Void = { _ in } var needsReload = true