Merge pull request #25 from MobileGL-Dev/dev

Merge from dev

Author: Swung0x48

.github/workflows/mg.yml

@@ -2,7 +2,9 @@ name: MobileGlues
 
 on:
   push:
-    branches: [ main ]
+    branches: 
+      - main
+      - dev
   workflow_dispatch:
 
 jobs:
@@ -14,7 +16,7 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v4
         with:
-          submodules: true
+          submodules: recursive
 
       - name: Set current date as env variable
         run: echo "date_today=$(date +'%Y-%m-%d')" >> $GITHUB_ENV

MobileGlues

@@ -13,8 +13,8 @@ android {
         applicationId = "com.fcl.plugin.mobileglues"
         minSdk = 26
         targetSdk = 35
-        versionCode = 1271
-        versionName = "1.2.7 - hotfix1"
+        versionCode = 1299
+        versionName = "1.3.0·RC1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -42,7 +42,7 @@ android {
             resValue("string","app_name","MobileGlues")
 
             manifestPlaceholders["des"] = "MobileGlues (OpenGL 4.0, 1.17+)"
-            manifestPlaceholders["renderer"] = "MobileGlues:libmobileglues.so:libEGL.so"
+            manifestPlaceholders["renderer"] = "MobileGlues:libmobileglues.so:libmobileglues.so"
 
             manifestPlaceholders["minMCVer"] = "1.17"
             manifestPlaceholders["maxMCVer"] = "" //为空则不限制 No restriction if empty
@@ -61,6 +61,8 @@ android {
                 put("LIBGL_ES", "3")
                 put("DLOPEN", "libspirv-cross-c-shared.so,libshaderconv.so")
                 put("POJAV_RENDERER", "opengles3")
+				put("POJAVEXEC_EGL", "libmobileglues.so")
+				put("LIBGL_EGL", "libmobileglues.so")
             }.run {
                 var env = ""
                 forEach { (key, value) ->
@@ -71,6 +73,12 @@ android {
         }
     }
 
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging = true
+        }
+    }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11

app/build.gradle.kts

@@ -19,5 +19,3 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
-
--keep class com.fcl.plugin.mobileglues.settings.MGConfig { *; }

app/proguard-rules.pro

@@ -0,0 +1,26 @@
+package com.fcl.plugin.mobileglues
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.TextView
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+
+class AppInfoDialogBuilder(context: Context) : MaterialAlertDialogBuilder(context) {
+
+    init {
+        val view = LayoutInflater.from(context).inflate(R.layout.dialog_app_info, null)
+        view.findViewById<TextView>(R.id.info_version).text = BuildConfig.VERSION_NAME
+
+        setTitle(R.string.dialog_info)
+        setView(view)
+        setPositiveButton(R.string.dialog_positive, null)
+        setNeutralButton(R.string.dialog_github) { _, _ ->
+            context.startActivity(
+                Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/MobileGL-Dev/MobileGlues-release"))
+            )
+        }
+    }
+}