Skip to content

Commit 110bfee

Browse files
committed
Color subtitle on qrcode auth screens in red only for errors
1 parent fe92773 commit 110bfee

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

WordPress/src/main/java/org/wordpress/android/ui/qrcodeauth/compose/components/Subtitle.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,25 @@ package org.wordpress.android.ui.qrcodeauth.compose.components
22

33
import androidx.compose.foundation.layout.padding
44
import androidx.compose.foundation.layout.wrapContentSize
5-
import androidx.compose.material.MaterialTheme
65
import androidx.compose.material.Text
76
import androidx.compose.runtime.Composable
87
import androidx.compose.ui.Modifier
8+
import androidx.compose.ui.graphics.Color
99
import androidx.compose.ui.text.style.TextAlign
1010
import org.wordpress.android.ui.compose.unit.FontSize
1111
import org.wordpress.android.ui.compose.unit.Margin
1212

1313
@Composable
1414
fun Subtitle(
1515
text: String,
16+
color: Color,
1617
modifier: Modifier = Modifier
1718
) {
1819
Text(
1920
text = text,
2021
textAlign = TextAlign.Center,
2122
fontSize = FontSize.Large.value,
22-
color = MaterialTheme.colors.error,
23+
color = color,
2324
modifier = modifier
2425
.wrapContentSize()
2526
.padding(

WordPress/src/main/java/org/wordpress/android/ui/qrcodeauth/compose/state/ContentState.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.padding
88
import androidx.compose.foundation.layout.wrapContentHeight
99
import androidx.compose.foundation.layout.wrapContentSize
1010
import androidx.compose.material.CircularProgressIndicator
11+
import androidx.compose.material.MaterialTheme
1112
import androidx.compose.runtime.Composable
1213
import androidx.compose.ui.Alignment
1314
import androidx.compose.ui.Modifier
@@ -52,7 +53,7 @@ fun ContentState(uiState: QRCodeAuthUiState.Content) = with(uiState) {
5253
Title(text = uiStringText(it))
5354
}
5455
subtitle?.let {
55-
Subtitle(text = uiStringText(it))
56+
Subtitle(text = uiStringText(it), color = MaterialTheme.colors.onBackground)
5657
}
5758
primaryActionButton?.let { actionButton ->
5859
if (actionButton.isVisible) {

WordPress/src/main/java/org/wordpress/android/ui/qrcodeauth/compose/state/ErrorState.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
66
import androidx.compose.foundation.layout.padding
77
import androidx.compose.foundation.layout.wrapContentHeight
88
import androidx.compose.foundation.layout.wrapContentSize
9+
import androidx.compose.material.MaterialTheme
910
import androidx.compose.runtime.Composable
1011
import androidx.compose.ui.Alignment
1112
import androidx.compose.ui.Modifier
@@ -43,7 +44,7 @@ fun ErrorState(uiState: QRCodeAuthUiState.Error) = with(uiState) {
4344
.wrapContentSize()
4445
)
4546
Title(text = uiStringText(title))
46-
Subtitle(text = uiStringText(subtitle))
47+
Subtitle(text = uiStringText(subtitle), color = MaterialTheme.colors.error)
4748
primaryActionButton?.let { actionButton ->
4849
if (actionButton.isVisible) {
4950
PrimaryButton(

0 commit comments

Comments
 (0)