From ebd7018a144fd8d5869a45218457395d850d8cf9 Mon Sep 17 00:00:00 2001 From: Satindar Dhillon Date: Mon, 21 Mar 2022 13:15:03 -0700 Subject: [PATCH] set wedreader server addresses --- .../App/Views/WebReader/WebReader.swift | 5 +- .../Views/WebReader/WebReaderContent.swift | 46 +++++----- .../Sources/Models/AppEnvironment.swift | 19 ++++- .../Sources/Utils/FeatureFlags.swift | 2 +- .../Sources/Views/Resources/fonts.css | 84 ------------------- 5 files changed, 48 insertions(+), 108 deletions(-) delete mode 100644 apple/OmnivoreKit/Sources/Views/Resources/fonts.css diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift index 29c6adb8f..ec83f6721 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift @@ -169,6 +169,7 @@ struct WebReaderContainerView: View { navBarVisibilityRatio = $0 }, authToken: authenticator.authToken ?? "", + appEnv: dataService.appEnvironment, increaseFontActionID: $increaseFontActionID, decreaseFontActionID: $decreaseFontActionID, annotationSaveTransactionID: nil @@ -249,6 +250,7 @@ struct WebReader: UIViewRepresentable { let webViewActionHandler: (WKScriptMessage) -> Void let navBarVisibilityRatioUpdater: (Double) -> Void let authToken: String + let appEnv: AppEnvironment @Binding var increaseFontActionID: UUID? @Binding var decreaseFontActionID: UUID? @@ -275,7 +277,8 @@ struct WebReader: UIViewRepresentable { item: item, authToken: authToken, isDark: UITraitCollection.current.userInterfaceStyle == .dark, - fontSize: fontSize() + fontSize: fontSize(), + appEnv: appEnv ) .styledContent, baseURL: ViewsPackage.bundleURL diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContent.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContent.swift index c2570dca9..ff08b1bb5 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContent.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContent.swift @@ -8,19 +8,22 @@ struct WebReaderContent { let item: FeedItem let themeKey: String let authToken: String + let appEnv: AppEnvironment init( htmlContent: String, item: FeedItem, authToken: String, isDark: Bool, - fontSize: Int + fontSize: Int, + appEnv: AppEnvironment ) { self.textFontSize = fontSize self.content = htmlContent self.item = item self.themeKey = isDark ? "Gray" : "LightGray" self.authToken = authToken + self.appEnv = appEnv } // swiftlint:disable line_length @@ -31,32 +34,33 @@ struct WebReaderContent { -