Merge branch 'compose-dev' into social-links

.github/workflows/release-build.yml

@@ -0,0 +1,43 @@
+name: Release Build
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set env
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+
+      - name: Set up Java
+        run: echo "JAVA_HOME=$JAVA_HOME_17_X64" >> $GITHUB_ENV
+
+      - name: Build with Gradle
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./gradlew assembleRelease --no-daemon
+
+      - name: Sign APK
+        id: sign_apk
+        uses: ilharp/sign-android-release@v1
+        with:
+          releaseDir: ./app/build/outputs/apk/release/
+          signingKey: ${{ secrets.SIGNING_KEYSTORE }}
+          keyStorePassword: ${{ secrets.SIGNING_KEYSTORE_PASSWORD }}
+          keyAlias: ${{ secrets.SIGNING_KEY_ALIAS }}
+          keyPassword: ${{ secrets.SIGNING_KEY_PASSWORD }}
+
+      - name: Add version to APK
+        run: mv ${{ steps.sign_apk.outputs.signedFile }} revanced-manager-${{ env.RELEASE_VERSION }}.apk
+
+      - name: Publish release APK
+        uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          prerelease: false
+          files: revanced-manager-${{ env.RELEASE_VERSION }}.apk

.github/workflows/update-documentation.yml

@@ -0,0 +1,19 @@
+name: Update documentation
+
+on:
+  push:
+    paths:
+      - docs/**
+
+jobs:
+  trigger:
+    runs-on: ubuntu-latest
+    name: Dispatch event to documentation repository
+    if: github.ref == 'refs/heads/main'
+    steps:
+      - uses: peter-evans/repository-dispatch@v2
+        with:
+          token: ${{ secrets.DOCUMENTATION_REPO_ACCESS_TOKEN  }}
+          repository: revanced/revanced-documentation
+          event-type: update-documentation
+          client-payload: '{"repo": "${{ github.event.repository.name }}", "ref": "${{ github.ref }}"}'

.gitignore

@@ -1,15 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-/.idea/deploymentTargetDropDown.xml
-/.idea/misc.xml
-/.idea/gradle.xml
+/.idea
 .DS_Store
 /build
 /captures

README.md

@@ -32,3 +32,24 @@ By using Material 3 and Material You, we are ensuring that the app's user interf
 * **Better performance:** Jetpack Compose uses the power of the Android framework to provide smooth and fast performance, which enhances the user experience.
 * **Modern and efficient UI development:** Jetpack Compose provides a modern and efficient way of building UI, which makes it easier for developers to create beautiful and performant user interfaces.
 
+## 🔽 Download
+
+You can obtain ReVanced Manager by downloading it from either [revanced.app/download](https://revanced.app/download) or [GitHub Releases](https://github.com/ReVanced/revanced-manager/releases)
+
+## 📝 Prerequisites
+
+For a list of prerequisites, refer to [docs/0_prerequisites.md](docs/0_prerequisites.md)
+
+## 🔴 Issues
+
+For suggestions and bug reports, open an issue [here](https://github.com/revanced/revanced-manager/issues/new/choose).
+
+## 🌐 Translation
+
+[![Crowdin](https://badges.crowdin.net/revanced/localized.svg)](https://crowdin.com/project/revanced)
+
+We're accepting translations on [Crowdin](https://translate.revanced.app)
+
+## 🛠️ Building Manager from source
+
+For instructions on how to build ReVanced Manager from source, refer to [docs/4_building.md](docs/4_building.md)

app/build.gradle.kts

@@ -131,11 +131,8 @@ dependencies {
     ksp(libs.room.compiler)
 
     // ReVanced
-    implementation(libs.patcher)
-
-    // Signing
-    implementation(libs.apksign)
-    implementation(libs.bcpkix.jdk18on)
+    implementation(libs.revanced.patcher)
+    implementation(libs.revanced.library)
 
     implementation(libs.libsu.core)
     implementation(libs.libsu.service)

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

@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 1,
-    "identityHash": "5515d164bc8f713201506d42a02d337f",
+    "identityHash": "371c7a84b122a2de8b660b35e6e9ce14",
     "entities": [
       {
         "tableName": "patch_bundles",
@@ -160,7 +160,7 @@
       },
       {
         "tableName": "downloaded_app",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`package_name` TEXT NOT NULL, `version` TEXT NOT NULL, `file` TEXT NOT NULL, PRIMARY KEY(`package_name`, `version`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`package_name` TEXT NOT NULL, `version` TEXT NOT NULL, `directory` TEXT NOT NULL, PRIMARY KEY(`package_name`, `version`))",
         "fields": [
           {
             "fieldPath": "packageName",
@@ -175,8 +175,8 @@
             "notNull": true
           },
           {
-            "fieldPath": "file",
-            "columnName": "file",
+            "fieldPath": "directory",
+            "columnName": "directory",
             "affinity": "TEXT",
             "notNull": true
           }
@@ -300,7 +300,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, '5515d164bc8f713201506d42a02d337f')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '371c7a84b122a2de8b660b35e6e9ce14')"
     ]
   }
 }

app/src/main/java/app/revanced/manager/MainActivity.kt

@@ -1,24 +1,36 @@
 package app.revanced.manager
 
+import android.content.ActivityNotFoundException
+import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import androidx.activity.ComponentActivity
+import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.compose.setContent
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import app.revanced.manager.ui.component.AutoUpdatesDialog
 import app.revanced.manager.ui.destination.Destination
 import app.revanced.manager.ui.screen.AppInfoScreen
-import app.revanced.manager.ui.screen.VersionSelectorScreen
 import app.revanced.manager.ui.screen.AppSelectorScreen
 import app.revanced.manager.ui.screen.DashboardScreen
 import app.revanced.manager.ui.screen.InstallerScreen
 import app.revanced.manager.ui.screen.PatchesSelectorScreen
 import app.revanced.manager.ui.screen.SettingsScreen
+import app.revanced.manager.ui.screen.VersionSelectorScreen
 import app.revanced.manager.ui.theme.ReVancedManagerTheme
 import app.revanced.manager.ui.theme.Theme
 import app.revanced.manager.ui.viewmodel.MainViewModel
+import app.revanced.manager.util.tag
+import app.revanced.manager.util.toast
 import dev.olshevski.navigation.reimagined.AnimatedNavHost
 import dev.olshevski.navigation.reimagined.NavBackHandler
 import dev.olshevski.navigation.reimagined.navigate
@@ -51,9 +63,48 @@ class MainActivity : ComponentActivity() {
 
                 NavBackHandler(navController)
 
-                val showAutoUpdatesDialog by vm.prefs.showAutoUpdatesDialog.getAsState()
-                if (showAutoUpdatesDialog) {
-                    AutoUpdatesDialog(vm::applyAutoUpdatePrefs)
+                val firstLaunch by vm.prefs.firstLaunch.getAsState()
+
+                if (firstLaunch) {
+                    var legacyActivityState by rememberSaveable { mutableStateOf(LegacyActivity.NOT_LAUNCHED) }
+                    if (legacyActivityState == LegacyActivity.NOT_LAUNCHED) {
+                        val launcher = rememberLauncherForActivityResult(
+                            contract = ActivityResultContracts.StartActivityForResult()
+                        ) { result: ActivityResult ->
+                            if (result.resultCode == RESULT_OK) {
+                                if (result.data != null) {
+                                    val jsonData = result.data!!.getStringExtra("data")!!
+                                    vm.applyLegacySettings(jsonData)
+                                }
+                            } else {
+                                legacyActivityState = LegacyActivity.FAILED
+                                toast(getString(R.string.legacy_import_failed))
+                            }
+                        }
+
+                        val intent = Intent().apply {
+                            setClassName(
+                                "app.revanced.manager.flutter",
+                                "app.revanced.manager.flutter.ExportSettingsActivity"
+                            )
+                        }
+
+                        LaunchedEffect(Unit) {
+                            try {
+                                launcher.launch(intent)
+                            } catch (e: Exception) {
+                                if (e !is ActivityNotFoundException) {
+                                    toast(getString(R.string.legacy_import_failed))
+                                    Log.e(tag, "Failed to launch legacy import activity: $e")
+                                }
+                                legacyActivityState = LegacyActivity.FAILED
+                            }
+                        }
+
+                        legacyActivityState = LegacyActivity.LAUNCHED
+                    } else if (legacyActivityState == LegacyActivity.FAILED){
+                        AutoUpdatesDialog(vm::applyAutoUpdatePrefs)
+                    }
                 }
 
                 AnimatedNavHost(
@@ -120,4 +171,10 @@ class MainActivity : ComponentActivity() {
             }
         }
     }
-}
+
+    private enum class LegacyActivity {
+        NOT_LAUNCHED,
+        LAUNCHED,
+        FAILED
+    }
+}

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

@@ -9,9 +9,18 @@ import androidx.activity.result.contract.ActivityResultContract
 import androidx.activity.result.contract.ActivityResultContracts
 import app.revanced.manager.util.RequestManageStorageContract
 
-class FileSystem(private val app: Application) {
+class Filesystem(private val app: Application) {
     val contentResolver = app.contentResolver // TODO: move Content Resolver operations to here.
 
+    /**
+     * 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 {
+        deleteRecursively()
+        mkdirs()
+    }
+
     fun externalFilesDir() = Environment.getExternalStorageDirectory().toPath()
 
     private fun usesManagePermission() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R