Skip to content

Commit d9d0bf2

Browse files
committed
see 12/01 log
1 parent d4288dd commit d9d0bf2

File tree

8 files changed

+36
-12
lines changed

8 files changed

+36
-12
lines changed

README-CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
4343

44-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.9-brightgreen.svg
44+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.10-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

4747
[apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ If this ptoject helps you a lot, and you would like to support this ptoject's fu
4141

4242
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
4343

44-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.9-brightgreen.svg
44+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.10-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

4747
[apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ dependencies {
6161
debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version"
6262
releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version"
6363

64-
// implementation 'com.blankj:utilcode:1.9.9'
64+
// implementation 'com.blankj:utilcode:1.9.10'
6565
}
6666

6767

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ ext {
3232
min_sdk_version = 14
3333
target_sdk_version = 22
3434

35-
version_code = 100900900
36-
version_name = '1.9.9'
35+
version_code = 1009010
36+
version_name = '1.9.10'// E.g 1.9.72 == 1,009,072
3737

3838
// App dependencies
3939
support_version = '26.1.0'

update_log.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* 17/11/30 修复 ToastUtils 背景问题,发布 1.9.10
12
* 17/11/30 修复 ToastUtils 获取背景为空,发布 1.9.9
23
* 17/11/28 修复 EmptyUtils 对 CharSequence 的判断,感谢 jiezigg
34
* 17/11/24 新增 readme 格式化的 gradle 脚本

utilcode/README-CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Gradle:
44
```groovy
5-
compile 'com.blankj:utilcode:1.9.9'
5+
compile 'com.blankj:utilcode:1.9.10'
66
```
77

88

utilcode/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Gradle:
44
```groovy
5-
compile 'com.blankj:utilcode:1.9.9'
5+
compile 'com.blankj:utilcode:1.9.10'
66
```
77

88

utilcode/src/main/java/com/blankj/utilcode/util/ToastUtils.java

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.blankj.utilcode.util;
22

33
import android.content.Context;
4+
import android.graphics.Color;
45
import android.graphics.PorterDuff;
56
import android.graphics.PorterDuffColorFilter;
67
import android.graphics.drawable.ColorDrawable;
@@ -212,10 +213,11 @@ public void run() {
212213
cancel();
213214
sToast = Toast.makeText(Utils.getApp(), text, duration);
214215
// solve the font of toast
215-
TextView tvMessage = (TextView) sToast.getView().findViewById(android.R.id.message);
216+
TextView tvMessage = sToast.getView().findViewById(android.R.id.message);
216217
TextViewCompat.setTextAppearance(tvMessage, android.R.style.TextAppearance);
217218
tvMessage.setTextColor(msgColor);
218-
setBgAndGravity();
219+
sToast.setGravity(gravity, xOffset, yOffset);
220+
setBg(tvMessage);
219221
sToast.show();
220222
}
221223
});
@@ -229,13 +231,14 @@ public void run() {
229231
sToast = new Toast(Utils.getApp());
230232
sToast.setView(view);
231233
sToast.setDuration(duration);
232-
setBgAndGravity();
234+
sToast.setGravity(gravity, xOffset, yOffset);
235+
setBg();
233236
sToast.show();
234237
}
235238
});
236239
}
237240

238-
private static void setBgAndGravity() {
241+
private static void setBg() {
239242
View toastView = sToast.getView();
240243
if (bgResource != -1) {
241244
toastView.setBackgroundResource(bgResource);
@@ -247,7 +250,27 @@ private static void setBgAndGravity() {
247250
ViewCompat.setBackground(toastView, new ColorDrawable(bgColor));
248251
}
249252
}
250-
sToast.setGravity(gravity, xOffset, yOffset);
253+
}
254+
255+
private static void setBg(final TextView tvMessage) {
256+
View toastView = sToast.getView();
257+
if (bgResource != -1) {
258+
toastView.setBackgroundResource(bgResource);
259+
tvMessage.setBackgroundColor(Color.TRANSPARENT);
260+
} else if (bgColor != COLOR_DEFAULT) {
261+
Drawable tvBg = toastView.getBackground();
262+
Drawable messageBg = tvMessage.getBackground();
263+
if (tvBg != null && messageBg != null) {
264+
tvBg.setColorFilter(new PorterDuffColorFilter(bgColor, PorterDuff.Mode.SRC_IN));
265+
tvMessage.setBackgroundColor(Color.TRANSPARENT);
266+
} else if (tvBg != null) {
267+
tvBg.setColorFilter(new PorterDuffColorFilter(bgColor, PorterDuff.Mode.SRC_IN));
268+
} else if (messageBg != null) {
269+
messageBg.setColorFilter(new PorterDuffColorFilter(bgColor, PorterDuff.Mode.SRC_IN));
270+
} else {
271+
toastView.setBackgroundColor(bgColor);
272+
}
273+
}
251274
}
252275

253276
private static View getView(@LayoutRes final int layoutId) {

0 commit comments

Comments
 (0)