Merge pull request #124 from wordpress-mobile/fix/more-dark-mode

Dark mode: text and button fixes

Author: frosty

WordPressAuthenticator.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "WordPressAuthenticator"
-  s.version       = "1.8.0-beta.12"
+  s.version       = "1.8.0-beta.13"
   s.summary       = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps."
 
   s.description   = <<-DESC

WordPressAuthenticator/Extensions/WPStyleGuide+Login.swift

@@ -190,12 +190,15 @@ extension WPStyleGuide {
     /// - Returns: A properly styled UIButton
     ///
     class func termsButton() -> UIButton {
+        let style = WordPressAuthenticator.shared.style
+
         let baseString =  NSLocalizedString("By signing up, you agree to our _Terms of Service_.", comment: "Legal disclaimer for signup buttons, the underscores _..._ denote underline")
 
-        let labelString = baseString.underlined()
+        let attrStrNormal = baseString.underlined(color: style.subheadlineColor, underlineColor: style.textButtonColor)
+        let attrStrHighlight = baseString.underlined(color: style.subheadlineColor, underlineColor: style.textButtonHighlightColor)
+        let font = WPStyleGuide.mediumWeightFont(forStyle: .footnote)
 
-        let font = WPStyleGuide.mediumWeightFont(forStyle: .caption2)
-        return textButton(normal: labelString, highlighted: labelString, font: font, alignment: .center)
+        return textButton(normal: attrStrNormal, highlighted: attrStrHighlight, font: font, alignment: .center)
     }
 
     private class func textButton(normal normalString: NSAttributedString, highlighted highlightString: NSAttributedString, font: UIFont, alignment: UIControl.NaturalContentHorizontalAlignment = .leading) -> UIButton {

WordPressAuthenticator/NUX/NUXButton.swift

@@ -10,6 +10,7 @@ import WordPressUI
 
     @objc let activityIndicator: UIActivityIndicatorView = {
         let indicator = UIActivityIndicatorView(style: .white)
+        indicator.color = WordPressAuthenticator.shared.style.primaryTitleColor
         indicator.hidesWhenStopped = true
         return indicator
     }()

WordPressAuthenticator/Signin/LoginSocialErrorCell.swift

@@ -60,10 +60,11 @@ open class LoginSocialErrorCell: UITableViewCell {
         labelStack.axis = .vertical
         labelStack.spacing = Constants.labelSpacing
 
+        let style = WordPressAuthenticator.shared.style
         titleLabel.font = WPStyleGuide.fontForTextStyle(.footnote)
-        titleLabel.textColor = WPStyleGuide.greyDarken30()
+        titleLabel.textColor = style.instructionColor
         descriptionLabel.font = WPStyleGuide.mediumWeightFont(forStyle: .subheadline)
-        descriptionLabel.textColor = WPStyleGuide.darkGrey()
+        descriptionLabel.textColor = style.subheadlineColor
         descriptionLabel.numberOfLines = 0
         descriptionLabel.heightAnchor.constraint(greaterThanOrEqualToConstant: Constants.descriptionMinHeight).isActive = true