Expose view controller background colors for styling by host apps

WordPressAuthenticator/Authenticator/WordPressAuthenticatorStyles.swift

@@ -1,4 +1,5 @@
-
+import UIKit
+import Gridicons
 
 // MARK: - WordPress Authenticator Styles
 //
@@ -41,9 +42,17 @@ public struct WordPressAuthenticatorStyle {
     ///
     public let subheadlineColor: UIColor
 
+    /// Style: Login screen background colors
+    ///
+    public let viewControllerBackgroundColor: UIColor
+
+    /// Style: nav bar logo
+    ///
+    public let navBarImage: UIImage
+
     /// Designated initializer
     ///
-    public init(primaryNormalBackgroundColor: UIColor, primaryNormalBorderColor: UIColor, primaryHighlightBackgroundColor: UIColor, primaryHighlightBorderColor: UIColor, secondaryNormalBackgroundColor: UIColor, secondaryNormalBorderColor: UIColor, secondaryHighlightBackgroundColor: UIColor, secondaryHighlightBorderColor: UIColor, disabledBackgroundColor: UIColor, disabledBorderColor: UIColor, primaryTitleColor: UIColor, secondaryTitleColor: UIColor, disabledTitleColor: UIColor, subheadlineColor: UIColor) {
+    public init(primaryNormalBackgroundColor: UIColor, primaryNormalBorderColor: UIColor, primaryHighlightBackgroundColor: UIColor, primaryHighlightBorderColor: UIColor, secondaryNormalBackgroundColor: UIColor, secondaryNormalBorderColor: UIColor, secondaryHighlightBackgroundColor: UIColor, secondaryHighlightBorderColor: UIColor, disabledBackgroundColor: UIColor, disabledBorderColor: UIColor, primaryTitleColor: UIColor, secondaryTitleColor: UIColor, disabledTitleColor: UIColor, subheadlineColor: UIColor, viewControllerBackgroundColor: UIColor, navBarImage: UIImage) {
         self.primaryNormalBackgroundColor = primaryNormalBackgroundColor
         self.primaryNormalBorderColor = primaryNormalBorderColor
         self.primaryHighlightBackgroundColor = primaryHighlightBackgroundColor
@@ -58,6 +67,8 @@ public struct WordPressAuthenticatorStyle {
         self.secondaryTitleColor = secondaryTitleColor
         self.disabledTitleColor = disabledTitleColor
         self.subheadlineColor = subheadlineColor
+        self.viewControllerBackgroundColor = viewControllerBackgroundColor
+        self.navBarImage = navBarImage
     }
 }
 
@@ -76,6 +87,9 @@ public extension WordPressAuthenticatorStyle {
                                            primaryTitleColor: UIColor.white,
                                            secondaryTitleColor: WPStyleGuide.darkGrey(),
                                            disabledTitleColor: WPStyleGuide.greyLighten30(),
-                                           subheadlineColor: WPStyleGuide.wordPressBlue())
+                                           subheadlineColor: WPStyleGuide.wordPressBlue(),
+                                           viewControllerBackgroundColor: WPStyleGuide.lightGrey(),
+                                           navBarImage: Gridicon.iconOfType(.mySites)
+        )
     }
 }

WordPressAuthenticator/NUX/NUXViewControllerBase.swift

@@ -144,7 +144,7 @@ extension NUXViewControllerBase where Self: UIViewController, Self: UIViewContro
     /// Adds the WP logo to the nav controller
     ///
     public func addWordPressLogoToNavController() {
-        let image = Gridicon.iconOfType(.mySites)
+        let image = WordPressAuthenticator.shared.style.navBarImage
         let imageView = UIImageView(image: image.imageWithTintColor(UIColor.white))
         navigationItem.titleView = imageView
     }

WordPressAuthenticator/Signin/Login.storyboard

@@ -107,7 +107,6 @@
                                 </connections>
                             </containerView>
                         </subviews>
-                        <color key="backgroundColor" red="0.95294117649999999" green="0.96470588239999999" blue="0.97254901959999995" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstItem="6cw-FO-hjb" firstAttribute="leading" secondItem="EnO-7f-1yO" secondAttribute="leading" id="7Z8-mD-FWN"/>
                             <constraint firstAttribute="trailing" secondItem="G3G-Ap-6ix" secondAttribute="trailing" id="96a-eB-JlD"/>
@@ -320,7 +319,6 @@
                                 </variation>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" red="0.95294117649999999" green="0.96470588239999999" blue="0.97254901959999995" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstItem="ozJ-hT-OEw" firstAttribute="top" secondItem="bn3-aC-RIM" secondAttribute="bottom" id="S6n-FZ-9Yc"/>
                             <constraint firstAttribute="trailing" secondItem="ozJ-hT-OEw" secondAttribute="trailing" id="Uuo-bm-Be2"/>
@@ -547,7 +545,6 @@
                                 </variation>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" red="0.95294117649999999" green="0.96470588239999999" blue="0.97254901959999995" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstItem="Ktl-It-Kmo" firstAttribute="top" secondItem="dSZ-FR-Cdo" secondAttribute="bottom" id="1qL-V5-NRd"/>
                             <constraint firstItem="dSZ-FR-Cdo" firstAttribute="leading" secondItem="HTO-Y8-god" secondAttribute="leadingMargin" constant="-20" id="E8T-56-rvq"/>
@@ -721,7 +718,6 @@
                                 </variation>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" red="0.95294117649999999" green="0.96470588239999999" blue="0.97254901959999995" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstItem="7OQ-0t-1zq" firstAttribute="centerX" secondItem="tEh-Nj-xof" secondAttribute="centerX" id="1g8-p2-jnJ"/>
                             <constraint firstItem="7OQ-0t-1zq" firstAttribute="top" secondItem="dAs-4b-ACP" secondAttribute="bottom" id="6Lb-n5-RrE"/>
@@ -885,7 +881,6 @@
                                 </variation>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" red="0.95294117649999999" green="0.96470588239999999" blue="0.97254901959999995" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstAttribute="trailingMargin" secondItem="hTY-xb-H5h" secondAttribute="trailing" constant="-20" id="23h-QU-eyB"/>
                             <constraint firstItem="hTY-xb-H5h" firstAttribute="centerX" secondItem="cm5-76-st7" secondAttribute="centerX" id="PRb-I7-O07"/>
@@ -983,7 +978,6 @@
                                 </connections>
                             </button>
                         </subviews>
-                        <color key="backgroundColor" red="0.95294117649999999" green="0.96470588239999999" blue="0.97254901959999995" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstItem="B6x-b7-hU9" firstAttribute="width" secondItem="HnR-5a-suO" secondAttribute="width" id="AAB-N8-Iyv"/>
                             <constraint firstAttribute="trailingMargin" secondItem="Mq6-n0-6iO" secondAttribute="trailing" constant="20" id="CoO-Ax-hqg"/>
@@ -1133,7 +1127,6 @@
                                 </variation>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" red="0.95294117649999999" green="0.96470588239999999" blue="0.97254901959999995" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstItem="a59-c7-WBk" firstAttribute="centerX" secondItem="CvY-vN-fn9" secondAttribute="centerX" id="R8E-Gd-gVZ"/>
                             <constraint firstItem="a59-c7-WBk" firstAttribute="leading" secondItem="CvY-vN-fn9" secondAttribute="leadingMargin" constant="-20" id="atB-bL-5qa"/>
@@ -1182,10 +1175,10 @@
     <inferredMetricsTieBreakers>
         <segue reference="kRR-qz-Hu2"/>
         <segue reference="ySQ-EM-6JI"/>
-        <segue reference="sIC-Hv-FJw"/>
-        <segue reference="1xT-tL-sp6"/>
-        <segue reference="iD4-VS-n3M"/>
-        <segue reference="EmH-Av-vhT"/>
-        <segue reference="HMT-Z5-QHr"/>
+        <segue reference="nCA-u7-fKm"/>
+        <segue reference="D3h-Su-Jwk"/>
+        <segue reference="swV-lc-6gI"/>
+        <segue reference="gD5-d0-X3t"/>
+        <segue reference="aSC-hU-lzE"/>
     </inferredMetricsTieBreakers>
 </document>

WordPressAuthenticator/Signin/Login2FAViewController.swift

@@ -30,6 +30,7 @@ class Login2FAViewController: LoginViewController, NUXKeyboardResponder, UITextF
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        styleBackground()
         localizeControls()
         configureTextFields()
         configureSubmitButton(animating: false)
@@ -82,6 +83,11 @@ class Login2FAViewController: LoginViewController, NUXKeyboardResponder, UITextF
 
     // MARK: Configuration Methods
 
+    /// Styles the view's background color. Defaults to WPStyleGuide.lightGrey()
+    ///
+    @objc func styleBackground() {
+        view.backgroundColor = WordPressAuthenticator.shared.style.viewControllerBackgroundColor
+    }
 
     /// Assigns localized strings to various UIControl defined in the storyboard.
     ///

WordPressAuthenticator/Signin/LoginEmailViewController.swift

@@ -42,6 +42,7 @@ open class LoginEmailViewController: LoginViewController, NUXKeyboardResponder {
     override open func viewDidLoad() {
         super.viewDidLoad()
 
+        styleBackground()
         localizeControls()
         setupOnePasswordButtonIfNeeded()
         addGoogleButton()
@@ -97,6 +98,13 @@ open class LoginEmailViewController: LoginViewController, NUXKeyboardResponder {
     }
 
 
+    /// Styles the view's background color. Defaults to WPStyleGuide.lightGrey()
+    ///
+    private func styleBackground() {
+        view.backgroundColor = WordPressAuthenticator.shared.style.viewControllerBackgroundColor
+    }
+
+
     /// Assigns localized strings to various UIControl defined in the storyboard.
     ///
     func localizeControls() {

WordPressAuthenticator/Signin/LoginLinkRequestViewController.swift

@@ -24,6 +24,7 @@ class LoginLinkRequestViewController: LoginViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        styleBackground()
         localizeControls()
 
         let email = loginFields.username
@@ -50,6 +51,12 @@ class LoginLinkRequestViewController: LoginViewController {
 
     // MARK: - Configuration
 
+    /// Styles the view's background color. Defaults to WPStyleGuide.lightGrey()
+    ///
+    @objc func styleBackground() {
+        view.backgroundColor = WordPressAuthenticator.shared.style.viewControllerBackgroundColor
+    }
+
     /// Assigns localized strings to various UIControl defined in the storyboard.
     ///
     @objc func localizeControls() {

WordPressAuthenticator/Signin/LoginPrologueViewController.swift

@@ -14,6 +14,11 @@ class LoginPrologueViewController: LoginViewController {
 
     // MARK: - Lifecycle Methods
 
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        styleBackground()
+    }
+
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         configureButtonVC()
@@ -55,6 +60,10 @@ class LoginPrologueViewController: LoginViewController {
         }
     }
 
+    private func styleBackground() {
+        view.backgroundColor = WordPressAuthenticator.shared.style.viewControllerBackgroundColor
+    }
+
     private func configureButtonVC() {
         guard let buttonViewController = buttonViewController else {
             return

WordPressAuthenticator/Signin/LoginSelfHostedViewController.swift

@@ -32,6 +32,7 @@ class LoginSelfHostedViewController: LoginViewController, NUXKeyboardResponder {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        styleBackground()
         configureHeader()
         localizeControls()
         setupOnePasswordButtonIfNeeded()
@@ -72,6 +73,11 @@ class LoginSelfHostedViewController: LoginViewController, NUXKeyboardResponder {
 
     // MARK: - Setup and Configuration
 
+    /// Styles the view's background color. Defaults to WPStyleGuide.lightGrey()
+    ///
+    private func styleBackground() {
+        view.backgroundColor = WordPressAuthenticator.shared.style.viewControllerBackgroundColor
+    }
 
     /// Assigns localized strings to various UIControl defined in the storyboard.
     ///

WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift

@@ -29,6 +29,8 @@ class LoginSiteAddressViewController: LoginViewController, NUXKeyboardResponder
 
     override func viewDidLoad() {
         super.viewDidLoad()
+
+        styleBackground()
         localizeControls()
     }
 
@@ -64,6 +66,12 @@ class LoginSiteAddressViewController: LoginViewController, NUXKeyboardResponder
     // MARK: Setup and Configuration
 
 
+    /// Styles the view's background color. Defaults to WPStyleGuide.lightGrey()
+    ///
+    @objc func styleBackground() {
+        view.backgroundColor = WordPressAuthenticator.shared.style.viewControllerBackgroundColor
+    }
+
     /// Assigns localized strings to various UIControl defined in the storyboard.
     ///
     @objc func localizeControls() {

WordPressAuthenticator/Signin/LoginWPComViewController.swift

@@ -32,6 +32,7 @@ class LoginWPComViewController: LoginViewController, NUXKeyboardResponder {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        styleBackground()
         localizeControls()
         setupOnePasswordButtonIfNeeded()
     }
@@ -118,6 +119,12 @@ class LoginWPComViewController: LoginViewController, NUXKeyboardResponder {
         emailLabel?.text = loginFields.username
     }
 
+    /// Styles the view's background color. Defaults to WPStyleGuide.lightGrey()
+    ///
+    @objc func styleBackground() {
+        view.backgroundColor = WordPressAuthenticator.shared.style.viewControllerBackgroundColor
+    }
+
     @objc func localizeControls() {
         if let service = loginFields.meta.socialService, service == SocialServiceName.google {
             instructionLabel?.text = NSLocalizedString("To proceed with this Google account, please first log in with your WordPress.com password. This will only be asked once.", comment: "")