Merge pull request #3200 from carstene1ns/update/android-sdl

Update Android SDL project

Author: Ghabry

.gitattributes

@@ -17,8 +17,6 @@ src/midisequencer.* -diff linguist-vendored
 src/midisynth.* -diff linguist-vendored
 src/picojson.h -diff linguist-vendored
 CMakePresets.json -diff linguist-generated
-builds/android/app/src/main/java/org/libsdl/app/SDL*.java -diff linguist-vendored
+builds/android/app/src/main/java/org/libsdl/app/*.java -diff linguist-vendored
 builds/android/app/src/main/java/org/libsdl/app/SDLActivity.java diff
-builds/android/app/src/main/java/org/libsdl/app/SDLSurface.java diff
-builds/android/app/src/main/java/org/libsdl/app/HID*.java -diff linguist-vendored
 src/generated/* -diff linguist-generated

builds/android/app/build.gradle

@@ -1,5 +1,6 @@
 apply plugin: 'com.android.application'
 android {
+    namespace "org.easyrpg.player"
     compileSdkVersion 33
     buildToolsVersion '33.0.0'
     ndkVersion '21.4.7075529'

builds/android/app/src/main/AndroidManifest.xml

@@ -2,9 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="org.easyrpg.player"
-    android:installLocation="auto"
     android:versionCode="1"
-    android:versionName="1.0">
+    android:versionName="1.0"
+    android:installLocation="auto">
+
     <!-- OpenGL ES 2.0 -->
     <uses-feature android:glEsVersion="0x00020000" />
     <!-- Touchscreen support -->
@@ -38,6 +39,10 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
 
+        <!-- Setting SDL hints from AndroidManifest.xml: -->
+        <meta-data android:name="SDL_ENV.SDL_ACCELEROMETER_AS_JOYSTICK" android:value="0" />
+        <meta-data android:name="SDL_ENV.SDL_APP_NAME" android:value="EasyRPG Player" />
+
         <!-- Startup Activity -->
         <activity
             android:name=".InitActivity"

builds/android/app/src/main/java/org/easyrpg/player/player/EasyRpgPlayerActivity.java

@@ -84,6 +84,14 @@ public class EasyRpgPlayerActivity extends SDLActivity implements NavigationView
     private boolean uiVisible = true;
     SurfaceView surface;
 
+    @Override
+    protected String[] getLibraries() {
+        return new String[] {
+            "SDL2",
+            "easyrpg_android"
+        };
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

builds/android/app/src/main/java/org/libsdl/app/HIDDeviceManager.java

@@ -285,6 +285,7 @@ private boolean isXboxOneController(UsbDevice usbDevice, UsbInterface usbInterfa
             0x24c6, // PowerA
             0x2dc8, // 8BitDo
             0x2e24, // Hyperkin
+            0x3537, // GameSir
         };
 
         if (usbInterface.getId() == 0 &&
@@ -358,6 +359,12 @@ private void connectHIDDeviceUSB(UsbDevice usbDevice) {
     private void initializeBluetooth() {
         Log.d(TAG, "Initializing Bluetooth");
 
+        if (Build.VERSION.SDK_INT >= 31 /* Android 12  */ &&
+            mContext.getPackageManager().checkPermission(android.Manifest.permission.BLUETOOTH_CONNECT, mContext.getPackageName()) != PackageManager.PERMISSION_GRANTED) {
+            Log.d(TAG, "Couldn't initialize Bluetooth, missing android.permission.BLUETOOTH_CONNECT");
+            return;
+        }
+
         if (Build.VERSION.SDK_INT <= 30 /* Android 11.0 (R) */ &&
             mContext.getPackageManager().checkPermission(android.Manifest.permission.BLUETOOTH, mContext.getPackageName()) != PackageManager.PERMISSION_GRANTED) {
             Log.d(TAG, "Couldn't initialize Bluetooth, missing android.permission.BLUETOOTH");

builds/android/app/src/main/java/org/libsdl/app/SDLActivity.java

@@ -62,8 +62,8 @@
 public class SDLActivity extends Activity implements View.OnSystemUiVisibilityChangeListener {
     private static final String TAG = "SDL";
     private static final int SDL_MAJOR_VERSION = 2;
-    private static final int SDL_MINOR_VERSION = 28;
-    private static final int SDL_MICRO_VERSION = 5;
+    private static final int SDL_MINOR_VERSION = 30;
+    private static final int SDL_MICRO_VERSION = 1;
 /*
     // Display InputType.SOURCE/CLASS of events and devices
     //
@@ -276,7 +276,7 @@ protected String[] getLibraries() {
             // "SDL2_mixer",
             // "SDL2_net",
             // "SDL2_ttf",
-            "easyrpg_android"
+            "main"
         };
     }
 

builds/android/app/src/main/java/org/libsdl/app/SDLSurface.java

@@ -354,11 +354,11 @@ public void onSensorChanged(SensorEvent event) {
                 SDLActivity.onNativeOrientationChanged(newOrientation);
             }
 
-            /* EasyRPG modification: prevent movement to be input
             SDLActivity.onNativeAccel(-x / SensorManager.GRAVITY_EARTH,
                                       y / SensorManager.GRAVITY_EARTH,
                                       event.values[2] / SensorManager.GRAVITY_EARTH);
-            */
+
+
         }
     }
 

builds/android/build.gradle

@@ -1,11 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+
 buildscript {
     repositories {
         mavenCentral()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:8.1.1'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
     }
 }
 
@@ -15,3 +19,7 @@ allprojects {
         google()
     }
 }
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}

builds/android/gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists