1、增加ToastUtil设置最小宽高

2、修改BasisActivity控制虚拟导航栏逻辑

Author: AriesHoo

apk/sample.apk

@@ -15,7 +15,7 @@ android {
         minSdkVersion ext.minSdkVersion
         targetSdkVersion ext.targetSdkVersion
         versionCode 229
-        versionName "2.2.9-alpha"
+        versionName "2.2.9-beta"
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         buildConfigField "String", "BASE_URL", "\"https://api.douban.com/\""

app/build.gradle

@@ -102,7 +102,7 @@ public void onCreate() {
                         .setQuitDelay(2000)
                         .setQuitMessage(isBackTask ? getText(R.string.fast_back_home) : getText(R.string.fast_quit_app))
                         .setSnackBarBackgroundColor(Color.argb(220, 0, 0, 0))
-                        .setSnackBarEnable(false)
+                        .setSnackBarEnable(true)
                         .setSnackBarMessageColor(Color.WHITE))
                 //设置Glide背景色
                 .setPlaceholderColor(getResources().getColor(R.color.colorPlaceholder))

app/src/main/java/com/aries/library/fast/demo/App.java

@@ -72,14 +72,14 @@ public void timeEnd() {
 //            public FastNavigationConfigEntity createNavigationBarControl(Activity activity) {
 //                return new FastNavigationConfigEntity()
 //                        .setControlEnable(true)
-//                        .setTransEnable(true)
+//                        .setTransEnable(false)
 //                        .setColor(Color.argb(80,0,0,0));
 //            }
 //        };
 //    }
-//
-//    @Override
-//    protected View getNavigationBarControlView() {
-//        return tvCopyRight;
-//    }
+
+    @Override
+    protected View getNavigationBarControlView() {
+        return tvCopyRight;
+    }
 }

app/src/main/java/com/aries/library/fast/demo/module/SplashActivity.java

@@ -3,6 +3,7 @@
 import android.os.Bundle;
 import android.view.View;
 
+import com.aries.library.fast.FastConfig;
 import com.aries.library.fast.demo.R;
 import com.aries.library.fast.demo.module.activity.ActivityFragment;
 import com.aries.library.fast.demo.module.mine.MineFragment;
@@ -61,6 +62,7 @@ public void initView(Bundle savedInstanceState) {
 
     @Override
     protected View getNavigationBarControlView() {
-        return null;
+        return FastConfig.getInstance(mContext).getNavigationBarControl().createNavigationBarControl(mContext)
+                .isTransEnable() ?  null:super.getNavigationBarControlView();
     }
 }

app/src/main/java/com/aries/library/fast/demo/module/main/MainActivity.java

@@ -9,7 +9,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 25
         versionCode 229
-        versionName "2.2.9-alpha"
+        versionName "2.2.9-beta"
     }
     buildTypes {
         release {

library/build.gradle

@@ -97,33 +97,22 @@ private void setNavigationBar() {
             getWindow().setNavigationBarColor(entity.getColor());
         }
         final View controlView = getNavigationBarControlView();
-        if (!entity.isTransEnable()) {
-            mContentView.setFitsSystemWindows(true);
-            mContentView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+        if (controlView != null && NavigationBarUtil.hasSoftKeys(getWindowManager())) {
+            controlView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
                 @Override
                 public void onGlobalLayout() {
-                    mContentView.setPadding(mContentView.getPaddingLeft(), 0
-                            , mContentView.getPaddingRight(), mContentView.getPaddingBottom());
+                    if (mIsGlobal) {
+                        return;
+                    }
+                    mIsGlobal = true;
+                    ViewGroup.LayoutParams params = controlView.getLayoutParams();
+                    if (params != null && params.height >= 0) {//默认
+                        params.height = params.height + NavigationBarUtil.getNavigationBarHeight(getWindowManager());
+                    }
+                    controlView.setPadding(controlView.getPaddingLeft(), controlView.getPaddingTop(), controlView.getPaddingRight(),
+                            controlView.getPaddingBottom() + NavigationBarUtil.getNavigationBarHeight(getWindowManager()));
                 }
             });
-        } else {
-            if (controlView != null && NavigationBarUtil.hasSoftKeys(getWindowManager())) {
-                controlView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-                    @Override
-                    public void onGlobalLayout() {
-                        if (mIsGlobal) {
-                            return;
-                        }
-                        mIsGlobal = true;
-                        ViewGroup.LayoutParams params = controlView.getLayoutParams();
-                        if (params != null && params.height >= 0) {//默认
-                            params.height = params.height + NavigationBarUtil.getNavigationBarHeight(getWindowManager());
-                        }
-                        controlView.setPadding(controlView.getPaddingLeft(), controlView.getPaddingTop(), controlView.getPaddingRight(),
-                                controlView.getPaddingBottom() + NavigationBarUtil.getNavigationBarHeight(getWindowManager()));
-                    }
-                });
-            }
         }
     }
 

library/src/main/java/com/aries/library/fast/basis/BasisActivity.java

@@ -135,6 +135,8 @@ public static Toast show(CharSequence content, boolean isShowRunningForeground,
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                 sTextView.setElevation(builder.elevation);
             }
+            sTextView.setMinimumHeight(builder.minHeight);
+            sTextView.setMinimumWidth(builder.minWidth);
             sTextView.setText(content);
             sSystemToast.setView(sTextView);
             sSystemToast.setDuration(duration);
@@ -214,7 +216,7 @@ private static Builder getDrawableBuilder(int res) {
                 .setElevation(8)
                 .setTextDrawable(sContext.getResources().getDrawable(res))
                 .setTextDrawableGravity(Gravity.TOP)
-                .setTextDrawablePadding(SizeUtil.dp2px(8))
+                .setTextDrawablePadding(SizeUtil.dp2px(10))
                 .setTextDrawableWidth(SizeUtil.dp2px(36))
                 .setTextDrawableHeight(SizeUtil.dp2px(36))
                 .setTextGravity(Gravity.CENTER)
@@ -225,7 +227,8 @@ private static Builder getDrawableBuilder(int res) {
                 .setRadius(SizeUtil.dp2px(8))
                 .setTextSize(SizeUtil.dp2px(16))
                 .setGravityYOffset(0)
-                .setGravity(Gravity.CENTER);
+                .setGravity(Gravity.CENTER)
+                .setMinWidth(SizeUtil.dp2px(140));
 
     }
 
@@ -265,6 +268,8 @@ public static final class Builder {
         int strokeColor;
         int strokeWidth;
         int radius;
+        int minWidth;
+        int minHeight;
 
         public Builder() {
             setGravity(Gravity.BOTTOM)
@@ -288,7 +293,9 @@ public Builder() {
                     .setBackgroundColor(Color.argb(187, 0, 0, 0))
                     .setStrokeColor(Color.TRANSPARENT)
                     .setStrokeWidth(0)
-                    .setRadius(SizeUtil.dp2px(4f));
+                    .setRadius(SizeUtil.dp2px(4f))
+                    .setMinWidth(0)
+                    .setMinHeight(0);
         }
 
         /**
@@ -545,5 +552,15 @@ public Builder setRadius(int radius) {
             this.radius = radius;
             return this;
         }
+
+        public Builder setMinWidth(int minWidth) {
+            this.minWidth = minWidth;
+            return this;
+        }
+
+        public Builder setMinHeight(int minHeight) {
+            this.minHeight = minHeight;
+            return this;
+        }
     }
 }