build: Bump version to v0.0.9

fix: Minor improvements on App Info view
feat: Retrieve unsaved apps from manager's root folder and known packages from user's apps list
2025-05-18 06:56:16 +08:00 · 2022-09-17 19:40:44 +01:00 · 2022-09-17 19:30:04 +01:00 · 2022-09-17 19:29:46 +01:00 · 2022-09-17 17:42:29 +01:00 · 2022-09-17 20:58:19 +05:30
45 changed files with 801 additions and 480 deletions
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -44,7 +44,7 @@ android {

    defaultConfig {
        applicationId "app.revanced.manager.flutter"
-        minSdkVersion 21
+        minSdkVersion 26
        targetSdkVersion 33
        versionCode flutterVersionCode.toInteger()
        versionName flutterVersionName
@ -57,6 +57,10 @@ android {
            signingConfig signingConfigs.debug
        }
    }
+
+    packagingOptions {
+        exclude '/prebuilt/**'
+    }
 }

 flutter {
@ -67,9 +71,9 @@ dependencies {
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

    // ReVanced
-    implementation "app.revanced:revanced-patcher:4.2.3"
+    implementation "app.revanced:revanced-patcher:4.4.1"

    // Signing & aligning
    implementation("org.bouncycastle:bcpkix-jdk15on:1.70")
-    implementation("com.android.tools.build:apksig:7.2.1")
+    implementation("com.android.tools.build:apksig:7.2.2")
 }
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -1,8 +1,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="app.revanced.manager.flutter">
    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
    <uses-permission android:name="android.permission.WAKE_LOCK" />
--- a/android/app/src/main/kotlin/app/revanced/manager/MainActivity.kt
+++ b/android/app/src/main/kotlin/app/revanced/manager/MainActivity.kt
@ -1,333 +0,0 @@
-package app.revanced.manager.flutter
-
-import android.os.Handler
-import android.os.Looper
-import androidx.annotation.NonNull
-import app.revanced.manager.flutter.utils.Aapt
-import app.revanced.manager.flutter.utils.aligning.ZipAligner
-import app.revanced.manager.flutter.utils.signing.Signer
-import app.revanced.manager.flutter.utils.zip.ZipFile
-import app.revanced.manager.flutter.utils.zip.structures.ZipEntry
-import app.revanced.patcher.Patcher
-import app.revanced.patcher.PatcherOptions
-import app.revanced.patcher.extensions.PatchExtensions.patchName
-import app.revanced.patcher.util.patch.impl.DexPatchBundle
-import dalvik.system.DexClassLoader
-import io.flutter.embedding.android.FlutterActivity
-import io.flutter.embedding.engine.FlutterEngine
-import io.flutter.plugin.common.MethodChannel
-import io.flutter.plugin.common.MethodChannel.Result
-import java.io.File
-
-class MainActivity : FlutterActivity() {
-    private val PATCHER_CHANNEL = "app.revanced.manager.flutter/patcher"
-    private val INSTALLER_CHANNEL = "app.revanced.manager.flutter/installer"
-    private val handler = Handler(Looper.getMainLooper())
-    private lateinit var installerChannel: MethodChannel
-
-    override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
-        super.configureFlutterEngine(flutterEngine)
-        val mainChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, PATCHER_CHANNEL)
-        installerChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, INSTALLER_CHANNEL)
-        mainChannel.setMethodCallHandler { call, result ->
-            when (call.method) {
-                "runPatcher" -> {
-                    val patchBundleFilePath = call.argument<String>("patchBundleFilePath")
-                    val originalFilePath = call.argument<String>("originalFilePath")
-                    val inputFilePath = call.argument<String>("inputFilePath")
-                    val patchedFilePath = call.argument<String>("patchedFilePath")
-                    val outFilePath = call.argument<String>("outFilePath")
-                    val integrationsPath = call.argument<String>("integrationsPath")
-                    val selectedPatches = call.argument<List<String>>("selectedPatches")
-                    val cacheDirPath = call.argument<String>("cacheDirPath")
-                    val mergeIntegrations = call.argument<Boolean>("mergeIntegrations")
-                    val resourcePatching = call.argument<Boolean>("resourcePatching")
-                    val keyStoreFilePath = call.argument<String>("keyStoreFilePath")
-                    if (patchBundleFilePath != null &&
-                                    originalFilePath != null &&
-                                    inputFilePath != null &&
-                                    patchedFilePath != null &&
-                                    outFilePath != null &&
-                                    integrationsPath != null &&
-                                    selectedPatches != null &&
-                                    cacheDirPath != null &&
-                                    mergeIntegrations != null &&
-                                    resourcePatching != null &&
-                                    keyStoreFilePath != null
-                    ) {
-                        runPatcher(
-                                result,
-                                patchBundleFilePath,
-                                originalFilePath,
-                                inputFilePath,
-                                patchedFilePath,
-                                outFilePath,
-                                integrationsPath,
-                                selectedPatches,
-                                cacheDirPath,
-                                mergeIntegrations,
-                                resourcePatching,
-                                keyStoreFilePath
-                        )
-                    } else {
-                        result.notImplemented()
-                    }
-                }
-                else -> result.notImplemented()
-            }
-        }
-    }
-
-    fun runPatcher(
-            result: MethodChannel.Result,
-            patchBundleFilePath: String,
-            originalFilePath: String,
-            inputFilePath: String,
-            patchedFilePath: String,
-            outFilePath: String,
-            integrationsPath: String,
-            selectedPatches: List<String>,
-            cacheDirPath: String,
-            mergeIntegrations: Boolean,
-            resourcePatching: Boolean,
-            keyStoreFilePath: String
-    ) {
-        val originalFile = File(originalFilePath)
-        val inputFile = File(inputFilePath)
-        val patchedFile = File(patchedFilePath)
-        val outFile = File(outFilePath)
-        val integrations = File(integrationsPath)
-        val keyStoreFile = File(keyStoreFilePath)
-
-        val patches =
-                DexPatchBundle(
-                                patchBundleFilePath,
-                                DexClassLoader(
-                                        patchBundleFilePath,
-                                        cacheDirPath,
-                                        null,
-                                        javaClass.classLoader
-                                )
-                        )
-                        .loadPatches()
-                        .filter { patch -> selectedPatches.any { it == patch.patchName } }
-
-        Thread(
-                        Runnable {
-                            handler.post {
-                                installerChannel.invokeMethod(
-                                        "update",
-                                        mapOf(
-                                                "progress" to 0.1,
-                                                "header" to "",
-                                                "log" to "Copying original apk"
-                                        )
-                                )
-                            }
-                            originalFile.copyTo(inputFile, true)
-
-                            handler.post {
-                                installerChannel.invokeMethod(
-                                        "update",
-                                        mapOf(
-                                                "progress" to 0.2,
-                                                "header" to "Unpacking apk...",
-                                                "log" to "Unpacking input apk"
-                                        )
-                                )
-                            }
-                            val patcher =
-                                    Patcher(
-                                            PatcherOptions(
-                                                    inputFile,
-                                                    cacheDirPath,
-                                                    resourcePatching,
-                                                    Aapt.binary(applicationContext).absolutePath,
-                                                    cacheDirPath,
-                                                    logger =
-                                                            object :
-                                                                    app.revanced.patcher.logging.Logger {
-                                                                override fun error(msg: String) {
-                                                                    handler.post {
-                                                                        installerChannel
-                                                                                .invokeMethod(
-                                                                                        "update",
-                                                                                        mapOf(
-                                                                                                "progress" to
-                                                                                                        -1.0,
-                                                                                                "header" to
-                                                                                                        "",
-                                                                                                "log" to
-                                                                                                        msg
-                                                                                        )
-                                                                                )
-                                                                    }
-                                                                }
-
-                                                                override fun warn(msg: String) {
-                                                                    handler.post {
-                                                                        installerChannel
-                                                                                .invokeMethod(
-                                                                                        "update",
-                                                                                        mapOf(
-                                                                                                "progress" to
-                                                                                                        -1.0,
-                                                                                                "header" to
-                                                                                                        "",
-                                                                                                "log" to
-                                                                                                        msg
-                                                                                        )
-                                                                                )
-                                                                    }
-                                                                }
-
-                                                                override fun info(msg: String) {
-                                                                    handler.post {
-                                                                        installerChannel
-                                                                                .invokeMethod(
-                                                                                        "update",
-                                                                                        mapOf(
-                                                                                                "progress" to
-                                                                                                        -1.0,
-                                                                                                "header" to
-                                                                                                        "",
-                                                                                                "log" to
-                                                                                                        msg
-                                                                                        )
-                                                                                )
-                                                                    }
-                                                                }
-
-                                                                override fun trace(msg: String) {
-                                                                    handler.post {
-                                                                        installerChannel
-                                                                                .invokeMethod(
-                                                                                        "update",
-                                                                                        mapOf(
-                                                                                                "progress" to
-                                                                                                        -1.0,
-                                                                                                "header" to
-                                                                                                        "",
-                                                                                                "log" to
-                                                                                                        msg
-                                                                                        )
-                                                                                )
-                                                                    }
-                                                                }
-                                                            }
-                                            )
-                                    )
-
-                            handler.post {
-                                installerChannel.invokeMethod(
-                                        "update",
-                                        mapOf("progress" to 0.3, "header" to "", "log" to "")
-                                )
-                            }
-                            if (mergeIntegrations) {
-                                handler.post {
-                                    installerChannel.invokeMethod(
-                                            "update",
-                                            mapOf(
-                                                    "progress" to 0.4,
-                                                    "header" to "Merging integrations...",
-                                                    "log" to "Merging integrations"
-                                            )
-                                    )
-                                }
-                                patcher.addFiles(listOf(integrations)) {}
-                            }
-
-                            handler.post {
-                                installerChannel.invokeMethod(
-                                        "update",
-                                        mapOf(
-                                                "progress" to 0.5,
-                                                "header" to "Applying patches...",
-                                                "log" to ""
-                                        )
-                                )
-                            }
-                            patcher.addPatches(patches)
-                            patcher.applyPatches().forEach { (patch, res) ->
-                                if (res.isSuccess) {
-                                    val msg = "[success] $patch"
-                                    handler.post {
-                                        installerChannel.invokeMethod(
-                                                "update",
-                                                mapOf(
-                                                        "progress" to 0.5,
-                                                        "header" to "",
-                                                        "log" to msg
-                                                )
-                                        )
-                                    }
-                                    return@forEach
-                                }
-                                val msg = "[error] $patch:" + res.exceptionOrNull()!!
-                                handler.post {
-                                    installerChannel.invokeMethod(
-                                            "update",
-                                            mapOf("progress" to 0.5, "header" to "", "log" to msg)
-                                    )
-                                }
-                            }
-
-                            handler.post {
-                                installerChannel.invokeMethod(
-                                        "update",
-                                        mapOf(
-                                                "progress" to 0.7,
-                                                "header" to "Repacking apk...",
-                                                "log" to "Repacking patched apk"
-                                        )
-                                )
-                            }
-                            val res = patcher.save()
-                            ZipFile(patchedFile).use { file ->
-                                res.dexFiles.forEach {
-                                    file.addEntryCompressData(
-                                            ZipEntry.createWithName(it.name),
-                                            it.stream.readBytes()
-                                    )
-                                }
-                                res.resourceFile?.let {
-                                    file.copyEntriesFromFileAligned(
-                                            ZipFile(it),
-                                            ZipAligner::getEntryAlignment
-                                    )
-                                }
-                                file.copyEntriesFromFileAligned(
-                                        ZipFile(inputFile),
-                                        ZipAligner::getEntryAlignment
-                                )
-                            }
-                            handler.post {
-                                installerChannel.invokeMethod(
-                                        "update",
-                                        mapOf(
-                                                "progress" to 0.9,
-                                                "header" to "Signing apk...",
-                                                "log" to ""
-                                        )
-                                )
-                            }
-                            Signer("ReVanced", "s3cur3p@ssw0rd").signApk(patchedFile, outFile, keyStoreFile)
-
-                            handler.post {
-                                installerChannel.invokeMethod(
-                                        "update",
-                                        mapOf(
-                                                "progress" to 1.0,
-                                                "header" to "Finished!",
-                                                "log" to "Finished!"
-                                        )
-                                )
-                            }
-
-                            handler.post { result.success(null) }
-                        }
-                )
-                .start()
-    }
-}
--- a/android/app/src/main/kotlin/app/revanced/manager/flutter/MainActivity.kt
+++ b/android/app/src/main/kotlin/app/revanced/manager/flutter/MainActivity.kt
@ -0,0 +1,299 @@
+package app.revanced.manager.flutter
+
+import android.os.Handler
+import android.os.Looper
+import androidx.annotation.NonNull
+import app.revanced.manager.flutter.utils.Aapt
+import app.revanced.manager.flutter.utils.aligning.ZipAligner
+import app.revanced.manager.flutter.utils.signing.Signer
+import app.revanced.manager.flutter.utils.zip.ZipFile
+import app.revanced.manager.flutter.utils.zip.structures.ZipEntry
+import app.revanced.patcher.Patcher
+import app.revanced.patcher.PatcherOptions
+import app.revanced.patcher.extensions.PatchExtensions.patchName
+import app.revanced.patcher.logging.Logger
+import app.revanced.patcher.util.patch.impl.DexPatchBundle
+import dalvik.system.DexClassLoader
+import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.plugin.common.MethodChannel
+import java.io.File
+
+private const val PATCHER_CHANNEL = "app.revanced.manager.flutter/patcher"
+private const val INSTALLER_CHANNEL = "app.revanced.manager.flutter/installer"
+
+class MainActivity : FlutterActivity() {
+    private val handler = Handler(Looper.getMainLooper())
+    private lateinit var installerChannel: MethodChannel
+
+    override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
+        super.configureFlutterEngine(flutterEngine)
+        val mainChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, PATCHER_CHANNEL)
+        installerChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, INSTALLER_CHANNEL)
+        mainChannel.setMethodCallHandler { call, result ->
+            when (call.method) {
+                "runPatcher" -> {
+                    val patchBundleFilePath = call.argument<String>("patchBundleFilePath")
+                    val originalFilePath = call.argument<String>("originalFilePath")
+                    val inputFilePath = call.argument<String>("inputFilePath")
+                    val patchedFilePath = call.argument<String>("patchedFilePath")
+                    val outFilePath = call.argument<String>("outFilePath")
+                    val integrationsPath = call.argument<String>("integrationsPath")
+                    val selectedPatches = call.argument<List<String>>("selectedPatches")
+                    val cacheDirPath = call.argument<String>("cacheDirPath")
+                    val mergeIntegrations = call.argument<Boolean>("mergeIntegrations")
+                    val resourcePatching = call.argument<Boolean>("resourcePatching")
+                    val keyStoreFilePath = call.argument<String>("keyStoreFilePath")
+                    if (patchBundleFilePath != null &&
+                        originalFilePath != null &&
+                        inputFilePath != null &&
+                        patchedFilePath != null &&
+                        outFilePath != null &&
+                        integrationsPath != null &&
+                        selectedPatches != null &&
+                        cacheDirPath != null &&
+                        mergeIntegrations != null &&
+                        resourcePatching != null &&
+                        keyStoreFilePath != null
+                    ) {
+                        runPatcher(
+                            result,
+                            patchBundleFilePath,
+                            originalFilePath,
+                            inputFilePath,
+                            patchedFilePath,
+                            outFilePath,
+                            integrationsPath,
+                            selectedPatches,
+                            cacheDirPath,
+                            mergeIntegrations,
+                            resourcePatching,
+                            keyStoreFilePath
+                        )
+                    } else {
+                        result.notImplemented()
+                    }
+                }
+
+                else -> result.notImplemented()
+            }
+        }
+    }
+
+    private fun runPatcher(
+        result: MethodChannel.Result,
+        patchBundleFilePath: String,
+        originalFilePath: String,
+        inputFilePath: String,
+        patchedFilePath: String,
+        outFilePath: String,
+        integrationsPath: String,
+        selectedPatches: List<String>,
+        cacheDirPath: String,
+        mergeIntegrations: Boolean,
+        resourcePatching: Boolean,
+        keyStoreFilePath: String
+    ) {
+        val originalFile = File(originalFilePath)
+        val inputFile = File(inputFilePath)
+        val patchedFile = File(patchedFilePath)
+        val outFile = File(outFilePath)
+        val integrations = File(integrationsPath)
+        val keyStoreFile = File(keyStoreFilePath)
+
+        val patches = DexPatchBundle(
+            patchBundleFilePath,
+            DexClassLoader(
+                patchBundleFilePath,
+                cacheDirPath,
+                null,
+                javaClass.classLoader
+            )
+        ).loadPatches().filter { patch -> selectedPatches.any { it == patch.patchName } }
+
+        Thread {
+            handler.post {
+                installerChannel.invokeMethod(
+                    "update",
+                    mapOf(
+                        "progress" to 0.1,
+                        "header" to "",
+                        "log" to "Copying original apk"
+                    )
+                )
+            }
+            originalFile.copyTo(inputFile, true)
+
+            handler.post {
+                installerChannel.invokeMethod(
+                    "update",
+                    mapOf(
+                        "progress" to 0.2,
+                        "header" to "Unpacking apk...",
+                        "log" to "Unpacking input apk"
+                    )
+                )
+            }
+            val patcher =
+                Patcher(
+                    PatcherOptions(
+                        inputFile,
+                        cacheDirPath,
+                        resourcePatching,
+                        Aapt.binary(applicationContext).absolutePath,
+                        cacheDirPath,
+                        logger = ManagerLogger()
+                    )
+                )
+
+            handler.post {
+                installerChannel.invokeMethod(
+                    "update",
+                    mapOf("progress" to 0.3, "header" to "", "log" to "")
+                )
+            }
+            if (mergeIntegrations) {
+                handler.post {
+                    installerChannel.invokeMethod(
+                        "update",
+                        mapOf(
+                            "progress" to 0.4,
+                            "header" to "Merging integrations...",
+                            "log" to "Merging integrations"
+                        )
+                    )
+                }
+                patcher.addFiles(listOf(integrations)) {}
+            }
+
+            handler.post {
+                installerChannel.invokeMethod(
+                    "update",
+                    mapOf(
+                        "progress" to 0.5,
+                        "header" to "Applying patches...",
+                        "log" to ""
+                    )
+                )
+            }
+            patcher.addPatches(patches)
+            patcher.applyPatches().forEach { (patch, res) ->
+                if (res.isSuccess) {
+                    val msg = "[success] $patch"
+                    handler.post {
+                        installerChannel.invokeMethod(
+                            "update",
+                            mapOf(
+                                "progress" to 0.5,
+                                "header" to "",
+                                "log" to msg
+                            )
+                        )
+                    }
+                    return@forEach
+                }
+                val msg = "[error] $patch:" + res.exceptionOrNull()!!
+                handler.post {
+                    installerChannel.invokeMethod(
+                        "update",
+                        mapOf("progress" to 0.5, "header" to "", "log" to msg)
+                    )
+                }
+            }
+
+            handler.post {
+                installerChannel.invokeMethod(
+                    "update",
+                    mapOf(
+                        "progress" to 0.7,
+                        "header" to "Repacking apk...",
+                        "log" to "Repacking patched apk"
+                    )
+                )
+            }
+            val res = patcher.save()
+            ZipFile(patchedFile).use { file ->
+                res.dexFiles.forEach {
+                    file.addEntryCompressData(
+                        ZipEntry.createWithName(it.name),
+                        it.stream.readBytes()
+                    )
+                }
+                res.resourceFile?.let {
+                    file.copyEntriesFromFileAligned(
+                        ZipFile(it),
+                        ZipAligner::getEntryAlignment
+                    )
+                }
+                file.copyEntriesFromFileAligned(
+                    ZipFile(inputFile),
+                    ZipAligner::getEntryAlignment
+                )
+            }
+            handler.post {
+                installerChannel.invokeMethod(
+                    "update",
+                    mapOf(
+                        "progress" to 0.9,
+                        "header" to "Signing apk...",
+                        "log" to ""
+                    )
+                )
+            }
+            Signer("ReVanced", "s3cur3p@ssw0rd").signApk(patchedFile, outFile, keyStoreFile)
+
+            handler.post {
+                installerChannel.invokeMethod(
+                    "update",
+                    mapOf(
+                        "progress" to 1.0,
+                        "header" to "Finished!",
+                        "log" to "Finished!"
+                    )
+                )
+            }
+
+            handler.post { result.success(null) }
+        }
+            .start()
+    }
+
+    inner class ManagerLogger : Logger {
+        override fun error(msg: String) {
+            handler.post {
+                installerChannel
+                    .invokeMethod(
+                        "update",
+                        mapOf("progress" to -1.0, "header" to "", "log" to msg)
+                    )
+            }
+        }
+
+        override fun warn(msg: String) {
+            handler.post {
+                installerChannel.invokeMethod(
+                    "update",
+                    mapOf("progress" to -1.0, "header" to "", "log" to msg)
+                )
+            }
+        }
+
+        override fun info(msg: String) {
+            handler.post {
+                installerChannel.invokeMethod(
+                    "update",
+                    mapOf("progress" to -1.0, "header" to "", "log" to msg)
+                )
+            }
+        }
+
+        override fun trace(msg: String) {
+            handler.post {
+                installerChannel.invokeMethod(
+                    "update",
+                    mapOf("progress" to -1.0, "header" to "", "log" to msg)
+                )
+            }
+        }
+    }
+}
--- a/android/app/src/main/kotlin/app/revanced/manager/flutter/utils/Aapt.kt
+++ b/android/app/src/main/kotlin/app/revanced/manager/flutter/utils/Aapt.kt
--- a/android/app/src/main/kotlin/app/revanced/manager/flutter/utils/aligning/ZipAligner.kt
+++ b/android/app/src/main/kotlin/app/revanced/manager/flutter/utils/aligning/ZipAligner.kt
--- a/android/app/src/main/kotlin/app/revanced/manager/flutter/utils/signing/Signer.kt
+++ b/android/app/src/main/kotlin/app/revanced/manager/flutter/utils/signing/Signer.kt
--- a/android/app/src/main/kotlin/app/revanced/manager/flutter/utils/zip/Extensions.kt
+++ b/android/app/src/main/kotlin/app/revanced/manager/flutter/utils/zip/Extensions.kt
@ -1,3 +1,5 @@
+@file:Suppress("unused")
+
 package app.revanced.manager.flutter.utils.zip

 import java.io.DataInput
@ -17,8 +19,8 @@ fun UShort.toBigEndian() = (this.toUInt() shl 16).toBigEndian().toUShort()
 fun ByteBuffer.getUShort() = this.short.toUShort()
 fun ByteBuffer.getUInt() = this.int.toUInt()

-fun ByteBuffer.putUShort(ushort: UShort) = this.putShort(ushort.toShort())
-fun ByteBuffer.putUInt(uint: UInt) = this.putInt(uint.toInt())
+fun ByteBuffer.putUShort(ushort: UShort): ByteBuffer = this.putShort(ushort.toShort())
+fun ByteBuffer.putUInt(uint: UInt): ByteBuffer = this.putInt(uint.toInt())

 fun DataInput.readUShort() = this.readShort().toUShort()
 fun DataInput.readUInt() = this.readInt().toUInt()
--- a/android/app/src/main/kotlin/app/revanced/manager/flutter/utils/zip/ZipFile.kt
+++ b/android/app/src/main/kotlin/app/revanced/manager/flutter/utils/zip/ZipFile.kt
@ -10,7 +10,7 @@ import java.nio.channels.FileChannel
 import java.util.zip.CRC32
 import java.util.zip.Deflater

-class ZipFile(val file: File) : Closeable {
+class ZipFile(file: File) : Closeable {
    var entries: MutableList<ZipEntry> = mutableListOf()

    private val filePointer: RandomAccessFile = RandomAccessFile(file, "rw")
@ -134,8 +134,8 @@ class ZipFile(val file: File) : Closeable {
        addEntry(entry, compressedBuffer)
    }

-    fun addEntryCopyData(entry: ZipEntry, data: ByteBuffer, alignment: Int? = null) {
-        alignment?.let { alignment ->
+    private fun addEntryCopyData(entry: ZipEntry, data: ByteBuffer, alignment: Int? = null) {
+        alignment?.let {
            //calculate where data would end up
            val dataOffset = filePointer.filePointer + entry.LFHSize

--- a/android/app/src/main/kotlin/app/revanced/manager/flutter/utils/zip/structures/ZipEndRecord.kt
+++ b/android/app/src/main/kotlin/app/revanced/manager/flutter/utils/zip/structures/ZipEndRecord.kt
--- a/android/app/src/main/kotlin/app/revanced/manager/flutter/utils/zip/structures/ZipEntry.kt
+++ b/android/app/src/main/kotlin/app/revanced/manager/flutter/utils/zip/structures/ZipEntry.kt
@ -76,7 +76,7 @@ data class ZipEntry(
            val fileNameLength = input.readUShortLE()
            var fileName = ""
            val extraFieldLength = input.readUShortLE()
-            var extraField = ByteArray(extraFieldLength.toInt())
+            val extraField = ByteArray(extraFieldLength.toInt())
            val fileCommentLength = input.readUShortLE()
            var fileComment = ""
            val diskNumber = input.readUShortLE()
--- a/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png
+++ b/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png
--- a/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png
+++ b/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png
--- a/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png
+++ b/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png
--- a/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png
+++ b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png
--- a/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png
+++ b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png
--- a/android/build.gradle
+++ b/android/build.gradle
@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.7.10'
    repositories {
        google()
        mavenCentral()
    }

    dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }
 }
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,6 @@
-#Fri Jun 23 08:50:38 CEST 2017
+#Mon May 09 12:07:41 MSK 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-rc-1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+zipStoreBase=GRADLE_USER_HOME
--- a/assets/i18n/en.json
+++ b/assets/i18n/en.json
@ -42,7 +42,9 @@
    },
    "patcherView": {
        "widgetTitle": "Patcher",
-        "patchButton": "Patch"
+        "patchButton": "Patch",
+        "patchDialogTitle": "Warning",
+        "patchDialogText": "You have selected a resource patch and a split APK installation was detected so patching errors can occur.\nAre you sure you want to proceed with patching a split base APK?"
    },
    "appSelectorCard": {
        "widgetTitle": "Select application",
@ -67,7 +69,8 @@
    },
    "patchesSelectorView": {
        "searchBarHint": "Search patches",
-        "doneButton": "Done"
+        "doneButton": "Done",
+        "noPatchesFound": "No patches found for the selected app."
    },
    "patchItem": {
        "unsupportedWarningButton": "Unsupported version",
@ -118,8 +121,11 @@
        "openButton": "Open",
        "uninstallButton": "Uninstall",
        "patchButton": "Patch",
+        "unpatchButton": "Unpatch",
        "uninstallDialogTitle": "Uninstall",
        "uninstallDialogText": "Are you sure you want to uninstall this app?",
+        "unpatchDialogTitle": "Unpatch",
+        "unpatchDialogText": "Are you sure you want to unpatch this app?",
        "rootDialogTitle": "Error",
        "rootDialogText": "App was installed with root mode enabled but currently root mode is disabled.\nPlease enable root mode first.",
        "packageNameLabel": "Package Name",
--- a/lib/models/patched_application.dart
+++ b/lib/models/patched_application.dart
@ -7,7 +7,7 @@ part 'patched_application.g.dart';
@JsonSerializable()
 class PatchedApplication {
  String name;
-  final String packageName;
+  String packageName;
  String version;
  final String apkFilePath;
  @JsonKey(
--- a/lib/services/github_api.dart
+++ b/lib/services/github_api.dart
@ -13,7 +13,7 @@ class GithubAPI {
  final Dio _dio = Dio();
  final DioCacheManager _dioCacheManager = DioCacheManager(CacheConfig());
  final Options _cacheOptions = buildCacheOptions(
-    const Duration(hours: 1),
+    const Duration(days: 1),
    maxStale: const Duration(days: 7),
  );
  final Map<String, String> repoAppPath = {
--- a/lib/services/manager_api.dart
+++ b/lib/services/manager_api.dart
@ -165,33 +165,96 @@ class ManagerAPI {
    return packageInfo.version;
  }

-  Future<void> reAssessSavedApps() async {
-    List<PatchedApplication> patchedApps = getPatchedApps();
+  Future<List<PatchedApplication>> getAppsToRemove(
+    List<PatchedApplication> patchedApps,
+  ) async {
    List<PatchedApplication> toRemove = [];
    for (PatchedApplication app in patchedApps) {
      bool isRemove = await isAppUninstalled(app);
      if (isRemove) {
        toRemove.add(app);
-      } else {
-        app.hasUpdates = await hasAppUpdates(app.packageName, app.patchDate);
-        app.changelog = await getAppChangelog(app.packageName, app.patchDate);
-        if (!app.hasUpdates) {
-          String? currentInstalledVersion =
-              (await DeviceApps.getApp(app.packageName))?.versionName;
-          if (currentInstalledVersion != null) {
-            String currentSavedVersion = app.version;
-            int currentInstalledVersionInt = int.parse(
-                currentInstalledVersion.replaceAll(RegExp('[^0-9]'), ''));
-            int currentSavedVersionInt =
-                int.parse(currentSavedVersion.replaceAll(RegExp('[^0-9]'), ''));
-            if (currentInstalledVersionInt > currentSavedVersionInt) {
-              app.hasUpdates = true;
-            }
+      }
+    }
+    return toRemove;
+  }
+
+  Future<List<PatchedApplication>> getUnsavedApps(
+    List<PatchedApplication> patchedApps,
+  ) async {
+    List<PatchedApplication> unsavedApps = [];
+    List<String> installedApps = await _rootAPI.getInstalledApps();
+    for (String packageName in installedApps) {
+      if (!patchedApps.any((app) => app.packageName == packageName)) {
+        ApplicationWithIcon? application =
+            await DeviceApps.getApp(packageName, true) as ApplicationWithIcon?;
+        if (application != null) {
+          unsavedApps.add(
+            PatchedApplication(
+              name: application.appName,
+              packageName: application.packageName,
+              version: application.versionName!,
+              apkFilePath: application.apkFilePath,
+              icon: application.icon,
+              patchDate: DateTime.now(),
+              isRooted: true,
+            ),
+          );
+        }
+      }
+    }
+    List<Application> userApps = await DeviceApps.getInstalledApplications(
+      includeSystemApps: false,
+      includeAppIcons: false,
+    );
+    for (Application app in userApps) {
+      if (app.packageName.startsWith('app.revanced') &&
+          !app.packageName.startsWith('app.revanced.manager.')) {
+        ApplicationWithIcon? application =
+            await DeviceApps.getApp(app.packageName, true)
+                as ApplicationWithIcon?;
+        if (application != null) {
+          unsavedApps.add(
+            PatchedApplication(
+              name: application.appName,
+              packageName: application.packageName,
+              version: application.versionName!,
+              apkFilePath: application.apkFilePath,
+              icon: application.icon,
+              patchDate: DateTime.now(),
+              isRooted: false,
+            ),
+          );
+        }
+      }
+    }
+
+    return unsavedApps;
+  }
+
+  Future<void> reAssessSavedApps() async {
+    List<PatchedApplication> patchedApps = getPatchedApps();
+    List<PatchedApplication> unsavedApps = await getUnsavedApps(patchedApps);
+    patchedApps.addAll(unsavedApps);
+    List<PatchedApplication> toRemove = await getAppsToRemove(patchedApps);
+    patchedApps.removeWhere((a) => toRemove.contains(a));
+    for (PatchedApplication app in patchedApps) {
+      app.hasUpdates = await hasAppUpdates(app.packageName, app.patchDate);
+      app.changelog = await getAppChangelog(app.packageName, app.patchDate);
+      if (!app.hasUpdates) {
+        String? currentInstalledVersion =
+            (await DeviceApps.getApp(app.packageName))?.versionName;
+        if (currentInstalledVersion != null) {
+          String currentSavedVersion = app.version;
+          int currentInstalledVersionInt = int.parse(
+              currentInstalledVersion.replaceAll(RegExp('[^0-9]'), ''));
+          int currentSavedVersionInt =
+              int.parse(currentSavedVersion.replaceAll(RegExp('[^0-9]'), ''));
+          if (currentInstalledVersionInt > currentSavedVersionInt) {
+            app.hasUpdates = true;
          }
        }
      }
    }
-    patchedApps.removeWhere((a) => toRemove.contains(a));
    await setPatchedApps(patchedApps);
  }

--- a/lib/services/patcher_api.dart
+++ b/lib/services/patcher_api.dart
@ -82,6 +82,24 @@ class PatcherAPI {
        .toList();
  }

+  Future<bool> needsIntegrations(List<Patch> selectedPatches) async {
+    return selectedPatches.any(
+      (patch) => patch.dependencies.contains('integrations'),
+    );
+  }
+
+  Future<bool> needsResourcePatching(List<Patch> selectedPatches) async {
+    return selectedPatches.any(
+      (patch) => patch.dependencies.any((dep) => dep.contains('resource-')),
+    );
+  }
+
+  Future<bool> needsSettingsPatch(List<Patch> selectedPatches) async {
+    return selectedPatches.any(
+      (patch) => patch.dependencies.contains('settings'),
+    );
+  }
+
  Future<String> getOriginalFilePath(
    String packageName,
    String originalFilePath,
@ -101,15 +119,9 @@ class PatcherAPI {
    String originalFilePath,
    List<Patch> selectedPatches,
  ) async {
-    bool mergeIntegrations = selectedPatches.any(
-      (patch) => patch.dependencies.contains('integrations'),
-    );
-    bool resourcePatching = selectedPatches.any(
-      (patch) => patch.dependencies.any((dep) => dep.contains('resource-')),
-    );
-    bool includeSettings = selectedPatches.any(
-      (patch) => patch.dependencies.contains('settings'),
-    );
+    bool mergeIntegrations = await needsIntegrations(selectedPatches);
+    bool resourcePatching = await needsResourcePatching(selectedPatches);
+    bool includeSettings = await needsSettingsPatch(selectedPatches);
    if (includeSettings) {
      try {
        Patch? settingsPatch = _patches.firstWhereOrNull(
--- a/lib/services/revanced_api.dart
+++ b/lib/services/revanced_api.dart
@ -13,7 +13,7 @@ class RevancedAPI {
  final Dio _dio = Dio();
  final DioCacheManager _dioCacheManager = DioCacheManager(CacheConfig());
  final Options _cacheOptions = buildCacheOptions(
-    const Duration(hours: 1),
+    const Duration(days: 1),
    maxStale: const Duration(days: 7),
  );

--- a/lib/services/root_api.dart
+++ b/lib/services/root_api.dart
@ -6,8 +6,12 @@ class RootAPI {
  final String _serviceDDirPath = '/data/adb/service.d';

  Future<bool> hasRootPermissions() async {
-    bool? isRooted = await Root.isRooted();
-    return isRooted != null && isRooted;
+    try {
+      bool? isRooted = await Root.isRooted();
+      return isRooted != null && isRooted;
+    } on Exception {
+      return false;
+    }
  }

  Future<void> setPermissions(
--- a/lib/theme.dart
+++ b/lib/theme.dart
@ -4,6 +4,7 @@ import 'package:google_fonts/google_fonts.dart';
 var lightCustomColorScheme = ColorScheme.fromSeed(
  seedColor: Colors.blue,
  brightness: Brightness.light,
+  primary: const Color(0xff1B73E8),
 );

 var lightCustomTheme = ThemeData(
@ -23,8 +24,8 @@ var lightCustomTheme = ThemeData(
 var darkCustomColorScheme = ColorScheme.fromSeed(
  seedColor: Colors.blue,
  brightness: Brightness.dark,
-  primary: const Color(0xff7792BA),
-  surface: const Color(0xff0A0D11),
+  primary: const Color(0xffA5CAFF),
+  surface: const Color(0xff1B1A1D),
 );

 var darkCustomTheme = ThemeData(
@ -38,8 +39,8 @@ var darkCustomTheme = ThemeData(
      ),
    ),
  ),
-  canvasColor: const Color(0xff0A0D11),
-  scaffoldBackgroundColor: const Color(0xff0A0D11),
-  toggleableActiveColor: const Color(0xff7792BA),
+  canvasColor: const Color(0xff1B1A1D),
+  scaffoldBackgroundColor: const Color(0xff1B1A1D),
+  toggleableActiveColor: const Color(0xffA5CAFF),
  textTheme: GoogleFonts.robotoTextTheme(ThemeData.dark().textTheme),
 );
--- a/lib/ui/theme/dynamic_theme_builder.dart
+++ b/lib/ui/theme/dynamic_theme_builder.dart
@ -76,7 +76,7 @@ class DynamicThemeBuilder extends StatelessWidget {
              2: lightDynamicTheme,
              3: darkDynamicTheme,
            },
-            fallbackTheme: darkCustomTheme,
+            fallbackTheme: lightCustomTheme,
          ),
          builder: (context, theme) => MaterialApp(
            debugShowCheckedModeBanner: false,
--- a/lib/ui/views/installer/installer_view.dart
+++ b/lib/ui/views/installer/installer_view.dart
@ -3,6 +3,7 @@ import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:revanced_manager/ui/views/installer/installer_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/installerView/custom_material_button.dart';
+import 'package:revanced_manager/ui/widgets/installerView/gradient_progress_indicator.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_popup_menu.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_sliver_app_bar.dart';
@ -30,7 +31,7 @@ class InstallerView extends StatelessWidget {
                ),
                actions: <Widget>[
                  Visibility(
-                    visible: !model.isPatching && model.hasErrors,
+                    visible: !model.isPatching && !model.hasErrors,
                    child: CustomPopupMenu(
                      onSelected: (value) => model.onMenuSelection(value),
                      children: {
@ -57,14 +58,9 @@ class InstallerView extends StatelessWidget {
                  ),
                ],
                bottom: PreferredSize(
-                  preferredSize: const Size(double.infinity, 1.0),
-                  child: LinearProgressIndicator(
-                    color: Theme.of(context).colorScheme.primary,
-                    backgroundColor:
-                        Theme.of(context).colorScheme.primaryContainer,
-                    value: model.progress,
-                  ),
-                ),
+                    preferredSize: const Size(double.infinity, 1.0),
+                    child:
+                        GradientProgressIndicator(progress: model.progress!)),
              ),
              SliverPadding(
                padding: const EdgeInsets.all(20.0),
--- a/lib/ui/views/installer/installer_viewmodel.dart
+++ b/lib/ui/views/installer/installer_viewmodel.dart
@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_background/flutter_background.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
+//import 'package:permission_handler/permission_handler.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/models/patched_application.dart';
@ -29,29 +30,31 @@ class InstallerViewModel extends BaseViewModel {
  bool hasErrors = false;

  Future<void> initialize(BuildContext context) async {
-    try {
-      await FlutterBackground.initialize(
-        androidConfig: FlutterBackgroundAndroidConfig(
-          notificationTitle: FlutterI18n.translate(
-            context,
-            'installerView.notificationTitle',
+    if (true /*await Permission.ignoreBatteryOptimizations.isGranted*/) {
+      try {
+        await FlutterBackground.initialize(
+          androidConfig: FlutterBackgroundAndroidConfig(
+            notificationTitle: FlutterI18n.translate(
+              context,
+              'installerView.notificationTitle',
+            ),
+            notificationText: FlutterI18n.translate(
+              context,
+              'installerView.notificationText',
+            ),
+            notificationImportance: AndroidNotificationImportance.Default,
+            notificationIcon: const AndroidResource(
+              name: 'ic_notification',
+              defType: 'drawable',
+            ),
          ),
-          notificationText: FlutterI18n.translate(
-            context,
-            'installerView.notificationText',
-          ),
-          notificationImportance: AndroidNotificationImportance.Default,
-          notificationIcon: const AndroidResource(
-            name: 'ic_notification',
-            defType: 'drawable',
-          ),
-        ),
-      );
-      await FlutterBackground.enableBackgroundExecution();
-      await Wakelock.enable();
-    } on Exception {
-      // ignore
+        );
+        await FlutterBackground.enableBackgroundExecution();
+      } on Exception {
+        // ignore
+      }
    }
+    await Wakelock.enable();
    await handlePlatformChannelMethods();
    await runPatcher();
  }
@ -119,12 +122,14 @@ class InstallerViewModel extends BaseViewModel {
      hasErrors = true;
      update(-1.0, 'Aborting...', 'No app or patches selected! Aborting');
    }
-    try {
-      await FlutterBackground.disableBackgroundExecution();
-      await Wakelock.disable();
-    } on Exception {
-      // ignore
+    if (true /*await Permission.ignoreBatteryOptimizations.isGranted*/) {
+      try {
+        await FlutterBackground.disableBackgroundExecution();
+      } on Exception {
+        // ignore
+      }
    }
+    await Wakelock.disable();
    isPatching = false;
  }

@ -142,6 +147,13 @@ class InstallerViewModel extends BaseViewModel {
      update(1.0, 'Installed!', 'Installed!');
      _app.patchDate = DateTime.now();
      _app.appliedPatches = _patches.map((p) => p.name).toList();
+      bool hasMicroG = _patches.any((p) => p.name.endsWith('microg-support'));
+      if (hasMicroG) {
+        _app.packageName = _app.packageName.replaceFirst(
+          'com.google.',
+          'app.revanced.',
+        );
+      }
      await _managerAPI.savePatchedApp(_app);
    }
  }
--- a/lib/ui/views/navigation/navigation_view.dart
+++ b/lib/ui/views/navigation/navigation_view.dart
@ -11,6 +11,7 @@ class NavigationView extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return ViewModelBuilder<NavigationViewModel>.reactive(
+      onModelReady: (model) => model.initialize(context),
      viewModelBuilder: () => locator<NavigationViewModel>(),
      builder: (context, model, child) => Scaffold(
        body: PageTransitionSwitcher(
@ -41,6 +42,7 @@ class NavigationView extends StatelessWidget {
                context,
                'navigationView.dashboardTab',
              ),
+              tooltip: '',
            ),
            NavigationDestination(
              icon: model.isIndexSelected(1)
@ -50,6 +52,7 @@ class NavigationView extends StatelessWidget {
                context,
                'navigationView.patcherTab',
              ),
+              tooltip: '',
            ),
            NavigationDestination(
              icon: model.isIndexSelected(2)
@ -59,6 +62,7 @@ class NavigationView extends StatelessWidget {
                context,
                'navigationView.settingsTab',
              ),
+              tooltip: '',
            ),
          ],
        ),
--- a/lib/ui/views/navigation/navigation_viewmodel.dart
+++ b/lib/ui/views/navigation/navigation_viewmodel.dart
@ -1,12 +1,44 @@
+// ignore_for_file: use_build_context_synchronously
+import 'package:dynamic_themes/dynamic_themes.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:injectable/injectable.dart';
+//import 'package:permission_handler/permission_handler.dart';
+import 'package:revanced_manager/services/root_api.dart';
 import 'package:revanced_manager/ui/views/home/home_view.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_view.dart';
 import 'package:revanced_manager/ui/views/settings/settings_view.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 import 'package:stacked/stacked.dart';

@lazySingleton
 class NavigationViewModel extends IndexTrackingViewModel {
+  void initialize(BuildContext context) async {
+    SharedPreferences prefs = await SharedPreferences.getInstance();
+    if (prefs.getBool('useDarkTheme') == null) {
+      bool isDark =
+          MediaQuery.of(context).platformBrightness != Brightness.light;
+      await prefs.setBool('useDarkTheme', isDark);
+      await DynamicTheme.of(context)!.setTheme(isDark ? 1 : 0);
+    }
+    SystemChrome.setSystemUIOverlayStyle(
+      SystemUiOverlayStyle(
+        systemNavigationBarColor:
+            DynamicTheme.of(context)!.theme.colorScheme.surface,
+        systemNavigationBarIconBrightness:
+            DynamicTheme.of(context)!.theme.brightness == Brightness.light
+                ? Brightness.dark
+                : Brightness.light,
+      ),
+    );
+    //if (prefs.getBool('permissionsRequested') == null) {
+    //await prefs.setBool('permissionsRequested', true);
+    RootAPI().hasRootPermissions();
+    //Permission.requestInstallPackages.request();
+    //Permission.ignoreBatteryOptimizations.request();
+    //}
+  }
+
  Widget getViewForIndex(int index) {
    switch (index) {
      case 0:
--- a/lib/ui/views/patcher/patcher_view.dart
+++ b/lib/ui/views/patcher/patcher_view.dart
@ -22,7 +22,7 @@ class PatcherView extends StatelessWidget {
          child: FloatingActionButton.extended(
            label: I18nText('patcherView.patchButton'),
            icon: const Icon(Icons.build),
-            onPressed: () => model.navigateToInstaller(),
+            onPressed: () => model.showPatchConfirmationDialog(context),
          ),
        ),
        body: CustomScrollView(
--- a/lib/ui/views/patcher/patcher_viewmodel.dart
+++ b/lib/ui/views/patcher/patcher_viewmodel.dart
@ -1,14 +1,20 @@
+import 'package:device_apps/device_apps.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:injectable/injectable.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/app/app.router.dart';
 import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/models/patched_application.dart';
+import 'package:revanced_manager/services/patcher_api.dart';
+import 'package:revanced_manager/ui/widgets/installerView/custom_material_button.dart';
 import 'package:stacked/stacked.dart';
 import 'package:stacked_services/stacked_services.dart';

@lazySingleton
 class PatcherViewModel extends BaseViewModel {
  final NavigationService _navigationService = locator<NavigationService>();
+  final PatcherAPI _patcherAPI = locator<PatcherAPI>();
  PatchedApplication? selectedApp;
  List<Patch> selectedPatches = [];

@ -31,4 +37,46 @@ class PatcherViewModel extends BaseViewModel {
  bool dimPatchesCard() {
    return selectedApp == null;
  }
+
+  Future<bool> isValidPatchConfig() async {
+    bool needsResourcePatching =
+        await _patcherAPI.needsResourcePatching(selectedPatches);
+    if (needsResourcePatching && selectedApp != null) {
+      Application? app = await DeviceApps.getApp(selectedApp!.packageName);
+      if (app != null && app.isSplit) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  Future<void> showPatchConfirmationDialog(BuildContext context) async {
+    bool isValid = await isValidPatchConfig();
+    if (isValid) {
+      navigateToInstaller();
+    } else {
+      return showDialog(
+        context: context,
+        builder: (context) => AlertDialog(
+          title: I18nText('patcherView.patchDialogTitle'),
+          backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+          content: I18nText('patcherView.patchDialogText'),
+          actions: <Widget>[
+            CustomMaterialButton(
+              isFilled: false,
+              label: I18nText('cancelButton'),
+              onPressed: () => Navigator.of(context).pop(),
+            ),
+            CustomMaterialButton(
+              label: I18nText('okButton'),
+              onPressed: () {
+                Navigator.of(context).pop();
+                navigateToInstaller();
+              },
+            )
+          ],
+        ),
+      );
+    }
+  }
 }
--- a/lib/ui/views/patches_selector/patches_selector_view.dart
+++ b/lib/ui/views/patches_selector/patches_selector_view.dart
@ -55,9 +55,16 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                const SizedBox(height: 12),
                Expanded(
                  child: model.patches.isEmpty
-                      ? Center(
-                          child: CircularProgressIndicator(
-                            color: Theme.of(context).colorScheme.primary,
+                      ? Padding(
+                          padding: const EdgeInsets.all(8.0),
+                          child: Center(
+                            child: I18nText(
+                              'patchesSelectorView.noPatchesFound',
+                              child: Text(
+                                '',
+                                style: Theme.of(context).textTheme.bodyMedium,
+                              ),
+                            ),
                          ),
                        )
                      : ListView(
--- a/lib/ui/views/settings/settings_viewmodel.dart
+++ b/lib/ui/views/settings/settings_viewmodel.dart
@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:dynamic_themes/dynamic_themes.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:logcat/logcat.dart';
 import 'package:path_provider/path_provider.dart';
@ -50,10 +51,16 @@ class SettingsViewModel extends BaseViewModel {
    await _managerAPI.setUseDynamicTheme(value);
    int currentTheme = DynamicTheme.of(context)!.themeId;
    if (currentTheme.isEven) {
-      DynamicTheme.of(context)!.setTheme(value ? 2 : 0);
+      await DynamicTheme.of(context)!.setTheme(value ? 2 : 0);
    } else {
-      DynamicTheme.of(context)!.setTheme(value ? 3 : 1);
+      await DynamicTheme.of(context)!.setTheme(value ? 3 : 1);
    }
+    SystemChrome.setSystemUIOverlayStyle(
+      SystemUiOverlayStyle(
+        systemNavigationBarColor:
+            DynamicTheme.of(context)!.theme.colorScheme.surface,
+      ),
+    );
    notifyListeners();
  }

@ -65,10 +72,18 @@ class SettingsViewModel extends BaseViewModel {
    await _managerAPI.setUseDarkTheme(value);
    int currentTheme = DynamicTheme.of(context)!.themeId;
    if (currentTheme < 2) {
-      DynamicTheme.of(context)!.setTheme(value ? 1 : 0);
+      await DynamicTheme.of(context)!.setTheme(value ? 1 : 0);
    } else {
-      DynamicTheme.of(context)!.setTheme(value ? 3 : 2);
+      await DynamicTheme.of(context)!.setTheme(value ? 3 : 2);
    }
+    SystemChrome.setSystemUIOverlayStyle(
+      SystemUiOverlayStyle(
+        systemNavigationBarColor:
+            DynamicTheme.of(context)!.theme.colorScheme.surface,
+        systemNavigationBarIconBrightness:
+            value ? Brightness.light : Brightness.dark,
+      ),
+    );
    notifyListeners();
  }

--- a/lib/ui/widgets/appInfoView/app_info_view.dart
+++ b/lib/ui/widgets/appInfoView/app_info_view.dart
@ -96,8 +96,11 @@ class AppInfoView extends StatelessWidget {
                              color: Theme.of(context).canvasColor,
                            ),
                            InkWell(
-                              onTap: () =>
-                                  model.showUninstallAlertDialog(context, app),
+                              onTap: () => model.showUninstallAlertDialog(
+                                context,
+                                app,
+                                false,
+                              ),
                              child: Column(
                                mainAxisAlignment: MainAxisAlignment.center,
                                children: <Widget>[
@ -154,6 +157,45 @@ class AppInfoView extends StatelessWidget {
                                ],
                              ),
                            ),
+                            Visibility(
+                              visible: app.isRooted,
+                              child: VerticalDivider(
+                                color: Theme.of(context).canvasColor,
+                              ),
+                            ),
+                            Visibility(
+                              visible: app.isRooted,
+                              child: InkWell(
+                                onTap: () => model.showUninstallAlertDialog(
+                                  context,
+                                  app,
+                                  true,
+                                ),
+                                child: Column(
+                                  mainAxisAlignment: MainAxisAlignment.center,
+                                  children: <Widget>[
+                                    Icon(
+                                      Icons.settings_backup_restore_outlined,
+                                      color:
+                                          Theme.of(context).colorScheme.primary,
+                                    ),
+                                    const SizedBox(height: 10),
+                                    I18nText(
+                                      'appInfoView.unpatchButton',
+                                      child: Text(
+                                        '',
+                                        style: TextStyle(
+                                          color: Theme.of(context)
+                                              .colorScheme
+                                              .primary,
+                                          fontWeight: FontWeight.bold,
+                                        ),
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                              ),
+                            ),
                          ],
                        ),
                      ),
--- a/lib/ui/widgets/appInfoView/app_info_viewmodel.dart
+++ b/lib/ui/widgets/appInfoView/app_info_viewmodel.dart
@ -19,12 +19,15 @@ class AppInfoViewModel extends BaseViewModel {
  final PatcherAPI _patcherAPI = locator<PatcherAPI>();
  final RootAPI _rootAPI = RootAPI();

-  Future<void> uninstallApp(PatchedApplication app) async {
+  Future<void> uninstallApp(PatchedApplication app, bool onlyUnpatch) async {
    if (app.isRooted) {
      bool hasRootPermissions = await _rootAPI.hasRootPermissions();
      if (hasRootPermissions) {
        _rootAPI.deleteApp(app.packageName, app.apkFilePath);
        _managerAPI.deletePatchedApp(app);
+        if (!onlyUnpatch) {
+          DeviceApps.uninstallApp(app.packageName);
+        }
      }
    } else {
      DeviceApps.uninstallApp(app.packageName);
@ -43,32 +46,39 @@ class AppInfoViewModel extends BaseViewModel {
  Future<void> showUninstallAlertDialog(
    BuildContext context,
    PatchedApplication app,
+    bool onlyUnpatch,
  ) async {
-    if (app.isRooted) {
-      bool hasRootPermissions = await _rootAPI.hasRootPermissions();
-      if (!hasRootPermissions) {
-        return showDialog(
-          context: context,
-          builder: (context) => AlertDialog(
-            title: I18nText('appInfoView.rootDialogTitle'),
-            backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-            content: I18nText('appInfoView.rootDialogText'),
-            actions: <Widget>[
-              CustomMaterialButton(
-                label: I18nText('okButton'),
-                onPressed: () => Navigator.of(context).pop(),
-              )
-            ],
-          ),
-        );
-      }
+    bool hasRootPermissions = await _rootAPI.hasRootPermissions();
+    if (app.isRooted && !hasRootPermissions) {
+      return showDialog(
+        context: context,
+        builder: (context) => AlertDialog(
+          title: I18nText('appInfoView.rootDialogTitle'),
+          backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+          content: I18nText('appInfoView.rootDialogText'),
+          actions: <Widget>[
+            CustomMaterialButton(
+              label: I18nText('okButton'),
+              onPressed: () => Navigator.of(context).pop(),
+            )
+          ],
+        ),
+      );
    } else {
      return showDialog(
        context: context,
        builder: (context) => AlertDialog(
-          title: I18nText('appInfoView.uninstallDialogTitle'),
+          title: I18nText(
+            onlyUnpatch
+                ? 'appInfoView.unpatchDialogTitle'
+                : 'appInfoView.uninstallDialogTitle',
+          ),
          backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-          content: I18nText('appInfoView.uninstallDialogText'),
+          content: I18nText(
+            onlyUnpatch
+                ? 'appInfoView.unpatchDialogText'
+                : 'appInfoView.uninstallDialogText',
+          ),
          actions: <Widget>[
            CustomMaterialButton(
              isFilled: false,
@ -78,7 +88,7 @@ class AppInfoViewModel extends BaseViewModel {
            CustomMaterialButton(
              label: I18nText('okButton'),
              onPressed: () {
-                uninstallApp(app);
+                uninstallApp(app, onlyUnpatch);
                locator<HomeViewModel>().initialize(context);
                Navigator.of(context).pop();
                Navigator.of(context).pop();
--- a/lib/ui/widgets/homeView/latest_commit_card.dart
+++ b/lib/ui/widgets/homeView/latest_commit_card.dart
@ -71,7 +71,7 @@ class _LatestCommitCardState extends State<LatestCommitCard> {
            future: locator<HomeViewModel>().hasManagerUpdates(),
            initialData: false,
            builder: (context, snapshot) => Opacity(
-              opacity: snapshot.hasData && snapshot.data! ? 1.0 : 0.5,
+              opacity: snapshot.hasData && snapshot.data! ? 1.0 : 0.25,
              child: CustomMaterialButton(
                isExpanded: false,
                label: I18nText('latestCommitCard.updateButton'),
--- a/lib/ui/widgets/installerView/gradient_progress_indicator.dart
+++ b/lib/ui/widgets/installerView/gradient_progress_indicator.dart
@ -0,0 +1,32 @@
+import 'package:flutter/material.dart';
+
+class GradientProgressIndicator extends StatefulWidget {
+  final double? progress;
+  const GradientProgressIndicator({required this.progress, super.key});
+
+  @override
+  State<GradientProgressIndicator> createState() =>
+      _GradientProgressIndicatorState();
+}
+
+class _GradientProgressIndicatorState extends State<GradientProgressIndicator> {
+  @override
+  Widget build(BuildContext context) {
+    return Align(
+      alignment: Alignment.centerLeft,
+      child: AnimatedContainer(
+        duration: const Duration(milliseconds: 500),
+        decoration: BoxDecoration(
+          gradient: LinearGradient(
+            colors: [
+              Theme.of(context).colorScheme.primary,
+              Theme.of(context).colorScheme.secondary,
+            ],
+          ),
+        ),
+        height: 5,
+        width: MediaQuery.of(context).size.width * widget.progress!,
+      ),
+    );
+  }
+}
--- a/lib/ui/widgets/settingsView/about_widget.dart
+++ b/lib/ui/widgets/settingsView/about_widget.dart
@ -61,6 +61,13 @@ class _AboutWidgetState extends State<AboutWidget> {
                          fontWeight: FontWeight.w300,
                        ),
                      ),
+                      Text(
+                        'Build: ${snapshot.data!['flavor']}',
+                        style: const TextStyle(
+                          fontSize: 13,
+                          fontWeight: FontWeight.w300,
+                        ),
+                      ),
                      Text(
                        'Model: ${snapshot.data!['model']}',
                        style: const TextStyle(
--- a/lib/ui/widgets/shared/application_item.dart
+++ b/lib/ui/widgets/shared/application_item.dart
@ -6,7 +6,7 @@ import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 import 'package:expandable/expandable.dart';
 import 'package:timeago/timeago.dart';

-class ApplicationItem extends StatelessWidget {
+class ApplicationItem extends StatefulWidget {
  final Uint8List icon;
  final String name;
  final DateTime patchDate;
@ -24,10 +24,39 @@ class ApplicationItem extends StatelessWidget {
    required this.onPressed,
  }) : super(key: key);

+  @override
+  State<ApplicationItem> createState() => _ApplicationItemState();
+}
+
+class _ApplicationItemState extends State<ApplicationItem>
+    with TickerProviderStateMixin {
+  late AnimationController _animationController;
+
+  @override
+  initState() {
+    super.initState();
+    _animationController = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 300),
+    );
+  }
+
+  @override
+  void dispose() {
+    _animationController.dispose();
+    super.dispose();
+  }
+
  @override
  Widget build(BuildContext context) {
+    ExpandableController expController = ExpandableController();
    return ExpandablePanel(
+      controller: expController,
      theme: const ExpandableThemeData(
+        inkWellBorderRadius: BorderRadius.all(Radius.circular(16)),
+        tapBodyToCollapse: false,
+        tapBodyToExpand: false,
+        tapHeaderToExpand: false,
        hasIcon: false,
        animationDuration: Duration(milliseconds: 450),
      ),
@ -35,33 +64,54 @@ class ApplicationItem extends StatelessWidget {
        child: Row(
          children: <Widget>[
            SizedBox(
-              width: 60,
-              child: Image.memory(icon, height: 39, width: 39),
+              width: 40,
+              child: Image.memory(widget.icon, height: 40, width: 40),
            ),
            const SizedBox(width: 4),
-            Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: <Widget>[
-                Text(
-                  name,
-                  style: const TextStyle(
-                    fontSize: 16,
-                    fontWeight: FontWeight.w500,
+            Padding(
+              padding: const EdgeInsets.only(left: 15.0),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: <Widget>[
+                  Text(
+                    widget.name.length > 10
+                        ? '${widget.name.substring(0, 10)}...'
+                        : widget.name,
+                    style: const TextStyle(
+                      fontSize: 16,
+                      fontWeight: FontWeight.w500,
+                    ),
                  ),
-                ),
-                Text(format(patchDate)),
-              ],
+                  Text(format(widget.patchDate)),
+                ],
+              ),
            ),
            const Spacer(),
+            Padding(
+              padding: const EdgeInsets.only(right: 5.0),
+              child: RotationTransition(
+                turns:
+                    Tween(begin: 0.0, end: 0.50).animate(_animationController),
+                child: IconButton(
+                  onPressed: () {
+                    expController.toggle();
+                    _animationController.isCompleted
+                        ? _animationController.reverse()
+                        : _animationController.forward();
+                  },
+                  icon: const Icon(Icons.arrow_drop_down),
+                ),
+              ),
+            ),
            Column(
              mainAxisAlignment: MainAxisAlignment.center,
              crossAxisAlignment: CrossAxisAlignment.end,
              children: <Widget>[
                CustomMaterialButton(
-                  label: isUpdatableApp
+                  label: widget.isUpdatableApp
                      ? I18nText('applicationItem.patchButton')
                      : I18nText('applicationItem.infoButton'),
-                  onPressed: onPressed,
+                  onPressed: widget.onPressed,
                ),
              ],
            ),
@ -70,7 +120,7 @@ class ApplicationItem extends StatelessWidget {
      ),
      collapsed: const Text(''),
      expanded: Padding(
-        padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0),
+        padding: const EdgeInsets.symmetric(vertical: 16.0, horizontal: 16.0),
        child: Column(
          crossAxisAlignment: CrossAxisAlignment.start,
          children: <Widget>[
@ -82,7 +132,7 @@ class ApplicationItem extends StatelessWidget {
              ),
            ),
            const SizedBox(height: 4),
-            Text('\u2022 ${changelog.join('\n\u2022 ')}'),
+            Text('\u2022 ${widget.changelog.join('\n\u2022 ')}'),
          ],
        ),
      ),
--- a/lib/ui/widgets/shared/custom_card.dart
+++ b/lib/ui/widgets/shared/custom_card.dart
@ -16,7 +16,7 @@ class CustomCard extends StatelessWidget {
      decoration: BoxDecoration(
        borderRadius: BorderRadius.circular(16),
        color: isFilled
-            ? Theme.of(context).colorScheme.secondaryContainer
+            ? Theme.of(context).colorScheme.secondaryContainer.withOpacity(0.40)
            : Colors.transparent,
        border: isFilled
            ? null
--- a/lib/ui/widgets/shared/custom_chip.dart
+++ b/lib/ui/widgets/shared/custom_chip.dart
@ -22,7 +22,7 @@ class DashboardChip extends StatelessWidget {
            color: isSelected
                ? Theme.of(context).colorScheme.primary
                : Theme.of(context).colorScheme.secondary,
-            fontWeight: FontWeight.bold,
+            fontWeight: FontWeight.w500,
          ),
      backgroundColor: Colors.transparent,
      selectedColor: Theme.of(context).colorScheme.secondaryContainer,
--- a/lib/utils/about_info.dart
+++ b/lib/utils/about_info.dart
@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:device_info_plus/device_info_plus.dart';

@ -7,6 +8,7 @@ class AboutInfo {
    final info = await DeviceInfoPlugin().androidInfo;
    return {
      'version': packageInfo.version,
+      'flavor': kReleaseMode ? 'release' : 'debug',
      'model': info.model,
      'androidVersion': info.version.release,
      'arch': info.supportedAbis.first
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -4,7 +4,7 @@ homepage: https://github.com/revanced/revanced-manager

 publish_to: 'none'

-version: 0.0.3+3
+version: 0.0.9+9

 environment:
  sdk: ">=2.17.5 <3.0.0"
@ -17,14 +17,17 @@ dependencies:
  device_apps:
    git:
      url: https://github.com/ponces/flutter_plugin_device_apps
-      ref: appinfo-from-storage
+      ref: revanced-manager
  device_info_plus: ^4.1.2
  dio: ^4.0.6
  dio_http_cache_lts: ^0.4.1
  dynamic_color: ^1.5.4
  dynamic_themes: ^1.1.0
  expandable: ^5.0.1
-  file_picker: ^5.0.1
+  file_picker:
+    git:
+      url: https://github.com/alexmercerind/flutter_file_picker
+      ref: master
  flex_color_scheme: ^6.0.0
  flutter:
    sdk: flutter
@ -49,6 +52,7 @@ dependencies:
      ref: feature/nullSafe
  package_info_plus: ^1.4.3+1
  path_provider: ^2.0.11
+  #permission_handler: ^10.0.0
  pull_to_refresh: ^2.0.0
  root: ^2.0.2
  share_extend: ^2.0.0
Author	SHA1	Message	Date
Alberto Ponces	6bd218277d	build: Bump version to v0.0.9	2022-09-17 19:40:44 +01:00
Alberto Ponces	83ad7605c4	fix: Minor improvements on App Info view	2022-09-17 19:30:04 +01:00
Alberto Ponces	5fbc8ff7a0	feat: Retrieve unsaved apps from manager's root folder and known packages from user's apps list	2022-09-17 19:29:46 +01:00
Alberto Ponces	bb4b59eee6	Disable `permission_handler` package for now	2022-09-17 17:42:29 +01:00
Aunali321	4cfb620d63	build: Bump version to v0.0.8.	2022-09-17 20:58:19 +05:30
Aunali321	55739a9c78	fix: background should be more opaque.	2022-09-17 20:56:44 +05:30
Alberto Ponces	482599bb4e	fix: Do not import `dart:html`	2022-09-17 14:59:23 +01:00
Alberto Ponces	3aaf49fee0	fix: Only init foreground service if user allowed IGNORE_BATTERY_OPTIMIZATIONS permission	2022-09-17 14:55:00 +01:00
Alberto Ponces	0424ee235c	build: Bump patcher dependency version	2022-09-17 14:51:09 +01:00
Alberto Ponces	a178afce99	fix: Fix typo on menu options visibility	2022-09-17 14:47:03 +01:00
Alberto Ponces	ef3685c817	fix: Add Unpatch option on App Info view	2022-09-17 14:45:43 +01:00
Alberto Ponces	e74fce8574	Merge branch 'flutter' of github.com:revanced/revanced-manager into flutter	2022-09-17 14:42:58 +01:00
Aunali321	73e4ae1416	build: restrict manager to android 8.	2022-09-17 16:14:24 +03:00
afnzmn	bcf3b36b13	feat: tweak UI	2022-09-17 16:13:41 +03:00
Alberto Ponces	9c3626c8ed	fix: Request permissions a single time at boot	2022-09-16 17:29:32 +01:00
Alberto Ponces	a3dca8c142	fix: Add build mode to about widget	2022-09-16 16:39:57 +01:00
Alberto Ponces	ef0c59f693	fix: Surround isRooted with a try/catch just to be safe	2022-09-16 16:39:37 +01:00
Aunali321	31756884b6	build: Bump version to v0.0.7.	2022-09-16 03:48:23 +05:30
Aunali321	0a2a495ab0	feat: custom animated progressbar.	2022-09-16 03:46:46 +05:30
Aunali321	8300cc4071	feat: dropdown for changelogs.	2022-09-16 00:49:11 +05:30
Alberto Ponces	9f58757caf	feat: Apply dark/light mode to system navigation bar too	2022-09-15 13:27:48 +01:00
Alberto Ponces	5d296038b7	fix: Increase API's maxAge to 1 day	2022-09-15 12:33:19 +01:00
Alberto Ponces	9f85450c6c	build: Bump version to v0.0.6	2022-09-15 09:14:43 +01:00
Alberto Ponces	cba4e175a3	build: Bump version to v0.0.5	2022-09-15 02:27:36 +01:00
Alberto Ponces	cf3fa935ce	fix: Fix select from storage for Android 13 devices	2022-09-15 02:18:07 +01:00
Alberto Ponces	6de7e2e098	build: Bump version to v0.0.4	2022-09-15 01:34:53 +01:00
Alberto Ponces	30d9b5f6fe	fix: These foreground icons are more appropriate for each dpi size	2022-09-15 01:30:14 +01:00
Alberto Ponces	ec31667591	feat: Add a warning for split APK patching for now	2022-09-15 01:15:13 +01:00
Alberto Ponces	a82b0cd74d	fix: Request IGNORE_BATTERY_OPTIMIZATIONS on boot	2022-09-15 00:57:54 +01:00
Alberto Ponces	34e67d396f	fix: Remove unneeded WRITE_EXTERNAL_STORAGE and limit READ_EXTERNAL_STORAGE to SDK versions lower than 33	2022-09-15 00:54:51 +01:00
Alberto Ponces	cdb492910c	fix: Update package name if MicroG was applied	2022-09-14 23:40:08 +01:00
Alberto Ponces	9f3a30d9f2	feat: Request root and install permissions as soon as possible	2022-09-14 23:30:02 +01:00
Alberto Ponces	598f7571de	feat: Auto dark mode based on system theme	2022-09-14 23:23:03 +01:00
Sculas	85cd176347	chore: exclude aapt prebuilt (from apktool)	2022-09-14 23:22:18 +02:00
Sculas	2f78af7f08	refactor: more cleanup	2022-09-14 23:16:48 +02:00
Sculas	a4b5fc4796	chore: update dependencies	2022-09-14 23:16:33 +02:00
Sculas	a0a0d0a939	Merge remote-tracking branch 'origin/flutter' into flutter	2022-09-14 23:09:31 +02:00
Sculas	eef9c2bf31	refactor: cleanup code & fix warnings	2022-09-14 23:09:18 +02:00
Sculas	84813d34c6	refactor: move classes to flutter pkg	2022-09-14 23:05:47 +02:00
Sculas	aad7e06f2e	chore: update gradle	2022-09-14 23:03:15 +02:00