Revert "Remove aapt and use aapt2 for all android versions"

This reverts commit 7bd24a5.

app/src/main/java/com/drdisagree/iconify/common/Dynamic.kt

@@ -29,8 +29,12 @@ object Dynamic {
     // Overlay compiler tools
     val NATIVE_LIBRARY_DIR: String = appContext.applicationInfo.nativeLibraryDir
 
+    val AAPTLIB = File(NATIVE_LIBRARY_DIR, "libaapt.so")
+
     val AAPT2LIB = File(NATIVE_LIBRARY_DIR, "libaapt2.so")
 
+    val AAPT = File(Resources.BIN_DIR, "aapt")
+
     val AAPT2 = File(Resources.BIN_DIR, "aapt2")
 
     val ZIPALIGNLIB = File(NATIVE_LIBRARY_DIR, "libzipalign.so")

app/src/main/java/com/drdisagree/iconify/utils/helper/BinaryInstaller.kt

@@ -1,13 +1,15 @@
 package com.drdisagree.iconify.utils.helper
 
 import android.util.Log
+import com.drdisagree.iconify.common.Dynamic.AAPT
 import com.drdisagree.iconify.common.Dynamic.AAPT2
 import com.drdisagree.iconify.common.Dynamic.AAPT2LIB
+import com.drdisagree.iconify.common.Dynamic.AAPTLIB
 import com.drdisagree.iconify.common.Dynamic.NATIVE_LIBRARY_DIR
 import com.drdisagree.iconify.common.Dynamic.ZIPALIGN
 import com.drdisagree.iconify.common.Dynamic.ZIPALIGNLIB
+import com.drdisagree.iconify.common.Resources
 import com.drdisagree.iconify.common.Resources.BIN_DIR
-import com.drdisagree.iconify.common.Resources.DATA_DIR
 import com.drdisagree.iconify.utils.FileUtils
 import com.topjohnwu.superuser.Shell
 
@@ -20,11 +22,14 @@ object BinaryInstaller {
 
         extractTools()
 
+        if (AAPT.exists()) AAPT.delete()
         if (AAPT2.exists()) AAPT2.delete()
         if (ZIPALIGN.exists()) ZIPALIGN.delete()
 
-        Shell.cmd("ln -sf " + AAPT2LIB.absolutePath + " " + AAPT2.absolutePath).exec()
-        Shell.cmd("ln -sf " + ZIPALIGNLIB.absolutePath + " " + ZIPALIGN.absolutePath).exec()
+        Shell.cmd("ln -sf " + AAPTLIB.absolutePath + ' ' + AAPT.absolutePath).exec()
+        Shell.cmd("ln -sf " + AAPT2LIB.absolutePath + ' ' + AAPT2.absolutePath).exec()
+        Shell.cmd("ln -sf " + ZIPALIGNLIB.absolutePath + ' ' + ZIPALIGN.absolutePath)
+            .exec()
     }
 
     private fun extractTools() {
@@ -33,7 +38,7 @@ object BinaryInstaller {
         try {
             FileUtils.copyAssets("Tools")
 
-            Shell.cmd("for fl in $DATA_DIR/Tools/*; do cp -f \"\$fl\" \"$NATIVE_LIBRARY_DIR\"; chmod 755 \"$NATIVE_LIBRARY_DIR/$(basename \$fl)\"; ln -sf \"$NATIVE_LIBRARY_DIR/$(basename \$fl)\" \"$BIN_DIR/$(basename \$fl)\"; done")
+            Shell.cmd("for fl in " + Resources.DATA_DIR + "/Tools/*; do cp -f \"\$fl\" \"" + NATIVE_LIBRARY_DIR + "\"; chmod 755 \"" + NATIVE_LIBRARY_DIR + "/$(basename \$fl)\"; ln -sf \"" + NATIVE_LIBRARY_DIR + "/$(basename \$fl)\" \"" + BIN_DIR + "/$(basename \$fl)\"; done")
                 .exec()
 
             FileUtils.cleanDir("Tools")

app/src/main/java/com/drdisagree/iconify/utils/overlay/compiler/OnboardingCompiler.kt

@@ -2,8 +2,10 @@ package com.drdisagree.iconify.utils.overlay.compiler
 
 import android.util.Log
 import com.drdisagree.iconify.Iconify.Companion.appContext
+import com.drdisagree.iconify.common.Dynamic.AAPT
 import com.drdisagree.iconify.common.Dynamic.AAPT2
 import com.drdisagree.iconify.common.Dynamic.ZIPALIGN
+import com.drdisagree.iconify.common.Dynamic.isAtleastA14
 import com.drdisagree.iconify.common.Resources
 import com.drdisagree.iconify.common.Resources.FRAMEWORK_DIR
 import com.drdisagree.iconify.common.Resources.UNSIGNED_UNALIGNED_DIR
@@ -18,6 +20,7 @@ import java.security.cert.X509Certificate
 object OnboardingCompiler {
 
     private val TAG = OnboardingCompiler::class.java.simpleName
+    private val aapt: String = AAPT.absolutePath
     private val aapt2: String = AAPT2.absolutePath
     private val zipalign: String = ZIPALIGN.absolutePath
     private var key: PrivateKey? = null
@@ -45,11 +48,17 @@ object OnboardingCompiler {
     fun runAapt(source: String, name: String): Boolean {
         var result: Shell.Result? = null
         var attempt = 3
+        val command: String
 
-        val command: String = getAAPT2Command(source, name)
+        if (!isAtleastA14) {
+            command =
+                "$aapt p -f -M $source/AndroidManifest.xml -I $FRAMEWORK_DIR -S $source/res -F $UNSIGNED_UNALIGNED_DIR/$name-unsigned-unaligned.apk --include-meta-data --auto-add-overlay"
+        } else {
+            command = getAAPT2Command(source, name)
 
-        if (isQsTileOrTextOverlay(name)) {
-            QsResourceManager.removeQuickSettingsStyles(source)
+            if (isQsTileOrTextOverlay(name)) {
+                QsResourceManager.removeQuickSettingsStyles(source)
+            }
         }
 
         while (attempt-- != 0) {

app/src/main/java/com/drdisagree/iconify/utils/overlay/compiler/OverlayCompiler.kt

@@ -2,8 +2,10 @@ package com.drdisagree.iconify.utils.overlay.compiler
 
 import android.util.Log
 import com.drdisagree.iconify.Iconify.Companion.appContext
+import com.drdisagree.iconify.common.Dynamic.AAPT
 import com.drdisagree.iconify.common.Dynamic.AAPT2
 import com.drdisagree.iconify.common.Dynamic.ZIPALIGN
+import com.drdisagree.iconify.common.Dynamic.isAtleastA14
 import com.drdisagree.iconify.common.Resources
 import com.drdisagree.iconify.common.Resources.FRAMEWORK_DIR
 import com.drdisagree.iconify.utils.AppUtils.getSplitLocations
@@ -17,6 +19,7 @@ import java.security.cert.X509Certificate
 object OverlayCompiler {
 
     private val TAG = OverlayCompiler::class.java.simpleName
+    private val aapt: String = AAPT.absolutePath
     private val aapt2: String = AAPT2.absolutePath
     private val zipalign: String = ZIPALIGN.absolutePath
     private var key: PrivateKey? = null
@@ -111,7 +114,11 @@ object OverlayCompiler {
                 Resources.UNSIGNED_UNALIGNED_DIR
             }
 
-        return StringBuilder(getAAPT2Command(source, name, outputDir))
+        return if (!isAtleastA14) {
+            StringBuilder("$aapt p -f -M $source/AndroidManifest.xml -S $source/res -F $outputDir/$name -I $FRAMEWORK_DIR --include-meta-data --auto-add-overlay")
+        } else {
+            StringBuilder(getAAPT2Command(source, name, outputDir))
+        }
     }
 
     private fun getAAPT2Command(source: String, name: String, outputDir: String): String {