From e5516e93f0f4fc713aea71d72a5a65c886b3022d Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Fri, 13 Jul 2018 10:27:46 -0500 Subject: [PATCH 1/3] Configure subheadline button title color in WordPressAuthStyle initializer. Remove UIButton UIAppearance setting --- WooCommerce/Classes/AppDelegate.swift | 2 -- WooCommerce/Classes/Authentication/AuthenticationManager.swift | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/WooCommerce/Classes/AppDelegate.swift b/WooCommerce/Classes/AppDelegate.swift index a1ae4e9bd3b..9af93551b0a 100644 --- a/WooCommerce/Classes/AppDelegate.swift +++ b/WooCommerce/Classes/AppDelegate.swift @@ -116,8 +116,6 @@ private extension AppDelegate { UINavigationBar.appearance().isTranslucent = false UINavigationBar.appearance().tintColor = .white UIApplication.shared.statusBarStyle = .lightContent - - UIButton.appearance().setTitleColor(StyleManager.wooCommerceBrandColor, for: .normal) } /// Sets up FancyButton's UIAppearance. diff --git a/WooCommerce/Classes/Authentication/AuthenticationManager.swift b/WooCommerce/Classes/Authentication/AuthenticationManager.swift index dcf5658398b..679332e18b4 100644 --- a/WooCommerce/Classes/Authentication/AuthenticationManager.swift +++ b/WooCommerce/Classes/Authentication/AuthenticationManager.swift @@ -33,7 +33,8 @@ class AuthenticationManager { disabledBorderColor: StyleManager.buttonDisabledHighlightedColor, primaryTitleColor: StyleManager.buttonPrimaryTitleColor, secondaryTitleColor: StyleManager.buttonSecondaryTitleColor, - disabledTitleColor: StyleManager.buttonDisabledTitleColor) + disabledTitleColor: StyleManager.buttonDisabledTitleColor, + subheadlineColor: StyleManager.wooCommerceBrandColor) WordPressAuthenticator.initialize(configuration: configuration, style: style) WordPressAuthenticator.shared.delegate = self From 7e0c84cd81d8bf9d6c8d74cb20c5bb1ec8a47e18 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Mon, 16 Jul 2018 10:47:19 -0500 Subject: [PATCH 2/3] Point to the correct commit line for WordPressAuthenticator so this bugfix can build --- Podfile | 2 +- Podfile.lock | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Podfile b/Podfile index d019ad2ccc7..9d3212d10c8 100644 --- a/Podfile +++ b/Podfile @@ -18,7 +18,7 @@ target 'WooCommerce' do # pod 'Automattic-Tracks-iOS', :git => 'https://github.com/Automattic/Automattic-Tracks-iOS.git', :tag => '0.2.3' pod 'Gridicons', '0.15' - pod 'WordPressAuthenticator', '1.0.2' + pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => '3aecb1c' # External Libraries diff --git a/Podfile.lock b/Podfile.lock index 2173c0c34c8..76bae21ad99 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -38,7 +38,7 @@ PODS: - Reachability (3.2) - SVProgressHUD (2.2.5) - UIDeviceIdentifier (0.5.0) - - WordPressAuthenticator (1.0.2): + - WordPressAuthenticator (1.0.3): - 1PasswordExtension (= 1.8.5) - Alamofire (= 4.7.2) - CocoaLumberjack (= 3.4.2) @@ -72,7 +72,7 @@ DEPENDENCIES: - Crashlytics (~> 3.10) - Gridicons (= 0.15) - KeychainAccess (~> 3.1) - - WordPressAuthenticator (= 1.0.2) + - WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, commit `3aecb1c`) SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -92,7 +92,6 @@ SPEC REPOS: - Reachability - SVProgressHUD - UIDeviceIdentifier - - WordPressAuthenticator - WordPressKit - WordPressShared - WordPressUI @@ -102,11 +101,17 @@ EXTERNAL SOURCES: Automattic-Tracks-iOS: :git: https://github.com/Automattic/Automattic-Tracks-iOS.git :tag: 0.2.3 + WordPressAuthenticator: + :commit: 3aecb1c + :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git CHECKOUT OPTIONS: Automattic-Tracks-iOS: :git: https://github.com/Automattic/Automattic-Tracks-iOS.git :tag: 0.2.3 + WordPressAuthenticator: + :commit: 3aecb1c + :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git SPEC CHECKSUMS: 1PasswordExtension: 0e95bdea64ec8ff2f4f693be5467a09fac42a83d @@ -126,12 +131,12 @@ SPEC CHECKSUMS: Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6 UIDeviceIdentifier: a959a6d4f51036b4180dd31fb26483a820f1cc46 - WordPressAuthenticator: 20e8eb9cb61bef82370658037bdf9ca24a54570a + WordPressAuthenticator: f9954efc6832c17aed0861e22429c7d929e18c60 WordPressKit: a24baaa783c3a221f2d9a51c19318cbb27333373 WordPressShared: 063e1e8b1a7aaf635abf17f091a2d235a068abdc WordPressUI: af141587ec444f9af753a00605bd0d3f14d8d8a3 wpxmlrpc: bfc572f62ce7ee897f6f38b098d2ba08732ecef4 -PODFILE CHECKSUM: cf5b7216652672de11a865ab3265c7b0c38117e2 +PODFILE CHECKSUM: dd8bd4e38a54233267c885fecd1582ccca6b77d9 COCOAPODS: 1.5.3 From 6acb79771bc20b60c4207834217c98e8e30a8d29 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Tue, 17 Jul 2018 09:34:07 -0500 Subject: [PATCH 3/3] `pod install` to update to WordPressAuthenticator 1.0.4 --- Podfile | 2 +- Podfile.lock | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Podfile b/Podfile index c138d5f7cec..f40e3eb8f36 100644 --- a/Podfile +++ b/Podfile @@ -18,7 +18,7 @@ target 'WooCommerce' do # pod 'Automattic-Tracks-iOS', :git => 'https://github.com/Automattic/Automattic-Tracks-iOS.git', :tag => '0.2.3' pod 'Gridicons', '0.15' - pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => '3aecb1c' + pod 'WordPressAuthenticator', '1.0.4' # External Libraries diff --git a/Podfile.lock b/Podfile.lock index 76bae21ad99..c453a0365ec 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -38,7 +38,7 @@ PODS: - Reachability (3.2) - SVProgressHUD (2.2.5) - UIDeviceIdentifier (0.5.0) - - WordPressAuthenticator (1.0.3): + - WordPressAuthenticator (1.0.4): - 1PasswordExtension (= 1.8.5) - Alamofire (= 4.7.2) - CocoaLumberjack (= 3.4.2) @@ -72,7 +72,7 @@ DEPENDENCIES: - Crashlytics (~> 3.10) - Gridicons (= 0.15) - KeychainAccess (~> 3.1) - - WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, commit `3aecb1c`) + - WordPressAuthenticator (= 1.0.4) SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -92,6 +92,7 @@ SPEC REPOS: - Reachability - SVProgressHUD - UIDeviceIdentifier + - WordPressAuthenticator - WordPressKit - WordPressShared - WordPressUI @@ -101,17 +102,11 @@ EXTERNAL SOURCES: Automattic-Tracks-iOS: :git: https://github.com/Automattic/Automattic-Tracks-iOS.git :tag: 0.2.3 - WordPressAuthenticator: - :commit: 3aecb1c - :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git CHECKOUT OPTIONS: Automattic-Tracks-iOS: :git: https://github.com/Automattic/Automattic-Tracks-iOS.git :tag: 0.2.3 - WordPressAuthenticator: - :commit: 3aecb1c - :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git SPEC CHECKSUMS: 1PasswordExtension: 0e95bdea64ec8ff2f4f693be5467a09fac42a83d @@ -131,12 +126,12 @@ SPEC CHECKSUMS: Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6 UIDeviceIdentifier: a959a6d4f51036b4180dd31fb26483a820f1cc46 - WordPressAuthenticator: f9954efc6832c17aed0861e22429c7d929e18c60 + WordPressAuthenticator: 2825f0c56f83a17470564dbec427991fa5cac5af WordPressKit: a24baaa783c3a221f2d9a51c19318cbb27333373 WordPressShared: 063e1e8b1a7aaf635abf17f091a2d235a068abdc WordPressUI: af141587ec444f9af753a00605bd0d3f14d8d8a3 wpxmlrpc: bfc572f62ce7ee897f6f38b098d2ba08732ecef4 -PODFILE CHECKSUM: dd8bd4e38a54233267c885fecd1582ccca6b77d9 +PODFILE CHECKSUM: bca741aeec025b018771a1e5d22cbc71dfd15f55 COCOAPODS: 1.5.3