Skip to content

Commit 391a1e6

Browse files
author
肖琪(融汇/产品技术中心)
committed
1.7.2
1 parent d5c6871 commit 391a1e6

File tree

5 files changed

+25
-15
lines changed

5 files changed

+25
-15
lines changed

README-EN.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Add this to your app's build.gradle:
1414
}
1515

1616
implementation "androidx.appcompat:appcompat:$supportVersion"
17-
implementation 'com.github.JavaNoober.BackgroundLibrary:library:1.7.1'
17+
implementation 'com.github.JavaNoober.BackgroundLibrary:library:1.7.2'
1818

1919
if use androidx:
2020

@@ -26,7 +26,7 @@ if use androidx:
2626
}
2727

2828
implementation "androidx.appcompat:appcompat:$supportVersion"
29-
implementation 'com.github.JavaNoober.BackgroundLibrary:libraryx:1.7.1'
29+
implementation 'com.github.JavaNoober.BackgroundLibrary:libraryx:1.7.2'
3030

3131

3232
## Example effect

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ issue回复不及时,可以添加qq群887686934
1919
}
2020

2121
implementation "com.android.support:appcompat-v7:$supportVersion"
22-
implementation 'com.github.JavaNoober.BackgroundLibrary:library:1.7.1'
22+
implementation 'com.github.JavaNoober.BackgroundLibrary:library:1.7.2'
2323

2424
如果项目使用了androidx:
2525

@@ -31,7 +31,7 @@ issue回复不及时,可以添加qq群887686934
3131
}
3232

3333
implementation "androidx.appcompat:appcompat:$supportVersion"
34-
implementation 'com.github.JavaNoober.BackgroundLibrary:libraryx:1.7.1'
34+
implementation 'com.github.JavaNoober.BackgroundLibrary:libraryx:1.7.2'
3535

3636

3737
## 使用文档

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,21 @@
1313
tools:context=".MainActivity"
1414
tools:ignore="MissingPrefix">
1515

16+
<Button
17+
android:id="@+id/btnConsole"
18+
android:layout_width="match_parent"
19+
android:layout_height="49dp"
20+
android:layout_marginTop="12.5dp"
21+
android:padding="0dp"
22+
android:textColor="@android:color/black"
23+
android:textSize="16sp"
24+
android:textStyle="bold"
25+
app:bl_corners_radius="10dp"
26+
app:bl_gradient_angle="45"
27+
app:bl_gradient_endColor="#00E0D3"
28+
app:bl_gradient_startColor="#0093C3"
29+
app:bl_gradient_type="linear" />
30+
1631
<com.noober.background.view.BLButton
1732
style="?android:attr/borderlessButtonStyle"
1833
android:layout_width="match_parent"

library/src/main/java/com/noober/background/drawable/DrawableCreator.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public static class Builder {
7171
private boolean useLevel = false;
7272

7373
private Rect padding = new Rect();
74-
74+
private boolean hasSetPadding = false;
7575
private Float sizeWidth;
7676
private Float sizeHeight;
7777
private Float strokeWidth;
@@ -211,6 +211,7 @@ public Builder setUseLevel(boolean useLevel) {
211211
}
212212

213213
public Builder setPadding(float paddingLeft, float paddingTop, float paddingRight, float paddingBottom) {
214+
hasSetPadding = true;
214215
padding.left = (int) paddingLeft;
215216
padding.top = (int) paddingTop;
216217
padding.right = (int) paddingRight;
@@ -761,7 +762,7 @@ private GradientDrawable getGradientDrawable() {
761762
}
762763
drawable.setGradientType(gradient.value);
763764
drawable.setUseLevel(useLevel);
764-
if (!isEmpty(padding)) {
765+
if (hasSetPadding) {
765766
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
766767
drawable.setPadding(padding.left, padding.top, padding.right, padding.bottom);
767768
} else {
@@ -960,7 +961,4 @@ public static void setDrawable(Drawable drawable, View view, DrawablePosition dr
960961

961962
}
962963

963-
private static final boolean isEmpty(Rect rect) {
964-
return rect.left > rect.right || rect.top > rect.bottom;
965-
}
966964
}

libraryx/src/main/java/com/noober/background/drawable/DrawableCreator.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public static class Builder {
6969
private boolean useLevel = false;
7070

7171
private Rect padding = new Rect();
72-
72+
private boolean hasSetPadding = false;
7373
private Float sizeWidth;
7474
private Float sizeHeight;
7575
private Float strokeWidth;
@@ -209,6 +209,7 @@ public Builder setUseLevel(boolean useLevel) {
209209
}
210210

211211
public Builder setPadding(float paddingLeft, float paddingTop, float paddingRight, float paddingBottom) {
212+
hasSetPadding = true;
212213
padding.left = (int) paddingLeft;
213214
padding.top = (int) paddingTop;
214215
padding.right = (int) paddingRight;
@@ -759,7 +760,7 @@ private GradientDrawable getGradientDrawable() {
759760
}
760761
drawable.setGradientType(gradient.value);
761762
drawable.setUseLevel(useLevel);
762-
if (!isEmpty(padding)) {
763+
if (hasSetPadding) {
763764
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
764765
drawable.setPadding(padding.left, padding.top, padding.right, padding.bottom);
765766
} else {
@@ -959,8 +960,4 @@ public static void setDrawable(Drawable drawable, View view, DrawablePosition dr
959960
}
960961

961962
}
962-
963-
private static final boolean isEmpty(Rect rect) {
964-
return rect.left > rect.right || rect.top > rect.bottom;
965-
}
966963
}

0 commit comments

Comments
 (0)