Skip to content

Commit c894a8f

Browse files
BlankjBlankj
committed
see 06/27 log
1 parent a99a347 commit c894a8f

31 files changed

+285
-187
lines changed

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

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

88
import com.blankj.androidutilcode.Config;
99
import com.blankj.androidutilcode.R;
10-
import com.blankj.androidutilcode.base.BaseActivity;
10+
import com.blankj.androidutilcode.base.BaseDrawerActivity;
1111
import com.blankj.utilcode.util.ActivityUtils;
1212

1313
/**
@@ -18,7 +18,7 @@
1818
* desc : Activity工具类Demo
1919
* </pre>
2020
*/
21-
public class ActivityActivity extends BaseActivity {
21+
public class ActivityActivity extends BaseDrawerActivity {
2222

2323
private String imageActivityClassName;
2424

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

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

88
import com.blankj.androidutilcode.Config;
99
import com.blankj.androidutilcode.R;
10-
import com.blankj.androidutilcode.base.BaseActivity;
10+
import com.blankj.androidutilcode.base.BaseDrawerActivity;
1111
import com.blankj.utilcode.util.AppUtils;
1212
import com.blankj.utilcode.util.SpanUtils;
1313
import com.blankj.utilcode.util.ToastUtils;
@@ -21,7 +21,7 @@
2121
* </pre>
2222
*/
2323

24-
public class AppActivity extends BaseActivity {
24+
public class AppActivity extends BaseDrawerActivity {
2525

2626
@Override
2727
public void initData(Bundle bundle) {

‎app/src/main/java/com/blankj/androidutilcode/activity/BarActivity.java

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
package com.blankj.androidutilcode.activity;
22

33
import android.content.Context;
4+
import android.content.Intent;
5+
import android.net.Uri;
46
import android.os.Bundle;
7+
import android.support.annotation.NonNull;
8+
import android.support.design.widget.NavigationView;
9+
import android.support.v4.widget.DrawerLayout;
10+
import android.support.v7.app.ActionBarDrawerToggle;
11+
import android.support.v7.widget.Toolbar;
12+
import android.view.MenuItem;
513
import android.view.View;
614

715
import com.blankj.androidutilcode.R;
8-
import com.blankj.androidutilcode.base.BaseActivity;
16+
import com.blankj.androidutilcode.base.BaseDrawerActivity;
17+
import com.blankj.utilcode.util.BarUtils;
918

1019
/**
1120
* <pre>
@@ -15,7 +24,24 @@
1524
* desc :
1625
* </pre>
1726
*/
18-
public class BarActivity extends BaseActivity {
27+
public class BarActivity extends BaseDrawerActivity {
28+
29+
NavigationView.OnNavigationItemSelectedListener mListener = new NavigationView.OnNavigationItemSelectedListener() {
30+
@Override
31+
public boolean onNavigationItemSelected(@NonNull MenuItem item) {
32+
switch (item.getItemId()) {
33+
case R.id.action_git_hub:
34+
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/Blankj/AndroidUtilCode")));
35+
break;
36+
case R.id.action_blog:
37+
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.jianshu.com/u/46702d5c6978")));
38+
break;
39+
}
40+
return false;
41+
}
42+
};
43+
44+
int alpha;
1945

2046
@Override
2147
public void initData(Bundle bundle) {
@@ -29,7 +55,15 @@ public int bindLayout() {
2955

3056
@Override
3157
public void initView(Bundle savedInstanceState, View view) {
32-
58+
DrawerLayout mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
59+
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
60+
NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
61+
setSupportActionBar(toolbar);
62+
ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, mDrawerLayout, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
63+
mDrawerLayout.addDrawerListener(toggle);
64+
toggle.syncState();
65+
BarUtils.setColor(this, getResources().getColor(R.color.colorPrimary));
66+
navigationView.setNavigationItemSelectedListener(mListener);
3367
}
3468

3569
@Override

‎app/src/main/java/com/blankj/androidutilcode/activity/CleanActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import android.widget.Button;
77

88
import com.blankj.androidutilcode.R;
9-
import com.blankj.androidutilcode.base.BaseActivity;
9+
import com.blankj.androidutilcode.base.BaseDrawerActivity;
1010
import com.blankj.utilcode.util.CleanUtils;
1111
import com.blankj.utilcode.util.ToastUtils;
1212

@@ -20,7 +20,7 @@
2020
* desc : Clean工具类Demo
2121
* </pre>
2222
*/
23-
public class CleanActivity extends BaseActivity {
23+
public class CleanActivity extends BaseDrawerActivity {
2424

2525
@Override
2626
public void initData(Bundle bundle) {

‎app/src/main/java/com/blankj/androidutilcode/activity/DeviceActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import android.widget.TextView;
77

88
import com.blankj.androidutilcode.R;
9-
import com.blankj.androidutilcode.base.BaseActivity;
9+
import com.blankj.androidutilcode.base.BaseDrawerActivity;
1010
import com.blankj.utilcode.util.DeviceUtils;
1111

1212
/**
@@ -17,7 +17,7 @@
1717
* desc : Device工具类Demo
1818
* </pre>
1919
*/
20-
public class DeviceActivity extends BaseActivity {
20+
public class DeviceActivity extends BaseDrawerActivity {
2121

2222
@Override
2323
public void initData(Bundle bundle) {

‎app/src/main/java/com/blankj/androidutilcode/activity/FragmentActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import android.view.View;
77

88
import com.blankj.androidutilcode.R;
9-
import com.blankj.androidutilcode.base.BaseActivity;
9+
import com.blankj.androidutilcode.base.BaseDrawerActivity;
1010
import com.blankj.androidutilcode.fragment.Demo0Fragment;
1111
import com.blankj.utilcode.util.FragmentUtils;
1212

@@ -20,7 +20,7 @@
2020
* desc : Fragment工具类Demo
2121
* </pre>
2222
*/
23-
public class FragmentActivity extends BaseActivity {
23+
public class FragmentActivity extends BaseDrawerActivity {
2424

2525
public Fragment rootFragment;
2626

‎app/src/main/java/com/blankj/androidutilcode/activity/ImageActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import android.widget.ImageView;
99

1010
import com.blankj.androidutilcode.R;
11-
import com.blankj.androidutilcode.base.BaseActivity;
11+
import com.blankj.androidutilcode.base.BaseDrawerActivity;
1212
import com.blankj.utilcode.util.ImageUtils;
1313
import com.blankj.utilcode.util.SizeUtils;
1414

@@ -20,7 +20,7 @@
2020
* desc : Image工具类Demo
2121
* </pre>
2222
*/
23-
public class ImageActivity extends BaseActivity {
23+
public class ImageActivity extends BaseDrawerActivity {
2424

2525
private ImageView ivSrc;
2626
private ImageView ivView2Bitmap;

‎app/src/main/java/com/blankj/androidutilcode/activity/KeyboardActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import android.widget.TextView;
1313

1414
import com.blankj.androidutilcode.R;
15-
import com.blankj.androidutilcode.base.BaseActivity;
15+
import com.blankj.androidutilcode.base.BaseDrawerActivity;
1616
import com.blankj.androidutilcode.dialog.KeyboardDialog;
1717
import com.blankj.utilcode.util.KeyboardUtils;
1818
import com.blankj.utilcode.util.LogUtils;
@@ -25,7 +25,7 @@
2525
* desc : Keyboard工具类Demo
2626
* </pre>
2727
*/
28-
public class KeyboardActivity extends BaseActivity {
28+
public class KeyboardActivity extends BaseDrawerActivity {
2929

3030
TextView tvAboutKeyboard;
3131
EditText etInput;

‎app/src/main/java/com/blankj/androidutilcode/activity/LocationActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import android.widget.TextView;
1111

1212
import com.blankj.androidutilcode.R;
13-
import com.blankj.androidutilcode.base.BaseActivity;
13+
import com.blankj.androidutilcode.base.BaseDrawerActivity;
1414
import com.blankj.androidutilcode.service.LocationService;
1515

1616
/**
@@ -21,7 +21,7 @@
2121
* desc : Location工具类Demo
2222
* </pre>
2323
*/
24-
public class LocationActivity extends BaseActivity {
24+
public class LocationActivity extends BaseDrawerActivity {
2525

2626
TextView tvAboutLocation;
2727
LocationService mLocationService;

‎app/src/main/java/com/blankj/androidutilcode/activity/LogActivity.java

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

99
import com.blankj.androidutilcode.R;
1010
import com.blankj.androidutilcode.UtilsApp;
11-
import com.blankj.androidutilcode.base.BaseActivity;
11+
import com.blankj.androidutilcode.base.BaseDrawerActivity;
1212
import com.blankj.utilcode.util.LogUtils;
1313

1414

@@ -21,7 +21,7 @@
2121
* </pre>
2222
*/
2323

24-
public class LogActivity extends BaseActivity {
24+
public class LogActivity extends BaseDrawerActivity {
2525

2626
private static final String TAG = "CMJ";
2727

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

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,22 @@
2323
* desc : MainActivity
2424
* </pre>
2525
*/
26-
public class MainActivity extends BaseActivity
27-
implements NavigationView.OnNavigationItemSelectedListener {
26+
public class MainActivity extends BaseActivity {
27+
28+
NavigationView.OnNavigationItemSelectedListener mListener = new NavigationView.OnNavigationItemSelectedListener() {
29+
@Override
30+
public boolean onNavigationItemSelected(@NonNull MenuItem item) {
31+
switch (item.getItemId()) {
32+
case R.id.action_git_hub:
33+
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/Blankj/AndroidUtilCode")));
34+
break;
35+
case R.id.action_blog:
36+
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.jianshu.com/u/46702d5c6978")));
37+
break;
38+
}
39+
return false;
40+
}
41+
};
2842

2943
@Override
3044
public void initData(Bundle bundle) {
@@ -45,7 +59,7 @@ public void initView(Bundle savedInstanceState, View view) {
4559
ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, mDrawerLayout, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
4660
mDrawerLayout.addDrawerListener(toggle);
4761
toggle.syncState();
48-
navigationView.setNavigationItemSelectedListener(this);
62+
navigationView.setNavigationItemSelectedListener(mListener);
4963
}
5064

5165
@Override
@@ -141,17 +155,4 @@ public void spannableClick(View view) {
141155
public void toastClick(View view) {
142156
startActivity(new Intent(this, ToastActivity.class));
143157
}
144-
145-
@Override
146-
public boolean onNavigationItemSelected(@NonNull MenuItem item) {
147-
switch (item.getItemId()) {
148-
case R.id.action_git_hub:
149-
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/Blankj/AndroidUtilCode")));
150-
break;
151-
case R.id.action_blog:
152-
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.jianshu.com/u/46702d5c6978")));
153-
break;
154-
}
155-
return false;
156-
}
157158
}

‎app/src/main/java/com/blankj/androidutilcode/activity/NetworkActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import android.widget.TextView;
77

88
import com.blankj.androidutilcode.R;
9-
import com.blankj.androidutilcode.base.BaseActivity;
9+
import com.blankj.androidutilcode.base.BaseDrawerActivity;
1010
import com.blankj.utilcode.util.NetworkUtils;
1111

1212
/**
@@ -17,7 +17,7 @@
1717
* desc : Network工具类Demo
1818
* </pre>
1919
*/
20-
public class NetworkActivity extends BaseActivity {
20+
public class NetworkActivity extends BaseDrawerActivity {
2121

2222
private TextView tvAboutNetwork;
2323

‎app/src/main/java/com/blankj/androidutilcode/activity/PhoneActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import android.widget.TextView;
77

88
import com.blankj.androidutilcode.R;
9-
import com.blankj.androidutilcode.base.BaseActivity;
9+
import com.blankj.androidutilcode.base.BaseDrawerActivity;
1010
import com.blankj.utilcode.util.PhoneUtils;
1111

1212
/**
@@ -17,7 +17,7 @@
1717
* desc : Phone工具类Demo
1818
* </pre>
1919
*/
20-
public class PhoneActivity extends BaseActivity {
20+
public class PhoneActivity extends BaseDrawerActivity {
2121

2222
@Override
2323
public void initData(Bundle bundle) {

‎app/src/main/java/com/blankj/androidutilcode/activity/PinyinActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import android.widget.TextView;
77

88
import com.blankj.androidutilcode.R;
9-
import com.blankj.androidutilcode.base.BaseActivity;
9+
import com.blankj.androidutilcode.base.BaseDrawerActivity;
1010
import com.blankj.utilcode.util.PinyinUtils;
1111

1212
/**
@@ -17,7 +17,7 @@
1717
* desc : Pinyin工具类Demo
1818
* </pre>
1919
*/
20-
public class PinyinActivity extends BaseActivity {
20+
public class PinyinActivity extends BaseDrawerActivity {
2121

2222
@Override
2323
public void initData(Bundle bundle) {

‎app/src/main/java/com/blankj/androidutilcode/activity/ProcessActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import android.widget.TextView;
77

88
import com.blankj.androidutilcode.R;
9-
import com.blankj.androidutilcode.base.BaseActivity;
9+
import com.blankj.androidutilcode.base.BaseDrawerActivity;
1010
import com.blankj.utilcode.util.ProcessUtils;
1111

1212
import java.util.Iterator;
@@ -20,7 +20,7 @@
2020
* desc : Process工具类Demo
2121
* </pre>
2222
*/
23-
public class ProcessActivity extends BaseActivity {
23+
public class ProcessActivity extends BaseDrawerActivity {
2424

2525
private TextView tvAboutProcess;
2626

‎app/src/main/java/com/blankj/androidutilcode/activity/SDCardActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import android.widget.TextView;
77

88
import com.blankj.androidutilcode.R;
9-
import com.blankj.androidutilcode.base.BaseActivity;
9+
import com.blankj.androidutilcode.base.BaseDrawerActivity;
1010
import com.blankj.utilcode.util.SDCardUtils;
1111

1212
/**
@@ -17,7 +17,7 @@
1717
* desc : SDCard工具类Demo
1818
* </pre>
1919
*/
20-
public class SDCardActivity extends BaseActivity {
20+
public class SDCardActivity extends BaseDrawerActivity {
2121

2222
@Override
2323
public void initData(Bundle bundle) {

‎app/src/main/java/com/blankj/androidutilcode/activity/SnackbarActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import android.widget.TextView;
1111

1212
import com.blankj.androidutilcode.R;
13-
import com.blankj.androidutilcode.base.BaseActivity;
13+
import com.blankj.androidutilcode.base.BaseDrawerActivity;
1414
import com.blankj.utilcode.util.SnackbarUtils;
1515
import com.blankj.utilcode.util.SpanUtils;
1616
import com.blankj.utilcode.util.ToastUtils;
@@ -23,7 +23,7 @@
2323
* desc : Snackbar工具类Demo
2424
* </pre>
2525
*/
26-
public class SnackbarActivity extends BaseActivity {
26+
public class SnackbarActivity extends BaseDrawerActivity {
2727

2828
private View snackBarRootView;
2929

0 commit comments

Comments
 (0)