Inprove ModConf

DerGoogler · Sep 22, 2023 · 00b1b7a · 00b1b7a
1 parent a8a448d
commit 00b1b7a
Show file tree

Hide file tree

Showing 8 changed files with 260 additions and 287 deletions.
diff --git a/Android/app/release/output-metadata.json b/Android/app/release/output-metadata.json
@@ -8,12 +8,64 @@
   "variantName": "release",
   "elements": [
     {
-      "type": "SINGLE",
+      "type": "UNIVERSAL",
       "filters": [],
       "attributes": [],
       "versionCode": 165,
       "versionName": "1.6.5",
-      "outputFile": "app-release.apk"
+      "outputFile": "app-universal-release.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "x86_64"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 165,
+      "versionName": "1.6.5",
+      "outputFile": "app-x86_64-release.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "arm64-v8a"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 165,
+      "versionName": "1.6.5",
+      "outputFile": "app-arm64-v8a-release.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "armeabi-v7a"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 165,
+      "versionName": "1.6.5",
+      "outputFile": "app-armeabi-v7a-release.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "x86"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 165,
+      "versionName": "1.6.5",
+      "outputFile": "app-x86-release.apk"
     }
   ],
   "elementType": "File"

diff --git a/Website/src/activitys/ConfigureActivity.tsx b/Website/src/activitys/ConfigureActivity.tsx
@@ -83,12 +83,12 @@ const DialogEditListItem = ({
 const ConfigureActivity = () => {
   const log = useLog("ConfigureActivity");
   const { strings } = useStrings();
-  const { settings } = useSettings();
+  const { settings, modConf } = useSettings();
   const { theme } = useTheme();
   const { context, extra } = useActivity<Extra>();
 
   const config: string = React.useMemo(() => {
-    const file = new SuFile(`${settings.mod_tree}/${extra.moduleid}/system/usr/share/mmrl/config/${extra.moduleid}.mdx`);
+    const file = new SuFile(modConf("CONFIG", { MODID: extra.moduleid }));
 
     if (file.exist()) {
       return file.read();