From 00f1fdb30379782d7814bf966807178c96fdea49 Mon Sep 17 00:00:00 2001 From: DatLag Date: Sat, 2 Dec 2023 17:51:16 +0100 Subject: [PATCH] clip click ripple --- .../shared/ui/screen/video/dialog/cast/CastDialog.android.kt | 3 ++- .../shared/ui/screen/initial/favorite/FavoriteScreen.kt | 3 ++- .../shared/ui/screen/initial/home/component/EpisodeItem.kt | 2 +- .../shared/ui/screen/initial/home/component/SeriesItem.kt | 2 +- .../shared/ui/screen/initial/search/SearchScreen.kt | 5 +++-- .../shared/ui/screen/initial/series/component/EpisodeItem.kt | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/cast/CastDialog.android.kt b/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/cast/CastDialog.android.kt index 5329220a..681ba86f 100644 --- a/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/cast/CastDialog.android.kt +++ b/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/cast/CastDialog.android.kt @@ -12,6 +12,7 @@ import androidx.compose.material3.* import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp @@ -167,7 +168,7 @@ private fun DeviceInfo(device: Device, onClick: () -> Unit, onConnected: () -> U } Row( - modifier = Modifier.fillMaxWidth().defaultMinSize(minHeight = 48.dp).onClick { onClick() }, + modifier = Modifier.fillMaxWidth().defaultMinSize(minHeight = 48.dp).clip(MaterialTheme.shapes.small).onClick { onClick() }, horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically ) { diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/favorite/FavoriteScreen.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/favorite/FavoriteScreen.kt index 8525680f..21b617f4 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/favorite/FavoriteScreen.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/favorite/FavoriteScreen.kt @@ -18,6 +18,7 @@ import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass import androidx.compose.runtime.* import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import com.arkivanov.decompose.extensions.compose.jetbrains.subscribeAsState @@ -145,7 +146,7 @@ private fun SearchBar(component: FavoriteComponent) { ) { items.forEach { item -> Text( - modifier = Modifier.fillMaxWidth().onClick { + modifier = Modifier.fillMaxWidth().clip(MaterialTheme.shapes.extraSmall).onClick { component.itemClicked(FavoriteConfig.Series(item)) }.padding(12.dp), text = item.title, diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/component/EpisodeItem.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/component/EpisodeItem.kt index 175fc814..17bef5f8 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/component/EpisodeItem.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/component/EpisodeItem.kt @@ -27,7 +27,7 @@ import io.kamel.image.asyncPainterResource @Composable fun LazyGridItemScope.EpisodeItem(episode: Home.Episode, onclick: () -> Unit) { ElevatedCard( - modifier = Modifier.animateItemPlacement().height(150.dp).bounceClick().onClick { + modifier = Modifier.animateItemPlacement().height(150.dp).bounceClick().clip(MaterialTheme.shapes.medium).onClick { onclick() } ) { diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/component/SeriesItem.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/component/SeriesItem.kt index f0a00617..2c6efe81 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/component/SeriesItem.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/component/SeriesItem.kt @@ -57,7 +57,7 @@ fun LazyItemScope.SeriesItem(series: DBSeries, modifier: Modifier = Modifier, on @Composable private fun SeriesItem(title: String, coverHref: String?, modifier: Modifier = Modifier, onClick: () -> Unit) { ElevatedCard( - modifier = modifier.height(150.dp).bounceClick().onClick { + modifier = modifier.height(150.dp).bounceClick().clip(MaterialTheme.shapes.medium).onClick { onClick() } ) { diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/search/SearchScreen.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/search/SearchScreen.kt index bbf8681f..d11d105b 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/search/SearchScreen.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/search/SearchScreen.kt @@ -16,6 +16,7 @@ import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow @@ -117,7 +118,7 @@ private fun MainView(component: SearchComponent, modifier: Modifier = Modifier) } items(genre.items) { Text( - modifier = Modifier.fillMaxWidth().onClick { + modifier = Modifier.fillMaxWidth().clip(MaterialTheme.shapes.extraSmall).onClick { component.itemClicked(SearchConfig.Series(it)) }.padding(12.dp).animateItemPlacement(), text = it.title, @@ -191,7 +192,7 @@ private fun SearchBar(component: SearchComponent) { ) { items.forEach { item -> Text( - modifier = Modifier.fillMaxWidth().onClick { + modifier = Modifier.fillMaxWidth().clip(MaterialTheme.shapes.extraSmall).onClick { component.itemClicked(SearchConfig.Series(item)) }.padding(12.dp), text = item.title, diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/component/EpisodeItem.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/component/EpisodeItem.kt index 81e658af..c76f5773 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/component/EpisodeItem.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/component/EpisodeItem.kt @@ -49,7 +49,7 @@ fun EpisodeItem(content: Series.Episode, dbEpisode: Episode?, isLoading: Boolean } Row( - modifier = Modifier.padding(vertical = 4.dp).fillMaxWidth().height(100.dp).onClick(enabled) { + modifier = Modifier.padding(vertical = 4.dp).fillMaxWidth().height(100.dp).clip(MaterialTheme.shapes.medium).onClick(enabled) { onClick() }.ifTrue(enabled) { bounceClick(0.95F) }.ifFalse(enabled) { alpha(0.5F) }, horizontalArrangement = Arrangement.spacedBy(8.dp),