Skip to content
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

UL&S: Add TextLinkTableViewCell to SiteAddressViewController #14372

Merged
merged 13 commits into from
Jun 25, 2020
Merged

UL&S: Add TextLinkTableViewCell to SiteAddressViewController #14372

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1dfc58f
Merge branch 'develop' into feature/14009-unify-site-address-vi
mindgraffiti Jun 23, 2020
877bca5
Set hint buttons to display
mindgraffiti Jun 23, 2020
1b2a5db
Point the podfile to the feature branch for Authenticator
mindgraffiti Jun 23, 2020
0c64165
Change the pod checksum so it will pick up the latest feature branch …
mindgraffiti Jun 23, 2020
23df8ef
Changing the checksum is no longer working. Use commit.
mindgraffiti Jun 23, 2020
158f6cc
Change commit in podfile
mindgraffiti Jun 23, 2020
6ca1770
Add text color to unified styles
mindgraffiti Jun 24, 2020
ee454be
Point podfile to latest commit for Auth feature branch
mindgraffiti Jun 24, 2020
ab6a5fd
Merge branch 'develop' into feature/14009-unify-site-address-vi
mindgraffiti Jun 24, 2020
923f52f
Remove displayHintButtons from config, it already defaults to true
mindgraffiti Jun 25, 2020
3717a88
Update Authenticator to latest commit
mindgraffiti Jun 25, 2020
3f5202f
Merge branch 'develop' into feature/14009-unify-site-address-vi
mindgraffiti Jun 25, 2020
a21c6b1
Point podfile to latest Auth release, v 1.19.0-beta.4
mindgraffiti Jun 25, 2020
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
6 changes: 3 additions & 3 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,10 @@ target 'WordPress' do

pod 'Gridicons', '~> 1.0.1'

pod 'WordPressAuthenticator', '~> 1.19.0-beta'
#pod 'WordPressAuthenticator', '~> 1.19.0-beta'
# While in PR
# pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
# pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
# pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => 'feature/283-site-address-vi'
pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => 'f7d7535'
# pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'

pod 'MediaEditor', '~> 1.1.0'
Expand Down
15 changes: 10 additions & 5 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ PODS:
- WordPress-Aztec-iOS (1.19.2)
- WordPress-Editor-iOS (1.19.2):
- WordPress-Aztec-iOS (= 1.19.2)
- WordPressAuthenticator (1.19.0-beta.3):
- WordPressAuthenticator (1.19.0-beta.4):
- 1PasswordExtension (= 1.8.6)
- Alamofire (= 4.8)
- CocoaLumberjack (~> 3.5)
Expand Down Expand Up @@ -484,7 +484,7 @@ DEPENDENCIES:
- Starscream (= 3.0.6)
- SVProgressHUD (= 2.2.5)
- WordPress-Editor-iOS (~> 1.19.2)
- WordPressAuthenticator (~> 1.19.0-beta)
- WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, commit `f7d7535`)
- WordPressKit (= 4.11.0-beta.1)
- WordPressMocks (~> 0.0.8)
- WordPressShared (= 1.9.0)
Expand Down Expand Up @@ -534,7 +534,6 @@ SPEC REPOS:
- UIDeviceIdentifier
- WordPress-Aztec-iOS
- WordPress-Editor-iOS
- WordPressAuthenticator
- WordPressKit
- WordPressMocks
- WordPressShared
Expand Down Expand Up @@ -620,6 +619,9 @@ EXTERNAL SOURCES:
RNTAztecView:
:commit: 74f2bb2c58b1fcd9a10125b78673318d5ef8d0a4
:git: http://github.com/wordpress-mobile/gutenberg-mobile/
WordPressAuthenticator:
:commit: f7d7535
:git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git
Yoga:
:podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/74f2bb2c58b1fcd9a10125b78673318d5ef8d0a4/react-native-gutenberg-bridge/third-party-podspecs/Yoga.podspec.json

Expand All @@ -633,6 +635,9 @@ CHECKOUT OPTIONS:
RNTAztecView:
:commit: 74f2bb2c58b1fcd9a10125b78673318d5ef8d0a4
:git: http://github.com/wordpress-mobile/gutenberg-mobile/
WordPressAuthenticator:
:commit: f7d7535
:git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git

SPEC CHECKSUMS:
1PasswordExtension: f97cc80ae58053c331b2b6dc8843ba7103b33794
Expand Down Expand Up @@ -706,7 +711,7 @@ SPEC CHECKSUMS:
UIDeviceIdentifier: 44f805037d21b94394821828f4fcaba34b38c2d0
WordPress-Aztec-iOS: d01bf0c5e150ae6a046f06ba63b7cc2762061c0b
WordPress-Editor-iOS: 5b726489e5ae07b7281a2862d69aba2d5c83f140
WordPressAuthenticator: 6d6b085a895ce00bd616c2132d58e59cd1f26745
WordPressAuthenticator: 66d3dfc6d40623a454afa4d65c9b5d6bf9edeb98
WordPressKit: cf04f034a376fe54a44edff62c3bd0ece5ef13a6
WordPressMocks: b4064b99a073117bbc304abe82df78f2fbe60992
WordPressShared: b887b17aa949e4b142a1421fd479de495db9a054
Expand All @@ -723,6 +728,6 @@ SPEC CHECKSUMS:
ZendeskSupportSDK: a87ab1e4badace92c75eb11dc77ede1e995b2adc
ZIPFoundation: 249fa8890597086cd536bb2df5c9804d84e122b0

PODFILE CHECKSUM: 9f4a86c80ce6c489fdb920100c833d8788aefc10
PODFILE CHECKSUM: 56f9217052b7507e5dcfafe743019dd6a1c73178

COCOAPODS: 1.8.4
3 changes: 3 additions & 0 deletions WordPress/Classes/ViewRelated/NUX/WordPressAuthenticationManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ class WordPressAuthenticationManager: NSObject {
enableSignInWithApple: enableSignInWithApple,
enableSignupWithGoogle: true,
enableUnifiedAuth: FeatureFlag.unifiedAuth.enabled,
displayHintButtons: true,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since displayHintButtons defaults to true, this isn't necessary.

enableUnifiedSiteAddress: FeatureFlag.unifiedSiteAddress.enabled,
enableUnifiedGoogle: FeatureFlag.unifiedGoogle.enabled)

Expand Down Expand Up @@ -70,6 +71,8 @@ class WordPressAuthenticationManager: NSObject {
statusBarStyle: .lightContent)

let unifiedStyle = WordPressAuthenticatorUnifiedStyle(borderColor: .divider,
textButtonColor: .brand,
textButtonHighlightColor: .brand,
viewControllerBackgroundColor: .basicBackground)

WordPressAuthenticator.initialize(configuration: configuration,
Expand Down