diff --git a/twidere/build.gradle b/twidere/build.gradle index 842c4cb18..6f3b688b6 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -34,8 +34,8 @@ android { applicationId "org.mariotaku.twidere" minSdkVersion 14 targetSdkVersion 25 - versionCode 282 - versionName '3.4.20' + versionCode 283 + versionName '3.4.21' multiDexEnabled true buildConfigField 'boolean', 'LEAK_CANARY_ENABLED', 'Boolean.parseBoolean("true")' diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/Utils.java b/twidere/src/main/java/org/mariotaku/twidere/util/Utils.java index 976026c38..ea2a7879c 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/Utils.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/Utils.java @@ -1228,8 +1228,7 @@ public final class Utils implements Constants { */ public static boolean isScreenTablet(@NonNull Context context) { DisplayMetrics metrics = context.getResources().getDisplayMetrics(); - final float mw = Math.min(metrics.widthPixels / metrics.density, metrics.heightPixels / metrics.density); - return mw >= 600; + return metrics.widthPixels / metrics.density >= 600; } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt index 98f1d356b..1737af137 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt @@ -870,7 +870,7 @@ class HomeActivity : BaseActivity(), OnClickListener, OnPageChangeListener, Supp fun hasMultiColumns(): Boolean { - if (!Utils.isScreenTablet(this)) return false + if (!Utils.isDeviceTablet(this) || !Utils.isScreenTablet(this)) return false if (resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) { return preferences.getBoolean("multi_column_tabs_landscape", resources.getBoolean(R.bool.default_multi_column_tabs_land)) }