mirror of
https://github.com/AngelAuraMC/Amethyst-Android.git
synced 2025-09-14 15:17:02 -04:00
Control: shift button now change down state on click
This commit is contained in:
parent
226c8ae7e9
commit
14f0d159b0
@ -34,7 +34,7 @@ import sun.security.jca.*;
|
|||||||
|
|
||||||
import android.app.AlertDialog;
|
import android.app.AlertDialog;
|
||||||
|
|
||||||
public class MainActivity extends AppCompatActivity implements OnTouchListener, OnClickListener
|
public class MainActivity extends AppCompatActivity implements OnTouchListener, OnClickListener, ToggleButton.OnCheckedChangeListener
|
||||||
{
|
{
|
||||||
public static final String initText = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ";
|
public static final String initText = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ";
|
||||||
|
|
||||||
@ -821,6 +821,15 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCheckedChanged(CompoundButton btn, boolean checked) {
|
||||||
|
switch (btn.getId()) {
|
||||||
|
case R.id.control_shift:
|
||||||
|
sendKeyPress(Keyboard.KEY_LSHIFT, checked);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public boolean onTouch(View v, MotionEvent e) {
|
public boolean onTouch(View v, MotionEvent e) {
|
||||||
boolean isDown;
|
boolean isDown;
|
||||||
switch (e.getActionMasked()) {
|
switch (e.getActionMasked()) {
|
||||||
@ -855,7 +864,7 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
|
|||||||
setRightOverride(isDown);
|
setRightOverride(isDown);
|
||||||
} break;
|
} break;
|
||||||
case R.id.control_debug: sendKeyPress(Keyboard.KEY_F3, isDown); break;
|
case R.id.control_debug: sendKeyPress(Keyboard.KEY_F3, isDown); break;
|
||||||
case R.id.control_shift: sendKeyPress(Keyboard.KEY_LSHIFT, isDown); break;
|
// case R.id.control_shift: sendKeyPress(Keyboard.KEY_LSHIFT, isDown); break;
|
||||||
case R.id.control_inventory: sendKeyPress(Keyboard.KEY_E, isDown); break;
|
case R.id.control_inventory: sendKeyPress(Keyboard.KEY_E, isDown); break;
|
||||||
case R.id.control_talk: sendKeyPress(Keyboard.KEY_T, isDown); break;
|
case R.id.control_talk: sendKeyPress(Keyboard.KEY_T, isDown); break;
|
||||||
case R.id.control_keyboard: showKeyboard(); break;
|
case R.id.control_keyboard: showKeyboard(); break;
|
||||||
@ -1436,7 +1445,9 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
|
|||||||
Button button = (Button) findViewById(id);
|
Button button = (Button) findViewById(id);
|
||||||
button.setWidth((int) Tools.dpToPx(this, Tools.pxToDp(this, button.getWidth()) * PojavPreferenceActivity.PREF_BUTTONSIZE));
|
button.setWidth((int) Tools.dpToPx(this, Tools.pxToDp(this, button.getWidth()) * PojavPreferenceActivity.PREF_BUTTONSIZE));
|
||||||
button.setHeight((int) Tools.dpToPx(this, Tools.pxToDp(this, button.getHeight()) * PojavPreferenceActivity.PREF_BUTTONSIZE));
|
button.setHeight((int) Tools.dpToPx(this, Tools.pxToDp(this, button.getHeight()) * PojavPreferenceActivity.PREF_BUTTONSIZE));
|
||||||
button.setOnTouchListener(this);
|
if (button instanceof ToggleButton) {
|
||||||
|
((ToggleButton) button).setOnCheckedChangeListener(this);
|
||||||
|
} else button.setOnTouchListener(this);
|
||||||
return button;
|
return button;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -193,7 +193,7 @@
|
|||||||
android:layout_alignParentLeft="true"
|
android:layout_alignParentLeft="true"
|
||||||
android:layout_alignParentBottom="true"/>
|
android:layout_alignParentBottom="true"/>
|
||||||
|
|
||||||
<Button
|
<ToggleButton
|
||||||
android:textSize="20.0sp"
|
android:textSize="20.0sp"
|
||||||
android:id="@+id/control_shift"
|
android:id="@+id/control_shift"
|
||||||
android:background="@drawable/control_button"
|
android:background="@drawable/control_button"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user