Merge remote-tracking branch 'origin/main'

.gitignore

@@ -4,11 +4,10 @@
 *.hprof
 .gradle
 .idea
-app/src/main/assets
+src/main/assets
 assets
 build/
-app/build
 local.properties
-app/src/main/jniLibs/
+src/main/jniLibs/
 release/
-app/neo/
+neo/

CHANGELOG.md

@@ -1,6 +1,41 @@
 CHANGELOG
 =========
 
+8.3.7 (24.07.2024) +100 Commits & +20 Translations
+------------
+
+#### Function
+
+- Add: Zstd compression option
+- Fix: Crash on after giving permissions
+- Fix: Reduce many unneeded recompositions
+- Fix: Showing restore-preferences in backup page
+- Fix: App sheet and context menu actions respect user
+- Fix: Profile handling for pm commands
+- Fix: Work profile support
+- Fix: StorageFile related crash
+- Fix: StorageFile duplication if renaming to the same name
+- Update: Split excludeCache to backupCache, restoreCache
+- Update: Rebase SwitchChip on segmented buttons
+- Update: Migrate most sheets to scaffold
+- Update: Restore directories without owner
+
+#### UI & UX
+
+- Add: Respecting tags & notes when searching
+- Add: Tags filter for schedules
+- Add: Notes to backups
+- Add: Button to search for uninstalled app in store
+- Add: Original text to error for better reinterpretation
+- Add: Share button to terminal text
+- Add: Option for alternative page blocks layout
+- Fix: Alternative navigation bar item
+- Update: Backup items' layout info
+- Update: OAndBackup-attribution icon
+- Update: Revamp Batch actions bar
+- Update: Revamp coloring of UI
+- Update: Revamp dialog layouts
+
 8.3.6 (12.01.2024) 6 Commits
 ------------
 

build.gradle.kts

@@ -33,12 +33,12 @@ android {
         applicationId = "com.machiav3lli.backup"
         minSdk = 26
         targetSdk = 34
-        versionCode = 8316
-        versionName = "8.3.6"
+        versionCode = 8317
+        versionName = "8.3.7"
         buildConfigField("int", "MAJOR", "8")
         buildConfigField("int", "MINOR", "3")
 
-        testApplicationId = "${applicationId}.tests"
+        testApplicationId = "$applicationId.tests"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
         javaCompileOptions {
@@ -50,7 +50,6 @@ android {
                 }
             }
         }
-
     }
 
     applicationVariants.all { variant ->
@@ -65,9 +64,8 @@ android {
         named("release") {
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
             )
-            //versionNameSuffix = "-alpha01"
             isMinifyEnabled = true
         }
         named("debug") {
@@ -79,13 +77,12 @@ android {
             isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
             )
         }
     }
     buildFeatures {
         buildConfig = true
-        dataBinding = true
         compose = true
     }
     compileOptions {
@@ -106,18 +103,28 @@ android {
         includeInBundle = false
     }
     packaging {
-        resources.excludes.add("META-INF/LICENSE.md")
-        resources.excludes.add("META-INF/LICENSE-notice.md")
+        resources {
+            excludes += listOf(
+                "/DebugProbesKt.bin",
+                "/kotlin/**.kotlin_builtins",
+                "/kotlin/**.kotlin_metadata",
+                "/META-INF/**.kotlin_module",
+                "/META-INF/**.pro",
+                "/META-INF/**.version",     // comment out to enable layout inspector
+                "/META-INF/LICENSE-notice.md",
+                "/META-INF/LICENSE.md"
+            )
+        }
     }
 }
 
 dependencies {
     implementation(libs.kotlin.stdlib)
-    //implementation(kotlin("reflect", vKotlin))
     implementation(libs.ksp)
 
     // Libs
     implementation(libs.activity.compose)
+    implementation(libs.collections.immutable)
     implementation(libs.room.runtime)
     implementation(libs.room.ktx)
     ksp(libs.room.compiler)
@@ -131,7 +138,7 @@ dependencies {
     implementation(libs.security.crypto)
     implementation(libs.commons.io)
     implementation(libs.commons.compress)
-    implementation(libs.zstd.jni)
+    implementation(variantOf(libs.zstd.jni) { artifactType("aar") })
     implementation(libs.timber)
     implementation(libs.semver)
     implementation(libs.libsu.core)
@@ -150,10 +157,7 @@ dependencies {
     implementation(libs.compose.material3)
     implementation(libs.compose.animation)
     implementation(libs.compose.navigation)
-    //implementation("androidx.compose.ui:ui-tooling:$vCompose")
-    //implementation("androidx.compose.runtime:runtime-livedata:$vCompose")
     implementation(libs.coil.compose)
-    //implementation("com.google.accompanist:accompanist-systemuicontroller:$vAccompanist")
     implementation(libs.accompanist.permissions)
 
     // Testing
@@ -169,21 +173,20 @@ dependencies {
     debugImplementation(libs.compose.ui.test.manifest)
 }
 
-//TODO: how to do this with ksp?
-//kapt {
-//    correctErrorTypes = true
-//}
-
 // using a task as a preBuild dependency instead of a function that takes some time insures that it runs
 task("detectAndroidLocals") {
     val langsList: MutableSet<String> = HashSet()
 
     // in /res are (almost) all languages that have a translated string is saved. this is safer and saves some time
     fileTree("src/main/res").visit {
-        if (this.file.path.endsWith("strings.xml")
-            && this.file.canonicalFile.readText().contains("<string")
+        if (this.file.path.endsWith("strings.xml") &&
+            this.file.canonicalFile
+                .readText()
+                .contains("<string")
         ) {
-            var languageCode = this.file.parentFile.name.replace("values-", "")
+            var languageCode =
+                this.file.parentFile.name
+                    .replace("values-", "")
             languageCode = if (languageCode == "values") "en" else languageCode
             langsList.add(languageCode)
         }
@@ -194,7 +197,7 @@ task("detectAndroidLocals") {
 tasks.preBuild.dependsOn("detectAndroidLocals")
 
 tasks.withType<Test> {
-    useJUnit()          // we still use junit4
-    //useTestNG()
-    //useJUnitPlatform()
+    useJUnit() // we still use junit4
+    // useTestNG()
+    // useJUnitPlatform()
 }

fastlane/metadata/android/en-US/changelogs/8317.txt

@@ -0,0 +1,7 @@
+Add: Zstd compression option
+Add: Tags support to schedules
+Add: Respecting tags & notes when searching
+Add: Button to search for uninstalled app in store
+Fix: Work profile support
+Update: OAndBackup-attribution icon
++ more than 100 commits and 20 translation contributions

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 activity = "1.9.0"
 agp = "8.5.1"
 biometric = "1.2.0-alpha05"
-coil = "2.6.0"
+coil = "2.7.0"
 commons-compress = "1.26.2"
 commons-io = "2.16.1"
 compose = "1.6.8"
@@ -16,7 +16,7 @@ kaml = "0.60.0"
 koin = "3.5.6"
 koin-ksp = "1.3.1"
 kotlin = "2.0.0"
-ksp = "2.0.0-1.0.22"
+ksp = "2.0.0-1.0.23"
 libsu = "5.2.2"
 lifecycle = "2.8.3"
 material = "1.12.0"
@@ -31,7 +31,7 @@ test-rules = "1.6.1"
 test-ext = "1.2.1"
 timber = "5.0.1"
 work = "2.9.0"
-zstd-Jni = "1.5.6-3"
+zstd-jni = "1.5.6-4"
 
 [libraries]
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
@@ -56,7 +56,7 @@ kaml = { module = "com.charleskorn.kaml:kaml", version.ref = "kaml" }
 security-crypto = { module = "androidx.security:security-crypto-ktx", version.ref = "security" }
 commons-io = { module = "commons-io:commons-io", version.ref = "commons-io" }
 commons-compress = { module = "org.apache.commons:commons-compress", version.ref = "commons-compress" }
-zstd-jni = { module = "com.github.luben:zstd-jni", version.ref = "zstd-Jni" }
+zstd-jni = { module = "com.github.luben:zstd-jni", version.ref = "zstd-jni" }
 timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }
 semver = { module = "de.voize:semver4k", version.ref = "semver" }