From 644af4eaaf6b333121fbce81c0788bfde9248254 Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Fri, 20 Nov 2020 12:59:59 +0700 Subject: [PATCH] Fixes - Some crashes - Button too big --- .../java/com/kdt/handleview/ActionPopupWindow.java | 2 +- .../main/java/net/kdt/pojavlaunch/BaseActivity.java | 10 ++++++++-- .../java/net/kdt/pojavlaunch/MCLauncherActivity.java | 2 +- app/src/main/java/net/kdt/pojavlaunch/Tools.java | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/kdt/handleview/ActionPopupWindow.java b/app/src/main/java/com/kdt/handleview/ActionPopupWindow.java index 7602ec521..3982e9bda 100644 --- a/app/src/main/java/com/kdt/handleview/ActionPopupWindow.java +++ b/app/src/main/java/com/kdt/handleview/ActionPopupWindow.java @@ -42,7 +42,7 @@ public class ActionPopupWindow extends PinnedPopupWindow implements OnClickListe } private int getInternalId(String type, String name) { - int id = Resources.getSystem().getIdentifier(name, type, "com.android.internal.R"); + int id = Resources.getSystem().getIdentifier(name, type, "com.android.internal"); if (id == 0) { mHandleView.getContext().getResources().getIdentifier(name, type, "android"); } diff --git a/app/src/main/java/net/kdt/pojavlaunch/BaseActivity.java b/app/src/main/java/net/kdt/pojavlaunch/BaseActivity.java index f5789074a..fff4108f5 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/BaseActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/BaseActivity.java @@ -1,7 +1,13 @@ package net.kdt.pojavlaunch; import android.support.v7.app.*; +import android.os.*; -public class BaseActivity extends AppCompatActivity { - +public class BaseActivity extends AppCompatActivity +{ + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + Tools.updateWindowSize(this); + } } diff --git a/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java b/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java index 0228d7ac6..ab312d139 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java @@ -56,7 +56,7 @@ public class MCLauncherActivity extends BaseLauncherActivity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - + viewInit(); Tools.setFullscreen(this); diff --git a/app/src/main/java/net/kdt/pojavlaunch/Tools.java b/app/src/main/java/net/kdt/pojavlaunch/Tools.java index 7342e66cc..9cd1fdbd9 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/Tools.java +++ b/app/src/main/java/net/kdt/pojavlaunch/Tools.java @@ -347,8 +347,8 @@ public final class Tools public static float dpToPx(Context ctx, float dp) { // 921600 = 1280 * 720, default scale - float scaledDp = dp * currentDisplayMetrics.scaledDensity; - // / 921600 * CallbackBridge.windowWidth * CallbackBridge.windowHeight; + // TODO better way to scaling + float scaledDp = dp / 921600 * CallbackBridge.windowWidth * CallbackBridge.windowHeight; return (scaledDp * ctx.getResources().getDisplayMetrics().density); }