Skip to content

Commit a5a7420

Browse files
BlankjBlankj
committed
see 06/28 log
1 parent 8d43ee9 commit a5a7420

Some content is hidden

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

57 files changed

+479
-307
lines changed

‎app/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ android {
99
defaultConfig {
1010
applicationId "com.blankj.androidutilcode"
1111
minSdkVersion 14
12-
targetSdkVersion 16
12+
targetSdkVersion 25
1313
versionCode 41
1414
versionName "1.7.1"
1515
}
@@ -57,6 +57,8 @@ dependencies {
5757
compile "com.android.support:support-v4:$SUPPORT_VERSION"
5858
compile "com.android.support:design:$SUPPORT_VERSION"
5959

60+
compile 'com.r0adkll:slidableactivity:2.0.5'
61+
6062
// LeakCanary
6163
debugCompile "com.squareup.leakcanary:leakcanary-android:$LEAKCANARY_VERSION"
6264
releaseCompile leakCanary

‎app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
<activity android:name=".activity.ActivityActivity"/>
5353
<activity android:name=".activity.AppActivity"/>
5454
<activity android:name=".activity.BarActivity"/>
55+
<activity android:name=".activity.BarBranchActivity"/>
5556
<activity android:name=".activity.CleanActivity"/>
5657
<activity android:name=".activity.DeviceActivity"/>
5758
<activity android:name=".activity.FragmentActivity"/>

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

Lines changed: 5 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.BaseDrawerActivity;
10+
import com.blankj.androidutilcode.base.BaseBackActivity;
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 BaseDrawerActivity {
21+
public class ActivityActivity extends BaseBackActivity {
2222

2323
private String imageActivityClassName;
2424

@@ -32,8 +32,11 @@ public int bindLayout() {
3232
return R.layout.activity_activity;
3333
}
3434

35+
3536
@Override
3637
public void initView(Bundle savedInstanceState, View view) {
38+
getSupportActionBar().setTitle(getString(R.string.demo_activity));
39+
3740
findViewById(R.id.btn_launch_image_activity).setOnClickListener(this);
3841
TextView tvAboutActivity = (TextView) findViewById(R.id.tv_about_activity);
3942
tvAboutActivity.setText("Is ImageActivity Exists: " + ActivityUtils.isActivityExists(Config.PKG, imageActivityClassName)

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

Lines changed: 6 additions & 4 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.BaseDrawerActivity;
10+
import com.blankj.androidutilcode.base.BaseBackActivity;
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 BaseDrawerActivity {
24+
public class AppActivity extends BaseBackActivity {
2525

2626
@Override
2727
public void initData(Bundle bundle) {
@@ -35,6 +35,8 @@ public int bindLayout() {
3535

3636
@Override
3737
public void initView(Bundle savedInstanceState, View view) {
38+
getSupportActionBar().setTitle(getString(R.string.demo_app));
39+
3840
findViewById(R.id.btn_install_app).setOnClickListener(this);
3941
findViewById(R.id.btn_install_app_silent).setOnClickListener(this);
4042
findViewById(R.id.btn_uninstall_app).setOnClickListener(this);
@@ -44,12 +46,12 @@ public void initView(Bundle savedInstanceState, View view) {
4446
TextView tvAboutApp = (TextView) findViewById(R.id.tv_about_app);
4547
tvAboutApp.setText(
4648
new SpanUtils()
47-
.append("app icon: ").appendImage(AppUtils.getAppIcon(), SpanUtils.ALIGN_CENTER)
49+
.appendLine("app icon: ").appendImage(AppUtils.getAppIcon(), SpanUtils.ALIGN_CENTER)
4850
.appendLine(AppUtils.getAppInfo().toString())
4951
.appendLine("isAppRoot: " + AppUtils.isAppRoot())
5052
.appendLine("isAppDebug: " + AppUtils.isAppDebug())
5153
.appendLine("AppSignatureSHA1: " + AppUtils.getAppSignatureSHA1())
52-
.appendLine("isAppForeground: " + AppUtils.isAppForeground())
54+
.append("isAppForeground: " + AppUtils.isAppForeground())
5355
.create());
5456
}
5557

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

Lines changed: 10 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
package com.blankj.androidutilcode.activity;
22

33
import android.content.Context;
4+
import android.content.Intent;
45
import android.os.Bundle;
5-
import android.support.v4.content.ContextCompat;
66
import android.view.View;
7-
import android.widget.SeekBar;
8-
import android.widget.TextView;
97

108
import com.blankj.androidutilcode.R;
11-
import com.blankj.androidutilcode.base.BaseDrawerActivity;
12-
import com.blankj.utilcode.util.BarUtils;
13-
14-
import java.util.Random;
9+
import com.blankj.androidutilcode.base.BaseBackActivity;
1510

1611
/**
1712
* <pre>
@@ -21,18 +16,11 @@
2116
* desc :
2217
* </pre>
2318
*/
24-
public class BarActivity extends BaseDrawerActivity {
25-
26-
private int mColor;
27-
private int mAlpha;
28-
private Random mRandom;
29-
private TextView mTvStatusAlpha;
19+
public class BarActivity extends BaseBackActivity {
3020

3121
@Override
3222
public void initData(Bundle bundle) {
33-
mRandom = new Random();
34-
mColor = ContextCompat.getColor(this, R.color.colorPrimary);
35-
mAlpha = 112;
23+
3624
}
3725

3826
@Override
@@ -42,30 +30,9 @@ public int bindLayout() {
4230

4331
@Override
4432
public void initView(Bundle savedInstanceState, View view) {
45-
findViewById(R.id.btn_set_color).setOnClickListener(this);
46-
mTvStatusAlpha = (TextView) findViewById(R.id.tv_status_alpha);
47-
SeekBar sbChangeAlpha = (SeekBar) findViewById(R.id.sb_change_alpha);
48-
49-
sbChangeAlpha.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
50-
@Override
51-
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
52-
mAlpha = progress;
53-
BarUtils.setColor(BarActivity.this, mColor, mAlpha);
54-
mTvStatusAlpha.setText(String.valueOf(mAlpha));
55-
}
56-
57-
@Override
58-
public void onStartTrackingTouch(SeekBar seekBar) {
33+
getSupportActionBar().setTitle(getString(R.string.demo_bar));
5934

60-
}
61-
62-
@Override
63-
public void onStopTrackingTouch(SeekBar seekBar) {
64-
65-
}
66-
});
67-
sbChangeAlpha.setProgress(mAlpha);
68-
updateStatusBar();
35+
findViewById(R.id.btn_bar_color).setOnClickListener(this);
6936
}
7037

7138
@Override
@@ -76,15 +43,11 @@ public void doBusiness(Context context) {
7643
@Override
7744
public void onWidgetClick(View view) {
7845
switch (view.getId()) {
79-
case R.id.btn_set_color:
80-
mColor = 0xff000000 | mRandom.nextInt(0xffffff);
81-
updateStatusBar();
46+
case R.id.btn_bar_color:
47+
Intent intent = new Intent(this, BarBranchActivity.class);
48+
intent.putExtra("branch", BarBranchActivity.BRANCH_BAR_COLOR);
49+
startActivity(intent);
8250
break;
8351
}
8452
}
85-
86-
private void updateStatusBar() {
87-
mToolbar.setBackgroundColor(mColor);
88-
BarUtils.setColor(this, mColor, mAlpha);
89-
}
9053
}

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

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
package com.blankj.androidutilcode.activity;
2+
3+
import android.content.Context;
4+
import android.os.Bundle;
5+
import android.support.v4.content.ContextCompat;
6+
import android.view.View;
7+
import android.widget.SeekBar;
8+
import android.widget.TextView;
9+
10+
import com.blankj.androidutilcode.R;
11+
import com.blankj.androidutilcode.base.BaseBackActivity;
12+
import com.blankj.utilcode.util.BarUtils;
13+
14+
import java.util.Random;
15+
16+
/**
17+
* <pre>
18+
* author: Blankj
19+
* blog : http://blankj.com
20+
* time : 2017/05/27
21+
* desc :
22+
* </pre>
23+
*/
24+
public class BarBranchActivity extends BaseBackActivity
25+
implements SeekBar.OnSeekBarChangeListener {
26+
27+
public static final String BRANCH_BAR_COLOR = "branch_bar_color";
28+
29+
30+
private int mColor;
31+
private int mAlpha;
32+
private Random mRandom;
33+
private TextView mTvStatusAlpha;
34+
private String branch;
35+
36+
@Override
37+
public void initData(Bundle bundle) {
38+
39+
branch = bundle.getString("branch");
40+
41+
mRandom = new Random();
42+
mColor = ContextCompat.getColor(this, R.color.colorPrimary);
43+
mAlpha = 112;
44+
}
45+
46+
@Override
47+
public int bindLayout() {
48+
int layoutId = 0;
49+
if (branch.equals(BRANCH_BAR_COLOR)) {
50+
layoutId = R.layout.activity_bar_color;
51+
}
52+
return layoutId;
53+
}
54+
55+
@Override
56+
public void initView(Bundle savedInstanceState, View view) {
57+
getSupportActionBar().setTitle(getString(R.string.demo_bar));
58+
59+
if (branch.equals(BRANCH_BAR_COLOR)) {
60+
findViewById(R.id.btn_set_color).setOnClickListener(this);
61+
mTvStatusAlpha = (TextView) findViewById(R.id.tv_status_alpha);
62+
SeekBar sbChangeAlpha = (SeekBar) findViewById(R.id.sb_change_alpha);
63+
sbChangeAlpha.setOnSeekBarChangeListener(this);
64+
sbChangeAlpha.setProgress(mAlpha);
65+
updateStatusBar();
66+
}
67+
}
68+
69+
@Override
70+
public void doBusiness(Context context) {
71+
72+
}
73+
74+
@Override
75+
public void onWidgetClick(View view) {
76+
switch (view.getId()) {
77+
case R.id.btn_set_color:
78+
mColor = 0xff000000 | mRandom.nextInt(0xffffff);
79+
updateStatusBar();
80+
break;
81+
}
82+
}
83+
84+
private void updateStatusBar() {
85+
mToolbar.setBackgroundColor(mColor);
86+
BarUtils.setColor(this, mColor, mAlpha);
87+
}
88+
89+
90+
///////////////////////////////////////////////////////////////////////////
91+
// OnSeekBarChangeListener
92+
///////////////////////////////////////////////////////////////////////////
93+
@Override
94+
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
95+
mAlpha = progress;
96+
BarUtils.setColor(BarBranchActivity.this, mColor, mAlpha);
97+
mTvStatusAlpha.setText(String.valueOf(mAlpha));
98+
}
99+
100+
@Override
101+
public void onStartTrackingTouch(SeekBar seekBar) {
102+
103+
}
104+
105+
@Override
106+
public void onStopTrackingTouch(SeekBar seekBar) {
107+
108+
}
109+
///////////////////////////////////////////////////////////////////////////
110+
// OnSeekBarChangeListener
111+
///////////////////////////////////////////////////////////////////////////
112+
}

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

Lines changed: 4 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.BaseDrawerActivity;
9+
import com.blankj.androidutilcode.base.BaseBackActivity;
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 BaseDrawerActivity {
23+
public class CleanActivity extends BaseBackActivity {
2424

2525
@Override
2626
public void initData(Bundle bundle) {
@@ -34,6 +34,8 @@ public int bindLayout() {
3434

3535
@Override
3636
public void initView(Bundle savedInstanceState, View view) {
37+
getSupportActionBar().setTitle(getString(R.string.demo_clean));
38+
3739
Button btnCleanInternalCache = (Button) findViewById(R.id.btn_clean_internal_cache);
3840
Button btnCleanInternalFiles = (Button) findViewById(R.id.btn_clean_internal_files);
3941
Button btnCleanInternalDbs = (Button) findViewById(R.id.btn_clean_internal_databases);

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

Lines changed: 4 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.BaseDrawerActivity;
9+
import com.blankj.androidutilcode.base.BaseBackActivity;
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 BaseDrawerActivity {
20+
public class DeviceActivity extends BaseBackActivity {
2121

2222
@Override
2323
public void initData(Bundle bundle) {
@@ -31,6 +31,8 @@ public int bindLayout() {
3131

3232
@Override
3333
public void initView(Bundle savedInstanceState, View view) {
34+
getSupportActionBar().setTitle(getString(R.string.demo_device));
35+
3436
findViewById(R.id.btn_shutdown).setOnClickListener(this);
3537
findViewById(R.id.btn_reboot).setOnClickListener(this);
3638
findViewById(R.id.btn_reboot_to_recovery).setOnClickListener(this);

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

Lines changed: 3 additions & 3 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.BaseDrawerActivity;
9+
import com.blankj.androidutilcode.base.BaseBackActivity;
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 BaseDrawerActivity {
23+
public class FragmentActivity extends BaseBackActivity {
2424

2525
public Fragment rootFragment;
2626

@@ -36,7 +36,7 @@ public int bindLayout() {
3636

3737
@Override
3838
public void initView(Bundle savedInstanceState, View view) {
39-
39+
getSupportActionBar().setTitle(getString(R.string.demo_fragment));
4040
}
4141

4242
@Override

0 commit comments

Comments
 (0)