Skip to content

Commit f154d09

Browse files
BlankjBlankj
committed
see 01/15 log
1 parent bebbaae commit f154d09

File tree

68 files changed

+1912
-2102
lines changed

Some content is hidden

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

68 files changed

+1912
-2102
lines changed

‎launcher/pkg/src/main/java/com/blankj/launcher/pkg/MainActivity.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import android.os.Bundle
55
import android.support.v7.app.ActionBarDrawerToggle
66
import android.view.View
77
import android.widget.ImageView
8-
import com.blankj.launcher.pkg.R
98
import com.blankj.lib.base.BaseDrawerActivity
109
import com.blankj.utilcode.util.ActivityUtils
1110
import com.blankj.utilcode.util.BarUtils
@@ -44,7 +43,7 @@ class MainActivity : BaseDrawerActivity() {
4443
mDrawerRootLayout.addDrawerListener(toggle)
4544
toggle.syncState()
4645

47-
BarUtils.setStatusBarAlpha4Drawer(this, mDrawerRootLayout, launcherMainFakeStatusBar, 0, false)
46+
BarUtils.setStatusBarColor4Drawer(mDrawerRootLayout, launcherMainFakeStatusBar, Color.TRANSPARENT, false)
4847
BarUtils.addMarginTopEqualStatusBarHeight(launcherMainToolbar)
4948

5049
launcherMainCoreUtilBtn.setOnClickListener {

‎lib/base/src/main/java/com/blankj/lib/base/BaseActivity.kt‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import android.os.Bundle
55
import android.support.v7.app.AppCompatActivity
66
import android.view.LayoutInflater
77
import android.view.View
8-
import com.blankj.utilcode.util.AntiShakeUtils
8+
import com.blankj.utilcode.util.*
99

1010
/**
1111
* ```
@@ -27,6 +27,15 @@ abstract class BaseActivity : AppCompatActivity(), IBaseView {
2727
setRootLayout(bindLayout())
2828
initView(savedInstanceState, mContentView)
2929
doBusiness()
30+
AppUtils.registerAppStatusChangedListener(this, object : Utils.OnAppStatusChangedListener {
31+
override fun onForeground() {
32+
ToastUtils.showShort("foreground")
33+
}
34+
35+
override fun onBackground() {
36+
ToastUtils.showShort("background")
37+
}
38+
})
3039
}
3140

3241
override fun setRootLayout(layoutId: Int) {
@@ -40,4 +49,10 @@ abstract class BaseActivity : AppCompatActivity(), IBaseView {
4049
onWidgetClick(view)
4150
}
4251
}
52+
53+
override fun onDestroy() {
54+
super.onDestroy()
55+
AppUtils.unregisterAppStatusChangedListener(this)
56+
KeyboardUtils.fixSoftInputLeaks(this);
57+
}
4358
}

‎lib/base/src/main/java/com/blankj/lib/base/BaseBackActivity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ abstract class BaseBackActivity : BaseActivity() {
2828
setSupportActionBar(baseBackToolbar)
2929
supportActionBar?.setDisplayHomeAsUpEnabled(true)
3030

31-
BarUtils.setStatusBarColor(this, ContextCompat.getColor(Utils.getApp(), R.color.colorPrimary), 0)
32-
BarUtils.addMarginTopEqualStatusBarHeight(backRootLayout)
31+
BarUtils.setStatusBarColor(this, ContextCompat.getColor(Utils.getApp(), R.color.colorPrimary))
32+
BarUtils.addMarginTopEqualStatusBarHeight(baseBackAppBarLayout)
3333
}
3434

3535
override fun onOptionsItemSelected(item: MenuItem): Boolean {

‎lib/base/src/main/res/values/colors.xml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,42 @@
2626
<item>@color/rainbow_blue</item>
2727
<item>@color/rainbow_purple</item>
2828
</integer-array>
29+
30+
31+
<!--beautiful color-->
32+
<color name="grapefruit">#ED5565</color>
33+
<color name="grapefruitDark">#DA4453</color>
34+
35+
<color name="bittersweet">#FC6E51</color>
36+
<color name="bittersweetDark">#E9573F</color>
37+
38+
<color name="sunflower">#FFCE54</color>
39+
<color name="sunflowerDark">#F6BB42</color>
40+
41+
<color name="grass">#A0D468</color>
42+
<color name="grassDark">#8CC152</color>
43+
44+
<color name="mint">#48CFAD</color>
45+
<color name="mintDark">#37BC9B</color>
46+
47+
<color name="aqua">#4FC1E9</color>
48+
<color name="aquaDark">#3BAFDA</color>
49+
50+
<color name="blueJeans">#5D9CEC</color>
51+
<color name="blueJeansDark">#4A89DC</color>
52+
53+
<color name="lavander">#AC92EC</color>
54+
<color name="lavanderDark">#967ADC</color>
55+
56+
<color name="pinkRose">#EC87C0</color>
57+
<color name="pinkRoseDark">#D770AD</color>
58+
59+
<color name="lightGray">#F5F7FA</color>
60+
<color name="lightGrayDark">#E6E9ED</color>
61+
62+
<color name="mediumGray">#CCD1D9</color>
63+
<color name="mediumGrayDark">#AAB2BD</color>
64+
65+
<color name="darkGray">#656D78</color>
66+
<color name="darkGrayDark">#434A54</color>
2967
</resources>

‎utilcode/README-CN.md‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,19 @@ closeIO : 关闭 IO
210210
closeIOQuietly: 安静关闭 IO
211211
```
212212

213+
* ### 颜色相关 -> [ColorUtils.java][color.java]
214+
```
215+
getColor : 获取颜色
216+
setAlphaComponent: 设置颜色透明度值
217+
setRedComponent : 设置颜色红色值
218+
setGreenComponent: 设置颜色绿色值
219+
setBlueComponent : 设置颜色蓝色值
220+
string2Int : 颜色串转颜色值
221+
int2RgbString : 颜色值转 RGB 串
222+
int2ArgbString : 颜色值转 ARGB 串
223+
getRandomColor : 获取随机色
224+
```
225+
213226
* ### 转换相关 -> [ConvertUtils.java][convert.java] -> [Test][convert.test]
214227
```
215228
bytes2Bits, bits2Bytes : bytes 与 bits 互转
@@ -667,8 +680,7 @@ isTablet : 判断是否是平板
667680
```
668681
isSDCardEnableByEnvironment: 根据 Environment 判断 SD 卡是否可用
669682
getSDCardPathByEnvironment : 根据 Environment 获取 SD 卡路径
670-
isSDCardEnable : 判断 SD 卡是否可用
671-
getSDCardPaths : 获取 SD 卡路径
683+
getSDCardInfo : 获取 SD 卡信息
672684
```
673685

674686
* ### 服务相关 -> [ServiceUtils.java][service.java]
@@ -936,6 +948,9 @@ getComments : 获取压缩文件中的注释链表
936948

937949
[close.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/CloseUtils.java
938950

951+
[color.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/ColorUtils.java
952+
[color.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/test/java/com/blankj/utilcode/util/ColorUtilsTest.java
953+
939954
[convert.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/ConvertUtils.java
940955
[convert.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/test/java/com/blankj/utilcode/util/ConvertUtilsTest.java
941956

‎utilcode/README.md‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,19 @@ closeIO
210210
closeIOQuietly
211211
```
212212

213+
* ### About Color -> [ColorUtils.java][color.java]
214+
```
215+
getColor
216+
setAlphaComponent
217+
setRedComponent
218+
setGreenComponent
219+
setBlueComponent
220+
string2Int
221+
int2RgbString
222+
int2ArgbString
223+
getRandomColor
224+
```
225+
213226
* ### About Convert -> [ConvertUtils.java][convert.java] -> [Test][convert.test]
214227
```
215228
bytes2Bits, bits2Bytes
@@ -667,8 +680,7 @@ isTablet
667680
```
668681
isSDCardEnableByEnvironment
669682
getSDCardPathByEnvironment
670-
isSDCardEnable
671-
getSDCardPaths
683+
getSDCardInfo
672684
```
673685

674686
* ### About Service -> [ServiceUtils.java][service.java]
@@ -936,6 +948,9 @@ getComments
936948

937949
[close.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/CloseUtils.java
938950

951+
[color.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/ColorUtils.java
952+
[color.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/test/java/com/blankj/utilcode/util/ColorUtilsTest.java
953+
939954
[convert.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/ConvertUtils.java
940955
[convert.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/test/java/com/blankj/utilcode/util/ConvertUtilsTest.java
941956

0 commit comments

Comments
 (0)