From cf72f7bf782884d2ebd72f87b8229b584d8f8d3b Mon Sep 17 00:00:00 2001 From: kosenda Date: Sat, 16 Sep 2023 15:36:57 +0900 Subject: [PATCH 1/4] feature: change fade favorite animation end --- .../sessions/component/BookmarkIcon.kt | 24 ++++++++++++------- .../sessions/component/TimetableTopArea.kt | 1 + 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/feature/sessions/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/BookmarkIcon.kt b/feature/sessions/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/BookmarkIcon.kt index df038ee4d..e681210fb 100644 --- a/feature/sessions/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/BookmarkIcon.kt +++ b/feature/sessions/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/feature/sessions/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/TimetableTopArea.kt b/feature/sessions/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/TimetableTopArea.kt index 69087e337..6cd0d18f0 100644 --- a/feature/sessions/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/TimetableTopArea.kt +++ b/feature/sessions/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/TimetableTopArea.kt @@ -1,5 +1,6 @@ package io.github.droidkaigi.confsched2023.sessions.component +import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.clickable import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Search From ae0f40a47223a9e962e394cffaacc8787b0d6c13 Mon Sep 17 00:00:00 2001 From: kosenda Date: Sat, 16 Sep 2023 15:43:00 +0900 Subject: [PATCH 2/4] fix: auto correct --- .../confsched2023/sessions/component/TimetableTopArea.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/feature/sessions/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/TimetableTopArea.kt b/feature/sessions/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/TimetableTopArea.kt index 6cd0d18f0..69087e337 100644 --- a/feature/sessions/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/TimetableTopArea.kt +++ b/feature/sessions/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/TimetableTopArea.kt @@ -1,6 +1,5 @@ package io.github.droidkaigi.confsched2023.sessions.component -import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.clickable import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Search From a3dd945b49a816c00a42276aebe82f2bb99d5dc4 Mon Sep 17 00:00:00 2001 From: ASAKURA404 Date: Sat, 16 Sep 2023 17:59:45 +0900 Subject: [PATCH 3/4] change lineHeight of session tag --- .../droidkaigi/confsched2023/sessions/component/SessionTag.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/feature/sessions/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/SessionTag.kt b/feature/sessions/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/SessionTag.kt index f0f1f3bff..646552fc3 100644 --- a/feature/sessions/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/SessionTag.kt +++ b/feature/sessions/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, + lineHeight = 16.sp, color = labelColor, ) } From 38e8aab6e5f17846557e777ed1d93968bf39eacc Mon Sep 17 00:00:00 2001 From: ASAKURA404 Date: Sat, 16 Sep 2023 19:11:43 +0900 Subject: [PATCH 4/4] change text style in session tag --- .../droidkaigi/confsched2023/sessions/component/SessionTag.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/sessions/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/SessionTag.kt b/feature/sessions/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/SessionTag.kt index 646552fc3..b520990cf 100644 --- a/feature/sessions/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/SessionTag.kt +++ b/feature/sessions/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/SessionTag.kt @@ -53,7 +53,7 @@ fun SessionTag( text = label, fontWeight = FontWeight.Medium, fontSize = 12.sp, - lineHeight = 16.sp, + style = MaterialTheme.typography.labelMedium, color = labelColor, ) }