From ee6d0d1e0528505ad9ec0da9a7c159a237b52841 Mon Sep 17 00:00:00 2001 From: Nate Heagy Date: Mon, 15 Jul 2019 12:52:41 -0600 Subject: [PATCH 01/14] Make style a mandatory parameter - now that WPiOS provides a style, defaultStyle seems unnecessary --- .../WordPressAuthenticator.swift | 2 +- .../WordPressAuthenticatorStyles.swift | 22 ------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/WordPressAuthenticator/Authenticator/WordPressAuthenticator.swift b/WordPressAuthenticator/Authenticator/WordPressAuthenticator.swift index c1b503b50..1ddb44ddb 100644 --- a/WordPressAuthenticator/Authenticator/WordPressAuthenticator.swift +++ b/WordPressAuthenticator/Authenticator/WordPressAuthenticator.swift @@ -70,7 +70,7 @@ import WordPressUI /// Initializes the WordPressAuthenticator with the specified Configuration. /// public static func initialize(configuration: WordPressAuthenticatorConfiguration, - style: WordPressAuthenticatorStyle = .defaultStyle, + style: WordPressAuthenticatorStyle, displayStrings: WordPressAuthenticatorDisplayStrings = .defaultStrings) { guard privateInstance == nil else { fatalError("WordPressAuthenticator is already initialized") diff --git a/WordPressAuthenticator/Authenticator/WordPressAuthenticatorStyles.swift b/WordPressAuthenticator/Authenticator/WordPressAuthenticatorStyles.swift index ca46099d3..4982c2cfb 100644 --- a/WordPressAuthenticator/Authenticator/WordPressAuthenticatorStyles.swift +++ b/WordPressAuthenticator/Authenticator/WordPressAuthenticatorStyles.swift @@ -82,25 +82,3 @@ public struct WordPressAuthenticatorStyle { self.prologueTitleColor = prologueTitleColor } } - -public extension WordPressAuthenticatorStyle { - static var defaultStyle: WordPressAuthenticatorStyle { - return WordPressAuthenticatorStyle(primaryNormalBackgroundColor: WPStyleGuide.mediumBlue(), - primaryNormalBorderColor: WPStyleGuide.wordPressBlue(), - primaryHighlightBackgroundColor: WPStyleGuide.wordPressBlue(), - primaryHighlightBorderColor: WPStyleGuide.wordPressBlue(), - secondaryNormalBackgroundColor: UIColor.white, - secondaryNormalBorderColor: WPStyleGuide.greyLighten20(), - secondaryHighlightBackgroundColor: WPStyleGuide.greyLighten20(), - secondaryHighlightBorderColor: WPStyleGuide.greyLighten20(), - disabledBackgroundColor: UIColor.white, - disabledBorderColor: WPStyleGuide.greyLighten30(), - primaryTitleColor: UIColor.white, - secondaryTitleColor: WPStyleGuide.darkGrey(), - disabledTitleColor: WPStyleGuide.greyLighten30(), - subheadlineColor: WPStyleGuide.wordPressBlue(), - viewControllerBackgroundColor: WPStyleGuide.lightGrey(), - navBarImage: Gridicon.iconOfType(.mySites) - ) - } -} From 767d0a454d57265ece319b31f5fab8a82850857d Mon Sep 17 00:00:00 2001 From: Nate Heagy Date: Mon, 15 Jul 2019 12:53:39 -0600 Subject: [PATCH 02/14] Add style color param for instruction labels --- .../Authenticator/WordPressAuthenticatorStyles.swift | 7 +++++-- WordPressAuthenticator/Signin/LoginViewController.swift | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/WordPressAuthenticator/Authenticator/WordPressAuthenticatorStyles.swift b/WordPressAuthenticator/Authenticator/WordPressAuthenticatorStyles.swift index 4982c2cfb..a989b8d69 100644 --- a/WordPressAuthenticator/Authenticator/WordPressAuthenticatorStyles.swift +++ b/WordPressAuthenticator/Authenticator/WordPressAuthenticatorStyles.swift @@ -39,8 +39,10 @@ public struct WordPressAuthenticatorStyle { public let disabledTitleColor: UIColor - /// Style: Subheadline + /// Style: Labels /// + public let instructionColor: UIColor + public let subheadlineColor: UIColor /// Style: Login screen background colors @@ -61,7 +63,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, subheadlineColor: 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, instructionColor: UIColor, subheadlineColor: UIColor, viewControllerBackgroundColor: UIColor, navBarImage: UIImage, prologueBackgroundColor: UIColor = WPStyleGuide.wordPressBlue(), prologueTitleColor: UIColor = .white) { self.primaryNormalBackgroundColor = primaryNormalBackgroundColor self.primaryNormalBorderColor = primaryNormalBorderColor self.primaryHighlightBackgroundColor = primaryHighlightBackgroundColor @@ -75,6 +77,7 @@ public struct WordPressAuthenticatorStyle { self.primaryTitleColor = primaryTitleColor self.secondaryTitleColor = secondaryTitleColor self.disabledTitleColor = disabledTitleColor + self.instructionColor = instructionColor self.subheadlineColor = subheadlineColor self.viewControllerBackgroundColor = viewControllerBackgroundColor self.navBarImage = navBarImage diff --git a/WordPressAuthenticator/Signin/LoginViewController.swift b/WordPressAuthenticator/Signin/LoginViewController.swift index 5d087c067..e9a3f68e1 100644 --- a/WordPressAuthenticator/Signin/LoginViewController.swift +++ b/WordPressAuthenticator/Signin/LoginViewController.swift @@ -70,6 +70,7 @@ open class LoginViewController: NUXViewController, LoginFacadeDelegate { func styleInstructions() { instructionLabel?.font = WPStyleGuide.mediumWeightFont(forStyle: .subheadline) instructionLabel?.adjustsFontForContentSizeCategory = true + instructionLabel?.textColor = WordPressAuthenticator.shared.style.instructionColor } func configureViewLoading(_ loading: Bool) { From 0e30b829746f6fcaf18e01c153a2d028843906be Mon Sep 17 00:00:00 2001 From: Nate Heagy Date: Mon, 15 Jul 2019 14:23:53 -0600 Subject: [PATCH 03/14] Add style setting for text buttons --- .../Authenticator/WordPressAuthenticatorStyles.swift | 10 +++++++++- .../Extensions/WPStyleGuide+Login.swift | 11 ++++++----- .../Signin/LoginEmailViewController.swift | 1 + 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/WordPressAuthenticator/Authenticator/WordPressAuthenticatorStyles.swift b/WordPressAuthenticator/Authenticator/WordPressAuthenticatorStyles.swift index a989b8d69..971439806 100644 --- a/WordPressAuthenticator/Authenticator/WordPressAuthenticatorStyles.swift +++ b/WordPressAuthenticator/Authenticator/WordPressAuthenticatorStyles.swift @@ -39,6 +39,12 @@ public struct WordPressAuthenticatorStyle { public let disabledTitleColor: UIColor + /// Style: Text Buttons + /// + public let textButton: UIColor + + public let textButtonHighlight: UIColor + /// Style: Labels /// public let instructionColor: UIColor @@ -63,7 +69,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, instructionColor: UIColor, subheadlineColor: 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, textButton: UIColor, textButtonHighlight: UIColor, instructionColor: UIColor, subheadlineColor: UIColor, viewControllerBackgroundColor: UIColor, navBarImage: UIImage, prologueBackgroundColor: UIColor = WPStyleGuide.wordPressBlue(), prologueTitleColor: UIColor = .white) { self.primaryNormalBackgroundColor = primaryNormalBackgroundColor self.primaryNormalBorderColor = primaryNormalBorderColor self.primaryHighlightBackgroundColor = primaryHighlightBackgroundColor @@ -77,6 +83,8 @@ public struct WordPressAuthenticatorStyle { self.primaryTitleColor = primaryTitleColor self.secondaryTitleColor = secondaryTitleColor self.disabledTitleColor = disabledTitleColor + self.textButton = textButton + self.textButtonHighlight = textButtonHighlight self.instructionColor = instructionColor self.subheadlineColor = subheadlineColor self.viewControllerBackgroundColor = viewControllerBackgroundColor diff --git a/WordPressAuthenticator/Extensions/WPStyleGuide+Login.swift b/WordPressAuthenticator/Extensions/WPStyleGuide+Login.swift index 0cb7166b9..a9aea8be2 100644 --- a/WordPressAuthenticator/Extensions/WPStyleGuide+Login.swift +++ b/WordPressAuthenticator/Extensions/WPStyleGuide+Login.swift @@ -7,7 +7,8 @@ final class SubheadlineButton: UIButton { super.traitCollectionDidChange(previousTraitCollection) if previousTraitCollection?.preferredContentSizeCategory != traitCollection.preferredContentSizeCategory { titleLabel?.font = WPStyleGuide.mediumWeightFont(forStyle: .subheadline) - setTitleColor(WordPressAuthenticator.shared.style.subheadlineColor, for: .normal) + setTitleColor(WordPressAuthenticator.shared.style.textButton, for: .normal) + setTitleColor(WordPressAuthenticator.shared.style.textButtonHighlight, for: .highlighted) } } } @@ -103,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.primaryNormalBorderColor) - let attrStrHighlight = googleButtonString(baseString, linkColor: WordPressAuthenticator.shared.style.primaryHighlightBorderColor) + let attrStrNormal = googleButtonString(baseString, linkColor: WordPressAuthenticator.shared.style.textButton) + let attrStrHighlight = googleButtonString(baseString, linkColor: WordPressAuthenticator.shared.style.textButtonHighlight) let font = WPStyleGuide.mediumWeightFont(forStyle: .subheadline) @@ -118,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.primaryNormalBorderColor) - let attrStrHighlight = selfHostedButtonString(baseString, linkColor: WordPressAuthenticator.shared.style.primaryHighlightBorderColor) + let attrStrNormal = selfHostedButtonString(baseString, linkColor: WordPressAuthenticator.shared.style.textButton) + let attrStrHighlight = selfHostedButtonString(baseString, linkColor: WordPressAuthenticator.shared.style.textButtonHighlight) let font = WPStyleGuide.mediumWeightFont(forStyle: .subheadline) diff --git a/WordPressAuthenticator/Signin/LoginEmailViewController.swift b/WordPressAuthenticator/Signin/LoginEmailViewController.swift index f10315271..22e962c7f 100644 --- a/WordPressAuthenticator/Signin/LoginEmailViewController.swift +++ b/WordPressAuthenticator/Signin/LoginEmailViewController.swift @@ -226,6 +226,7 @@ open class LoginEmailViewController: LoginViewController, NUXKeyboardResponder { private func configureAlternativeLabel() { alternativeLoginLabel?.font = WPStyleGuide.fontForTextStyle(.subheadline) + alternativeLoginLabel?.textColor = WordPressAuthenticator.shared.style.subheadlineColor } /// Configures whether appearance of the submit button. From 56c46ff1ad32a66e5c1eb02c31fc2129fc6a7a92 Mon Sep 17 00:00:00 2001 From: Nate Heagy Date: Mon, 15 Jul 2019 15:57:34 -0600 Subject: [PATCH 04/14] Add placeholder color --- .../WordPressAuthenticatorStyles.swift | 5 +++- .../NUX/WPWalkthroughTextField.h | 1 + .../NUX/WPWalkthroughTextField.m | 6 ++++- .../UI/LoginTextField.swift | 23 ++++++++++++++++++- 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/WordPressAuthenticator/Authenticator/WordPressAuthenticatorStyles.swift b/WordPressAuthenticator/Authenticator/WordPressAuthenticatorStyles.swift index 971439806..0c9904329 100644 --- a/WordPressAuthenticator/Authenticator/WordPressAuthenticatorStyles.swift +++ b/WordPressAuthenticator/Authenticator/WordPressAuthenticatorStyles.swift @@ -51,6 +51,8 @@ public struct WordPressAuthenticatorStyle { public let subheadlineColor: UIColor + public let placeholderColor: UIColor + /// Style: Login screen background colors /// public let viewControllerBackgroundColor: UIColor @@ -69,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, 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, textButton: UIColor, textButtonHighlight: 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 @@ -87,6 +89,7 @@ public struct WordPressAuthenticatorStyle { self.textButtonHighlight = textButtonHighlight self.instructionColor = instructionColor self.subheadlineColor = subheadlineColor + self.placeholderColor = placeholderColor self.viewControllerBackgroundColor = viewControllerBackgroundColor self.navBarImage = navBarImage self.prologueBackgroundColor = prologueBackgroundColor diff --git a/WordPressAuthenticator/NUX/WPWalkthroughTextField.h b/WordPressAuthenticator/NUX/WPWalkthroughTextField.h index 22862f3db..043e79e5c 100644 --- a/WordPressAuthenticator/NUX/WPWalkthroughTextField.h +++ b/WordPressAuthenticator/NUX/WPWalkthroughTextField.h @@ -38,5 +38,6 @@ IB_DESIGNABLE @property (nonatomic) UIEdgeInsets contentInsets; - (instancetype)initWithLeftViewImage:(UIImage *)image; +- (void)setupPlaceholder; @end diff --git a/WordPressAuthenticator/NUX/WPWalkthroughTextField.m b/WordPressAuthenticator/NUX/WPWalkthroughTextField.m index 4ad6a261a..60930718d 100644 --- a/WordPressAuthenticator/NUX/WPWalkthroughTextField.m +++ b/WordPressAuthenticator/NUX/WPWalkthroughTextField.m @@ -86,6 +86,11 @@ - (void)commonInit self.showTopLineSeparator = NO; self.showSecureTextEntryToggle = NO; + [self setupPlaceholder]; +} + +- (void)setupPlaceholder +{ // Apply styles to the placeholder if one was set in IB. if (self.placeholder) { NSDictionary *attributes = @{ @@ -146,7 +151,6 @@ - (void)drawRect:(CGRect)rect CGContextAddPath(context, path.CGPath); CGContextSetStrokeColorWithColor(context, [UIColor colorWithWhite:0.87 alpha:1.0].CGColor); CGContextStrokePath(context); - } diff --git a/WordPressAuthenticator/UI/LoginTextField.swift b/WordPressAuthenticator/UI/LoginTextField.swift index 4efc7704b..b36801882 100644 --- a/WordPressAuthenticator/UI/LoginTextField.swift +++ b/WordPressAuthenticator/UI/LoginTextField.swift @@ -14,6 +14,27 @@ open class LoginTextField: WPWalkthroughTextField { } } + override open func setupPlaceholder() { + guard let placeholder = placeholder else { + return + } + let attributes: [NSAttributedString.Key: Any] = [ + .foregroundColor: WordPressAuthenticator.shared.style.placeholderColor, + .font: font + ] + self.attributedPlaceholder = NSAttributedString(string: placeholder, attributes: attributes) + } + + override open var leftViewImage: UIImage! { + set { + let newImage = newValue.imageWithTintColor(WordPressAuthenticator.shared.style.placeholderColor) + super.leftViewImage = newImage + } + get { + return super.leftViewImage + } + } + private func drawTopLine(rect: CGRect, context: CGContext) { drawBorderLine(from: CGPoint(x: rect.minX, y: rect.minY), to: CGPoint(x: rect.maxX, y: rect.minY), context: context) } @@ -29,7 +50,7 @@ open class LoginTextField: WPWalkthroughTextField { path.addLine(to: endPoint) path.lineWidth = UIScreen.main.scale / 2.0 context.addPath(path.cgPath) - context.setStrokeColor(WPStyleGuide.greyLighten20().cgColor) + context.setStrokeColor(WordPressAuthenticator.shared.style.secondaryNormalBorderColor.cgColor) context.strokePath() } } From 71a70da6e008f93eb72e797bb54c0a2fe4a6d82b Mon Sep 17 00:00:00 2001 From: Nate Heagy Date: Mon, 15 Jul 2019 16:33:02 -0600 Subject: [PATCH 05/14] Allow secure entry icon to be styled --- WordPressAuthenticator/NUX/WPWalkthroughTextField.h | 1 + WordPressAuthenticator/NUX/WPWalkthroughTextField.m | 1 - WordPressAuthenticator/UI/LoginTextField.swift | 8 ++++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/WordPressAuthenticator/NUX/WPWalkthroughTextField.h b/WordPressAuthenticator/NUX/WPWalkthroughTextField.h index 043e79e5c..5dc506ae9 100644 --- a/WordPressAuthenticator/NUX/WPWalkthroughTextField.h +++ b/WordPressAuthenticator/NUX/WPWalkthroughTextField.h @@ -6,6 +6,7 @@ IB_DESIGNABLE @property (nonatomic) IBInspectable BOOL showTopLineSeparator; @property (nonatomic) IBInspectable BOOL showSecureTextEntryToggle; @property (nonatomic) IBInspectable UIImage *leftViewImage; +@property (nonatomic, strong) UIButton *secureTextEntryToggle; /// Width for the left view. Set to 0 to use the given frame in the view. /// Default is: 30 diff --git a/WordPressAuthenticator/NUX/WPWalkthroughTextField.m b/WordPressAuthenticator/NUX/WPWalkthroughTextField.m index 60930718d..89a78f4aa 100644 --- a/WordPressAuthenticator/NUX/WPWalkthroughTextField.m +++ b/WordPressAuthenticator/NUX/WPWalkthroughTextField.m @@ -8,7 +8,6 @@ @import Gridicons; @interface WPWalkthroughTextField () -@property (nonatomic, strong) UIButton *secureTextEntryToggle; @property (nonatomic, strong) UIImage *secureTextEntryImageVisible; @property (nonatomic, strong) UIImage *secureTextEntryImageHidden; @end diff --git a/WordPressAuthenticator/UI/LoginTextField.swift b/WordPressAuthenticator/UI/LoginTextField.swift index b36801882..3bbfe3c6a 100644 --- a/WordPressAuthenticator/UI/LoginTextField.swift +++ b/WordPressAuthenticator/UI/LoginTextField.swift @@ -3,6 +3,14 @@ import WordPressShared open class LoginTextField: WPWalkthroughTextField { + override open func awakeFromNib() { + super.awakeFromNib() + guard let secureTextEntryToggle = secureTextEntryToggle else { + return + } + secureTextEntryToggle.tintColor = WordPressAuthenticator.shared.style.placeholderColor + } + override open func draw(_ rect: CGRect) { if showTopLineSeparator { guard let context = UIGraphicsGetCurrentContext() else { From 19dc8bc1cccf94575777359e537e780a0cc08813 Mon Sep 17 00:00:00 2001 From: Nate Heagy Date: Mon, 15 Jul 2019 17:08:34 -0600 Subject: [PATCH 06/14] Update the icon color in password entry screen --- .../Signin/LoginWPComViewController.swift | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/WordPressAuthenticator/Signin/LoginWPComViewController.swift b/WordPressAuthenticator/Signin/LoginWPComViewController.swift index 522696675..151c46a2f 100644 --- a/WordPressAuthenticator/Signin/LoginWPComViewController.swift +++ b/WordPressAuthenticator/Signin/LoginWPComViewController.swift @@ -10,6 +10,7 @@ class LoginWPComViewController: LoginViewController, NUXKeyboardResponder { @IBOutlet weak var bottomContentConstraint: NSLayoutConstraint? @IBOutlet weak var verticalCenterConstraint: NSLayoutConstraint? @objc var onePasswordButton: UIButton! + @IBOutlet var emailIcon: UIImageView? @IBOutlet var emailLabel: UITextField? @IBOutlet var emailStackView: UIStackView? override var sourceTag: WordPressSupportSourceTag { @@ -43,6 +44,7 @@ class LoginWPComViewController: LoginViewController, NUXKeyboardResponder { loginFields.meta.userIsDotCom = true configureTextFields() + configureEmailIcon() configureSubmitButton(animating: false) configureViewForEditingIfNeeded() } @@ -116,6 +118,14 @@ class LoginWPComViewController: LoginViewController, NUXKeyboardResponder { passwordField?.text = loginFields.password passwordField?.contentInsets = WPStyleGuide.edgeInsetForLoginTextFields() emailLabel?.text = loginFields.username + emailLabel?.textColor = WordPressAuthenticator.shared.style.subheadlineColor + } + + func configureEmailIcon() { + guard let image = emailIcon?.image else { + return + } + emailIcon?.image = image.imageWithTintColor(WordPressAuthenticator.shared.style.subheadlineColor) } @objc func localizeControls() { From ca048ee07207c3c32b1926be646d34bf27e17d16 Mon Sep 17 00:00:00 2001 From: Nate Heagy Date: Mon, 15 Jul 2019 17:21:55 -0600 Subject: [PATCH 07/14] Update color magic link instructions --- .../NUX/NUXLinkMailViewController.swift | 1 + .../Signin/Login.storyboard | 53 ++++++++++--------- .../LoginLinkRequestViewController.swift | 1 + 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/WordPressAuthenticator/NUX/NUXLinkMailViewController.swift b/WordPressAuthenticator/NUX/NUXLinkMailViewController.swift index 54566a7b5..d03170764 100644 --- a/WordPressAuthenticator/NUX/NUXLinkMailViewController.swift +++ b/WordPressAuthenticator/NUX/NUXLinkMailViewController.swift @@ -73,6 +73,7 @@ class NUXLinkMailViewController: LoginViewController { return NSLocalizedString("We sent you a magic signup link! Check your email on this device, and tap the link in the email to finish signing up.", comment: "Instructional text on how to open the email containing a magic link.") } }() + label?.textColor = WordPressAuthenticator.shared.style.instructionColor } // MARK: - Dynamic type diff --git a/WordPressAuthenticator/Signin/Login.storyboard b/WordPressAuthenticator/Signin/Login.storyboard index ac62ab9f3..d0ee346d8 100644 --- a/WordPressAuthenticator/Signin/Login.storyboard +++ b/WordPressAuthenticator/Signin/Login.storyboard @@ -194,7 +194,7 @@ - + @@ -279,7 +279,7 @@ - - - - - -