Merge pull request Blankj#816 from Blankj/1.23.2

1.23.2

Author: Blankj

CHANGELOG.md

@@ -1,3 +1,5 @@
+* `19/01/24` [add] CloneUtils. Publish v1.23.2.
+* `19/01/24` [add] BrightnessUtils and FlashlightUtils.
 * `19/01/23` [add] Modify the demo of utilcode use kotlin. Publish v1.23.1.
 * `19/01/22` [fix] AppUtils#installApp.
 * `19/01/17` [fix] Publish v1.23.0.

README-CN.md

@@ -41,7 +41,7 @@
 
 [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
 
-[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.23.1-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.23.2-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

README.md

@@ -41,7 +41,7 @@ If this project helps you a lot and you want to support the project's developmen
 
 [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
 
-[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.23.1-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.23.2-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

config.gradle

@@ -5,8 +5,8 @@ ext {
     compileSdkVersion = 27
     minSdkVersion = 14
     targetSdkVersion = 27
-    versionCode = 1_023_001
-    versionName = '1.23.1'// E.g. 1.9.72 => 1,009,072
+    versionCode = 1_023_002
+    versionName = '1.23.2'// E.g. 1.9.72 => 1,009,072
 
     bus = [
             isDebug: false,

launcher/app/__bus__.json

@@ -1,4 +1,4 @@
 {
-  "SubUtilActivity#start": "void com.blankj.subutil.pkg.feature.SubUtilActivity.start(android.content.Context)",
+  "SubUtilActivity#start": "void com.blankj.subutil.pkg.feature.SubUtilActivity.Companion.start(android.content.Context)",
   "CoreUtilActivity#start": "void com.blankj.utilcode.pkg.feature.CoreUtilActivity.Companion.start(android.content.Context)"
 }

launcher/pkg/src/main/java/com/blankj/launcher/pkg/MainActivity.kt

@@ -36,14 +36,14 @@ class MainActivity : BaseDrawerActivity() {
         launcherMainCtl.setExpandedTitleColor(Color.TRANSPARENT)
         setSupportActionBar(launcherMainToolbar)
         val toggle = ActionBarDrawerToggle(this,
-                mDrawerRootLayout,
+                mBaseDrawerRootLayout,
                 launcherMainToolbar,
                 R.string.navigation_drawer_open,
                 R.string.navigation_drawer_close)
-        mDrawerRootLayout.addDrawerListener(toggle)
+        mBaseDrawerRootLayout.addDrawerListener(toggle)
         toggle.syncState()
 
-        BarUtils.setStatusBarColor4Drawer(mDrawerRootLayout, launcherMainFakeStatusBar, Color.TRANSPARENT, false)
+        BarUtils.setStatusBarColor4Drawer(mBaseDrawerRootLayout, launcherMainFakeStatusBar, Color.TRANSPARENT, false)
         BarUtils.addMarginTopEqualStatusBarHeight(launcherMainToolbar)
 
         launcherMainCoreUtilBtn.setOnClickListener {

lib/base/build.gradle

@@ -15,5 +15,5 @@ dependencies {
     api dep.free_proguard
     api 'com.r0adkll:slidableactivity:2.0.5'
     compileOnly dep.leakcanary.android_no_op
-//    api 'com.blankj:utilcode:1.23.1'
+//    api 'com.blankj:utilcode:1.23.2'
 }

lib/base/src/main/java/com/blankj/lib/base/BaseBackActivity.kt

@@ -23,13 +23,13 @@ abstract class BaseBackActivity : BaseActivity() {
         super.setRootLayout(R.layout.activity_back)
         Slidr.attach(this)
         if (layoutId > 0) {
-            LayoutInflater.from(this).inflate(layoutId, drawerContainerView)
+            LayoutInflater.from(this).inflate(layoutId, baseBackContainerView)
         }
         setSupportActionBar(baseBackToolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
         BarUtils.setStatusBarColor(this, ContextCompat.getColor(Utils.getApp(), R.color.colorPrimary))
-        BarUtils.addMarginTopEqualStatusBarHeight(backRootLayout)
+        BarUtils.addMarginTopEqualStatusBarHeight(baseBackRootLayout)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {

lib/base/src/main/java/com/blankj/lib/base/BaseDrawerActivity.kt

@@ -20,23 +20,23 @@ import kotlinx.android.synthetic.main.activity_drawer.*
  */
 abstract class BaseDrawerActivity : BaseActivity() {
 
-    protected lateinit var mDrawerRootLayout: DrawerLayout
-    protected lateinit var mDrawerContainerView: FrameLayout
+    protected lateinit var mBaseDrawerRootLayout: DrawerLayout
+    protected lateinit var mBaseDrawerContainerView: FrameLayout
 
     override fun setRootLayout(layoutId: Int) {
         super.setRootLayout(R.layout.activity_drawer)
         if (layoutId > 0) {
-            LayoutInflater.from(this).inflate(layoutId, drawerContainerView)
+            LayoutInflater.from(this).inflate(layoutId, baseDrawerContainerView)
         }
-        drawerNavView.setNavigationItemSelectedListener l@{ item ->
+        baseDrawerNavView.setNavigationItemSelectedListener l@{ item ->
             when (item.itemId) {
-                R.id.action_git_hub -> return@l goWeb(R.string.github)
-                R.id.action_blog -> return@l goWeb(R.string.blog)
+                R.id.baseDrawerActionGitHub -> return@l goWeb(R.string.github)
+                R.id.baseDrawerActionBlog -> return@l goWeb(R.string.blog)
             }
             false
         }
-        mDrawerRootLayout = drawerRootLayout
-        mDrawerContainerView = drawerContainerView
+        mBaseDrawerRootLayout = baseDrawerRootLayout
+        mBaseDrawerContainerView = baseDrawerContainerView
     }
 
     private fun goWeb(@StringRes id: Int): Boolean {

lib/base/src/main/res/layout/activity_back.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/backRootLayout"
+    android:id="@+id/baseBackRootLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white">
@@ -26,7 +26,7 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <FrameLayout
-            android:id="@+id/drawerContainerView"
+            android:id="@+id/baseBackContainerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
     </android.support.v4.widget.NestedScrollView>

lib/base/src/main/res/layout/activity_drawer.xml

@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/drawerRootLayout"
+    android:id="@+id/baseDrawerRootLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white"
@@ -12,12 +12,12 @@
     tools:openDrawer="start">
 
     <FrameLayout
-        android:id="@+id/drawerContainerView"
+        android:id="@+id/baseDrawerContainerView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
     <android.support.design.widget.NavigationView
-        android:id="@+id/drawerNavView"
+        android:id="@+id/baseDrawerNavView"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"

lib/base/src/main/res/layout/activity_drawer_nav_header.xml

@@ -12,7 +12,7 @@
         android:src="@drawable/main_bg_header" />
 
     <ImageView
-        android:id="@+id/avatarIv"
+        android:id="@+id/baseDrawerNavHeaderAvatarIv"
         android:layout_width="80dp"
         android:layout_height="80dp"
         android:layout_above="@+id/descTv"
@@ -24,7 +24,7 @@
         android:layout_height="80dp"
         android:layout_above="@+id/descTv"
         android:layout_marginLeft="@dimen/spacing_16"
-        android:layout_toRightOf="@id/avatarIv"
+        android:layout_toRightOf="@id/baseDrawerNavHeaderAvatarIv"
         android:gravity="center_vertical"
         android:text="@string/author"
         android:textColor="@color/white"

lib/base/src/main/res/menu/main_drawer.xml

@@ -1,12 +1,12 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:id="@+id/action_git_hub"
+        android:id="@+id/baseDrawerActionGitHub"
         android:icon="@drawable/main_menu_github"
         android:title="GitHub" />
 
     <item
-        android:id="@+id/action_blog"
+        android:id="@+id/baseDrawerActionBlog"
         android:icon="@drawable/main_menu_blog"
         android:title="Blog" />
 </menu>

lib/base/src/main/res/values-v26/styles.xml

@@ -12,22 +12,4 @@
         <item name="android:windowIsTranslucent">false</item>
         <item name="android:windowBackground">@android:color/transparent</item>
     </style>
-
-    <style name="TextStyle">
-        <item name="android:textSize">@dimen/font_24</item>
-        <item name="android:textColor">@color/light_black</item>
-    </style>
-
-    <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>
-
-    <style name="AnimationActivity" parent="@android:style/Animation.Translucent">
-        <item name="android:activityOpenEnterAnimation">@anim/slide_in_left</item>
-        <item name="android:activityOpenExitAnimation">@anim/slide_out_left</item>
-        <item name="android:activityCloseEnterAnimation">@anim/slide_in_right</item>
-        <item name="android:activityCloseExitAnimation">@anim/slide_out_right</item>
-    </style>
 </resources>

lib/base/src/main/res/values-v27/styles.xml

@@ -12,22 +12,4 @@
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
     </style>
-
-    <style name="TextStyle">
-        <item name="android:textSize">@dimen/font_24</item>
-        <item name="android:textColor">@color/light_black</item>
-    </style>
-
-    <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>
-
-    <style name="AnimationActivity" parent="@android:style/Animation.Translucent">
-        <item name="android:activityOpenEnterAnimation">@anim/slide_in_left</item>
-        <item name="android:activityOpenExitAnimation">@anim/slide_out_left</item>
-        <item name="android:activityCloseEnterAnimation">@anim/slide_in_right</item>
-        <item name="android:activityCloseExitAnimation">@anim/slide_out_right</item>
-    </style>
 </resources>

lib/base/src/main/res/values/styles.xml

@@ -18,12 +18,14 @@
         <item name="android:textColor">@color/light_black</item>
     </style>
 
-    <style name="WideBtnStyle">
-        <item name="android:textSize">@dimen/font_24</item>
-        <item name="android:textColor">@color/light_black</item>
+    <style name="WideBtnStyle" parent="TextStyle">
         <item name="android:textAllCaps">false</item>
     </style>
 
+    <style name="CbStyle" parent="TextStyle">
+
+    </style>
+
     <style name="AnimationActivity" parent="@android:style/Animation.Translucent">
         <item name="android:activityOpenEnterAnimation">@anim/slide_in_left</item>
         <item name="android:activityOpenExitAnimation">@anim/slide_out_left</item>

subutil/README-CN.md

@@ -5,15 +5,6 @@
 
 ## APIs
 
-* ### 亮度相关 -> [BrightnessUtils.java][brightness.java] -> [Demo][brightness.demo]
-```
-isAutoBrightnessEnabled : 判断是否开启自动调节亮度
-setAutoBrightnessEnabled: 设置是否开启自动调节亮度
-getBrightness           : 获取屏幕亮度
-setBrightness           : 设置屏幕亮度
-setWindowBrightness     : 设置窗口亮度
-getWindowBrightness     : 获取窗口亮度
-```
 
 * ### 剪贴板相关 -> [ClipboardUtils.java][clipboard.java] -> [Test][clipboard.test]
 ```
@@ -25,11 +16,6 @@ copyIntent: 复制意图到剪贴板
 getIntent : 获取剪贴板的意图
 ```
 
-* ### 克隆相关 -> [CloneUtils.java][clone.java] -> [Test][clone.test]
-```
-deepClone: 深度克隆
-```
-
 * ### 坐标转换相关 -> [CoordinateUtils.java][coordinate.java] -> [Test][coordinate.test]
 ```
 bd09ToGcj02 : BD09 坐标转 GCJ02 坐标
@@ -40,17 +26,6 @@ bd09ToWGS84 : BD09 坐标转 WGS84 坐标
 wgs84ToBd09 : WGS84 坐标转 BD09 坐标
 ```
 
-* ### 闪光灯相关 -> [FlashlightUtils.java][flashlight.java] -> [Demo][flashlight.demo]
-```
-getInstance              : 获取闪光灯实例
-Instance.register        : 注册
-Instance.unregister      : 注销
-Instance.setFlashlightOn : 打开闪光灯
-Instance.setFlashlightOff: 关闭闪光灯
-Instance.isFlashlightOn  : 判断闪光灯是否打开
-isFlashlightEnable       : 判断设备是否支持闪光灯
-```
-
 * ### 定位相关 -> [LocationUtils.java][location.java] -> [Demo][location.demo]
 ```
 isGpsEnabled     : 判断 Gps 是否可用
@@ -78,23 +53,14 @@ getSurnameFirstLetter: 根据名字获取姓氏的首字母
 
 
 
-[brightness.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/BrightnessUtils.java
-[brightness.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/brightness/BrightnessActivity.java
-
 [clipboard.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/ClipboardUtils.java
 [clipboard.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/test/java/com/blankj/subutil/util/ClipboardUtilsTest.java
 
-[clone.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/CloneUtils.java
-[clone.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/test/java/com/blankj/subutil/util/CloneUtilsTest.java
-
 [coordinate.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/CoordinateUtils.java
 [coordinate.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/test/java/com/blankj/subutil/util/CoordinateUtilsTest.java
 
-[flashlight.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/FlashlightUtils.java
-[flashlight.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/flashlight/FlashlightActivity.java
-
 [location.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/LocationUtils.java
-[location.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/location/LocationActivity.java
+[location.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/location/LocationActivity.kt
 
 [pinyin.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/PinyinUtils.java
-[pinyin.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/pinyin/PinyinActivity.java
+[pinyin.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/pinyin/PinyinActivity.kt

subutil/README.md

@@ -5,15 +5,6 @@ You should copy the following classes which you want to use in your project.
 
 ## APIs
 
-* ### About Brightness -> [BrightnessUtils.java][brightness.java] -> [Demo][brightness.demo]
-```
-isAutoBrightnessEnabled
-setAutoBrightnessEnabled
-getBrightness
-setBrightness
-setWindowBrightness
-getWindowBrightness
-```
 
 * ### About Clipboard -> [ClipboardUtils.java][clipboard.java] -> [Test][clipboard.test]
 ```
@@ -25,11 +16,6 @@ copyIntent
 getIntent
 ```
 
-* ### About Clone -> [CloneUtils.java][clone.java] -> [Test][clone.test]
-```
-deepClone
-```
-
 * ### About Coordinate -> [CoordinateUtils.java][coordinate.java] -> [Test][coordinate.test]
 ```
 bd09ToGcj02
@@ -40,17 +26,6 @@ bd09ToWGS84
 wgs84ToBd09
 ```
 
-* ### About Flashlight -> [FlashlightUtils.java][flashlight.java] -> [Demo][flashlight.demo]
-```
-getInstance
-Instance.register
-Instance.unregister
-Instance.setFlashlightOn
-Instance.setFlashlightOff
-Instance.isFlashlightOn
-isFlashlightEnable
-```
-
 * ### About Location -> [LocationUtils.java][location.java] -> [Demo][location.demo]
 ```
 isGpsEnabled
@@ -78,23 +53,14 @@ getSurnameFirstLetter
 
 
 
-[brightness.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/BrightnessUtils.java
-[brightness.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/brightness/BrightnessActivity.java
-
 [clipboard.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/ClipboardUtils.java
 [clipboard.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/test/java/com/blankj/subutil/util/ClipboardUtilsTest.java
 
-[clone.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/CloneUtils.java
-[clone.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/test/java/com/blankj/subutil/util/CloneUtilsTest.java
-
 [coordinate.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/CoordinateUtils.java
 [coordinate.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/test/java/com/blankj/subutil/util/CoordinateUtilsTest.java
 
-[flashlight.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/FlashlightUtils.java
-[flashlight.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/flashlight/FlashlightActivity.java
-
 [location.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/LocationUtils.java
-[location.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/location/LocationActivity.java
+[location.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/location/LocationActivity.kt
 
 [pinyin.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/PinyinUtils.java
-[pinyin.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/pinyin/PinyinActivity.java
+[pinyin.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/pinyin/PinyinActivity.kt