Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add snippets for Indication and Ripple migration #191

Merged
merged 8 commits into from
Jan 24, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add ripple snippets.
arriolac committed Jan 23, 2024
commit 6080f42ae3e79067b63e0d5db4a34587f43a5686
1 change: 1 addition & 0 deletions compose/snippets/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -99,6 +99,7 @@ dependencies {
implementation(libs.androidx.compose.runtime.livedata)
implementation(libs.androidx.compose.materialWindow)
implementation(libs.androidx.compose.material.iconsExtended)
implementation(libs.androidx.compose.material.ripple)
implementation(libs.androidx.constraintlayout.compose)
implementation(libs.androidx.compose.ui.googlefonts)

Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
package com.example.compose.snippets.touchinput.userinteractions

import androidx.compose.animation.core.Animatable
import androidx.compose.animation.core.spring
import androidx.compose.foundation.Indication
import androidx.compose.foundation.IndicationInstance
import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.InteractionSource
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.interaction.PressInteraction
import androidx.compose.foundation.layout.Box
import androidx.compose.material.ripple.LocalRippleTheme
import androidx.compose.material.ripple.RippleAlpha
import androidx.compose.material.ripple.RippleTheme
import androidx.compose.material.ripple.rememberRipple
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.drawscope.ContentDrawScope
import androidx.compose.ui.graphics.drawscope.scale
import com.example.compose.snippets.architecture.Button
import kotlinx.coroutines.flow.collectLatest

// [START android_compose_userinteractions_scale_indication]
// [START android_compose_userinteractions_scale_indication_object]
object ScaleIndication : Indication {
@Composable
override fun rememberUpdatedInstance(interactionSource: InteractionSource): IndicationInstance {
// key the remember against interactionSource, so if it changes we create a new instance
val instance = remember(interactionSource) { ScaleIndicationInstance() }

LaunchedEffect(interactionSource) {
interactionSource.interactions.collectLatest { interaction ->
when (interaction) {
is PressInteraction.Press -> instance.animateToPressed(interaction.pressPosition)
is PressInteraction.Release -> instance.animateToResting()
is PressInteraction.Cancel -> instance.animateToResting()
}
}
}

return instance
}
}
// [END android_compose_userinteractions_scale_indication_object]

// [START android_compose_userinteractions_scale_indication_instance]
private class ScaleIndicationInstance : IndicationInstance {
var currentPressPosition: Offset = Offset.Zero
val animatedScalePercent = Animatable(1f)

suspend fun animateToPressed(pressPosition: Offset) {
currentPressPosition = pressPosition
animatedScalePercent.animateTo(0.9f, spring())
}

suspend fun animateToResting() {
animatedScalePercent.animateTo(1f, spring())
}

override fun ContentDrawScope.drawIndication() {
scale(
scale = animatedScalePercent.value,
pivot = currentPressPosition
) {
[email protected]()
}
}
}
// [END android_compose_userinteractions_scale_indication_instance]
// [END android_compose_userinteractions_scale_indication]

@Composable
private fun RememberRippleExample() {
// [START android_compose_userinteractions_material_remember_ripple]
Box(
Modifier.clickable(
onClick = {},
interactionSource = remember { MutableInteractionSource() },
indication = rememberRipple()
)
) {
// ...
}
// [END android_compose_userinteractions_material_remember_ripple]
}

// [START android_compose_userinteractions_disabled_ripple_theme]
private object DisabledRippleTheme : RippleTheme {

@Composable
override fun defaultColor(): Color = Color.Transparent

@Composable
override fun rippleAlpha(): RippleAlpha = RippleAlpha(0f, 0f, 0f, 0f)
}

// [START_EXCLUDE]
@Composable
private fun MyComposable() {
// [END_EXCLUDE]
CompositionLocalProvider(LocalRippleTheme provides DisabledRippleTheme) {
Button {
// ...
}
}
// [START_EXCLUDE silent]
}
// [END_EXCLUDE]
// [END android_compose_userinteractions_disabled_ripple_theme]

private val MyRippleAlpha = RippleAlpha(0.5f, 0.5f, 0.5f, 0.5f)

// [START android_compose_userinteractions_disabled_ripple_theme_color_alpha]
private object DisabledRippleThemeColorAndAlpha : RippleTheme {


@Composable
override fun defaultColor(): Color = Color.Red

@Composable
override fun rippleAlpha(): RippleAlpha = MyRippleAlpha
}

// [START_EXCLUDE]
@Composable
private fun MyComposable2() {
// [END_EXCLUDE]
CompositionLocalProvider(LocalRippleTheme provides DisabledRippleThemeColorAndAlpha) {
Button {
// ...
}
}
// [START_EXCLUDE silent]
}
// [END_EXCLUDE]
// [END android_compose_userinteractions_disabled_ripple_theme_color_alpha]
3 changes: 2 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ junit = "4.13.2"
kotlin = "1.9.20"
ksp = "1.8.0-1.0.9"
maps-compose = "3.1.1"
material = "1.11.0-beta01"
material = "1.11.0"
material3-adaptive = "1.0.0-alpha04"
material3-adaptive-navigation-suite = "1.0.0-alpha02"
# @keep
@@ -55,6 +55,7 @@ androidx-compose-foundation = { module = "androidx.compose.foundation:foundation
androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" }
androidx-compose-material = { module = "androidx.compose.material:material" }
androidx-compose-material-iconsExtended = { module = "androidx.compose.material:material-icons-extended" }
androidx-compose-material-ripple = { module = "androidx.compose.material:material-ripple" }
androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
androidx-compose-material3-adaptive = { module = "androidx.compose.material3:material3-adaptive", version.ref = "material3-adaptive" }
androidx-compose-material3-adaptive-navigation-suite = { module = "androidx.compose.material3:material3-adaptive-navigation-suite", version.ref = "material3-adaptive-navigation-suite" }