TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-14 07:05:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Custom controls: fix wrong pos

Browse Source
This commit is contained in:
khanhduytran0 2020-09-22 13:25:40 +07:00
parent 89545f9256
commit d6988fea87
7 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java
View File

@ -140,7 +140,7 @@ public class CustomControlsActivity extends AppCompatActivity
builder.setPositiveButton(android.R.string.ok, null); builder.setPositiveButton(android.R.string.ok, null);
builder.setNegativeButton(android.R.string.cancel, null); builder.setNegativeButton(android.R.string.cancel, null);
if (exit) { if (exit) {
builder.setNeutralButton("Exit without save", new AlertDialog.OnClickListener(){ builder.setNeutralButton(R.string.mcn_exit_call, new AlertDialog.OnClickListener(){
@Override @Override
public void onClick(DialogInterface p1, int p2) { public void onClick(DialogInterface p1, int p2) {
CustomControlsActivity.super.onBackPressed(); CustomControlsActivity.super.onBackPressed();

7
app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java
View File

@ -62,9 +62,6 @@ public class MCLauncherActivity extends AppCompatActivity
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
gson = new Gson(); gson = new Gson();
DisplayMetrics dm = Tools.getDisplayMetrics(this);
CallbackBridge.windowWidth = dm.widthPixels;
CallbackBridge.windowHeight = dm.heightPixels;
viewInit(); viewInit();
final View decorView = getWindow().getDecorView(); final View decorView = getWindow().getDecorView();
@ -267,9 +264,9 @@ public class MCLauncherActivity extends AppCompatActivity
} }
@Override @Override
protected void onPostResume() protected void onPostResume() {
{
super.onPostResume(); super.onPostResume();
Tools.updateWindowSize(this);
} }
private float updateWidthHeight() { private float updateWidthHeight() {

1
app/src/main/java/net/kdt/pojavlaunch/MainActivity.java
View File

@ -171,7 +171,6 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
} }
this.displayMetrics = Tools.getDisplayMetrics(this); this.displayMetrics = Tools.getDisplayMetrics(this);
CallbackBridge.windowWidth = displayMetrics.widthPixels / scaleFactor; CallbackBridge.windowWidth = displayMetrics.widthPixels / scaleFactor;
CallbackBridge.windowHeight = displayMetrics.heightPixels / scaleFactor; CallbackBridge.windowHeight = displayMetrics.heightPixels / scaleFactor;
System.out.println("WidthHeight: " + CallbackBridge.windowWidth + ":" + CallbackBridge.windowHeight); System.out.println("WidthHeight: " + CallbackBridge.windowWidth + ":" + CallbackBridge.windowHeight);

11
app/src/main/java/net/kdt/pojavlaunch/PojavApplication.java
View File

@ -63,17 +63,6 @@ public class PojavApplication extends Application
LauncherPreferences.DEFAULT_PREF = PreferenceManager.getDefaultSharedPreferences(this); LauncherPreferences.DEFAULT_PREF = PreferenceManager.getDefaultSharedPreferences(this);
LauncherPreferences.loadPreferences(); LauncherPreferences.loadPreferences();
ControlButton.pixelOf2dp = (int) Tools.dpToPx(this, 2);
ControlButton.pixelOf30dp = (int) Tools.dpToPx(this, 30);
ControlButton.pixelOf50dp = (int) Tools.dpToPx(this, 50);
ControlButton.pixelOf80dp = (int) Tools.dpToPx(this, 80);
ControlButton[] specialButtons = ControlButton.getSpecialButtons();
specialButtons[0].name = getString(R.string.control_keyboard);
specialButtons[1].name = getString(R.string.control_toggle);
specialButtons[2].name = getString(R.string.control_primary);
specialButtons[3].name = getString(R.string.control_secondary);
specialButtons[4].name = getString(R.string.control_mouse);
FontChanger.initFonts(this); FontChanger.initFonts(this);
} catch (Throwable th) { } catch (Throwable th) {
Intent ferrorIntent = new Intent(this, FatalErrorActivity.class); Intent ferrorIntent = new Intent(this, FatalErrorActivity.class);

15
app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
View File

@ -48,6 +48,18 @@ public class PojavLoginActivity extends AppCompatActivity
protected void onCreate(Bundle savedInstanceState){ protected void onCreate(Bundle savedInstanceState){
super.onCreate(savedInstanceState); // false); super.onCreate(savedInstanceState); // false);
Tools.updateWindowSize(this);
ControlButton.pixelOf2dp = (int) Tools.dpToPx(this, 2);
ControlButton.pixelOf30dp = (int) Tools.dpToPx(this, 30);
ControlButton.pixelOf50dp = (int) Tools.dpToPx(this, 50);
ControlButton.pixelOf80dp = (int) Tools.dpToPx(this, 80);
ControlButton[] specialButtons = ControlButton.getSpecialButtons();
specialButtons[0].name = getString(R.string.control_keyboard);
specialButtons[1].name = getString(R.string.control_toggle);
specialButtons[2].name = getString(R.string.control_primary);
specialButtons[3].name = getString(R.string.control_secondary);
specialButtons[4].name = getString(R.string.control_mouse);
final View decorView = getWindow().getDecorView(); final View decorView = getWindow().getDecorView();
decorView.setOnSystemUiVisibilityChangeListener (new View.OnSystemUiVisibilityChangeListener() { decorView.setOnSystemUiVisibilityChangeListener (new View.OnSystemUiVisibilityChangeListener() {
@Override @Override
@ -278,6 +290,9 @@ public class PojavLoginActivity extends AppCompatActivity
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
Tools.updateWindowSize(this);
final int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION; final int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
final View decorView = getWindow().getDecorView(); final View decorView = getWindow().getDecorView();
decorView.setSystemUiVisibility(uiOptions); decorView.setSystemUiVisibility(uiOptions);

6
app/src/main/java/net/kdt/pojavlaunch/Tools.java
View File

@ -370,6 +370,12 @@ public final class Tools
return displayMetrics; return displayMetrics;
} }
public static void updateWindowSize(Activity ctx) {
DisplayMetrics dm = getDisplayMetrics(ctx);
CallbackBridge.windowWidth = dm.widthPixels;
CallbackBridge.windowHeight = dm.heightPixels;
}
public static float pxToDp(Context ctx, float px) { public static float pxToDp(Context ctx, float px) {
return (px / ctx.getResources().getDisplayMetrics().density); return (px / ctx.getResources().getDisplayMetrics().density);
} }

2
app/src/main/java/net/kdt/pojavlaunch/value/customcontrols/CustomControls.java
View File

@ -19,7 +19,7 @@ public class CustomControls
// Generate default control // Generate default control
public CustomControls(Context ctx) { public CustomControls(Context ctx) {
this(); this();
this.button.add(ControlButton.getSpecialButtons()[0].clone()); // LWJGLGLFWKeycode this.button.add(ControlButton.getSpecialButtons()[0].clone()); // Keyboard
this.button.add(ControlButton.getSpecialButtons()[1].clone()); // GUI this.button.add(ControlButton.getSpecialButtons()[1].clone()); // GUI
this.button.add(ControlButton.getSpecialButtons()[2].clone()); // Primary Mouse button this.button.add(ControlButton.getSpecialButtons()[2].clone()); // Primary Mouse button
this.button.add(ControlButton.getSpecialButtons()[3].clone()); // Secondary Mouse button this.button.add(ControlButton.getSpecialButtons()[3].clone()); // Secondary Mouse button