Skip to content

Commit 20712d6

Browse files
BlankjBlankj
committed
see 11/15 log
1 parent ea8f9aa commit 20712d6

File tree

207 files changed

+1914
-274
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

207 files changed

+1914
-274
lines changed

update_log.md renamed to CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
* `18/11/12` [fix] SPUtils bug when use in multi threads. Publish v1.21.3.
1+
* `18/11/15` [add] module of bus-gradle-plugin and change style of gradle.
2+
* `18/11/14` [add] BusUtils.
3+
* `18/11/13` [add] AdaptScreenUtils.
4+
* `18/11/12` [fix] SPUtils bug when use in multi threads.
25
* `18/10/25` [fix] SpanUtils#setLineHeight bug of multi lines. Publish v1.21.2.
36
* `18/10/24` [fix] SpanUtils#appendImage on VIVO. Publish v1.21.1.
47
* `18/10/16` [add] BusUtils, DeviceUtils#isAdbEnabled. Publish v1.21.0.

‎README-CN.md‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
![logo][logo]
22

3-
[![auc][aucsvg]][auc] [![api][apisvg]][api] [![build][buildsvg]][build] [![Insight][insightsvg]][insight] [![License][licensesvg]][license]
3+
[![auc][aucSvg]][auc] [![api][apiSvg]][api] [![build][buildSvg]][build] [![Insight][insightSvg]][insight] [![License][licenseSvg]][license]
44

55
## [README of English][readme]
66

@@ -32,28 +32,28 @@
3232

3333
## Contact
3434

35-
[![Blog][blogsvg]][blog] [![jianshu][jianshusvg]][jianshu] [![weibo][weibosvg]][weibo] [![QQGroup][qqgroupsvg]][qqgroup]
35+
[![Blog][blogSvg]][blog] [![jianshu][jianshuSvg]][jianshu] [![weibo][weiboSvg]][weibo] [![QQGroup][qqgroupSvg]][qqgroup]
3636

3737

38-
## [Update Log][update_log.md]
38+
## [Update Log][updateLog.md]
3939

4040

4141

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

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

47-
[apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg
47+
[apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg
4848
[api]: https://android-arsenal.com/api?level=14
4949

50-
[buildsvg]: https://travis-ci.org/Blankj/AndroidUtilCode.svg?branch=master
50+
[buildSvg]: https://travis-ci.org/Blankj/AndroidUtilCode.svg?branch=master
5151
[build]: https://travis-ci.org/Blankj/AndroidUtilCode
5252

53-
[insightsvg]: https://www.insight.io/repoBadge/github.com/Blankj/AndroidUtilCode
53+
[insightSvg]: https://www.insight.io/repoBadge/github.com/Blankj/AndroidUtilCode
5454
[insight]: https://insight.io/github.com/Blankj/AndroidUtilCode
5555

56-
[licensesvg]: https://img.shields.io/badge/License-Apache--2.0-brightgreen.svg
56+
[licenseSvg]: https://img.shields.io/badge/License-Apache--2.0-brightgreen.svg
5757
[license]: https://github.com/Blankj/AndroidUtilCode/blob/master/LICENSE
5858

5959
[readme]: https://github.com/Blankj/AndroidUtilCode
@@ -65,18 +65,18 @@
6565
[subutil]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/README.md
6666
[subutil-cn]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/README-CN.md
6767

68-
[update_log.md]: https://github.com/Blankj/AndroidUtilCode/blob/master/update_log.md
68+
[changeLog.md]: https://github.com/Blankj/AndroidUtilCode/blob/master/CHANGELOG.md
6969

7070
[donate]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/donate.png
7171

72-
[blogsvg]: https://img.shields.io/badge/Blog-@Blankj-34a48e.svg
72+
[blogSvg]: https://img.shields.io/badge/Blog-@Blankj-34a48e.svg
7373
[blog]: http://blankj.com
7474

75-
[jianshusvg]: https://img.shields.io/badge/简书-@Blankj-34a48e.svg
75+
[jianshuSvg]: https://img.shields.io/badge/简书-@Blankj-34a48e.svg
7676
[jianshu]: http://www.jianshu.com/u/46702d5c6978
7777

78-
[weibosvg]: https://img.shields.io/badge/weibo-@__Blankj-34a48e.svg
78+
[weiboSvg]: https://img.shields.io/badge/weibo-@__Blankj-34a48e.svg
7979
[weibo]: http://weibo.com/3076228982
8080

81-
[qqgroupsvg]: https://img.shields.io/badge/QQ群-25206533-34a48e.svg
81+
[qqgroupSvg]: https://img.shields.io/badge/QQ群-25206533-34a48e.svg
8282
[qqgroup]: https://shang.qq.com/wpa/qunwpa?idkey=d906789f84484465e2736f7b524366b4c23afeda38733d5c7b10fc3f6e406e9b

‎README.md‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
![logo][logo]
22

3-
[![auc][aucsvg]][auc] [![api][apisvg]][api] [![build][buildsvg]][build] [![Insight][insightsvg]][insight] [![License][licensesvg]][license]
3+
[![auc][aucSvg]][auc] [![api][apiSvg]][api] [![build][buildSvg]][build] [![Insight][insightSvg]][insight] [![License][licenseSvg]][license]
44

55
## [README of Chinese][readme-cn]
66

@@ -32,7 +32,7 @@ If this project helps you a lot and you want to support the project's developmen
3232

3333
## Contact
3434

35-
[![Blog][blogsvg]][blog] [![jianshu][jianshusvg]][jianshu] [![weibo][weibosvg]][weibo] [![QQGroup][qqgroupsvg]][qqgroup]
35+
[![Blog][blogSvg]][blog] [![jianshu][jianshuSvg]][jianshu] [![weibo][weiboSvg]][weibo] [![QQGroup][qqgroupSvg]][qqgroup]
3636

3737

3838
## [Update Log][update_log.md]
@@ -41,19 +41,19 @@ If this project helps you a lot and you want to support the project's developmen
4141

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

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

47-
[apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg
47+
[apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg
4848
[api]: https://android-arsenal.com/api?level=14
4949

50-
[buildsvg]: https://travis-ci.org/Blankj/AndroidUtilCode.svg?branch=master
50+
[buildSvg]: https://travis-ci.org/Blankj/AndroidUtilCode.svg?branch=master
5151
[build]: https://travis-ci.org/Blankj/AndroidUtilCode
5252

53-
[insightsvg]: https://www.insight.io/repoBadge/github.com/Blankj/AndroidUtilCode
53+
[insightSvg]: https://www.insight.io/repoBadge/github.com/Blankj/AndroidUtilCode
5454
[insight]: https://insight.io/github.com/Blankj/AndroidUtilCode
5555

56-
[licensesvg]: https://img.shields.io/badge/License-Apache--2.0-brightgreen.svg
56+
[licenseSvg]: https://img.shields.io/badge/License-Apache--2.0-brightgreen.svg
5757
[license]: https://github.com/Blankj/AndroidUtilCode/blob/master/LICENSE
5858

5959
[readme]: https://github.com/Blankj/AndroidUtilCode
@@ -65,18 +65,18 @@ If this project helps you a lot and you want to support the project's developmen
6565
[subutil]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/README.md
6666
[subutil-cn]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/README-CN.md
6767

68-
[update_log.md]: https://github.com/Blankj/AndroidUtilCode/blob/master/update_log.md
68+
[changeLog.md]: https://github.com/Blankj/AndroidUtilCode/blob/master/CHANGELOG.md
6969

7070
[donate]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/donate.png
7171

72-
[blogsvg]: https://img.shields.io/badge/Blog-@Blankj-34a48e.svg
72+
[blogSvg]: https://img.shields.io/badge/Blog-@Blankj-34a48e.svg
7373
[blog]: http://blankj.com
7474

75-
[jianshusvg]: https://img.shields.io/badge/简书-@Blankj-34a48e.svg
75+
[jianshuSvg]: https://img.shields.io/badge/简书-@Blankj-34a48e.svg
7676
[jianshu]: http://www.jianshu.com/u/46702d5c6978
7777

78-
[weibosvg]: https://img.shields.io/badge/weibo-@__Blankj-34a48e.svg
78+
[weiboSvg]: https://img.shields.io/badge/weibo-@__Blankj-34a48e.svg
7979
[weibo]: http://weibo.com/3076228982
8080

81-
[qqgroupsvg]: https://img.shields.io/badge/QQ群-25206533-34a48e.svg
81+
[qqgroupSvg]: https://img.shields.io/badge/QQ群-25206533-34a48e.svg
8282
[qqgroup]: https://shang.qq.com/wpa/qunwpa?idkey=d906789f84484465e2736f7b524366b4c23afeda38733d5c7b10fc3f6e406e9b

‎__bus__.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎app/build.gradle‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,20 @@ plugins {
66
}
77
// in config.gradle
88
configAndroidDomain project
9-
configAppDependencies project
9+
10+
dependencies {
11+
implementation fileTree(dir: 'libs', include: ['*.jar'])
12+
implementation project(':utilcode-lib')
13+
implementation project(':subutil-lib')
14+
15+
implementation dep.support.appcompat_v7
16+
implementation dep.support.design
17+
implementation dep.constraint
18+
implementation dep.kotlin
19+
implementation dep.free_proguard
20+
implementation 'com.r0adkll:slidableactivity:2.0.5'
21+
// LeakCanary
22+
debugImplementation dep.leakcanary.android
23+
releaseImplementation dep.leakcanary.android_no_op
24+
// implementation 'com.blankj:utilcode:1.21.2'
25+
}

‎app/src/main/java/com/blankj/androidutilcode/feature/core/adaptScreen/CloseAdaptActivity.kt‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import android.support.v7.app.AppCompatActivity
88
import android.view.WindowManager
99
import com.blankj.androidutilcode.R
1010
import com.blankj.utilcode.util.AdaptScreenUtils
11-
import com.blankj.utilcode.util.LogUtils
1211

1312
class CloseAdaptActivity : AppCompatActivity() {
1413

@@ -26,8 +25,6 @@ class CloseAdaptActivity : AppCompatActivity() {
2625
}
2726

2827
override fun getResources(): Resources {
29-
val resources = super.getResources()
30-
LogUtils.e(resources.displayMetrics)
31-
return AdaptScreenUtils.adaptWidth(resources, 1080, false)
28+
return AdaptScreenUtils.closeAdapt(super.getResources())
3229
}
3330
}

‎app/src/main/java/com/blankj/androidutilcode/feature/core/adaptScreen/HeightActivity.kt‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import android.support.v7.app.AppCompatActivity
99
import android.view.WindowManager
1010
import com.blankj.androidutilcode.R
1111
import com.blankj.utilcode.util.AdaptScreenUtils
12-
import com.blankj.utilcode.util.LogUtils
1312
import kotlinx.android.synthetic.main.activity_adapt_height.*
1413

1514
class HeightActivity : AppCompatActivity() {
@@ -30,8 +29,6 @@ class HeightActivity : AppCompatActivity() {
3029
}
3130

3231
override fun getResources(): Resources {
33-
val resources = super.getResources()
34-
LogUtils.e(resources.displayMetrics)
35-
return AdaptScreenUtils.adaptHeight(resources, 1920)
32+
return AdaptScreenUtils.adaptHeight(super.getResources(), 1920)
3633
}
3734
}

‎app/src/main/java/com/blankj/androidutilcode/feature/core/adaptScreen/WidthActivity.kt‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import android.support.v7.app.AppCompatActivity
99
import android.view.WindowManager
1010
import com.blankj.androidutilcode.R
1111
import com.blankj.utilcode.util.AdaptScreenUtils
12-
import com.blankj.utilcode.util.LogUtils
1312
import kotlinx.android.synthetic.main.activity_adapt_width.*
1413

1514
class WidthActivity : AppCompatActivity() {
@@ -30,8 +29,6 @@ class WidthActivity : AppCompatActivity() {
3029
}
3130

3231
override fun getResources(): Resources {
33-
val resources = super.getResources()
34-
LogUtils.e(resources.displayMetrics)
35-
return AdaptScreenUtils.adaptWidth(resources, 1080)
32+
return AdaptScreenUtils.adaptWidth(super.getResources(), 1080)
3633
}
3734
}

‎art/logo_static_bus.png‎

30.8 KB
Loading

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ allprojects {
4242

4343
task clean(type: Delete) {
4444
delete rootProject.buildDir
45-
}
45+
}

0 commit comments

Comments
 (0)