MMRL X Theme Migration

app/build.gradle.kts

@@ -1,12 +1,13 @@
 import app.cash.licensee.ViolationAction
-import com.android.build.gradle.internal.api.ApkVariantOutputImpl
+import com.android.build.api.variant.impl.VariantOutputImpl
 
 plugins {
     alias(libs.plugins.self.application)
     alias(libs.plugins.self.compose)
     alias(libs.plugins.self.hilt)
     alias(libs.plugins.licensee)
     alias(libs.plugins.ksp)
+    alias(libs.plugins.kotlin.parcelize)
     alias(libs.plugins.kotlin.serialization)
 }
 
@@ -54,7 +55,7 @@ android {
         signingConfigs.getByName("debug")
     }
 
-    flavorDimensions += "distribution"
+    flavorDimensions += listOf("distribution", "testing")
 
     productFlavors {
         create("official") {
@@ -64,6 +65,34 @@ android {
             buildConfigField("Boolean", "IS_SPOOFED_BUILD", "false")
         }
 
+        create("internal") {
+            dimension = "testing"
+            applicationIdSuffix  = ".internal"
+            resValue("string", "app_name", "[ᛁ] $baseAppName")
+            buildConfigField("Boolean", "IS_SPOOFED_BUILD", "false")
+        }
+
+        create("alpha") {
+            dimension = "testing"
+            applicationIdSuffix  = ".alpha"
+            resValue("string", "app_name", "[ᚨ] $baseAppName")
+            buildConfigField("Boolean", "IS_SPOOFED_BUILD", "false")
+        }
+
+        create("beta") {
+            dimension = "testing"
+            applicationIdSuffix  = ".beta"
+            resValue("string", "app_name", "[ᛒ] $baseAppName")
+            buildConfigField("Boolean", "IS_SPOOFED_BUILD", "false")
+        }
+
+        create("rc") {
+            dimension = "testing"
+            applicationIdSuffix  = ".rc"
+            resValue("string", "app_name", "[ᚱ] $baseAppName")
+            buildConfigField("Boolean", "IS_SPOOFED_BUILD", "false")
+        }
+
         create("spoofed") {
             dimension = "distribution"
             applicationId = generateRandomPackageName()
@@ -85,7 +114,6 @@ android {
             buildConfigField("Boolean", "IS_GOOGLE_PLAY_BUILD", "false")
             isDebuggable = false
             isJniDebuggable = false
-            versionNameSuffix = "-release"
             renderscriptOptimLevel = 3
             multiDexEnabled = true
 
@@ -103,7 +131,6 @@ android {
             buildConfigField("Boolean", "IS_DEV_VERSION", "true")
             buildConfigField("Boolean", "IS_GOOGLE_PLAY_BUILD", "false")
             applicationIdSuffix = ".debug"
-            versionNameSuffix = "-debug"
             isJniDebuggable = true
             isDebuggable = true
             renderscriptOptimLevel = 0
@@ -126,46 +153,62 @@ android {
 
     buildFeatures {
         buildConfig = true
+        resValues = true
     }
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
 
-    packaging.resources.excludes += setOf(
-        "META-INF/**",
-        "okhttp3/**",
-        //"kotlin/**",
-        "org/**",
-        "**.properties",
-        "**.bin",
-        "**/*.proto"
-    )
+    packaging {
+        resources {
+            excludes += setOf(
+                "META-INF/**",
+                "okhttp3/**",
+                //"kotlin/**",
+                "org/**",
+                "**.properties",
+                "**.bin",
+                "**/*.proto"
+            )
+            pickFirsts += listOf(
+                "tables/**"
+            )
+        }
+    }
 
     dependenciesInfo {
         includeInApk = false
         includeInBundle = false
     }
-
-    applicationVariants.configureEach {
-        outputs.configureEach {
-            (this as? ApkVariantOutputImpl)?.outputFileName =
-                "WebUI-X-$versionName-$flavorName.apk"
-        }
-    }
 }
 
 licensee {
     bundleAndroidAsset.set(true)
     violationAction(ViolationAction.IGNORE)
 }
 
+androidComponents {
+    onVariants { variant ->
+        val testingFlavor = variant.productFlavors
+            .firstOrNull { it.first == "testing" }
+            ?.second
+
+        variant.outputs.filterIsInstance<VariantOutputImpl>().forEach { output ->
+            output.outputFileName.set(
+                output.versionName.map { vName ->
+                    "WebUI-X-$vName-${variant.buildType}-$testingFlavor.apk"
+                }
+            )
+        }
+    }
+}
+
 dependencies {
     implementation(projects.webui)
     implementation(projects.modconf)
     implementation(projects.jna)
-    implementation(projects.hwui)
     implementation(libs.mmrl.ext)
     implementation(libs.mmrl.ui)
     implementation(libs.mmrl.platform)
@@ -180,6 +223,7 @@ dependencies {
 
     implementation(libs.androidx.lifecycle.process)
     implementation(libs.hiddenApiBypass)
+    implementation(libs.kotlin.parcelize.runtime)
 
     implementation(libs.semver)
     implementation(libs.coil.compose)
@@ -247,4 +291,13 @@ dependencies {
 
     implementation(libs.composedestinations.core)
     ksp(libs.composedestinations.ksp)
+
+    implementation(libs.mmrlx.ui)
+    implementation(libs.mmrlx.utilities)
+    implementation(libs.mmrlx.webui.core)
+    implementation(libs.mmrlx.webui.lua)
+    implementation(libs.mmrlx.nio)
+
+    implementation("com.github.MMRLApp.RootThread:thread:0.0.3")
+    implementation("org.jsoup:jsoup:1.18.3")
 }

app/src/main/AndroidManifest.xml

@@ -72,20 +72,34 @@
 
         <activity
             android:name="${__packageName__}.ui.activity.CrashHandlerActivity"
-            android:exported="true"
+            android:exported="false"
             android:launchMode="singleTask"
             android:windowSoftInputMode="adjustResize">
+        </activity>
+
+        <activity
+            android:name="${__packageName__}.ui.activity.webui.WebUIActivity"
+            android:autoRemoveFromRecents="true"
+            android:documentLaunchMode="intoExisting"
+            android:hardwareAccelerated="true"
+            android:enableOnBackInvokedCallback="true"
+            android:exported="true"
+            android:label="WebUI X"
+            android:permission="${webuiPermissionId}.permission.WEBUI_X"
+            android:process="${webuiPermissionId}.process.webui"
+            android:taskAffinity="${applicationId}.WEBUI_X">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
         <activity
-            android:name="${__packageName__}.ui.activity.webui.WebUIActivity"
+            android:name="${__packageName__}.ui.webui.WebUIActivity"
             android:autoRemoveFromRecents="true"
             android:documentLaunchMode="intoExisting"
             android:hardwareAccelerated="true"
+            android:enableOnBackInvokedCallback="true"
             android:exported="true"
             android:label="WebUI X"
             android:permission="${webuiPermissionId}.permission.WEBUI_X"
@@ -142,6 +156,11 @@
             android:exported="false"
             android:foregroundServiceType="specialUse" />
 
+        <service
+            android:name="dev.mmrlx.nio.service.NonRootFileService"
+            android:exported="false"
+            android:foregroundServiceType="specialUse" />
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"