From f94c4018e3986799db3cb78ebec4847e7a4301a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=82osz=20Moczkowski?= <mmoczkowski@google.com>
Date: Mon, 5 Jun 2023 13:50:35 +0200
Subject: [PATCH] Add border to selected topic item

Change-Id: I5e1730118116530ef5104ffaeda0ec7d43fef736
---
 .../feature/interests/InterestsItem.kt        | 22 +++++++++++++------
 .../feature/interests/InterestsScreen.kt      |  3 +--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt
index ed1a3901a..d39e61c83 100644
--- a/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt
+++ b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt
@@ -17,6 +17,7 @@
 package com.google.samples.apps.nowinandroid.feature.interests
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.selection.selectable
@@ -83,16 +84,23 @@ fun InterestsItem(
                 },
             )
         },
+        colors = ListItemDefaults.colors(
+            containerColor = Color.Transparent,
+        ),
         modifier = modifier
             .semantics(mergeDescendants = true) { /* no-op */ }
-            .selectable(selected = isSelected, onClick = onClick),
-        colors = ListItemDefaults.colors(
-            containerColor = if (isSelected) {
-                MaterialTheme.colorScheme.surface
-            } else {
-                Color.Transparent
+            .selectable(selected = isSelected, onClick = onClick)
+            .run {
+                if (isSelected) {
+                    border(
+                        width = 1.dp,
+                        color = MaterialTheme.colorScheme.outline,
+                        shape = MaterialTheme.shapes.medium,
+                    )
+                } else {
+                    this
+                }
             },
-        ),
     )
 }
 
diff --git a/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt
index c1a89b713..926a1083d 100644
--- a/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt
+++ b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt
@@ -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.FollowableTopicPreviewParameterProvider
 import com.google.samples.apps.nowinandroid.core.ui.TrackScreenViewEvent
-import com.google.samples.apps.nowinandroid.feature.interests.R.string
 
 @Composable
 internal fun InterestsScreen(
@@ -50,7 +49,7 @@ internal fun InterestsScreen(
             InterestsUiState.Loading ->
                 NiaLoadingWheel(
                     modifier = modifier,
-                    contentDesc = stringResource(id = string.loading),
+                    contentDesc = stringResource(id = R.string.loading),
                 )
 
             is InterestsUiState.Interests ->