Skip to content

Fix ripple animation on touchables in some cases #1877

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.

Sign up for GitHub

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

Merged
j-piasecki merged 2 commits into from
Mar 2, 2022
Merged

Fix ripple animation on touchables in some cases #1877

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e16226a
Fix ripple
j-piasecki Feb 15, 2022
9a15255
Use `android.R`
j-piasecki Mar 2, 2022
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
14 changes: 11 additions & 3 deletions ...oid/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerButtonViewManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,18 @@ class RNGestureHandlerButtonViewManager : ViewGroupManager<ButtonViewGroup>() {

private fun applyRippleEffectWhenNeeded(selectable: Drawable): Drawable {
val rippleColor = rippleColor
if (rippleColor != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && selectable is RippleDrawable) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && selectable is RippleDrawable) {
val states = arrayOf(intArrayOf(android.R.attr.state_enabled))
val colors = intArrayOf(rippleColor)
val colorStateList = ColorStateList(states, colors)
val colorStateList = if (rippleColor != null) {
val colors = intArrayOf(rippleColor)
ColorStateList(states, colors)
} else {
// if rippleColor is null, reapply the default color
context.theme.resolveAttribute(android.R.attr.colorControlHighlight, resolveOutValue, true)
val colors = intArrayOf(resolveOutValue.data)
ColorStateList(states, colors)
}

selectable.setColor(colorStateList)
}

Expand Down