diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 06663f195163..e258649245fe 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -3,6 +3,7 @@ * [*] Site previews: Reduced visual flickering when previewing sites and templates. [#17861] * [*] Stats: fix navigation between Stats tab. [#17894] * [*] Add "Copy Link" functionality to Posts List and Pages List [#17911] +* [*] [Jetpack-only] Enables the ability to use and create WordPress.com sites, and enables the Reader tab. [#17914, #17948] 19.2 ----- diff --git a/WordPress/Classes/Utility/App Configuration/AuthenticationHandler.swift b/WordPress/Classes/Utility/App Configuration/AuthenticationHandler.swift index 8781e5a1d188..07c6895c3f6b 100644 --- a/WordPress/Classes/Utility/App Configuration/AuthenticationHandler.swift +++ b/WordPress/Classes/Utility/App Configuration/AuthenticationHandler.swift @@ -3,8 +3,20 @@ import WordPressAuthenticator protocol AuthenticationHandler { func shouldPresentUsernamePasswordController(for siteInfo: WordPressComSiteInfo?, onCompletion: @escaping (WordPressAuthenticatorResult) -> Void) + /// Whether or not the AuthenticationHandler will override or handle the `presentLoginEpilogue` method. + /// If this returns true, the `AuthenticationHandler.presentLoginEpilogue` method is called + /// If not, then the default implementation will be called instead + /// - Returns: Bool, true if we should override the functionality, false if we should not + func willHandlePresentLoginEpilogue(in navigationController: UINavigationController, for credentials: AuthenticatorCredentials) -> Bool + func presentLoginEpilogue(in navigationController: UINavigationController, for credentials: AuthenticatorCredentials, windowManager: WindowManager, onDismiss: @escaping () -> Void) -> Bool + /// Whether or not the AuthenticationHandler will override or handle the `presentSignupEpilogue` method. + /// If this returns true, the `AuthenticationHandler.presentSignupEpilogue` method is called + /// If not, then the default implementation will be called instead + /// - Returns: Bool, true if we should override the functionality, false if we should not + func willHandlePresentSignupEpilogue(in navigationController: UINavigationController, for credentials: AuthenticatorCredentials, service: SocialService?) -> Bool + func presentSignupEpilogue(in navigationController: UINavigationController, for credentials: AuthenticatorCredentials, service: SocialService?) // WPAuthenticator style overrides diff --git a/WordPress/Classes/ViewRelated/NUX/Post Signup Interstitial/PostSignUpInterstitialViewController.swift b/WordPress/Classes/ViewRelated/NUX/Post Signup Interstitial/PostSignUpInterstitialViewController.swift index fb576fd4ca23..c8739d3dbae6 100644 --- a/WordPress/Classes/ViewRelated/NUX/Post Signup Interstitial/PostSignUpInterstitialViewController.swift +++ b/WordPress/Classes/ViewRelated/NUX/Post Signup Interstitial/PostSignUpInterstitialViewController.swift @@ -45,6 +45,7 @@ class PostSignUpInterstitialViewController: UIViewController { @IBOutlet weak var createSiteButton: UIButton! @IBOutlet weak var addSelfHostedButton: UIButton! @IBOutlet weak var cancelButton: UIButton! + @IBOutlet weak var imageView: UIImageView! enum DismissAction { case none @@ -66,6 +67,11 @@ class PostSignUpInterstitialViewController: UIViewController { view.backgroundColor = .listBackground + // Update the banner image for Jetpack + if AppConfiguration.isJetpack, let image = UIImage(named: "wp-illustration-construct-site-jetpack") { + imageView.image = image + } + configureI18N() WPAnalytics.track(.welcomeNoSitesInterstitialShown) diff --git a/WordPress/Classes/ViewRelated/NUX/Post Signup Interstitial/PostSignUpInterstitialViewController.xib b/WordPress/Classes/ViewRelated/NUX/Post Signup Interstitial/PostSignUpInterstitialViewController.xib index 4a6eff8ca12b..0f343a88745d 100644 --- a/WordPress/Classes/ViewRelated/NUX/Post Signup Interstitial/PostSignUpInterstitialViewController.xib +++ b/WordPress/Classes/ViewRelated/NUX/Post Signup Interstitial/PostSignUpInterstitialViewController.xib @@ -1,9 +1,9 @@ - + - + @@ -13,6 +13,7 @@ + @@ -29,7 +30,7 @@ - - -