diff --git a/android/app/build.gradle b/android/app/build.gradle index 6e022e5d..e6663b0b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -43,7 +43,7 @@ android { } defaultConfig { - applicationId "app.revanced.manager" + applicationId "app.revanced.manager.flutter" minSdkVersion 21 targetSdkVersion 33 versionCode flutterVersionCode.toInteger() diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index b75b409f..2abfc8e9 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,4 +1,4 @@ + package="app.revanced.manager.flutter"> diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index d12578ef..5d889eab 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="app.revanced.manager.flutter"> diff --git a/android/app/src/main/kotlin/app/revanced/manager/MainActivity.kt b/android/app/src/main/kotlin/app/revanced/manager/MainActivity.kt index 99112cd9..5d17103c 100644 --- a/android/app/src/main/kotlin/app/revanced/manager/MainActivity.kt +++ b/android/app/src/main/kotlin/app/revanced/manager/MainActivity.kt @@ -1,13 +1,13 @@ -package app.revanced.manager +package app.revanced.manager.flutter import android.os.Handler import android.os.Looper import androidx.annotation.NonNull -import app.revanced.manager.utils.Aapt -import app.revanced.manager.utils.aligning.ZipAligner -import app.revanced.manager.utils.signing.Signer -import app.revanced.manager.utils.zip.ZipFile -import app.revanced.manager.utils.zip.structures.ZipEntry +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 @@ -22,8 +22,8 @@ import java.nio.file.Files import java.nio.file.StandardCopyOption class MainActivity : FlutterActivity() { - private val PATCHER_CHANNEL = "app.revanced.manager/patcher" - private val INSTALLER_CHANNEL = "app.revanced.manager/installer" + 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 diff --git a/android/app/src/main/kotlin/app/revanced/manager/utils/Aapt.kt b/android/app/src/main/kotlin/app/revanced/manager/utils/Aapt.kt index 2e680e1c..10c80dea 100644 --- a/android/app/src/main/kotlin/app/revanced/manager/utils/Aapt.kt +++ b/android/app/src/main/kotlin/app/revanced/manager/utils/Aapt.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.utils +package app.revanced.manager.flutter.utils import android.content.Context import java.io.File diff --git a/android/app/src/main/kotlin/app/revanced/manager/utils/aligning/ZipAligner.kt b/android/app/src/main/kotlin/app/revanced/manager/utils/aligning/ZipAligner.kt index af4e51da..088aad59 100644 --- a/android/app/src/main/kotlin/app/revanced/manager/utils/aligning/ZipAligner.kt +++ b/android/app/src/main/kotlin/app/revanced/manager/utils/aligning/ZipAligner.kt @@ -1,6 +1,6 @@ -package app.revanced.manager.utils.aligning +package app.revanced.manager.flutter.utils.aligning -import app.revanced.manager.utils.zip.structures.ZipEntry +import app.revanced.manager.flutter.utils.zip.structures.ZipEntry internal object ZipAligner { private const val DEFAULT_ALIGNMENT = 4 diff --git a/android/app/src/main/kotlin/app/revanced/manager/utils/signing/Signer.kt b/android/app/src/main/kotlin/app/revanced/manager/utils/signing/Signer.kt index 7438b1e5..1e1a08a2 100644 --- a/android/app/src/main/kotlin/app/revanced/manager/utils/signing/Signer.kt +++ b/android/app/src/main/kotlin/app/revanced/manager/utils/signing/Signer.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.utils.signing +package app.revanced.manager.flutter.utils.signing import com.android.apksig.ApkSigner import org.bouncycastle.asn1.x500.X500Name diff --git a/android/app/src/main/kotlin/app/revanced/manager/utils/zip/Extensions.kt b/android/app/src/main/kotlin/app/revanced/manager/utils/zip/Extensions.kt index 8be66822..2898d79d 100644 --- a/android/app/src/main/kotlin/app/revanced/manager/utils/zip/Extensions.kt +++ b/android/app/src/main/kotlin/app/revanced/manager/utils/zip/Extensions.kt @@ -1,4 +1,4 @@ -package app.revanced.manager.utils.zip +package app.revanced.manager.flutter.utils.zip import java.io.DataInput import java.io.DataOutput diff --git a/android/app/src/main/kotlin/app/revanced/manager/utils/zip/ZipFile.kt b/android/app/src/main/kotlin/app/revanced/manager/utils/zip/ZipFile.kt index 5b8c5f8e..1bf76960 100644 --- a/android/app/src/main/kotlin/app/revanced/manager/utils/zip/ZipFile.kt +++ b/android/app/src/main/kotlin/app/revanced/manager/utils/zip/ZipFile.kt @@ -1,7 +1,7 @@ -package app.revanced.manager.utils.zip +package app.revanced.manager.flutter.utils.zip -import app.revanced.manager.utils.zip.structures.ZipEndRecord -import app.revanced.manager.utils.zip.structures.ZipEntry +import app.revanced.manager.flutter.utils.zip.structures.ZipEndRecord +import app.revanced.manager.flutter.utils.zip.structures.ZipEntry import java.io.Closeable import java.io.File import java.io.RandomAccessFile diff --git a/android/app/src/main/kotlin/app/revanced/manager/utils/zip/structures/ZipEndRecord.kt b/android/app/src/main/kotlin/app/revanced/manager/utils/zip/structures/ZipEndRecord.kt index 9e4ff65d..e7b9b58e 100644 --- a/android/app/src/main/kotlin/app/revanced/manager/utils/zip/structures/ZipEndRecord.kt +++ b/android/app/src/main/kotlin/app/revanced/manager/utils/zip/structures/ZipEndRecord.kt @@ -1,9 +1,9 @@ -package app.revanced.manager.utils.zip.structures +package app.revanced.manager.flutter.utils.zip.structures -import app.revanced.manager.utils.zip.putUInt -import app.revanced.manager.utils.zip.putUShort -import app.revanced.manager.utils.zip.readUIntLE -import app.revanced.manager.utils.zip.readUShortLE +import app.revanced.manager.flutter.utils.zip.putUInt +import app.revanced.manager.flutter.utils.zip.putUShort +import app.revanced.manager.flutter.utils.zip.readUIntLE +import app.revanced.manager.flutter.utils.zip.readUShortLE import java.io.DataInput import java.nio.ByteBuffer import java.nio.ByteOrder diff --git a/android/app/src/main/kotlin/app/revanced/manager/utils/zip/structures/ZipEntry.kt b/android/app/src/main/kotlin/app/revanced/manager/utils/zip/structures/ZipEntry.kt index 51a24ebf..53f4dfda 100644 --- a/android/app/src/main/kotlin/app/revanced/manager/utils/zip/structures/ZipEntry.kt +++ b/android/app/src/main/kotlin/app/revanced/manager/utils/zip/structures/ZipEntry.kt @@ -1,6 +1,6 @@ -package app.revanced.manager.utils.zip.structures +package app.revanced.manager.flutter.utils.zip.structures -import app.revanced.manager.utils.zip.* +import app.revanced.manager.flutter.utils.zip.* import java.io.DataInput import java.nio.ByteBuffer import java.nio.ByteOrder diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml index b75b409f..2abfc8e9 100644 --- a/android/app/src/profile/AndroidManifest.xml +++ b/android/app/src/profile/AndroidManifest.xml @@ -1,4 +1,4 @@ + package="app.revanced.manager.flutter"> diff --git a/lib/services/patcher_api.dart b/lib/services/patcher_api.dart index 1bed078c..c2dc8823 100644 --- a/lib/services/patcher_api.dart +++ b/lib/services/patcher_api.dart @@ -14,7 +14,8 @@ import 'package:share_extend/share_extend.dart'; @lazySingleton class PatcherAPI { - static const patcherChannel = MethodChannel('app.revanced.manager/patcher'); + static const patcherChannel = + MethodChannel('app.revanced.manager.flutter/patcher'); final ManagerAPI _managerAPI = locator(); final RootAPI _rootAPI = RootAPI(); late Directory _tmpDir; diff --git a/lib/ui/views/home/home_viewmodel.dart b/lib/ui/views/home/home_viewmodel.dart index 737fa446..303eba20 100644 --- a/lib/ui/views/home/home_viewmodel.dart +++ b/lib/ui/views/home/home_viewmodel.dart @@ -34,7 +34,8 @@ class HomeViewModel extends BaseViewModel { const InitializationSettings( android: AndroidInitializationSettings('ic_notification'), ), - onSelectNotification: (p) => DeviceApps.openApp('app.revanced.manager'), + onSelectNotification: (p) => + DeviceApps.openApp('app.revanced.manager.flutter'), ); _getPatchedApps(); _managerAPI.reAssessSavedApps().then((_) => _getPatchedApps()); diff --git a/lib/ui/views/installer/installer_viewmodel.dart b/lib/ui/views/installer/installer_viewmodel.dart index a75f3c22..e3e7c5ff 100644 --- a/lib/ui/views/installer/installer_viewmodel.dart +++ b/lib/ui/views/installer/installer_viewmodel.dart @@ -17,7 +17,7 @@ class InstallerViewModel extends BaseViewModel { final PatchedApplication _app = locator().selectedApp!; final List _patches = locator().selectedPatches; static const _installerChannel = MethodChannel( - 'app.revanced.manager/installer', + 'app.revanced.manager.flutter/installer', ); final ScrollController scrollController = ScrollController(); double? progress = 0.0;