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

Add support for swipeable buttons !

Browse Source
This commit is contained in:
SerpentSpirale 2021-07-05 17:22:03 +02:00
parent a5f8c4f69f
commit c7cb8d45dc
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlLayout.java
View File

@ -6,12 +6,14 @@ import android.widget.*;
import com.google.gson.*; import com.google.gson.*;
import java.io.*; import java.io.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import net.kdt.pojavlaunch.*; import net.kdt.pojavlaunch.*;
import net.kdt.pojavlaunch.customcontrols.buttons.ControlButton; import net.kdt.pojavlaunch.customcontrols.buttons.ControlButton;
import net.kdt.pojavlaunch.customcontrols.buttons.ControlDrawer; import net.kdt.pojavlaunch.customcontrols.buttons.ControlDrawer;
import net.kdt.pojavlaunch.customcontrols.buttons.ControlSubButton; import net.kdt.pojavlaunch.customcontrols.buttons.ControlSubButton;
import net.kdt.pojavlaunch.customcontrols.handleview.HandleView;
import net.kdt.pojavlaunch.prefs.*; import net.kdt.pojavlaunch.prefs.*;
import org.lwjgl.glfw.*; import org.lwjgl.glfw.*;
@ -52,6 +54,7 @@ public class ControlLayout extends FrameLayout
} }
System.gc(); System.gc();
mapTable.clear();
// Cleanup buttons only when input layout is null // Cleanup buttons only when input layout is null
if (controlLayout == null) return; if (controlLayout == null) return;
@ -68,8 +71,9 @@ public class ControlLayout extends FrameLayout
ControlDrawer drawer = addDrawerView(drawerData); ControlDrawer drawer = addDrawerView(drawerData);
if(mModifiable) drawer.areButtonsVisible = true; if(mModifiable) drawer.areButtonsVisible = true;
//CONTROL SUB BUTTON //CONTROL SUB BUTTON
for (ControlData subButton : drawerData.buttonProperties){ for (ControlData subButton : drawerData.buttonProperties) {
addSubView(drawer, subButton); addSubView(drawer, subButton);
} }
} }
@ -233,23 +237,20 @@ public class ControlLayout extends FrameLayout
return children; return children;
} }
ControlButton lastControlButton = null; HashMap<View, ControlButton> mapTable = new HashMap<>();
//While this is called onTouch, this should only be called from a ControlButton. //While this is called onTouch, this should only be called from a ControlButton.
public boolean onTouch(MotionEvent ev) { public boolean onTouch(View v, MotionEvent ev) {
ControlButton lastControlButton = mapTable.get(v);
//Check if the action is cancelling, reset the lastControl button associated to the view
if(ev.getActionMasked() == MotionEvent.ACTION_UP || ev.getActionMasked() == MotionEvent.ACTION_CANCEL){ if(ev.getActionMasked() == MotionEvent.ACTION_UP || ev.getActionMasked() == MotionEvent.ACTION_CANCEL){
if(lastControlButton != null) lastControlButton.onTouchEvent(ev); if(lastControlButton != null) lastControlButton.onTouchEvent(ev);
lastControlButton = null; mapTable.put(v, null);
return true; return true;
} }
if(ev.getActionMasked() != MotionEvent.ACTION_MOVE) return false; if(ev.getActionMasked() != MotionEvent.ACTION_MOVE) return false;
ArrayList<ControlButton> children = getButtonChildren();
/*
Log.d("getX LAYOUT_CONTROL", String.valueOf(ev.getX()));
Log.d("getY LAYOUT_CONTROL", String.valueOf(ev.getY()));
Log.d("getRawX LAYOUT_CONTROL", String.valueOf(ev.getRawX()));
Log.d("getRawY LAYOUT_CONTROL", String.valueOf(ev.getRawY()));
*/
//Optimization pass to avoid looking at all children again //Optimization pass to avoid looking at all children again
if(lastControlButton != null){ if(lastControlButton != null){
if( ev.getRawX() > lastControlButton.getX() && ev.getRawX() < lastControlButton.getX() + lastControlButton.getWidth() && if( ev.getRawX() > lastControlButton.getX() && ev.getRawX() < lastControlButton.getX() + lastControlButton.getWidth() &&
@ -258,19 +259,17 @@ public class ControlLayout extends FrameLayout
} }
} }
for(ControlButton button : children){
/*
Log.d("Left: LAYOUT_CONTROL", String.valueOf(button.getLeft()));
Log.d("TOP: LAYOUT_CONTROL", String.valueOf(button.getTop()));
Log.d("RIGHT: LAYOUT_CONTROL", String.valueOf(button.getRight()));
Log.d("BOTTOM: LAYOUT_CONTROL", String.valueOf(button.getBottom()));
*/
//Look for another SWIPEABLE button
for(ControlButton button : getButtonChildren()){
if(!button.getProperties().isSwipeable) continue; if(!button.getProperties().isSwipeable) continue;
if( ev.getRawX() > button.getX() && ev.getRawX() < button.getX() + button.getWidth() && if( ev.getRawX() > button.getX() && ev.getRawX() < button.getX() + button.getWidth() &&
ev.getRawY() > button.getY() && ev.getRawY() < button.getY() + button.getHeight()){ ev.getRawY() > button.getY() && ev.getRawY() < button.getY() + button.getHeight()){
System.out.println("FOUND ONE !");
//Button hovered; //Release the last key, press the new one
if(!button.equals(lastControlButton)){ if(!button.equals(lastControlButton)){
ev.setAction(MotionEvent.ACTION_POINTER_UP); ev.setAction(MotionEvent.ACTION_POINTER_UP);
if (lastControlButton != null) lastControlButton.onTouchEvent(ev); if (lastControlButton != null) lastControlButton.onTouchEvent(ev);
@ -278,7 +277,7 @@ public class ControlLayout extends FrameLayout
ev.setAction(MotionEvent.ACTION_POINTER_DOWN); ev.setAction(MotionEvent.ACTION_POINTER_DOWN);
button.onTouchEvent(ev); button.onTouchEvent(ev);
lastControlButton = button; mapTable.put(v, button);
} }
return true; return true;
} }

6
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java
View File

@ -260,13 +260,13 @@ public class ControlButton extends androidx.appcompat.widget.AppCompatButton imp
} }
} }
isPointerOutOfBounds = true; isPointerOutOfBounds = true;
((ControlLayout) getParent()).onTouch(event); ((ControlLayout) getParent()).onTouch(this, event);
break; break;
} }
//Else if we now are in bounds //Else if we now are in bounds
if(isPointerOutOfBounds) { if(isPointerOutOfBounds) {
((ControlLayout) getParent()).onTouch(event); ((ControlLayout) getParent()).onTouch(this, event);
//RE-press the button //RE-press the button
if(mProperties.isSwipeable && !mProperties.isToggle){ if(mProperties.isSwipeable && !mProperties.isToggle){
setHolding(true); setHolding(true);
@ -287,7 +287,7 @@ public class ControlButton extends androidx.appcompat.widget.AppCompatButton imp
case MotionEvent.ACTION_UP: // 1 case MotionEvent.ACTION_UP: // 1
case MotionEvent.ACTION_CANCEL: // 3 case MotionEvent.ACTION_CANCEL: // 3
case MotionEvent.ACTION_POINTER_UP: // 6 case MotionEvent.ACTION_POINTER_UP: // 6
if(isPointerOutOfBounds) ((ControlLayout) getParent()).onTouch(event); if(isPointerOutOfBounds) ((ControlLayout) getParent()).onTouch(this, event);
isPointerOutOfBounds = false; isPointerOutOfBounds = false;
if(!triggerToggle(event)) { if(!triggerToggle(event)) {