MMRLApp · DerGoogler · Oct 31, 2022 · Jul 15, 2022 · Jul 15, 2022 · Jul 15, 2022
diff --git a/.github/workflows/webpack.yml b/.github/workflows/webpack.yml
@@ -1,4 +1,4 @@
-name: Bun with Webpack
+name: Build with Webpack
 
 on:
   push:
@@ -16,21 +16,21 @@ jobs:
 
     strategy:
       matrix:
-        bun-version: ["0.1.2"]
+        node-version: [ 16, 18 ]
 
     steps:
     - uses: actions/checkout@v2
 
-    - uses: xhyrom/setup-bun@v0.1.0
+    - uses: actions/setup-node@v3
       with:
-        bun-version: ${{ matrix.bun-version }}
+        node-version: ${{ matrix.node-version }}
 
     - name: Build Development
       run: |
-        bun install --force
-        bun run dev
+        npm install --force
+        npm run web:dev
 
     - name: Build Production
       run: |
-        bun install --force
-        bun run prod
+        npm install --force
+        npm run web:prod
diff --git a/Android/app/build.gradle b/Android/app/build.gradle
@@ -1,3 +1,7 @@
+import groovy.json.*
+import org.json.*
+import com.google.gson.*;
+
 apply plugin: 'com.android.application'
 apply plugin: 'com.github.node-gradle.node'
 
@@ -23,6 +27,7 @@ android {
             minifyEnabled false
             multiDexEnabled false
             applicationIdSuffix '.debug'
+            buildConfigField "String", "BASE_URL", "\"leer\""
         }
     }
     compileOptions {
@@ -48,3 +53,44 @@ dependencies {
     implementation "androidx.appcompat:appcompat:1.4.2"
    // implementation 'com.google.android.material:material:1.6.0'
 }
+
+configurations.implementation.setCanBeResolved(true)
+
+task printDepsTreeInJson {
+    doLast {
+        configurations.implementation.incoming.getResolutionResult().getAllDependencies().each { depResult  ->
+            println "{\"from\":\"" + depResult.getFrom() + "\"," + "\"requested\":\"" + depResult.getRequested() + "\"}"
+        }
+    }
+}
+
+task printSolvedDepsTreeInJson {
+    doLast {
+        def jsonOutput = "["
+        configurations.implementation.resolvedConfiguration.firstLevelModuleDependencies.each { dep ->
+            def addToJson
+            addToJson = { resolvedDep ->
+                jsonOutput += "\n{"
+                jsonOutput += "\"name\":\"${resolvedDep.module.id.group}:${resolvedDep.module.id.name}\","
+                jsonOutput += "\"description\":\"${resolvedDep.module.id}\","
+                jsonOutput += "\"version\":\"${resolvedDep.module.id.version}\","
+                jsonOutput += "\"license\":\"null\","
+                jsonOutput += "\"author\":\"null\","
+                jsonOutput += "\"repository\":\"https://mvnrepository.com/artifact/${resolvedDep.module.id.group}/${resolvedDep.module.id.name}/${resolvedDep.module.id.version}\""
+                jsonOutput += "},"
+            }
+            addToJson(dep)
+        }
+        if(jsonOutput[-1] == ','){
+            jsonOutput = jsonOutput[0..-2]
+        }
+        jsonOutput += "]"
+
+        // This took me more than two hours to make -_-
+        def jsonFile =new JsonSlurper().parseText(jsonOutput)
+        def json = JsonOutput.toJson(jsonFile)
+        def pretty = JsonOutput.prettyPrint(json)
+        def myFile = new File('./../Website/src/utils/native-licenses.json')
+        myFile.write(pretty)
+    }
+}
diff --git a/Android/app/release/output-metadata.json b/Android/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 140,
-      "versionName": "1.4.0@alpha-3",
+      "versionCode": 141,
+      "versionName": "1.4.1",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/Android/app/src/main/assets/index.html b/Android/app/src/main/assets/index.html
@@ -1,9 +1,10 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="stylesheet" type="text/css" href="bundle/vendor.bundle.css" />
     <link rel="stylesheet" type="text/css" href="bundle/app.bundle.css" />
-    <meta charset="utf-8" />
   </head>
   <body>
     <app></app>

diff --git a/Android/app/src/main/java/com/dergoogler/component/ModuleView.java b/Android/app/src/main/java/com/dergoogler/component/ModuleView.java
@@ -128,7 +128,13 @@ public void postUrl(@NonNull String url, @NonNull byte[] postData) {
 
     @Override
     public void evaluateJavascript(@NonNull String script, @Nullable ValueCallback<String> resultCallback) {
-        throw new RuntimeException("Stub!");
+        super.evaluateJavascript(script, resultCallback);
+    }
+
+    public void eventDispatcher(@NonNull String event) {
+        super.evaluateJavascript(
+                "(function() { window.dispatchEvent(" + event + "); })();"
+                , null);
     }
 
     public void loadJavascript(String javascript) {

diff --git a/Android/app/src/main/java/com/dergoogler/mmrl/MainActivity.java b/Android/app/src/main/java/com/dergoogler/mmrl/MainActivity.java
@@ -62,10 +62,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
     @Override
     public void onBackPressed() {
-        if (view.canGoBack()) {
-            view.goBack();
-        } else {
-            super.onBackPressed();
-        }
+        view.eventDispatcher("onBackButton");
     }
 }
diff --git a/Android/gradle.properties b/Android/gradle.properties
@@ -17,4 +17,4 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=true
diff --git a/Android/gradle/wrapper/gradle-wrapper.properties b/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Sat Jun 11 19:47:22 CEST 2022
+#Mon Jul 18 21:46:42 CEST 2022
 distributionBase=GRADLE_USER_HOME
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists

diff --git a/README.md b/README.md
@@ -2,19 +2,23 @@
 
 Magisk Module Repo Loader (MMRL). Allows you to load custom repos with an simple UI
 
+[![Build with Webpack](https://github.com/DerGoogler/MMRL/actions/workflows/webpack.yml/badge.svg?branch=master)](https://github.com/DerGoogler/MMRL/actions/workflows/webpack.yml)
+[![CodeQL](https://github.com/DerGoogler/MMRL/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/DerGoogler/MMRL/actions/workflows/codeql-analysis.yml)
+[![Android CI](https://github.com/DerGoogler/MMRL/actions/workflows/android.yml/badge.svg)](https://github.com/DerGoogler/MMRL/actions/workflows/android.yml)
+
 ## How to create custom repo?
 
 Use [this](https://dergoogler.com/repo-generator/) service to create a custom repository.
 
 ## What MMRL Supports (Roadmap)
 
-- [x] Custom repo loading
+- [x] Custom repo loading (Since 1.4.2 mutiple repositories are supported)
 - [x] Translation
 - [x] Dark mode
+- [ ] Favorite lists
 
 #### Android only
 
-- [x] Custom theming
 - [x] View installed modules
 - [x] Remove installed modules
 - [x] Enable/Disable installed modules
@@ -27,15 +31,75 @@ Use [this](https://dergoogler.com/repo-generator/) service to create a custom re
 <tr>
 	<td><img src="https://user-images.githubusercontent.com/54764558/170883584-008e135e-09d3-4c5f-9780-9d963b70205f.png"/>
 	<td><img src="https://user-images.githubusercontent.com/54764558/170883624-b564a344-7f6a-4a94-8494-3ca6b7e6a311.png"/>
-<tr>
-	<td><img src="https://user-images.githubusercontent.com/54764558/170883656-acacbe8e-2f78-48a5-9f85-839cebdf0f82.png"/>
-	<td><img src="https://user-images.githubusercontent.com/54764558/170883697-ff98c975-74e0-4622-b71c-189576e8c4f7.png"/>
-<tr>
-	<td><img src="https://user-images.githubusercontent.com/54764558/170883716-1b774428-e9dd-4de6-b341-9bc07417e771.png"/>
-	<td><img src=""/>
 <tr>
 </table>
 
+## Supported `module.json` syntax
+
+**MMRL** new default
+
+> **Note** > `prop_url` can also used as fallback
+
+```json
+{
+  "last_update": 1658146279000,
+  "name": "Googlers Magisk Repo",
+  "website": "https://dergoogler.com/repo",
+  "support": "https://t.me/The_Googler",
+  "donate": null,
+  "submitModule": null,
+  "modules": [
+    {
+      "id": "samsung_a70_raven_prop_overlay",
+      "last_update": 1654181061000,
+      "prop_url": "https://.../module.prop",
+      "zip_url": "https://.../master.zip",
+      "notes_url": "https://.../README.md",
+      "props": {
+        "id": "samsung_a70_raven_prop_overlay",
+        "name": "Samsung Galaxy A70 Overlay",
+        "author": "Der_Googler",
+        "version": "2022-05-22",
+        "versionCode": "2205-22",
+        "description": "Spoof your device to RAVEN pixel prop (April 2022) with an generared overlay for Samsung Galaxy A70 (GSI's only). Prop original made by Tesla",
+        "foxprops": {
+          "minApi": "31",
+          "maxApi": "31",
+          "minMagisk": "18000",
+          "needRamdisk": null,
+          "support": null,
+          "donate": null,
+          "config": null,
+          "changeBoot": null
+        }
+      }
+    }
+  ]
+}
+```
+
+**FoxMMM**
+
+```json
+{
+  "name": "Repo name",
+  "website": "repo website",
+  "support": "optional support url",
+  "donate": "optional support url",
+  "submitModule": "optional submit module URL",
+  "last_update": 0,
+  "modules": [
+    {
+      "id": "module id",
+      "last_update": 0,
+      "notes_url": "notes url",
+      "prop_url": "module.prop url",
+      "zip_url": "module.zip url"
+    }
+  ]
+}
+```
+
 ## FAQ
 
 ### Why does some description reports `404: Not Found`?

diff --git a/Website/.gradle/4.4.1/fileChanges/last-build.bin b/Website/.gradle/4.4.1/fileChanges/last-build.bin
diff --git a/Website/.gradle/4.4.1/fileHashes/fileHashes.lock b/Website/.gradle/4.4.1/fileHashes/fileHashes.lock
diff --git a/Website/.gradle/4.4.1/taskHistory/taskHistory.bin b/Website/.gradle/4.4.1/taskHistory/taskHistory.bin
diff --git a/Website/.gradle/4.4.1/taskHistory/taskHistory.lock b/Website/.gradle/4.4.1/taskHistory/taskHistory.lock
diff --git a/Website/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/Website/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/Website/.gradle/buildOutputCleanup/cache.properties b/Website/.gradle/buildOutputCleanup/cache.properties
@@ -0,0 +1,2 @@
+#Mon Jul 18 21:35:59 CEST 2022
+gradle.version=4.4.1
diff --git a/Website/bun.lockb b/Website/bun.lockb
diff --git a/Website/license.ts b/Website/license.ts
@@ -8,9 +8,9 @@ let outputArray: any = [];
 function getObject(name?: any, fallback?: any, options?: any) {
   const checkLink = (link?: any) => {
     if (options?.isLink) {
-      return Bota64.encode(link.replace("git+", ""));
+      return link.replace("git+", "");
     } else {
-      return Bota64.encode(link);
+      return link;
     }
   };
 
@@ -23,9 +23,9 @@ function getObject(name?: any, fallback?: any, options?: any) {
 
 function getInnerObject(name?: any, rightName?: any) {
   if (typeof name == "object") {
-    return Bota64.encode(rightName);
+    return rightName;
   } else {
-    return Bota64.encode(name);
+    return name;
   }
 }
 
@@ -39,10 +39,10 @@ dep.forEach((element?: any) => {
     name: getObject(name, "Unknown Module"),
     description: getObject(description, "There is no description"),
     // Fallback doesn't work here.
-    author: typeof author == "undefined" ? Bota64.encode("null") : typeof author == "object" ? Bota64.encode(author.name) : Bota64.encode(author), //getObject(getInnerObject(author, author.name), "Unknown"),
+    author: typeof author == "undefined" ? "null" : typeof author == "object" ? author.name : author, //getObject(getInnerObject(author, author.name), "Unknown"),
     version: getObject(version, "null"),
     license: getObject(license, "null"),
-    repository: getObject(getInnerObject(repository, repository.url), "empty", { isLink: true }),
+    repository: `https://www.npmjs.com/package/${getObject(name, "Unknown Module")}`,
   });
 });
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#Mon Jul 18 21:35:59 CEST 2022
		gradle.version=4.4.1