diff --git a/apple/AppStoreScreenshots/AppStoreScreenshots.swift b/apple/AppStoreScreenshots/AppStoreScreenshots.swift index b2b458678..c1e5522f6 100644 --- a/apple/AppStoreScreenshots/AppStoreScreenshots.swift +++ b/apple/AppStoreScreenshots/AppStoreScreenshots.swift @@ -26,7 +26,7 @@ final class AppStoreScreenshots: XCTestCase { setupSnapshot(app) // Display the context menu of the first item in the libary - app.collectionViews.cells.firstMatch.press(forDuration: 2) + // app.collectionViews.cells.firstMatch.press(forDuration: 2) snapshot("LibraryActions") app.children(matching: .window).element(boundBy: 0).tap() @@ -37,7 +37,7 @@ final class AppStoreScreenshots: XCTestCase { setupSnapshot(app) // Move into the reader - app.collectionViews.cells.firstMatch.tap() + // app.collectionViews.cells.firstMatch.tap() snapshot("Reader") } @@ -64,6 +64,21 @@ final class AppStoreScreenshots: XCTestCase { // snapshot("ReaderTTSPlayer") +// app.children(matching: .window).element(boundBy: 0).tap() +// XCUIApplication().buttons["Back"].tap() + } + + func testScreenshotNotebook() throws { + let app = XCUIApplication() + setupSnapshot(app) +// app.collectionViews.cells.firstMatch.tap() +// print("BUTTONS: ", app.buttons.allElementsBoundByIndex.count) +// app.buttons["Audiobook"].tap() +// +// print("MINIPLAYER BUTTONS: ", app.buttons.allElementsBoundByIndex) +// + snapshot("Notebook") + // app.children(matching: .window).element(boundBy: 0).tap() // XCUIApplication().buttons["Back"].tap() } diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift index fcf641923..b8c42dd4e 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift @@ -62,6 +62,7 @@ struct WebReader: PlatformViewRepresentable { webView.scrollView.contentInset.top = readerViewNavBarHeight webView.scrollView.verticalScrollIndicatorInsets.top = readerViewNavBarHeight webView.configuration.userContentController.add(webView, name: "viewerAction") + webView.scrollView.indicatorStyle = ThemeManager.currentTheme.isDark ? UIScrollView.IndicatorStyle.white : UIScrollView.IndicatorStyle.black @@ -113,6 +114,10 @@ struct WebReader: PlatformViewRepresentable { (webView as? OmnivoreWebView)?.updateLabels(labelsJSON: item.labelsJSONString) (webView as? OmnivoreWebView)?.updateTitle(title: item.title ?? "") (webView as? OmnivoreWebView)?.updateJustifyText() + + webView.backgroundColor = UIColor(ThemeManager.currentBgColor) + webView.underPageBackgroundColor = UIColor(ThemeManager.currentBgColor) + webView.scrollView.backgroundColor = UIColor(ThemeManager.currentBgColor) webView.scrollView.indicatorStyle = ThemeManager.currentTheme.isDark ? UIScrollView.IndicatorStyle.white : UIScrollView.IndicatorStyle.black diff --git a/apple/OmnivoreKit/Sources/Views/Article/OmnivoreWebView.swift b/apple/OmnivoreKit/Sources/Views/Article/OmnivoreWebView.swift index 14bfe3197..1816a4a0f 100644 --- a/apple/OmnivoreKit/Sources/Views/Article/OmnivoreWebView.swift +++ b/apple/OmnivoreKit/Sources/Views/Article/OmnivoreWebView.swift @@ -222,7 +222,6 @@ public final class OmnivoreWebView: WKWebView { } case "pageTapped": - print("currentMenu: ", currentMenu, "menuDisplayed", menuDisplayed) if menuDisplayed { hideMenuAndDismissHighlight() break