A fully functional Android app built entirely with Kotlin and Jetpack Compose
Remove redundant NiaTopicChip and use previewNewsResource
Caren Changa0a3b5c8280a
diff --git a/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt b/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.ktindex 1df362050..3d2cf3f2c 100644--- a/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt+++ b/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt@@ -23,17 +23,11 @@ import androidx.compose.material3.Iconimport androidx.compose.material3.MaterialThemeimport androidx.compose.material3.ProvideTextStyleimport androidx.compose.material3.Shapes-import androidx.compose.material3.SuggestionChip-import androidx.compose.material3.SuggestionChipDefaults-import androidx.compose.material3.Surface-import androidx.compose.material3.Textimport androidx.compose.runtime.Composableimport androidx.compose.ui.Modifierimport androidx.compose.ui.graphics.Color-import androidx.compose.ui.tooling.preview.Previewimport androidx.compose.ui.unit.dpimport com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons-import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme/*** Now in Android filter chip with included leading checked icon as well as text content slot.@@ -107,80 +101,6 @@ fun NiaFilterChip()}-/**- * Now in Android topic chip that displays a topic name text.- *- * @param enabled Whether the chip is currently enabled.- * @param onClick Called when the user clicks the chip for more options.- * @param modifier Modifier to be applied to the chip.- * @param label The text label content.- */-@Composable-@OptIn(ExperimentalMaterial3Api::class)-fun NiaTopicChip(- enabled: Boolean,- onClick: () -> Unit,- modifier: Modifier = Modifier,- label: @Composable () -> Unit-) {- SuggestionChip(- enabled = enabled,- onClick = onClick,- label = {- ProvideTextStyle(value = MaterialTheme.typography.labelMedium) {- label()- }- },- modifier = modifier,- shape = Shapes.Full,- border = SuggestionChipDefaults.suggestionChipBorder(- borderColor = MaterialTheme.colorScheme.primaryContainer,- disabledBorderColor = MaterialTheme.colorScheme.primaryContainer.copy(- alpha = NiaChipDefaults.DisabledChipContainerAlpha- ),- borderWidth = NiaChipDefaults.ChipBorderWidth- ),- colors = SuggestionChipDefaults.suggestionChipColors(- containerColor = MaterialTheme.colorScheme.primaryContainer,- disabledContainerColor = MaterialTheme.colorScheme.primaryContainer.copy(- alpha = NiaChipDefaults.DisabledChipContainerAlpha- ),- labelColor = MaterialTheme.colorScheme.onBackground,- disabledLabelColor = MaterialTheme.colorScheme.onBackground- )- )-}--@Preview("Enabled Topic Chip Preview")-@Composable-fun NiaEnabledTopicChipPreview() {- NiaTheme {- Surface {- NiaTopicChip(- enabled = true,- onClick = { }- ) {- Text("Accessibility")- }- }- }-}--@Preview("Disabled Topic Chip Preview")-@Composable-fun NiaDisabledTopicChipPreview() {- NiaTheme {- Surface {- NiaTopicChip(- enabled = false,- onClick = { }- ) {- Text("Accessibility")- }- }- }-}-/*** Now in Android chip default values.*/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 82cd9537b..3fdad17c4 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@@ -274,10 +274,10 @@ fun NewsResourceTopics() {for (topic in topics) {NiaTopicTag(- followed = true, // Todo- onFollowClick = { }, // Todo- onUnfollowClick = { }, // Todo- onBrowseClick = { }, // Todo+ followed = true, // ToDo: Check if topic is followed+ onFollowClick = { }, // ToDo+ onUnfollowClick = { }, // ToDo+ onBrowseClick = { }, // ToDotext = { Text(text = topic.name.uppercase(Locale.getDefault())) })}@@ -317,4 +317,4 @@ fun ExpandedNewsResourcePreview() {)}}-}+}\ No newline at end of file