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

[Text input] remove CapturedEditText and supports "dead chars"

Browse Source
This commit is contained in:
khanhduytran0 2020-11-28 18:57:45 +07:00
parent 77bfd121ea
commit 5c74b1038b
4 changed files with 11 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java
View File

@ -195,8 +195,12 @@ public class AndroidLWJGLKeycode {
} }
try { try {
if ((int) keyEvent.getDisplayLabel() != KeyEvent.KEYCODE_UNKNOWN && !CallbackBridge.isGrabbing()) { if (!CallbackBridge.isGrabbing()) {
BaseMainActivity.sendKeyPress(androidToLwjglMap.get(keyEvent.getKeyCode()), (char) keyEvent.getUnicodeChar(), keyEvent.getScanCode(), mods, isDown); if ((int) keyEvent.getDisplayLabel() != KeyEvent.KEYCODE_UNKNOWN) {
BaseMainActivity.sendKeyPress(androidToLwjglMap.get(keyEvent.getKeyCode()), (char) keyEvent.getDisplayLabel(), keyEvent.getScanCode(), mods, isDown);
} else if ((int) keyEvent.getUnicodeChar() != KeyEvent.KEYCODE_UNKNOWN) {
BaseMainActivity.sendKeyPress(androidToLwjglMap.get(keyEvent.getKeyCode()), (char) keyEvent.getUnicodeChar(), keyEvent.getScanCode(), mods, isDown);
}
} }
} catch (Throwable th) { } catch (Throwable th) {
th.printStackTrace(); th.printStackTrace();

10
app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
View File

@ -74,7 +74,7 @@ public class BaseMainActivity extends LoggableActivity {
private DrawerLayout drawerLayout; private DrawerLayout drawerLayout;
private NavigationView navDrawer; private NavigationView navDrawer;
protected CapturedEditText mKeyHandlerView; // protected CapturedEditText mKeyHandlerView;
private LinearLayout contentLog; private LinearLayout contentLog;
private TextView textLog; private TextView textLog;
@ -197,13 +197,13 @@ public class BaseMainActivity extends LoggableActivity {
// toggleGui(null); // toggleGui(null);
this.drawerLayout.closeDrawers(); this.drawerLayout.closeDrawers();
/*
mKeyHandlerView = findViewById(R.id.main_key_handler); mKeyHandlerView = findViewById(R.id.main_key_handler);
mKeyHandlerView.setSingleLine(false); mKeyHandlerView.setSingleLine(false);
mKeyHandlerView.clearFocus(); mKeyHandlerView.clearFocus();
AndroidLWJGLKeycode.isBackspaceAfterChar = true; // mVersionInfo.minimumLauncherVersion >= 18; AndroidLWJGLKeycode.isBackspaceAfterChar = true; // mVersionInfo.minimumLauncherVersion >= 18;
*/
placeMouseAt(CallbackBridge.windowWidth / 2, CallbackBridge.windowHeight / 2); placeMouseAt(CallbackBridge.windowWidth / 2, CallbackBridge.windowHeight / 2);
new Thread(new Runnable(){ new Thread(new Runnable(){
@ -719,7 +719,7 @@ public class BaseMainActivity extends LoggableActivity {
Tools.showError(this, e, true); Tools.showError(this, e, true);
} }
} }
/*
@Override @Override
public boolean onKeyUp(int keyCode, KeyEvent event) { public boolean onKeyUp(int keyCode, KeyEvent event) {
AndroidLWJGLKeycode.execKey(event, keyCode, false); AndroidLWJGLKeycode.execKey(event, keyCode, false);
@ -731,7 +731,7 @@ public class BaseMainActivity extends LoggableActivity {
AndroidLWJGLKeycode.execKey(event, keyCode, true); AndroidLWJGLKeycode.execKey(event, keyCode, true);
return super.onKeyDown(keyCode, event); return super.onKeyDown(keyCode, event);
} }
*/
//private Dialog menuDial; //private Dialog menuDial;
@Override @Override

31
app/src/main/java/net/kdt/pojavlaunch/CapturedEditText.java
View File

@ -1,31 +0,0 @@
package net.kdt.pojavlaunch;
import android.content.*;
import android.util.*;
import android.widget.*;
import android.view.*;
public class CapturedEditText extends EditText
{
public CapturedEditText(Context ctx) {
this(ctx, null);
}
public CapturedEditText(Context ctx, AttributeSet attrs) {
super(ctx, attrs);
}
@Override
public boolean onKeyPreIme(int keyCode, KeyEvent event){
switch (event.getAction()) {
case KeyEvent.ACTION_DOWN:
AndroidLWJGLKeycode.execKey(event, keyCode, true);
break;
case KeyEvent.ACTION_UP:
AndroidLWJGLKeycode.execKey(event, keyCode, false);
break;
}
return false;
}
}

6
app/src/main/res/layout/main_with_customctrl.xml
View File

@ -18,12 +18,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<net.kdt.pojavlaunch.CapturedEditText
android:imeOptions="flagNoExtractUi"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:id="@+id/main_key_handler"/>
<net.kdt.pojavlaunch.MinecraftGLView <net.kdt.pojavlaunch.MinecraftGLView
android:id="@+id/main_game_render_view" android:id="@+id/main_game_render_view"
android:layout_width="fill_parent" android:layout_width="fill_parent"