Merge pull request #542 from MMRLApp/overhaul-su

Overhaul su

Author: DerGoogler

.github/workflows/github.yml

@@ -20,13 +20,13 @@ jobs:
       - name: Download Official Release APK
         uses: actions/download-artifact@v4
         with:
-          name: ${{ inputs.officialAssetName }}
+          name: ${{ env.OFFICIAL_NAME }}
           path: official-apk
 
       - name: Download Spoofed Release APK
         uses: actions/download-artifact@v4
         with:
-          name: ${{ inputs.spoofedAssetName }}
+          name: ${{ env.SPOOFED_NAME }}
           path: spoofed-apk
 
       - name: Find APKs by name
@@ -39,6 +39,12 @@ jobs:
           echo "OFFICIAL_APK_PATH=$OFFICIAL_APK_PATH" >> $GITHUB_OUTPUT
           echo "SPOOFED_APK_PATH=$SPOOFED_APK_PATH" >> $GITHUB_OUTPUT
 
+          OFFICIAL_NAME=$(basename "$OFFICIAL_APK_PATH")
+          echo "OFFICIAL_NAME=$OFFICIAL_NAME" >> $GITHUB_OUTPUT
+
+          SPOOFED_NAME=$(basename "$SPOOFED_APK_PATH")
+          echo "SPOOFED_NAME=$SPOOFED_NAME" >> $GITHUB_OUTPUT
+
       - name: Get commit info and build timestamp
         id: meta
         run: |
@@ -47,7 +53,7 @@ jobs:
           VERSION=$((31320 + COMMIT_COUNT))
 
           if [ -f commits.sh ]; then
-            MESSAGE=$(bash commits.sh 10000)
+            MESSAGE=$(bash commits.sh 10000 "${{ env.BRANCH_NAME }}")
           else
             MESSAGE="Latest commits not available."
           fi
@@ -91,7 +97,7 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ${{ steps.find_apks.outputs.OFFICIAL_APK_PATH }}
-          asset_name: ${{ inputs.officialAssetName }}.apk
+          asset_name: ${{ steps.find_apks.outputs.OFFICIAL_NAME }}
           asset_content_type: application/vnd.android.package-archive
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -102,7 +108,7 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ${{ steps.find_apks.outputs.SPOOFED_APK_PATH }}
-          asset_name: ${{ inputs.spoofedAssetName }}.apk
+          asset_name: ${{ steps.find_apks.outputs.SPOOFED_NAME }}
           asset_content_type: application/vnd.android.package-archive
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/telegram.yml

@@ -48,7 +48,7 @@ jobs:
           VERSION=$((31320 + COMMIT_COUNT))
 
           if [ -f commits.sh ]; then
-            MESSAGE=$(bash commits.sh 950)
+            MESSAGE=$(bash commits.sh 950 "${{ env.BRANCH_NAME }}")
           else
             MESSAGE="Latest commits not available."
           fi

README.md

@@ -5,7 +5,7 @@
 ![Google Play Release](https://img.shields.io/endpoint?url=https%3A%2F%2Fplay.cuzi.workers.dev%2Fplay%3Fi%3Dcom.dergoogler.mmrl%26l%3DInstalls%26m%3D%24shortinstalls&label=Google%20Play&color=red)
 ![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/MMRLApp/MMRL/total?label=GitHub%20Downloads)
 
-MMRL is an Android app that helps manage your own modules repository.
+A app for managing, sharing, and exploring Magisk modules across repositories.
 
 ## Features
 

app/build.gradle.kts

@@ -1,6 +1,5 @@
+
 import com.android.build.gradle.internal.api.ApkVariantOutputImpl
-import org.gradle.internal.extensions.stdlib.capitalized
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     alias(libs.plugins.self.application)
@@ -56,7 +55,7 @@ android {
             keyAlias = project.releaseKeyAlias
             keyPassword = project.releaseKeyPassword
             enableV2Signing = true
-            enableV3Signing = true
+            enableV3Signing = false
         }
     } else {
         signingConfigs.getByName("debug")
@@ -262,8 +261,14 @@ dependencies {
     implementation(libs.square.logging.interceptor)
     implementation(libs.square.moshi)
     ksp(libs.square.moshi.kotlin)
+
+    implementation("dev.chrisbanes.haze:haze:1.6.10")
+    implementation("dev.chrisbanes.haze:haze-materials:1.6.10")
+
+    implementation(libs.composedestinations.core)
+    ksp(libs.composedestinations.ksp)
 }
 
 tasks.register("version") {
     println(appVersion)
-}
+}

app/src/main/AndroidManifest.xml

@@ -13,6 +13,7 @@
 
     <uses-permission android:name="${webuiPermissionId}.permission.WEBUI_X" />
     <uses-permission android:name="${webuiPermissionId}.permission.WEBUI_LEGACY" />
+    <uses-permission android:name="${webuiPermissionId}.permission.MODCONF" />
 
     <uses-permission
         android:name="android.permission.READ_EXTERNAL_STORAGE"

app/src/main/assets/markdown.css

@@ -8,6 +8,14 @@ body {
   background-color: var(--background);
 }
 
+.toolbar {
+  height: var(--window-inset-top, 0px);
+}
+
+.bottom-bar {
+  height: var(--window-inset-bottom, 0px);
+}
+
 .markdown-body {
   user-select: none;
   -ms-text-size-adjust: 100%;

app/src/main/assets/markdown.html

@@ -1,15 +1,19 @@
 <!DOCTYPE html>
+<!--suppress HtmlRequiredLangAttribute, HtmlRequiredTitleElement -->
 <html>
 
 <head>
   <meta charset="UTF-8" />
   <meta content="width=device-width, initial-scale=1.0" name="viewport" />
   <link href="https://mui.kernelsu.org/internal/assets/markdown.css" rel="stylesheet" />
   <link href="https://mui.kernelsu.org/internal/colors.css" rel="stylesheet" />
+  <link href="https://mui.kernelsu.org/internal/insets.css" rel="stylesheet" />
 </head>
 
 <body>
+  <div class="toolbar"></div>
   <div class="markdown-body" id="content"></div>
+  <div class="bottom-bar"></div>
   <script type="module">
     import { Marked } from "https://mui.kernelsu.org/internal/assets/marked/index.mjs";
     import markedAlert from "https://mui.kernelsu.org/internal/assets/marked/alert.mjs";

app/src/main/kotlin/com/dergoogler/mmrl/App.kt

@@ -4,7 +4,6 @@ import android.app.Application
 import android.content.Context
 import com.dergoogler.mmrl.app.utils.NotificationUtils
 import com.dergoogler.mmrl.network.NetworkUtils
-import com.dergoogler.mmrl.platform.Platform
 import com.dergoogler.mmrl.platform.PlatformManager
 import com.toxicbakery.logging.Arbor
 import com.toxicbakery.logging.LogCatSeedling

app/src/main/kotlin/com/dergoogler/mmrl/app/Const.kt

@@ -1,8 +1,11 @@
 package com.dergoogler.mmrl.app
 
 import android.os.Environment
+import com.dergoogler.mmrl.platform.PlatformManager
 import java.io.File
 
+typealias PLM = PlatformManager
+
 object Const {
     val PUBLIC_DOWNLOADS: File = Environment.getExternalStoragePublicDirectory(
         Environment.DIRECTORY_DOWNLOADS

app/src/main/kotlin/com/dergoogler/mmrl/database/dao/OnlineDao.kt

@@ -14,6 +14,9 @@ interface OnlineDao {
     @Query("SELECT * FROM onlineModules WHERE id = :id AND repoUrl = :repoUrl")
     suspend fun getAllByIdAndUrl(id: String, repoUrl: String): List<OnlineModuleEntity>
 
+    @Query("SELECT * FROM onlineModules WHERE repoUrl = :repoUrl")
+    suspend fun getAllByUrl(repoUrl: String): List<OnlineModuleEntity>
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insert(list: List<OnlineModuleEntity>)