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

Refactor: Merge MainActivity and BaseMainActivity

Browse source 
Given even BaseMainActivity had unchecked typecasts to MainActivity, it had to be done
This commit is contained in:
Boulay Mathias 2022-10-31 20:37:12 +01:00
parent a896ffb273
commit a9cf9a74dc
10 changed files with 455 additions and 488 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
package net.kdt.pojavlaunch;
import static net.kdt.pojavlaunch.BaseMainActivity.touchCharInput;
import static net.kdt.pojavlaunch.MainActivity.touchCharInput;
import static net.kdt.pojavlaunch.utils.MCOptionUtils.getMcScale;
import static org.lwjgl.glfw.CallbackBridge.sendKeyPress;
import static org.lwjgl.glfw.CallbackBridge.sendMouseButton;
@ -25,7 +25,6 @@ import android.view.TextureView;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
@ -404,7 +403,7 @@ public class MinecraftGLSurface extends View {
}
if(mouseCursorIndex == -1) return false; // we cant consoom that, theres no mice!
if(CallbackBridge.isGrabbing()) {
if(BaseMainActivity.isAndroid8OrHigher() && !hasPointerCapture()){
if(MainActivity.isAndroid8OrHigher() && !hasPointerCapture()){
requestFocus();
requestPointerCapture();
}