2009Scape/2009Scape-mobile
1
0
Fork 0
mirror of https://github.com/2009scape/2009Scape-mobile.git synced 2025-12-20 13:30:15 -07:00
Code Issues Projects Releases Packages Wiki Activity

Settings Toasts, Long tap improvments, updated miniclient

Browse source
This commit is contained in:
downthecrop 2021-12-28 22:29:26 -08:00
parent 108695fec5
commit 4979167651
4 changed files with 39 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

29
app_2009scape/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java
View file

@ -105,7 +105,7 @@ public class JavaGUILauncherActivity extends BaseActivity implements View.OnTou
lp.addRule(RelativeLayout.ALIGN_PARENT_END);
RelativeLayout.LayoutParams lp1 = (RelativeLayout.LayoutParams) findViewById(R.id.mb2).getLayoutParams();
lp1.addRule(RelativeLayout.LEFT_OF,R.id.keyboard);
lp1.addRule(RelativeLayout.RIGHT_OF); // Clear right of prop
lp1.addRule(RelativeLayout.RIGHT_OF,0); // Clear right_of prop
RelativeLayout.LayoutParams lp2 = (RelativeLayout.LayoutParams) findViewById(R.id.main_toggle_mouse).getLayoutParams();
lp2.addRule(RelativeLayout.LEFT_OF,R.id.keyboard);
RelativeLayout.LayoutParams lp3 = (RelativeLayout.LayoutParams) findViewById(R.id.installmod_scale_down).getLayoutParams();
@ -148,7 +148,7 @@ public class JavaGUILauncherActivity extends BaseActivity implements View.OnTou
public boolean onTouch(View v, MotionEvent event) {
int action = event.getActionMasked();
if(action == 0){
if(action == KeyEvent.ACTION_DOWN){
// Reset checks because this is a new tap
longPressTriggered = false;
totalMovement = 0;
@ -169,12 +169,13 @@ public class JavaGUILauncherActivity extends BaseActivity implements View.OnTou
}
// Long press
totalMovement += Math.abs(x - prevX) + Math.abs(y - prevX);
totalMovement += Math.abs(x - prevX) + Math.abs(y - prevY);
if(!longPressTriggered &&
System.currentTimeMillis() - touchStart > 1500 &&
totalMovement < 8000
totalMovement < 5
){
longPressTriggered = true;
Log.i("Longpress: ",""+totalMovement);
AWTInputBridge.sendKey((char)118,118);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
vb.vibrate(VibrationEffect.createOneShot(100, VibrationEffect.DEFAULT_AMPLITUDE));
@ -302,6 +303,19 @@ public class JavaGUILauncherActivity extends BaseActivity implements View.OnTou
@Override
public boolean dispatchKeyEvent(KeyEvent event) {
if(event.getAction() == KeyEvent.ACTION_DOWN){
/*
About Key Events. Because the Android Spec doesn't require
soft keyboards to dispatch key events not all keyboard implementations
across Android will trigger these actions.
Currently we use the following function to translate keycodes for
special character, capital letters, and digits.
keycode 123 (F12) is used as a single digit capslock button which
when sent to the miniclient before a char will act accordingly.
*/
if(event.getKeyCode() == 67){
// Backspace
AWTInputBridge.sendKey((char)0x08,0x08);
@ -370,7 +384,6 @@ public class JavaGUILauncherActivity extends BaseActivity implements View.OnTou
c = '\\';
break;
}
//System.out.println("I SEE A "+(char)event.getUnicodeChar());
if(c != (char)event.getUnicodeChar()){
System.out.println("REPLACED with "+(char)c);
AWTInputBridge.sendKey((char)123,123);
@ -378,14 +391,12 @@ public class JavaGUILauncherActivity extends BaseActivity implements View.OnTou
AWTInputBridge.sendKey((char)c,c);
} else if(Character.isDigit((char)event.getUnicodeChar())){
System.out.println("I SEE A "+(char)event.getUnicodeChar());
AWTInputBridge.sendKey((char)event.getUnicodeChar(),(char)event.getUnicodeChar());
} else if ((char)event.getUnicodeChar() == Character.toUpperCase((char)event.getUnicodeChar())){
// We send a '`' (keycode) 192 to avoid needing to worry about shift. The RS client takes this modifier
// and does a toUpperCase(). Special character mapping will also need to be provided.
// We send F12 (keycode 123) to avoid needing to worry about shift. The RS client takes this modifier
// and does a toUpperCase().
AWTInputBridge.sendKey((char)123,123);
AWTInputBridge.sendKey((char)Character.toUpperCase(event.getUnicodeChar()),(char)Character.toUpperCase(event.getUnicodeChar()));
// Send shift key.. only problem is then you're stuck shifted.
// AWTInputBridge.sendKey((char)0x10,(char)Character.toUpperCase(event.getUnicodeChar()),0,0x10);
} else if((char)event.getUnicodeChar() == Character.toLowerCase((char)event.getUnicodeChar())){

14
app_2009scape/src/main/java/net/kdt/pojavlaunch/SettingsMenu.java
View file

@ -52,12 +52,7 @@ public class SettingsMenu extends Activity {
switch (requestCode) {
case FILE_SELECT_CODE:
if (resultCode == RESULT_OK) {
// Get the Uri of the selected file
Uri uri = data.getData();
Log.d("TAG", "File Uri: " + uri.toString());
// Get the path
Log.d("TAG", "File Path: " + uri.getPath());
// Get the file instance
File config = new File(getFilesDir(), "config.json");
try {
Log.d("TAG", "Starting copy: " + uri.getPath());
@ -70,7 +65,8 @@ public class SettingsMenu extends Activity {
}
fileOutputStream.close();
inputStream.close();
System.out.println("Wrote new config to Local");
Toast.makeText(this, "Config loaded. Please restart the app.",
Toast.LENGTH_SHORT).show();
} catch (IOException e1) {
Log.d("error", "Error with file " + e1);
}
@ -141,14 +137,14 @@ public class SettingsMenu extends Activity {
return false;
});
righthanded.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
righthanded.setOnCheckedChangeListener((buttonView, isChecked) -> {
// do something, the isChecked will be
// true if the switch is in the On position
System.out.println(isChecked);
editor.putString("righthanded",""+isChecked);
editor.commit();
}
Toast.makeText(this, "Relaunch required to update GUI.",
Toast.LENGTH_SHORT).show();
});
}

12
app_2009scape/src/main/res/layout/settings_menu.xml
View file

@ -26,8 +26,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/loginText"
android:layout_marginTop="43dp"
android:layout_marginTop="16dp"
android:hint="Username"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
app:layout_constraintTop_toBottomOf="@+id/loginText" />
<com.google.android.material.textfield.TextInputEditText
@ -35,7 +37,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/username"
android:layout_marginTop="28dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:hint="Password"
android:inputType="textPassword"
app:layout_constraintTop_toBottomOf="@+id/username"
@ -46,6 +50,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="35dp"
android:text="Right Handed Mode"
app:layout_constraintStart_toStartOf="parent"
@ -53,9 +58,10 @@
<Button
android:id="@+id/loadconfig"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="24dp"
android:text="Load Config"
app:layout_constraintStart_toStartOf="parent"

BIN
app_2009scape/src/main/res/raw/miniclient.jar
View file

Binary file not shown.