A fully functional Android app built entirely with Kotlin and Jetpack Compose
UI polish for "For You" Onboarding Screen [http://b/228070817]
sheda3eccce0ec54
diff --git a/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt b/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.ktindex d31f988ce..4242f2f33 100644--- a/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt+++ b/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt@@ -141,6 +141,7 @@ fun NewsResourceHeaderImage(},modifier = Modifier.fillMaxWidth()+ .clip(RoundedCornerShape(topEnd = 24.dp, topStart = 24.dp)).height(180.dp),contentScale = ContentScale.Crop,model = headerImageUrl,diff --git a/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/component/ToggleButton.kt b/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/component/ToggleButton.ktindex 19f0a4bc2..df2b67f73 100644--- a/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/component/ToggleButton.kt+++ b/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/component/ToggleButton.kt@@ -26,6 +26,7 @@ import androidx.compose.ui.Modifierimport androidx.compose.ui.draw.drawBehindimport androidx.compose.ui.platform.LocalDensityimport androidx.compose.ui.semantics.Role+import androidx.compose.ui.unit.Dpimport androidx.compose.ui.unit.dp/**@@ -38,6 +39,8 @@ import androidx.compose.ui.unit.dp* @param enabled Controls the enabled state of the toggle button. When `false`, this toggle button* will not be clickable and will appear disabled to accessibility services.* @param icon The icon content to show when unchecked.+ * @param checkedBackgroundRadius The background radius that will be used to draw a background color+ * behind the checkedIcon when this toggle button is checked.* @param checkedIcon The icon content to show when checked.*/@Composable@@ -47,11 +50,12 @@ fun NiaToggleButton(modifier: Modifier = Modifier,enabled: Boolean = true,icon: @Composable () -> Unit,+ checkedBackgroundRadius: Dp = NiaToggleButtonDefaults.ToggleButtonSize / 2,checkedIcon: @Composable () -> Unit = icon) {val checkedColor = MaterialTheme.colorScheme.primaryContainerval checkedRadius = with(LocalDensity.current) {- (NiaToggleButtonDefaults.ToggleButtonSize / 2).toPx()+ checkedBackgroundRadius.toPx()}IconButton(onClick = { onCheckedChange(!checked) },diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.ktindex 2c790d4b8..b65093d12 100644--- a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt+++ b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt@@ -49,6 +49,7 @@ import androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.filled.Searchimport androidx.compose.material.icons.outlined.AccountCircleimport androidx.compose.material3.Button+import androidx.compose.material3.ButtonDefaultsimport androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.material3.Iconimport androidx.compose.material3.MaterialTheme@@ -270,9 +271,15 @@ private fun LazyListScope.InterestsSelection(enabled = interestsSelectionState.canSaveInterests,modifier = Modifier.padding(horizontal = 40.dp)- .width(364.dp)+ .width(364.dp),+ colors = ButtonDefaults.buttonColors(+ containerColor = MaterialTheme.colorScheme.onBackground+ )) {- Text(text = stringResource(R.string.done))+ Text(+ text = stringResource(R.string.done),+ color = MaterialTheme.colorScheme.onPrimary+ )}}}@@ -330,6 +337,7 @@ private fun SingleTopicButton(.width(264.dp).heightIn(min = 56.dp),shape = RoundedCornerShape(corner = CornerSize(8.dp)),+ color = MaterialTheme.colorScheme.surface,selected = isSelected,onClick = {onClick(topicId, !isSelected)@@ -354,10 +362,16 @@ private fun SingleTopicButton(checked = isSelected,onCheckedChange = { checked -> onClick(topicId, !isSelected) },icon = {- Icon(imageVector = NiaIcons.Add, contentDescription = name)+ Icon(+ imageVector = NiaIcons.Add, contentDescription = name,+ tint = MaterialTheme.colorScheme.onSurface+ )},checkedIcon = {- Icon(imageVector = NiaIcons.Check, contentDescription = name)+ Icon(+ imageVector = NiaIcons.Check, contentDescription = name,+ tint = MaterialTheme.colorScheme.onSurface+ )})}