Merge pull request #832 from kosenda/feature/favorite-filters-chip-ad…

…d-animation-icon In FavoriteScreen, add animtion in FavoriteFilterChip icon
DroidKaigi · Aug 27, 2024 · 009bdf7 · 009bdf7
2 parents db0e473 + 1acca38
commit 009bdf7
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/...c/commonMain/kotlin/io/github/droidkaigi/confsched/favorites/component/FavoriteFilters.kt b/...c/commonMain/kotlin/io/github/droidkaigi/confsched/favorites/component/FavoriteFilters.kt
@@ -1,5 +1,10 @@
 package io.github.droidkaigi.confsched.favorites.component
 
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.expandHorizontally
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkHorizontally
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
@@ -43,17 +48,17 @@ fun FavoriteFilters(
         horizontalArrangement = Arrangement.spacedBy(6.dp),
     ) {
         FavoriteFilterChip(
-            selected = allFilterSelected,
+            isSelected = allFilterSelected,
             onClick = onAllFilterChipClick,
             text = stringResource(FavoritesRes.string.filter_all),
         )
         FavoriteFilterChip(
-            selected = day1FilterSelected,
+            isSelected = day1FilterSelected,
             onClick = onDay1FilterChipClick,
             text = stringResource(FavoritesRes.string.filter_day1),
         )
         FavoriteFilterChip(
-            selected = day2FilterSelected,
+            isSelected = day2FilterSelected,
             onClick = onDay2FilterChipClick,
             text = stringResource(FavoritesRes.string.filter_day2),
         )
@@ -62,18 +67,22 @@ fun FavoriteFilters(
 
 @Composable
 private fun FavoriteFilterChip(
-    selected: Boolean,
+    isSelected: Boolean,
     text: String,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     FilterChip(
         modifier = modifier.padding(top = 8.dp, bottom = 12.dp),
-        selected = selected,
+        selected = isSelected,
         onClick = onClick,
         label = { Text(text) },
         leadingIcon = {
-            if (selected) {
+            AnimatedVisibility(
+                visible = isSelected,
+                enter = fadeIn() + expandHorizontally(),
+                exit = fadeOut() + shrinkHorizontally(),
+            ) {
                 Icon(
                     imageVector = Icons.Filled.Check,
                     contentDescription = null,