Merge pull request #721 from hilmyveradin/issue_720_credits-dark-mode

Fix Credits Dark Mode Issues and refactor webview code
OneBusAway · Apr 5, 2024 · e8eb008 · e8eb008
2 parents 47b6a80 + a1e0770
commit e8eb008
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/OBAKit/Alerts/TransitAlertDetailViewController.swift b/OBAKit/Alerts/TransitAlertDetailViewController.swift
@@ -67,6 +67,8 @@ class TransitAlertDetailViewController: UIViewController, WKScriptMessageHandler
 
         let view = DocumentWebView(frame: view.bounds, configuration: configuration)
         view.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        view.isOpaque = false
+        view.backgroundColor = ThemeColors.shared.systemBackground
 
         if #available(iOS 16.4, *) {
             view.isInspectable = true

diff --git a/OBAKit/Settings/CreditsViewController.swift b/OBAKit/Settings/CreditsViewController.swift
@@ -84,6 +84,8 @@ class CreditViewerController: UIViewController {
     override func viewDidLoad() {
         webView.frame = view.bounds
         webView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        webView.isOpaque = false
+        webView.backgroundColor = ThemeColors.shared.systemBackground
         view.addSubview(webView)
 
         let mungedCredits = "<code>\(licenseText.replacingOccurrences(of: "\n", with: "<br>"))</code>"

diff --git a/OBAKit/WebView/DocumentWebView.swift b/OBAKit/WebView/DocumentWebView.swift
@@ -25,20 +25,23 @@ class DocumentWebView: WKWebView {
     /// - Parameter htmlFragment: The content to render in the web view.
     /// - Parameter actionButtonTitle: The title of the optional button shown at the bottom of the web view.
     func setPageContent(_ htmlFragment: String, actionButtonTitle: String? = nil) {
-        var content = pageBody.replacingOccurrences(of: "{{{oba_page_content}}}", with: htmlFragment)
-        content = content.replacingOccurrences(of: "{{{accent_color}}}", with: accentHexColor)
-        content = content.replacingOccurrences(of: "{{{accent_foreground_color}}}", with: accentForegroundColor)
-
-        if let actionButtonTitle {
-            let buttonText = """
-            <div class="actions__button-container">
-                <button type="button" class="actions__button-container__button" onclick="window.webkit.messageHandlers.actionButtonClicked.postMessage({})">
-                    \(actionButtonTitle)
-                </button>
-            </div>
-            """
-            content = content.replacingOccurrences(of: "{{{oba_page_actions}}}", with: buttonText)
+        var content = pageBody
+            .replacingOccurrences(of: "{{{oba_page_content}}}", with: htmlFragment)
+            .replacingOccurrences(of: "{{{accent_color}}}", with: accentHexColor)
+            .replacingOccurrences(of: "{{{accent_foreground_color}}}", with: accentForegroundColor)
+
+        // Construct button HTML if actionButtonTitle is present and not empty
+        let buttonText: String? = actionButtonTitle.flatMap { title in
+            title.isEmpty ? nil : """
+                <div class="actions__button-container">
+                    <button type="button" class="actions__button-container__button" onclick="window.webkit.messageHandlers.actionButtonClicked.postMessage({})">
+                        \(title)
+                    </button>
+                </div>
+                """
         }
+        // Use coalescing operator to remove action button placeholder if buttonText is nil
+        content = content.replacingOccurrences(of: "{{{oba_page_actions}}}", with: buttonText ?? "")
 
         loadHTMLString(content, baseURL: nil)
     }