From d7ac889b2b6b9ce1780d9c0c60795f620c9f08a1 Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Fri, 12 Apr 2024 21:17:13 +0900 Subject: [PATCH] Merge only text. Change-Id: I36eefc6dd9f56f7a1f63003f0f95f6755ae16def --- .../feature/foryou/ForYouScreen.kt | 39 +++++++++++-------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt index b27264124..f27b88069 100644 --- a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt +++ b/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt @@ -77,6 +77,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.clearAndSetSemantics import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.semantics.stateDescription import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp @@ -272,25 +273,29 @@ private fun LazyStaggeredGridScope.onboarding( is OnboardingUiState.Shown -> { item(span = StaggeredGridItemSpan.FullLine, contentType = "onboarding") { Column( - modifier = interestsItemModifier - .semantics(mergeDescendants = true) { }, + modifier = interestsItemModifier, ) { - Text( - text = stringResource(R.string.feature_foryou_onboarding_guidance_title), - textAlign = TextAlign.Center, + Column( modifier = Modifier - .fillMaxWidth() - .padding(top = 24.dp), - style = MaterialTheme.typography.titleMedium, - ) - 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, - ) + .semantics(mergeDescendants = true) { }, + ) { + Text( + text = stringResource(R.string.feature_foryou_onboarding_guidance_title), + textAlign = TextAlign.Center, + modifier = Modifier + .fillMaxWidth() + .padding(top = 24.dp), + style = MaterialTheme.typography.titleMedium, + ) + 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( onboardingUiState, onTopicCheckedChanged,