AxmolActivity will extend AppCompatActivity

Min SDK set to 21
Tests updated to support AppCompatActivity
MultiDexEnabled for cpp-tests

Author: rh101

1k/build.profiles

@@ -54,7 +54,7 @@ target_sdk=35
 
 # The android min sdk version, @gradle
 # as min as possible
-min_sdk=17
+min_sdk=21
 
 # The gradle version, @setup.ps1
 # as latest as possible

core/platform/android/java/src/dev/axmol/lib/AxmolActivity.java

@@ -25,7 +25,6 @@ of this software and associated documentation files (the "Software"), to deal
  ****************************************************************************/
 package dev.axmol.lib;
 
-import android.app.Activity;
 import android.app.KeyguardManager;
 import android.content.Context;
 import android.content.Intent;
@@ -46,14 +45,16 @@ of this software and associated documentation files (the "Software"), to deal
 import android.view.Window;
 import android.view.WindowManager;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import dev.axmol.lib.AxmolEngine.AxmolEngineListener;
 
 import javax.microedition.khronos.egl.EGL10;
 import javax.microedition.khronos.egl.EGLConfig;
 import javax.microedition.khronos.egl.EGLDisplay;
 import javax.microedition.khronos.egl.EGLContext;
 
-public abstract class AxmolActivity extends Activity implements AxmolEngineListener {
+public abstract class AxmolActivity extends AppCompatActivity implements AxmolEngineListener {
     // ===========================================================
     // Constants
     // ===========================================================

core/platform/android/java/src/dev/axmol/lib/AxmolEngine.java

@@ -30,7 +30,6 @@ of this software and associated documentation files (the "Software"), to deal
 import android.content.pm.PackageManager;
 import android.graphics.Rect;
 import android.media.AudioManager;
-import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -59,6 +58,8 @@ of this software and associated documentation files (the "Software"), to deal
 import android.view.WindowInsets;
 import android.view.WindowManager;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.android.vending.expansion.zipfile.APKExpansionSupport;
 import com.android.vending.expansion.zipfile.ZipResourceFile;
 
@@ -95,7 +96,7 @@ public class AxmolEngine {
     private static boolean sCompassEnabled;
     private static boolean sActivityVisible;
     private static String sPackageName;
-    private static Activity sActivity = null;
+    private static AppCompatActivity sActivity = null;
     private static AxmolEngineListener sAxmolEngineListener;
     private static Set<OnActivityResultListener> onActivityResultListeners = new LinkedHashSet<OnActivityResultListener>();
     private static Vibrator sVibrateService = null;
@@ -128,7 +129,7 @@ public void run() {
     }
 
     private static boolean sInited = false;
-    public static void init(final Activity activity) {
+    public static void init(final AppCompatActivity activity) {
         sActivity = activity;
         AxmolEngine.sAxmolEngineListener = (AxmolEngineListener)activity;
         if (!sInited) {
@@ -202,7 +203,7 @@ public static ZipResourceFile getObbFile() {
         return sOBBFile;
     }
 
-    public static Activity getActivity() {
+    public static AppCompatActivity getActivity() {
         return sActivity;
     }
 

core/platform/android/java/src/dev/axmol/lib/AxmolMediaEngine.java

@@ -23,7 +23,6 @@ of this software and associated documentation files (the "Software"), to deal
  ****************************************************************************/
 package dev.axmol.lib;
 
-import android.app.Activity;
 import android.content.Context;
 import android.media.MediaCodecInfo;
 import android.media.MediaFormat;
@@ -32,6 +31,7 @@ of this software and associated documentation files (the "Software"), to deal
 import android.util.Log;
 
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.media3.common.Format;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.PlaybackException;
@@ -127,7 +127,7 @@ public class AxmolMediaEngine extends DefaultRenderersFactory implements Player.
 
     public static native void nativeStoreCurrentTime(long nativeObj, double currentTime);
 
-    public static void setContext(Activity activity) {
+    public static void setContext(AppCompatActivity activity) {
         sContext = activity.getApplicationContext();
     }
 

core/platform/android/libaxmol/build.gradle

@@ -55,6 +55,7 @@ dependencies {
     //api "androidx.media3:media3-exoplayer-ima:$media3_version"
 
     implementation "androidx.annotation:annotation:$annotation_ver"
+    implementation "androidx.appcompat:appcompat:$appcompat_ver"
 
     api ("com.google.guava:guava:$guava_ver-android") {
         // Exclude dependencies that are only used by Guava at compile time

templates/common/proj.android/app/AndroidManifest.xml

@@ -18,7 +18,7 @@
             android:screenOrientation="sensorLandscape"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/app_name"
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
             android:launchMode="singleTask"
             android:taskAffinity=""
             android:exported="true"  >

tests/cpp-tests/proj.android/app/AndroidManifest.xml

@@ -21,7 +21,7 @@
             android:screenOrientation="sensorLandscape"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/app_name"
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
             android:launchMode="singleTask"
             android:taskAffinity=""
             android:exported="true"  >

tests/cpp-tests/proj.android/app/build.gradle

@@ -37,6 +37,8 @@ android {
         ndk {
             abiFilters = __1K_ARCHS.split(':').collect{it as String}
         }
+
+        multiDexEnabled true
     }
 
     sourceSets.main {
@@ -112,6 +114,9 @@ android.applicationVariants.configureEach { variant ->
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':libaxmol')
+
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    //implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.22"))
 }
 
 project.afterEvaluate {

tests/cpp-tests/proj.android/gradle.properties

@@ -30,4 +30,4 @@ __1K_ARCHS=arm64-v8a
 
 android.injected.testOnly=false
 android.useAndroidX=true
-
+android.enableJetifier=true

tests/fairygui-tests/proj.android/app/AndroidManifest.xml

@@ -3,23 +3,23 @@
     android:installLocation="auto">
 
     <uses-feature android:glEsVersion="0x00020000" />
-    
+
     <application
         android:usesCleartextTraffic="true"
         android:label="@string/app_name"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher">
-        
+
         <!-- Tell AxmolActivity the name of our .so -->
 		<meta-data android:name="android.app.lib_name"
 				   android:value="fairygui-tests" />
-		
+
         <activity
             android:name=".AppActivity"
             android:screenOrientation="sensorLandscape"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/app_name"
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
             android:launchMode="singleTask"
             android:taskAffinity=""
             android:exported="true"  >