mirror of
https://github.com/AngelAuraMC/Amethyst-Android.git
synced 2025-09-16 16:16:04 -04:00
[Custom controls] Fix control edit appear on play
This commit is contained in:
parent
746aeea4c5
commit
87809c5532
@ -664,7 +664,7 @@ public final class Tools
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static String read(InputStream is) throws Exception {
|
public static String read(InputStream is) throws IOException {
|
||||||
String out = "";
|
String out = "";
|
||||||
int len;
|
int len;
|
||||||
byte[] buf = new byte[512];
|
byte[] buf = new byte[512];
|
||||||
@ -674,11 +674,11 @@ public final class Tools
|
|||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String read(String path) throws Exception {
|
public static String read(String path) throws IOException {
|
||||||
return read(new FileInputStream(path));
|
return read(new FileInputStream(path));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void write(String path, byte[] content) throws Exception
|
public static void write(String path, byte[] content) throws IOException
|
||||||
{
|
{
|
||||||
File outPath = new File(path);
|
File outPath = new File(path);
|
||||||
outPath.getParentFile().mkdirs();
|
outPath.getParentFile().mkdirs();
|
||||||
@ -689,8 +689,7 @@ public final class Tools
|
|||||||
fos.close();
|
fos.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void write(String path, String content) throws Exception
|
public static void write(String path, String content) throws IOException {
|
||||||
{
|
|
||||||
write(path, content.getBytes());
|
write(path, content.getBytes());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -147,35 +147,35 @@ public class ControlButton extends Button implements OnLongClickListener, OnTouc
|
|||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
} else {
|
||||||
|
if (mGestureDetector.onTouchEvent(event)) {
|
||||||
if (mGestureDetector.onTouchEvent(event)) {
|
|
||||||
mCanTriggerLongClick = true;
|
|
||||||
onLongClick(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (event.getActionMasked()) {
|
|
||||||
case MotionEvent.ACTION_UP:
|
|
||||||
case MotionEvent.ACTION_DOWN:
|
|
||||||
mCanTriggerLongClick = true;
|
mCanTriggerLongClick = true;
|
||||||
downX = event.getX();
|
onLongClick(this);
|
||||||
downY = event.getY();
|
}
|
||||||
break;
|
|
||||||
|
switch (event.getActionMasked()) {
|
||||||
case MotionEvent.ACTION_MOVE:
|
case MotionEvent.ACTION_UP:
|
||||||
mCanTriggerLongClick = false;
|
case MotionEvent.ACTION_DOWN:
|
||||||
moveX += event.getX() - downX;
|
mCanTriggerLongClick = true;
|
||||||
moveY += event.getY() - downY;
|
downX = event.getX();
|
||||||
|
downY = event.getY();
|
||||||
|
break;
|
||||||
|
|
||||||
if (!mProperties.isDynamicBtn) {
|
case MotionEvent.ACTION_MOVE:
|
||||||
setTranslationX(moveX);
|
mCanTriggerLongClick = false;
|
||||||
setTranslationY(moveY);
|
moveX += event.getX() - downX;
|
||||||
}
|
moveY += event.getY() - downY;
|
||||||
|
|
||||||
break;
|
if (!mProperties.isDynamicBtn) {
|
||||||
|
setTranslationX(moveX);
|
||||||
|
setTranslationY(moveY);
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setModifiable(boolean z) {
|
public void setModifiable(boolean z) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user