see 03/09 log

Author: Blankj

CHANGELOG.md

@@ -1,3 +1,7 @@
+* `20/01/20` [upd] Publish v1.26.1.
+* `20/01/19` [add] Publish bus plugin v1.4.
+* `20/01/18` [add] Publish api plugin v2.6.
+* `20/01/17` [upd] Leak Canary to v2.1.
 * `19/12/08` [add] Publish bus plugin v2.5.
 * `19/12/06` [add] Publish api plugin v1.3.
 * `19/11/30` [add] Publish bus plugin v2.4. Publish api plugin v1.2.

buildApp.gradle

@@ -67,8 +67,6 @@ android {
 dependencies {
     // LeakCanary
     debugImplementation Config.depConfig.leakcanary_android.dep
-    debugImplementation Config.depConfig.leakcanary_support_fragment.dep
-    releaseImplementation Config.depConfig.leakcanary_android_no_op.dep
 
     debugImplementation Config.depConfig.lib_utildebug.dep
     releaseImplementation Config.depConfig.lib_utildebug_no_op.dep
@@ -84,8 +82,8 @@ dependencies {
 }
 
 def getSuffix() {
-    if (project.path == ":feature:launcher:app") return ""
-    return project.path.replace(":", "_").substring(":feature".length(), project.path.length() - ":app".length())
+    if (project.path == ":feature_launcher_app") return ""
+    return "." + project.path.substring(":feature_".length(), project.path.length() - "_app".length())
 }
 
 def configSigning() {

buildLib.gradle

@@ -24,20 +24,19 @@ android {
     lintOptions {
         abortOnError false
     }
-}
 
-afterEvaluate {
-    generateReleaseBuildConfig.enabled = false
-    generateDebugBuildConfig.enabled = false
+//    viewBinding {
+//        enabled = true
+//    }
 }
 
 dependencies {
-    if (project.name == 'pkg' || project.name == 'mock') {
+    if (project.name.endsWith("_pkg") || project.name.endsWith("_mock")) {
         // if module's name equals 'pkg', api all of export
         for (def entrySet : ConfigUtils.getApplyExports().entrySet()) {
             api entrySet.value.dep
         }
-    } else if (project.name == 'export') {
+    } else if (project.name.endsWith("_export")) {
         api Config.depConfig.lib_common.dep
     }
 }

buildSrc/src/main/groovy/Config.groovy

@@ -11,17 +11,16 @@ class Config {
     static applicationId = 'com.blankj.androidutilcode'
     static appName = 'Util'
 
-    static compileSdkVersion = 28
+    static compileSdkVersion = 29
     static minSdkVersion = 14
-    static targetSdkVersion = 28
+    static targetSdkVersion = 29
     static versionCode = 1_026_001
-    static versionName = '1.26.1-alpha0'// E.g. 1.9.72 => 1,009,072
+    static versionName = '1.26.1-alpha3'// E.g. 1.9.72 => 1,009,072
 
     // lib version
-    static gradlePluginVersion = '3.5.2'
+    static gradlePluginVersion = '3.5.0'
     static kotlinVersion = '1.3.50'
     static supportVersion = '28.0.0'
-    static leakcanaryVersion = '1.6.3'
 
     static depConfig = [
             /*Never delete this line*/
@@ -54,10 +53,10 @@ class Config {
             // 本地第一次上传插件新的版本需设置 isApply = false, useLocal = true
             // 本地上传成功之后 isApply = true 即可应用插件来调试，后续版本更新无需设置 isApply = false
             // 发布版本的话把 isApply = false, useLocal = false，更新版本号，发布成功后 isApply = true 即可使用远程库版本
-            plugin_api                 : new DepConfig(isApply: false, useLocal: true, pluginPath: "com.blankj:api-gradle-plugin:1.3-r4", pluginId: "com.blankj.api"),
+            plugin_api                 : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:api-gradle-plugin:1.4-r1", pluginId: "com.blankj.api"),
             //./gradlew plugin:api-gradle-plugin:uploadArchives // 上传到本地 maven
             //./gradlew plugin:api-gradle-plugin:bintrayUpload  // 上传到 jcenter
-            plugin_bus                 : new DepConfig(isApply: true, useLocal: true, pluginPath: "com.blankj:bus-gradle-plugin:2.5", pluginId: "com.blankj.bus"),
+            plugin_bus                 : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:bus-gradle-plugin:2.6-r2", pluginId: "com.blankj.bus"),
             //./gradlew plugin:bus-gradle-plugin:uploadArchives // 上传到本地 maven
             //./gradlew plugin:bus-gradle-plugin:bintrayUpload  // 上传到 jcenter
 
@@ -68,9 +67,7 @@ class Config {
 
             kotlin                     : new DepConfig("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"),
 
-            leakcanary_android         : new DepConfig("com.squareup.leakcanary:leakcanary-android:$leakcanaryVersion"),
-            leakcanary_android_no_op   : new DepConfig("com.squareup.leakcanary:leakcanary-android-no-op:$leakcanaryVersion"),
-            leakcanary_support_fragment: new DepConfig("com.squareup.leakcanary:leakcanary-support-fragment:$leakcanaryVersion"),
+            leakcanary_android         : new DepConfig("com.squareup.leakcanary:leakcanary-android:2.1"),
 
             free_proguard              : new DepConfig("com.blankj:free-proguard:1.0.2"),
             swipe_panel                : new DepConfig("com.blankj:swipe-panel:1.2"),
@@ -86,7 +83,7 @@ class Config {
             photo_view                 : new DepConfig("com.github.chrisbanes:PhotoView:2.0.0"),
 
             test_junit                 : new DepConfig("junit:junit:4.12"),
-            test_robolectric           : new DepConfig("org.robolectric:robolectric:4.2"),
+            test_robolectric           : new DepConfig("org.robolectric:robolectric:4.3.1"),
     ]
 }
 //./gradlew clean :lib:utilcode:bintrayUpload

buildSrc/src/main/groovy/ConfigUtils.groovy

@@ -14,10 +14,10 @@ import org.gradle.api.invocation.Gradle
 class ConfigUtils {
 
     static init(Gradle gradle) {
-        GitUtils.init(gradle)
         generateDep(gradle)
         addCommonGradle(gradle)
         TaskDurationUtils.init(gradle)
+        GitUtils.init(gradle)
     }
 
     /**
@@ -47,10 +47,10 @@ class ConfigUtils {
             void beforeEvaluate(Project project) {
                 // 在 project 的 build.gradle 前 do sth.
                 if (project.subprojects.isEmpty()) {
-                    if (project.path.contains(":plugin:")) {
+                    if (project.name.startsWith("plugin")) {
                         return
                     }
-                    if (project.name == "app") {
+                    if (project.name.endsWith("_app")) {
                         GLog.l(project.toString() + " applies buildApp.gradle")
                         project.apply {
                             from "${project.rootDir.path}/buildApp.gradle"

buildSrc/src/main/groovy/DepConfig.groovy

@@ -75,6 +75,10 @@ class DepConfig {
         return splits.length == 3 ? splits[2] : null
     }
 
+    String getLocalPath() {
+        return ":" + localPath.replace(":", "_").substring(1)
+    }
+
     @Override
     String toString() {
         return "{ isApply = ${getFlag(isApply)}" +

buildSrc/src/main/groovy/GitUtils.groovy

@@ -19,12 +19,6 @@ class GitUtils {
     static void init(Gradle gradle) {
         rootProject = gradle.rootProject
         addGitHelpTask()
-//        gradle.rootProject(new Action<Project>() {
-//            @Override
-//            void execute(Project project) {
-//                addGitHelpTask()
-//            }
-//        })
     }
 
     static def addGitHelpTask() {

feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/helper/DialogHelper.kt

@@ -88,7 +88,7 @@ object DialogHelper {
                 contentView.findViewById<View>(R.id.keyboardDialogCloseBtn).setOnClickListener(listener)
 
                 dialog.dialog.setOnShowListener(DialogInterface.OnShowListener {
-                    KeyboardUtils.fixAndroidBug5497(dialog.dialog.window)
+                    KeyboardUtils.fixAndroidBug5497(dialog.dialog.window!!)
                 })
             }
 

lib/base/build.gradle

@@ -12,5 +12,4 @@ dependencies {
     api Config.depConfig.swipe_panel.dep
     api Config.depConfig.eventbus_lib.dep
     compileOnly Config.depConfig.lib_utildebug_no_op.dep
-    compileOnly Config.depConfig.leakcanary_android_no_op.dep
 }

lib/base/src/main/java/com/blankj/base/BaseApplication.java

@@ -8,7 +8,6 @@
 import com.blankj.utilcode.util.CrashUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ProcessUtils;
-import com.squareup.leakcanary.LeakCanary;
 
 import java.util.ArrayList;
 
@@ -43,22 +42,10 @@ protected void attachBaseContext(Context base) {
     public void onCreate() {
         super.onCreate();
         sInstance = this;
-        initLeakCanary();
         initLog();
         initCrash();
     }
 
-    private void initLeakCanary() {// 内存泄露检查工具
-        if (isDebug()) {
-            if (LeakCanary.isInAnalyzerProcess(this)) {
-                // This process is dedicated to LeakCanary for heap analysis.
-                // You should not init your app in this process.
-                return;
-            }
-            LeakCanary.install(this);
-        }
-    }
-
     // init it in ur application
     public void initLog() {
         LogUtils.Config config = LogUtils.getConfig()

lib/utilcode/README-CN.md

@@ -13,7 +13,7 @@ implementation 'com.blankj:utilcodex:1.26.0'
 
 * ### Activity 相关 -> [ActivityUtils.java][activity.java] -> [Demo][activity.demo]
 ```
-getActivityByView              : 根据视图获取 Activity
+getAliveActivityByContext      : 根据上下文获取存活的 Activity
 getActivityByContext           : 根据上下文获取 Activity
 isActivityExists               : 判断 Activity 是否存在
 startActivity                  : 启动 Activity
@@ -135,8 +135,8 @@ isNavBarVisible                      : 判断导航栏是否可见
 setNavBarColor                       : 设置导航栏颜色
 getNavBarColor                       : 获取导航栏颜色
 isSupportNavBar                      : 判断是否支持导航栏
-setNavBarLightMode                   : 设置状态栏是否为浅色模式
-isNavBarLightMode                    : 判断状态栏是否为浅色模式
+setNavBarLightMode                   : 设置导航栏是否为浅色模式
+isNavBarLightMode                    : 判断导航栏是否为浅色模式
 ```
 
 * ### 亮度相关 -> [BrightnessUtils.java][brightness.java] -> [Demo][brightness.demo]

lib/utilcode/README.md

@@ -13,7 +13,7 @@ implementation 'com.blankj:utilcodex:1.26.0'
 
 * ### About Activity -> [ActivityUtils.java][activity.java] -> [Demo][activity.demo]
 ```
-getActivityByView
+getAliveActivityByContext
 getActivityByContext
 isActivityExists
 startActivity
@@ -272,6 +272,8 @@ applyPressedBgAlpha
 applyPressedBgDark
 applySingleDebouncing
 applyGlobalDebouncing
+expandClickArea
+back2HomeFriendly
 ClickUtils#OnDebouncingClickListener
 ClickUtils#OnMultiClickListener
 ```

lib/utilcode/src/main/java/com/blankj/utilcode/constant/RegexConstants.java

@@ -22,7 +22,7 @@ public final class RegexConstants {
      * <p>global star: 1349</p>
      * <p>virtual operator: 170</p>
      */
-    public static final String REGEX_MOBILE_EXACT  = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(16[6])|(17[0,1,3,5-8])|(18[0-9])|(19[1,8,9]))\\d{8}$";
+    public static final String REGEX_MOBILE_EXACT  = "^((13[0-9])|(14[57])|(15[0-35-9])|(16[6])|(17[0135-8])|(18[0-9])|(19[189]))\\d{8}$";
     /**
      * Regex of telephone number.
      */

lib/utilcode/src/main/java/com/blankj/utilcode/util/ActivityUtils.java

@@ -40,13 +40,15 @@ private ActivityUtils() {
     }
 
     /**
-     * Return the activity by view.
+     * Return the activity by context.
      *
-     * @param view The view.
-     * @return the activity by view.
+     * @param context The context.
+     * @return the activity by context.
      */
-    public static Activity getActivityByView(@NonNull View view) {
-        return getActivityByContext(view.getContext());
+    public static Activity getAliveActivityByContext(Context context) {
+        Activity activity = getActivityByContext(context);
+        if (!isActivityAlive(activity)) return null;
+        return activity;
     }
 
     /**

lib/utilcode/src/main/java/com/blankj/utilcode/util/BarUtils.java

@@ -25,6 +25,8 @@
 import android.view.Window;
 import android.view.WindowManager;
 
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
 import static android.Manifest.permission.EXPAND_STATUS_BAR;
@@ -272,7 +274,7 @@ public static View setStatusBarColor(@NonNull final Window window,
     public static void setStatusBarColor(@NonNull final View fakeStatusBar,
                                          @ColorInt final int color) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) return;
-        Activity activity = getActivityByView(fakeStatusBar);
+        Activity activity = getActivityByContext(fakeStatusBar.getContext());
         if (activity == null) return;
         transparentStatusBar(activity);
         fakeStatusBar.setVisibility(View.VISIBLE);
@@ -289,7 +291,7 @@ public static void setStatusBarColor(@NonNull final View fakeStatusBar,
      */
     public static void setStatusBarCustom(@NonNull final View fakeStatusBar) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) return;
-        Activity activity = getActivityByView(fakeStatusBar);
+        Activity activity = getActivityByContext(fakeStatusBar.getContext());
         if (activity == null) return;
         transparentStatusBar(activity);
         fakeStatusBar.setVisibility(View.VISIBLE);
@@ -334,7 +336,7 @@ public static void setStatusBarColor4Drawer(@NonNull final DrawerLayout drawer,
                                                 @ColorInt final int color,
                                                 final boolean isTop) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) return;
-        Activity activity = getActivityByView(fakeStatusBar);
+        Activity activity = getActivityByContext(fakeStatusBar.getContext());
         if (activity == null) return;
         transparentStatusBar(activity);
         drawer.setFitsSystemWindows(false);
@@ -699,15 +701,24 @@ public static boolean isNavBarLightMode(@NonNull final Window window) {
         return false;
     }
 
-    private static Activity getActivityByView(@NonNull final View view) {
-        Context context = view.getContext();
+    private static Activity getActivityByContext(Context context) {
+        if (context instanceof Activity) return (Activity) context;
+        if (context != null && context.getClass().getName().equals("com.android.internal.policy.DecorContext")) {
+            try {
+                Field mActivityContextField = context.getClass().getDeclaredField("mActivityContext");
+                mActivityContextField.setAccessible(true);
+                //noinspection unchecked
+                return ((WeakReference<Activity>) mActivityContextField.get(context)).get();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
         while (context instanceof ContextWrapper) {
             if (context instanceof Activity) {
                 return (Activity) context;
             }
             context = ((ContextWrapper) context).getBaseContext();
         }
-        Log.e("BarUtils", "the view's Context is not an Activity.");
         return null;
     }
 }

lib/utilcode/src/main/java/com/blankj/utilcode/util/ClickUtils.java

@@ -447,7 +447,12 @@ private static boolean isValid(@NonNull final View view, final long duration) {
                 return true;
             }
             long preTime = (Long) tag;
-            if (curTime - preTime <= duration) return false;
+            if (curTime - preTime < 0) {
+                view.setTag(DEBOUNCING_TAG, curTime);
+                return false;
+            } else if (curTime - preTime <= duration) {
+                return false;
+            }
             view.setTag(DEBOUNCING_TAG, curTime);
             return true;
         }