Skip to content

Commit 12070e6

Browse files
BlankjBlankj
committed
see 12/28 log
1 parent 5663ef5 commit 12070e6

File tree

74 files changed

+1928
-791
lines changed

Some content is hidden

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

74 files changed

+1928
-791
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.12-brightgreen.svg
44+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.10.0-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.12-brightgreen.svg
44+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.10.0-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
@@ -67,7 +67,7 @@ dependencies {
6767
debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version"
6868
releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version"
6969

70-
// implementation 'com.blankj:utilcode:1.9.11'
70+
// implementation 'com.blankj:utilcode:1.10.0'
7171
}
7272

7373

‎app/src/main/AndroidManifest.xml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.blankj.androidutilcode">
44

5-
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
5+
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
66

77
<!--bar-->
88
<uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
@@ -16,6 +16,7 @@
1616
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
1717
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
1818
<uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
19+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
1920
<uses-permission android:name="android.permission.INTERNET" />
2021

2122
<!--phone-->
@@ -27,10 +28,10 @@
2728
<!--发送短信-->
2829
<uses-permission android:name="android.permission.SEND_SMS" />
2930
<!--获取手机联系人-->
30-
<!--<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>-->
31+
<!--<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />-->
3132
<uses-permission android:name="android.permission.READ_CONTACTS" />
3233
<!--获取短信-->
33-
<!--<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>-->
34+
<!--<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />-->
3435
<uses-permission android:name="android.permission.READ_SMS" />
3536

3637
<!--process-->
@@ -83,6 +84,12 @@
8384
<activity
8485
android:name=".core.bar.BarActivity"
8586
android:launchMode="singleTop" />
87+
<activity
88+
android:name=".core.bar.BarStatusActivity"
89+
android:launchMode="singleTop" />
90+
<activity
91+
android:name=".core.bar.BarNotificationActivity"
92+
android:launchMode="singleTop" />
8693
<activity
8794
android:name=".core.bar.BarNavActivity"
8895
android:launchMode="singleTop" />
@@ -126,7 +133,7 @@
126133
<activity
127134
android:name=".core.network.NetworkActivity"
128135
android:launchMode="singleTop" />
129-
<!--<activity android:name=".activities.PermissionActivity"/>-->
136+
<!--<activity android:name=".activities.PermissionActivity" />-->
130137
<activity
131138
android:name=".core.phone.PhoneActivity"
132139
android:launchMode="singleTop" />

‎app/src/main/java/com/blankj/androidutilcode/core/app/AppActivity.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.blankj.androidutilcode.R;
1111
import com.blankj.androidutilcode.base.BaseBackActivity;
1212
import com.blankj.utilcode.util.AppUtils;
13-
import com.blankj.utilcode.util.LogUtils;
1413
import com.blankj.utilcode.util.SpanUtils;
1514
import com.blankj.utilcode.util.ToastUtils;
1615

@@ -122,10 +121,4 @@ public void run() {
122121
break;
123122
}
124123
}
125-
126-
@Override
127-
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
128-
super.onActivityResult(requestCode, resultCode, data);
129-
LogUtils.d(requestCode, resultCode);
130-
}
131124
}

‎app/src/main/java/com/blankj/androidutilcode/core/bar/BarActivity.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import android.content.Intent;
55
import android.os.Bundle;
66
import android.view.View;
7+
import android.widget.TextView;
78

89
import com.blankj.androidutilcode.R;
910
import com.blankj.androidutilcode.base.BaseBackActivity;
@@ -18,6 +19,8 @@
1819
*/
1920
public class BarActivity extends BaseBackActivity {
2021

22+
private TextView tvAboutStatus;
23+
2124
public static void start(Context context) {
2225
Intent starter = new Intent(context, BarActivity.class);
2326
context.startActivity(starter);
@@ -37,12 +40,15 @@ public int bindLayout() {
3740
public void initView(Bundle savedInstanceState, View view) {
3841
getToolBar().setTitle(getString(R.string.demo_bar));
3942

43+
tvAboutStatus = findViewById(R.id.tv_about_status);
44+
findViewById(R.id.btn_status_bar).setOnClickListener(this);
4045
findViewById(R.id.btn_status_bar_color).setOnClickListener(this);
4146
findViewById(R.id.btn_status_bar_alpha).setOnClickListener(this);
4247
findViewById(R.id.btn_status_bar_image_view).setOnClickListener(this);
4348
findViewById(R.id.btn_status_bar_fragment).setOnClickListener(this);
4449
findViewById(R.id.btn_status_bar_swipe_back).setOnClickListener(this);
4550
findViewById(R.id.btn_status_bar_drawer).setOnClickListener(this);
51+
findViewById(R.id.btn_notification_bar).setOnClickListener(this);
4652
findViewById(R.id.btn_nav_bar).setOnClickListener(this);
4753
}
4854

@@ -54,6 +60,9 @@ public void doBusiness() {
5460
@Override
5561
public void onWidgetClick(View view) {
5662
switch (view.getId()) {
63+
case R.id.btn_status_bar:
64+
BarStatusActivity.start(this);
65+
break;
5766
case R.id.btn_status_bar_color:
5867
BarStatusColorActivity.start(this);
5968
break;
@@ -72,6 +81,9 @@ public void onWidgetClick(View view) {
7281
case R.id.btn_status_bar_drawer:
7382
BarStatusDrawerActivity.start(this);
7483
break;
84+
case R.id.btn_notification_bar:
85+
BarNotificationActivity.start(this);
86+
break;
7587
case R.id.btn_nav_bar:
7688
BarNavActivity.start(this);
7789
break;

‎app/src/main/java/com/blankj/androidutilcode/core/bar/BarNavActivity.java

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
import android.content.Context;
44
import android.content.Intent;
55
import android.os.Bundle;
6+
import android.support.v4.content.ContextCompat;
67
import android.view.View;
78
import android.widget.TextView;
89

910
import com.blankj.androidutilcode.R;
11+
import com.blankj.androidutilcode.UtilsApp;
1012
import com.blankj.androidutilcode.base.BaseBackActivity;
1113
import com.blankj.utilcode.util.BarUtils;
1214

@@ -43,7 +45,10 @@ public void initView(Bundle savedInstanceState, View view) {
4345
getToolBar().setTitle(getString(R.string.demo_bar));
4446

4547
tvAboutNav = findViewById(R.id.tv_about_nav);
46-
tvAboutNav.setText("navHeight: " + BarUtils.getNavBarHeight());
48+
findViewById(R.id.btn_show_nav).setOnClickListener(this);
49+
findViewById(R.id.btn_hide_nav).setOnClickListener(this);
50+
findViewById(R.id.btn_immersive_nav).setOnClickListener(this);
51+
updateAboutNav();
4752
}
4853

4954
@Override
@@ -53,12 +58,24 @@ public void doBusiness() {
5358

5459
@Override
5560
public void onWidgetClick(View view) {
56-
61+
switch (view.getId()) {
62+
case R.id.btn_show_nav:
63+
BarUtils.setNavBarVisibility(this, true);
64+
BarUtils.setStatusBarColor(this, ContextCompat.getColor(UtilsApp.getInstance(), R.color.colorPrimary), 0);
65+
BarUtils.addMarginTopEqualStatusBarHeight(rootLayout);
66+
break;
67+
case R.id.btn_hide_nav:
68+
BarUtils.setNavBarVisibility(this, false);
69+
break;
70+
case R.id.btn_immersive_nav:
71+
BarUtils.setNavBarImmersive(this);
72+
break;
73+
}
74+
updateAboutNav();
5775
}
5876

59-
@Override
60-
public void onWindowFocusChanged(boolean hasFocus) {
61-
super.onWindowFocusChanged(hasFocus);
62-
BarUtils.hideNavBar(this);
77+
private void updateAboutNav() {
78+
tvAboutNav.setText("navHeight: " + BarUtils.getNavBarHeight()
79+
+ "\nisNavBarVisible: " + BarUtils.isNavBarVisible(this));
6380
}
6481
}

‎app/src/main/java/com/blankj/androidutilcode/core/bar/BarNotificationActivity.java

Lines changed: 20 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
import android.content.Context;
44
import android.content.Intent;
55
import android.os.Bundle;
6-
import android.support.v4.content.ContextCompat;
6+
import android.os.Handler;
77
import android.view.View;
8-
import android.widget.TextView;
98

109
import com.blankj.androidutilcode.R;
11-
import com.blankj.androidutilcode.UtilsApp;
1210
import com.blankj.androidutilcode.base.BaseBackActivity;
1311
import com.blankj.utilcode.util.BarUtils;
1412

@@ -20,12 +18,12 @@
2018
* desc : Activity 工具类 Demo
2119
* </pre>
2220
*/
23-
public class BarNavActivity extends BaseBackActivity {
21+
public class BarNotificationActivity extends BaseBackActivity {
2422

25-
private TextView tvAboutNav;
23+
private Handler mHandler = new Handler();
2624

2725
public static void start(Context context) {
28-
Intent starter = new Intent(context, BarNavActivity.class);
26+
Intent starter = new Intent(context, BarNotificationActivity.class);
2927
context.startActivity(starter);
3028
}
3129

@@ -36,32 +34,15 @@ public void initData(Bundle bundle) {
3634

3735
@Override
3836
public int bindLayout() {
39-
return R.layout.activity_bar_nav;
37+
return R.layout.activity_bar_notification;
4038
}
4139

4240

4341
@Override
4442
public void initView(Bundle savedInstanceState, View view) {
4543
getToolBar().setTitle(getString(R.string.demo_bar));
4644

47-
tvAboutNav = findViewById(R.id.tv_about_nav);
48-
findViewById(R.id.btn_show_nav).setOnClickListener(this);
49-
findViewById(R.id.btn_hide_nav).setOnClickListener(this);
50-
51-
BarUtils.setNavBarVisible(this, false);
52-
updateAboutNav(false);
53-
54-
BarUtils.registerNavBarChangedListener(this, new BarUtils.OnNavBarChangedListener() {
55-
@Override
56-
public void onNavBarChanged(boolean isVisible) {
57-
updateAboutNav(isVisible);
58-
}
59-
});
60-
}
61-
62-
private void updateAboutNav(boolean isNavBarVisible) {
63-
tvAboutNav.setText("navHeight: " + BarUtils.getNavBarHeight()
64-
+ "\nisNavBarVisible: " + isNavBarVisible);
45+
findViewById(R.id.btn_show_notification).setOnClickListener(this);
6546
}
6647

6748
@Override
@@ -72,14 +53,21 @@ public void doBusiness() {
7253
@Override
7354
public void onWidgetClick(View view) {
7455
switch (view.getId()) {
75-
case R.id.btn_show_nav:
76-
BarUtils.setNavBarVisible(this, true);
77-
BarUtils.setStatusBarColor(this, ContextCompat.getColor(UtilsApp.getInstance(), R.color.colorPrimary), 0);
78-
BarUtils.addMarginTopEqualStatusBarHeight(rootLayout);
79-
break;
80-
case R.id.btn_hide_nav:
81-
BarUtils.setNavBarVisible(this, false);
56+
case R.id.btn_show_notification:
57+
BarUtils.setNotificationBarVisibility(true);
58+
mHandler.postDelayed(new Runnable() {
59+
@Override
60+
public void run() {
61+
BarUtils.setNotificationBarVisibility(false);
62+
}
63+
}, 2000);
8264
break;
8365
}
8466
}
67+
68+
@Override
69+
protected void onDestroy() {
70+
super.onDestroy();
71+
mHandler.removeCallbacksAndMessages(null);
72+
}
8573
}

‎app/src/main/java/com/blankj/androidutilcode/core/bar/BarStatusActivity.java

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import com.blankj.androidutilcode.R;
1010
import com.blankj.androidutilcode.base.BaseBackActivity;
1111
import com.blankj.utilcode.util.BarUtils;
12-
import com.blankj.utilcode.util.LogUtils;
1312

1413
/**
1514
* <pre>
@@ -46,20 +45,7 @@ public void initView(Bundle savedInstanceState, View view) {
4645
tvAboutStatus = findViewById(R.id.tv_about_status);
4746
findViewById(R.id.btn_show_status).setOnClickListener(this);
4847
findViewById(R.id.btn_hide_status).setOnClickListener(this);
49-
50-
tvAboutStatus.setText("statusHeight: " + BarUtils.getStatusBarHeight()
51-
+ "\nisStatusVisible: " + BarUtils.isStatusBarVisible(this));
52-
53-
BarUtils.registerNavBarChangedListener(this, new BarUtils.OnNavBarChangedListener() {
54-
@Override
55-
public void onNavBarChanged(boolean isVisible) {
56-
LogUtils.d(isVisible);
57-
}
58-
});
59-
}
60-
61-
private void updateAboutNav(boolean isNavBarVisible) {
62-
48+
updateAboutStatus();
6349
}
6450

6551
@Override
@@ -71,12 +57,16 @@ public void doBusiness() {
7157
public void onWidgetClick(View view) {
7258
switch (view.getId()) {
7359
case R.id.btn_show_status:
74-
BarUtils.showStatusBar(this);
60+
BarUtils.setStatusBarVisibility(this, true);
7561
break;
7662
case R.id.btn_hide_status:
77-
BarUtils.hideStatusBar(this);
63+
BarUtils.setStatusBarVisibility(this, false);
7864
break;
7965
}
66+
updateAboutStatus();
67+
}
68+
69+
private void updateAboutStatus() {
8070
tvAboutStatus.setText("statusHeight: " + BarUtils.getStatusBarHeight()
8171
+ "\nisStatusVisible: " + BarUtils.isStatusBarVisible(this));
8272
}

0 commit comments

Comments
 (0)