Skip to content

Commit b33b10f

Browse files
BlankjBlankj
committed
see 04/04 log
1 parent 87a39a6 commit b33b10f

Some content is hidden

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

47 files changed

+114
-104
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public int bindLayout() {
3333
}
3434

3535
@Override
36-
public void initView(Bundle savedInstanceState, View view) {
36+
public void initView(Bundle savedInstanceState, View contentView) {
3737
Toolbar toolbar = findViewById(R.id.toolbar);
3838
View fakeStatusBar = findViewById(R.id.fake_status_bar);
3939
CollapsingToolbarLayout ctl = findViewById(R.id.ctl);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.blankj.androidutilcode.base;
22

3+
import android.app.Activity;
34
import android.os.Bundle;
45
import android.support.annotation.LayoutRes;
56
import android.support.v7.app.AppCompatActivity;
@@ -26,7 +27,7 @@ public abstract class BaseActivity extends AppCompatActivity
2627
*/
2728
private long lastClick = 0;
2829

29-
protected BaseActivity mActivity;
30+
protected Activity mActivity;
3031

3132
@Override
3233
protected void onCreate(Bundle savedInstanceState) {
@@ -40,6 +41,7 @@ protected void onCreate(Bundle savedInstanceState) {
4041
}
4142

4243
protected void setBaseView(@LayoutRes int layoutId) {
44+
if (layoutId <= 0) return;
4345
setContentView(contentView = LayoutInflater.from(this).inflate(layoutId, null));
4446
}
4547

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

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

3+
import android.app.Activity;
34
import android.os.Bundle;
5+
import android.support.annotation.IdRes;
46
import android.support.annotation.Nullable;
57
import android.support.v4.app.Fragment;
68
import android.support.v4.app.FragmentTransaction;
@@ -23,8 +25,8 @@ public abstract class BaseFragment extends Fragment
2325
private static final String TAG = "BaseFragment";
2426
private static final String STATE_SAVE_IS_HIDDEN = "STATE_SAVE_IS_HIDDEN";
2527

26-
protected View contentView;
27-
protected BaseActivity mActivity;
28+
protected View contentView;
29+
protected Activity mActivity;
2830

2931
private long lastClick = 0;
3032

@@ -104,4 +106,9 @@ private boolean isFastClick() {
104106
public void onClick(View view) {
105107
if (!isFastClick()) onWidgetClick(view);
106108
}
109+
110+
public <T extends View> T findViewById(@IdRes int id) {
111+
if (contentView == null) throw new NullPointerException("ContentView is null.");
112+
return contentView.findViewById(id);
113+
}
107114
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ interface IBaseView extends View.OnClickListener {
3030
/**
3131
* 初始化 view
3232
*/
33-
void initView(final Bundle savedInstanceState, final View view);
33+
void initView(final Bundle savedInstanceState, final View contentView);
3434

3535
/**
3636
* 业务操作

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public int bindLayout() {
5454
}
5555

5656
@Override
57-
public void initView(Bundle savedInstanceState, View view) {
57+
public void initView(Bundle savedInstanceState, View contentView) {
5858
getToolBar().setTitle(getString(R.string.core_util));
5959
}
6060

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public int bindLayout() {
5959

6060

6161
@Override
62-
public void initView(Bundle savedInstanceState, View view) {
62+
public void initView(Bundle savedInstanceState, View contentView) {
6363
getToolBar().setTitle(getString(R.string.demo_activity));
6464
viewSharedElement = findViewById(R.id.view_shared_element);
6565
findViewById(R.id.btn_clz).setOnClickListener(this);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public int bindLayout() {
3838
}
3939

4040
@Override
41-
public void initView(Bundle savedInstanceState, View view) {
41+
public void initView(Bundle savedInstanceState, View contentView) {
4242
((View)flActivityContainer.getParent()).setBackgroundColor(Color.rgb(random.nextInt(256), random.nextInt(256), random.nextInt(256)));
4343
}
4444

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public int bindLayout() {
4242
}
4343

4444
@Override
45-
public void initView(Bundle savedInstanceState, View view) {
45+
public void initView(Bundle savedInstanceState, View contentView) {
4646
getToolBar().setTitle(getString(R.string.demo_app));
4747

4848
findViewById(R.id.btn_install_app).setOnClickListener(this);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public int bindLayout() {
3737
}
3838

3939
@Override
40-
public void initView(Bundle savedInstanceState, View view) {
40+
public void initView(Bundle savedInstanceState, View contentView) {
4141
getToolBar().setTitle(getString(R.string.demo_bar));
4242

4343
tvAboutStatus = findViewById(R.id.tv_about_status);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public int bindLayout() {
4242

4343

4444
@Override
45-
public void initView(Bundle savedInstanceState, View view) {
45+
public void initView(Bundle savedInstanceState, View contentView) {
4646
getToolBar().setTitle(getString(R.string.demo_bar));
4747

4848
tvAboutNav = findViewById(R.id.tv_about_nav);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public int bindLayout() {
3939

4040

4141
@Override
42-
public void initView(Bundle savedInstanceState, View view) {
42+
public void initView(Bundle savedInstanceState, View contentView) {
4343
getToolBar().setTitle(getString(R.string.demo_bar));
4444

4545
findViewById(R.id.btn_show_notification).setOnClickListener(this);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public int bindLayout() {
4040

4141

4242
@Override
43-
public void initView(Bundle savedInstanceState, View view) {
43+
public void initView(Bundle savedInstanceState, View contentView) {
4444
getToolBar().setTitle(getString(R.string.demo_bar));
4545

4646
tvAboutStatus = findViewById(R.id.tv_about_status);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public int bindLayout() {
4242
}
4343

4444
@Override
45-
public void initView(Bundle savedInstanceState, View view) {
45+
public void initView(Bundle savedInstanceState, View contentView) {
4646
findViewById(R.id.btn_set_transparent).setOnClickListener(this);
4747
mTvStatusAlpha = findViewById(R.id.tv_status_alpha);
4848
sbChangeAlpha = findViewById(R.id.sb_change_alpha);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ public int bindLayout() {
4242
}
4343

4444
@Override
45-
public void initView(Bundle savedInstanceState, View view) {
46-
fakeStatusBar = view.findViewById(R.id.fake_status_bar);
47-
mTvStatusAlpha = view.findViewById(R.id.tv_status_alpha);
48-
sbChangeAlpha = view.findViewById(R.id.sb_change_alpha);
49-
view.findViewById(R.id.btn_set_transparent).setOnClickListener(this);
45+
public void initView(Bundle savedInstanceState, View contentView) {
46+
fakeStatusBar = findViewById(R.id.fake_status_bar);
47+
mTvStatusAlpha = findViewById(R.id.tv_status_alpha);
48+
sbChangeAlpha = findViewById(R.id.sb_change_alpha);
49+
findViewById(R.id.btn_set_transparent).setOnClickListener(this);
5050
sbChangeAlpha.setOnSeekBarChangeListener(translucentListener);
5151
mTvStatusAlpha.setText(String.valueOf(mAlpha));
5252

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public int bindLayout() {
5151
}
5252

5353
@Override
54-
public void initView(Bundle savedInstanceState, View view) {
54+
public void initView(Bundle savedInstanceState, View contentView) {
5555
findViewById(R.id.btn_random_color).setOnClickListener(this);
5656
findViewById(R.id.btn_set_transparent).setOnClickListener(this);
5757
mTvStatusAlpha = findViewById(R.id.tv_status_alpha);

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ public int bindLayout() {
4949
}
5050

5151
@Override
52-
public void initView(Bundle savedInstanceState, View view) {
53-
fakeStatusBar = view.findViewById(R.id.fake_status_bar);
54-
view.findViewById(R.id.btn_random_color).setOnClickListener(this);
55-
view.findViewById(R.id.btn_set_transparent).setOnClickListener(this);
56-
mTvStatusAlpha = (TextView) view.findViewById(R.id.tv_status_alpha);
57-
sbChangeAlpha = (SeekBar) view.findViewById(R.id.sb_change_alpha);
52+
public void initView(Bundle savedInstanceState, View contentView) {
53+
fakeStatusBar = findViewById(R.id.fake_status_bar);
54+
findViewById(R.id.btn_random_color).setOnClickListener(this);
55+
findViewById(R.id.btn_set_transparent).setOnClickListener(this);
56+
mTvStatusAlpha = findViewById(R.id.tv_status_alpha);
57+
sbChangeAlpha = findViewById(R.id.sb_change_alpha);
5858
sbChangeAlpha.setOnSeekBarChangeListener(colorListener);
5959
mTvStatusAlpha.setText(String.valueOf(mAlpha));
6060

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public int bindLayout() {
5959
}
6060

6161
@Override
62-
public void initView(Bundle savedInstanceState, View view) {
62+
public void initView(Bundle savedInstanceState, View contentView) {
6363
fakeStatusBar = findViewById(R.id.fake_status_bar);
6464
cbAlpha = findViewById(R.id.cb_alpha);
6565
cbFront = findViewById(R.id.cb_front);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public int bindLayout() {
5757
}
5858

5959
@Override
60-
public void initView(Bundle savedInstanceState, View view) {
60+
public void initView(Bundle savedInstanceState, View contentView) {
6161
mVpStatusBar = findViewById(R.id.vp_status_bar);
6262
navigation = findViewById(R.id.navigation_status_bar);
6363

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public int bindLayout() {
4242
}
4343

4444
@Override
45-
public void initView(Bundle savedInstanceState, View view) {
45+
public void initView(Bundle savedInstanceState, View contentView) {
4646
findViewById(R.id.btn_set_transparent).setOnClickListener(this);
4747
mTvStatusAlpha = findViewById(R.id.tv_status_alpha);
4848
sbChangeAlpha = findViewById(R.id.sb_change_alpha);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ public int bindLayout() {
4141
}
4242

4343
@Override
44-
public void initView(Bundle savedInstanceState, View view) {
45-
fakeStatusBar = view.findViewById(R.id.fake_status_bar);
46-
mTvStatusAlpha = (TextView) view.findViewById(R.id.tv_status_alpha);
47-
sbChangeAlpha = (SeekBar) view.findViewById(R.id.sb_change_alpha);
48-
view.findViewById(R.id.btn_set_transparent).setOnClickListener(this);
44+
public void initView(Bundle savedInstanceState, View contentView) {
45+
fakeStatusBar = findViewById(R.id.fake_status_bar);
46+
mTvStatusAlpha = findViewById(R.id.tv_status_alpha);
47+
sbChangeAlpha = findViewById(R.id.sb_change_alpha);
48+
findViewById(R.id.btn_set_transparent).setOnClickListener(this);
4949
sbChangeAlpha.setOnSeekBarChangeListener(translucentListener);
5050
mTvStatusAlpha.setText(String.valueOf(mAlpha));
5151

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public int bindLayout() {
6060
}
6161

6262
@Override
63-
public void initView(Bundle savedInstanceState, View view) {
63+
public void initView(Bundle savedInstanceState, View contentView) {
6464
Slidr.attach(this);
6565

6666
llContainer = findViewById(R.id.ll_container);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public int bindLayout() {
4646
}
4747

4848
@Override
49-
public void initView(Bundle savedInstanceState, View view) {
49+
public void initView(Bundle savedInstanceState, View contentView) {
5050
getToolBar().setTitle(getString(R.string.demo_clean));
5151

5252
snackBarRootView = findViewById(android.R.id.content);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public int bindLayout() {
3737
}
3838

3939
@Override
40-
public void initView(Bundle savedInstanceState, View view) {
40+
public void initView(Bundle savedInstanceState, View contentView) {
4141
getToolBar().setTitle(getString(R.string.demo_device));
4242

4343
findViewById(R.id.btn_shutdown).setOnClickListener(this);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ public int bindLayout() {
4343
}
4444

4545
@Override
46-
public void initView(Bundle savedInstanceState, View view) {
46+
public void initView(Bundle savedInstanceState, View contentView) {
4747
Random random = new Random();
4848
FragmentUtils.setBackgroundColor(this, Color.rgb(random.nextInt(256), random.nextInt(256), random.nextInt(256)));
49-
view.findViewById(R.id.btn_show_about_fragment).setOnClickListener(this);
50-
view.findViewById(R.id.btn_pop).setOnClickListener(this);
51-
tvAboutFragment = (TextView) view.findViewById(R.id.tv_about_fragment);
49+
findViewById(R.id.btn_show_about_fragment).setOnClickListener(this);
50+
findViewById(R.id.btn_pop).setOnClickListener(this);
51+
tvAboutFragment = findViewById(R.id.tv_about_fragment);
5252
}
5353

5454
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public int bindLayout() {
5050
}
5151

5252
@Override
53-
public void initView(Bundle savedInstanceState, View view) {
53+
public void initView(Bundle savedInstanceState, View contentView) {
5454
if (savedInstanceState != null) {
5555
curIndex = savedInstanceState.getInt("curIndex");
5656
}

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,22 @@ public int bindLayout() {
4747
}
4848

4949
@Override
50-
public void initView(Bundle savedInstanceState, View view) {
50+
public void initView(Bundle savedInstanceState, View contentView) {
5151
Random random = new Random();
5252
FragmentUtils.setBackgroundColor(this, Color.rgb(random.nextInt(256), random.nextInt(256), random.nextInt(256)));
53-
view.findViewById(R.id.btn_show_about_fragment).setOnClickListener(this);
54-
view.findViewById(R.id.btn_add).setOnClickListener(this);
55-
view.findViewById(R.id.btn_add_hide).setOnClickListener(this);
56-
view.findViewById(R.id.btn_add_hide_stack).setOnClickListener(this);
57-
view.findViewById(R.id.btn_add).setOnClickListener(this);
58-
view.findViewById(R.id.btn_add_show).setOnClickListener(this);
59-
view.findViewById(R.id.btn_add_child).setOnClickListener(this);
60-
view.findViewById(R.id.btn_pop_to_root).setOnClickListener(this);
61-
view.findViewById(R.id.btn_pop_add).setOnClickListener(this);
62-
view.findViewById(R.id.btn_hide_show).setOnClickListener(this);
63-
view.findViewById(R.id.btn_replace).setOnClickListener(this);
64-
ivSharedElement = (ImageView) view.findViewById(R.id.iv_shared_element);
65-
tvAboutFragment = (TextView) view.findViewById(R.id.tv_about_fragment);
53+
findViewById(R.id.btn_show_about_fragment).setOnClickListener(this);
54+
findViewById(R.id.btn_add).setOnClickListener(this);
55+
findViewById(R.id.btn_add_hide).setOnClickListener(this);
56+
findViewById(R.id.btn_add_hide_stack).setOnClickListener(this);
57+
findViewById(R.id.btn_add).setOnClickListener(this);
58+
findViewById(R.id.btn_add_show).setOnClickListener(this);
59+
findViewById(R.id.btn_add_child).setOnClickListener(this);
60+
findViewById(R.id.btn_pop_to_root).setOnClickListener(this);
61+
findViewById(R.id.btn_pop_add).setOnClickListener(this);
62+
findViewById(R.id.btn_hide_show).setOnClickListener(this);
63+
findViewById(R.id.btn_replace).setOnClickListener(this);
64+
ivSharedElement = findViewById(R.id.iv_shared_element);
65+
tvAboutFragment = findViewById(R.id.tv_about_fragment);
6666
}
6767

6868
@Override

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,22 @@ public int bindLayout() {
4747
}
4848

4949
@Override
50-
public void initView(Bundle savedInstanceState, View view) {
50+
public void initView(Bundle savedInstanceState, View contentView) {
5151
Random random = new Random();
5252
FragmentUtils.setBackgroundColor(this, Color.rgb(random.nextInt(256), random.nextInt(256), random.nextInt(256)));
53-
view.findViewById(R.id.btn_show_about_fragment).setOnClickListener(this);
54-
view.findViewById(R.id.btn_add).setOnClickListener(this);
55-
view.findViewById(R.id.btn_add_hide).setOnClickListener(this);
56-
view.findViewById(R.id.btn_add_hide_stack).setOnClickListener(this);
57-
view.findViewById(R.id.btn_add).setOnClickListener(this);
58-
view.findViewById(R.id.btn_add_show).setOnClickListener(this);
59-
view.findViewById(R.id.btn_add_child).setOnClickListener(this);
60-
view.findViewById(R.id.btn_pop_to_root).setOnClickListener(this);
61-
view.findViewById(R.id.btn_pop_add).setOnClickListener(this);
62-
view.findViewById(R.id.btn_hide_show).setOnClickListener(this);
63-
view.findViewById(R.id.btn_replace).setOnClickListener(this);
64-
ivSharedElement = (ImageView) view.findViewById(R.id.iv_shared_element);
65-
tvAboutFragment = (TextView) view.findViewById(R.id.tv_about_fragment);
53+
findViewById(R.id.btn_show_about_fragment).setOnClickListener(this);
54+
findViewById(R.id.btn_add).setOnClickListener(this);
55+
findViewById(R.id.btn_add_hide).setOnClickListener(this);
56+
findViewById(R.id.btn_add_hide_stack).setOnClickListener(this);
57+
findViewById(R.id.btn_add).setOnClickListener(this);
58+
findViewById(R.id.btn_add_show).setOnClickListener(this);
59+
findViewById(R.id.btn_add_child).setOnClickListener(this);
60+
findViewById(R.id.btn_pop_to_root).setOnClickListener(this);
61+
findViewById(R.id.btn_pop_add).setOnClickListener(this);
62+
findViewById(R.id.btn_hide_show).setOnClickListener(this);
63+
findViewById(R.id.btn_replace).setOnClickListener(this);
64+
ivSharedElement = findViewById(R.id.iv_shared_element);
65+
tvAboutFragment = findViewById(R.id.tv_about_fragment);
6666
}
6767

6868
@Override

0 commit comments

Comments
 (0)