From d2dd686ca4b2b1711571924028af1eb2232f1cb3 Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Mon, 23 Nov 2020 05:54:04 +0700 Subject: [PATCH] Try to autoscale --- .../java/net/kdt/pojavlaunch/MCLauncherActivity.java | 4 ++-- .../net/kdt/pojavlaunch/PojavLauncherActivity.java | 4 ++-- .../java/net/kdt/pojavlaunch/PojavLoginActivity.java | 8 ++++---- app/src/main/java/net/kdt/pojavlaunch/Tools.java | 10 +++------- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java b/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java index 6df4cf103..fd0620bc0 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java @@ -151,8 +151,8 @@ public class MCLauncherActivity extends BaseLauncherActivity protected float updateWidthHeight() { float leftRightWidth = (float) CallbackBridge.windowWidth / 100f * 32f; float mPlayButtonWidth = CallbackBridge.windowWidth - leftRightWidth * 2f; - LinearLayout.LayoutParams leftRightParams = new LinearLayout.LayoutParams((int) leftRightWidth, (int) Tools.dpToPx(this, CallbackBridge.windowHeight / 9)); - LinearLayout.LayoutParams mPlayButtonParams = new LinearLayout.LayoutParams((int) mPlayButtonWidth, (int) Tools.dpToPx(this, CallbackBridge.windowHeight / 9)); + LinearLayout.LayoutParams leftRightParams = new LinearLayout.LayoutParams((int) leftRightWidth, (int) Tools.dpToPx(CallbackBridge.windowHeight / 9)); + LinearLayout.LayoutParams mPlayButtonParams = new LinearLayout.LayoutParams((int) mPlayButtonWidth, (int) Tools.dpToPx(CallbackBridge.windowHeight / 9)); leftView.setLayoutParams(leftRightParams); rightView.setLayoutParams(leftRightParams); mPlayButton.setLayoutParams(mPlayButtonParams); diff --git a/app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java b/app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java index b9568a850..9996a4d14 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java @@ -185,8 +185,8 @@ public class PojavLauncherActivity extends BaseLauncherActivity protected float updateWidthHeight() { float leftRightWidth = (float) CallbackBridge.windowWidth / 100f * 32f; float mPlayButtonWidth = CallbackBridge.windowWidth - leftRightWidth * 2f; - LinearLayout.LayoutParams leftRightParams = new LinearLayout.LayoutParams((int) leftRightWidth, (int) Tools.dpToPx(this, CallbackBridge.windowHeight / 9)); - LinearLayout.LayoutParams mPlayButtonParams = new LinearLayout.LayoutParams((int) mPlayButtonWidth, (int) Tools.dpToPx(this, CallbackBridge.windowHeight / 9)); + LinearLayout.LayoutParams leftRightParams = new LinearLayout.LayoutParams((int) leftRightWidth, (int) Tools.dpToPx(CallbackBridge.windowHeight / 9)); + LinearLayout.LayoutParams mPlayButtonParams = new LinearLayout.LayoutParams((int) mPlayButtonWidth, (int) Tools.dpToPx(CallbackBridge.windowHeight / 9)); leftView.setLayoutParams(leftRightParams); rightView.setLayoutParams(leftRightParams); mPlayButton.setLayoutParams(mPlayButtonParams); diff --git a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java index aa9894be9..8e83eb3bc 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java @@ -56,10 +56,10 @@ public class PojavLoginActivity extends BaseActivity Tools.updateWindowSize(this); - ControlData.pixelOf2dp = (int) Tools.dpToPx(this, 2); - ControlData.pixelOf30dp = (int) Tools.dpToPx(this, 30); - ControlData.pixelOf50dp = (int) Tools.dpToPx(this, 50); - ControlData.pixelOf80dp = (int) Tools.dpToPx(this, 80); + ControlData.pixelOf2dp = (int) Tools.dpToPx(2); + ControlData.pixelOf30dp = (int) Tools.dpToPx(30); + ControlData.pixelOf50dp = (int) Tools.dpToPx(50); + ControlData.pixelOf80dp = (int) Tools.dpToPx(80); ControlData[] specialButtons = ControlData.getSpecialButtons(); specialButtons[0].name = getString(R.string.control_keyboard); specialButtons[1].name = getString(R.string.control_toggle); diff --git a/app/src/main/java/net/kdt/pojavlaunch/Tools.java b/app/src/main/java/net/kdt/pojavlaunch/Tools.java index 22664ea5f..9dac47ac3 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/Tools.java +++ b/app/src/main/java/net/kdt/pojavlaunch/Tools.java @@ -341,15 +341,11 @@ public final class Tools CallbackBridge.windowHeight = currentDisplayMetrics.heightPixels; } - public static float pxToDp(Context ctx, float px) { - return (px / ctx.getResources().getDisplayMetrics().density); - } - - public static float dpToPx(Context ctx, float dp) { + public static float dpToPx(float dp) { // 921600 = 1280 * 720, default scale // TODO better way to scaling - // float scaledDp = dp / 921600 * CallbackBridge.windowWidth * CallbackBridge.windowHeight; - return (dp /* scaledDp */ * ctx.getResources().getDisplayMetrics().density); + float scaledDp = dp / DisplayMetrics.DENSITY_XHIGH * currentDisplayMetrics.densityDpi; + return (scaledDp * currentDisplayMetrics.density); } public static void copyAssetFile(Context ctx, String fileName, String output, boolean overwrite) throws Exception