Merge pull request #219 from wordpress-mobile/issue/218-remove-showGoogle

mindgraffiti · web-flow · commit 5867587bfc4a · 2020-03-26T14:03:28.000-05:00
Remove segue `.showGoogle`
diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "WordPressAuthenticator"
-  s.version       = "1.12.0-beta.4"
+  s.version       = "1.12.0-beta.5"
   s.summary       = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps."
 
   s.description   = <<-DESC
diff --git a/WordPressAuthenticator/NUX/NUXViewController.swift b/WordPressAuthenticator/NUX/NUXViewController.swift
@@ -27,7 +27,6 @@ open class NUXViewController: UIViewController, NUXViewControllerBase, UIViewCon
     public enum SegueIdentifier: String {
         case showSignupMethod
         case showSigninV2
-        case showGoogle
         case showURLUsernamePassword
         case showWPUsernamePassword
         case showSelfHostedLogin
diff --git a/WordPressAuthenticator/Signin/Login.storyboard b/WordPressAuthenticator/Signin/Login.storyboard
@@ -7,14 +7,6 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
-        <!--googleSignup-->
-        <scene sceneID="GBa-1v-wvb">
-            <objects>
-                <viewControllerPlaceholder storyboardIdentifier="Signup" storyboardName="Signup" referencedIdentifier="googleSignup" id="MEg-KS-Afs" sceneMemberID="viewController"/>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="bjg-XU-5Rh" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="1384" y="-231"/>
-        </scene>
         <!--Login Prologue Page View Controller-->
         <scene sceneID="Jbm-5H-sqY">
             <objects>
@@ -118,7 +110,6 @@
                     <connections>
                         <segue destination="IwV-3R-6dB" kind="presentation" identifier="showSignupMethod" id="gD5-d0-X3t"/>
                         <segue destination="T5n-nb-cOW" kind="show" identifier="showSigninV2" id="nCA-u7-fKm"/>
-                        <segue destination="MEg-KS-Afs" kind="show" identifier="showGoogle" id="aSC-hU-lzE"/>
                         <segue destination="hed-vB-osh" kind="presentation" identifier="showLoginMethod" id="N3P-wt-Rn3"/>
                         <segue destination="anK-hg-K4j" kind="show" identifier="showSelfHostedLogin" id="Njv-lY-Lyi"/>
                         <segue destination="lmD-c6-SLs" kind="show" identifier="showWPComLogin" id="UV4-XI-c0q"/>
@@ -366,7 +357,6 @@
                         <segue destination="klu-4U-PyL" kind="show" identifier="showSignupEmail" id="dh4-9P-l8W"/>
                         <segue destination="IwV-3R-6dB" kind="presentation" identifier="showSignupMethod" id="EmH-Av-vhT"/>
                         <segue destination="T5n-nb-cOW" kind="show" identifier="showSigninV2" id="sIC-Hv-FJw"/>
-                        <segue destination="MEg-KS-Afs" kind="show" identifier="showGoogle" id="HMT-Z5-QHr"/>
                         <segue destination="SZS-o3-1P7" kind="show" identifier="showURLUsernamePassword" id="4SK-mG-U33"/>
                     </connections>
                 </viewController>
@@ -1174,7 +1164,6 @@
                         <segue destination="SZS-o3-1P7" kind="show" identifier="showURLUsernamePassword" id="TkG-0R-c3i"/>
                         <segue destination="iMi-vX-AxR" kind="show" identifier="showWPUsernamePassword" id="dtm-iK-PLb"/>
                         <segue destination="hed-vB-osh" kind="presentation" identifier="showLoginMethod" id="5hL-j3-eMs"/>
-                        <segue destination="MEg-KS-Afs" kind="show" identifier="showGoogle" id="pe1-D0-Mpg"/>
                         <segue destination="lmD-c6-SLs" kind="show" identifier="showWPComLogin" id="8p6-rS-9Ml"/>
                     </connections>
                 </viewController>
@@ -1462,11 +1451,10 @@
         <segue reference="N3P-wt-Rn3"/>
         <segue reference="Njv-lY-Lyi"/>
         <segue reference="2Of-BA-xqb"/>
-        <segue reference="0ao-yi-yZI"/>
+        <segue reference="UV4-XI-c0q"/>
         <segue reference="4SK-mG-U33"/>
         <segue reference="nCA-u7-fKm"/>
         <segue reference="swV-lc-6gI"/>
         <segue reference="gD5-d0-X3t"/>
-        <segue reference="aSC-hU-lzE"/>
     </inferredMetricsTieBreakers>
 </document>
diff --git a/WordPressAuthenticator/Signin/LoginEmailViewController.swift b/WordPressAuthenticator/Signin/LoginEmailViewController.swift
@@ -398,7 +398,12 @@ open class LoginEmailViewController: LoginViewController, NUXKeyboardResponder {
                 self?.performSegue(withIdentifier: .showSigninV2, sender: self)
             }
             vc.googleTapped = { [weak self] in
-                self?.performSegue(withIdentifier: .showGoogle, sender: self)
+                guard let toVC = SignupGoogleViewController.instantiate(from: .signup) else {
+                    DDLogError("Failed to navigate to SignupGoogleViewController")
+                    return
+                }
+
+                self?.navigationController?.pushViewController(toVC, animated: true)
             }
             vc.modalPresentationStyle = .custom
         }
diff --git a/WordPressAuthenticator/Signin/LoginPrologueViewController.swift b/WordPressAuthenticator/Signin/LoginPrologueViewController.swift
@@ -47,11 +47,17 @@ class LoginPrologueViewController: LoginViewController {
         }
         else if let vc = segue.destination as? LoginPrologueSignupMethodViewController {
             vc.transitioningDelegate = self
+
             vc.emailTapped = { [weak self] in
                 self?.performSegue(withIdentifier: .showSigninV2, sender: self)
             }
             vc.googleTapped = { [weak self] in
-                self?.performSegue(withIdentifier: .showGoogle, sender: self)
+                guard let toVC = SignupGoogleViewController.instantiate(from: .signup) else {
+                    DDLogError("Failed to navigate to SignupGoogleViewController")
+                    return
+                }
+
+                self?.navigationController?.pushViewController(toVC, animated: true)
             }
             vc.appleTapped = { [weak self] in
                 self?.appleTapped()
diff --git a/WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift b/WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift
@@ -287,7 +287,12 @@ class LoginSiteAddressViewController: LoginViewController, NUXKeyboardResponder
                 self?.showWPUsernamePassword()
             }
             vc.googleTapped = { [weak self] in
-                self?.performSegue(withIdentifier: .showGoogle, sender: self)
+                guard let toVC = SignupGoogleViewController.instantiate(from: .signup) else {
+                    DDLogError("Failed to navigate to SignupGoogleViewController")
+                    return
+                }
+
+                self?.navigationController?.pushViewController(toVC, animated: true)
             }
             vc.appleTapped = { [weak self] in
                 self?.appleTapped()
diff --git a/WordPressAuthenticator/Signup/Signup.storyboard b/WordPressAuthenticator/Signup/Signup.storyboard
@@ -137,7 +137,7 @@
         <!--Signup Google View Controller-->
         <scene sceneID="WBb-bn-nnr">
             <objects>
-                <viewController storyboardIdentifier="googleSignup" id="cgk-WR-8PR" customClass="SignupGoogleViewController" customModule="WordPressAuthenticator" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="SignupGoogleViewController" id="cgk-WR-8PR" customClass="SignupGoogleViewController" customModule="WordPressAuthenticator" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="3UA-HJ-Orw">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>

Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,12 @@ open class LoginEmailViewController: LoginViewController, NUXKeyboardResponder {`
`398`	`398`	`self?.performSegue(withIdentifier: .showSigninV2, sender: self)`
`399`	`399`	`}`
`400`	`400`	`vc.googleTapped = { [weak self] in`
`401`		`- self?.performSegue(withIdentifier: .showGoogle, sender: self)`
	`401`	`+ guard let toVC = SignupGoogleViewController.instantiate(from: .signup) else {`
	`402`	`+ DDLogError("Failed to navigate to SignupGoogleViewController")`
	`403`	`+ return`
	`404`	`+ }`
	`405`	`+`
	`406`	`+ self?.navigationController?.pushViewController(toVC, animated: true)`
`402`	`407`	`}`
`403`	`408`	`vc.modalPresentationStyle = .custom`
`404`	`409`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,11 +47,17 @@ class LoginPrologueViewController: LoginViewController {`
`47`	`47`	`}`
`48`	`48`	`else if let vc = segue.destination as? LoginPrologueSignupMethodViewController {`
`49`	`49`	`vc.transitioningDelegate = self`
	`50`	`+`
`50`	`51`	`vc.emailTapped = { [weak self] in`
`51`	`52`	`self?.performSegue(withIdentifier: .showSigninV2, sender: self)`
`52`	`53`	`}`
`53`	`54`	`vc.googleTapped = { [weak self] in`
`54`		`- self?.performSegue(withIdentifier: .showGoogle, sender: self)`
	`55`	`+ guard let toVC = SignupGoogleViewController.instantiate(from: .signup) else {`
	`56`	`+ DDLogError("Failed to navigate to SignupGoogleViewController")`
	`57`	`+ return`
	`58`	`+ }`
	`59`	`+`
	`60`	`+ self?.navigationController?.pushViewController(toVC, animated: true)`
`55`	`61`	`}`
`56`	`62`	`vc.appleTapped = { [weak self] in`
`57`	`63`	`self?.appleTapped()`
Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,12 @@ class LoginSiteAddressViewController: LoginViewController, NUXKeyboardResponder`
`287`	`287`	`self?.showWPUsernamePassword()`
`288`	`288`	`}`
`289`	`289`	`vc.googleTapped = { [weak self] in`
`290`		`- self?.performSegue(withIdentifier: .showGoogle, sender: self)`
	`290`	`+ guard let toVC = SignupGoogleViewController.instantiate(from: .signup) else {`
	`291`	`+ DDLogError("Failed to navigate to SignupGoogleViewController")`
	`292`	`+ return`
	`293`	`+ }`
	`294`	`+`
	`295`	`+ self?.navigationController?.pushViewController(toVC, animated: true)`
`291`	`296`	`}`
`292`	`297`	`vc.appleTapped = { [weak self] in`
`293`	`298`	`self?.appleTapped()`