Skip to content

[Android] Fix ReactSwitch for non RippleDrawable backgrounds #32468

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

Closed
wants to merge 2 commits into from
Closed

[Android] Fix ReactSwitch for non RippleDrawable backgrounds #32468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a26207
Ensure RippleDrawable background for ReactSwitch
smarki Oct 24, 2021
80a643f
Add backgroundColor example use case
smarki Oct 26, 2021
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
30 changes: 22 additions & 8 deletions ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import android.content.Context;
import android.content.res.ColorStateList;
import android.graphics.PorterDuff;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.RippleDrawable;
import android.os.Build;
Expand Down Expand Up @@ -48,6 +49,18 @@ public void setChecked(boolean checked) {
}
}

@Override
public void setBackgroundColor(int color) {
// Ensure RippleDrawable is preserved for >=21
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
setBackground(
new RippleDrawable(
createRippleDrawableColorStateList(color), new ColorDrawable(color), null));
} else {
super.setBackgroundColor(color);
}
}

void setColor(Drawable drawable, @Nullable Integer color) {
if (color == null) {
drawable.clearColorFilter();
Expand All @@ -63,14 +76,10 @@ public void setTrackColor(@Nullable Integer color) {
public void setThumbColor(@Nullable Integer color) {
setColor(super.getThumbDrawable(), color);

// Set the ripple color with thumb color if >= LOLLIPOP
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
RippleDrawable ripple = (RippleDrawable) super.getBackground();
ColorStateList customColorState =
new ColorStateList(
new int[][] {new int[] {android.R.attr.state_pressed}}, new int[] {color});

ripple.setColor(customColorState);
// Set the ripple color if background is instance of RippleDrawable
if (color != null && super.getBackground() instanceof RippleDrawable) {
ColorStateList customColorState = createRippleDrawableColorStateList(color);
((RippleDrawable) super.getBackground()).setColor(customColorState);
}
}

Expand Down Expand Up @@ -113,4 +122,9 @@ private void setTrackColor(boolean checked) {
setTrackColor(currentTrackColor);
}
}

private ColorStateList createRippleDrawableColorStateList(@Nullable Integer color) {
return new ColorStateList(
new int[][] {new int[] {android.R.attr.state_pressed}}, new int[] {color});
}
}
23 changes: 23 additions & 0 deletions packages/rn-tester/js/examples/Switch/SwitchExample.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,23 @@ class OnChangeExample extends React.Component<{...}, $FlowFixMeState> {
}
}

class ContainerBackgroundColorStyleExample extends React.Component<
{...},
$FlowFixMeState,
> {
render() {
return (
<View>
<Switch
style={{backgroundColor: 'blue'}}
thumbColor="white"
value={true}
/>
</View>
);
}
}

exports.title = 'Switch';
exports.documentationURL = 'https://reactnative.dev/docs/switch';
exports.category = 'UI';
Expand Down Expand Up @@ -291,6 +308,12 @@ exports.examples = [
return <OnChangeExample />;
},
},
{
title: "The container's background color can be set",
render(): React.Element<any> {
return <ContainerBackgroundColorStyleExample />;
},
},
];

if (Platform.OS === 'ios') {
Expand Down