2009Scape/2009Scape-mobile
1
0
Fork 0
mirror of https://github.com/2009scape/2009Scape-mobile.git synced 2025-12-21 09:01:56 -07:00
Code Issues Projects Releases Packages Wiki Activity

Aggressive reduction of the dependencies, part 1/?

Browse source
This commit is contained in:
Boulay Mathias 2022-04-18 21:36:47 +02:00
parent 84074885d3
commit a41826a167
6 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app_pojavlauncher/build.gradle
View file

@ -122,13 +122,9 @@ dependencies {
implementation 'javax.annotation:javax.annotation-api:1.3.2' implementation 'javax.annotation:javax.annotation-api:1.3.2'
implementation 'commons-codec:commons-codec:1.14' implementation 'commons-codec:commons-codec:1.14'
// implementation 'com.wu-man:android-bsf-api:3.1.3' // implementation 'com.wu-man:android-bsf-api:3.1.3'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.preference:preference:1.1.1' implementation 'androidx.preference:preference:1.1.1'
implementation 'androidx.appcompat:appcompat:1.4.0'
implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
implementation 'com.google.android.material:material:1.4.0' implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.annotation:annotation:1.3.0' implementation 'androidx.annotation:annotation:1.3.0'
implementation 'androidx.browser:browser:1.4.0'
implementation "androidx.constraintlayout:constraintlayout:2.1.2" implementation "androidx.constraintlayout:constraintlayout:2.1.2"

3
app_pojavlauncher/src/main/java/com/kdt/mcgui/MineEditText.java
View file

@ -3,8 +3,9 @@ package com.kdt.mcgui;
import android.content.*; import android.content.*;
import android.util.*; import android.util.*;
import android.graphics.*; import android.graphics.*;
import android.widget.EditText;
public class MineEditText extends com.google.android.material.textfield.TextInputEditText { public class MineEditText extends androidx.appcompat.widget.AppCompatEditText {
public MineEditText(Context ctx) { public MineEditText(Context ctx) {
super(ctx); super(ctx);
init(); init();

4
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MinecraftGLSurface.java
View file

@ -25,11 +25,11 @@ import android.view.TextureView;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi; import androidx.annotation.RequiresApi;
import net.kdt.pojavlaunch.utils.MathUtils;
import com.google.android.material.math.MathUtils;
import net.kdt.pojavlaunch.customcontrols.gamepad.Gamepad; import net.kdt.pojavlaunch.customcontrols.gamepad.Gamepad;
import net.kdt.pojavlaunch.prefs.LauncherPreferences; import net.kdt.pojavlaunch.prefs.LauncherPreferences;

2
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java
View file

@ -391,7 +391,7 @@ public class ControlButton extends androidx.appcompat.widget.AppCompatButton imp
float MIN_DISTANCE = Tools.dpToPx(8); float MIN_DISTANCE = Tools.dpToPx(8);
if(button == this) return false; if(button == this) return false;
if(com.google.android.material.math.MathUtils.dist( if(net.kdt.pojavlaunch.utils.MathUtils.dist(
button.getX() + button.getWidth()/2f, button.getX() + button.getWidth()/2f,
button.getY() + button.getHeight()/2f, button.getY() + button.getHeight()/2f,
getX() + getWidth()/2f, getX() + getWidth()/2f,

2
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadJoystick.java
View file

@ -4,7 +4,7 @@ import android.view.InputDevice;
import android.view.MotionEvent; import android.view.MotionEvent;
import com.google.android.material.math.MathUtils; import net.kdt.pojavlaunch.utils.MathUtils;
public class GamepadJoystick { public class GamepadJoystick {

7
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/MathUtils.java
View file

@ -7,4 +7,11 @@ public class MathUtils {
return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min; return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
} }
/** Returns the distance between two points. */
public static float dist(float x1, float y1, float x2, float y2) {
final float x = (x2 - x1);
final float y = (y2 - y1);
return (float) Math.hypot(x, y);
}
} }