File tree Expand file tree Collapse file tree
WordPress/src/main/java/org/wordpress/android/ui/qrcodeauth/compose Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -2,24 +2,25 @@ package org.wordpress.android.ui.qrcodeauth.compose.components
22
33import androidx.compose.foundation.layout.padding
44import androidx.compose.foundation.layout.wrapContentSize
5- import androidx.compose.material.MaterialTheme
65import androidx.compose.material.Text
76import androidx.compose.runtime.Composable
87import androidx.compose.ui.Modifier
8+ import androidx.compose.ui.graphics.Color
99import androidx.compose.ui.text.style.TextAlign
1010import org.wordpress.android.ui.compose.unit.FontSize
1111import org.wordpress.android.ui.compose.unit.Margin
1212
1313@Composable
1414fun 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(
Original file line number Diff line number Diff line change @@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.padding
88import androidx.compose.foundation.layout.wrapContentHeight
99import androidx.compose.foundation.layout.wrapContentSize
1010import androidx.compose.material.CircularProgressIndicator
11+ import androidx.compose.material.MaterialTheme
1112import androidx.compose.runtime.Composable
1213import androidx.compose.ui.Alignment
1314import 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) {
Original file line number Diff line number Diff line change @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
66import androidx.compose.foundation.layout.padding
77import androidx.compose.foundation.layout.wrapContentHeight
88import androidx.compose.foundation.layout.wrapContentSize
9+ import androidx.compose.material.MaterialTheme
910import androidx.compose.runtime.Composable
1011import androidx.compose.ui.Alignment
1112import 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 (
You can’t perform that action at this time.
0 commit comments