Merge branch 'compose-dev' into feat/haptic-compose

# Conflicts:
#	app/src/main/java/app/revanced/manager/domain/manager/base/BasePreferencesManager.kt
#	app/src/main/java/app/revanced/manager/ui/component/bundle/BaseBundleDialog.kt
#	app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
#	app/src/main/java/app/revanced/manager/ui/screen/PatcherScreen.kt
#	app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt
#	app/src/main/java/app/revanced/manager/ui/screen/SelectedAppInfoScreen.kt
#	app/src/main/java/app/revanced/manager/ui/screen/settings/AdvancedSettingsScreen.kt
#	app/src/main/java/app/revanced/manager/ui/viewmodel/DashboardViewModel.kt

Author: Ushie

.github/workflows/pr-build.yml

@@ -24,7 +24,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Build with Gradle
         env:

.github/workflows/release-build.yml

@@ -21,7 +21,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Build with Gradle
         env:

app/build.gradle.kts

@@ -191,6 +191,10 @@ dependencies {
     // Scrollbars
     implementation(libs.scrollbars)
 
+    // EnumUtil
+    implementation(libs.enumutil)
+    ksp(libs.enumutil.ksp)
+    
     // Reorderable lists
     implementation(libs.reorderable)
 

app/schemas/app.revanced.manager.data.room.AppDatabase/1.json

@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 1,
-    "identityHash": "c0c780e55e10c9b095c004733c846b67",
+    "identityHash": "1dd9d5c0201fdf3cfef3ae669fd65e46",
     "entities": [
       {
         "tableName": "patch_bundles",
@@ -51,17 +51,7 @@
             "uid"
           ]
         },
-        "indices": [
-          {
-            "name": "index_patch_bundles_name",
-            "unique": true,
-            "columnNames": [
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_patch_bundles_name` ON `${TABLE_NAME}` (`name`)"
-          }
-        ],
+        "indices": [],
         "foreignKeys": []
       },
       {
@@ -407,7 +397,7 @@
     "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'c0c780e55e10c9b095c004733c846b67')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '1dd9d5c0201fdf3cfef3ae669fd65e46')"
     ]
   }
 }

app/src/main/java/app/revanced/manager/data/platform/Filesystem.kt

@@ -1,10 +1,11 @@
 package app.revanced.manager.data.platform
 
+import android.Manifest
 import android.app.Application
+import android.content.Context
+import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Environment
-import android.Manifest
-import android.content.pm.PackageManager
 import androidx.activity.result.contract.ActivityResultContract
 import androidx.activity.result.contract.ActivityResultContracts
 import app.revanced.manager.util.RequestManageStorageContract
@@ -16,7 +17,7 @@ class Filesystem(private val app: Application) {
      * A directory that gets cleared when the app restarts.
      * Do not store paths to this directory in a parcel.
      */
-    val tempDir = app.cacheDir.resolve("ephemeral").apply {
+    val tempDir = app.getDir("ephemeral", Context.MODE_PRIVATE).apply {
         deleteRecursively()
         mkdirs()
     }

app/src/main/java/app/revanced/manager/data/room/apps/installed/InstalledApp.kt

@@ -9,7 +9,7 @@ import kotlinx.parcelize.Parcelize
 
 enum class InstallType(val stringResource: Int) {
     DEFAULT(R.string.default_install),
-    ROOT(R.string.root_install)
+    MOUNT(R.string.mount_install)
 }
 
 @Parcelize

app/src/main/java/app/revanced/manager/data/room/bundles/PatchBundleEntity.kt

@@ -21,7 +21,7 @@ sealed class Source {
     }
 
     companion object {
-        fun from(value: String) = when(value) {
+        fun from(value: String) = when (value) {
             Local.SENTINEL -> Local
             API.SENTINEL -> API
             else -> Remote(Url(value))
@@ -34,7 +34,7 @@ data class VersionInfo(
     @ColumnInfo(name = "integrations_version") val integrations: String? = null,
 )
 
-@Entity(tableName = "patch_bundles", indices = [Index(value = ["name"], unique = true)])
+@Entity(tableName = "patch_bundles")
 data class PatchBundleEntity(
     @PrimaryKey val uid: Int,
     @ColumnInfo(name = "name") val name: String,

app/src/main/java/app/revanced/manager/domain/installer/RootInstaller.kt

@@ -43,7 +43,7 @@ class RootInstaller(
             }
         }
 
-        return withTimeoutOrNull(Duration.ofSeconds(120L)) {
+        return withTimeoutOrNull(Duration.ofSeconds(20L)) {
             remoteFS.await()
         } ?: throw RootServiceException()
     }
@@ -58,6 +58,10 @@ class RootInstaller(
 
     fun hasRootAccess() = Shell.isAppGrantedRoot() ?: false
 
+    fun isDeviceRooted() = System.getenv("PATH")?.split(":")?.any { path ->
+        File(path, "su").canExecute()
+    } ?: false
+
     suspend fun isAppInstalled(packageName: String) =
         awaitRemoteFS().getFile("$modulesPath/$packageName-revanced").exists()
 

app/src/main/java/app/revanced/manager/domain/manager/PreferencesManager.kt

@@ -23,6 +23,7 @@ class PreferencesManager(
 
     val firstLaunch = booleanPreference("first_launch", true)
     val managerAutoUpdates = booleanPreference("manager_auto_updates", false)
+    val showManagerUpdateDialogOnLaunch = booleanPreference("show_manager_update_dialog_on_launch", true)
 
     val disablePatchVersionCompatCheck = booleanPreference("disable_patch_version_compatibility_check", false)
     val disableSelectionWarning = booleanPreference("disable_selection_warning", false)

app/src/main/java/app/revanced/manager/domain/manager/base/BasePreferencesManager.kt

@@ -70,7 +70,7 @@ class EditorContext(
 
 abstract class Preference<T>(
     private val dataStore: DataStore<Preferences>,
-    protected val default: T,
+    val default: T,
 ) {
     internal abstract fun Preferences.read(): T