Skip to content
This repository was archived by the owner on Feb 5, 2025. It is now read-only.

Configure subheadline button title color #16

Merged
merged 3 commits into from
Jul 17, 2018
Merged

Configure subheadline button title color #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67c94f6
Add subheadline color property to style configuration
mindgraffiti Jul 13, 2018
e6f1249
Set button title color instead of label tint
mindgraffiti Jul 13, 2018
3aecb1c
Merge branch 'develop' into feature/subheadline-button-appearance
mindgraffiti Jul 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions WordPressAuthenticator/Authenticator/WordPressAuthenticatorStyles.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,13 @@ public struct WordPressAuthenticatorStyle {

public let disabledTitleColor: UIColor

/// Style: Subheadline
///
public let subheadlineColor: UIColor

/// 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) {
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) {
self.primaryNormalBackgroundColor = primaryNormalBackgroundColor
self.primaryNormalBorderColor = primaryNormalBorderColor
self.primaryHighlightBackgroundColor = primaryHighlightBackgroundColor
Expand All @@ -53,6 +57,7 @@ public struct WordPressAuthenticatorStyle {
self.primaryTitleColor = primaryTitleColor
self.secondaryTitleColor = secondaryTitleColor
self.disabledTitleColor = disabledTitleColor
self.subheadlineColor = subheadlineColor
}
}

Expand All @@ -70,6 +75,7 @@ public extension WordPressAuthenticatorStyle {
disabledBorderColor: WPStyleGuide.greyLighten30(),
primaryTitleColor: UIColor.white,
secondaryTitleColor: WPStyleGuide.darkGrey(),
disabledTitleColor: WPStyleGuide.greyLighten30())
disabledTitleColor: WPStyleGuide.greyLighten30(),
subheadlineColor: WPStyleGuide.wordPressBlue())
}
}
2 changes: 2 additions & 0 deletions WordPressAuthenticator/Extensions/WPStyleGuide+Login.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ 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)
}
}
}
Expand Down Expand Up @@ -162,6 +163,7 @@ extension WPStyleGuide {
button.titleLabel?.font = font
button.titleLabel?.numberOfLines = 0
button.titleLabel?.lineBreakMode = .byWordWrapping
button.setTitleColor(WordPressAuthenticator.shared.style.subheadlineColor, for: .normal)

// These constraints work around some issues with multiline buttons and
// vertical layout. Without them the button's height may not account
Expand Down