1、更新三方库修改FastUtil 设置Drawable颜色方法

AriesHoo · AriesHoo · commit 2a66b989ea56 · 2019-04-22T17:49:53.000+08:00
diff --git a/app/src/main/java/com/aries/library/fast/demo/impl/ActivityControlImpl.java b/app/src/main/java/com/aries/library/fast/demo/impl/ActivityControlImpl.java
@@ -47,7 +47,6 @@
 import com.didichuxing.doraemonkit.ui.base.BaseActivity;
 import com.luck.picture.lib.PictureBaseActivity;
 import com.luck.picture.lib.PicturePreviewActivity;
-import com.squareup.leakcanary.internal.DisplayLeakActivity;
 import com.umeng.analytics.MobclickAgent;
 
 import java.util.List;
@@ -215,16 +214,19 @@ public void setRequestedOrientation(Activity activity) {
      */
     @Override
     public boolean setStatusBar(Activity activity, StatusViewHelper helper, View topView) {
+        LoggerManager.e("setStatusBar:" + Thread.currentThread());
         boolean isSupportStatusBarFont = StatusBarUtil.isSupportStatusBarFontChange();
-        helper.setTransEnable(isSupportStatusBarFont || activity instanceof DisplayLeakActivity)
-                .setPlusStatusViewEnable(!(activity instanceof DisplayLeakActivity))
-                .setStatusLayoutColor(activity instanceof DisplayLeakActivity ?
-                        ContextCompat.getColor(activity, R.color.leak_canary_background_color) :
-                        Color.WHITE);
+        helper.setTransEnable(isSupportStatusBarFont || isLeak(activity))
+                .setPlusStatusViewEnable(!isLeak(activity))
+                .setStatusLayoutColor(Color.WHITE);
         setStatusBarActivity(activity);
         return true;
     }
 
+    private boolean isLeak(Activity activity) {
+        return activity.getClass().getSimpleName().equals("DisplayLeakActivity");
+    }
+
     /**
      * {@link FastLifecycleCallbacks#onActivityStarted(Activity)}
      *
@@ -243,7 +245,7 @@ public boolean setNavigationBar(Activity activity, NavigationViewHelper helper,
                 .setOnKeyboardVisibilityChangedListener(mOnKeyboardVisibilityChangedListener)
                 .setBottomView(PicturePreviewActivity.class.isAssignableFrom(activity.getClass()) ?
                         FindViewUtil.getTargetView(bottomView, R.id.select_bar_layout) : bottomView)
-                .setNavigationViewColor(activity instanceof DisplayLeakActivity ? Color.BLACK : Color.argb(isDarkIcon() && isPlusView(activity) ? 0 : 102, 0, 0, 0))
+                .setNavigationViewColor(isLeak(activity) ? Color.BLACK : Color.argb(isDarkIcon() && isPlusView(activity) ? 0 : 102, 0, 0, 0))
                 .setNavigationLayoutColor(ContextCompat.getColor(activity, R.color.colorTabBackground));
         if (!isControlNavigation() && !(activity instanceof MainActivity)) {
             KeyboardHelper.with(activity)
@@ -273,7 +275,7 @@ protected boolean isDarkIcon() {
     protected boolean isPlusView(Activity activity) {
         return !(activity instanceof SplashActivity)
                 && !(activity instanceof TestStatusActivity)
-                && !(activity instanceof DisplayLeakActivity);
+                && !isLeak(activity);
     }
 
     private KeyboardHelper.OnKeyboardVisibilityChangedListener mOnKeyboardVisibilityChangedListener = (activity, isOpen, heightDiff, navigationHeight) -> {
@@ -412,7 +414,7 @@ private void setStatusBarActivity(Activity activity) {
                 .subscribe(new FastObserver<Long>() {
                     @Override
                     public void _onNext(Long entity) {
-                        if (activity instanceof DisplayLeakActivity) {
+                        if (isLeak(activity)) {
                             return;
                         }
                         StatusBarUtil.setStatusBarLightMode(activity);
diff --git a/app/src/main/java/com/aries/library/fast/demo/impl/AppImpl.java b/app/src/main/java/com/aries/library/fast/demo/impl/AppImpl.java
@@ -17,11 +17,11 @@
 import com.aries.library.fast.i.ToastControl;
 import com.aries.library.fast.manager.LoggerManager;
 import com.aries.library.fast.util.FastStackUtil;
-import com.aries.library.fast.util.FastUtil;
 import com.aries.library.fast.util.SizeUtil;
 import com.aries.library.fast.util.ToastUtil;
 import com.aries.library.fast.widget.FastLoadDialog;
 import com.aries.library.fast.widget.FastLoadMoreView;
+import com.aries.ui.util.DrawableUtil;
 import com.aries.ui.util.StatusBarUtil;
 import com.aries.ui.view.radius.RadiusTextView;
 import com.aries.ui.view.title.TitleBarView;
@@ -180,7 +180,7 @@ public FastLoadDialog createLoadingDialog(@Nullable Activity activity) {
     @Override
     public boolean createTitleBarViewControl(TitleBarView titleBar, Class<?> cls) {
         //默认的MD风格返回箭头icon如使用该风格可以不用设置
-        Drawable mDrawable = FastUtil.getTintDrawable(ContextCompat.getDrawable(mContext, R.drawable.fast_ic_back),
+        Drawable mDrawable = DrawableUtil.setTintDrawable(ContextCompat.getDrawable(mContext, R.drawable.fast_ic_back),
                 ContextCompat.getColor(mContext, R.color.colorTitleText));
         //是否支持状态栏白色
         boolean isSupport = StatusBarUtil.isSupportStatusBarFontChange();
diff --git a/app/src/main/java/com/aries/library/fast/demo/module/SplashActivity.java b/app/src/main/java/com/aries/library/fast/demo/module/SplashActivity.java
@@ -3,7 +3,6 @@
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import androidx.core.content.ContextCompat;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.TextView;
@@ -16,10 +15,12 @@
 import com.aries.library.fast.retrofit.FastObserver;
 import com.aries.library.fast.util.FastStackUtil;
 import com.aries.library.fast.util.FastUtil;
+import com.aries.ui.util.DrawableUtil;
 import com.aries.ui.util.StatusBarUtil;
 import com.aries.ui.view.title.TitleBarView;
 import com.trello.rxlifecycle3.android.ActivityEvent;
 
+import androidx.core.content.ContextCompat;
 import butterknife.BindView;
 
 /**
@@ -36,7 +37,7 @@ public class SplashActivity extends FastTitleActivity {
 
     @Override
     public void beforeSetContentView() {
-        LoggerManager.i(TAG,"isTaskRoot:"+isTaskRoot()+";getCurrent:"+FastStackUtil.getInstance().getCurrent());
+        LoggerManager.i(TAG, "isTaskRoot:" + isTaskRoot() + ";getCurrent:" + FastStackUtil.getInstance().getCurrent());
         //防止应用后台后点击桌面图标造成重启的假象---MIUI及Flyme上发现过(原生未发现)
         if (!isTaskRoot()) {
             finish();
@@ -66,8 +67,8 @@ public void initView(Bundle savedInstanceState) {
             //隐藏状态栏
             getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
         }
-        Drawable drawable = ContextCompat.getDrawable(mContext,R.drawable.ic_launcher);
-        FastUtil.getTintDrawable(drawable, Color.WHITE);
+        Drawable drawable = ContextCompat.getDrawable(mContext, R.drawable.ic_launcher);
+        DrawableUtil.setTintDrawable(drawable, Color.WHITE);
         tvApp.setCompoundDrawablesWithIntrinsicBounds(null, drawable, null, null);
         mContentView.setBackgroundResource(R.drawable.img_bg_login);
         tvVersion.setText("V" + FastUtil.getVersionName(mContext));
diff --git a/app/src/main/java/com/aries/library/fast/demo/util/ViewColorUtil.java b/app/src/main/java/com/aries/library/fast/demo/util/ViewColorUtil.java
@@ -7,7 +7,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.aries.library.fast.util.FastUtil;
+import com.aries.ui.util.DrawableUtil;
 
 /**
  * @Author: AriesHoo on 2018/11/2 13:27
@@ -42,8 +42,7 @@ public void changeColor(View rootView, int alpha, boolean mIsLight, boolean show
                 for (Drawable item : drawables) {
                     if (item != null) {
                         //使用该方法避免同一Drawable被全局修改
-                        item = item.mutate();
-                        FastUtil.getTintDrawable(item, Color.argb(mIsLight ? alpha : 255 - alpha, mIsLight ? 0 : 252, mIsLight ? 0 : 252, mIsLight ? 0 : 252));
+                        DrawableUtil.setTintDrawable(item, Color.argb(mIsLight ? alpha : 255 - alpha, mIsLight ? 0 : 252, mIsLight ? 0 : 252, mIsLight ? 0 : 252));
                     }
                 }
                 if (!showText) {
@@ -54,7 +53,7 @@ public void changeColor(View rootView, int alpha, boolean mIsLight, boolean show
             } else if (rootView instanceof ImageView) {
                 //使用该方法避免同一Drawable被全局修改
                 Drawable drawable = ((ImageView) rootView).getDrawable().mutate();
-                FastUtil.getTintDrawable(drawable, Color.argb(mIsLight ? alpha : 255 - alpha, mIsLight ? 0 : 252, mIsLight ? 0 : 252, mIsLight ? 0 : 252));
+                DrawableUtil.setTintDrawable(drawable, Color.argb(mIsLight ? alpha : 255 - alpha, mIsLight ? 0 : 252, mIsLight ? 0 : 252, mIsLight ? 0 : 252));
             } else if (rootView instanceof ViewGroup) {
                 ViewGroup contentView = (ViewGroup) rootView;
                 int size = contentView.getChildCount();
diff --git a/library/build.gradle b/library/build.gradle
@@ -65,7 +65,7 @@ dependencies {
     //图片加载
     compileOnly 'com.github.bumptech.glide:glide:4.8.0'
     //常用UI控件(TitleBarView、RadiusView等)
-    api 'com.github.AriesHoo.UIWidget:widget-core:3.2.12'
+    api 'com.github.AriesHoo.UIWidget:widget-core:3.2.13'
     //日志打印
     api 'com.orhanobut:logger:2.2.0'
     //注解
@@ -85,7 +85,7 @@ dependencies {
     //滑动返回Activity
     api 'cn.bingoogolapple:bga-swipebacklayout:1.2.0@aar'
     //快速Tab库
-    api 'com.github.AriesHoo:TabLayout:1.0.5'
+    api 'com.github.AriesHoo:TabLayout:1.0.6'
     //页面事件交互
     api 'org.simple:androideventbus:1.0.5.1'
     //多状态视图切换
diff --git a/library/src/main/java/com/aries/library/fast/module/activity/FastWebActivity.java b/library/src/main/java/com/aries/library/fast/module/activity/FastWebActivity.java
@@ -21,6 +21,7 @@
 import com.aries.library.fast.util.FastUtil;
 import com.aries.library.fast.util.ToastUtil;
 import com.aries.ui.helper.navigation.NavigationViewHelper;
+import com.aries.ui.util.DrawableUtil;
 import com.aries.ui.view.title.TitleBarView;
 import com.aries.ui.widget.BasisDialog;
 import com.aries.ui.widget.action.sheet.UIActionSheetDialog;
@@ -137,7 +138,7 @@ public void onClick(View v) {
                 onBackPressed();
             }
         })
-                .setRightTextDrawable(FastUtil.getTintDrawable(
+                .setRightTextDrawable(DrawableUtil.setTintDrawable(
                         ContextCompat.getDrawable(mContext, R.drawable.fast_ic_more),
                         ContextCompat.getColor(mContext, R.color.colorTitleText)))
                 .setOnRightTextClickListener(new View.OnClickListener() {
@@ -147,7 +148,7 @@ public void onClick(View v) {
                     }
                 })
                 .addLeftAction(titleBar.new ImageAction(
-                        FastUtil.getTintDrawable(ContextCompat.getDrawable(mContext, R.drawable.fast_ic_close),
+                        DrawableUtil.setTintDrawable(ContextCompat.getDrawable(mContext, R.drawable.fast_ic_close),
                                 ContextCompat.getColor(mContext, R.color.colorTitleText)), new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
diff --git a/library/src/main/java/com/aries/library/fast/util/FastUtil.java b/library/src/main/java/com/aries/library/fast/util/FastUtil.java
@@ -20,6 +20,7 @@
 import android.view.ViewGroup;
 
 import com.aries.library.fast.manager.LoggerManager;
+import com.aries.ui.util.DrawableUtil;
 
 import java.util.List;
 import java.util.Random;
@@ -38,6 +39,7 @@
  * 3、2019-2-15 11:28:53 修改startActivity 方法增加single tag设置方法{@link #setActivitySingleFlag(int)}
  * 4、2019-2-22 13:49:12 修改{@link #getRootView(Activity)} 判断逻辑
  * 5、2019-4-19 17:02:01 修改{@link #getTintDrawable(Drawable, int)}以支持5.0以下版本并增加{@link #getTintDrawable(Drawable, ColorStateList)}
+ * 6、2019-4-22 17:44:14 修改{@link #getTintDrawable(Drawable, int)}以支持5.0以下版本并增加{@link #getTintDrawable(Drawable, ColorStateList)}
  */
 public class FastUtil {
 
@@ -104,11 +106,13 @@ public static View getRootView(Activity activity) {
 
     /**
      * 给一个Drawable变换线框颜色
+     * {@link DrawableUtil#setTintDrawable(Drawable, int)}
      *
      * @param drawable 需要变换颜色的drawable
      * @param color    需要变换的颜色
      * @return
      */
+    @Deprecated
     public static Drawable getTintDrawable(Drawable drawable, @ColorInt int color) {
         if (drawable != null) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@@ -117,18 +121,19 @@ public static Drawable getTintDrawable(Drawable drawable, @ColorInt int color) {
                 drawable.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
             }
         }
-        return drawable;
+        return DrawableUtil.setTintDrawable(drawable, color);
     }
 
+    /**
+     * {@link DrawableUtil#setTintDrawable(Drawable, ColorStateList)}
+     *
+     * @param drawable
+     * @param tint
+     * @return
+     */
+    @Deprecated
     public static Drawable getTintDrawable(Drawable drawable, @Nullable ColorStateList tint) {
-        if (drawable != null && tint != null) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                DrawableCompat.setTintList(drawable, tint);
-            } else {
-                drawable.setColorFilter(tint.getDefaultColor(), PorterDuff.Mode.SRC_ATOP);
-            }
-        }
-        return drawable;
+        return DrawableUtil.setTintDrawable(drawable, tint);
     }
 
     /**
