mirror/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2026-05-25 02:14:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix custom controls screen crash; Fix uninstall JRE dialog crash

Browse Source
This commit is contained in:
khanhduytran0
2020-09-22 12:47:29 +07:00
parent 627de51fb0
commit 986549cd73
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/net/kdt/pojavlaunch/prefs/UninstallJREDialogPreference.java
View File

@@ -1,16 +1,18 @@
package net.kdt.pojavlaunch.prefs;
import android.content.*;
import android.support.v7.app.*;
import android.support.v7.preference.*;
import android.util.*;
import android.widget.*;
import java.io.*;
import net.kdt.pojavlaunch.*;
import net.kdt.pojavlaunch.R;
import android.widget.*;
public class UninstallJREDialogPreference extends DialogPreference implements DialogInterface.OnClickListener
public class UninstallJREDialogPreference extends Preference implements DialogInterface.OnClickListener
{
private AlertDialog mDialog;
public UninstallJREDialogPreference(Context ctx) {
this(ctx, null);
}
@@ -18,9 +20,18 @@ public class UninstallJREDialogPreference extends DialogPreference implements Di
public UninstallJREDialogPreference(Context ctx, AttributeSet attrs) {
super(ctx, attrs);
setPersistent(false);
setDialogMessage(R.string.mcl_setting_title_uninstalljre);
setPositiveButtonText(android.R.string.ok);
setNegativeButtonText(android.R.string.cancel);
AlertDialog.Builder dialog = new AlertDialog.Builder(getContext());
dialog.setMessage(R.string.mcl_setting_title_uninstalljre);
dialog.setPositiveButton(android.R.string.ok, this);
dialog.setNegativeButton(android.R.string.cancel, this);
mDialog = dialog.create();
}
@Override
protected void onClick() {
super.onClick();
mDialog.show();
}
@Override

4
app/src/main/java/net/kdt/pojavlaunch/value/customcontrols/ControlView.java
View File

@@ -54,7 +54,9 @@ public class ControlView extends Button implements OnLongClickListener, OnTouchL
setTranslationY(moveY = properties.y);
}
if (properties.specialButtonListener instanceof View.OnClickListener) {
if (properties.specialButtonListener == null) {
// A non-special button or inside custom controls screen so skip listener
} if (properties.specialButtonListener instanceof View.OnClickListener) {
setOnClickListener((View.OnClickListener) properties.specialButtonListener);
} else if (properties.specialButtonListener instanceof View.OnTouchListener) {
setOnTouchListener((View.OnTouchListener) properties.specialButtonListener);