Merge branch 'main' into feature/sticky-timetable-grid-title

DroidKaigi · Sep 17, 2023 · 38623d1 · 38623d1
2 parents 4cdfbd5 + 0a8bd1d
commit 38623d1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/...sions/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/BookmarkIcon.kt b/...sions/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/BookmarkIcon.kt
@@ -1,5 +1,9 @@
 package io.github.droidkaigi.confsched2023.sessions.component
 
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
@@ -53,7 +57,11 @@ fun BookmarkIcon(
         modifier = modifier,
         contentAlignment = Alignment.Center,
     ) {
-        if (lottieState.isPlaying && !lottieState.isAtEnd) {
+        AnimatedVisibility(
+            visible = lottieState.isPlaying,
+            enter = fadeIn(animationSpec = tween(0)),
+            exit = fadeOut(),
+        ) {
             LottieAnimation(
                 composition = lottieComposition,
                 progress = { lottieState.progress },
@@ -62,13 +70,13 @@ fun BookmarkIcon(
                         onClick(label = contentDescription, action = null)
                     },
             )
-        } else {
-            Icon(
-                modifier = Modifier
-                    .padding(12.dp),
-                imageVector = Icons.Outlined.Bookmarks,
-                contentDescription = contentDescription,
-            )
         }
+
+        Icon(
+            modifier = Modifier
+                .padding(12.dp),
+            imageVector = Icons.Outlined.Bookmarks,
+            contentDescription = contentDescription,
+        )
     }
 }
diff --git a/...essions/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/SessionTag.kt b/...essions/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/SessionTag.kt
@@ -53,6 +53,7 @@ fun SessionTag(
             text = label,
             fontWeight = FontWeight.Medium,
             fontSize = 12.sp,
+            style = MaterialTheme.typography.labelMedium,
             color = labelColor,
         )
     }