Add border to selected topic item

Change-Id: I5e1730118116530ef5104ffaeda0ec7d43fef736
feature/interests-list-detail
Miłosz Moczkowski 2 years ago
parent 6af2a0aab3
commit f94c4018e3

@ -17,6 +17,7 @@
package com.google.samples.apps.nowinandroid.feature.interests package com.google.samples.apps.nowinandroid.feature.interests
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.selection.selectable import androidx.compose.foundation.selection.selectable
@ -83,16 +84,23 @@ fun InterestsItem(
}, },
) )
}, },
colors = ListItemDefaults.colors(
containerColor = Color.Transparent,
),
modifier = modifier modifier = modifier
.semantics(mergeDescendants = true) { /* no-op */ } .semantics(mergeDescendants = true) { /* no-op */ }
.selectable(selected = isSelected, onClick = onClick), .selectable(selected = isSelected, onClick = onClick)
colors = ListItemDefaults.colors( .run {
containerColor = if (isSelected) { if (isSelected) {
MaterialTheme.colorScheme.surface border(
} else { width = 1.dp,
Color.Transparent color = MaterialTheme.colorScheme.outline,
shape = MaterialTheme.shapes.medium,
)
} else {
this
}
}, },
),
) )
} }

@ -32,7 +32,6 @@ import com.google.samples.apps.nowinandroid.core.model.data.FollowableTopic
import com.google.samples.apps.nowinandroid.core.ui.DevicePreviews import com.google.samples.apps.nowinandroid.core.ui.DevicePreviews
import com.google.samples.apps.nowinandroid.core.ui.FollowableTopicPreviewParameterProvider import com.google.samples.apps.nowinandroid.core.ui.FollowableTopicPreviewParameterProvider
import com.google.samples.apps.nowinandroid.core.ui.TrackScreenViewEvent import com.google.samples.apps.nowinandroid.core.ui.TrackScreenViewEvent
import com.google.samples.apps.nowinandroid.feature.interests.R.string
@Composable @Composable
internal fun InterestsScreen( internal fun InterestsScreen(
@ -50,7 +49,7 @@ internal fun InterestsScreen(
InterestsUiState.Loading -> InterestsUiState.Loading ->
NiaLoadingWheel( NiaLoadingWheel(
modifier = modifier, modifier = modifier,
contentDesc = stringResource(id = string.loading), contentDesc = stringResource(id = R.string.loading),
) )
is InterestsUiState.Interests -> is InterestsUiState.Interests ->

Loading…
Cancel
Save