Skip to content

Commit 9d8dd9a

Browse files
committed
Fix bug with no elevation on >=Lollipop devices
1 parent 367f7c4 commit 9d8dd9a

File tree

3 files changed

+12
-31
lines changed

3 files changed

+12
-31
lines changed

app/src/main/res/layout/button_custom.xml

Lines changed: 0 additions & 19 deletions
This file was deleted.

library/src/main/java/pl/sigmapoint/customview/CustomButton.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,11 @@ private void setShapeBackground() {
229229
drawableNormal.setColor(backgroundColor);
230230
drawablePressed.setColor(backgroundPressed);
231231
drawableDisabled.setColor(backgroundDisabled);
232-
drawableNormal.setStroke((int) frameSize, frameColor);
233-
drawablePressed.setStroke((int) frameSize, frameColorPressed);
234-
drawableDisabled.setStroke((int) frameSize, frameColorDisabled);
235-
232+
if (frameSize > 0) {
233+
drawableNormal.setStroke((int) frameSize, frameColor);
234+
drawablePressed.setStroke((int) frameSize, frameColorPressed);
235+
drawableDisabled.setStroke((int) frameSize, frameColorDisabled);
236+
}
236237

237238
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
238239

@@ -246,7 +247,6 @@ private void setShapeBackground() {
246247
container.setBackgroundDrawable(stateListDrawable);
247248

248249
} else {
249-
250250
stateListDrawable.addState(new int[]{android.R.attr.state_enabled}, drawableNormal);
251251
stateListDrawable.addState(new int[]{}, drawableDisabled);
252252

@@ -332,11 +332,6 @@ public void setFrame(int color, float size) {
332332
setShapeBackground();
333333
}
334334

335-
public void removeFrame() {
336-
frameSize = 0;
337-
setShapeBackground();
338-
}
339-
340335
/**
341336
* Set frame size and color from color state list.
342337
* Only three states are use: disabled, pressed, normal.
@@ -363,6 +358,11 @@ public void setFrameSize(float frameSize) {
363358
setShapeBackground();
364359
}
365360

361+
public void removeFrame() {
362+
frameSize = 0;
363+
setShapeBackground();
364+
}
365+
366366
/**
367367
* Set text color.
368368
*

library/src/main/res/anim/elevation_button_custom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<objectAnimator
1313
android:duration="75"
1414
android:propertyName="elevation"
15-
android:valueTo="4dp"
15+
android:valueTo="3dp"
1616
android:valueType="floatType" />
1717
</set>
1818
</item>
@@ -28,7 +28,7 @@
2828
<objectAnimator
2929
android:duration="75"
3030
android:propertyName="elevation"
31-
android:valueTo="2dp"
31+
android:valueTo="1dp"
3232
android:valueType="floatType" />
3333
</set>
3434
</item>

0 commit comments

Comments
 (0)