From 14f0d159b0a437ad5a5ae8199d484e625c76c667 Mon Sep 17 00:00:00 2001
From: khanhduytran0 <khanhduytran032@gmail.com>
Date: Mon, 31 Aug 2020 12:42:58 +0700
Subject: [PATCH] Control: shift button now change down state on click

---
 .../java/net/kdt/pojavlaunch/MainActivity.java  | 17 ++++++++++++++---
 app/src/main/res/layout/main.xml                |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java
index 32c2fe6fd..bf1114ec4 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java
@@ -34,7 +34,7 @@ import sun.security.jca.*;
 
 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  ";
 
@@ -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) {
         boolean isDown;
         switch (e.getActionMasked()) {
@@ -855,7 +864,7 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
 					setRightOverride(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_talk: sendKeyPress(Keyboard.KEY_T, isDown); 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.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.setOnTouchListener(this);
+        if (button instanceof ToggleButton) {
+			((ToggleButton) button).setOnCheckedChangeListener(this);
+		} else button.setOnTouchListener(this);
         return button;
     }
 
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
index 9818270f9..5229bd287 100644
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -193,7 +193,7 @@
 				android:layout_alignParentLeft="true"
 				android:layout_alignParentBottom="true"/>
 
-			<Button
+			<ToggleButton
 				android:textSize="20.0sp"
 				android:id="@+id/control_shift"
 				android:background="@drawable/control_button"