Skip to content

Commit 99d2cf7

Browse files
author
Blankj
committed
see 04/19 log
1 parent 1de559c commit 99d2cf7

61 files changed

Lines changed: 425 additions & 153 deletions

File tree

Some content is hidden

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

‎app/src/main/java/com/blankj/androidutilcode/MainActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import android.graphics.Color;
44
import android.os.Bundle;
5-
import android.support.annotation.NonNull;
5+
import android.support.annotation.Nullable;
66
import android.support.design.widget.CollapsingToolbarLayout;
77
import android.support.v7.app.ActionBarDrawerToggle;
88
import android.support.v7.widget.Toolbar;
@@ -24,7 +24,7 @@
2424
public class MainActivity extends BaseDrawerActivity {
2525

2626
@Override
27-
public void initData(@NonNull Bundle bundle) {
27+
public void initData(@Nullable Bundle bundle) {
2828

2929
}
3030

‎app/src/main/java/com/blankj/androidutilcode/base/BaseActivity.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ protected void onCreate(Bundle savedInstanceState) {
3131
super.onCreate(savedInstanceState);
3232
mActivity = this;
3333
Bundle bundle = getIntent().getExtras();
34-
if (bundle != null) {
35-
initData(bundle);
36-
}
34+
initData(bundle);
3735
setBaseView(bindLayout());
3836
initView(savedInstanceState, mContentView);
3937
doBusiness();

‎app/src/main/java/com/blankj/androidutilcode/base/BaseFragment.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
6666
Log.d(TAG, "onViewCreated: ");
6767
super.onViewCreated(view, savedInstanceState);
6868
Bundle bundle = getArguments();
69-
if (bundle != null) {
70-
initData(bundle);
71-
}
69+
initData(bundle);
7270
}
7371

7472
@Override

‎app/src/main/java/com/blankj/androidutilcode/base/IBaseView.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.blankj.androidutilcode.base;
22

33
import android.os.Bundle;
4-
import android.support.annotation.NonNull;
4+
import android.support.annotation.Nullable;
55
import android.view.View;
66

77
/**
@@ -19,7 +19,7 @@ interface IBaseView extends View.OnClickListener {
1919
*
2020
* @param bundle 传递过来的 bundle
2121
*/
22-
void initData(@NonNull final Bundle bundle);
22+
void initData(@Nullable final Bundle bundle);
2323

2424
/**
2525
* 绑定布局

‎app/src/main/java/com/blankj/androidutilcode/feature/core/CoreUtilActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import android.content.Context;
44
import android.content.Intent;
55
import android.os.Bundle;
6-
import android.support.annotation.NonNull;
6+
import android.support.annotation.Nullable;
77
import android.view.View;
88

99
import com.blankj.androidutilcode.R;
@@ -45,7 +45,7 @@ public static void start(Context context) {
4545
}
4646

4747
@Override
48-
public void initData(@NonNull Bundle bundle) {
48+
public void initData(@Nullable Bundle bundle) {
4949

5050
}
5151

‎app/src/main/java/com/blankj/androidutilcode/feature/core/activity/ActivityActivity.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
import android.graphics.drawable.BitmapDrawable;
77
import android.os.Build;
88
import android.os.Bundle;
9-
import android.support.annotation.NonNull;
9+
import android.support.annotation.Nullable;
1010
import android.support.v4.app.ActivityOptionsCompat;
1111
import android.view.View;
1212
import android.view.Window;
1313
import android.widget.ImageView;
1414
import android.widget.TextView;
1515

1616
import com.blankj.androidutilcode.Config;
17+
import com.blankj.androidutilcode.MainActivity;
1718
import com.blankj.androidutilcode.R;
1819
import com.blankj.androidutilcode.base.BaseBackActivity;
1920
import com.blankj.androidutilcode.feature.core.CoreUtilActivity;
20-
import com.blankj.androidutilcode.MainActivity;
2121
import com.blankj.utilcode.util.ActivityUtils;
2222
import com.blankj.utilcode.util.LogUtils;
2323
import com.blankj.utilcode.util.SpanUtils;
@@ -46,7 +46,7 @@ public static void start(Context context) {
4646
}
4747

4848
@Override
49-
public void initData(@NonNull Bundle bundle) {
49+
public void initData(@Nullable Bundle bundle) {
5050

5151
}
5252

‎app/src/main/java/com/blankj/androidutilcode/feature/core/activity/SubActivityActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import android.graphics.Color;
44
import android.os.Build;
55
import android.os.Bundle;
6-
import android.support.annotation.NonNull;
6+
import android.support.annotation.Nullable;
77
import android.support.v4.app.ActivityCompat;
88
import android.view.View;
99
import android.view.Window;
@@ -26,7 +26,7 @@ public class SubActivityActivity extends BaseBackActivity {
2626
Random random = new Random();
2727

2828
@Override
29-
public void initData(@NonNull Bundle bundle) {
29+
public void initData(@Nullable Bundle bundle) {
3030

3131
}
3232

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import android.content.Context;
44
import android.content.Intent;
55
import android.os.Bundle;
6-
import android.support.annotation.NonNull;
6+
import android.support.annotation.Nullable;
77
import android.view.View;
88
import android.widget.TextView;
99

@@ -33,7 +33,7 @@ public static void start(Context context) {
3333
}
3434

3535
@Override
36-
public void initData(@NonNull Bundle bundle) {
36+
public void initData(@Nullable Bundle bundle) {
3737

3838
}
3939

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import android.content.Context;
44
import android.content.Intent;
55
import android.os.Bundle;
6-
import android.support.annotation.NonNull;
6+
import android.support.annotation.Nullable;
77
import android.view.View;
88
import android.widget.TextView;
99

@@ -28,7 +28,7 @@ public static void start(Context context) {
2828
}
2929

3030
@Override
31-
public void initData(@NonNull Bundle bundle) {
31+
public void initData(@Nullable Bundle bundle) {
3232

3333
}
3434

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

Lines changed: 41 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22

33
import android.content.Context;
44
import android.content.Intent;
5+
import android.graphics.Color;
6+
import android.os.Build;
57
import android.os.Bundle;
6-
import android.support.annotation.NonNull;
8+
import android.support.annotation.Nullable;
9+
import android.support.annotation.RequiresApi;
710
import android.support.v4.content.ContextCompat;
811
import android.view.View;
912
import android.widget.TextView;
@@ -14,6 +17,8 @@
1417
import com.blankj.utilcode.util.BarUtils;
1518
import com.blankj.utilcode.util.SpanUtils;
1619

20+
import java.util.Random;
21+
1722
/**
1823
* <pre>
1924
* author: Blankj
@@ -24,6 +29,8 @@
2429
*/
2530
public class BarNavActivity extends BaseBackActivity {
2631

32+
private Random random = new Random();
33+
2734
private TextView tvAboutNav;
2835

2936
public static void start(Context context) {
@@ -32,7 +39,7 @@ public static void start(Context context) {
3239
}
3340

3441
@Override
35-
public void initData(@NonNull Bundle bundle) {
42+
public void initData(@Nullable Bundle bundle) {
3643

3744
}
3845

@@ -44,12 +51,14 @@ public int bindLayout() {
4451

4552
@Override
4653
public void initView(Bundle savedInstanceState, View contentView) {
54+
rootLayout.setBackgroundColor(Color.GRAY);
4755
getToolBar().setTitle(getString(R.string.demo_bar));
4856

4957
tvAboutNav = findViewById(R.id.tv_about_nav);
50-
findViewById(R.id.btn_show_nav).setOnClickListener(this);
51-
findViewById(R.id.btn_hide_nav).setOnClickListener(this);
52-
findViewById(R.id.btn_immersive_nav).setOnClickListener(this);
58+
findViewById(R.id.btn_nav_show).setOnClickListener(this);
59+
findViewById(R.id.btn_nav_hide).setOnClickListener(this);
60+
findViewById(R.id.btn_nav_immersive).setOnClickListener(this);
61+
findViewById(R.id.btn_nav_set_color).setOnClickListener(this);
5362
updateAboutNav();
5463
}
5564

@@ -61,32 +70,49 @@ public void doBusiness() {
6170
@Override
6271
public void onWidgetClick(View view) {
6372
switch (view.getId()) {
64-
case R.id.btn_show_nav:
73+
case R.id.btn_nav_show:
6574
BarUtils.setNavBarVisibility(this, true);
6675
BarUtils.setStatusBarColor(this, ContextCompat.getColor(UtilsApp.getInstance(), R.color.colorPrimary), 0);
6776
BarUtils.addMarginTopEqualStatusBarHeight(rootLayout);
6877
break;
69-
case R.id.btn_hide_nav:
78+
case R.id.btn_nav_hide:
7079
BarUtils.setNavBarVisibility(this, false);
7180
break;
72-
case R.id.btn_immersive_nav:
73-
BarUtils.setNavBarImmersive(this);
81+
case R.id.btn_nav_immersive:
82+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
83+
BarUtils.setNavBarImmersive(this);
84+
}
85+
break;
86+
case R.id.btn_nav_set_color:
87+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
88+
BarUtils.setNavBarColor(this, Color.rgb(random.nextInt(256), random.nextInt(256), random.nextInt(256)));
89+
}
7490
break;
7591
}
7692
updateAboutNav();
7793
}
7894

7995
private void updateAboutNav() {
80-
tvAboutNav.setText(new SpanUtils()
81-
.appendLine("navHeight: " + BarUtils.getNavBarHeight())
82-
.append("isNavBarVisible: " + BarUtils.isNavBarVisible(this))
83-
.create()
84-
);
96+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
97+
tvAboutNav.setText(new SpanUtils()
98+
.appendLine("navHeight: " + BarUtils.getNavBarHeight())
99+
.appendLine("isNavBarVisible: " + BarUtils.isNavBarVisible(this))
100+
.append("getNavBarColor: #" + Integer.toHexString(BarUtils.getNavBarColor(this)))
101+
.create()
102+
);
103+
} else {
104+
tvAboutNav.setText(new SpanUtils()
105+
.appendLine("navHeight: " + BarUtils.getNavBarHeight())
106+
.appendLine("isNavBarVisible: " + BarUtils.isNavBarVisible(this))
107+
.create()
108+
);
109+
}
85110
}
86111

112+
@RequiresApi(api = Build.VERSION_CODES.KITKAT)
87113
@Override
88114
public void onWindowFocusChanged(boolean hasFocus) {
89115
super.onWindowFocusChanged(hasFocus);
90-
BarUtils.setNavBarVisibility(this, false);
116+
BarUtils.setNavBarImmersive(this);
91117
}
92118
}

0 commit comments

Comments
 (0)