Improve some style names

Author: nheagy

WordPressAuthenticator/Authenticator/WordPressAuthenticatorStyles.swift

@@ -41,9 +41,9 @@ public struct WordPressAuthenticatorStyle {
 
     /// Style: Text Buttons
     ///
-    public let textButton: UIColor
+    public let textButtonColor: UIColor
 
-    public let textButtonHighlight: UIColor
+    public let textButtonHighlightColor: UIColor
 
     /// Style: Labels
     ///
@@ -71,7 +71,7 @@ public struct WordPressAuthenticatorStyle {
 
     /// 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, textButton: UIColor, textButtonHighlight: UIColor, instructionColor: UIColor, subheadlineColor: UIColor, placeholderColor: UIColor, viewControllerBackgroundColor: UIColor, navBarImage: UIImage, prologueBackgroundColor: UIColor = WPStyleGuide.wordPressBlue(), prologueTitleColor: UIColor = .white) {
+    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, textButtonColor: UIColor, textButtonHighlightColor: UIColor, instructionColor: UIColor, subheadlineColor: UIColor, placeholderColor: UIColor, viewControllerBackgroundColor: UIColor, navBarImage: UIImage, prologueBackgroundColor: UIColor = WPStyleGuide.wordPressBlue(), prologueTitleColor: UIColor = .white) {
         self.primaryNormalBackgroundColor = primaryNormalBackgroundColor
         self.primaryNormalBorderColor = primaryNormalBorderColor
         self.primaryHighlightBackgroundColor = primaryHighlightBackgroundColor
@@ -85,8 +85,8 @@ public struct WordPressAuthenticatorStyle {
         self.primaryTitleColor = primaryTitleColor
         self.secondaryTitleColor = secondaryTitleColor
         self.disabledTitleColor = disabledTitleColor
-        self.textButton = textButton
-        self.textButtonHighlight = textButtonHighlight
+        self.textButtonColor = textButtonColor
+        self.textButtonHighlightColor = textButtonHighlightColor
         self.instructionColor = instructionColor
         self.subheadlineColor = subheadlineColor
         self.placeholderColor = placeholderColor

WordPressAuthenticator/Extensions/WPStyleGuide+Login.swift

@@ -7,8 +7,8 @@ final class SubheadlineButton: UIButton {
         super.traitCollectionDidChange(previousTraitCollection)
         if previousTraitCollection?.preferredContentSizeCategory != traitCollection.preferredContentSizeCategory {
             titleLabel?.font = WPStyleGuide.mediumWeightFont(forStyle: .subheadline)
-            setTitleColor(WordPressAuthenticator.shared.style.textButton, for: .normal)
-            setTitleColor(WordPressAuthenticator.shared.style.textButtonHighlight, for: .highlighted)
+            setTitleColor(WordPressAuthenticator.shared.style.textButtonColor, for: .normal)
+            setTitleColor(WordPressAuthenticator.shared.style.textButtonHighlightColor, for: .highlighted)
         }
     }
 }
@@ -104,8 +104,8 @@ extension WPStyleGuide {
     class func googleLoginButton() -> UIButton {
         let baseString =  NSLocalizedString("{G} Log in with Google.", comment: "Label for button to log in using Google. The {G} will be replaced with the Google logo.")
 
-        let attrStrNormal = googleButtonString(baseString, linkColor: WordPressAuthenticator.shared.style.textButton)
-        let attrStrHighlight = googleButtonString(baseString, linkColor: WordPressAuthenticator.shared.style.textButtonHighlight)
+        let attrStrNormal = googleButtonString(baseString, linkColor: WordPressAuthenticator.shared.style.textButtonColor)
+        let attrStrHighlight = googleButtonString(baseString, linkColor: WordPressAuthenticator.shared.style.textButtonHighlightColor)
 
         let font = WPStyleGuide.mediumWeightFont(forStyle: .subheadline)
 
@@ -119,8 +119,8 @@ extension WPStyleGuide {
     class func selfHostedLoginButton() -> UIButton {
         let baseString =  NSLocalizedString("Log in by entering your site address.", comment: "Label for button to log in using your site address.")
 
-        let attrStrNormal = selfHostedButtonString(baseString, linkColor:  WordPressAuthenticator.shared.style.textButton)
-        let attrStrHighlight = selfHostedButtonString(baseString, linkColor: WordPressAuthenticator.shared.style.textButtonHighlight)
+        let attrStrNormal = selfHostedButtonString(baseString, linkColor:  WordPressAuthenticator.shared.style.textButtonColor)
+        let attrStrHighlight = selfHostedButtonString(baseString, linkColor: WordPressAuthenticator.shared.style.textButtonHighlightColor)
 
         let font = WPStyleGuide.mediumWeightFont(forStyle: .subheadline)
 

WordPressAuthenticator/UI/SiteInfoHeaderView.swift

@@ -115,7 +115,7 @@ private extension SiteInfoHeaderView {
         } else {
             blavatarImageView.layer.borderColor = WordPressAuthenticator.shared.style.instructionColor.cgColor
             blavatarImageView.layer.borderWidth = 1
-            blavatarImageView.tintColor = WordPressAuthenticator.shared.style.instructionColor
+            blavatarImageView.tintColor = WordPressAuthenticator.shared.style.placeholderColor
         }
     }
 }