From 4c9b2cda805c9a89888b5df4e0314debc204f0fe Mon Sep 17 00:00:00 2001
From: Nate Heagy <nate@heagy.com>
Date: Tue, 3 Oct 2017 11:04:55 -0600
Subject: [PATCH 1/7] Stop Google button from covering error label

---
 .../Classes/ViewRelated/NUX/Login.storyboard  | 110 ++++++++++--------
 .../NUX/LoginEmailViewController.swift        |  28 +++--
 .../ViewRelated/NUX/LoginViewController.swift |   5 +
 3 files changed, 85 insertions(+), 58 deletions(-)

diff --git a/WordPress/Classes/ViewRelated/NUX/Login.storyboard b/WordPress/Classes/ViewRelated/NUX/Login.storyboard
index 7c0f9fd1bea4..2906d7fdc2d0 100644
--- a/WordPress/Classes/ViewRelated/NUX/Login.storyboard
+++ b/WordPress/Classes/ViewRelated/NUX/Login.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Ck1-vY-O11">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13526" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Ck1-vY-O11">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13524"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -119,7 +119,7 @@
             <objects>
                 <navigationController id="Ck1-vY-O11" customClass="LoginNavigationController" customModule="WordPress" customModuleProvider="target" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="mKb-UO-KoA">
-                        <rect key="frame" x="0.0" y="20" width="375" height="48"/>
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
@@ -148,50 +148,61 @@
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KAn-ug-oE6">
                                         <rect key="frame" x="0.0" y="0.0" width="391" height="548"/>
                                         <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="750" verticalCompressionResistancePriority="1000" text="Log in to WordPress.com using an email address to manage all your WordPress sites." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DKR-9c-zZQ">
-                                                <rect key="frame" x="20" y="194" width="351" height="38"/>
-                                                <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
-                                                <color key="textColor" red="0.1803921568627451" green="0.26666666666666666" blue="0.32549019607843138" alpha="1" colorSpace="calibratedRGB"/>
-                                                <nil key="highlightedColor"/>
-                                            </label>
-                                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" semanticContentAttribute="forceLeftToRight" verticalHuggingPriority="251" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email address" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="XXO-aV-keK" customClass="LoginTextField" customModule="WordPress" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="252" width="391" height="44"/>
-                                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                <accessibility key="accessibilityConfiguration" identifier="usernameField"/>
+                                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="JdU-yW-tzf">
+                                                <rect key="frame" x="0.0" y="194" width="391" height="102"/>
+                                                <subviews>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="750" verticalCompressionResistancePriority="1000" text="Log in to WordPress.com using an email address to manage all your WordPress sites." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DKR-9c-zZQ">
+                                                        <rect key="frame" x="20" y="0.0" width="351" height="38"/>
+                                                        <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
+                                                        <color key="textColor" red="0.1803921568627451" green="0.26666666666666666" blue="0.32549019607843138" alpha="1" colorSpace="calibratedRGB"/>
+                                                        <nil key="highlightedColor"/>
+                                                    </label>
+                                                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" semanticContentAttribute="forceLeftToRight" verticalHuggingPriority="251" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email address" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="XXO-aV-keK" customClass="LoginTextField" customModule="WordPress" customModuleProvider="target">
+                                                        <rect key="frame" x="0.0" y="58" width="391" height="44"/>
+                                                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                        <accessibility key="accessibilityConfiguration" identifier="usernameField"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="44" id="c8B-Ol-kY2"/>
+                                                        </constraints>
+                                                        <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                                                        <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" keyboardType="emailAddress" returnKeyType="next" enablesReturnKeyAutomatically="YES"/>
+                                                        <userDefinedRuntimeAttributes>
+                                                            <userDefinedRuntimeAttribute type="image" keyPath="leftViewImage" value="icon-username-field"/>
+                                                            <userDefinedRuntimeAttribute type="boolean" keyPath="showTopLineSeparator" value="YES"/>
+                                                        </userDefinedRuntimeAttributes>
+                                                        <connections>
+                                                            <action selector="handleSubmitForm" destination="fwZ-QE-5et" eventType="primaryActionTriggered" id="8l9-uh-Gyz"/>
+                                                            <action selector="handleTextFieldDidChange:" destination="fwZ-QE-5et" eventType="editingChanged" id="LoF-5Q-Yw5"/>
+                                                            <action selector="handleTextFieldEditingDidBegin:" destination="fwZ-QE-5et" eventType="editingDidBegin" id="Ff8-SJ-F9U"/>
+                                                            <outlet property="delegate" destination="fwZ-QE-5et" id="Urv-t1-Fui"/>
+                                                        </connections>
+                                                    </textField>
+                                                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="750" text="" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qqt-eq-gac">
+                                                        <rect key="frame" x="20" y="102" width="351" height="40"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" constant="40" placeholder="YES" id="0GR-cF-ntU"/>
+                                                        </constraints>
+                                                        <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
+                                                        <color key="textColor" red="0.85098039215686272" green="0.30980392156862746" blue="0.30980392156862746" alpha="1" colorSpace="calibratedRGB"/>
+                                                        <nil key="highlightedColor"/>
+                                                    </label>
+                                                </subviews>
                                                 <constraints>
-                                                    <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="44" id="c8B-Ol-kY2"/>
+                                                    <constraint firstAttribute="trailing" secondItem="DKR-9c-zZQ" secondAttribute="trailing" constant="20" id="Arc-2j-NIk"/>
+                                                    <constraint firstItem="DKR-9c-zZQ" firstAttribute="leading" secondItem="JdU-yW-tzf" secondAttribute="leading" constant="20" id="EhG-eK-xfB"/>
+                                                    <constraint firstAttribute="trailing" secondItem="Qqt-eq-gac" secondAttribute="trailing" constant="20" id="G1N-hC-wjG"/>
+                                                    <constraint firstItem="XXO-aV-keK" firstAttribute="leading" secondItem="JdU-yW-tzf" secondAttribute="leading" id="Nn2-cS-qMf"/>
+                                                    <constraint firstItem="Qqt-eq-gac" firstAttribute="leading" secondItem="JdU-yW-tzf" secondAttribute="leading" constant="20" id="Yi1-cS-eg0"/>
+                                                    <constraint firstAttribute="trailing" secondItem="XXO-aV-keK" secondAttribute="trailing" id="wb9-QT-CMv"/>
                                                 </constraints>
-                                                <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
-                                                <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" keyboardType="emailAddress" returnKeyType="next" enablesReturnKeyAutomatically="YES"/>
-                                                <userDefinedRuntimeAttributes>
-                                                    <userDefinedRuntimeAttribute type="image" keyPath="leftViewImage" value="icon-username-field"/>
-                                                    <userDefinedRuntimeAttribute type="boolean" keyPath="showTopLineSeparator" value="YES"/>
-                                                </userDefinedRuntimeAttributes>
-                                                <connections>
-                                                    <action selector="handleSubmitForm" destination="fwZ-QE-5et" eventType="primaryActionTriggered" id="8l9-uh-Gyz"/>
-                                                    <action selector="handleTextFieldDidChange:" destination="fwZ-QE-5et" eventType="editingChanged" id="LoF-5Q-Yw5"/>
-                                                    <action selector="handleTextFieldEditingDidBegin:" destination="fwZ-QE-5et" eventType="editingDidBegin" id="Ff8-SJ-F9U"/>
-                                                    <outlet property="delegate" destination="fwZ-QE-5et" id="Urv-t1-Fui"/>
-                                                </connections>
-                                            </textField>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="750" text="" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qqt-eq-gac">
-                                                <rect key="frame" x="20" y="316" width="351" height="0.0"/>
-                                                <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
-                                                <color key="textColor" red="0.85098039215686272" green="0.30980392156862746" blue="0.30980392156862746" alpha="1" colorSpace="calibratedRGB"/>
-                                                <nil key="highlightedColor"/>
-                                            </label>
+                                            </stackView>
                                         </subviews>
                                         <constraints>
-                                            <constraint firstItem="DKR-9c-zZQ" firstAttribute="leading" secondItem="KAn-ug-oE6" secondAttribute="leading" constant="20" id="7wu-3l-qUr"/>
-                                            <constraint firstItem="XXO-aV-keK" firstAttribute="top" secondItem="DKR-9c-zZQ" secondAttribute="bottom" constant="20" id="9oX-ka-j3I"/>
-                                            <constraint firstItem="DKR-9c-zZQ" firstAttribute="top" relation="greaterThanOrEqual" secondItem="KAn-ug-oE6" secondAttribute="top" constant="20" id="JJl-Bt-GIK"/>
-                                            <constraint firstItem="XXO-aV-keK" firstAttribute="leading" secondItem="KAn-ug-oE6" secondAttribute="leading" id="KvU-q6-a4w"/>
-                                            <constraint firstAttribute="trailing" secondItem="XXO-aV-keK" secondAttribute="trailing" id="MIQ-Zc-xTt"/>
-                                            <constraint firstItem="Qqt-eq-gac" firstAttribute="top" secondItem="XXO-aV-keK" secondAttribute="bottom" constant="20" id="RI6-Oc-Mzl"/>
-                                            <constraint firstItem="Qqt-eq-gac" firstAttribute="leading" secondItem="KAn-ug-oE6" secondAttribute="leading" constant="20" id="YNt-g8-nUN"/>
-                                            <constraint firstAttribute="trailing" secondItem="Qqt-eq-gac" secondAttribute="trailing" constant="20" id="bSc-Qd-t4P"/>
-                                            <constraint firstAttribute="trailing" secondItem="DKR-9c-zZQ" secondAttribute="trailing" constant="20" id="jye-BF-2wg"/>
-                                            <constraint firstItem="XXO-aV-keK" firstAttribute="centerY" secondItem="KAn-ug-oE6" secondAttribute="centerY" priority="900" id="wqM-E8-vHO"/>
+                                            <constraint firstItem="XXO-aV-keK" firstAttribute="centerY" secondItem="KAn-ug-oE6" secondAttribute="centerY" id="02j-fV-HrF"/>
+                                            <constraint firstItem="JdU-yW-tzf" firstAttribute="width" secondItem="KAn-ug-oE6" secondAttribute="width" id="TL8-5B-Fpy"/>
+                                            <constraint firstItem="JdU-yW-tzf" firstAttribute="height" relation="lessThanOrEqual" secondItem="KAn-ug-oE6" secondAttribute="height" id="m0i-QV-gVF"/>
+                                            <constraint firstAttribute="trailing" secondItem="JdU-yW-tzf" secondAttribute="trailing" id="qo0-v2-sqg"/>
+                                            <constraint firstItem="JdU-yW-tzf" firstAttribute="leading" secondItem="KAn-ug-oE6" secondAttribute="leading" id="yAg-ul-Rff"/>
                                         </constraints>
                                     </view>
                                     <stackView contentMode="scaleToFill" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" distribution="equalSpacing" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="6i6-CG-3Tg">
@@ -273,6 +284,7 @@
                         <outlet property="bottomContentConstraint" destination="h6K-00-qtf" id="qRz-TA-WAC"/>
                         <outlet property="emailTextField" destination="XXO-aV-keK" id="GZQ-cn-hKd"/>
                         <outlet property="errorLabel" destination="Qqt-eq-gac" id="4mV-5J-TJ2"/>
+                        <outlet property="inputStack" destination="JdU-yW-tzf" id="99m-CN-GKR"/>
                         <outlet property="instructionLabel" destination="DKR-9c-zZQ" id="2Rj-ad-hnL"/>
                         <outlet property="selfHostedSigninButton" destination="5Hn-ZK-h9k" id="hZn-AT-eQt"/>
                         <outlet property="submitButton" destination="OZC-xf-OAn" id="k1c-SJ-qiK"/>
@@ -1447,7 +1459,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="L3o-Cy-vXw">
-                                <rect key="frame" x="36" y="143.5" width="303" height="340.5"/>
+                                <rect key="frame" x="36" y="176" width="303" height="275"/>
                                 <subviews>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="login-magic-link" translatesAutoresizingMaskIntoConstraints="NO" id="upR-OL-iQF">
                                         <rect key="frame" x="71.5" y="0.0" width="160" height="160"/>
@@ -1457,7 +1469,7 @@
                                         </constraints>
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Your magic link is on its way! Check your email on this device, and tap the link in the email you receive from WordPress.com" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pkM-xx-821">
-                                        <rect key="frame" x="0.0" y="190" width="303" height="86.5"/>
+                                        <rect key="frame" x="-36" y="190" width="0.0" height="21"/>
                                         <constraints>
                                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="21" id="0nV-Yg-je4"/>
                                             <constraint firstAttribute="width" constant="320" id="2JY-7V-RVK"/>
@@ -1477,7 +1489,7 @@
                                         </variation>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="749" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0Iy-9H-ykD" customClass="LoginButton" customModule="WordPress" customModuleProvider="target">
-                                        <rect key="frame" x="114" y="306.5" width="75" height="34"/>
+                                        <rect key="frame" x="114" y="241" width="75" height="34"/>
                                         <constraints>
                                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="34" id="tyz-kt-Arb"/>
                                         </constraints>
@@ -1712,8 +1724,8 @@
         <image name="login-magic-link" width="160" height="160"/>
     </resources>
     <inferredMetricsTieBreakers>
-        <segue reference="7lv-19-h36"/>
-        <segue reference="qLI-qX-rkG"/>
-        <segue reference="Jfl-Zm-PRR"/>
+        <segue reference="gAE-di-Wyf"/>
+        <segue reference="kRR-qz-Hu2"/>
+        <segue reference="ySQ-EM-6JI"/>
     </inferredMetricsTieBreakers>
 </document>
diff --git a/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift b/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift
index e6752be2becf..fe844cb3c397 100644
--- a/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift
+++ b/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift
@@ -8,6 +8,7 @@ class LoginEmailViewController: LoginViewController, SigninKeyboardResponder {
     @IBOutlet var selfHostedSigninButton: UIButton!
     @IBOutlet var bottomContentConstraint: NSLayoutConstraint?
     @IBOutlet var verticalCenterConstraint: NSLayoutConstraint?
+    @IBOutlet var inputStack: UIStackView?
     var onePasswordButton: UIButton!
     var googleLoginButton: UIButton?
 
@@ -29,7 +30,7 @@ class LoginEmailViewController: LoginViewController, SigninKeyboardResponder {
     }
 
     private struct Constants {
-        static let googleButtonOffset: CGFloat = 5.0
+        static let googleButtonOffset: CGFloat = 10.0
     }
 
 
@@ -127,20 +128,29 @@ class LoginEmailViewController: LoginViewController, SigninKeyboardResponder {
     /// Add the log in with Google button to the view
     func addGoogleButton() {
         guard Feature.enabled(.googleLogin),
-            let instructionLabel = instructionLabel else {
+            let instructionLabel = instructionLabel,
+            let stackView = inputStack else {
             return
         }
 
         let button = UIButton.googleLoginButton()
-        view.addSubview(button)
+        let buttonWrapper = UIView()
+        buttonWrapper.addSubview(button)
+        stackView.addArrangedSubview(buttonWrapper)
         button.addTarget(self, action: #selector(googleLoginTapped), for: .touchUpInside)
 
-        view.addConstraints([
-            button.topAnchor.constraint(equalTo: self.emailTextField.bottomAnchor, constant: Constants.googleButtonOffset),
-            button.leadingAnchor.constraint(equalTo: instructionLabel.leadingAnchor),
-            button.trailingAnchor.constraint(equalTo: instructionLabel.trailingAnchor),
-            button.centerXAnchor.constraint(equalTo: emailTextField.centerXAnchor)
-        ])
+        buttonWrapper.addConstraints([
+            buttonWrapper.topAnchor.constraint(equalTo: button.topAnchor, constant: Constants.googleButtonOffset),
+            buttonWrapper.bottomAnchor.constraint(equalTo: button.bottomAnchor, constant: Constants.googleButtonOffset * -1.0),
+            buttonWrapper.leadingAnchor.constraint(equalTo: button.leadingAnchor),
+            buttonWrapper.trailingAnchor.constraint(equalTo: button.trailingAnchor)
+            ])
+
+        stackView.addConstraints([
+            buttonWrapper.leadingAnchor.constraint(equalTo: instructionLabel.leadingAnchor),
+            buttonWrapper.trailingAnchor.constraint(equalTo: instructionLabel.trailingAnchor),
+            ])
+
         googleLoginButton = button
     }
 
diff --git a/WordPress/Classes/ViewRelated/NUX/LoginViewController.swift b/WordPress/Classes/ViewRelated/NUX/LoginViewController.swift
index 5680875fcbed..ded478062b88 100644
--- a/WordPress/Classes/ViewRelated/NUX/LoginViewController.swift
+++ b/WordPress/Classes/ViewRelated/NUX/LoginViewController.swift
@@ -104,6 +104,11 @@ class LoginViewController: NUXAbstractViewController, LoginWithLogoAndHelpViewCo
     /// Sets the text of the error label.
     ///
     func displayError(message: String) {
+        guard message.count > 0 else {
+            errorLabel?.isHidden = true
+            return
+        }
+        errorLabel?.isHidden = false
         errorLabel?.text = message
     }
 

From a59ac324a4b7e64e86cb72a62353cad3905f976f Mon Sep 17 00:00:00 2001
From: Nate Heagy <nate@heagy.com>
Date: Tue, 3 Oct 2017 11:10:31 -0600
Subject: [PATCH 2/7] Add missing top constraint to new stack view

---
 WordPress/Classes/ViewRelated/NUX/Login.storyboard | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WordPress/Classes/ViewRelated/NUX/Login.storyboard b/WordPress/Classes/ViewRelated/NUX/Login.storyboard
index 2906d7fdc2d0..b99d8ca91e6b 100644
--- a/WordPress/Classes/ViewRelated/NUX/Login.storyboard
+++ b/WordPress/Classes/ViewRelated/NUX/Login.storyboard
@@ -201,6 +201,7 @@
                                             <constraint firstItem="XXO-aV-keK" firstAttribute="centerY" secondItem="KAn-ug-oE6" secondAttribute="centerY" id="02j-fV-HrF"/>
                                             <constraint firstItem="JdU-yW-tzf" firstAttribute="width" secondItem="KAn-ug-oE6" secondAttribute="width" id="TL8-5B-Fpy"/>
                                             <constraint firstItem="JdU-yW-tzf" firstAttribute="height" relation="lessThanOrEqual" secondItem="KAn-ug-oE6" secondAttribute="height" id="m0i-QV-gVF"/>
+                                            <constraint firstItem="JdU-yW-tzf" firstAttribute="top" relation="greaterThanOrEqual" secondItem="KAn-ug-oE6" secondAttribute="top" constant="20" id="pjg-E0-opm"/>
                                             <constraint firstAttribute="trailing" secondItem="JdU-yW-tzf" secondAttribute="trailing" id="qo0-v2-sqg"/>
                                             <constraint firstItem="JdU-yW-tzf" firstAttribute="leading" secondItem="KAn-ug-oE6" secondAttribute="leading" id="yAg-ul-Rff"/>
                                         </constraints>

From 77d474aa2dcc24bc44b66a2e47e4b3c707058eeb Mon Sep 17 00:00:00 2001
From: Nate Heagy <nate@heagy.com>
Date: Tue, 10 Oct 2017 14:23:11 -0600
Subject: [PATCH 3/7] Hide Google signin button if there is an error with
 keyboard on screen

---
 WordPress/Classes/ViewRelated/NUX/Login.storyboard |  2 +-
 .../ViewRelated/NUX/LoginEmailViewController.swift | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/WordPress/Classes/ViewRelated/NUX/Login.storyboard b/WordPress/Classes/ViewRelated/NUX/Login.storyboard
index b99d8ca91e6b..50b1b78aa5f1 100644
--- a/WordPress/Classes/ViewRelated/NUX/Login.storyboard
+++ b/WordPress/Classes/ViewRelated/NUX/Login.storyboard
@@ -198,7 +198,7 @@
                                             </stackView>
                                         </subviews>
                                         <constraints>
-                                            <constraint firstItem="XXO-aV-keK" firstAttribute="centerY" secondItem="KAn-ug-oE6" secondAttribute="centerY" id="02j-fV-HrF"/>
+                                            <constraint firstItem="XXO-aV-keK" firstAttribute="centerY" secondItem="KAn-ug-oE6" secondAttribute="centerY" priority="750" id="02j-fV-HrF"/>
                                             <constraint firstItem="JdU-yW-tzf" firstAttribute="width" secondItem="KAn-ug-oE6" secondAttribute="width" id="TL8-5B-Fpy"/>
                                             <constraint firstItem="JdU-yW-tzf" firstAttribute="height" relation="lessThanOrEqual" secondItem="KAn-ug-oE6" secondAttribute="height" id="m0i-QV-gVF"/>
                                             <constraint firstItem="JdU-yW-tzf" firstAttribute="top" relation="greaterThanOrEqual" secondItem="KAn-ug-oE6" secondAttribute="top" constant="20" id="pjg-E0-opm"/>
diff --git a/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift b/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift
index fe844cb3c397..05d6d0237a9d 100644
--- a/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift
+++ b/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift
@@ -31,6 +31,7 @@ class LoginEmailViewController: LoginViewController, SigninKeyboardResponder {
 
     private struct Constants {
         static let googleButtonOffset: CGFloat = 10.0
+        static let googleButtonAnimationDuration: TimeInterval = 0.33
     }
 
 
@@ -388,13 +389,26 @@ class LoginEmailViewController: LoginViewController, SigninKeyboardResponder {
 
     func handleKeyboardWillShow(_ notification: Foundation.Notification) {
         keyboardWillShow(notification)
+
+        adjustGoogleButtonVisibility(true)
     }
 
 
     func handleKeyboardWillHide(_ notification: Foundation.Notification) {
         keyboardWillHide(notification)
+
+        adjustGoogleButtonVisibility(false)
     }
 
+    func adjustGoogleButtonVisibility(_ visible: Bool) {
+        let errorLength = errorLabel?.text?.count ?? 0
+        let baseAlpha: CGFloat = errorLength > 0 ? 0.0 : 1.0
+        let newAlpha: CGFloat = visible ? baseAlpha : 1.0
+
+        UIView.animate(withDuration: Constants.googleButtonAnimationDuration) { [weak self] in
+            self?.googleLoginButton?.alpha = newAlpha
+        }
+    }
 }
 
 // LoginFacadeDelegate methods for Google Google Sign In

From cd35876a9b63001bcc28299cf7f0473bec54eeae Mon Sep 17 00:00:00 2001
From: Nate Heagy <nate@heagy.com>
Date: Tue, 10 Oct 2017 14:23:28 -0600
Subject: [PATCH 4/7] Update Google Signin pod to 4.1.0

---
 Podfile      |  2 +-
 Podfile.lock | 37 +++++++++++++++++++------------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/Podfile b/Podfile
index 5b00e19de1d2..7dfe46712f21 100644
--- a/Podfile
+++ b/Podfile
@@ -45,7 +45,7 @@ target 'WordPress' do
   pod 'MGSwipeTableCell', '1.6.1'
   pod 'lottie-ios', '1.5.1'
   pod 'Starscream', '3.0.2'
-  pod 'GoogleSignIn', '4.0.2'
+  pod 'GoogleSignIn', '4.1.0'
 
   # --------------------
   # WordPress components
diff --git a/Podfile.lock b/Podfile.lock
index 2f6054c63d01..066dd883f88d 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -35,27 +35,27 @@ PODS:
   - FormatterKit/Resources (1.8.2)
   - FormatterKit/TimeIntervalFormatter (1.8.2):
     - FormatterKit/Resources
-  - GoogleSignIn (4.0.2):
+  - GoogleSignIn (4.1.0):
     - GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)
     - GoogleToolboxForMac/NSString+URLArguments (~> 2.1)
     - GTMOAuth2 (~> 1.0)
     - GTMSessionFetcher/Core (~> 1.1)
-  - GoogleToolboxForMac/DebugUtils (2.1.1):
-    - GoogleToolboxForMac/Defines (= 2.1.1)
-  - GoogleToolboxForMac/Defines (2.1.1)
-  - GoogleToolboxForMac/NSDictionary+URLArguments (2.1.1):
-    - GoogleToolboxForMac/DebugUtils (= 2.1.1)
-    - GoogleToolboxForMac/Defines (= 2.1.1)
-    - GoogleToolboxForMac/NSString+URLArguments (= 2.1.1)
-  - GoogleToolboxForMac/NSString+URLArguments (2.1.1)
+  - GoogleToolboxForMac/DebugUtils (2.1.3):
+    - GoogleToolboxForMac/Defines (= 2.1.3)
+  - GoogleToolboxForMac/Defines (2.1.3)
+  - GoogleToolboxForMac/NSDictionary+URLArguments (2.1.3):
+    - GoogleToolboxForMac/DebugUtils (= 2.1.3)
+    - GoogleToolboxForMac/Defines (= 2.1.3)
+    - GoogleToolboxForMac/NSString+URLArguments (= 2.1.3)
+  - GoogleToolboxForMac/NSString+URLArguments (2.1.3)
   - Gridicons (0.10)
   - GTMOAuth2 (1.1.5):
     - GTMSessionFetcher (~> 1.1)
-  - GTMSessionFetcher (1.1.11):
-    - GTMSessionFetcher/Full (= 1.1.11)
-  - GTMSessionFetcher/Core (1.1.11)
-  - GTMSessionFetcher/Full (1.1.11):
-    - GTMSessionFetcher/Core (= 1.1.11)
+  - GTMSessionFetcher (1.1.12):
+    - GTMSessionFetcher/Full (= 1.1.12)
+  - GTMSessionFetcher/Core (1.1.12)
+  - GTMSessionFetcher/Full (1.1.12):
+    - GTMSessionFetcher/Core (= 1.1.12)
   - HockeySDK (5.0.0):
     - HockeySDK/DefaultLib (= 5.0.0)
   - HockeySDK/DefaultLib (5.0.0)
@@ -132,7 +132,7 @@ DEPENDENCIES:
   - Expecta (= 1.0.6)
   - FLAnimatedImage (= 1.0.12)
   - FormatterKit/TimeIntervalFormatter (= 1.8.2)
-  - GoogleSignIn (= 4.0.2)
+  - GoogleSignIn (= 4.1.0)
   - Gridicons (= 0.10)
   - HockeySDK (= 5.0.0)
   - lottie-ios (= 1.5.1)
@@ -183,11 +183,11 @@ SPEC CHECKSUMS:
   Fabric: 2fb5676bc811af011a04513451f463dac6803206
   FLAnimatedImage: 4a0b56255d9b05f18b6dd7ee06871be5d3b89e31
   FormatterKit: 4b8f29acc9b872d5d12a63efb560661e8f2e1b98
-  GoogleSignIn: d7ad83f13480e1f30453471d00d19b5293ac46af
-  GoogleToolboxForMac: 8e329f1b599f2512c6b10676d45736bcc2cbbeb0
+  GoogleSignIn: 8c599fc10d25b2af86a3f82fd9631e863f2b1400
+  GoogleToolboxForMac: 2501e2ad72a52eb3dfe7bd9aee7dad11b858bd20
   Gridicons: e661b35e7d4f0ca79e8b2a2072c0081b91b5d1e0
   GTMOAuth2: be83fd28d63ae3087e7d351b1f39c1a7e24ab6e7
-  GTMSessionFetcher: 5ad62e8200fa00ed011fe5e08d27fef72c5b1429
+  GTMSessionFetcher: ebaa1f79a5366922c1735f1566901f50beba23b7
   HockeySDK: 82bf8dcbe1af3c87c24dc98924fcf2e2ba5be8c4
   lottie-ios: f680a7c4cb7a567ecf258fde0f967913aff111b8
   MGSwipeTableCell: 19a1d65dcc1ceaea42eb44bb2adae32101904514
@@ -209,5 +209,6 @@ SPEC CHECKSUMS:
   wpxmlrpc: bfc572f62ce7ee897f6f38b098d2ba08732ecef4
 
 PODFILE CHECKSUM: 2d90baa0286b074b38d3f5fd7c860a6832ff9ee0
+PODFILE CHECKSUM: 100c319ed9793258189246d8f04d86ef839e72b9
 
 COCOAPODS: 1.3.1

From 03c05af1d8eacb1584a5d53d8dafe1f92443f3c2 Mon Sep 17 00:00:00 2001
From: Nate Heagy <nate@heagy.com>
Date: Wed, 11 Oct 2017 14:47:25 -0600
Subject: [PATCH 5/7] Fix Google button appearance on iPad

---
 .../Classes/ViewRelated/NUX/LoginEmailViewController.swift  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift b/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift
index 05d6d0237a9d..1c9b7b5f3652 100644
--- a/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift
+++ b/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift
@@ -32,6 +32,7 @@ class LoginEmailViewController: LoginViewController, SigninKeyboardResponder {
     private struct Constants {
         static let googleButtonOffset: CGFloat = 10.0
         static let googleButtonAnimationDuration: TimeInterval = 0.33
+        static let keyboardThreshold: CGFloat = 100.0
     }
 
 
@@ -402,8 +403,11 @@ class LoginEmailViewController: LoginViewController, SigninKeyboardResponder {
 
     func adjustGoogleButtonVisibility(_ visible: Bool) {
         let errorLength = errorLabel?.text?.count ?? 0
+        let keyboardTallEnough = SigninEditingState.signinLastKeyboardHeightDelta > Constants.keyboardThreshold
+        let keyboardVisible = visible && keyboardTallEnough
+
         let baseAlpha: CGFloat = errorLength > 0 ? 0.0 : 1.0
-        let newAlpha: CGFloat = visible ? baseAlpha : 1.0
+        let newAlpha: CGFloat = keyboardVisible ? baseAlpha : 1.0
 
         UIView.animate(withDuration: Constants.googleButtonAnimationDuration) { [weak self] in
             self?.googleLoginButton?.alpha = newAlpha

From 586b475f23148136176d78d4cfbc4514b9e03156 Mon Sep 17 00:00:00 2001
From: Nate Heagy <nate@heagy.com>
Date: Wed, 11 Oct 2017 15:00:35 -0600
Subject: [PATCH 6/7] Update Podfile.lock checksum after merge

---
 Podfile.lock | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Podfile.lock b/Podfile.lock
index 066dd883f88d..4437219f7149 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -208,7 +208,6 @@ SPEC CHECKSUMS:
   WPMediaPicker: 51dff88157706419e000169b37c3abe0d3017b5f
   wpxmlrpc: bfc572f62ce7ee897f6f38b098d2ba08732ecef4
 
-PODFILE CHECKSUM: 2d90baa0286b074b38d3f5fd7c860a6832ff9ee0
-PODFILE CHECKSUM: 100c319ed9793258189246d8f04d86ef839e72b9
+PODFILE CHECKSUM: 33133081eee85a333db6f0250442984189477661
 
 COCOAPODS: 1.3.1

From 9ebf38a083f7a95daf1e51d2e1df5b9b10324c8b Mon Sep 17 00:00:00 2001
From: Nate Heagy <nate@heagy.com>
Date: Thu, 12 Oct 2017 14:50:28 -0600
Subject: [PATCH 7/7] Update cocoapod checksum for reasons

---
 Podfile.lock | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Podfile.lock b/Podfile.lock
index b5c5b47d717a..b442e5f36b22 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -208,4 +208,6 @@ SPEC CHECKSUMS:
   WPMediaPicker: 51dff88157706419e000169b37c3abe0d3017b5f
   wpxmlrpc: bfc572f62ce7ee897f6f38b098d2ba08732ecef4
 
+PODFILE CHECKSUM: 5fbfa68744b1e7c3d10ab0d934e8b716bf5e55f4
+
 COCOAPODS: 1.3.1