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

Commit 9c5aa2d

Browse files
committed
Allow prologue paged background colors to be set
- also remove the default background color from the navbar
1 parent 955bb3f commit 9c5aa2d

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

WordPressAuthenticator/Authenticator/WordPressAuthenticatorStyles.swift

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import WordPressShared
55
// MARK: - WordPress Authenticator Styles
66
//
77
public struct WordPressAuthenticatorStyle {
8+
public typealias PrologueColors = (odd: UIColor, even: UIColor)
9+
810
/// Style: Primary + Normal State
911
///
1012
public let primaryNormalBackgroundColor: UIColor
@@ -51,9 +53,13 @@ public struct WordPressAuthenticatorStyle {
5153
///
5254
public let navBarImage: UIImage
5355

56+
/// Style: prologue background colors
57+
///
58+
public let prologueBackgroundColors: PrologueColors
59+
5460
/// Designated initializer
5561
///
56-
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) {
62+
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, prologueBackgroundColors: PrologueColors? = nil) {
5763
self.primaryNormalBackgroundColor = primaryNormalBackgroundColor
5864
self.primaryNormalBorderColor = primaryNormalBorderColor
5965
self.primaryHighlightBackgroundColor = primaryHighlightBackgroundColor
@@ -70,6 +76,7 @@ public struct WordPressAuthenticatorStyle {
7076
self.subheadlineColor = subheadlineColor
7177
self.viewControllerBackgroundColor = viewControllerBackgroundColor
7278
self.navBarImage = navBarImage
79+
self.prologueBackgroundColors = prologueBackgroundColors ?? (odd: WPStyleGuide.lightBlue(), even: WPStyleGuide.wordPressBlue())
7380
}
7481
}
7582

WordPressAuthenticator/Signin/LoginNavigationController.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,4 @@ import WordPressUI
44

55

66
public class LoginNavigationController: RotationAwareNavigationViewController {
7-
override public func awakeFromNib() {
8-
super.awakeFromNib()
9-
10-
navigationBar.barTintColor = WPStyleGuide.wordPressBlue()
11-
}
127
}

WordPressAuthenticator/Signin/LoginProloguePageViewController.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,12 @@ class LoginProloguePageViewController: UIPageViewController {
6767
fileprivate func backgroundColor(for index: Int) -> UIColor {
6868
switch index % 2 {
6969
case 0:
70-
return WPStyleGuide.lightBlue()
70+
// this uses the "odd" color because it is zero indexed
71+
return WordPressAuthenticator.shared.style.prologueBackgroundColors.odd
7172
case 1:
7273
fallthrough
7374
default:
74-
return WPStyleGuide.wordPressBlue()
75+
return WordPressAuthenticator.shared.style.prologueBackgroundColors.even
7576
}
7677
}
7778
}

0 commit comments

Comments
 (0)