diff --git a/app/src/main/kotlin/com/flixclusive/mobile/component/BottomBar.kt b/app/src/main/kotlin/com/flixclusive/mobile/component/BottomBar.kt index 8cea2c32..4a05acac 100644 --- a/app/src/main/kotlin/com/flixclusive/mobile/component/BottomBar.kt +++ b/app/src/main/kotlin/com/flixclusive/mobile/component/BottomBar.kt @@ -19,12 +19,12 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.Icon import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.minimumInteractiveComponentSize +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Alignment @@ -44,8 +44,8 @@ import com.flixclusive.AppNavigationItem import com.flixclusive.core.ui.common.util.onMediumEmphasis import com.flixclusive.mobile.MobileNavGraphs import com.ramcosta.composedestinations.spec.NavGraphSpec -import com.flixclusive.core.ui.common.R as UiCommonR import com.flixclusive.core.locale.R as LocaleR +import com.flixclusive.core.ui.common.R as UiCommonR @Composable internal fun BottomBar( @@ -132,7 +132,7 @@ private fun CustomNavItem( .height(28.dp) .indication( interactionSource = interactionSource, - indication = rememberRipple() + indication = ripple() ) ) diff --git a/app/src/main/kotlin/com/flixclusive/mobile/component/FilmPreviewBottomSheet.kt b/app/src/main/kotlin/com/flixclusive/mobile/component/FilmPreviewBottomSheet.kt index 314d2c19..27d50f0d 100644 --- a/app/src/main/kotlin/com/flixclusive/mobile/component/FilmPreviewBottomSheet.kt +++ b/app/src/main/kotlin/com/flixclusive/mobile/component/FilmPreviewBottomSheet.kt @@ -15,7 +15,6 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.Star -import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon @@ -26,6 +25,7 @@ import androidx.compose.material3.SheetState import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.material3.minimumInteractiveComponentSize +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Alignment @@ -45,12 +45,12 @@ import androidx.constraintlayout.compose.Dimension import com.flixclusive.R import com.flixclusive.core.theme.starColor import com.flixclusive.core.ui.common.FilmCover -import com.flixclusive.core.ui.common.util.onMediumEmphasis import com.flixclusive.core.ui.common.util.formatRating +import com.flixclusive.core.ui.common.util.onMediumEmphasis import com.flixclusive.model.film.Film +import com.flixclusive.core.locale.R as LocaleR import com.flixclusive.core.ui.common.R as UiCommonR import com.flixclusive.core.ui.mobile.R as UiMobileR -import com.flixclusive.core.locale.R as LocaleR @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -284,7 +284,7 @@ internal fun IconButtonWithLabel( enabled = enabled, role = Role.Button, interactionSource = interactionSource, - indication = rememberRipple( + indication = ripple( bounded = false, radius = size / 2 ) diff --git a/core/ui/mobile/src/main/kotlin/com/flixclusive/core/ui/mobile/component/CustomCheckbox.kt b/core/ui/mobile/src/main/kotlin/com/flixclusive/core/ui/mobile/component/CustomCheckbox.kt index b265db35..9926a906 100644 --- a/core/ui/mobile/src/main/kotlin/com/flixclusive/core/ui/mobile/component/CustomCheckbox.kt +++ b/core/ui/mobile/src/main/kotlin/com/flixclusive/core/ui/mobile/component/CustomCheckbox.kt @@ -11,9 +11,9 @@ import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.requiredSize import androidx.compose.foundation.layout.wrapContentSize import androidx.compose.foundation.selection.triStateToggleable -import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.CheckboxColors import androidx.compose.material3.CheckboxDefaults +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.Immutable import androidx.compose.runtime.State @@ -79,7 +79,7 @@ fun CustomTriStateCheckbox( enabled = enabled, role = Role.Checkbox, interactionSource = interactionSource, - indication = rememberRipple( + indication = ripple( bounded = false, radius = 40.dp / 2 ) diff --git a/feature/mobile/player/src/main/java/com/flixclusive/feature/mobile/player/controls/common/EnlargedTouchableButton.kt b/feature/mobile/player/src/main/java/com/flixclusive/feature/mobile/player/controls/common/EnlargedTouchableButton.kt index b96fc4b5..ba503b50 100644 --- a/feature/mobile/player/src/main/java/com/flixclusive/feature/mobile/player/controls/common/EnlargedTouchableButton.kt +++ b/feature/mobile/player/src/main/java/com/flixclusive/feature/mobile/player/controls/common/EnlargedTouchableButton.kt @@ -6,9 +6,9 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.size -import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.Icon import androidx.compose.material3.minimumInteractiveComponentSize +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Alignment @@ -36,7 +36,7 @@ internal fun EnlargedTouchableButton( onClick = onClick, role = Role.Button, interactionSource = remember { MutableInteractionSource() }, - indication = rememberRipple( + indication = ripple( bounded = false, radius = size / 2 ) diff --git a/feature/mobile/player/src/main/java/com/flixclusive/feature/mobile/player/controls/common/slider/CustomSlider.kt b/feature/mobile/player/src/main/java/com/flixclusive/feature/mobile/player/controls/common/slider/CustomSlider.kt index aedd484b..dc25a3bc 100644 --- a/feature/mobile/player/src/main/java/com/flixclusive/feature/mobile/player/controls/common/slider/CustomSlider.kt +++ b/feature/mobile/player/src/main/java/com/flixclusive/feature/mobile/player/controls/common/slider/CustomSlider.kt @@ -27,11 +27,11 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.requiredSizeIn import androidx.compose.foundation.layout.size import androidx.compose.foundation.progressSemantics -import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme import androidx.compose.material3.RangeSlider import androidx.compose.material3.minimumInteractiveComponentSize +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.Immutable import androidx.compose.runtime.LaunchedEffect @@ -528,7 +528,7 @@ internal object CustomSliderDefaults { .size(thumbSize) .indication( interactionSource = interactionSource, - indication = rememberRipple( + indication = ripple( bounded = false, radius = SliderTokens.StateLayerSize / 2 ) diff --git a/feature/mobile/player/src/main/java/com/flixclusive/feature/mobile/player/controls/gestures/SeekerAndSliderGestures.kt b/feature/mobile/player/src/main/java/com/flixclusive/feature/mobile/player/controls/gestures/SeekerAndSliderGestures.kt index 433da6e7..2c36e6c6 100644 --- a/feature/mobile/player/src/main/java/com/flixclusive/feature/mobile/player/controls/gestures/SeekerAndSliderGestures.kt +++ b/feature/mobile/player/src/main/java/com/flixclusive/feature/mobile/player/controls/gestures/SeekerAndSliderGestures.kt @@ -17,9 +17,9 @@ import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.size -import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.Icon import androidx.compose.material3.Surface +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.MutableState @@ -167,7 +167,7 @@ internal fun SeekerAndSliderGestures( .fillMaxHeight() .indication( interactionSource, - rememberRipple(bounded = false, radius = screenWidth.div(2F)) + ripple(bounded = false, radius = screenWidth.div(2F)) ) .onPlaced { screenHeightPx = it.size.height diff --git a/feature/mobile/preferences/src/main/kotlin/com/flixclusive/feature/mobile/preferences/component/HeaderButton.kt b/feature/mobile/preferences/src/main/kotlin/com/flixclusive/feature/mobile/preferences/component/HeaderButton.kt index 9b975708..c8ee15ae 100644 --- a/feature/mobile/preferences/src/main/kotlin/com/flixclusive/feature/mobile/preferences/component/HeaderButton.kt +++ b/feature/mobile/preferences/src/main/kotlin/com/flixclusive/feature/mobile/preferences/component/HeaderButton.kt @@ -6,9 +6,9 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.size -import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.Icon import androidx.compose.material3.minimumInteractiveComponentSize +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Alignment @@ -36,7 +36,7 @@ internal fun HeaderButton( onClick = onClick, role = Role.Button, interactionSource = remember { MutableInteractionSource() }, - indication = rememberRipple( + indication = ripple( bounded = false, radius = size / 2 ) diff --git a/feature/mobile/provider-info/src/main/kotlin/com/flixclusive/feature/mobile/provider/info/component/author/AuthorCard.kt b/feature/mobile/provider-info/src/main/kotlin/com/flixclusive/feature/mobile/provider/info/component/author/AuthorCard.kt index 5bd668b6..3b333fc0 100644 --- a/feature/mobile/provider-info/src/main/kotlin/com/flixclusive/feature/mobile/provider/info/component/author/AuthorCard.kt +++ b/feature/mobile/provider-info/src/main/kotlin/com/flixclusive/feature/mobile/provider/info/component/author/AuthorCard.kt @@ -7,9 +7,9 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.size -import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Alignment @@ -61,7 +61,7 @@ internal fun AuthorCard( condition = author.socialLink != null, ifTrueModifier = Modifier.clickable( interactionSource = interactionSource, - indication = rememberRipple( + indication = ripple( bounded = false, radius = avatarSize / 2 ), diff --git a/feature/mobile/provider-list/src/main/kotlin/com/flixclusive/feature/mobile/provider/component/ProvidersTopBar.kt b/feature/mobile/provider-list/src/main/kotlin/com/flixclusive/feature/mobile/provider/component/ProvidersTopBar.kt index 09a2cfab..727fa63d 100644 --- a/feature/mobile/provider-list/src/main/kotlin/com/flixclusive/feature/mobile/provider/component/ProvidersTopBar.kt +++ b/feature/mobile/provider-list/src/main/kotlin/com/flixclusive/feature/mobile/provider/component/ProvidersTopBar.kt @@ -20,7 +20,6 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.statusBarsPadding import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions -import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExtendedFloatingActionButton import androidx.compose.material3.Icon @@ -39,6 +38,7 @@ import androidx.compose.material3.TooltipBox import androidx.compose.material3.TooltipDefaults import androidx.compose.material3.TooltipState import androidx.compose.material3.rememberTooltipState +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState import androidx.compose.runtime.SideEffect @@ -66,8 +66,8 @@ import com.flixclusive.core.ui.common.util.createTextFieldValue import com.flixclusive.core.ui.common.util.noIndicationClickable import com.flixclusive.core.ui.common.util.onMediumEmphasis import kotlinx.coroutines.launch -import com.flixclusive.core.ui.common.R as UiCommonR import com.flixclusive.core.locale.R as LocaleR +import com.flixclusive.core.ui.common.R as UiCommonR private val SearchIconSize = 18.dp @@ -208,7 +208,7 @@ private fun CollapsedTopBar( onClick = onExpandTopBar, role = Role.Button, interactionSource = remember { MutableInteractionSource() }, - indication = rememberRipple( + indication = ripple( bounded = false, radius = SearchIconSize )