Merge only text.

Change-Id: I36eefc6dd9f56f7a1f63003f0f95f6755ae16def
pull/1309/head
Jaehwa Noh 1 year ago
parent 5401baae60
commit d7ac889b2b

@ -77,6 +77,7 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.clearAndSetSemantics import androidx.compose.ui.semantics.clearAndSetSemantics
import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.semantics.stateDescription
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
@ -272,25 +273,29 @@ private fun LazyStaggeredGridScope.onboarding(
is OnboardingUiState.Shown -> { is OnboardingUiState.Shown -> {
item(span = StaggeredGridItemSpan.FullLine, contentType = "onboarding") { item(span = StaggeredGridItemSpan.FullLine, contentType = "onboarding") {
Column( Column(
modifier = interestsItemModifier modifier = interestsItemModifier,
.semantics(mergeDescendants = true) { },
) { ) {
Text( Column(
text = stringResource(R.string.feature_foryou_onboarding_guidance_title),
textAlign = TextAlign.Center,
modifier = Modifier modifier = Modifier
.fillMaxWidth() .semantics(mergeDescendants = true) { },
.padding(top = 24.dp), ) {
style = MaterialTheme.typography.titleMedium, Text(
) text = stringResource(R.string.feature_foryou_onboarding_guidance_title),
Text( textAlign = TextAlign.Center,
text = stringResource(R.string.feature_foryou_onboarding_guidance_subtitle), modifier = Modifier
modifier = Modifier .fillMaxWidth()
.fillMaxWidth() .padding(top = 24.dp),
.padding(top = 8.dp, start = 24.dp, end = 24.dp), style = MaterialTheme.typography.titleMedium,
textAlign = TextAlign.Center, )
style = MaterialTheme.typography.bodyMedium, Text(
) text = stringResource(R.string.feature_foryou_onboarding_guidance_subtitle),
modifier = Modifier
.fillMaxWidth()
.padding(top = 8.dp, start = 24.dp, end = 24.dp),
textAlign = TextAlign.Center,
style = MaterialTheme.typography.bodyMedium,
)
}
TopicSelection( TopicSelection(
onboardingUiState, onboardingUiState,
onTopicCheckedChanged, onTopicCheckedChanged,

Loading…
Cancel
Save