see 03/31 log

Author: Blankj

feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/adaptScreen/AdaptHeightActivity.kt

@@ -9,6 +9,8 @@ import android.view.WindowManager
 import com.blankj.common.activity.CommonActivity
 import com.blankj.utilcode.pkg.R
 import com.blankj.utilcode.util.AdaptScreenUtils
+import com.blankj.utilcode.util.BarUtils
+import com.blankj.utilcode.util.LogUtils
 
 class AdaptHeightActivity : CommonActivity() {
 
@@ -28,6 +30,11 @@ class AdaptHeightActivity : CommonActivity() {
         window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
     }
 
+    override fun onResume() {
+        super.onResume()
+        LogUtils.e(BarUtils.getStatusBarHeight())
+    }
+
     override fun getResources(): Resources {
         return AdaptScreenUtils.adaptHeight(super.getResources(), 1920)
     }

feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/shadow/ShadowActivity.kt

@@ -39,7 +39,7 @@ class ShadowActivity : CommonActivity() {
 
     override fun initView(savedInstanceState: Bundle?, contentView: View?) {
         super.initView(savedInstanceState, contentView)
-        ShadowUtils.apply(shadowRectView, Config().setShadowRadius(0.01f).setShadowColor(Color.BLUE, Color.GREEN))
+        ShadowUtils.apply(shadowRectView, Config().setShadowColor(Color.BLUE, Color.GREEN))
         ShadowUtils.apply(shadowRoundRectView, Config().setShadowRadius(
                 SizeUtils.dp2px(16f).toFloat()))
         ShadowUtils.apply(shadowCircleView, Config().setCircle().setShadowColor(Color.GREEN, Color.BLUE))

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

@@ -55,7 +55,7 @@ private BarUtils() {
      * @return the status bar's height
      */
     public static int getStatusBarHeight() {
-        Resources resources = Utils.getApp().getResources();
+        Resources resources = Resources.getSystem();
         int resourceId = resources.getIdentifier("status_bar_height", "dimen", "android");
         return resources.getDimensionPixelSize(resourceId);
     }
@@ -431,7 +431,7 @@ public static int getActionBarHeight() {
         TypedValue tv = new TypedValue();
         if (Utils.getApp().getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true)) {
             return TypedValue.complexToDimensionPixelSize(
-                    tv.data, Utils.getApp().getResources().getDisplayMetrics()
+                    tv.data, Resources.getSystem().getDisplayMetrics()
             );
         }
         return 0;
@@ -481,7 +481,7 @@ private static void invokePanels(final String methodName) {
      * @return the navigation bar's height
      */
     public static int getNavBarHeight() {
-        Resources res = Utils.getApp().getResources();
+        Resources res = Resources.getSystem();
         int resourceId = res.getIdentifier("navigation_bar_height", "dimen", "android");
         if (resourceId != 0) {
             return res.getDimensionPixelSize(resourceId);
@@ -515,9 +515,7 @@ public static void setNavBarVisibility(@NonNull final Window window, boolean isV
             final View child = decorView.getChildAt(i);
             final int id = child.getId();
             if (id != View.NO_ID) {
-                String resourceEntryName = Utils.getApp()
-                        .getResources()
-                        .getResourceEntryName(id);
+                String resourceEntryName = Resources.getSystem().getResourceEntryName(id);
                 if ("navigationBarBackground".equals(resourceEntryName)) {
                     child.setVisibility(isVisible ? View.VISIBLE : View.INVISIBLE);
                 }
@@ -558,9 +556,7 @@ public static boolean isNavBarVisible(@NonNull final Window window) {
             final View child = decorView.getChildAt(i);
             final int id = child.getId();
             if (id != View.NO_ID) {
-                String resourceEntryName = Utils.getApp()
-                        .getResources()
-                        .getResourceEntryName(id);
+                String resourceEntryName = Resources.getSystem().getResourceEntryName(id);
                 if ("navigationBarBackground".equals(resourceEntryName)
                         && child.getVisibility() == View.VISIBLE) {
                     isVisible = true;

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

@@ -4,6 +4,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.net.Uri;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
@@ -329,7 +330,7 @@ public static String[] getABIs() {
      * @return {@code true}: yes<br>{@code false}: no
      */
     public static boolean isTablet() {
-        return (Utils.getApp().getResources().getConfiguration().screenLayout
+        return (Resources.getSystem().getConfiguration().screenLayout
                 & Configuration.SCREENLAYOUT_SIZE_MASK)
                 >= Configuration.SCREENLAYOUT_SIZE_LARGE;
     }

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

@@ -101,7 +101,7 @@ public static int getAppScreenHeight() {
      * @return the density of screen
      */
     public static float getScreenDensity() {
-        return Utils.getApp().getResources().getDisplayMetrics().density;
+        return Resources.getSystem().getDisplayMetrics().density;
     }
 
     /**
@@ -110,7 +110,7 @@ public static float getScreenDensity() {
      * @return the screen density expressed as dots-per-inch
      */
     public static int getScreenDensityDpi() {
-        return Utils.getApp().getResources().getDisplayMetrics().densityDpi;
+        return Resources.getSystem().getDisplayMetrics().densityDpi;
     }
 
     /**

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

@@ -1,7 +1,6 @@
 package com.blankj.utilcode.util;
 
 import android.content.res.ColorStateList;
-import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.ColorFilter;
@@ -58,7 +57,7 @@ public static void apply(View view, Config builder) {
     public static class Config {
 
         private static final int SHADOW_COLOR_DEFAULT = 0xb0_000000;
-        private static final int SHADOW_SIZE          = dp2px(8);
+        private static final int SHADOW_SIZE          = UtilsBridge.dp2px(8);
 
         private float   mShadowRadius         = -1;
         private float   mShadowSizeNormal     = -1;
@@ -137,7 +136,7 @@ Drawable apply(Drawable src) {
         }
 
         private float getShadowRadius() {
-            if (mShadowRadius == -1) {
+            if (mShadowRadius < 0) {
                 mShadowRadius = 0;
             }
             return mShadowRadius;
@@ -170,11 +169,6 @@ private float getShadowMaxSizePressed() {
             }
             return mShadowMaxSizePressed;
         }
-
-        private static int dp2px(final float dpValue) {
-            final float scale = Resources.getSystem().getDisplayMetrics().density;
-            return (int) (dpValue * scale + 0.5f);
-        }
     }
 
     public static class ShadowDrawable extends DrawableWrapper {