Skip to content

Fix for issue 403: #408

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for issue 403: #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...alDesignLibrary/MaterialDesign/src/main/java/com/gc/materialdesign/views/ButtonFloat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,12 @@ protected void setAttributes(AttributeSet attrs){
// Set Ripple Color
// Color by resource
int rippleColor = attrs.getAttributeResourceValue(MATERIALDESIGNXML,
"rippleColor", -1);
"rippleColor2", -1);
if (rippleColor != -1) {
setRippleColor(getResources().getColor(rippleColor));
} else {
// Color by hexadecimal
int background = attrs.getAttributeIntValue(MATERIALDESIGNXML, "rippleColor", -1);
int background = attrs.getAttributeIntValue(MATERIALDESIGNXML, "rippleColor2", -1);
if (background != -1)
setRippleColor(background);
else
Expand Down
4 changes: 2 additions & 2 deletions ...lDesignLibrary/MaterialDesign/src/main/java/com/gc/materialdesign/views/LayoutRipple.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ protected void setAttributes(AttributeSet attrs) {
// Set Ripple Color
// Color by resource
int rippleColor = attrs.getAttributeResourceValue(MATERIALDESIGNXML,
"rippleColor", -1);
"rippleColor2", -1);
if (rippleColor != -1) {
setRippleColor(getResources().getColor(rippleColor));
} else {
// Color by hexadecimal
int background = attrs.getAttributeIntValue(MATERIALDESIGNXML, "rippleColor", -1);
int background = attrs.getAttributeIntValue(MATERIALDESIGNXML, "rippleColor2", -1);
if (background != -1)
setRippleColor(background);
else
Expand Down
2 changes: 1 addition & 1 deletion MaterialDesignLibrary/MaterialDesign/src/main/res/values/attributes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<declare-styleable name="CustomAttributes">

<!-- Color of ripple animation -->
<attr name="rippleColor" format="color|reference" />
<attr name="rippleColor2" format="color|reference" />
<!-- Speed of ripple animation -->
<attr name="rippleSpeed" format="float" />
<!-- indicate if the slider must show number indicator -->
Expand Down