Merge branch 'trunk' into issue/17214-final-design-touces

ovitrif · ovitrif · commit 05371b456ba0 · 2022-10-07T14:44:29.000+02:00
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -3,6 +3,7 @@
 21.0
 -----
 * [*] Updates splash screen for Android 12+ [https://github.com/wordpress-mobile/WordPress-Android/pull/17273]
+* [*] Fix text color of success messages in the QR code login flow [https://github.com/wordpress-mobile/WordPress-Android/pull/17286]
 
 20.9
 -----
diff --git a/WordPress/src/jetpack/AndroidManifest.xml b/WordPress/src/jetpack/AndroidManifest.xml
@@ -37,6 +37,9 @@
                 <data
                     android:host="notifications"
                     android:scheme="jetpack" />
+                <data
+                    android:host="home"
+                    android:scheme="jetpack" />
             </intent-filter>
         </activity>
 
diff --git a/WordPress/src/main/AndroidManifest.xml b/WordPress/src/main/AndroidManifest.xml
@@ -400,6 +400,9 @@
                 <data
                     android:host="notifications"
                     android:scheme="wordpress" />
+                <data
+                    android:host="home"
+                    android:scheme="wordpress" />
             </intent-filter>
 
             <intent-filter android:autoVerify="true">
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java b/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java
@@ -1751,4 +1751,9 @@ public static void startQRCodeAuthFlowInNewStack(@NonNull Context context, @NonN
 
         taskStackBuilder.startActivities();
     }
+
+    public static void showLoginPrologue(@NonNull Context context) {
+        Intent intent = new Intent(context, LoginActivity.class);
+        context.startActivity(intent);
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkNavigator.kt b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkNavigator.kt
@@ -8,8 +8,10 @@ import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.Login
 import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenEditor
 import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenEditorForPost
 import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenEditorForSite
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenMySite
 import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenInBrowser
 import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenInReader
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenLoginPrologue
 import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenNotifications
 import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenPages
 import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenPagesForSite
@@ -74,6 +76,8 @@ class DeepLinkNavigator
             is OpenPagesForSite -> ActivityLauncher.viewPagesInNewStack(activity, navigateAction.site)
             OpenPages -> ActivityLauncher.viewPagesInNewStack(activity)
             is OpenQRCodeAuthFlow -> ActivityLauncher.startQRCodeAuthFlowInNewStack(activity, navigateAction.uri)
+            OpenMySite -> ActivityLauncher.viewMySiteInNewStack(activity)
+            OpenLoginPrologue -> ActivityLauncher.showLoginPrologue(activity)
         }
         if (navigateAction != LoginForResult) {
             activity.finish()
@@ -101,5 +105,7 @@ class DeepLinkNavigator
         data class OpenPagesForSite(val site: SiteModel) : NavigateAction()
         object OpenPages : NavigateAction()
         data class OpenQRCodeAuthFlow(val uri: String) : NavigateAction()
+        object OpenMySite : NavigateAction()
+        object OpenLoginPrologue : NavigateAction()
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkingIntentReceiverViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkingIntentReceiverViewModel.kt
@@ -9,6 +9,7 @@ import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction
 import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.LoginForResult
 import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenInBrowser
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenLoginPrologue
 import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.ShowSignInFlow
 import org.wordpress.android.ui.deeplinks.handlers.DeepLinkHandlers
 import org.wordpress.android.ui.deeplinks.handlers.ServerTrackingHandler
@@ -69,14 +70,21 @@ class DeepLinkingIntentReceiverViewModel
             if (action != null) {
                 deepLinkTrackingUtils.track(action, it, uriWrapper)
             }
-            if (accountStore.hasAccessToken() || it is OpenInBrowser || it is ShowSignInFlow) {
+            if (loginIsUnnecessary(it)) {
                 _navigateAction.value = Event(it)
             } else {
                 _navigateAction.value = Event(LoginForResult)
             }
         } != null
     }
 
+    private fun loginIsUnnecessary(action: NavigateAction): Boolean {
+        return accountStore.hasAccessToken() ||
+                action is OpenInBrowser ||
+                action is ShowSignInFlow ||
+                action is OpenLoginPrologue
+    }
+
     private fun buildNavigateAction(uri: UriWrapper, rootUri: UriWrapper = uri): NavigateAction? {
         return when {
             deepLinkUriUtils.isTrackingUrl(uri) -> getRedirectUriAndBuildNavigateAction(uri, rootUri)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/handlers/DeepLinkHandlers.kt b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/handlers/DeepLinkHandlers.kt
@@ -15,7 +15,8 @@ class DeepLinkHandlers
     readerLinkHandler: ReaderLinkHandler,
     pagesLinkHandler: PagesLinkHandler,
     notificationsLinkHandler: NotificationsLinkHandler,
-    qrCodeAuthLinkHandler: QRCodeAuthLinkHandler
+    qrCodeAuthLinkHandler: QRCodeAuthLinkHandler,
+    homeLinkHandler: HomeLinkHandler
 ) {
     private val handlers = listOf(
             editorLinkHandler,
@@ -24,7 +25,8 @@ class DeepLinkHandlers
             readerLinkHandler,
             pagesLinkHandler,
             notificationsLinkHandler,
-            qrCodeAuthLinkHandler
+            qrCodeAuthLinkHandler,
+            homeLinkHandler
     )
 
     private val _toast by lazy {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/handlers/HomeLinkHandler.kt b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/handlers/HomeLinkHandler.kt
@@ -0,0 +1,40 @@
+package org.wordpress.android.ui.deeplinks.handlers
+
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenMySite
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenLoginPrologue
+import org.wordpress.android.ui.deeplinks.DeepLinkingIntentReceiverViewModel
+import org.wordpress.android.util.UriWrapper
+import javax.inject.Inject
+
+class HomeLinkHandler
+@Inject constructor(private val accountStore: AccountStore) : DeepLinkHandler {
+    /**
+     * Returns true if the URI looks like `wordpress://home`
+     */
+    override fun shouldHandleUrl(uri: UriWrapper): Boolean {
+        return uri.host == HOME_PATH
+    }
+
+    override fun buildNavigateAction(uri: UriWrapper): NavigateAction {
+        return if (accountStore.hasAccessToken()) {
+            OpenMySite
+        } else {
+            OpenLoginPrologue
+        }
+    }
+
+    override fun stripUrl(uri: UriWrapper): String {
+        return buildString {
+            if (uri.host == HOME_PATH) {
+                append(DeepLinkingIntentReceiverViewModel.APPLINK_SCHEME)
+            }
+            append(HOME_PATH)
+        }
+    }
+
+    companion object {
+        private const val HOME_PATH = "home"
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/qrcodeauth/QRCodeAuthUiState.kt b/WordPress/src/main/java/org/wordpress/android/ui/qrcodeauth/QRCodeAuthUiState.kt
@@ -31,24 +31,17 @@ const val BLURRED_ALPHA = 0.75f
 
 sealed class QRCodeAuthUiState {
     open val type: QRCodeAuthUiStateType? = null
-    open val scanningVisibility = false
-    open val loadingVisibility = false
-    open val errorVisibility = false
-    open val contentVisibility = false
 
     object Scanning : QRCodeAuthUiState() {
         override val type = SCANNING
-        override val scanningVisibility = true
     }
 
     object Loading : QRCodeAuthUiState() {
         override val type = LOADING
-        override val loadingVisibility = true
     }
 
     sealed class Error : QRCodeAuthUiState() {
         override val type = ERROR
-        override val errorVisibility = true
         abstract val title: UiString
         abstract val subtitle: UiString
         abstract val image: Int
@@ -98,7 +91,6 @@ sealed class QRCodeAuthUiState {
 
     sealed class Content : QRCodeAuthUiState() {
         override val type = CONTENT
-        override val contentVisibility: Boolean = true
         open val title: UiString? = null
         open val subtitle: UiString? = null
         @DrawableRes open val image: Int? = null
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/qrcodeauth/compose/components/Subtitle.kt b/WordPress/src/main/java/org/wordpress/android/ui/qrcodeauth/compose/components/Subtitle.kt
@@ -2,24 +2,25 @@ package org.wordpress.android.ui.qrcodeauth.compose.components
 
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentSize
-import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextAlign
 import org.wordpress.android.ui.compose.unit.FontSize
 import org.wordpress.android.ui.compose.unit.Margin
 
 @Composable
 fun Subtitle(
     text: String,
+    color: Color,
     modifier: Modifier = Modifier
 ) {
     Text(
             text = text,
             textAlign = TextAlign.Center,
             fontSize = FontSize.Large.value,
-            color = MaterialTheme.colors.error,
+            color = color,
             modifier = modifier
                     .wrapContentSize()
                     .padding(
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/qrcodeauth/compose/state/ContentState.kt b/WordPress/src/main/java/org/wordpress/android/ui/qrcodeauth/compose/state/ContentState.kt
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.material.CircularProgressIndicator
+import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -52,7 +53,7 @@ fun ContentState(uiState: QRCodeAuthUiState.Content) = with(uiState) {
             Title(text = uiStringText(it))
         }
         subtitle?.let {
-            Subtitle(text = uiStringText(it))
+            Subtitle(text = uiStringText(it), color = MaterialTheme.colors.onBackground)
         }
         primaryActionButton?.let { actionButton ->
             if (actionButton.isVisible) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/qrcodeauth/compose/state/ErrorState.kt b/WordPress/src/main/java/org/wordpress/android/ui/qrcodeauth/compose/state/ErrorState.kt
@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -42,8 +43,8 @@ fun ErrorState(uiState: QRCodeAuthUiState.Error) = with(uiState) {
                         .padding(vertical = Margin.ExtraLarge.value)
                         .wrapContentSize()
         )
-        Title(text = uiStringText(title), modifier = Modifier)
-        Subtitle(text = uiStringText(subtitle), modifier = Modifier)
+        Title(text = uiStringText(title))
+        Subtitle(text = uiStringText(subtitle), color = MaterialTheme.colors.error)
         primaryActionButton?.let { actionButton ->
             if (actionButton.isVisible) {
                 PrimaryButton(
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/handlers/DeepLinkHandlersTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/handlers/DeepLinkHandlersTest.kt
@@ -20,6 +20,7 @@ class DeepLinkHandlersTest : BaseUnitTest() {
     @Mock lateinit var pagesLinkHandler: PagesLinkHandler
     @Mock lateinit var notificationsLinkHandler: NotificationsLinkHandler
     @Mock lateinit var qrCodeAuthLinkHandler: QRCodeAuthLinkHandler
+    @Mock lateinit var homeLinkHandler: HomeLinkHandler
     @Mock lateinit var uri: UriWrapper
     private lateinit var deepLinkHandlers: DeepLinkHandlers
     private lateinit var handlers: List<DeepLinkHandler>
@@ -33,7 +34,8 @@ class DeepLinkHandlersTest : BaseUnitTest() {
                 readerLinkHandler,
                 pagesLinkHandler,
                 notificationsLinkHandler,
-                qrCodeAuthLinkHandler
+                qrCodeAuthLinkHandler,
+                homeLinkHandler
         )
         initDeepLinkHandlers()
     }
@@ -46,7 +48,8 @@ class DeepLinkHandlersTest : BaseUnitTest() {
                 readerLinkHandler,
                 pagesLinkHandler,
                 notificationsLinkHandler,
-                qrCodeAuthLinkHandler
+                qrCodeAuthLinkHandler,
+                homeLinkHandler
         )
     }
 
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/handlers/HomeLinkHandlerTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/handlers/HomeLinkHandlerTest.kt
@@ -0,0 +1,52 @@
+package org.wordpress.android.ui.deeplinks.handlers
+
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.whenever
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenMySite
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenLoginPrologue
+import org.wordpress.android.ui.deeplinks.buildUri
+
+@RunWith(MockitoJUnitRunner::class)
+class HomeLinkHandlerTest {
+    @Mock lateinit var accountStore: AccountStore
+    private lateinit var homeLinkHandler: HomeLinkHandler
+
+    @Before
+    fun setUp() {
+        homeLinkHandler = HomeLinkHandler(accountStore)
+    }
+
+    @Test
+    fun `returns login prologue action when user is logged out`() {
+        whenever(accountStore.hasAccessToken()).thenReturn(false)
+
+        val navigateAction = homeLinkHandler.buildNavigateAction(mock())
+
+        assertThat(navigateAction).isEqualTo(OpenLoginPrologue)
+    }
+
+    @Test
+    fun `returns my site action when user is logged in`() {
+        whenever(accountStore.hasAccessToken()).thenReturn(true)
+
+        val navigateAction = homeLinkHandler.buildNavigateAction(mock())
+
+        assertThat(navigateAction).isEqualTo(OpenMySite)
+    }
+
+    @Test
+    fun `builds URL for tracking`() {
+        val homeUri = buildUri("home")
+
+        val strippedUrl = homeLinkHandler.stripUrl(homeUri)
+
+        assertThat(strippedUrl).isEqualTo("wordpress://home")
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/qrcodeauth/QRCodeAuthViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/qrcodeauth/QRCodeAuthViewModelTest.kt
@@ -102,7 +102,6 @@ class QRCodeAuthViewModelTest : BaseUnitTest() {
         runBlockingTestWithData(uiStates) {
             viewModel.start()
 
-            assert(uiStates.first().loadingVisibility)
             assertThat(uiStates.last()).isInstanceOf(QRCodeAuthUiState.Scanning::class.java)
         }
     }
@@ -113,7 +112,6 @@ class QRCodeAuthViewModelTest : BaseUnitTest() {
         runBlockingTestWithData(uiStates) {
             initAndStartVMForState(NO_INTERNET)
 
-            assert(uiStates.first().loadingVisibility)
             assertThat(uiStates.last().type).isEqualTo(NO_INTERNET)
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1751,4 +1751,9 @@ public static void startQRCodeAuthFlowInNewStack(@NonNull Context context, @NonN`
`1751`	`1751`
`1752`	`1752`	`taskStackBuilder.startActivities();`
`1753`	`1753`	`}`
	`1754`	`+`
	`1755`	`+ public static void showLoginPrologue(@NonNull Context context) {`
	`1756`	`+ Intent intent = new Intent(context, LoginActivity.class);`
	`1757`	`+ context.startActivity(intent);`
	`1758`	`+ }`
`1754`	`1759`	`}`