提交 1f48171b 编写于 作者: B Blankj

see 08/01 log

上级 0291442c
......@@ -43,15 +43,18 @@ cleanAppData : 清除App所有数据
* ### 栏相关→[BarUtils.java][bar.java]
```
setStatusBarColor : 设置状态栏颜色
setStatusBarAlpha : 设置状态栏透明度
setTransparentStatusBar: 设置透明状态栏(api大于19方可使用)
hideStatusBar : 隐藏状态栏
getStatusBarHeight : 获取状态栏高度
isStatusBarExists : 判断状态栏是否存在
getActionBarHeight : 获取ActionBar高度
showNotificationBar : 显示通知栏
hideNotificationBar : 隐藏通知栏
getStatusBarHeight : 获取状态栏高度(px)
addMarginTopEqualStatusBarHeight : 为view增加MarginTop为状态栏高度
subtractMarginTopEqualStatusBarHeight: 为view减少MarginTop为状态栏高度
setStatusBarColor : 设置状态栏颜色
setStatusBarAlpha : 设置状态栏透明度
setStatusBarColor4Drawer : 为DrawerLayout设置状态栏颜色
setStatusBarAlpha4Drawer : 为DrawerLayout设置状态栏透明度
getActionBarHeight : 获取ActionBar高度
showNotificationBar : 显示通知栏
hideNotificationBar : 隐藏通知栏
getNavBarHeight : 获取导航栏高度
hideNavBar : 隐藏导航栏
```
* ### 缓存相关→[CacheUtils.java][cache.java][Test][cache.test]
......@@ -409,16 +412,19 @@ getReplaceAll : 替换所有正则匹配的部分
* ### 屏幕相关→[ScreenUtils.java][screen.java]
```
getScreenWidth : 获取屏幕的宽度(单位:px)
getScreenHeight : 获取屏幕的高度(单位:px)
setLandscape : 设置屏幕为横屏
setPortrait : 设置屏幕为竖屏
isLandscape : 判断是否横屏
isPortrait : 判断是否竖屏
getScreenRotation : 获取屏幕旋转角度
captureWithStatusBar : 获取当前屏幕截图,包含状态栏
captureWithoutStatusBar: 获取当前屏幕截图,不包含状态栏
isScreenLock : 判断是否锁屏
getScreenWidth : 获取屏幕的宽度(单位:px)
getScreenHeight : 获取屏幕的高度(单位:px)
setFullScreen : 设置屏幕为全屏
setLandscape : 设置屏幕为横屏
setPortrait : 设置屏幕为竖屏
isLandscape : 判断是否横屏
isPortrait : 判断是否竖屏
getScreenRotation: 获取屏幕旋转角度
screenShot : 截屏
isScreenLock : 判断是否锁屏
setSleepDuration : 设置进入休眠时长
getSleepDuration : 获取进入休眠时长
isTablet : 判断是否是平板
```
* ### SD卡相关→[SDCardUtils.java][sdcard.java][Demo][sdcard.demo]
......@@ -621,7 +627,7 @@ getEntries : 获取压缩文件中的文件对象
Gradle:
``` groovy
compile 'com.blankj:utilcode:1.7.1'
compile 'com.blankj:utilcode:1.8.0'
```
......@@ -644,7 +650,7 @@ Utils.init(context);
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.7.1-brightgreen.svg
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.8.0-brightgreen.svg
[auc]: https://github.com/Blankj/AndroidUtilCode
[apisvg]: https://img.shields.io/badge/API-15+-brightgreen.svg
......
......@@ -43,15 +43,18 @@ cleanAppData
* ### About Bar→[BarUtils.java][bar.java]
```
getStatusBarHeight
addMarginTopEqualStatusBarHeight
subtractMarginTopEqualStatusBarHeight
setStatusBarColor
setStatusBarAlpha
setTransparentStatusBar
hideStatusBar
getStatusBarHeight
isStatusBarExists
setStatusBarColor4Drawer
setStatusBarAlpha4Drawer
getActionBarHeight
showNotificationBar
hideNotificationBar
getNavBarHeight
hideNavBar
```
* ### About Cache→[CacheUtils.java][cache.java][Test][cache.test]
......@@ -380,16 +383,6 @@ getContactNum
getAllSMS
```
* ### About Pinyin→[PinyinUtils.java][pinyin.java][Test][pinyin.test]
```
ccs2Pinyin
ccs2Pinyin
getPinyinFirstLetter
getPinyinFirstLetters
getSurnamePinyin
getSurnameFirstLetter
```
* ### About Process→[ProcessUtils.java][process.java][Demo][process.demo]
```
getForegroundProcessName
......@@ -421,14 +414,17 @@ getReplaceAll
```
getScreenWidth
getScreenHeight
setFullScreen
setLandscape
setPortrait
isLandscape
isPortrait
getScreenRotation
captureWithStatusBar
captureWithoutStatusBar
screenShot
isScreenLock
setSleepDuration
getSleepDuration
isTablet
```
* ### About SDCard→[SDCardUtils.java][sdcard.java][Demo][sdcard.demo]
......@@ -552,25 +548,6 @@ toDBC
toSBC
```
* ### About ThreadPool→[ThreadPoolUtils.java][thread_pool.java]
```
ThreadPoolUtils
execute
execute
shutDown
shutDownNow
isShutDown
isTerminated
awaitTermination
submit
submit
invokeAll, invokeAny
schedule
schedule
scheduleWithFixedRate
scheduleWithFixedDelay
```
* ### About Time→[TimeUtils.java][time.java][Test][time.test]
```
millis2String
......@@ -650,7 +627,7 @@ getEntries
Gradle:
``` groovy
compile 'com.blankj:utilcode:1.7.1'
compile 'com.blankj:utilcode:1.8.0'
```
......@@ -673,7 +650,7 @@ Utils.init(context);
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.7.1-brightgreen.svg
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.8.0-brightgreen.svg
[auc]: https://github.com/Blankj/AndroidUtilCode
[apisvg]: https://img.shields.io/badge/API-15+-brightgreen.svg
......@@ -767,9 +744,6 @@ Utils.init(context);
[phone.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/PhoneUtils.java
[phone.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/PhoneActivity.java
[pinyin.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/PinyinUtils.java
[pinyin.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/PinyinUtilsTest.java
[process.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/ProcessUtils.java
[process.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/ProcessActivity.java
......@@ -799,8 +773,6 @@ Utils.init(context);
[string.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/StringUtils.java
[string.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/StringUtilsTest.java
[thread_pool.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/ThreadPoolUtils.java
[time.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/TimeUtils.java
[time.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/TimeUtilsTest.java
......
......@@ -2,6 +2,9 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.blankj.androidutilcode">
<!--bar-->
<uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
<!--读写内存-->
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
......@@ -52,6 +55,13 @@
<activity android:name=".activity.ActivityActivity" />
<activity android:name=".activity.AppActivity" />
<activity android:name=".activity.BarActivity" />
<activity android:name=".activity.BarNavActivity" />
<activity android:name=".activity.BarStatusAlphaActivity" />
<activity android:name=".activity.BarStatusColorActivity" />
<activity android:name=".activity.BarStatusDrawerActivity" />
<activity android:name=".activity.BarStatusFragmentActivity" />
<activity android:name=".activity.BarStatusImageViewActivity" />
<activity android:name=".activity.BarStatusSwipeBackActivity" />
<activity android:name=".activity.CleanActivity" />
<activity android:name=".activity.DeviceActivity" />
<activity android:name=".activity.FragmentActivity" />
......@@ -75,12 +85,6 @@
<activity android:name=".activity.SDCardActivity" />
<activity android:name=".activity.SnackbarActivity" />
<activity android:name=".activity.SpanActivity" />
<activity android:name=".activity.StatusBarAlphaActivity" />
<activity android:name=".activity.StatusBarColorActivity" />
<activity android:name=".activity.StatusBarDrawerActivity" />
<activity android:name=".activity.StatusBarFragmentActivity" />
<activity android:name=".activity.StatusBarImageViewActivity" />
<activity android:name=".activity.StatusBarSwipeBackActivity" />
<activity android:name=".activity.ToastActivity" />
<provider
......
......@@ -15,6 +15,10 @@ import java.io.File;
public class Config {
public static final String PKG = "com.blankj.androidutilcode";
public static final String TEST_PKG = "com.blankj.testinstall";
public static final String GITHUB = "https://github.com/Blankj/AndroidUtilCode";
public static final String BLOG = "http://www.jianshu.com/u/46702d5c6978";
private static String testApkPath;
public static String getTestApkPath() {
......
......@@ -43,6 +43,7 @@ public class BarActivity extends BaseBackActivity {
findViewById(R.id.btn_status_bar_fragment).setOnClickListener(this);
findViewById(R.id.btn_status_bar_swipe_back).setOnClickListener(this);
findViewById(R.id.btn_status_bar_drawer).setOnClickListener(this);
findViewById(R.id.btn_nav_bar).setOnClickListener(this);
}
@Override
......@@ -54,22 +55,25 @@ public class BarActivity extends BaseBackActivity {
public void onWidgetClick(View view) {
switch (view.getId()) {
case R.id.btn_status_bar_color:
StatusBarColorActivity.start(this);
BarStatusColorActivity.start(this);
break;
case R.id.btn_status_bar_alpha:
StatusBarAlphaActivity.start(this);
BarStatusAlphaActivity.start(this);
break;
case R.id.btn_status_bar_image_view:
StatusBarImageViewActivity.start(this);
BarStatusImageViewActivity.start(this);
break;
case R.id.btn_status_bar_fragment:
StatusBarFragmentActivity.start(this);
BarStatusFragmentActivity.start(this);
break;
case R.id.btn_status_bar_swipe_back:
StatusBarSwipeBackActivity.start(this);
BarStatusSwipeBackActivity.start(this);
break;
case R.id.btn_status_bar_drawer:
StatusBarDrawerActivity.start(this);
BarStatusDrawerActivity.start(this);
break;
case R.id.btn_nav_bar:
BarNavActivity.start(this);
break;
}
}
......
package com.blankj.androidutilcode.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.TextView;
import com.blankj.androidutilcode.R;
import com.blankj.androidutilcode.base.BaseBackActivity;
import com.blankj.utilcode.util.BarUtils;
/**
* <pre>
* author: Blankj
* blog : http://blankj.com
* time : 2016/10/13
* desc : Activity工具类Demo
* </pre>
*/
public class BarNavActivity extends BaseBackActivity {
private TextView tvAboutNav;
public static void start(Context context) {
Intent starter = new Intent(context, BarNavActivity.class);
context.startActivity(starter);
}
@Override
public void initData(Bundle bundle) {
}
@Override
public int bindLayout() {
return R.layout.activity_bar_nav;
}
@Override
public void initView(Bundle savedInstanceState, View view) {
getToolBar().setTitle(getString(R.string.demo_bar));
tvAboutNav = (TextView) findViewById(R.id.tv_about_nav);
tvAboutNav.setText(String.valueOf(BarUtils.getNavBarHeight()));
}
@Override
public void doBusiness(Context context) {
}
@Override
public void onWidgetClick(View view) {
}
@Override
public void onWindowFocusChanged(boolean hasFocus) {
super.onWindowFocusChanged(hasFocus);
BarUtils.hideNavBar(this);
}
}
\ No newline at end of file
......@@ -19,7 +19,7 @@ import com.blankj.utilcode.util.BarUtils;
* desc : Bar工具类Demo
* </pre>
*/
public class StatusBarAlphaActivity extends BaseActivity {
public class BarStatusAlphaActivity extends BaseActivity {
private int mAlpha;
......@@ -27,7 +27,7 @@ public class StatusBarAlphaActivity extends BaseActivity {
private SeekBar sbChangeAlpha;
public static void start(Context context) {
Intent starter = new Intent(context, StatusBarAlphaActivity.class);
Intent starter = new Intent(context, BarStatusAlphaActivity.class);
context.startActivity(starter);
}
......@@ -38,7 +38,7 @@ public class StatusBarAlphaActivity extends BaseActivity {
@Override
public int bindLayout() {
return R.layout.activity_status_bar_alpha;
return R.layout.activity_bar_status_alpha;
}
@Override
......@@ -86,7 +86,7 @@ public class StatusBarAlphaActivity extends BaseActivity {
};
private void updateStatusBar() {
BarUtils.setStatusBarAlpha(StatusBarAlphaActivity.this, mAlpha);
BarUtils.setStatusBarAlpha(BarStatusAlphaActivity.this, mAlpha);
BarUtils.addMarginTopEqualStatusBarHeight(mTvStatusAlpha);
}
}
......@@ -24,7 +24,7 @@ import java.util.Random;
* desc : Bar工具类Demo
* </pre>
*/
public class StatusBarColorActivity extends BaseActivity {
public class BarStatusColorActivity extends BaseActivity {
private Random mRandom;
private int mColor;
......@@ -34,7 +34,7 @@ public class StatusBarColorActivity extends BaseActivity {
private SeekBar sbChangeAlpha;
public static void start(Context context) {
Intent starter = new Intent(context, StatusBarColorActivity.class);
Intent starter = new Intent(context, BarStatusColorActivity.class);
context.startActivity(starter);
}
......@@ -47,7 +47,7 @@ public class StatusBarColorActivity extends BaseActivity {
@Override
public int bindLayout() {
return R.layout.activity_status_bar_color;
return R.layout.activity_bar_status_color;
}
@Override
......
......@@ -28,7 +28,7 @@ import java.util.Random;
* desc : Bar工具类Demo
* </pre>
*/
public class StatusBarDrawerActivity extends BaseDrawerActivity {
public class BarStatusDrawerActivity extends BaseDrawerActivity {
private Random mRandom;
private int mColor;
......@@ -36,12 +36,13 @@ public class StatusBarDrawerActivity extends BaseDrawerActivity {
private View fakeStatusBar;
private CheckBox cbAlpha;
private CheckBox cbFront;
private TextView tvStatusAlpha;
private SeekBar sbChangeAlpha;
private Button btnRandomColor;
public static void start(Context context) {
Intent starter = new Intent(context, StatusBarDrawerActivity.class);
Intent starter = new Intent(context, BarStatusDrawerActivity.class);
context.startActivity(starter);
}
......@@ -54,24 +55,27 @@ public class StatusBarDrawerActivity extends BaseDrawerActivity {
@Override
public int bindLayout() {
return R.layout.activity_status_bar_drawer;
return R.layout.activity_bar_status_drawer;
}
@Override
public void initView(Bundle savedInstanceState, View view) {
fakeStatusBar = findViewById(R.id.fake_status_bar);
cbAlpha = (CheckBox) findViewById(R.id.cb_alpha);
cbFront = (CheckBox) findViewById(R.id.cb_front);
btnRandomColor = (Button) findViewById(R.id.btn_random_color);
tvStatusAlpha = (TextView) findViewById(R.id.tv_status_alpha);
sbChangeAlpha = (SeekBar) findViewById(R.id.sb_change_alpha);
cbAlpha.setOnCheckedChangeListener(mCheckedChangeListener);
cbAlpha.setOnCheckedChangeListener(mAlphaCheckedChangeListener);
cbFront.setOnCheckedChangeListener(mFrontCheckedChangeListener);
btnRandomColor.setOnClickListener(this);
findViewById(R.id.btn_set_transparent).setOnClickListener(this);
sbChangeAlpha.setOnSeekBarChangeListener(mColorListener);
tvStatusAlpha.setText(String.valueOf(mAlpha));
BarUtils.addMarginTopEqualStatusBarHeight(cbAlpha);
updateStatusBar();
}
......@@ -113,26 +117,32 @@ public class StatusBarDrawerActivity extends BaseDrawerActivity {
}
};
CompoundButton.OnCheckedChangeListener mCheckedChangeListener = new CompoundButton.OnCheckedChangeListener() {
CompoundButton.OnCheckedChangeListener mAlphaCheckedChangeListener = new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (isChecked) {
btnRandomColor.setVisibility(View.GONE);
rootLayout.setBackgroundResource(R.drawable.bg_bar);
flActivityContainer.setBackgroundResource(R.drawable.bg_bar);
} else {
btnRandomColor.setVisibility(View.VISIBLE);
rootLayout.setBackgroundColor(Color.WHITE);
flActivityContainer.setBackgroundColor(Color.WHITE);
}
updateStatusBar();
}
};
CompoundButton.OnCheckedChangeListener mFrontCheckedChangeListener = new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
updateStatusBar();
}
};
private void updateStatusBar() {
if (cbAlpha.isChecked()) {
BarUtils.setStatusBarAlpha4Drawer(BarStatusDrawerActivity.this, rootLayout, fakeStatusBar, mAlpha, cbFront.isChecked());
} else {
BarUtils.setStatusBarColor4Drawer(this, rootLayout, fakeStatusBar, mColor, mAlpha, true);
BarUtils.setStatusBarColor4Drawer(BarStatusDrawerActivity.this, rootLayout, fakeStatusBar, mColor, mAlpha, cbFront.isChecked());
}
}
......
......@@ -13,9 +13,9 @@ import android.view.View;
import com.blankj.androidutilcode.R;
import com.blankj.androidutilcode.base.BaseActivity;
import com.blankj.androidutilcode.fragment.StatusBarAlphaFragment;
import com.blankj.androidutilcode.fragment.StatusBarColorFragment;
import com.blankj.androidutilcode.fragment.StatusBarImageViewFragment;
import com.blankj.androidutilcode.fragment.BarStatusAlphaFragment;
import com.blankj.androidutilcode.fragment.BarStatusColorFragment;
import com.blankj.androidutilcode.fragment.BarStatusImageViewFragment;
import java.util.ArrayList;
......@@ -27,7 +27,7 @@ import java.util.ArrayList;
* desc : Bar工具类Demo
* </pre>
*/
public class StatusBarFragmentActivity extends BaseActivity {
public class BarStatusFragmentActivity extends BaseActivity {
private int[] itemIds = new int[]{R.id.navigation_color, R.id.navigation_alpha, R.id.navigation_image_view};
......@@ -36,7 +36,7 @@ public class StatusBarFragmentActivity extends BaseActivity {
private ArrayList<Fragment> mFragmentList = new ArrayList<>();
public static void start(Context context) {
Intent starter = new Intent(context, StatusBarFragmentActivity.class);
Intent starter = new Intent(context, BarStatusFragmentActivity.class);
context.startActivity(starter);
}
......@@ -52,7 +52,7 @@ public class StatusBarFragmentActivity extends BaseActivity {
@Override
public int bindLayout() {
return R.layout.activity_status_bar_fragment;
return R.layout.activity_bar_status_fragment;
}
@Override
......@@ -60,9 +60,9 @@ public class StatusBarFragmentActivity extends BaseActivity {
mVpHome = (ViewPager) findViewById(R.id.vp_home);
navigation = (BottomNavigationView) findViewById(R.id.navigation);
mFragmentList.add(StatusBarColorFragment.newInstance());
mFragmentList.add(StatusBarAlphaFragment.newInstance());
mFragmentList.add(StatusBarImageViewFragment.newInstance());
mFragmentList.add(BarStatusColorFragment.newInstance());
mFragmentList.add(BarStatusAlphaFragment.newInstance());
mFragmentList.add(BarStatusImageViewFragment.newInstance());
mVpHome.setAdapter(new FragmentPagerAdapter(getSupportFragmentManager()) {
......
......@@ -19,7 +19,7 @@ import com.blankj.utilcode.util.BarUtils;
* desc : Bar工具类Demo
* </pre>
*/
public class StatusBarImageViewActivity extends BaseActivity {
public class BarStatusImageViewActivity extends BaseActivity {
private int mAlpha;
......@@ -27,7 +27,7 @@ public class StatusBarImageViewActivity extends BaseActivity {
private SeekBar sbChangeAlpha;
public static void start(Context context) {
Intent starter = new Intent(context, StatusBarImageViewActivity.class);
Intent starter = new Intent(context, BarStatusImageViewActivity.class);
context.startActivity(starter);
}
......@@ -38,7 +38,7 @@ public class StatusBarImageViewActivity extends BaseActivity {
@Override
public int bindLayout() {
return R.layout.activity_status_bar_image_view;
return R.layout.activity_bar_status_image_view;
}
@Override
......@@ -86,6 +86,6 @@ public class StatusBarImageViewActivity extends BaseActivity {
};
private void updateStatusBar() {
BarUtils.setStatusBarAlpha(StatusBarImageViewActivity.this, mAlpha, true);
BarUtils.setStatusBarAlpha(BarStatusImageViewActivity.this, mAlpha, true);
}
}
......@@ -9,13 +9,15 @@ import android.view.View;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.LinearLayout;
import android.widget.SeekBar;
import android.widget.TextView;
import com.blankj.androidutilcode.R;
import com.blankj.androidutilcode.UtilsApp;
import com.blankj.androidutilcode.base.BaseBackActivity;
import com.blankj.androidutilcode.base.BaseActivity;
import com.blankj.utilcode.util.BarUtils;
import com.r0adkll.slidr.Slidr;
import java.util.Random;
......@@ -28,19 +30,20 @@ import java.util.Random;
* desc : Bar工具类Demo
* </pre>
*/
public class StatusBarSwipeBackActivity extends BaseBackActivity {
public class BarStatusSwipeBackActivity extends BaseActivity {
private Random mRandom;
private int mColor;
private int mAlpha;
private LinearLayout llContainer;
private CheckBox cbAlpha;
private TextView tvStatusAlpha;
private SeekBar sbChangeAlpha;
private Button btnRandomColor;
public static void start(Context context) {
Intent starter = new Intent(context, StatusBarSwipeBackActivity.class);
Intent starter = new Intent(context, BarStatusSwipeBackActivity.class);
context.startActivity(starter);
}
......@@ -53,11 +56,14 @@ public class StatusBarSwipeBackActivity extends BaseBackActivity {
@Override
public int bindLayout() {
return R.layout.activity_status_bar_swipe_back;
return R.layout.activity_bar_status_swipe_back;
}
@Override
public void initView(Bundle savedInstanceState, View view) {
Slidr.attach(this);
llContainer = (LinearLayout) findViewById(R.id.ll_container);
cbAlpha = (CheckBox) findViewById(R.id.cb_alpha);
btnRandomColor = (Button) findViewById(R.id.btn_random_color);
tvStatusAlpha = (TextView) findViewById(R.id.tv_status_alpha);
......@@ -70,9 +76,6 @@ public class StatusBarSwipeBackActivity extends BaseBackActivity {
tvStatusAlpha.setText(String.valueOf(mAlpha));
abl.setVisibility(View.GONE);
BarUtils.subtractMarginTopEqualStatusBarHeight(rootLayout);
BarUtils.addMarginTopEqualStatusBarHeight(cbAlpha);
updateStatusBar();
}
......@@ -119,10 +122,10 @@ public class StatusBarSwipeBackActivity extends BaseBackActivity {
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (isChecked) {
btnRandomColor.setVisibility(View.GONE);
rootLayout.setBackgroundResource(R.drawable.bg_bar);
llContainer.setBackgroundResource(R.drawable.bg_bar);
} else {
btnRandomColor.setVisibility(View.VISIBLE);
rootLayout.setBackgroundColor(Color.WHITE);
llContainer.setBackgroundColor(Color.WHITE);
}
updateStatusBar();
}
......@@ -131,8 +134,10 @@ public class StatusBarSwipeBackActivity extends BaseBackActivity {
private void updateStatusBar() {
if (cbAlpha.isChecked()) {
BarUtils.setStatusBarAlpha(this, mAlpha);
BarUtils.addMarginTopEqualStatusBarHeight(cbAlpha);
} else {
BarUtils.setStatusBarColor(this, mColor, mAlpha);
BarUtils.addMarginTopEqualStatusBarHeight(cbAlpha);
}
}
}
......@@ -9,6 +9,7 @@ import android.view.LayoutInflater;
import android.view.MenuItem;
import android.widget.FrameLayout;
import com.blankj.androidutilcode.Config;
import com.blankj.androidutilcode.R;
......@@ -23,17 +24,17 @@ import com.blankj.androidutilcode.R;
public abstract class BaseDrawerActivity extends BaseActivity {
protected DrawerLayout rootLayout;
protected FrameLayout flActivityContainer;
protected FrameLayout flActivityContainer;
NavigationView.OnNavigationItemSelectedListener mListener = new NavigationView.OnNavigationItemSelectedListener() {
@Override
public boolean onNavigationItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) {
case R.id.action_git_hub:
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/Blankj/AndroidUtilCode")));
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Config.GITHUB)));
break;
case R.id.action_blog:
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.jianshu.com/u/46702d5c6978")));
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Config.BLOG)));
break;
}
return false;
......
......@@ -7,7 +7,7 @@ import android.widget.SeekBar;
import android.widget.TextView;
import com.blankj.androidutilcode.R;
import com.blankj.androidutilcode.activity.StatusBarFragmentActivity;
import com.blankj.androidutilcode.activity.BarStatusFragmentActivity;
import com.blankj.androidutilcode.base.BaseFragment;
import com.blankj.utilcode.util.BarUtils;
......@@ -19,7 +19,7 @@ import com.blankj.utilcode.util.BarUtils;
* desc : Bar工具类Demo
* </pre>
*/
public class StatusBarAlphaFragment extends BaseFragment<StatusBarFragmentActivity> {
public class BarStatusAlphaFragment extends BaseFragment<BarStatusFragmentActivity> {
private int mAlpha;
......@@ -28,8 +28,8 @@ public class StatusBarAlphaFragment extends BaseFragment<StatusBarFragmentActivi
private View fakeStatusBar;
public static StatusBarAlphaFragment newInstance() {
return new StatusBarAlphaFragment();
public static BarStatusAlphaFragment newInstance() {
return new BarStatusAlphaFragment();
}
@Override
......@@ -39,7 +39,7 @@ public class StatusBarAlphaFragment extends BaseFragment<StatusBarFragmentActivi
@Override
public int bindLayout() {
return R.layout.fragment_status_bar_alpha;
return R.layout.fragment_bar_status_alpha;
}
@Override
......@@ -88,6 +88,6 @@ public class StatusBarAlphaFragment extends BaseFragment<StatusBarFragmentActivi
};
public void updateFakeStatusBar() {
BarUtils.setFakeStatusBarAlpha(fakeStatusBar, mAlpha);
BarUtils.setStatusBarAlpha(fakeStatusBar, mAlpha);
}
}
......@@ -9,7 +9,7 @@ import android.widget.TextView;
import com.blankj.androidutilcode.R;
import com.blankj.androidutilcode.UtilsApp;
import com.blankj.androidutilcode.activity.StatusBarFragmentActivity;
import com.blankj.androidutilcode.activity.BarStatusFragmentActivity;
import com.blankj.androidutilcode.base.BaseFragment;
import com.blankj.utilcode.util.BarUtils;
......@@ -23,7 +23,7 @@ import java.util.Random;
* desc : Bar工具类Demo
* </pre>
*/
public class StatusBarColorFragment extends BaseFragment<StatusBarFragmentActivity> {
public class BarStatusColorFragment extends BaseFragment<BarStatusFragmentActivity> {
private Random mRandom;
private int mColor;
......@@ -33,8 +33,8 @@ public class StatusBarColorFragment extends BaseFragment<StatusBarFragmentActivi
private SeekBar sbChangeAlpha;
private View fakeStatusBar;
public static StatusBarColorFragment newInstance() {
return new StatusBarColorFragment();
public static BarStatusColorFragment newInstance() {
return new BarStatusColorFragment();
}
@Override
......@@ -46,7 +46,7 @@ public class StatusBarColorFragment extends BaseFragment<StatusBarFragmentActivi
@Override
public int bindLayout() {
return R.layout.fragment_status_bar_color;
return R.layout.fragment_bar_status_color;
}
@Override
......@@ -101,6 +101,6 @@ public class StatusBarColorFragment extends BaseFragment<StatusBarFragmentActivi
};
public void updateFakeStatusBar() {
BarUtils.setFakeStatusBarColor(fakeStatusBar, mColor, mAlpha);
BarUtils.setStatusBarColor(fakeStatusBar, mColor, mAlpha);
}
}
......@@ -7,7 +7,7 @@ import android.widget.SeekBar;
import android.widget.TextView;
import com.blankj.androidutilcode.R;
import com.blankj.androidutilcode.activity.StatusBarFragmentActivity;
import com.blankj.androidutilcode.activity.BarStatusFragmentActivity;
import com.blankj.androidutilcode.base.BaseFragment;
import com.blankj.utilcode.util.BarUtils;
......@@ -19,7 +19,7 @@ import com.blankj.utilcode.util.BarUtils;
* desc : Bar工具类Demo
* </pre>
*/
public class StatusBarImageViewFragment extends BaseFragment<StatusBarFragmentActivity> {
public class BarStatusImageViewFragment extends BaseFragment<BarStatusFragmentActivity> {
private int mAlpha;
......@@ -27,8 +27,8 @@ public class StatusBarImageViewFragment extends BaseFragment<StatusBarFragmentAc
private SeekBar sbChangeAlpha;
private View fakeStatusBar;
public static StatusBarImageViewFragment newInstance() {
return new StatusBarImageViewFragment();
public static BarStatusImageViewFragment newInstance() {
return new BarStatusImageViewFragment();
}
@Override
......@@ -38,7 +38,7 @@ public class StatusBarImageViewFragment extends BaseFragment<StatusBarFragmentAc
@Override
public int bindLayout() {
return R.layout.fragment_status_bar_image_view;
return R.layout.fragment_bar_status_image_view;
}
@Override
......@@ -87,6 +87,6 @@ public class StatusBarImageViewFragment extends BaseFragment<StatusBarFragmentAc
};
public void updateFakeStatusBar() {
BarUtils.setFakeStatusBarAlpha(fakeStatusBar, mAlpha);
BarUtils.setStatusBarAlpha(fakeStatusBar, mAlpha);
}
}
......@@ -11,8 +11,7 @@
android:id="@+id/tv_about_activity"
style="@style/TextStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center" />
android:layout_height="wrap_content" />
<Button
android:id="@+id/btn_launch_image_activity"
......
......@@ -7,46 +7,66 @@
android:orientation="vertical"
android:padding="@dimen/spacing_16">
<TextView
style="@style/TextStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/bar_about_status_bar" />
<Button
android:id="@+id/btn_status_bar_color"
style="@style/WideBtnStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/status_bar_set_color" />
android:text="@string/bar_status_set_color" />
<Button
android:id="@+id/btn_status_bar_alpha"
style="@style/WideBtnStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/status_bar_set_alpha" />
android:text="@string/bar_status_set_alpha" />
<Button
android:id="@+id/btn_status_bar_image_view"
style="@style/WideBtnStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/status_bar_set_image_view" />
android:text="@string/bar_status_set_image_view" />
<Button
android:id="@+id/btn_status_bar_fragment"
style="@style/WideBtnStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/status_bar_set_fragment" />
android:text="@string/bar_status_set_fragment" />
<Button
android:id="@+id/btn_status_bar_swipe_back"
style="@style/WideBtnStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/status_bar_set_swipe_back" />
android:text="@string/bar_status_set_swipe_back" />
<Button
android:id="@+id/btn_status_bar_drawer"
style="@style/WideBtnStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/status_bar_set_drawer" />
android:text="@string/bar_status_set_drawer" />
<TextView
style="@style/TextStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_16"
android:text="@string/bar_about_nav_bar" />
<Button
android:id="@+id/btn_nav_bar"
style="@style/WideBtnStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/bar_nav_about" />
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical"
android:padding="@dimen/spacing_16">
<TextView
android:id="@+id/tv_about_nav"
style="@style/TextStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
......@@ -34,7 +34,7 @@
style="@style/WideBtnStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/status_bar_set_transparent" />
android:text="@string/bar_status_set_transparent" />
</LinearLayout>
</ScrollView>
......@@ -33,14 +33,14 @@
style="@style/WideBtnStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/status_bar_random_color" />
android:text="@string/bar_status_random_color" />
<Button
android:id="@+id/btn_set_transparent"
style="@style/WideBtnStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/status_bar_set_transparent" />
android:text="@string/bar_status_set_transparent" />
</LinearLayout>
</ScrollView>
......@@ -2,9 +2,7 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical">
android:layout_height="wrap_content">
<View
android:id="@+id/fake_status_bar"
......@@ -25,7 +23,15 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="4dp"
android:text="@string/status_bar_title_alpha" />
android:text="@string/bar_status_title_alpha" />
<CheckBox
android:id="@+id/cb_front"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="4dp"
android:text="@string/bar_status_is_front" />
<TextView
android:id="@+id/tv_status_alpha"
......@@ -47,14 +53,14 @@
style="@style/WideBtnStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/status_bar_random_color" />
android:text="@string/bar_status_random_color" />
<Button
android:id="@+id/btn_set_transparent"
style="@style/WideBtnStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/status_bar_set_transparent" />
android:text="@string/bar_status_set_transparent" />
</LinearLayout>
</FrameLayout>
\ No newline at end of file
......@@ -44,7 +44,7 @@
style="@style/WideBtnStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/status_bar_set_transparent" />
android:text="@string/bar_status_set_transparent" />
</LinearLayout>
</ScrollView>
......
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
android:id="@+id/ll_container"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/ll_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:gravity="center_horizontal"
android:orientation="vertical"
android:paddingLeft="@dimen/spacing_16"
android:paddingRight="@dimen/spacing_16">
android:orientation="vertical">
<CheckBox
android:id="@+id/cb_alpha"
......@@ -15,7 +14,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="4dp"
android:text="@string/status_bar_title_alpha" />
android:text="@string/bar_status_title_alpha" />
<TextView
android:id="@+id/tv_status_alpha"
......@@ -28,6 +27,8 @@
android:id="@+id/sb_change_alpha"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/spacing_16"
android:layout_marginRight="@dimen/spacing_16"
android:max="255"
android:padding="@dimen/spacing_8"
android:progress="112" />
......@@ -37,13 +38,17 @@
style="@style/WideBtnStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/status_bar_random_color" />
android:layout_marginLeft="@dimen/spacing_16"
android:layout_marginRight="@dimen/spacing_16"
android:text="@string/bar_status_random_color" />
<Button
android:id="@+id/btn_set_transparent"
style="@style/WideBtnStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/status_bar_set_transparent" />
android:layout_marginLeft="@dimen/spacing_16"
android:layout_marginRight="@dimen/spacing_16"
android:text="@string/bar_status_set_transparent" />
</LinearLayout>
\ No newline at end of file
......@@ -7,6 +7,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:fitsSystemWindows="true"
android:overScrollMode="never"
tools:openDrawer="start">
......
......@@ -40,7 +40,7 @@
style="@style/WideBtnStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/status_bar_set_transparent" />
android:text="@string/bar_status_set_transparent" />
</LinearLayout>
</LinearLayout>
......@@ -38,14 +38,14 @@
style="@style/WideBtnStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/status_bar_random_color" />
android:text="@string/bar_status_random_color" />
<Button
android:id="@+id/btn_set_transparent"
style="@style/WideBtnStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/status_bar_set_transparent" />
android:text="@string/bar_status_set_transparent" />
</LinearLayout>
</LinearLayout>
......@@ -45,7 +45,7 @@
style="@style/WideBtnStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/status_bar_set_transparent" />
android:text="@string/bar_status_set_transparent" />
</LinearLayout>
......
......@@ -4,16 +4,16 @@
<item
android:id="@+id/navigation_color"
android:icon="@drawable/ic_color"
android:title="@string/status_bar_title_color" />
android:title="@string/bar_status_title_color" />
<item
android:id="@+id/navigation_alpha"
android:icon="@drawable/ic_alpha"
android:title="@string/status_bar_title_alpha" />
android:title="@string/bar_status_title_alpha" />
<item
android:id="@+id/navigation_image_view"
android:icon="@drawable/ic_image"
android:title="@string/status_bar_title_image_view" />
android:title="@string/bar_status_title_image_view" />
</menu>
......@@ -51,17 +51,23 @@
<string name="app_get_details_settings">Get App Details Settings</string>
<!--Bar相关-->
<string name="status_bar_set_color">Set Color</string>
<string name="status_bar_set_alpha">Set Alpha</string>
<string name="status_bar_set_image_view">Set Image View</string>
<string name="status_bar_set_fragment">Set Fragment</string>
<string name="status_bar_set_swipe_back">Set Swipe Back</string>
<string name="status_bar_set_drawer">Set Drawer</string>
<string name="status_bar_random_color">Random Color</string>
<string name="status_bar_set_transparent">Set Transparent</string>
<string name="status_bar_title_color">Color</string>
<string name="status_bar_title_alpha">Alpha</string>
<string name="status_bar_title_image_view">Image</string>
<string name="bar_about_status_bar">About Status Bar</string>
<string name="bar_about_nav_bar">About Nav Bar</string>
<string name="bar_status_set_color">Set Color</string>
<string name="bar_status_set_alpha">Set Alpha</string>
<string name="bar_status_set_image_view">Set Image View</string>
<string name="bar_status_set_fragment">Set Fragment</string>
<string name="bar_status_set_swipe_back">Set Swipe Back</string>
<string name="bar_status_set_drawer">Set Drawer</string>
<string name="bar_status_random_color">Random Color</string>
<string name="bar_status_set_transparent">Set Transparent</string>
<string name="bar_status_title_color">Color</string>
<string name="bar_status_title_alpha">Alpha</string>
<string name="bar_status_is_front">Front</string>
<string name="bar_status_title_image_view">Image</string>
<string name="bar_nav_about">About Nav</string>
<!--Device相关-->
<string name="device_shutdown">Shutdown</string>
......
......@@ -16,9 +16,12 @@
<style name="TextStyle">
<item name="android:textSize">@dimen/font_24</item>
<item name="android:textColor">@color/light_black</item>
<item name="android:gravity">center</item>
</style>
<style name="WideBtnStyle" parent="TextStyle">
<style name="WideBtnStyle">
<item name="android:textSize">@dimen/font_24</item>
<item name="android:textColor">@color/light_black</item>
<item name="android:textAllCaps">false</item>
</style>
......
* 17/07/31 完善BarUtils,发布1.8.0
* 17/07/31 完善BarUtils
* 17/07/30 完善BarUtils
* 17/07/29 完善BarUtils
* 17/07/28 完善BarUtils
* 17/07/27 完善BarUtils
* 17/07/26 完善ActivityUtils
* 17/07/25 完善BarUtils,更新布局文件
* 17/07/24 完善BarUtils
......
......@@ -27,7 +27,7 @@ android {
defaultConfig {
minSdkVersion 14
versionCode 41
versionName "1.7.1"
versionName "1.8.0"
}
buildTypes {
......
......@@ -12,6 +12,8 @@ import android.support.annotation.NonNull;
import android.util.DisplayMetrics;
import android.view.Surface;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
/**
* <pre>
......@@ -30,7 +32,7 @@ public final class ScreenUtils {
/**
* 获取屏幕的宽度(单位:px)
*
* @return 屏幕宽px
* @return 屏幕宽
*/
public static int getScreenWidth() {
return Utils.getContext().getResources().getDisplayMetrics().widthPixels;
......@@ -39,12 +41,24 @@ public final class ScreenUtils {
/**
* 获取屏幕的高度(单位:px)
*
* @return 屏幕高px
* @return 屏幕高
*/
public static int getScreenHeight() {
return Utils.getContext().getResources().getDisplayMetrics().heightPixels;
}
/**
* 设置屏幕为全屏
* <p>需在 {@code setContentView} 之前调用</p>
*
* @param activity activity
*/
public static void setFullScreen(@NonNull final Activity activity) {
activity.requestWindowFeature(Window.FEATURE_NO_TITLE);
activity.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FULLSCREEN);
}
/**
* 设置屏幕为横屏
* <p>还有一种就是在Activity中加属性android:screenOrientation="landscape"</p>
......@@ -107,41 +121,38 @@ public final class ScreenUtils {
}
/**
* 获取当前屏幕截图,包含状态栏
* 截屏
*
* @param activity activity
* @return Bitmap
*/
public static Bitmap captureWithStatusBar(@NonNull final Activity activity) {
View view = activity.getWindow().getDecorView();
view.setDrawingCacheEnabled(true);
view.buildDrawingCache();
Bitmap bmp = view.getDrawingCache();
DisplayMetrics dm = new DisplayMetrics();
activity.getWindowManager().getDefaultDisplay().getMetrics(dm);
Bitmap ret = Bitmap.createBitmap(bmp, 0, 0, dm.widthPixels, dm.heightPixels);
view.destroyDrawingCache();
return ret;
public static Bitmap screenShot(@NonNull final Activity activity) {
return screenShot(activity, true);
}
/**
* 获取当前屏幕截图,不包含状态栏
* 截屏
*
* @param activity activity
* @return Bitmap
*/
public static Bitmap captureWithoutStatusBar(@NonNull final Activity activity) {
View view = activity.getWindow().getDecorView();
view.setDrawingCacheEnabled(true);
view.buildDrawingCache();
Bitmap bmp = view.getDrawingCache();
Resources resources = activity.getResources();
int resourceId = resources.getIdentifier("status_bar_height", "dimen", "android");
int statusBarHeight = resources.getDimensionPixelSize(resourceId);
public static Bitmap screenShot(@NonNull final Activity activity, boolean isDeleteStatusBar) {
View decorView = activity.getWindow().getDecorView();
decorView.setDrawingCacheEnabled(true);
decorView.buildDrawingCache();
Bitmap bmp = decorView.getDrawingCache();
DisplayMetrics dm = new DisplayMetrics();
activity.getWindowManager().getDefaultDisplay().getMetrics(dm);
Bitmap ret = Bitmap.createBitmap(bmp, 0, statusBarHeight, dm.widthPixels, dm.heightPixels - statusBarHeight);
view.destroyDrawingCache();
Bitmap ret;
if (isDeleteStatusBar) {
Resources resources = activity.getResources();
int resourceId = resources.getIdentifier("status_bar_height", "dimen", "android");
int statusBarHeight = resources.getDimensionPixelSize(resourceId);
ret = Bitmap.createBitmap(bmp, 0, statusBarHeight, dm.widthPixels, dm.heightPixels - statusBarHeight);
} else {
ret = Bitmap.createBitmap(bmp, 0, 0, dm.widthPixels, dm.heightPixels);
}
decorView.destroyDrawingCache();
return ret;
}
......
......@@ -39,7 +39,7 @@ public class TestUtils {
Utils.init(RuntimeEnvironment.application);
}
// @Test
// @Test
public void readme2Eng() throws Exception {
formatCN();
File readmeCN = new File(new File(System.getProperty("user.dir")).getAbsolutePath() + FILE_SEP + "README-CN.md");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册