From 36c369d8dd623dc81842912b976685e53792f9d9 Mon Sep 17 00:00:00 2001
From: Robert <rmsr888@gmail.com>
Date: Wed, 31 Aug 2022 20:39:54 +0200
Subject: [PATCH] rename variable and fix spotless errors

---
 .../com/google/samples/apps/niacatalog/ui/Catalog.kt   | 10 +++++-----
 .../nowinandroid/core/designsystem/component/Tag.kt    |  8 ++------
 .../apps/nowinandroid/core/ui/NewsResourceCard.kt      |  8 +++++---
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt b/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt
index 7f554b470..851c20b28 100644
--- a/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt
+++ b/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt
@@ -518,14 +518,14 @@ fun NiaCatalog() {
                 item { Text("Tags", Modifier.padding(top = 16.dp)) }
                 item {
                     FlowRow(mainAxisSpacing = 16.dp) {
-                        var expandedTopic by remember { mutableStateOf<String?>(null) }
+                        var expandedTopicId by remember { mutableStateOf<String?>(null) }
 
                         var firstFollowed by remember { mutableStateOf(false) }
                         NiaTopicTag(
-                            expanded = expandedTopic == "Topic 1",
+                            expanded = expandedTopicId == "Topic 1",
                             followed = firstFollowed,
                             onDropMenuToggle = { show ->
-                                expandedTopic = if (show) "Topic 1" else null
+                                expandedTopicId = if (show) "Topic 1" else null
                             },
                             onFollowClick = { firstFollowed = true },
                             onUnfollowClick = { firstFollowed = false },
@@ -537,10 +537,10 @@ fun NiaCatalog() {
                         )
                         var secondFollowed by remember { mutableStateOf(true) }
                         NiaTopicTag(
-                            expanded = expandedTopic == "Topic 2",
+                            expanded = expandedTopicId == "Topic 2",
                             followed = secondFollowed,
                             onDropMenuToggle = { show ->
-                                expandedTopic = if (show) "Topic 2" else null
+                                expandedTopicId = if (show) "Topic 2" else null
                             },
                             onFollowClick = { secondFollowed = true },
                             onUnfollowClick = { secondFollowed = false },
diff --git a/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.kt b/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.kt
index 38a585907..6a2475931 100644
--- a/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.kt
+++ b/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.kt
@@ -21,10 +21,6 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.contentColorFor
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
@@ -32,9 +28,9 @@ import com.google.samples.apps.nowinandroid.core.designsystem.R
 
 @Composable
 fun NiaTopicTag(
-    expanded : Boolean = false,
+    expanded: Boolean = false,
     followed: Boolean,
-    onDropMenuToggle : (show: Boolean) -> Unit = {},
+    onDropMenuToggle: (show: Boolean) -> Unit = {},
     onFollowClick: () -> Unit,
     onUnfollowClick: () -> Unit,
     onBrowseClick: () -> Unit,
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.kt
index 00b6a0a93..0b765bbc1 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
@@ -268,7 +268,9 @@ fun NewsResourceTopics(
     topics: List<Topic>,
     modifier: Modifier = Modifier
 ) {
-    var expandedTopic by remember { mutableStateOf<String?>(null) }
+    // Store the ID of the Topic which has its "following" menu expanded, if any.
+    // To avoid UI confusion, only one topic can have an expanded menu at a time.
+    var expandedTopicId by remember { mutableStateOf<String?>(null) }
 
     Row(
         modifier = modifier.horizontalScroll(rememberScrollState()), // causes narrow chips
@@ -276,10 +278,10 @@ fun NewsResourceTopics(
     ) {
         for (topic in topics) {
             NiaTopicTag(
-                expanded = expandedTopic == topic.id,
+                expanded = expandedTopicId == topic.id,
                 followed = true, // ToDo: Check if topic is followed
                 onDropMenuToggle = { show ->
-                    expandedTopic = if (show) topic.id else null
+                    expandedTopicId = if (show) topic.id else null
                 },
                 onFollowClick = { }, // ToDo
                 onUnfollowClick = { }, // ToDo