Skip to content

Commit 2b38556

Browse files
BlankjBlankj
committed
see 03/31 log
1 parent 5d19ffa commit 2b38556

6 files changed

Lines changed: 19 additions & 21 deletions

File tree

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import android.view.WindowManager
99
import com.blankj.common.activity.CommonActivity
1010
import com.blankj.utilcode.pkg.R
1111
import com.blankj.utilcode.util.AdaptScreenUtils
12+
import com.blankj.utilcode.util.BarUtils
13+
import com.blankj.utilcode.util.LogUtils
1214

1315
class AdaptHeightActivity : CommonActivity() {
1416

@@ -28,6 +30,11 @@ class AdaptHeightActivity : CommonActivity() {
2830
window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
2931
}
3032

33+
override fun onResume() {
34+
super.onResume()
35+
LogUtils.e(BarUtils.getStatusBarHeight())
36+
}
37+
3138
override fun getResources(): Resources {
3239
return AdaptScreenUtils.adaptHeight(super.getResources(), 1920)
3340
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class ShadowActivity : CommonActivity() {
3939

4040
override fun initView(savedInstanceState: Bundle?, contentView: View?) {
4141
super.initView(savedInstanceState, contentView)
42-
ShadowUtils.apply(shadowRectView, Config().setShadowRadius(0.01f).setShadowColor(Color.BLUE, Color.GREEN))
42+
ShadowUtils.apply(shadowRectView, Config().setShadowColor(Color.BLUE, Color.GREEN))
4343
ShadowUtils.apply(shadowRoundRectView, Config().setShadowRadius(
4444
SizeUtils.dp2px(16f).toFloat()))
4545
ShadowUtils.apply(shadowCircleView, Config().setCircle().setShadowColor(Color.GREEN, Color.BLUE))

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ private BarUtils() {
5555
* @return the status bar's height
5656
*/
5757
public static int getStatusBarHeight() {
58-
Resources resources = Utils.getApp().getResources();
58+
Resources resources = Resources.getSystem();
5959
int resourceId = resources.getIdentifier("status_bar_height", "dimen", "android");
6060
return resources.getDimensionPixelSize(resourceId);
6161
}
@@ -431,7 +431,7 @@ public static int getActionBarHeight() {
431431
TypedValue tv = new TypedValue();
432432
if (Utils.getApp().getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true)) {
433433
return TypedValue.complexToDimensionPixelSize(
434-
tv.data, Utils.getApp().getResources().getDisplayMetrics()
434+
tv.data, Resources.getSystem().getDisplayMetrics()
435435
);
436436
}
437437
return 0;
@@ -481,7 +481,7 @@ private static void invokePanels(final String methodName) {
481481
* @return the navigation bar's height
482482
*/
483483
public static int getNavBarHeight() {
484-
Resources res = Utils.getApp().getResources();
484+
Resources res = Resources.getSystem();
485485
int resourceId = res.getIdentifier("navigation_bar_height", "dimen", "android");
486486
if (resourceId != 0) {
487487
return res.getDimensionPixelSize(resourceId);
@@ -515,9 +515,7 @@ public static void setNavBarVisibility(@NonNull final Window window, boolean isV
515515
final View child = decorView.getChildAt(i);
516516
final int id = child.getId();
517517
if (id != View.NO_ID) {
518-
String resourceEntryName = Utils.getApp()
519-
.getResources()
520-
.getResourceEntryName(id);
518+
String resourceEntryName = Resources.getSystem().getResourceEntryName(id);
521519
if ("navigationBarBackground".equals(resourceEntryName)) {
522520
child.setVisibility(isVisible ? View.VISIBLE : View.INVISIBLE);
523521
}
@@ -558,9 +556,7 @@ public static boolean isNavBarVisible(@NonNull final Window window) {
558556
final View child = decorView.getChildAt(i);
559557
final int id = child.getId();
560558
if (id != View.NO_ID) {
561-
String resourceEntryName = Utils.getApp()
562-
.getResources()
563-
.getResourceEntryName(id);
559+
String resourceEntryName = Resources.getSystem().getResourceEntryName(id);
564560
if ("navigationBarBackground".equals(resourceEntryName)
565561
&& child.getVisibility() == View.VISIBLE) {
566562
isVisible = true;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import android.content.Context;
55
import android.content.Intent;
66
import android.content.res.Configuration;
7+
import android.content.res.Resources;
78
import android.net.Uri;
89
import android.net.wifi.WifiInfo;
910
import android.net.wifi.WifiManager;
@@ -329,7 +330,7 @@ public static String[] getABIs() {
329330
* @return {@code true}: yes<br>{@code false}: no
330331
*/
331332
public static boolean isTablet() {
332-
return (Utils.getApp().getResources().getConfiguration().screenLayout
333+
return (Resources.getSystem().getConfiguration().screenLayout
333334
& Configuration.SCREENLAYOUT_SIZE_MASK)
334335
>= Configuration.SCREENLAYOUT_SIZE_LARGE;
335336
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public static int getAppScreenHeight() {
101101
* @return the density of screen
102102
*/
103103
public static float getScreenDensity() {
104-
return Utils.getApp().getResources().getDisplayMetrics().density;
104+
return Resources.getSystem().getDisplayMetrics().density;
105105
}
106106

107107
/**
@@ -110,7 +110,7 @@ public static float getScreenDensity() {
110110
* @return the screen density expressed as dots-per-inch
111111
*/
112112
public static int getScreenDensityDpi() {
113-
return Utils.getApp().getResources().getDisplayMetrics().densityDpi;
113+
return Resources.getSystem().getDisplayMetrics().densityDpi;
114114
}
115115

116116
/**

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.blankj.utilcode.util;
22

33
import android.content.res.ColorStateList;
4-
import android.content.res.Resources;
54
import android.graphics.Canvas;
65
import android.graphics.Color;
76
import android.graphics.ColorFilter;
@@ -58,7 +57,7 @@ public static void apply(View view, Config builder) {
5857
public static class Config {
5958

6059
private static final int SHADOW_COLOR_DEFAULT = 0xb0_000000;
61-
private static final int SHADOW_SIZE = dp2px(8);
60+
private static final int SHADOW_SIZE = UtilsBridge.dp2px(8);
6261

6362
private float mShadowRadius = -1;
6463
private float mShadowSizeNormal = -1;
@@ -137,7 +136,7 @@ Drawable apply(Drawable src) {
137136
}
138137

139138
private float getShadowRadius() {
140-
if (mShadowRadius == -1) {
139+
if (mShadowRadius < 0) {
141140
mShadowRadius = 0;
142141
}
143142
return mShadowRadius;
@@ -170,11 +169,6 @@ private float getShadowMaxSizePressed() {
170169
}
171170
return mShadowMaxSizePressed;
172171
}
173-
174-
private static int dp2px(final float dpValue) {
175-
final float scale = Resources.getSystem().getDisplayMetrics().density;
176-
return (int) (dpValue * scale + 0.5f);
177-
}
178172
}
179173

180174
public static class ShadowDrawable extends DrawableWrapper {

0 commit comments

Comments
 (0)