Skip to content

Commit 2e91c46

Browse files
author
Blankj
committed
see 04/27 log
1 parent 59f3367 commit 2e91c46

8 files changed

Lines changed: 99 additions & 43 deletions

File tree

‎.travis.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
language: android
2+
android:
3+
env:
4+
global:
5+
- COMPILE_SDK_VERSION = 25
6+
- BUILD_TOOLS_VERSION = 25.0.2
7+
components:
8+
# The BuildTools version used by your project
9+
- build-tools-$BUILD_TOOLS_VERSION
10+
# The SDK version used to compile your project
11+
- android-$COMPILE_SDK_VERSION
12+
13+
notifications:
14+
email: false

‎README-CN.md‎

Lines changed: 37 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Android开发人员不得不收集的代码([持续更新中][update_log.md])
22

3+
[![auc][aucsvg]][auc] [![build][buildsvg]][build] [![api][apidsvg]][api] [![License][licensesvg]][license]
4+
35
## [README of English][readme.md]
46

57
## API
@@ -465,6 +467,7 @@ Builder.setForegroundColor: 设置前景色
465467
Builder.setBackgroundColor: 设置背景色
466468
Builder.setQuoteColor : 设置引用线的颜色
467469
Builder.setLeadingMargin : 设置缩进
470+
Builder.setMargin : 设置间距
468471
Builder.setBullet : 设置列表标记
469472
Builder.setFontSize : 设置字体尺寸
470473
Builder.setFontProportion : 设置字体比例
@@ -476,7 +479,8 @@ Builder.setSubscript : 设置下标
476479
Builder.setBold : 设置粗体
477480
Builder.setItalic : 设置斜体
478481
Builder.setBoldItalic : 设置粗斜体
479-
Builder.setFontFamily : 设置字体
482+
Builder.setFontFamily : 设置字体系列
483+
Builder.setTypeface : 设置字体
480484
Builder.setAlign : 设置对齐
481485
Builder.setBitmap : 设置图片
482486
Builder.setDrawable : 设置图片
@@ -602,23 +606,27 @@ getEntries : 获取压缩文件中的文件对象
602606

603607
## About
604608

609+
* [![jianshu][jianshusvg]][jianshu] [![weibo][weibosvg]][weibo] [![Blog][blogsvg]][blog] [![QQ0Group][qq0groupsvg]][qq0group] [![QQ1Group][qq1groupsvg]][qq1group]
610+
605611
* 做这份整理是想把它作为Android开发的小字典，当遇到一些琐碎问题时，不用再面向百度或者谷歌查询API的使用，费时费力，这里有的话，大家尽管撸走；同时也希望它能逐日壮大起来，期待大家的Star和完善，当然我也会一直更新发布版本和日志，为了方便大家导入，现已上传jcenter；其中很多代码也是汇四方之精华，谢谢前辈们的提供，当然最终还是要通过单元测试的，如有错误，请及时告之。
606-
* QQ群提供讨论，1群：74721490（已满）2群：25206533，至于验证问题对大家来说肯定都是小case。关于群：[在别人生活里低调地做配角（我和466个程序员的故事）][group]。
607-
* 我的[微博][weibo],求个关注哈。
612+
608613

609614
## Download
610615

611616
Gradle:
612617
``` groovy
613-
compile 'com.blankj:utilcode:1.4.0'
618+
compile 'com.blankj:utilcode:1.4.1'
614619
```
615620

621+
616622
## How to use
617623

618624
```
625+
// init it in the function of onCreate in ur Application
619626
Utils.init(context);
620627
```
621628

629+
622630
## Proguard
623631

624632
```
@@ -627,25 +635,34 @@ Utils.init(context);
627635
-dontwarn com.blankj.utilcode.**
628636
```
629637

630-
## License
631638

632-
```
633-
Copyright 2016 Blankj
634639

635-
Licensed under the Apache License, Version 2.0 (the "License");
636-
you may not use this file except in compliance with the License.
637-
You may obtain a copy of the License at
640+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.4.1-blue.svg
641+
[auc]: https://github.com/Blankj/AndroidUtilCode
638642

639-
http://www.apache.org/licenses/LICENSE-2.0
643+
[buildsvg]: https://travis-ci.org/Blankj/AndroidUtilCode.svg?branch=master
644+
[build]: https://travis-ci.org/Blankj/AndroidUtilCode
640645

641-
Unless required by applicable law or agreed to in writing, software
642-
distributed under the License is distributed on an "AS IS" BASIS,
643-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
644-
See the License for the specific language governing permissions and
645-
limitations under the License.
646-
```
646+
[apisvg]: https://img.shields.io/badge/API-15+-blue.svg
647+
[api]: https://android-arsenal.com/api?level=15
647648

648-
[update_log.md]: https://github.com/Blankj/AndroidUtilCode/blob/master/update_log.md
649+
[jianshusvg]: https://img.shields.io/badge/简书-Blankj-brightgreen.svg
650+
[jianshu]: http://www.jianshu.com/u/46702d5c6978
651+
652+
[weibosvg]: https://img.shields.io/badge/weibo-__Blankj-brightgreen.svg
653+
[weibo]: http://weibo.com/3076228982
654+
655+
[blogsvg]: https://img.shields.io/badge/Blog-Blankj-brightgreen.svg
656+
[blog]: http://blankj.com
657+
658+
[qq0groupsvg]: https://img.shields.io/badge/QQ0群(满)-74721490-fba7f9.svg
659+
[qq0group]: https://shang.qq.com/wpa/qunwpa?idkey=62baf2c3ec6b0863155b0c7a10c71bba2608cb0b6532fc18515835e54c69bdd3
660+
661+
[qq1groupsvg]: https://img.shields.io/badge/QQ1群-25206533-fba7f9.svg
662+
[qq1group]: https://shang.qq.com/wpa/qunwpa?idkey=d906789f84484465e2736f7b524366b4c23afeda38733d5c7b10fc3f6e406e9b
663+
664+
[licensesvg]: https://img.shields.io/badge/License-Apache--2.0-blue.svg
665+
[license]: https://opensource.org/licenses/apache2.0.php
649666

650667
[readme.md]: https://github.com/Blankj/AndroidUtilCode
651668
[readme-cn.md]: https://github.com/Blankj/AndroidUtilCode/blob/master/README-CN.md
@@ -754,5 +771,7 @@ limitations under the License.
754771
[zip.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/ZipUtils.java
755772
[zip.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/ZipUtilsTest.java
756773

774+
[update_log.md]: https://github.com/Blankj/AndroidUtilCode/blob/master/update_log.md
775+
757776
[group]: http://www.jianshu.com/p/8938015df951
758777
[weibo]: http://weibo.com/blankcmj

‎README.md‎

Lines changed: 36 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Android developers should collect the following utils
22

3+
[![auc][aucsvg]][auc] [![build][buildsvg]][build] [![api][apidsvg]][api] [![License][licensesvg]][license]
4+
35
## [README of Chinese][readme-cn.md]
46

57
## API
@@ -465,6 +467,7 @@ Builder.setForegroundColor
465467
Builder.setBackgroundColor
466468
Builder.setQuoteColor
467469
Builder.setLeadingMargin
470+
Builder.setMargin
468471
Builder.setBullet
469472
Builder.setFontSize
470473
Builder.setFontProportion
@@ -477,6 +480,7 @@ Builder.setBold
477480
Builder.setItalic
478481
Builder.setBoldItalic
479482
Builder.setFontFamily
483+
Builder.setTypeface
480484
Builder.setAlign
481485
Builder.setBitmap
482486
Builder.setDrawable
@@ -602,21 +606,27 @@ getEntries
602606

603607
## About
604608

609+
* [![jianshu][jianshusvg]][jianshu] [![weibo][weibosvg]][weibo] [![Blog][blogsvg]][blog] [![QQ0Group][qq0groupsvg]][qq0group] [![QQ1Group][qq1groupsvg]][qq1group]
610+
605611
**I'm so sorry for that the code is annotated with Chinese.**
606612

613+
607614
## Download
608615

609616
Gradle:
610617
``` groovy
611-
compile 'com.blankj:utilcode:1.4.0'
618+
compile 'com.blankj:utilcode:1.4.1'
612619
```
613620

621+
614622
## How to use
615623

616624
```
625+
// init it in the function of onCreate in ur Application
617626
Utils.init(context);
618627
```
619628

629+
620630
## Proguard
621631

622632
```
@@ -625,25 +635,34 @@ Utils.init(context);
625635
-dontwarn com.blankj.utilcode.**
626636
```
627637

628-
## License
629638

630-
```
631-
Copyright 2016 Blankj
632639

633-
Licensed under the Apache License, Version 2.0 (the "License");
634-
you may not use this file except in compliance with the License.
635-
You may obtain a copy of the License at
640+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.4.1-blue.svg
641+
[auc]: https://github.com/Blankj/AndroidUtilCode
636642

637-
http://www.apache.org/licenses/LICENSE-2.0
643+
[buildsvg]: https://travis-ci.org/Blankj/AndroidUtilCode.svg?branch=master
644+
[build]: https://travis-ci.org/Blankj/AndroidUtilCode
638645

639-
Unless required by applicable law or agreed to in writing, software
640-
distributed under the License is distributed on an "AS IS" BASIS,
641-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
642-
See the License for the specific language governing permissions and
643-
limitations under the License.
644-
```
646+
[apisvg]: https://img.shields.io/badge/API-15+-blue.svg
647+
[api]: https://android-arsenal.com/api?level=15
645648

646-
[update_log.md]: https://github.com/Blankj/AndroidUtilCode/blob/master/update_log.md
649+
[jianshusvg]: https://img.shields.io/badge/简书-Blankj-brightgreen.svg
650+
[jianshu]: http://www.jianshu.com/u/46702d5c6978
651+
652+
[weibosvg]: https://img.shields.io/badge/weibo-__Blankj-brightgreen.svg
653+
[weibo]: http://weibo.com/3076228982
654+
655+
[blogsvg]: https://img.shields.io/badge/Blog-Blankj-brightgreen.svg
656+
[blog]: http://blankj.com
657+
658+
[qq0groupsvg]: https://img.shields.io/badge/QQ0群(满)-74721490-fba7f9.svg
659+
[qq0group]: https://shang.qq.com/wpa/qunwpa?idkey=62baf2c3ec6b0863155b0c7a10c71bba2608cb0b6532fc18515835e54c69bdd3
660+
661+
[qq1groupsvg]: https://img.shields.io/badge/QQ1群-25206533-fba7f9.svg
662+
[qq1group]: https://shang.qq.com/wpa/qunwpa?idkey=d906789f84484465e2736f7b524366b4c23afeda38733d5c7b10fc3f6e406e9b
663+
664+
[licensesvg]: https://img.shields.io/badge/License-Apache--2.0-blue.svg
665+
[license]: https://opensource.org/licenses/apache2.0.php
647666

648667
[readme.md]: https://github.com/Blankj/AndroidUtilCode
649668
[readme-cn.md]: https://github.com/Blankj/AndroidUtilCode/blob/master/README-CN.md
@@ -752,5 +771,7 @@ limitations under the License.
752771
[zip.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/ZipUtils.java
753772
[zip.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/ZipUtilsTest.java
754773

774+
[update_log.md]: https://github.com/Blankj/AndroidUtilCode/blob/master/update_log.md
775+
755776
[group]: http://www.jianshu.com/p/8938015df951
756777
[weibo]: http://weibo.com/blankcmj

‎app/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ android {
66

77
defaultConfig {
88
applicationId "com.blankj.androidutilcode"
9-
minSdkVersion 16
9+
minSdkVersion 15
1010
targetSdkVersion 16
11-
versionCode 20
12-
versionName "1.4.0"
11+
versionCode 21
12+
versionName "1.4.1"
1313
}
1414

1515
buildTypes {

‎update_log.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* 17/04/27 添加Travis CI，使用shields，发布1.4.1
12
* 17/04/26 完善HandlerUtils使用Handler.CallBack的回调接口及SpannableStringUtils图片对齐
23
* 17/04/24 fix typos and fix StringUtils.equalsIgnoreCase
34
* 17/04/23 完善README

‎utilcode/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ android {
55
buildToolsVersion "25.0.2"
66

77
defaultConfig {
8-
minSdkVersion 16
9-
versionCode 20
10-
versionName "1.4.0"
8+
minSdkVersion 15
9+
versionCode 21
10+
versionName "1.4.1"
1111
}
1212

1313
buildTypes {
@@ -36,5 +36,5 @@ dependencies {
3636
testCompile "com.google.truth:truth:$TRUTH_VERSION"
3737
testCompile "org.robolectric:robolectric:$ROBOLECTRIC_VERSION"
3838
}
39-
//apply from: "https://raw.githubusercontent.com/xiaopansky/android-library-publish-to-jcenter/master/bintrayUpload.gradle"
39+
apply from: "https://raw.githubusercontent.com/xiaopansky/android-library-publish-to-jcenter/master/bintrayUpload.gradle"
4040
//gradlew bintrayUpload

‎utilcode/src/main/java/com/blankj/utilcode/util/SpannableStringUtils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,9 @@ public Builder setLeadingMargin(int first, int rest) {
229229
}
230230

231231
/**
232-
* 设置边距
232+
* 设置间距
233233
*
234-
* @param margin 边距
234+
* @param margin 间距
235235
* @return {@link Builder}
236236
*/
237237
public Builder setMargin(int margin) {

‎utilcode/src/test/java/com/blankj/utilcode/util/TestUtils.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,10 @@ public void readme2Eng() throws Exception {
3838
File readmeEng = new File(new File(System.getProperty("user.dir")).getAbsolutePath() + FILE_SEP + "README.md");
3939
List<String> list = FileUtils.readFile2List(readmeCN, "UTF-8");
4040
StringBuilder sb = new StringBuilder("# Android developers should collect the following utils" + LINE_SEP + LINE_SEP +
41+
"[![auc][aucsvg]][auc] [![build][buildsvg]][build] [![api][apidsvg]][api] [![License][licensesvg]][license]" + LINE_SEP + LINE_SEP +
4142
"## [README of Chinese][readme-cn.md]" + LINE_SEP + LINE_SEP +
4243
"## API" + LINE_SEP + LINE_SEP);
43-
List<String> lines = list.subList(6, list.size());
44+
List<String> lines = list.subList(8, list.size());
4445
for (String line : lines) {
4546
if (line.contains("* ###")) {
4647
if (line.contains("Utils")) {

0 commit comments

Comments
 (0)