Merge pull request #17286 from wordpress-mobile/issue/17276-success-message-text-color-fix

Fix success message text color in QR code login flow

Author: zwarm

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
 -----

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

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(

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) {

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(

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)
         }
     }