Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed tablet mode option on 7 inch tablets

This commit is contained in:
Mariotaku Lee 2017-02-06 18:14:10 +08:00
parent bb59fdd684
commit 998f6db124
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
twidere/build.gradle
View File

@ -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")'

3
twidere/src/main/java/org/mariotaku/twidere/util/Utils.java
View File

@ -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;
}
}

2
twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt
View File

@ -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))
}