Merge remote-tracking branch 'origin/trunk' into release/7.0.0

Author: mokagio

CHANGELOG.md

@@ -30,15 +30,15 @@ _None._
 
 -->
 
-## Unreleased
+## 6.4.0
 
 ### Breaking Changes
 
 _None._
 
 ### New Features
 
-_None._
+- Update button style and position on the prologue screen when `enableSiteCreation` and `enableSiteAddressLoginOnlyInPrologue` configs are enabled.
 
 ### Bug Fixes
 

WordPressAuthenticator.xcodeproj/project.pbxproj

@@ -502,7 +502,7 @@
 		F1DE08CB24F4266A007AE6B3 /* StoredCredentialsAuthenticator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoredCredentialsAuthenticator.swift; sourceTree = "<group>"; };
 		F5C817E62582B2F300BD5A3B /* UIPasteboard+Detect.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIPasteboard+Detect.swift"; sourceTree = "<group>"; };
 		FF475C5056EB60A277696BA9 /* Pods-WordPressAuthenticatorTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPressAuthenticatorTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-WordPressAuthenticatorTests/Pods-WordPressAuthenticatorTests.release.xcconfig"; sourceTree = "<group>"; };
-		FF629D9522393500004C4106 /* WordPressAuthenticator.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WordPressAuthenticator.podspec; sourceTree = "<group>"; };
+		FF629D9522393500004C4106 /* WordPressAuthenticator.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WordPressAuthenticator.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */

WordPressAuthenticator/Signin/LoginPrologueViewController.swift

@@ -273,26 +273,32 @@ class LoginPrologueViewController: LoginViewController {
                                                  accessibilityIdentifier: "Prologue Continue Button",
                                                  style: primaryButtonStyle,
                                                  onTap: loginTapCallback())
-        let enterYourSiteAddressButton = StackedButton(title: displayStrings.enterYourSiteAddressButtonTitle,
-                                                       isPrimary: configuration.enableSiteAddressLoginOnlyInPrologue,
-                                                       configureBodyFontForTitle: true,
-                                                       accessibilityIdentifier: "Prologue Self Hosted Button",
-                                                       style: secondaryButtonStyle,
-                                                       onTap: siteAddressTapCallback())
-        let createSiteButton = StackedButton(title: displayStrings.siteCreationButtonTitle,
-                                             isPrimary: false,
-                                             configureBodyFontForTitle: true,
-                                             accessibilityIdentifier: "Prologue Create Site Button",
-                                             style: secondaryButtonStyle,
-                                             onTap: simplifiedLoginSiteCreationCallback())
+        let enterYourSiteAddressButton: StackedButton = {
+            let isPrimary = configuration.enableSiteAddressLoginOnlyInPrologue && !configuration.enableSiteCreation
+            return StackedButton(title: displayStrings.enterYourSiteAddressButtonTitle,
+                                 isPrimary: isPrimary,
+                                 configureBodyFontForTitle: true,
+                                 accessibilityIdentifier: "Prologue Self Hosted Button",
+                                 style: secondaryButtonStyle,
+                                 onTap: siteAddressTapCallback())
+        }()
+        let createSiteButton: StackedButton = {
+            let isPrimary = configuration.enableSiteAddressLoginOnlyInPrologue
+            return StackedButton(title: displayStrings.siteCreationButtonTitle,
+                                 isPrimary: isPrimary,
+                                 configureBodyFontForTitle: true,
+                                 accessibilityIdentifier: "Prologue Create Site Button",
+                                 style: secondaryButtonStyle,
+                                 onTap: simplifiedLoginSiteCreationCallback())
+        }()
 
         if configuration.enableWPComLoginOnlyInPrologue && configuration.enableSiteCreation {
             buttons = [continueWithWPButton,
                        createSiteButton]
         } else if configuration.enableWPComLoginOnlyInPrologue {
             buttons = [continueWithWPButton]
         } else if configuration.enableSiteAddressLoginOnlyInPrologue && configuration.enableSiteCreation {
-            buttons = [enterYourSiteAddressButton, createSiteButton]
+            buttons = [createSiteButton, enterYourSiteAddressButton]
         } else if configuration.enableSiteAddressLoginOnlyInPrologue {
             buttons = [enterYourSiteAddressButton]
         } else if configuration.enableSiteCreation {