Merge pull request #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>