Skip to content

Dark mode: Fix NUX sign up epilogue colors #12429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frosty merged 2 commits into from
Aug 30, 2019
Merged

Dark mode: Fix NUX sign up epilogue colors #12429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4912167
Dark mode: Fix NUX sign up epilogue colors
frosty Aug 30, 2019
55ab894
Update WPAuthenticator pod version
frosty Aug 30, 2019
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
4 changes: 2 additions & 2 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,9 @@ target 'WordPress' do

pod 'Gridicons', '~> 0.16'

pod 'WordPressAuthenticator', '~> 1.8.0-beta.12'
pod 'WordPressAuthenticator', '~> 1.8.0-beta.13'
# pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'
# pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => 'nux-dark-mode'
# pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => 'fix/more-dark-mode'

aztec
wordpress_ui
Expand Down
8 changes: 4 additions & 4 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ PODS:
- WordPress-Aztec-iOS (1.8.1)
- WordPress-Editor-iOS (1.8.1):
- WordPress-Aztec-iOS (= 1.8.1)
- WordPressAuthenticator (1.8.0-beta.12):
- WordPressAuthenticator (1.8.0-beta.13):
- 1PasswordExtension (= 1.8.5)
- Alamofire (= 4.7.3)
- CocoaLumberjack (~> 3.5)
Expand Down Expand Up @@ -301,7 +301,7 @@ DEPENDENCIES:
- Starscream (= 3.0.6)
- SVProgressHUD (= 2.2.5)
- WordPress-Editor-iOS (~> 1.8.1)
- WordPressAuthenticator (~> 1.8.0-beta.12)
- WordPressAuthenticator (~> 1.8.0-beta.13)
- WordPressKit (~> 4.5.0-beta.2)
- WordPressMocks (~> 0.0.5)
- WordPressShared (~> 1.8.7-beta.1)
Expand Down Expand Up @@ -487,7 +487,7 @@ SPEC CHECKSUMS:
UIDeviceIdentifier: 8f8a24b257a4d978c8d40ad1e7355b944ffbfa8c
WordPress-Aztec-iOS: 898336652f474b4bf940a80dc0f0172ace39f0c0
WordPress-Editor-iOS: ca06c5868d1ac68144a4626465b9c1eef1c53e40
WordPressAuthenticator: 0ac3268a4aec56c36e276869915c6f27c7693032
WordPressAuthenticator: c3098c453bce76106bc818124b98d5e5299d7fe0
WordPressKit: 6fb3101e9542398c895517d64ac435d3a4e83e25
WordPressMocks: d8088f718439556ff3856d5881aef581740cd26a
WordPressShared: fc1ef47c3dc91237ef225706bb21ea10c9e4388f
Expand All @@ -498,6 +498,6 @@ SPEC CHECKSUMS:
ZendeskSDK: c2e49fd16a73e43e490f777cea67dd852b819ace
ZIPFoundation: 89df685c971926b0323087952320bdfee9f0b6ef

PODFILE CHECKSUM: 2814ff5279597bbe34c23871d7d5ec3e424756e0
PODFILE CHECKSUM: 1b9332269f379da0ccd4c9b4a047f2aaaaa4c057

COCOAPODS: 1.6.1
14 changes: 14 additions & 0 deletions WordPress/Classes/ViewRelated/NUX/SignupEpilogueTableViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ class SignupEpilogueTableViewController: NUXTableViewController, EpilogueUserInf

// MARK: - View

override func viewDidLoad() {
super.viewDidLoad()

view.backgroundColor = .listBackground
}

override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)

Expand Down Expand Up @@ -144,6 +150,14 @@ class SignupEpilogueTableViewController: NUXTableViewController, EpilogueUserInf
return super.tableView(tableView, cellForRowAt: indexPath)
}

override func tableView(_ tableView: UITableView, willDisplay cell: UITableViewCell, forRowAt indexPath: IndexPath) {
guard cell is EpilogueUserInfoCell else {
return
}

cell.contentView.backgroundColor = .listForeground
}

override func tableView(_ tableView: UITableView, estimatedHeightForHeaderInSection section: Int) -> CGFloat {
return Constants.headerFooterHeight
}
Expand Down
1 change: 1 addition & 0 deletions WordPress/Classes/ViewRelated/NUX/SignupEpilogueViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class SignupEpilogueViewController: NUXViewController {
let buttonViewController = NUXButtonViewController.instance()
buttonViewController.delegate = self
buttonViewController.setButtonTitles(primary: ButtonTitles.primary, primaryAccessibilityId: ButtonTitles.primaryAccessibilityId)
buttonViewController.backgroundColor = WordPressAuthenticator.shared.style.viewControllerBackgroundColor
return buttonViewController
}()

Expand Down