Feature: Sign In Milestone 1

RELEASE-NOTES.txt

@@ -1,6 +1,7 @@
 2.1
 -----
-
+* The sign in flow has been completely revamped with new help screens and documentation to help users successfully login to the app.
+
 2.0
 ----
 * Translations have been added for the "Orders to Fulfill" card in My Store.

WooCommerce/src/main/kotlin/com/woocommerce/android/AppPrefs.kt

@@ -22,7 +22,8 @@ object AppPrefs {
         IS_USING_V3_API,
         HAS_UNSEEN_NOTIFS,
         SELECTED_SHIPMENT_TRACKING_PROVIDER_NAME,
-        SELECTED_SHIPMENT_TRACKING_PROVIDER_IS_CUSTOM
+        SELECTED_SHIPMENT_TRACKING_PROVIDER_IS_CUSTOM,
+        LOGIN_SITE_ADDRESS
     }
 
     /**
@@ -142,6 +143,16 @@ object AppPrefs {
         setBoolean(DeletablePrefKey.SELECTED_SHIPMENT_TRACKING_PROVIDER_IS_CUSTOM, isCustomProvider)
     }
 
+    fun setLoginSiteAddress(loginSiteAddress: String) {
+        setString(DeletablePrefKey.LOGIN_SITE_ADDRESS, loginSiteAddress)
+    }
+
+    fun getLoginSiteAddress() = getString(DeletablePrefKey.LOGIN_SITE_ADDRESS)
+
+    fun removeLoginSiteAddress() {
+        remove(DeletablePrefKey.LOGIN_SITE_ADDRESS)
+    }
+
     /**
      * Remove all user-related preferences.
      */

WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsTracker.kt

@@ -38,6 +38,7 @@ class AnalyticsTracker private constructor(private val context: Context) {
         LOGIN_AUTOFILL_CREDENTIALS_FILLED(siteless = true),
         LOGIN_AUTOFILL_CREDENTIALS_UPDATED(siteless = true),
         LOGIN_EMAIL_FORM_VIEWED(siteless = true),
+        LOGIN_BY_EMAIL_HELP_FINDING_CONNECTED_EMAIL_LINK_TAPPED(siteless = true),
         LOGIN_MAGIC_LINK_OPEN_EMAIL_CLIENT_VIEWED(siteless = true),
         LOGIN_MAGIC_LINK_OPEN_EMAIL_CLIENT_CLICKED(siteless = true),
         LOGIN_MAGIC_LINK_REQUEST_FORM_VIEWED(siteless = true),
@@ -74,11 +75,31 @@ class AnalyticsTracker private constructor(private val context: Context) {
         CREATED_ACCOUNT(siteless = true),
         LOGIN_PROLOGUE_JETPACK_LOGIN_BUTTON_TAPPED(siteless = true),
         LOGIN_PROLOGUE_JETPACK_CONFIGURATION_INSTRUCTIONS_LINK_TAPPED(siteless = true),
+        LOGIN_JETPACK_REQUIRED_SCREEN_VIEWED(siteless = true),
+        LOGIN_JETPACK_REQUIRED_VIEW_INSTRUCTIONS_BUTTON_TAPPED(siteless = true),
+        LOGIN_JETPACK_REQUIRED_CONTACT_SUPPORT_BUTTON_TAPPED(siteless = true),
+        LOGIN_JETPACK_REQUIRED_WHAT_IS_JETPACK_LINK_TAPPED(siteless = true),
+        LOGIN_JETPACK_REQUIRED_MENU_HELP_TAPPED(siteless = true),
+        LOGIN_WHAT_IS_JETPACK_HELP_SCREEN_VIEWED(siteless = true),
+        LOGIN_WHAT_IS_JETPACK_HELP_SCREEN_LEARN_MORE_BUTTON_TAPPED(siteless = true),
+        LOGIN_WHAT_IS_JETPACK_HELP_SCREEN_OK_BUTTON_TAPPED(siteless = true),
+        LOGIN_CONNECTED_SITE_INFO_REQUESTED(siteless = true),
+        LOGIN_CONNECTED_SITE_INFO_FAILED(siteless = true),
+        LOGIN_CONNECTED_SITE_INFO_SUCCEEDED(siteless = true),
+        LOGIN_FIND_CONNECTED_EMAIL_HELP_SCREEN_VIEWED(siteless = true),
+        LOGIN_FIND_CONNECTED_EMAIL_HELP_SCREEN_NEED_MORE_HELP_LINK_TAPPED(siteless = true),
+        LOGIN_FIND_CONNECTED_EMAIL_HELP_SCREEN_OK_BUTTON_TAPPED(siteless = true),
 
         // -- Site Picker
         SITE_PICKER_STORES_SHOWN(siteless = true),
         SITE_PICKER_CONTINUE_TAPPED(siteless = true),
         SITE_PICKER_HELP_BUTTON_TAPPED(siteless = true),
+        SITE_PICKER_AUTO_LOGIN_SUBMITTED(siteless = true),
+        SITE_PICKER_AUTO_LOGIN_ERROR_NOT_CONNECTED_TO_USER(siteless = true),
+        SITE_PICKER_AUTO_LOGIN_ERROR_NOT_WOO_STORE(siteless = true),
+        SITE_PICKER_TRY_ANOTHER_ACCOUNT_BUTTON_TAPPED(siteless = true),
+        SITE_PICKER_VIEW_CONNECTED_STORES_BUTTON_TAPPED(siteless = true),
+        SITE_PICKER_HELP_FINDING_CONNECTED_EMAIL_LINK_TAPPED(siteless = true),
 
         // -- Dashboard
         DASHBOARD_PULLED_TO_REFRESH,
@@ -370,6 +391,8 @@ class AnalyticsTracker private constructor(private val context: Context) {
         const val KEY_CARRIER = "carrier"
         const val KEY_OPTION = "option"
         const val KEY_SOURCE = "source"
+        const val KEY_URL = "url"
+        const val KEY_HAS_CONNECTED_STORES = "has_connected_stores"
 
         const val VALUE_ORDER = "order"
         const val VALUE_REVIEW = "review"

WooCommerce/src/main/kotlin/com/woocommerce/android/support/HelpActivity.kt

@@ -166,6 +166,7 @@ class HelpActivity : AppCompatActivity() {
         LOGIN_SOCIAL("origin:login-social"),
         LOGIN_USERNAME_PASSWORD("origin:login-username-password"),
         LOGIN_EPILOGUE("origin:login-epilogue"),
+        LOGIN_CONNECTED_EMAIL_HELP("origin:login-connected-email-help"),
         SIGNUP_EMAIL("origin:signup-email"),
         SIGNUP_MAGIC_LINK("origin:signup-magic-link");
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt

@@ -7,11 +7,14 @@ import android.os.Bundle
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
 import com.automattic.android.tracks.CrashLogging.CrashLogging
+import androidx.fragment.app.Fragment
+import com.woocommerce.android.AppPrefs
+import com.woocommerce.android.ui.login.LoginJetpackRequiredFragment.LoginJetpackRequiredListener
 import com.woocommerce.android.R
 import com.woocommerce.android.analytics.AnalyticsTracker
+import com.woocommerce.android.analytics.AnalyticsTracker.Stat
 import com.woocommerce.android.support.HelpActivity
 import com.woocommerce.android.support.HelpActivity.Origin
-import com.woocommerce.android.support.SupportHelper
 import com.woocommerce.android.support.ZendeskExtraTags
 import com.woocommerce.android.support.ZendeskHelper
 import com.woocommerce.android.ui.login.LoginPrologueFragment.PrologueFinishedListener
@@ -42,19 +45,18 @@ import java.util.ArrayList
 import javax.inject.Inject
 
 class LoginActivity : AppCompatActivity(), LoginListener, GoogleListener, PrologueFinishedListener,
-        HasSupportFragmentInjector {
+        HasSupportFragmentInjector, LoginJetpackRequiredListener, LoginEmailHelpDialogFragment.Listener {
     companion object {
         private const val FORGOT_PASSWORD_URL_SUFFIX = "wp-login.php?action=lostpassword"
     }
 
-    @Inject internal lateinit var fragmentInjector: DispatchingAndroidInjector<androidx.fragment.app.Fragment>
+    @Inject internal lateinit var fragmentInjector: DispatchingAndroidInjector<Fragment>
     @Inject internal lateinit var loginAnalyticsListener: LoginAnalyticsListener
     @Inject internal lateinit var zendeskHelper: ZendeskHelper
-    @Inject lateinit var supportHelper: SupportHelper
 
     private var loginMode: LoginMode? = null
 
-    override fun supportFragmentInjector(): AndroidInjector<androidx.fragment.app.Fragment> = fragmentInjector
+    override fun supportFragmentInjector(): AndroidInjector<Fragment> = fragmentInjector
 
     override fun onCreate(savedInstanceState: Bundle?) {
         AndroidInjection.inject(this)
@@ -82,11 +84,10 @@ class LoginActivity : AppCompatActivity(), LoginListener, GoogleListener, Prolog
     }
 
     override fun onPrologueFinished() {
-        // TODO Check loginMode here and handle different login cases
         startLogin()
     }
 
-    private fun slideInFragment(fragment: androidx.fragment.app.Fragment, shouldAddToBackStack: Boolean, tag: String) {
+    private fun slideInFragment(fragment: Fragment, shouldAddToBackStack: Boolean, tag: String) {
         val fragmentTransaction = supportFragmentManager.beginTransaction()
         fragmentTransaction.setCustomAnimations(
                 R.anim.activity_slide_in_from_right,
@@ -105,6 +106,9 @@ class LoginActivity : AppCompatActivity(), LoginListener, GoogleListener, Prolog
         return if (fragment == null) null else fragment as LoginEmailFragment
     }
 
+    private fun getLoginViaSiteAddressFragment(): LoginSiteAddressFragment? =
+            supportFragmentManager.findFragmentByTag(LoginSiteAddressFragment.TAG) as? LoginSiteAddressFragment
+
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         if (item.itemId == android.R.id.home) {
             onBackPressed()
@@ -152,12 +156,12 @@ class LoginActivity : AppCompatActivity(), LoginListener, GoogleListener, Prolog
     }
 
     private fun startLogin() {
-        if (getLoginEmailFragment() != null) {
-            // email screen is already shown so, login has already started. Just bail.
+        if (getLoginViaSiteAddressFragment() != null) {
+            // login by site address is already shown so, login has already started. Just bail.
             return
         }
 
-        slideInFragment(LoginEmailFragment(), true, LoginEmailFragment.TAG)
+        loginViaSiteAddress()
     }
 
     //  -- BEGIN: LoginListener implementation methods
@@ -259,12 +263,37 @@ class LoginActivity : AppCompatActivity(), LoginListener, GoogleListener, Prolog
     }
 
     override fun gotWpcomSiteInfo(siteAddress: String?, siteName: String?, siteIconUrl: String?) {
-        val loginUsernamePasswordFragment = LoginUsernamePasswordFragment.newInstance(
-                siteAddress, siteAddress, siteName, siteIconUrl, null, null, true)
-        slideInFragment(loginUsernamePasswordFragment, true, LoginUsernamePasswordFragment.TAG)
+        // Save site address to app prefs so it's available to MainActivity regardless of how the user
+        // logs into the app.
+        siteAddress?.let { AppPrefs.setLoginSiteAddress(it) }
+
+        val loginEmailFragment = getLoginEmailFragment() ?: LoginEmailFragment.newInstance(true, siteAddress)
+        slideInFragment(loginEmailFragment as Fragment, true, LoginEmailFragment.TAG)
+    }
+
+    override fun gotConnectedSiteInfo(siteAddress: String, hasJetpack: Boolean) {
+        // Save site address to app prefs so it's available to MainActivity regardless of how the user
+        // logs into the app.
+        AppPrefs.setLoginSiteAddress(siteAddress)
+
+        if (hasJetpack) {
+            val loginEmailFragment = getLoginEmailFragment() ?: LoginEmailFragment.newInstance(true, siteAddress)
+            slideInFragment(loginEmailFragment as Fragment, true, LoginEmailFragment.TAG)
+        } else {
+            // hide the keyboard
+            org.wordpress.android.util.ActivityUtils.hideKeyboard(this)
+
+            // Show the 'Jetpack required' fragment
+            val jetpackReqFragment = LoginJetpackRequiredFragment.newInstance(siteAddress)
+            slideInFragment(jetpackReqFragment as Fragment, true, LoginJetpackRequiredFragment.TAG)
+        }
     }
 
     override fun gotXmlRpcEndpoint(inputSiteAddress: String?, endpointAddress: String?) {
+        // Save site address to app prefs so it's available to MainActivity regardless of how the user
+        // logs into the app.
+        inputSiteAddress?.let { AppPrefs.setLoginSiteAddress(it) }
+
         val loginUsernamePasswordFragment = LoginUsernamePasswordFragment.newInstance(
                 inputSiteAddress, endpointAddress, null, null, null, null, false)
         slideInFragment(loginUsernamePasswordFragment, true, LoginUsernamePasswordFragment.TAG)
@@ -392,4 +421,22 @@ class LoginActivity : AppCompatActivity(), LoginListener, GoogleListener, Prolog
     }
 
     //  -- END: GoogleListener implementation methods
+
+    override fun showJetpackInstructions() {
+        ChromeCustomTabUtils.launchUrl(this, getString(R.string.jetpack_view_instructions_link))
+    }
+
+    override fun showWhatIsJetpackDialog() {
+        LoginWhatIsJetpackDialogFragment().show(supportFragmentManager, LoginWhatIsJetpackDialogFragment.TAG)
+    }
+
+    override fun showHelpFindingConnectedEmail() {
+        AnalyticsTracker.track(Stat.LOGIN_BY_EMAIL_HELP_FINDING_CONNECTED_EMAIL_LINK_TAPPED)
+
+        LoginEmailHelpDialogFragment().show(supportFragmentManager, LoginEmailHelpDialogFragment.TAG)
+    }
+
+    override fun onEmailNeedMoreHelpClicked() {
+        startActivity(HelpActivity.createIntent(this, Origin.LOGIN_CONNECTED_EMAIL_HELP, null))
+    }
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginAnalyticsTracker.kt

@@ -194,4 +194,27 @@ class LoginAnalyticsTracker : LoginAnalyticsListener {
     override fun trackWpComBackgroundServiceUpdate(properties: Map<String, *>) {
         AnalyticsTracker.track(AnalyticsTracker.Stat.LOGIN_WPCOM_BACKGROUND_SERVICE_UPDATE, properties)
     }
+
+    override fun trackConnectedSiteInfoRequested(url: String?) {
+        AnalyticsTracker.track(
+                AnalyticsTracker.Stat.LOGIN_CONNECTED_SITE_INFO_REQUESTED,
+                mapOf(AnalyticsTracker.KEY_URL to url))
+    }
+
+    override fun trackConnectedSiteInfoFailed(
+        url: String?,
+        errorContext: String?,
+        errorType: String?,
+        errorDescription: String?
+    ) {
+        AnalyticsTracker.track(
+                AnalyticsTracker.Stat.LOGIN_CONNECTED_SITE_INFO_FAILED,
+                errorContext,
+                errorType,
+                errorDescription)
+    }
+
+    override fun trackConnectedSiteInfoSucceeded(properties: Map<String, *>) {
+        AnalyticsTracker.track(AnalyticsTracker.Stat.LOGIN_CONNECTED_SITE_INFO_SUCCEEDED, properties)
+    }
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginEmailHelpDialogFragment.kt

@@ -0,0 +1,64 @@
+package com.woocommerce.android.ui.login
+
+import android.app.Dialog
+import android.content.Context
+import android.os.Bundle
+import android.text.Html
+import android.view.ContextThemeWrapper
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import com.woocommerce.android.R
+import com.woocommerce.android.R.style
+import com.woocommerce.android.analytics.AnalyticsTracker
+import com.woocommerce.android.analytics.AnalyticsTracker.Stat
+
+class LoginEmailHelpDialogFragment : DialogFragment() {
+    companion object {
+        const val TAG = "LoginEmailHelpDialogFragment"
+    }
+
+    interface Listener {
+        fun onEmailNeedMoreHelpClicked()
+    }
+
+    private var listener: Listener? = null
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        dialog?.window?.attributes?.windowAnimations = R.style.Woo_Dialog_Login_EmailHelp
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val message = Html.fromHtml(getString(R.string.login_email_help_desc, "<b>", "</b>", "<b>", "</b>"))
+
+        return AlertDialog.Builder(ContextThemeWrapper(activity, style.Woo_Dialog))
+                .setTitle(R.string.login_email_help_title)
+                .setMessage(message)
+                .setNeutralButton(R.string.login_site_address_more_help) { dialog, _ ->
+                    AnalyticsTracker.track(Stat.LOGIN_FIND_CONNECTED_EMAIL_HELP_SCREEN_NEED_MORE_HELP_LINK_TAPPED)
+
+                    listener?.onEmailNeedMoreHelpClicked()
+                    dialog.dismiss()
+                }
+                .setPositiveButton(android.R.string.ok) { dialog, _ ->
+                    AnalyticsTracker.track(Stat.LOGIN_FIND_CONNECTED_EMAIL_HELP_SCREEN_OK_BUTTON_TAPPED)
+
+                    dialog.dismiss()
+                }
+                .setCancelable(true)
+                .create()
+    }
+
+    override fun onAttach(context: Context?) {
+        super.onAttach(context)
+
+        if (context is Listener) {
+            listener = context
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        AnalyticsTracker.track(Stat.LOGIN_FIND_CONNECTED_EMAIL_HELP_SCREEN_VIEWED)
+    }
+}