Skip to content

Commit 2777f25

Browse files
committed
Improve AutoSize#autoConvertDensity
1 parent 5e02e64 commit 2777f25

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

autosize/src/main/java/me/jessyan/autosize/AutoSize.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import android.app.Dialog;
2121
import android.app.Fragment;
2222
import android.content.Context;
23-
import android.content.res.Configuration;
2423
import android.content.res.Resources;
2524
import android.net.Uri;
2625
import android.util.DisplayMetrics;
@@ -37,7 +36,6 @@
3736
import me.jessyan.autosize.internal.CustomAdapt;
3837
import me.jessyan.autosize.utils.LogUtils;
3938
import me.jessyan.autosize.utils.Preconditions;
40-
import me.jessyan.autosize.utils.ScreenUtils;
4139

4240
/**
4341
* ================================================
@@ -150,15 +148,6 @@ public static void autoConvertDensityBaseOnHeight(Activity activity, float desig
150148
public static void autoConvertDensity(Activity activity, float sizeInDp, boolean isBaseOnWidth) {
151149
Preconditions.checkNotNull(activity, "activity == null");
152150

153-
boolean isVertical = activity.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT;
154-
155-
if (isVertical != AutoSizeConfig.getInstance().isVertical()) {
156-
AutoSizeConfig.getInstance().setVertical(isVertical);
157-
int[] screenSize = ScreenUtils.getScreenSize(activity.getApplicationContext());
158-
AutoSizeConfig.getInstance().setScreenWidth(screenSize[0]);
159-
AutoSizeConfig.getInstance().setScreenHeight(screenSize[1]);
160-
}
161-
162151
int screenSize = isBaseOnWidth ? AutoSizeConfig.getInstance().getScreenWidth()
163152
: AutoSizeConfig.getInstance().getScreenHeight();
164153
String key = sizeInDp + "|" + isBaseOnWidth + "|"

autosize/src/main/java/me/jessyan/autosize/AutoSizeConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public void onConfigurationChanged(Configuration newConfig) {
199199
Resources.getSystem().getDisplayMetrics().scaledDensity;
200200
LogUtils.d("initScaledDensity = " + mInitScaledDensity + " on ConfigurationChanged");
201201
}
202-
isVertical = application.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT;
202+
isVertical = newConfig.orientation == Configuration.ORIENTATION_PORTRAIT;
203203
int[] screenSize = ScreenUtils.getScreenSize(application);
204204
mScreenWidth = screenSize[0];
205205
mScreenHeight = screenSize[1];

0 commit comments

Comments
 (0)