Merge master

Author: fdocr

DEV-Simple.xcodeproj/project.pbxproj

@@ -16,6 +16,7 @@
 		73D76751218BA66B00BD13B6 /* DEV_SimpleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73D76750218BA66B00BD13B6 /* DEV_SimpleTests.swift */; };
 		73D7675C218BA66B00BD13B6 /* DEV_SimpleUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73D7675B218BA66B00BD13B6 /* DEV_SimpleUITests.swift */; };
 		73E8ACC72192165E009CE057 /* BrowserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73E8ACC62192165E009CE057 /* BrowserViewController.swift */; };
+		BD35609425719BFE00555C25 /* ThemeManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD35609325719BFE00555C25 /* ThemeManager.swift */; };
 		BD35609225718C4C00555C25 /* Cartfile in Resources */ = {isa = PBXBuildFile; fileRef = BD35609125718C4C00555C25 /* Cartfile */; };
 		BD5C906C21B63CCC000D9F79 /* NetworkReachability.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD5C906B21B63CCC000D9F79 /* NetworkReachability.swift */; };
 		CCEA9AFC219B403100AEF5BE /* ViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCEA9AFB219B403100AEF5BE /* ViewControllerTests.swift */; };
@@ -75,6 +76,7 @@
 		73D7675D218BA66B00BD13B6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		73D767692190CE3900BD13B6 /* DEV-Simple.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "DEV-Simple.entitlements"; sourceTree = "<group>"; };
 		73E8ACC62192165E009CE057 /* BrowserViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrowserViewController.swift; sourceTree = "<group>"; };
+		BD35609325719BFE00555C25 /* ThemeManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeManager.swift; sourceTree = "<group>"; };
 		BD35609125718C4C00555C25 /* Cartfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cartfile; sourceTree = SOURCE_ROOT; };
 		BD5C906B21B63CCC000D9F79 /* NetworkReachability.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkReachability.swift; sourceTree = "<group>"; };
 		CCEA9AFB219B403100AEF5BE /* ViewControllerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewControllerTests.swift; sourceTree = "<group>"; };
@@ -132,6 +134,7 @@
 				1B032B1721E409FE00A2108A /* Globals.swift */,
 				DC65E65325656AF600EE3446 /* Notification+DEV.swift */,
 				BD5C906B21B63CCC000D9F79 /* NetworkReachability.swift */,
+				BD35609325719BFE00555C25 /* ThemeManager.swift */,
 			);
 			path = Utilities;
 			sourceTree = "<group>";
@@ -405,6 +408,7 @@
 				73D7673C218BA66700BD13B6 /* AppDelegate.swift in Sources */,
 				1B032B1821E409FE00A2108A /* Globals.swift in Sources */,
 				BD5C906C21B63CCC000D9F79 /* NetworkReachability.swift in Sources */,
+				BD35609425719BFE00555C25 /* ThemeManager.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

DEV-Simple/Utilities/ThemeManager.swift

@@ -0,0 +1,67 @@
+//
+//  ThemeManager.swift
+//  DEV-Simple
+//
+//  Created by Daniel Chick on 11/27/20.
+//  Copyright © 2020 DEV. All rights reserved.
+//
+
+import UIKit
+import ForemWebView
+
+class ThemeManager {
+    private(set) static var useLightIcons = false
+
+    static func applyTheme(to viewController: ViewController) {
+        guard let webView = viewController.webView else { return }
+
+        let theme = webView.userData?.theme() ?? .base
+        let config = getThemeColor(for: theme)
+
+        viewController.navigationToolBar.barTintColor = config.barTintColor
+        viewController.view.backgroundColor = config.backgroundColor
+
+        viewController.navigationToolBar.isTranslucent = !useLightIcons
+        viewController.safariButton.tintColor = useLightIcons ? UIColor.white : ThemeColors.darkBackgroundColor
+        viewController.backButton.tintColor = useLightIcons ? UIColor.white : ThemeColors.darkBackgroundColor
+        viewController.forwardButton.tintColor = useLightIcons ? UIColor.white : ThemeColors.darkBackgroundColor
+        viewController.refreshButton.tintColor = useLightIcons ? UIColor.white : ThemeColors.darkBackgroundColor
+        viewController.activityIndicator.color = useLightIcons ? UIColor.white : ThemeColors.darkBackgroundColor
+    }
+
+    private static func getThemeColor(for theme: ForemWebViewTheme) -> ThemeConfig {
+        switch theme {
+        case .night:
+            useLightIcons = true
+            return ThemeConfig.night
+        case .hacker:
+            useLightIcons = true
+            return ThemeConfig.hacker
+        case .pink:
+            useLightIcons = true
+            return ThemeConfig.pink
+        case .minimal:
+            useLightIcons = false
+            return ThemeConfig.minimal
+        default:
+            useLightIcons = false
+            return ThemeConfig.base
+        }
+    }
+}
+
+private struct ThemeConfig {
+    let barTintColor: UIColor
+    let backgroundColor: UIColor
+}
+
+extension ThemeConfig {
+    private static let devPink = UIColor(red: 250/255, green: 70/255, blue: 129/255, alpha: 1)
+
+    static let night = ThemeConfig(barTintColor: ThemeColors.darkBackgroundColor,
+                                   backgroundColor: ThemeColors.darkBackgroundColor)
+    static let hacker = ThemeConfig(barTintColor: .black, backgroundColor: .black)
+    static let pink = ThemeConfig(barTintColor: devPink, backgroundColor: devPink)
+    static let base = ThemeConfig(barTintColor: .white, backgroundColor: .white)
+    static let minimal = ThemeConfig(barTintColor: .white, backgroundColor: .white)
+}

DEV-Simple/ViewController.swift

@@ -24,7 +24,6 @@ class ViewController: UIViewController {
     @IBOutlet weak var activityIndicator: UIActivityIndicatorView!
     @IBOutlet weak var navigationToolBar: UIToolbar!
 
-    var useDarkMode = false
     var pushNotificationSubscription = ""
 
     lazy var errorBanner: NotificationBanner = {
@@ -124,27 +123,8 @@ class ViewController: UIViewController {
 
         backButton.isEnabled = webView.canGoBack
         forwardButton.isEnabled = webView.canGoForward
-        switch webView.userData?.theme() {
-        case .night:
-            useDarkMode = true
-            navigationToolBar.barTintColor = ThemeColors.darkBackgroundColor
-            view.backgroundColor = ThemeColors.darkBackgroundColor
-        case .hacker:
-            useDarkMode = true
-            navigationToolBar.barTintColor = UIColor.black
-            view.backgroundColor = UIColor.black
-        default:
-            useDarkMode = false
-            navigationToolBar.barTintColor = UIColor.white
-            view.backgroundColor = UIColor.white
-        }
 
-        navigationToolBar.isTranslucent = !useDarkMode
-        safariButton.tintColor = useDarkMode ? UIColor.white : ThemeColors.darkBackgroundColor
-        backButton.tintColor = useDarkMode ? UIColor.white : ThemeColors.darkBackgroundColor
-        forwardButton.tintColor = useDarkMode ? UIColor.white : ThemeColors.darkBackgroundColor
-        refreshButton.tintColor = useDarkMode ? UIColor.white : ThemeColors.darkBackgroundColor
-        activityIndicator.color = useDarkMode ? UIColor.white : ThemeColors.darkBackgroundColor
+        ThemeManager.applyTheme(to: self)
         setNeedsStatusBarAppearanceUpdate()
     }
 
@@ -181,10 +161,10 @@ class ViewController: UIViewController {
     }
 
     override var preferredStatusBarStyle: UIStatusBarStyle {
-        if !useDarkMode && traitCollection.userInterfaceStyle == .dark {
+        if !ThemeManager.useLightIcons && traitCollection.userInterfaceStyle == .dark {
             return UIStatusBarStyle.init(rawValue: ThemeColors.statusBarStyleDarkContentRawValue)!
         }
-        return useDarkMode ? .lightContent : .default
+        return ThemeManager.useLightIcons ? .lightContent : .default
     }
 
     private func setupObservers() {