Skip to content

Commit a31510e

Browse files
BlankjBlankj
committed
see 08/10 log
1 parent 15726d6 commit a31510e

File tree

14 files changed

+46
-67
lines changed

14 files changed

+46
-67
lines changed

‎README-CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
4343

44-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.18.6-brightgreen.svg
44+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.19.0-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

4747
[apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ If this project helps you a lot and you want to support the project's developmen
4141

4242
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
4343

44-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.18.6-brightgreen.svg
44+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.19.0-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

4747
[apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

‎app/src/main/java/com/blankj/androidutilcode/MainActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.blankj.androidutilcode.feature.core.CoreUtilActivity;
1313
import com.blankj.androidutilcode.feature.sub.SubUtilActivity;
1414
import com.blankj.utilcode.util.BarUtils;
15+
import com.blankj.utilcode.util.ScreenUtils;
1516

1617
/**
1718
* <pre>

‎app/src/main/java/com/blankj/androidutilcode/UtilsApp.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99
import com.squareup.leakcanary.LeakCanary;
1010

1111
import java.util.ArrayList;
12-
import java.util.Arrays;
13-
import java.util.Collection;
14-
import java.util.Collections;
15-
import java.util.LinkedList;
16-
import java.util.List;
1712

1813
/**
1914
* <pre>

‎app/src/main/java/com/blankj/androidutilcode/base/BaseActivity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
import android.view.LayoutInflater;
99
import android.view.View;
1010

11+
import com.blankj.utilcode.util.ScreenUtils;
12+
1113
/**
1214
* <pre>
1315
* author: Blankj

‎app/src/main/java/com/blankj/androidutilcode/feature/core/screen/ScreenAdaptActivity.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,11 @@
55
import android.os.Bundle;
66
import android.support.annotation.Nullable;
77
import android.view.View;
8-
import android.view.ViewGroup;
98
import android.widget.TextView;
109

1110
import com.blankj.androidutilcode.R;
1211
import com.blankj.androidutilcode.base.BaseActivity;
13-
import com.blankj.utilcode.util.BarUtils;
14-
import com.blankj.utilcode.util.LogUtils;
1512
import com.blankj.utilcode.util.ScreenUtils;
16-
import com.blankj.utilcode.util.SizeUtils;
1713

1814
/**
1915
* <pre>
@@ -36,9 +32,9 @@ public static void start(Context context) {
3632
@Override
3733
public void initData(@Nullable Bundle bundle) {
3834
if (ScreenUtils.isPortrait()) {
39-
ScreenUtils.adaptScreen4VerticalSlide(this, 360);
35+
ScreenUtils.adaptScreen4VerticalSlide(this, 720);
4036
} else {
41-
ScreenUtils.adaptScreen4HorizontalSlide(this, 360);
37+
ScreenUtils.adaptScreen4HorizontalSlide(this, 720);
4238
}
4339
}
4440

‎app/src/main/res_core/layout-land/activity_screen_adapt.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@
2121
android:id="@+id/tv_up"
2222
style="@style/TextStyle"
2323
android:layout_width="2000dp"
24-
android:layout_height="180dp"
24+
android:layout_height="360dp"
2525
android:layout_alignParentTop="true"
2626
android:layout_toRightOf="@id/tv_fullscreen"
2727
android:background="@color/colorAccentHalfTrans"
2828
android:gravity="center_vertical"
29-
android:text="180dp" />
29+
android:text="360dp" />
3030

3131
<TextView
3232
android:id="@+id/tv_down"
3333
style="@style/TextStyle"
3434
android:layout_width="2000dp"
35-
android:layout_height="180dp"
35+
android:layout_height="360dp"
3636
android:layout_alignParentBottom="true"
3737
android:layout_toRightOf="@id/tv_fullscreen"
3838
android:background="@color/colorPrimaryHalfTrans"
3939
android:gravity="center_vertical"
40-
android:text="180dp" />
40+
android:text="360dp" />
4141

4242

4343
</RelativeLayout>

‎app/src/main/res_core/layout-port/activity_screen_adapt.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@
1010

1111
<TextView
1212
style="@style/TextStyle"
13-
android:layout_width="180dp"
13+
android:layout_width="360dp"
1414
android:layout_height="2000dp"
1515
android:layout_alignParentLeft="true"
1616
android:layout_below="@id/tv_fullscreen"
1717
android:background="@color/colorAccentHalfTrans"
1818
android:gravity="center_horizontal"
19-
android:text="180dp" />
19+
android:text="360dp" />
2020

2121
<TextView
2222
style="@style/TextStyle"
23-
android:layout_width="180dp"
23+
android:layout_width="360dp"
2424
android:layout_height="2000dp"
2525
android:layout_alignParentRight="true"
2626
android:layout_below="@id/tv_fullscreen"
2727
android:background="@color/colorPrimaryHalfTrans"
2828
android:gravity="center_horizontal"
29-
android:text="180dp" />
29+
android:text="360dp" />
3030

3131
</RelativeLayout>
3232
</ScrollView>

‎config.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ ext {
66
compileSdkVersion: 27,
77
minSdkVersion : 14,
88
targetSdkVersion : 27,
9-
versionCode : 1_018_006,
10-
versionName : '1.18.6'// E.g 1.9.72 => 1,009,072
9+
versionCode : 1_019_000,
10+
versionName : '1.19.0'// E.g 1.9.72 => 1,009,072
1111
]
1212

1313
versionConfig = [
@@ -167,7 +167,7 @@ def configAppDependencies(Project pro) {
167167
// LeakCanary
168168
debugImplementation depConfig.leakcanary.android
169169
releaseImplementation depConfig.leakcanary.android_no_op
170-
// implementation 'com.blankj:utilcode:1.18.6'
170+
// implementation 'com.blankj:utilcode:1.18.7'
171171
}
172172
}
173173

‎update_log.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* 18/08/10 修复 ScreenUtils#adaptxx 导致获取状态栏和导航栏尺寸不对问题，发布 1.19.0
12
* 18/08/09 新增 IntentUtils#isIntentAvailable，ToastUtils 传入空显示 null，发布 1.18.6
23
* 18/08/08 修复 ScreenUtils#adaptxx 在第三方 SDK 会出现的问题，发布 1.18.5
34
* 18/08/07 修复 ScreenUtils#adaptxx 在 API 26 以下无效的 bug，发布 1.18.4

‎utilcode/README-CN.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Gradle:
44
```groovy
5-
implementation 'com.blankj:utilcode:1.18.6'
5+
implementation 'com.blankj:utilcode:1.19.0'
66
```
77

88

@@ -543,6 +543,7 @@ isTablet : 判断是否是平板
543543
adaptScreen4VerticalSlide : 适配垂直滑动的屏幕
544544
adaptScreen4HorizontalSlide: 适配水平滑动的屏幕
545545
cancelAdaptScreen : 取消适配屏幕
546+
isAdaptScreen : 是否适配屏幕
546547
```
547548

548549
* ### SD 卡相关 -> [SDCardUtils.java][sdcard.java] -> [Demo][sdcard.demo]

‎utilcode/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Gradle:
44
```groovy
5-
implementation 'com.blankj:utilcode:1.18.6'
5+
implementation 'com.blankj:utilcode:1.19.0'
66
```
77

88

@@ -543,6 +543,7 @@ isTablet
543543
adaptScreen4VerticalSlide
544544
adaptScreen4HorizontalSlide
545545
cancelAdaptScreen
546+
isAdaptScreen
546547
```
547548

548549
* ### About SDCard -> [SDCardUtils.java][sdcard.java] -> [Demo][sdcard.demo]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ private BarUtils() {
5454
* @return the status bar's height
5555
*/
5656
public static int getStatusBarHeight() {
57-
Resources resources = Utils.getApp().getResources();
57+
Resources resources = Resources.getSystem();
5858
int resourceId = resources.getIdentifier("status_bar_height", "dimen", "android");
5959
return resources.getDimensionPixelSize(resourceId);
6060
}
@@ -595,7 +595,7 @@ private static void invokePanels(final String methodName) {
595595
* @return the navigation bar's height
596596
*/
597597
public static int getNavBarHeight() {
598-
Resources res = Utils.getApp().getResources();
598+
Resources res = Resources.getSystem();
599599
int resourceId = res.getIdentifier("navigation_bar_height", "dimen", "android");
600600
if (resourceId != 0) {
601601
return res.getDimensionPixelSize(resourceId);

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

Lines changed: 21 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import android.app.Activity;
44
import android.app.KeyguardManager;
5-
import android.content.ComponentCallbacks;
65
import android.content.Context;
76
import android.content.pm.ActivityInfo;
87
import android.content.res.Configuration;
@@ -14,7 +13,6 @@
1413
import android.support.annotation.NonNull;
1514
import android.support.annotation.RequiresPermission;
1615
import android.util.DisplayMetrics;
17-
import android.util.Log;
1816
import android.view.Surface;
1917
import android.view.View;
2018
import android.view.Window;
@@ -297,8 +295,6 @@ public static boolean isTablet() {
297295
>= Configuration.SCREENLAYOUT_SIZE_LARGE;
298296
}
299297

300-
private static final UtilDisplayMetrics UDM = new UtilDisplayMetrics();
301-
302298
/**
303299
* Adapt the screen for vertical slide.
304300
*
@@ -324,34 +320,18 @@ public static void adaptScreen4HorizontalSlide(final Activity activity,
324320
/**
325321
* Reference from: https://mp.weixin.qq.com/s/d9QCoBP6kV9VSWvVldVVwA
326322
*/
327-
public static void adaptScreen(final Activity activity,
328-
final int sizeInPx,
329-
final boolean isVerticalSlide) {
323+
private static void adaptScreen(final Activity activity,
324+
final int sizeInPx,
325+
final boolean isVerticalSlide) {
326+
final DisplayMetrics systemDm = Resources.getSystem().getDisplayMetrics();
330327
final DisplayMetrics appDm = Utils.getApp().getResources().getDisplayMetrics();
331328
final DisplayMetrics activityDm = activity.getResources().getDisplayMetrics();
332-
if (UDM.densityDpi == -1) {
333-
UDM.density = activityDm.density;
334-
UDM.scaledDensity = activityDm.scaledDensity;
335-
UDM.densityDpi = activityDm.densityDpi;
336-
Utils.getApp().registerComponentCallbacks(new ComponentCallbacks() {
337-
@Override
338-
public void onConfigurationChanged(Configuration newConfig) {
339-
if (newConfig != null && newConfig.fontScale > 0) {
340-
UDM.scaledDensity =
341-
Utils.getApp().getResources().getDisplayMetrics().scaledDensity;
342-
}
343-
}
344-
345-
@Override
346-
public void onLowMemory() {/**/}
347-
});
348-
}
349329
if (isVerticalSlide) {
350330
activityDm.density = activityDm.widthPixels / (float) sizeInPx;
351331
} else {
352332
activityDm.density = activityDm.heightPixels / (float) sizeInPx;
353333
}
354-
activityDm.scaledDensity = activityDm.density * (UDM.scaledDensity / UDM.density);
334+
activityDm.scaledDensity = activityDm.density * (systemDm.scaledDensity / systemDm.density);
355335
activityDm.densityDpi = (int) (160 * activityDm.density);
356336

357337
appDm.density = activityDm.density;
@@ -365,24 +345,26 @@ public void onLowMemory() {/**/}
365345
* @param activity The activity.
366346
*/
367347
public static void cancelAdaptScreen(final Activity activity) {
348+
final DisplayMetrics systemDm = Resources.getSystem().getDisplayMetrics();
368349
final DisplayMetrics appDm = Utils.getApp().getResources().getDisplayMetrics();
369350
final DisplayMetrics activityDm = activity.getResources().getDisplayMetrics();
370-
if (UDM.densityDpi != -1) {
371-
activityDm.density = UDM.density;
372-
activityDm.scaledDensity = UDM.scaledDensity;
373-
activityDm.densityDpi = UDM.densityDpi;
351+
activityDm.density = systemDm.density;
352+
activityDm.scaledDensity = systemDm.scaledDensity;
353+
activityDm.densityDpi = systemDm.densityDpi;
374354

375-
appDm.density = UDM.density;
376-
appDm.scaledDensity = UDM.scaledDensity;
377-
appDm.densityDpi = UDM.densityDpi;
378-
} else {
379-
Log.i("ScreenUtils", "U should adapt screen first.");
380-
}
355+
appDm.density = systemDm.density;
356+
appDm.scaledDensity = systemDm.scaledDensity;
357+
appDm.densityDpi = systemDm.densityDpi;
381358
}
382359

383-
private static class UtilDisplayMetrics {
384-
float density;
385-
float scaledDensity;
386-
int densityDpi = -1;
360+
/**
361+
* Return whether adapt screen.
362+
*
363+
* @return {@code true}: yes<br>{@code false}: no
364+
*/
365+
public static boolean isAdaptScreen() {
366+
final DisplayMetrics systemDm = Resources.getSystem().getDisplayMetrics();
367+
final DisplayMetrics appDm = Utils.getApp().getResources().getDisplayMetrics();
368+
return systemDm.density != appDm.density;
387369
}
388370
}

0 commit comments

Comments
 (0)