From 5cb296eebf979440825c3523d047f66d477602ac Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 27 May 2024 03:36:08 +0000
Subject: [PATCH 001/236] Update dependency com.airbnb.android:lottie-compose
 to v6.4.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f68ee7349c..4a41214428 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -54,7 +54,7 @@ immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7"
 uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0"
 okhttp = "com.squareup.okhttp3:okhttp:4.12.0"
 review = "com.google.android.play:review-ktx:2.0.1"
-lottie = "com.airbnb.android:lottie-compose:6.4.0"
+lottie = "com.airbnb.android:lottie-compose:6.4.1"
 clikt = "com.github.ajalt.clikt:clikt:4.4.0"
 
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }

From e15b7ecfb4d484275f19933d8b7f72c51f44a2ef Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 28 May 2024 19:42:36 +0000
Subject: [PATCH 002/236] Update dependency app.cash.molecule:molecule-runtime
 to v2

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4a41214428..624a863b63 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -49,7 +49,7 @@ seismic = "com.squareup:seismic:1.0.3"
 viewBinding = { module = "androidx.databinding:viewbinding", version.ref = "agp" }
 appStartup = "androidx.startup:startup-runtime:1.1.1"
 turbine = "app.cash.turbine:turbine:1.1.0"
-molecule = "app.cash.molecule:molecule-runtime:1.4.3"
+molecule = "app.cash.molecule:molecule-runtime:2.0.0"
 immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7"
 uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0"
 okhttp = "com.squareup.okhttp3:okhttp:4.12.0"

From c3ef6e50a5069245368ab39a8eda0de49a6bd430 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 29 May 2024 18:33:21 +0000
Subject: [PATCH 003/236] Update dependency
 androidx.lifecycle:lifecycle-runtime-ktx to v2.8.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 624a863b63..7b1e58e065 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -100,7 +100,7 @@ media3-session = { module = "androidx.media3:media3-session", version.ref = "med
 media3-testUtils-core = { module = "androidx.media3:media3-test-utils", version.ref = "media3" }
 media3-testUtils-robolectric = { module = "androidx.media3:media3-test-utils-robolectric", version.ref = "media3" }
 
-lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.0"
+lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.1"
 
 compose-bom = "androidx.compose:compose-bom:2024.05.00"
 compose-ui-ui = { module = "androidx.compose.ui:ui" }

From d37748d098398dc6f98539fde2ff0ea815a60345 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 29 May 2024 18:33:25 +0000
Subject: [PATCH 004/236] Update dependency androidx.appcompat:appcompat to
 v1.7.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7b1e58e065..7c5c7d5a44 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -35,7 +35,7 @@ retrofit-scalars = { module = "com.squareup.retrofit2:converter-scalars", versio
 retrofit-serialization = { module = "com.squareup.retrofit2:converter-kotlinx-serialization", version.ref = "retrofit" }
 robolectric = "org.robolectric:robolectric:4.12.2"
 coil = "io.coil-kt:coil-compose:2.6.0"
-appCompat = "androidx.appcompat:appcompat:1.6.1"
+appCompat = "androidx.appcompat:appcompat:1.7.0"
 constraintLayout = "androidx.constraintlayout:constraintlayout:2.1.4"
 recyclerView = "androidx.recyclerview:recyclerview:1.3.2"
 androidxCore = "androidx.core:core-ktx:1.13.1"

From e040ee95d0d60c2ae9493dc0760fd3d2ffe8b40a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 30 May 2024 16:08:38 +0000
Subject: [PATCH 005/236] Update plugin googleServices to v4.4.2

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7c5c7d5a44..bfd019ff7c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -166,7 +166,7 @@ anvil = { id = "com.squareup.anvil", version = "2.4.9-1-8" }
 ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
 ksp = { id = "com.google.devtools.ksp", version = "1.9.24-1.0.20" }
 crashlytics = { id = "com.google.firebase.crashlytics", version = "3.0.1" }
-googleServices = { id = "com.google.gms.google-services", version = "4.4.1" }
+googleServices = { id = "com.google.gms.google-services", version = "4.4.2" }
 playPublish = { id = "com.github.triplet.play", version = "3.9.1" }
 android-app = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }

From 94f7471b0ffb271d6759d708a990c02838509577 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 30 May 2024 20:03:10 +0000
Subject: [PATCH 006/236] Update dependency com.google.firebase:firebase-bom to
 v33.1.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bfd019ff7c..d8b5529974 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -62,7 +62,7 @@ coroutines-guava = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-guava",
 coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
 coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
 
-firebase-bom = "com.google.firebase:firebase-bom:33.0.0"
+firebase-bom = "com.google.firebase:firebase-bom:33.1.0"
 firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics-ktx" }
 firebase-analytics = { module = "com.google.firebase:firebase-analytics-ktx" }
 firebase-remoteconfig = { module = "com.google.firebase:firebase-config-ktx" }

From 9708e4507156c0ba2e2f961c84acfa999f92e680 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 1 Jun 2024 00:23:49 +0000
Subject: [PATCH 007/236] Update dependency gradle to v8.8

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 gradlew                                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e7646dead0..6f7a6eb33e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 1aa94a4269..b740cf1339 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

From f02034e783962d6f41b2a92a6d6ef20c15c662b6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 6 Jun 2024 15:17:51 +0000
Subject: [PATCH 008/236] Update dependency io.kotest:kotest-assertions-core to
 v5.9.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d8b5529974..f97d27436c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -43,7 +43,7 @@ kotlin-pluginForGradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin",
 kotlin-compilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }
 desugar = "com.android.tools:desugar_jdk_libs:2.0.4"
 documentFile = "androidx.documentfile:documentfile:1.0.1"
-koTest-assert = "io.kotest:kotest-assertions-core:5.9.0"
+koTest-assert = "io.kotest:kotest-assertions-core:5.9.1"
 datastore = "androidx.datastore:datastore-preferences:1.1.1"
 seismic = "com.squareup:seismic:1.0.3"
 viewBinding = { module = "androidx.databinding:viewbinding", version.ref = "agp" }

From eb37f648054fde12cc4bb0f2e2ef1b4d9677da70 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 6 Jun 2024 18:51:07 +0000
Subject: [PATCH 009/236] Update Kotlin, Compose, KSP to v2

---
 gradle/libs.versions.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f97d27436c..15dd2b9ece 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ room = "2.6.1"
 prefs = "1.0.1"
 materialDialog = "3.3.0"
 dagger = "2.51.1"
-kotlin = "1.9.24"
+kotlin = "2.0.0"
 compose-compiler = "1.5.14"
 media3 = "1.3.1"
 agp = "8.4.1"
@@ -164,7 +164,7 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 anvil = { id = "com.squareup.anvil", version = "2.4.9-1-8" }
 ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
-ksp = { id = "com.google.devtools.ksp", version = "1.9.24-1.0.20" }
+ksp = { id = "com.google.devtools.ksp", version = "2.0.0-1.0.22" }
 crashlytics = { id = "com.google.firebase.crashlytics", version = "3.0.1" }
 googleServices = { id = "com.google.gms.google-services", version = "4.4.2" }
 playPublish = { id = "com.github.triplet.play", version = "3.9.1" }

From 13fe025363c8c87b065d915fdcfcc50171978979 Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Fri, 7 Jun 2024 19:45:03 +0200
Subject: [PATCH 010/236] Adjust for kotlin 2

---
 .gitignore                               |  1 +
 .idea/inspectionProfiles/ktlint.xml      |  2 ++
 build.gradle.kts                         |  1 +
 gradle/libs.versions.toml                |  5 ++---
 plugins/src/main/kotlin/ComposePlugin.kt | 12 ++++-------
 plugins/src/main/kotlin/baseSetup.kt     | 27 +++++++++++++-----------
 renovate.json                            |  3 +--
 7 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index e54e7872fc..6f317870c4 100755
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ Gemfile.lock
 releases
 .transifexrc
 /plugins/.idea/workspace.xml
+/.kotlin/sessions/kotlin-compiler-13421836681560975881.salive
diff --git a/.idea/inspectionProfiles/ktlint.xml b/.idea/inspectionProfiles/ktlint.xml
index 64d8f2eec1..867c7a6275 100644
--- a/.idea/inspectionProfiles/ktlint.xml
+++ b/.idea/inspectionProfiles/ktlint.xml
@@ -7,6 +7,7 @@
     </inspection_tool>
     <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
@@ -14,6 +15,7 @@
     </inspection_tool>
     <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
diff --git a/build.gradle.kts b/build.gradle.kts
index 89a68958f9..e21c1daf2c 100755
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
   alias(libs.plugins.kotlin.jvm) apply false
   alias(libs.plugins.android.app) apply false
   alias(libs.plugins.android.library) apply false
+  alias(libs.plugins.compose.compiler) apply false
   id("voice.ktlint")
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 15dd2b9ece..5d4b0eb42c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,7 +13,6 @@ prefs = "1.0.1"
 materialDialog = "3.3.0"
 dagger = "2.51.1"
 kotlin = "2.0.0"
-compose-compiler = "1.5.14"
 media3 = "1.3.1"
 agp = "8.4.1"
 ktlint-core = "1.2.1"
@@ -119,7 +118,6 @@ compose-material3 = { module = "androidx.compose.material3:material3" }
 compose-activity = "androidx.activity:activity-compose:1.9.0"
 compose-navigation = "dev.olshevski.navigation:reimagined:1.5.0"
 
-compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compose-compiler" }
 ktlint-core = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint-core" }
 ktlint-gradlePlugin = { module = "io.github.usefulness:ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
 ktlint-compose = "io.nlopez.compose.rules:ktlint:0.4.1"
@@ -162,7 +160,8 @@ retrofit = [
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-anvil = { id = "com.squareup.anvil", version = "2.4.9-1-8" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+anvil = { id = "com.squareup.anvil", version = "2.5.0-beta09" }
 ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
 ksp = { id = "com.google.devtools.ksp", version = "2.0.0-1.0.22" }
 crashlytics = { id = "com.google.firebase.crashlytics", version = "3.0.1" }
diff --git a/plugins/src/main/kotlin/ComposePlugin.kt b/plugins/src/main/kotlin/ComposePlugin.kt
index d52dbd8e3a..d33ab54d96 100644
--- a/plugins/src/main/kotlin/ComposePlugin.kt
+++ b/plugins/src/main/kotlin/ComposePlugin.kt
@@ -1,7 +1,6 @@
 @file:Suppress("UnstableApiUsage")
 
 import com.android.build.api.dsl.ApplicationExtension
-import com.android.build.api.dsl.CommonExtension
 import com.android.build.api.dsl.LibraryExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -15,24 +14,21 @@ class ComposePlugin : Plugin<Project> {
   override fun apply(target: Project) {
     target.pluginManager.withPlugin("com.android.application") {
       target.extensions.configure<ApplicationExtension> {
-        configureCompose(this, target)
+        configureCompose(target)
       }
     }
     target.pluginManager.withPlugin("com.android.library") {
       target.extensions.configure<LibraryExtension> {
-        configureCompose(this, target)
+        configureCompose(target)
       }
     }
   }
 
-  private fun configureCompose(extension: CommonExtension<*, *, *, *, *, *>, target: Project) {
+  private fun configureCompose(target: Project) {
     val libs = target.extensions.getByType(VersionCatalogsExtension::class.java).named("libs")
     target.dependencies.add("implementation", libs.findBundle("compose").get())
     target.dependencies.add("debugImplementation", libs.findLibrary("compose-ui-tooling-core").get())
-    extension.buildFeatures.compose = true
-    extension.composeOptions {
-      kotlinCompilerExtensionVersion = libs.findVersion("compose-compiler").get().requiredVersion
-    }
+    target.plugins.apply("org.jetbrains.kotlin.plugin.compose")
     target.tasks.withType<KotlinCompile> {
       kotlinOptions {
         freeCompilerArgs = freeCompilerArgs + listOf(
diff --git a/plugins/src/main/kotlin/baseSetup.kt b/plugins/src/main/kotlin/baseSetup.kt
index 0561b1536a..c39f28f248 100644
--- a/plugins/src/main/kotlin/baseSetup.kt
+++ b/plugins/src/main/kotlin/baseSetup.kt
@@ -6,25 +6,28 @@ import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.jvm.toolchain.JavaLanguageVersion
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 fun Project.baseSetup() {
   val libs: VersionCatalog = extensions.getByType(VersionCatalogsExtension::class.java).named("libs")
   tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions {
-      languageVersion = "1.9"
-      jvmTarget = JavaVersion.VERSION_11.toString()
-      val optIns = listOf(
-        "kotlin.RequiresOptIn",
-        "kotlin.ExperimentalStdlibApi",
-        "kotlin.contracts.ExperimentalContracts",
-        "kotlin.time.ExperimentalTime",
-        "kotlinx.coroutines.ExperimentalCoroutinesApi",
-        "kotlinx.coroutines.FlowPreview",
+    compilerOptions {
+      languageVersion.set(KotlinVersion.KOTLIN_1_9)
+      jvmTarget.set(JvmTarget.JVM_11)
+      optIn.addAll(
+        listOf(
+          "kotlin.RequiresOptIn",
+          "kotlin.ExperimentalStdlibApi",
+          "kotlin.contracts.ExperimentalContracts",
+          "kotlin.time.ExperimentalTime",
+          "kotlinx.coroutines.ExperimentalCoroutinesApi",
+          "kotlinx.coroutines.FlowPreview",
+        ),
       )
-      freeCompilerArgs = (freeCompilerArgs + listOf("-progressive") + optIns.map { "-opt-in=$it" })
-      allWarningsAsErrors = true
+      allWarningsAsErrors.set(true)
     }
   }
   extensions.configure<KotlinProjectExtension> {
diff --git a/renovate.json b/renovate.json
index e6883d6bf4..661282491e 100644
--- a/renovate.json
+++ b/renovate.json
@@ -14,9 +14,8 @@
       ]
     },
     {
-      "groupName": "Kotlin, Compose, KSP",
+      "groupName": "Kotlin, KSP",
       "matchPackagePrefixes": [
-        "androidx.compose.compiler:compiler",
         "org.jetbrains.kotlin:",
         "org.jetbrains.kotlin.",
         "com.google.devtools.ksp"

From acb665d91fed491e3dcdf385b6564590884c678e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 7 Jun 2024 18:29:22 +0000
Subject: [PATCH 011/236] Update dependency
 org.jetbrains.kotlinx:kotlinx-serialization-json to v1.7.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5d4b0eb42c..6caa40c5cb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -66,7 +66,7 @@ firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics-ktx"
 firebase-analytics = { module = "com.google.firebase:firebase-analytics-ktx" }
 firebase-remoteconfig = { module = "com.google.firebase:firebase-config-ktx" }
 
-serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3"
+serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0"
 
 room-runtime = { module = "androidx.room:room-ktx", version.ref = "room" }
 room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }

From f8b612ebe52d9ee7917283a8aa9819bdbe353750 Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@posteo.de>
Date: Fri, 7 Jun 2024 22:22:42 +0200
Subject: [PATCH 012/236] Remove Crashlytics and Play Services (#2439)

---
 .github/workflows/voice.yml                   |  1 -
 app/build.gradle.kts                          | 11 +-------
 gradle/libs.versions.toml                     |  7 ------
 logging/crashlytics/build.gradle.kts          |  8 ------
 .../crashlytics/src/main/AndroidManifest.xml  | 18 -------------
 .../crashlytics/CrashlyticsLogWriter.kt       | 25 -------------------
 .../CrashlyticsLogWriterInitializer.kt        | 15 -----------
 plugins/src/main/kotlin/baseSetup.kt          |  3 ---
 review/play/build.gradle.kts                  |  1 -
 .../main/kotlin/voice/review/ReviewModule.kt  |  6 -----
 .../voice/review/ShouldShowReviewDialog.kt    |  9 +------
 .../review/ShouldShowReviewDialogTest.kt      |  3 ---
 settings.gradle.kts                           |  1 -
 13 files changed, 2 insertions(+), 106 deletions(-)
 delete mode 100644 logging/crashlytics/build.gradle.kts
 delete mode 100644 logging/crashlytics/src/main/AndroidManifest.xml
 delete mode 100644 logging/crashlytics/src/main/kotlin/voice/logging/crashlytics/CrashlyticsLogWriter.kt
 delete mode 100644 logging/crashlytics/src/main/kotlin/voice/logging/crashlytics/CrashlyticsLogWriterInitializer.kt

diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index 70e48c4344..3c28aa9a9a 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -18,7 +18,6 @@ env:
   SIGNING_KEYSTORE_GITHUB: ${{ secrets.SIGNING_KEYSTORE_GITHUB }}
   SIGNING_PROPERTIES_GITHUB: ${{ secrets.SIGNING_PROPERTIES_GITHUB }}
   GOOGLE_SERVICES: ${{ secrets.GOOGLE_SERVICES }}
-  VOICE_USE_PROPRIETARY_LIBRARIES: "true"
 
 jobs:
   test:
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index dced576f14..dee022b3f8 100755
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -11,15 +11,9 @@ plugins {
   id("kotlin-kapt")
   alias(libs.plugins.kotlin.serialization)
   alias(libs.plugins.anvil)
-  alias(libs.plugins.crashlytics)
-  alias(libs.plugins.googleServices) apply false
   alias(libs.plugins.playPublish)
 }
 
-if (file("google-services.json").exists()) {
-  pluginManager.apply(libs.plugins.googleServices.get().pluginId)
-}
-
 play {
   defaultToAppBundles.value(true)
   val serviceAccountJson = file("play_service_account.json")
@@ -102,6 +96,7 @@ android {
     getByName("debug") {
       isMinifyEnabled = false
       isShrinkResources = false
+      applicationIdSuffix = ".debug"
     }
     all {
       setProguardFiles(
@@ -189,10 +184,6 @@ dependencies {
   implementation(libs.materialDialog.input)
   implementation(libs.coil)
 
-  "proprietaryImplementation"(libs.firebase.crashlytics)
-  "proprietaryImplementation"(libs.firebase.analytics)
-  "proprietaryImplementation"(libs.firebase.remoteconfig)
-  "proprietaryImplementation"(projects.logging.crashlytics)
   "proprietaryImplementation"(projects.review.play)
   "libreImplementation"(projects.review.noop)
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6caa40c5cb..6ef797e2a8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -61,11 +61,6 @@ coroutines-guava = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-guava",
 coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
 coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
 
-firebase-bom = "com.google.firebase:firebase-bom:33.1.0"
-firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics-ktx" }
-firebase-analytics = { module = "com.google.firebase:firebase-analytics-ktx" }
-firebase-remoteconfig = { module = "com.google.firebase:firebase-config-ktx" }
-
 serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0"
 
 room-runtime = { module = "androidx.room:room-ktx", version.ref = "room" }
@@ -164,8 +159,6 @@ compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "
 anvil = { id = "com.squareup.anvil", version = "2.5.0-beta09" }
 ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
 ksp = { id = "com.google.devtools.ksp", version = "2.0.0-1.0.22" }
-crashlytics = { id = "com.google.firebase.crashlytics", version = "3.0.1" }
-googleServices = { id = "com.google.gms.google-services", version = "4.4.2" }
 playPublish = { id = "com.github.triplet.play", version = "3.9.1" }
 android-app = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
diff --git a/logging/crashlytics/build.gradle.kts b/logging/crashlytics/build.gradle.kts
deleted file mode 100644
index 683225baa4..0000000000
--- a/logging/crashlytics/build.gradle.kts
+++ /dev/null
@@ -1,8 +0,0 @@
-plugins {
-  id("voice.library")
-}
-
-dependencies {
-  implementation(libs.appStartup)
-  implementation(libs.firebase.crashlytics)
-}
diff --git a/logging/crashlytics/src/main/AndroidManifest.xml b/logging/crashlytics/src/main/AndroidManifest.xml
deleted file mode 100644
index 605842fefc..0000000000
--- a/logging/crashlytics/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<manifest xmlns:tools="http://schemas.android.com/tools"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <application>
-
-    <provider
-      android:name="androidx.startup.InitializationProvider"
-      android:authorities="${applicationId}.androidx-startup"
-      android:exported="false"
-      tools:node="merge">
-
-      <meta-data
-        android:name="voice.logging.crashlytics.CrashlyticsLogWriterInitializer"
-        android:value="androidx.startup" />
-    </provider>
-
-  </application>
-</manifest>
diff --git a/logging/crashlytics/src/main/kotlin/voice/logging/crashlytics/CrashlyticsLogWriter.kt b/logging/crashlytics/src/main/kotlin/voice/logging/crashlytics/CrashlyticsLogWriter.kt
deleted file mode 100644
index 57c4a38e9b..0000000000
--- a/logging/crashlytics/src/main/kotlin/voice/logging/crashlytics/CrashlyticsLogWriter.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package voice.logging.crashlytics
-
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import voice.logging.core.LogWriter
-import voice.logging.core.Logger
-
-internal class CrashlyticsLogWriter : LogWriter {
-
-  private val crashlytics: FirebaseCrashlytics get() = FirebaseCrashlytics.getInstance()
-
-  override fun log(
-    severity: Logger.Severity,
-    message: String,
-    throwable: Throwable?,
-  ) {
-    if (severity <= Logger.Severity.Verbose) {
-      return
-    }
-
-    crashlytics.log(message)
-    if (severity >= Logger.Severity.Error) {
-      crashlytics.recordException(throwable ?: AssertionError(message))
-    }
-  }
-}
diff --git a/logging/crashlytics/src/main/kotlin/voice/logging/crashlytics/CrashlyticsLogWriterInitializer.kt b/logging/crashlytics/src/main/kotlin/voice/logging/crashlytics/CrashlyticsLogWriterInitializer.kt
deleted file mode 100644
index 3bc8787fb6..0000000000
--- a/logging/crashlytics/src/main/kotlin/voice/logging/crashlytics/CrashlyticsLogWriterInitializer.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package voice.logging.crashlytics
-
-import android.content.Context
-import androidx.startup.Initializer
-import voice.logging.core.Logger
-
-@Suppress("unused")
-class CrashlyticsLogWriterInitializer : Initializer<Unit> {
-
-  override fun create(context: Context) {
-    Logger.install(CrashlyticsLogWriter())
-  }
-
-  override fun dependencies(): List<Class<out Initializer<*>>> = emptyList()
-}
diff --git a/plugins/src/main/kotlin/baseSetup.kt b/plugins/src/main/kotlin/baseSetup.kt
index c39f28f248..b5d0059921 100644
--- a/plugins/src/main/kotlin/baseSetup.kt
+++ b/plugins/src/main/kotlin/baseSetup.kt
@@ -60,9 +60,6 @@ fun Project.baseSetup() {
       add("implementation", project(":logging:core"))
     }
     add("implementation", platform(libs.findLibrary("compose-bom").get()))
-    if (System.getenv("VOICE_USE_PROPRIETARY_LIBRARIES") == "true") {
-      add("implementation", platform(libs.findLibrary("firebase-bom").get()))
-    }
     add("androidTestImplementation", platform(libs.findLibrary("compose-bom").get()))
 
     listOf(
diff --git a/review/play/build.gradle.kts b/review/play/build.gradle.kts
index 6f13c6a585..80e86be3fc 100644
--- a/review/play/build.gradle.kts
+++ b/review/play/build.gradle.kts
@@ -23,5 +23,4 @@ dependencies {
   api(libs.review)
   implementation(libs.lottie)
   implementation(libs.dagger.core)
-  implementation(libs.firebase.remoteconfig)
 }
diff --git a/review/play/src/main/kotlin/voice/review/ReviewModule.kt b/review/play/src/main/kotlin/voice/review/ReviewModule.kt
index 174f0b9920..c61a825113 100644
--- a/review/play/src/main/kotlin/voice/review/ReviewModule.kt
+++ b/review/play/src/main/kotlin/voice/review/ReviewModule.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import androidx.datastore.core.DataStore
 import com.google.android.play.core.review.ReviewManager
 import com.google.android.play.core.review.ReviewManagerFactory
-import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import com.squareup.anvil.annotations.ContributesTo
 import dagger.Module
 import dagger.Provides
@@ -29,11 +28,6 @@ object ReviewModule {
   fun reviewManager(context: Context): ReviewManager {
     return ReviewManagerFactory.create(context)
   }
-
-  @Provides
-  fun remoteConfig(): FirebaseRemoteConfig {
-    return FirebaseRemoteConfig.getInstance()
-  }
 }
 
 @Qualifier
diff --git a/review/play/src/main/kotlin/voice/review/ShouldShowReviewDialog.kt b/review/play/src/main/kotlin/voice/review/ShouldShowReviewDialog.kt
index 4bf21e9b6b..32c13f2e1b 100644
--- a/review/play/src/main/kotlin/voice/review/ShouldShowReviewDialog.kt
+++ b/review/play/src/main/kotlin/voice/review/ShouldShowReviewDialog.kt
@@ -1,7 +1,6 @@
 package voice.review
 
 import androidx.datastore.core.DataStore
-import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import kotlinx.coroutines.flow.first
 import voice.data.repo.BookRepository
 import voice.playback.playstate.PlayStateManager
@@ -22,12 +21,10 @@ class ShouldShowReviewDialog
   private val bookRepository: BookRepository,
   private val playStateManager: PlayStateManager,
   private val reviewTranslated: ReviewTranslated,
-  private val remoteConfig: FirebaseRemoteConfig,
 ) {
 
   internal suspend fun shouldShow(): Boolean {
-    return enabledInRemoteConfig() &&
-      reviewTranslated.translated() &&
+    return reviewTranslated.translated() &&
       isNotPlaying() &&
       enoughTimeElapsedSinceInstallation() &&
       reviewDialogNotShown() &&
@@ -38,10 +35,6 @@ class ShouldShowReviewDialog
     reviewDialogShown.updateData { true }
   }
 
-  private fun enabledInRemoteConfig(): Boolean {
-    return remoteConfig.getBoolean("review_enabled")
-  }
-
   private fun enoughTimeElapsedSinceInstallation(): Boolean {
     val timeSinceInstallation = ChronoUnit.MINUTES.between(
       installationTimeProvider.installationTime(),
diff --git a/review/play/src/test/kotlin/voice/review/ShouldShowReviewDialogTest.kt b/review/play/src/test/kotlin/voice/review/ShouldShowReviewDialogTest.kt
index 436971d4c6..a464b0c107 100644
--- a/review/play/src/test/kotlin/voice/review/ShouldShowReviewDialogTest.kt
+++ b/review/play/src/test/kotlin/voice/review/ShouldShowReviewDialogTest.kt
@@ -102,9 +102,6 @@ class ShouldShowReviewDialogTest {
       reviewTranslated = mockk {
         every { translated() } returns true
       },
-      remoteConfig = mockk {
-        every { getBoolean("review_enabled") } returns true
-      },
     )
     val showsReviewDialog = runBlocking {
       shouldShowReviewDialog.shouldShow()
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 99635e3223..a2ce3e7a36 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -63,6 +63,5 @@ include(":logging:core")
 include(":logging:debug")
 include(":documentfile")
 include(":onboarding")
-include(":logging:crashlytics")
 include(":review:play")
 include(":review:noop")

From e4bbe629f89553b89f8b037f99a01f9723d2c73c Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@posteo.de>
Date: Sat, 8 Jun 2024 08:16:55 +0200
Subject: [PATCH 013/236] Enable edge to edge (#2440)

* Remove Crashlytics and Play Services

* Enable edge to edge

* Let the book overview go edge to edge
---
 .gitignore                                               | 2 +-
 app/src/main/kotlin/voice/app/features/MainActivity.kt   | 4 ++++
 app/src/main/res/layout/bookmark.xml                     | 1 +
 .../main/kotlin/voice/bookOverview/views/BookOverview.kt | 9 ++++++++-
 .../main/kotlin/voice/bookOverview/views/GridBooks.kt    | 9 +++++++++
 .../main/kotlin/voice/bookOverview/views/ListBooks.kt    | 7 +++++++
 6 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6f317870c4..66c0be8699 100755
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,4 @@ Gemfile.lock
 releases
 .transifexrc
 /plugins/.idea/workspace.xml
-/.kotlin/sessions/kotlin-compiler-13421836681560975881.salive
+/.kotlin
diff --git a/app/src/main/kotlin/voice/app/features/MainActivity.kt b/app/src/main/kotlin/voice/app/features/MainActivity.kt
index c122e39b0d..4c1ae6b617 100644
--- a/app/src/main/kotlin/voice/app/features/MainActivity.kt
+++ b/app/src/main/kotlin/voice/app/features/MainActivity.kt
@@ -4,6 +4,7 @@ import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.net.toUri
 import androidx.datastore.core.DataStore
@@ -57,6 +58,9 @@ class MainActivity : AppCompatActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
     appComponent.inject(this)
     super.onCreate(savedInstanceState)
+
+    enableEdgeToEdge()
+
     val root = ChangeHandlerFrameLayout(this)
     setContentView(root)
 
diff --git a/app/src/main/res/layout/bookmark.xml b/app/src/main/res/layout/bookmark.xml
index b5b52fdde9..a5069f5c18 100644
--- a/app/src/main/res/layout/bookmark.xml
+++ b/app/src/main/res/layout/bookmark.xml
@@ -3,6 +3,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
+  android:fitsSystemWindows="true"
   android:background="?android:windowBackground"
   android:focusableInTouchMode="true"
   android:orientation="vertical">
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/views/BookOverview.kt b/bookOverview/src/main/kotlin/voice/bookOverview/views/BookOverview.kt
index a8745c41ba..e323254f04 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/views/BookOverview.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/views/BookOverview.kt
@@ -3,6 +3,8 @@ package voice.bookOverview.views
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Scaffold
@@ -189,8 +191,13 @@ internal fun BookOverview(
         )
       }
     },
+    contentWindowInsets = WindowInsets(0, 0, 0, 0),
   ) { contentPadding ->
-    Box(Modifier.padding(contentPadding)) {
+    Box(
+      Modifier
+        .padding(contentPadding)
+        .consumeWindowInsets(contentPadding),
+    ) {
       when (viewState.layoutMode) {
         BookOverviewLayoutMode.List -> {
           ListBooks(
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/views/GridBooks.kt b/bookOverview/src/main/kotlin/voice/bookOverview/views/GridBooks.kt
index c741415481..74eff8115d 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/views/GridBooks.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/views/GridBooks.kt
@@ -3,9 +3,13 @@ package voice.bookOverview.views
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.windowInsetsBottomHeight
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.GridItemSpan
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
@@ -76,6 +80,11 @@ internal fun GridBooks(
           onBookLongClick = onBookLongClick,
         )
       }
+      item(
+        span = { GridItemSpan(maxLineSpan) },
+      ) {
+        Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.systemBars))
+      }
     }
   }
 }
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/views/ListBooks.kt b/bookOverview/src/main/kotlin/voice/bookOverview/views/ListBooks.kt
index 84f2f42c05..2880774108 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/views/ListBooks.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/views/ListBooks.kt
@@ -5,9 +5,13 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.windowInsetsBottomHeight
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -73,6 +77,9 @@ internal fun ListBooks(
           onBookLongClick = onBookLongClick,
         )
       }
+      item {
+        Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.systemBars))
+      }
     }
   }
 }

From 44e4547a6c7cd802c22b074f6b4e9767f8f73e2b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 16:49:48 +0000
Subject: [PATCH 014/236] Update agp to v8.4.2

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6ef797e2a8..d8b07260ad 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ materialDialog = "3.3.0"
 dagger = "2.51.1"
 kotlin = "2.0.0"
 media3 = "1.3.1"
-agp = "8.4.1"
+agp = "8.4.2"
 ktlint-core = "1.2.1"
 ktlint-gradlePlugin = "0.9.0"
 retrofit = "2.11.0"

From 03f67a51e23c279202473843b2e349384d463640 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 12 Jun 2024 17:03:16 +0000
Subject: [PATCH 015/236] Update actions/checkout digest to b17fe1e

---
 .github/workflows/voice.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index 3c28aa9a9a..176dcd2918 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -61,7 +61,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@b80ff79f1755d06ba70441c368a6fe801f5f3a62
+      - uses: actions/checkout@b17fe1e4d59a9d1d95a7aead5e6fcd13e50939a5
 
       - name: Set up JDK
         uses: actions/setup-java@v4.2.1

From 35beae1ff217da8dc8b877be25cb54dd8791f0a6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 12 Jun 2024 17:03:26 +0000
Subject: [PATCH 016/236] Update dependency androidx.compose:compose-bom to
 v2024.06.00

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d8b07260ad..c633af6a1f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -96,7 +96,7 @@ media3-testUtils-robolectric = { module = "androidx.media3:media3-test-utils-rob
 
 lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.1"
 
-compose-bom = "androidx.compose:compose-bom:2024.05.00"
+compose-bom = "androidx.compose:compose-bom:2024.06.00"
 compose-ui-ui = { module = "androidx.compose.ui:ui" }
 compose-ui-tooling-core = { module = "androidx.compose.ui:ui-tooling" }
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }

From a5d62fd7932bd9e554a9eabc26f973917293aae4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 12 Jun 2024 17:03:21 +0000
Subject: [PATCH 017/236] Update plugin com.gradle.develocity to v3.17.5

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index a2ce3e7a36..b429256c2a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -31,7 +31,7 @@ dependencyResolutionManagement {
 }
 
 plugins {
-  id("com.gradle.develocity") version "3.17.4"
+  id("com.gradle.develocity") version "3.17.5"
   id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.0")
 }
 

From 79c08f4a111f6421256f883371889e52c1a1e152 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 12 Jun 2024 18:11:02 +0000
Subject: [PATCH 018/236] Update actions/checkout digest to 6ccd57f

---
 .github/workflows/voice.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index 176dcd2918..9832188f8f 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -61,7 +61,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@b17fe1e4d59a9d1d95a7aead5e6fcd13e50939a5
+      - uses: actions/checkout@6ccd57f4c5d15bdc2fef309bd9fb6cc9db2ef1c6
 
       - name: Set up JDK
         uses: actions/setup-java@v4.2.1

From 4cc9807a966af19e93e5a0250eba5cc8ea527ee6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 12 Jun 2024 18:11:11 +0000
Subject: [PATCH 019/236] Update dependency
 androidx.lifecycle:lifecycle-runtime-ktx to v2.8.2

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c633af6a1f..fc90001076 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -94,7 +94,7 @@ media3-session = { module = "androidx.media3:media3-session", version.ref = "med
 media3-testUtils-core = { module = "androidx.media3:media3-test-utils", version.ref = "media3" }
 media3-testUtils-robolectric = { module = "androidx.media3:media3-test-utils-robolectric", version.ref = "media3" }
 
-lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.1"
+lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.2"
 
 compose-bom = "androidx.compose:compose-bom:2024.06.00"
 compose-ui-ui = { module = "androidx.compose.ui:ui" }

From bc02c3a914d9766ec3ff127b3a245f886353e110 Mon Sep 17 00:00:00 2001
From: etienne-w <etienne@moqueur.chat>
Date: Thu, 21 Mar 2024 22:15:43 +0000
Subject: [PATCH 020/236] Translated using Weblate (French)

Currently translated at 100.0% (119 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/fr/
---
 strings/src/main/res/values-fr/strings.xml | 47 ++++++++++++++++++++--
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/strings/src/main/res/values-fr/strings.xml b/strings/src/main/res/values-fr/strings.xml
index 0f7e67d4fb..dc4f49328a 100644
--- a/strings/src/main/res/values-fr/strings.xml
+++ b/strings/src/main/res/values-fr/strings.xml
@@ -50,8 +50,8 @@
     <string name="close">Fermer</string>
     <string name="delete">Supprimer</string>
     <string name="add">Ajouter</string>
-    <string name="folder_mode_root">Dossier racine des livres audio. Un sous-dossier = un livre.</string>
-    <string name="folder_mode_single">Dossier de livre audio unique </string>
+    <string name="folder_mode_root">Mode livres : chaque sous-dossier est un livre</string>
+    <string name="folder_mode_single">Mode livre unique : un dossier est un livre.</string>
     <plurals name="folder_type_file_count">
         <item quantity="one">%d fichier audio</item>
         <item quantity="many">%d fichiers audio</item>
@@ -90,4 +90,45 @@
     <string name="media_session_recent">Récent</string>
     <string name="notification_sleep_timer_enable">Activer la minuterie de sommeil</string>
     <string name="notification_sleep_timer_disable">Désactiver la minuterie de sommeil</string>
-</resources>
+    <string name="onboarding_welcome_title">Bienvenue dans Voice !</string>
+    <string name="sleep_timer.title">Bonne nuit ! 🌙</string>
+    <string name="sleep_timer.button.increment">Plus long</string>
+    <string name="folder_mode_author">Mode auteurs : chaque sous-dossier est un auteur, dont chaque sous-dossier est un livre.</string>
+    <string name="generic_error_message">Quelque chose a planté 😢</string>
+    <string name="generic_error_retry">Réessayer</string>
+    <string name="storage_bug_subtitle">Sur certains appareils, il manque les permissions nécessaires à une application système pour accéder au stockage externe. Cet accès est essentiel pour que Voice puisse lire les livres audio.</string>
+    <string name="storage_bug_button">Accorder la permission</string>
+    <string name="onboarding.explanation.title">Votre bibliothèque sur mesure</string>
+    <string name="review.request.title">Vous aimez Voice ?</string>
+    <string name="review.request.button.yes">Évaluer</string>
+    <string name="review.request.button.no">Non merci</string>
+    <string name="review.feedback.title">Désolé de l\'apprendre !</string>
+    <string name="review.feedback.content">Pourriez-vous nous indiquer ce qui s\'est mal passé ? Nous apprécions vos retours, ils nous aident à améliorer votre expérience.</string>
+    <string name="sleep_timer.button.decrement">Moins long</string>
+    <plurals name="minutes">
+        <item quantity="one">%d minute</item>
+        <item quantity="many">%d minutes</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <string name="cover_search_template_no_author">%s couverture livre audio</string>
+    <string name="cover_search_template_with_author">%1$s par %2$s couverture livre audio</string>
+    <string name="onboarding.button_next">Suivant</string>
+    <string name="onboarding.explanation.subtitle">Avec Voice, vous pouvez ajouter des livres comme des fichiers individuels, ou les organiser en dossier. Comme vous préférez !</string>
+    <string name="onboarding.completion.title">Tout est en ordre !</string>
+    <string name="review.feedback.button.yes">Donnez votre avis</string>
+    <string name="onboarding.completion.subtitle">Votre premier livre audio est prêt à être lu. Profitez de votre voyage avec Voice !</string>
+    <string name="onboarding.completion.next_button">Commencer à écouter</string>
+    <string name="review.request.content">Vos retours comptent pour nous ! Si vous avez un peu de temps, partagez votre expérience. Ça nous aide à améliorer Voice et à vous offrir un plus grand confort d\'écoute.</string>
+    <string name="review.feedback.button.no">Annuler</string>
+    <string name="onboarding_welcome_subtitle">Votre lecteur de livres audio personnel. Configurons votre application.</string>
+    <string name="play">Lecture</string>
+    <string name="pause">Pause</string>
+    <string name="cover_search.icon_recent">Recherche récente</string>
+    <string name="cover_search.author">Auteur</string>
+    <string name="storage_bug_title">Permission requise</string>
+    <string name="select_folder_title_onboarding">Ajoutez votre premier livre audio</string>
+    <string name="select_folder_title_default">Ajoutez vos livres audio</string>
+    <string name="select_folder_type_file">Fichier</string>
+    <string name="select_folder_type_folder">Dossier</string>
+    <string name="select_folder_subtitle">Les livres sont-ils des fichiers ou des dossiers ?</string>
+</resources>
\ No newline at end of file

From 4de96ad18dfe832e5587169e9034f9e99f93367f Mon Sep 17 00:00:00 2001
From: walafrid Mhagama <walitogama@gmail.com>
Date: Mon, 25 Mar 2024 05:32:13 +0000
Subject: [PATCH 021/236] Translated using Weblate (Swahili)

Currently translated at 21.8% (26 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/sw/
---
 strings/src/main/res/values-sw/strings.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/strings/src/main/res/values-sw/strings.xml b/strings/src/main/res/values-sw/strings.xml
index 46661132ca..4f9251daf2 100644
--- a/strings/src/main/res/values-sw/strings.xml
+++ b/strings/src/main/res/values-sw/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="cover">Jalada</string>
     <string name="play_pause">Cheza / Sitisha</string>
@@ -29,4 +29,6 @@
     <string name="book_header_current">iliyopo</string>
     <string name="book_header_not_started">Ambayo Haija Anzwa</string>
     <string name="book_header_completed">Iliyo malizwa</string>
-</resources>
+    <string name="play">Cheza</string>
+    <string name="pause">Sitisha</string>
+</resources>
\ No newline at end of file

From 10d398aee52f79045f62f247c847ee8fbd27a5e2 Mon Sep 17 00:00:00 2001
From: Syrma <justmeowmeow@proton.me>
Date: Mon, 25 Mar 2024 15:46:51 +0000
Subject: [PATCH 022/236] Translated using Weblate (Arabic)

Currently translated at 99.1% (118 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/ar/
---
 strings/src/main/res/values-ar/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/strings/src/main/res/values-ar/strings.xml b/strings/src/main/res/values-ar/strings.xml
index 6661c62f3a..09c24907d0 100644
--- a/strings/src/main/res/values-ar/strings.xml
+++ b/strings/src/main/res/values-ar/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation" tools:locale="ar">
-    <string name="cover">الغطاء</string>
+    <string name="cover">الغلاف</string>
     <string name="play_pause">شغّل/ ألبث</string>
     <string name="action_sleep">مؤقت النوم</string>
     <string name="rewind">أرجع</string>
@@ -132,4 +132,4 @@
     <string name="sleep_timer.title">أحلام سعيدة! 🌙</string>
     <string name="sleep_timer.button.increment">أطول</string>
     <string name="sleep_timer.button.decrement">أقصر</string>
-</resources>
+</resources>
\ No newline at end of file

From 7a4704eb4e5bf04361a053b3e140c34cc68e6bce Mon Sep 17 00:00:00 2001
From: Scrambled777 <weblate.scrambled777@simplelogin.com>
Date: Wed, 27 Mar 2024 18:23:20 +0000
Subject: [PATCH 023/236] Translated using Weblate (Hindi)

Currently translated at 100.0% (119 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/hi/
---
 strings/src/main/res/values-hi/strings.xml | 48 +++++++++++-----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/strings/src/main/res/values-hi/strings.xml b/strings/src/main/res/values-hi/strings.xml
index e339e0f002..913758a7be 100644
--- a/strings/src/main/res/values-hi/strings.xml
+++ b/strings/src/main/res/values-hi/strings.xml
@@ -8,22 +8,22 @@
     <string name="previous_track">पिछला ट्रैक</string>
     <string name="next_track">अगला ट्रैक</string>
     <string name="skip_silence">मौन भाग छोड़ें</string>
-    <string name="volume_boost">आवाज बूस्ट करें</string>
+    <string name="volume_boost">आवाज बढ़ाएँ</string>
     <string name="more">अधिक</string>
-    <string name="dialog_confirm">सेट करें</string>
-    <string name="dialog_cancel">रद्द करें</string>
+    <string name="dialog_confirm">निर्धारित</string>
+    <string name="dialog_cancel">रद्द</string>
     <string name="content_cover">चुनने के लिए कवर दिखाएँ</string>
     <string name="change_book_name">नाम</string>
     <string name="download_book_cover">इंटरनेट से कवर</string>
-    <string name="pick_book_cover">फ़ाइल सिस्टम से कवर</string>
-    <string name="edit_book_title">पुस्तक संपादित करें</string>
-    <string name="mark_as_completed">पूर्ण के रूप में चिह्नित करें</string>
-    <string name="mark_as_current">वर्तमान के रूप में चिह्नित करें</string>
-    <string name="mark_as_not_started">प्रारंभ नहीं हुआ के रूप में चिह्नित करें</string>
+    <string name="pick_book_cover">फाइल सिस्टम से कवर</string>
+    <string name="edit_book_title">पुस्तक संपादन</string>
+    <string name="mark_as_completed">पूर्ण चिह्नित करें</string>
+    <string name="mark_as_current">वर्तमान चिह्नित करें</string>
+    <string name="mark_as_not_started">अभी प्रारंभ नहीं चिह्नित करें</string>
     <string name="audiobook_folders_title">ऑडिओबुक के फोल्डर</string>
     <string name="playback_speed">प्लेबैक की गति</string>
     <string name="bookmark">बुकमार्क</string>
-    <string name="bookmark_edit_title">बुकमार्क सम्पादित करें</string>
+    <string name="bookmark_edit_title">बुकमार्क संपादन</string>
     <string name="bookmark_edit_hint">बुकमार्क का नाम</string>
     <string name="bookmark_added">बुकमार्क जोड़ा गया</string>
     <string name="action_settings">प्राथमिकताएँ</string>
@@ -35,24 +35,24 @@
     <string name="pref_theme_dark">गहरी थीम</string>
     <string name="pref_auto_rewind_title">ऑटो रिवाइंड</string>
     <string name="pref_suggest_idea">विचार सुझाएं</string>
-    <string name="pref_use_grid">ग्रिड लेआउट का प्रयोग करें</string>
+    <string name="pref_use_grid">ग्रिड लेआउट का प्रयोग</string>
     <string name="pref_report_issue">समस्या की रिपोर्ट करें</string>
     <string name="pref_help_translating">Voice का अनुवाद करने में मदद करें</string>
     <string name="pref_get_support">सहायता प्राप्त करें</string>
     <string name="pref_app_version">ऐप संस्करण</string>
-    <string name="popup_edit">संपादित करें</string>
+    <string name="popup_edit">संपादन</string>
     <string name="remove">हटाएं</string>
     <string name="play_current">वर्तामन चलायें</string>
     <string name="book_header_current">वर्तमान </string>
-    <string name="book_header_not_started">अभी प्रारंभ नही किया</string>
+    <string name="book_header_not_started">अभी प्रारंभ नही</string>
     <string name="book_header_completed">पूर्ण</string>
     <string name="close">बंद </string>
     <string name="delete">हटाएँ </string>
     <string name="add">जोड़ें</string>
-    <string name="folder_mode_root">शीर्ष-स्तरीय पुस्तक मोड: सबफ़ोल्डर पुस्तकें हैं</string>
-    <string name="folder_mode_single">एकल पुस्तक मोड: एक फ़ोल्डर एक पुस्तक के बराबर है।</string>
+    <string name="folder_mode_root">शीर्ष-स्तरीय पुस्तक मोड: सबफोल्डर पुस्तकें हैं</string>
+    <string name="folder_mode_single">एकल पुस्तक मोड: एक फोल्डर एक पुस्तक के बराबर है।</string>
     <plurals name="folder_type_file_count">
-        <item quantity="one">%dऑडियो फाइल</item>
+        <item quantity="one">%d ऑडियो फाइल</item>
         <item quantity="other">%d ऑडियो फाइलें</item>
     </plurals>
     <string name="folder_type_book_example_header">इससे निम्नलिखित पुस्तकों का पता चलेगा</string>
@@ -61,18 +61,18 @@
     <string name="bookmark_just_now">बस अभी </string>
     <string name="voice_intro_first_book">चलिए आपका ऑडियोबुक फोल्डर जोड़ते हैं ताकि आप सुनना शुरू कर सकें!</string>
     <string name="migration_hint_title">पुरानी पुस्तक स्थितियों तक पहुँचना</string>
-    <string name="migration_hint_content">नए Android संस्करणों में परिवर्तनों के कारण, सिस्टम पिकर का उपयोग करके अपने ऑडियोबुक फ़ोल्डर का चयन करना आवश्यक है।
+    <string name="migration_hint_content">नए Android संस्करणों में परिवर्तनों के कारण, सिस्टम पिकर का उपयोग करके अपने ऑडियोबुक फोल्डर का चयन करना आवश्यक है।
 \n
 \nअपनी पुरानी पुस्तक स्थिति देखने के लिए ऊपर दिए गए आइकन पर क्लिक करें।</string>
-    <string name="migration_hint_confirm">समझा</string>
+    <string name="migration_hint_confirm">समझ गया</string>
     <string name="migration_detail_title">पुरानी पुस्तक की स्थिति </string>
     <string name="migration_detail_content_name">नाम </string>
     <string name="migration_detail_content_root">रूट फोल्डर </string>
     <string name="migration_detail_content_position">स्थान </string>
     <string name="migration_detail_content_bookmarks">बुकमार्क्स </string>
     <string name="migration_detail_content_added_at">बजे जोड़ा गया</string>
-    <string name="migration_detail_content_position_current_file_title">वर्तमान फ़ाइल</string>
-    <string name="migration_detail_content_position_current_file_position">फ़ाइल में स्थिति</string>
+    <string name="migration_detail_content_position_current_file_title">वर्तमान फाइल</string>
+    <string name="migration_detail_content_position_current_file_position">फाइल में स्थिति</string>
     <string name="migration_detail_content_position_current_chapter_title">वर्तमान अध्याय</string>
     <string name="migration_detail_content_position_current_chapter_position">अध्याय में स्थिति</string>
     <string name="migration_delete_dialog_title">स्थान हटाएं</string>
@@ -81,8 +81,8 @@
     <string name="migration_delete_dialog_action_keep">रखें</string>
     <string name="delete_book_bottom_sheet_title">पुस्तक हटाएँ </string>
     <string name="delete_book_dialog_title">पुस्तक हटाएँ </string>
-    <string name="delete_book_dialog_deletion_confirmation">मेरी फ़ाइलें हटाएं</string>
-    <string name="delete_book_dialog_content">इससे आपके डिवाइस पर फ़ाइलें हटा दी जाएंगी।</string>
+    <string name="delete_book_dialog_deletion_confirmation">मेरी फाइलें हटाएं</string>
+    <string name="delete_book_dialog_content">इससे आपके डिवाइस पर फाइलें हटा दी जाएंगी।</string>
     <string name="search_hint">आप क्या ढूंढ रहे हैं?</string>
     <string name="battery_optimization_rationale">आपके पावर प्रतिबंधों के कारण, प्लेबैक रुकावट हो सकती है।</string>
     <string name="battery_optimization_action">अपडेट </string>
@@ -90,7 +90,7 @@
     <string name="media_session_recent">हालिया</string>
     <string name="notification_sleep_timer_enable">स्लीप टाइमर चालू करें</string>
     <string name="notification_sleep_timer_disable">स्लीप टाइमर बंद करें</string>
-    <string name="folder_mode_author">लेखक-पुस्तक मोड: सबफ़ोल्डर लेखक हैं, उप-सबफ़ोल्डर पुस्तकें हैं।</string>
+    <string name="folder_mode_author">लेखक-पुस्तक मोड: सबफोल्डर लेखक हैं, उप-सबफोल्डर पुस्तकें हैं।</string>
     <string name="generic_error_message">कुछ गलत हो गया 😢</string>
     <string name="storage_bug_title">अनुमति आवश्यक है</string>
     <string name="cover_search_template_no_author">%s ऑडियोबुक कवर</string>
@@ -102,14 +102,14 @@
     <string name="cover_search.author">लेखक</string>
     <string name="storage_bug_button">अनुमति प्रदान करें</string>
     <string name="select_folder_type_folder">फोल्डर</string>
-    <string name="select_folder_subtitle">क्या आप एक फ़ाइल को पुस्तक या फ़ोल्डर के रूप में जोड़ना चाहेंगे?</string>
+    <string name="select_folder_subtitle">क्या आप एक फाइल को पुस्तक या फोल्डर के रूप में जोड़ना चाहेंगे?</string>
     <string name="onboarding_welcome_title">Voice में आपका स्वागत है!</string>
     <string name="onboarding.button_next">अगला</string>
     <string name="onboarding.explanation.title">आपकी लाइब्रेरी, आपका तरीका</string>
     <string name="review.request.title">Voice का आनंद ले रहे हैं?</string>
     <string name="review.request.button.yes">अभी रेट करें</string>
     <string name="select_folder_title_onboarding">अपनी पहली ऑडियोबुक जोड़ें</string>
-    <string name="onboarding.explanation.subtitle">Voice के साथ, आप पुस्तकों को अलग-अलग फ़ाइलों के रूप में जोड़ सकते हैं या उन्हें फ़ोल्डरों में व्यवस्थित कर सकते हैं। आप चुनें!</string>
+    <string name="onboarding.explanation.subtitle">Voice के साथ, आप पुस्तकों को अलग-अलग फाइलों के रूप में जोड़ सकते हैं या उन्हें फोल्डरों में व्यवस्थित कर सकते हैं। आप चुनें!</string>
     <string name="onboarding.completion.title">आप पूरी तरह तैयार हैं!</string>
     <string name="onboarding.completion.subtitle">आपकी पहली ऑडियोबुक चलने के लिए तैयार है। Voice के साथ अपनी यात्रा का आनंद लें!</string>
     <string name="onboarding.completion.next_button">सुनना शुरू करें</string>

From a69c054c50cf49a26370d55a670a203aa66f366a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Smr=C5=BE?= <ilfirin.ms@gmail.com>
Date: Thu, 4 Apr 2024 20:14:06 +0000
Subject: [PATCH 024/236] Translated using Weblate (Czech)

Currently translated at 100.0% (119 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/cs/
---
 strings/src/main/res/values-cs/strings.xml | 110 +++++++++++++++++++--
 1 file changed, 101 insertions(+), 9 deletions(-)

diff --git a/strings/src/main/res/values-cs/strings.xml b/strings/src/main/res/values-cs/strings.xml
index 02acec6a55..c739902b5c 100644
--- a/strings/src/main/res/values-cs/strings.xml
+++ b/strings/src/main/res/values-cs/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="cover">Obal</string>
     <string name="play_pause">Přehrát / Pozastavit</string>
@@ -18,27 +18,119 @@
     <string name="pick_book_cover">Obal ze souborového systému</string>
     <string name="edit_book_title">Upravit knihu</string>
     <string name="mark_as_completed">Označit jako dokončené</string>
-    <string name="mark_as_current">Označit jako aktualní</string>
+    <string name="mark_as_current">Označit jako aktuální</string>
     <string name="mark_as_not_started">Označit jako dosud nezahájené</string>
-    <string name="audiobook_folders_title">Adresáře s audioknihami</string>
+    <string name="audiobook_folders_title">Složky s audioknihami</string>
     <string name="playback_speed">Rychlost přehrávání</string>
     <string name="bookmark">Záložka</string>
     <string name="bookmark_edit_title">Upravit záložku</string>
-    <string name="bookmark_edit_hint">Jméno záložky</string>
+    <string name="bookmark_edit_hint">Název záložky</string>
     <string name="bookmark_added">Záložka přidána</string>
     <string name="action_settings">Nastavení</string>
     <plurals name="seconds">
         <item quantity="one">%d sekunda</item>
-        <item quantity="few">%dsekundy </item>
-        <item quantity="many">%dsekund </item>
-        <item quantity="other">%dsekund </item>
+        <item quantity="few">%d sekundy</item>
+        <item quantity="other">%d sekund</item>
     </plurals>
     <string name="pref_seek_time">Přeskočit o</string>
     <string name="pref_auto_rewind_title">Automaticky přetočit</string>
     <string name="popup_edit">Upravit</string>
-    <string name="remove">Smazat</string>
+    <string name="remove">Odstranit</string>
     <string name="play_current">Přehrát aktuální</string>
     <string name="book_header_current">Aktuální</string>
     <string name="book_header_not_started">Doposud nespuštěno</string>
     <string name="book_header_completed">Dokončeno</string>
-</resources>
+    <string name="pref_get_support">Získat podporu</string>
+    <string name="delete">Smazat</string>
+    <string name="add">Přidat</string>
+    <string name="folder_mode_root">Režim řazení knih: Podsložky jsou knihy</string>
+    <string name="folder_type_title">Jak jsou vaše audioknihy logicky rozmístěné?</string>
+    <string name="bookmark_just_now">Právě teď</string>
+    <string name="migration_hint_title">Zpřístupnění starých pozic knih</string>
+    <string name="select_folder_type_folder">Složka</string>
+    <string name="notification_sleep_timer_disable">Vypnout časovač vypnutí</string>
+    <string name="select_folder_title_default">Přidejte své audoknihy</string>
+    <string name="select_folder_type_file">Soubor</string>
+    <string name="select_folder_subtitle">Chcete přidat jeden soubor jako knihu nebo jako složku?</string>
+    <string name="onboarding_welcome_title">Vítejte ve Voice!</string>
+    <string name="onboarding_welcome_subtitle">Váš osobní kapesní přehrávač audioknih. Pojďme ho nastavit.</string>
+    <string name="onboarding.explanation.subtitle">Pomocí aplikace Voice můžete přidávat knihy jako jednotlivé soubory nebo je organizovat do složek. Je to na vás!</string>
+    <string name="onboarding.completion.subtitle">Vaše první audiokniha je připravena k přehrání. Užijte si svou cestu s Voice!</string>
+    <string name="review.request.content">Vaše zpětná vazba je pro nás důležitá! Pokud máte chvilku, ohodnoťte nás a podělte se o své zkušenosti. Pomáhá nám to vylepšovat a nabízet lepší zážitek z poslechu.</string>
+    <string name="folder_type_no_books">Voice nenalezl žádné knihy. Jsou ve složkách opravdu zvukové soubory?</string>
+    <string name="migration_detail_content_name">Název</string>
+    <string name="migration_detail_content_bookmarks">Záložky</string>
+    <string name="migration_detail_title">Staré pozice knih</string>
+    <string name="migration_hint_confirm">Rozumím</string>
+    <string name="migration_detail_content_added_at">Přidáno v</string>
+    <string name="migration_delete_dialog_title">Odstranit pozice</string>
+    <string name="migration_hint_content">Vzhledem ke změnám v novějších verzích Androidu, je potřeba vybrat hlavní složku audioknih pomocí systémového výběru.
+\n
+\nkliknutím na ikonu výše zobrazíte pozice svých starých knih.</string>
+    <string name="migration_delete_dialog_content">Jakmile odstraníte staré pozice, nebudete moci obnovit své staré pozice přehrávání.</string>
+    <string name="delete_book_bottom_sheet_title">Odstranit knihu</string>
+    <string name="delete_book_dialog_title">Odstranit knihu</string>
+    <string name="delete_book_dialog_deletion_confirmation">Odstranit mé soubory</string>
+    <string name="cover_search_template_with_author">%1$s obal audioknihy od %2$s</string>
+    <string name="sleep_timer.title">Sladké sny! 🌙</string>
+    <string name="sleep_timer.button.decrement">Zkrátit</string>
+    <string name="sleep_timer.button.increment">Prodloužit</string>
+    <plurals name="minutes">
+        <item quantity="one">%d minuta</item>
+        <item quantity="few">%d minuty</item>
+        <item quantity="other">%d minut</item>
+    </plurals>
+    <string name="search_hint">Co hledáte?</string>
+    <string name="folder_mode_single">Režim řazení knih: Jedna složka = Jedna kniha</string>
+    <string name="folder_mode_author">Režim řazení knih: Podsložky jsou autoři, podsložky podložek jsou knihy</string>
+    <plurals name="folder_type_file_count">
+        <item quantity="one">%d zvukový soubor</item>
+        <item quantity="few">%d zvukové soubory</item>
+        <item quantity="other">%d zvukových souborů</item>
+    </plurals>
+    <string name="voice_intro_first_book">Pojďme přidat vaši složku s audioknihami ať můžete začít poslouchat!</string>
+    <string name="migration_detail_content_position">Pozice</string>
+    <string name="notification_sleep_timer_enable">Zapnout časovač vypnutí</string>
+    <string name="storage_bug_title">Vyžadováno povolení</string>
+    <string name="storage_bug_subtitle">U některých zařízení chybí systémové aplikaci potřebná oprávnění pro přístup k externímu úložišti. Tento přístup je nezbytný, aby Voice mohl číst vaše audioknihy.</string>
+    <string name="storage_bug_button">Udělit oprávnění</string>
+    <string name="pref_report_issue">Nahlásit problém</string>
+    <string name="pref_help_translating">Pomozte přeložit Voice</string>
+    <string name="close">Zavřít</string>
+    <string name="folder_type_book_example_header">Povede k nalezení následujících knih</string>
+    <string name="migration_detail_content_root">Kořenová složka</string>
+    <string name="migration_delete_dialog_action_delete">Odstranit</string>
+    <string name="delete_book_dialog_content">Toto odstraní soubory z vašeho zařízení.</string>
+    <string name="onboarding.button_next">Další</string>
+    <string name="onboarding.explanation.title">Vaše knihovna, váš způsob</string>
+    <string name="onboarding.completion.title">Vše je připraveno!</string>
+    <string name="onboarding.completion.next_button">Začít poslouchat</string>
+    <string name="review.request.title">Spokojeni s Voice?</string>
+    <string name="review.request.button.yes">Ohodnotit nyní</string>
+    <string name="review.request.button.no">Ne, děkuji</string>
+    <string name="review.feedback.title">To je nám líto!</string>
+    <string name="review.feedback.content">Můžete nám sdělit, co se pokazilo? Vážíme si vaší zpětné vazby a pomáhá nám zlepšovat uživatelskou zkušenost.</string>
+    <string name="review.feedback.button.yes">Odeslat zpětnou vazbu</string>
+    <string name="review.feedback.button.no">Zrušit</string>
+    <string name="cover_search_template_no_author">%s obal audioknihy</string>
+    <string name="pref_suggest_idea">Navrhnout nápad</string>
+    <string name="generic_error_message">Něco se pokazilo 😢</string>
+    <string name="generic_error_retry">Znovu</string>
+    <string name="play">Přehrát</string>
+    <string name="pause">Pozastavit</string>
+    <string name="migration_delete_dialog_action_keep">Ponechat</string>
+    <string name="cover_search.icon_recent">Nedávné hledání</string>
+    <string name="cover_search.author">Autor</string>
+    <string name="pref_theme_dark">Tmavé téma</string>
+    <string name="pref_use_grid">Použít rozložení mřížky</string>
+    <string name="pref_app_version">Verze aplikace</string>
+    <string name="migration_detail_content_position_current_file_position">Pozice v souboru</string>
+    <string name="migration_detail_content_position_current_file_title">Aktuální soubor</string>
+    <string name="migration_detail_content_position_current_chapter_position">Pozice v kapitole</string>
+    <string name="migration_detail_content_position_current_chapter_title">Současná kapitola</string>
+    <string name="media_session_root">Všechny audoknihy</string>
+    <string name="media_session_recent">Nedávné</string>
+    <string name="battery_optimization_rationale">Kvůli nastavení omezení spotřeby může docházet k přerušování přehrávání.</string>
+    <string name="battery_optimization_action">Aktualizovat</string>
+    <string name="select_folder_title_onboarding">Přidejte svou první audioknihu</string>
+</resources>
\ No newline at end of file

From 813166e6c62a7cd4272b5e7f706af4b04d8a896f Mon Sep 17 00:00:00 2001
From: Felipe Juan <felipejuandias@gmail.com>
Date: Sat, 6 Apr 2024 10:03:37 +0000
Subject: [PATCH 025/236] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (119 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/pt_BR/
---
 .../src/main/res/values-pt-rBR/strings.xml    | 43 +++++++++++++++++--
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/strings/src/main/res/values-pt-rBR/strings.xml b/strings/src/main/res/values-pt-rBR/strings.xml
index e16f1a1db0..122629f3f6 100644
--- a/strings/src/main/res/values-pt-rBR/strings.xml
+++ b/strings/src/main/res/values-pt-rBR/strings.xml
@@ -48,8 +48,8 @@
     <string name="close">Fechar</string>
     <string name="delete">Deletar</string>
     <string name="add">Adicionar</string>
-    <string name="folder_mode_root">Pasta de Audiolivro padrão. Cada subpasta representa um livro/volume.</string>
-    <string name="folder_mode_single">Pasta única de Audiolivro</string>
+    <string name="folder_mode_root">Pasta de Audiobook padrão. Cada subpasta representa um livro/volume diferente.</string>
+    <string name="folder_mode_single">Pasta única de Audiobook. Cada pasta representa um único livro.</string>
     <plurals name="folder_type_file_count">
         <item quantity="one">%d arquivo de áudio</item>
         <item quantity="many">%d arquivos de áudio</item>
@@ -96,4 +96,41 @@
     <string name="notification_sleep_timer_disable">Desativar desligamento automático</string>
     <string name="generic_error_message">Algo deu errado 😢</string>
     <string name="generic_error_retry">Tentar novamente</string>
-</resources>
+    <string name="onboarding.explanation.title">Sua Livraria, do Seu Jeito</string>
+    <string name="onboarding.button_next">Próximo</string>
+    <string name="sleep_timer.title">Bons sonhos! 🌙</string>
+    <plurals name="minutes">
+        <item quantity="one">%d minuto</item>
+        <item quantity="many">%d minutos</item>
+        <item quantity="other">%d minutos</item>
+    </plurals>
+    <string name="folder_mode_author">Modo Autor de Livro: Subpastas são autores, sub-subpasta são livros.</string>
+    <string name="review.request.title">Está gostando de Voice?</string>
+    <string name="review.request.content">O seu feedback é importante para nós! Se você tiver um momento, nos avalie e compartilhe a sua experiência. Ele ajuda a gente a melhorar ainda mais as suas lidas.</string>
+    <string name="cover_search_template_no_author">Capa do audiobook %s</string>
+    <string name="storage_bug_subtitle">Em certos dispositivos, o aplicativo pode exigir permissões para acessar o armazenamento externo. Esse acesso é essencial para Voice ler os seus audiobooks.</string>
+    <string name="onboarding_welcome_subtitle">Seu tocador de bolso pessoal de audiobook. Bora nos arrumar para isso.</string>
+    <string name="onboarding.completion.title">Está tudo pronto!</string>
+    <string name="onboarding.explanation.subtitle">Com Voice, você pode adicionar livros como arquivos individuais ou organizar eles em pastas. Você decide como!</string>
+    <string name="onboarding.completion.subtitle">O seu primeiro audiobook está pronto para rodar. Aprecie a sua jornada com Voice!</string>
+    <string name="review.feedback.button.yes">Enviar Feedback</string>
+    <string name="review.feedback.button.no">Cancelar</string>
+    <string name="sleep_timer.button.increment">Mais longo</string>
+    <string name="sleep_timer.button.decrement">Mais curto</string>
+    <string name="review.feedback.content">Poderia nos dizer o que errado? A gente valoriza o seu feedback e com ele sabemos como melhorar a sua experiência.</string>
+    <string name="storage_bug_title">Permissão necessária</string>
+    <string name="storage_bug_button">Permissão concedida</string>
+    <string name="select_folder_title_onboarding">Adicione o Seu Primeiro Audiobook</string>
+    <string name="review.request.button.yes">Avaliar Agora</string>
+    <string name="review.request.button.no">Não, obrigado</string>
+    <string name="review.feedback.title">A gente sente muito por isso!</string>
+    <string name="cover_search_template_with_author">Capa do audiobook %1$s, feito por %2$s</string>
+    <string name="cover_search.icon_recent">Pesquisa recente</string>
+    <string name="cover_search.author">Autor</string>
+    <string name="select_folder_title_default">Adicionar seus Audiobook(s)</string>
+    <string name="select_folder_type_file">Arquivo</string>
+    <string name="select_folder_type_folder">Pasta</string>
+    <string name="select_folder_subtitle">Gostaria de adicionar um único arquivo como um livro ou pasta?</string>
+    <string name="onboarding_welcome_title">Seja bem vindo ao Voice!</string>
+    <string name="onboarding.completion.next_button">Começar a Ouvir</string>
+</resources>
\ No newline at end of file

From 5a76873a10f2dd8b51470473d40a101879442149 Mon Sep 17 00:00:00 2001
From: Ewerson Barreto da Silva <ewerson.barreto@hotmail.com>
Date: Mon, 8 Apr 2024 02:11:46 +0000
Subject: [PATCH 026/236] Translated using Weblate (Portuguese)

Currently translated at 11.7% (14 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/pt/
---
 strings/src/main/res/values-pt/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/strings/src/main/res/values-pt/strings.xml b/strings/src/main/res/values-pt/strings.xml
index 7f534101ef..2700852439 100644
--- a/strings/src/main/res/values-pt/strings.xml
+++ b/strings/src/main/res/values-pt/strings.xml
@@ -13,4 +13,9 @@
     <string name="play">Reproduzir</string>
     <string name="action_sleep">Temporizador</string>
     <string name="volume_boost">Aumentar volume</string>
+    <string name="download_book_cover">Obter capa na Internet</string>
+    <string name="onboarding.completion.subtitle">Seu primeiro audiolivro está pronto para ser reproduzido. Aproveite sua jornada com o Voice!</string>
+    <string name="rewind">Retroceder</string>
+    <string name="change_book_name">Nome</string>
+    <string name="pick_book_cover">Obter capa nos arquivos</string>
 </resources>
\ No newline at end of file

From c32ce1ccec1965522ad917b17a7e24e6cf07d4fd Mon Sep 17 00:00:00 2001
From: ssantos <ssantos@web.de>
Date: Fri, 12 Apr 2024 19:48:19 +0000
Subject: [PATCH 027/236] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (119 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/pt_BR/
---
 .../src/main/res/values-pt-rBR/strings.xml    | 94 +++++++++----------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/strings/src/main/res/values-pt-rBR/strings.xml b/strings/src/main/res/values-pt-rBR/strings.xml
index 122629f3f6..b6159c8cf6 100644
--- a/strings/src/main/res/values-pt-rBR/strings.xml
+++ b/strings/src/main/res/values-pt-rBR/strings.xml
@@ -4,90 +4,90 @@
     <string name="play_pause">Tocar / Pausar</string>
     <string name="action_sleep">Desligamento automático</string>
     <string name="rewind">Retroceder</string>
-    <string name="fast_forward">Avançar</string>
-    <string name="previous_track">Capitulo anterior</string>
-    <string name="next_track">Próximo capitulo</string>
-    <string name="skip_silence">Pular Silêncio</string>
+    <string name="fast_forward">Avanço rápido</string>
+    <string name="previous_track">Capítulo anterior</string>
+    <string name="next_track">Próximo capítulo</string>
+    <string name="skip_silence">Pular silêncio</string>
     <string name="dialog_confirm">Definir</string>
     <string name="dialog_cancel">Cancelar</string>
-    <string name="content_cover">Mostrar capa para escolher</string>
-    <string name="change_book_name">Nome</string>
+    <string name="content_cover">Mostra capas para escolher</string>
+    <string name="change_book_name">Título</string>
     <string name="download_book_cover">Capa da internet</string>
-    <string name="pick_book_cover">Capa do arquivo de sistema</string>
+    <string name="pick_book_cover">Capa do sistema de ficheiros</string>
     <string name="edit_book_title">Editar livro</string>
-    <string name="audiobook_folders_title">Pastas de Audiolivros</string>
+    <string name="audiobook_folders_title">Pastas de audiolivros</string>
     <string name="playback_speed">Velocidade de reprodução</string>
-    <string name="bookmark">Marcador de páginas</string>
-    <string name="bookmark_edit_title">Editar marcador de páginas</string>
-    <string name="bookmark_edit_hint">Nome do marcador de páginas</string>
-    <string name="bookmark_added">Marcador de páginas adicionado</string>
+    <string name="bookmark">Marcador</string>
+    <string name="bookmark_edit_title">Editar marcador</string>
+    <string name="bookmark_edit_hint">Título do marcador</string>
+    <string name="bookmark_added">Marcador adicionado</string>
     <string name="action_settings">Preferências</string>
     <plurals name="seconds">
         <item quantity="one">%d segundo</item>
         <item quantity="many">%d segundos</item>
         <item quantity="other">%d segundos</item>
     </plurals>
-    <string name="pref_seek_time">Pular para</string>
-    <string name="pref_theme_dark">Tema escuro</string>
-    <string name="pref_auto_rewind_title">Retornar automaticamente</string>
+    <string name="pref_seek_time">Quantidade de Salto</string>
+    <string name="pref_theme_dark">Tema Escuro</string>
+    <string name="pref_auto_rewind_title">Rebobin automaticamente</string>
     <string name="popup_edit">Editar</string>
     <string name="remove">Remover</string>
-    <string name="play_current">Reproduzir o atual</string>
-    <string name="book_header_current">Atual</string>
+    <string name="play_current">Reproduzir atual</string>
+    <string name="book_header_current">Actual</string>
     <string name="book_header_not_started">Não iniciado ainda</string>
-    <string name="book_header_completed">Completo</string>
-    <string name="mark_as_completed">Marcar como completo</string>
-    <string name="mark_as_current">Marcar como atual</string>
-    <string name="mark_as_not_started">Marcar como não-começado</string>
+    <string name="book_header_completed">Concluído</string>
+    <string name="mark_as_completed">Marcar como Concluído</string>
+    <string name="mark_as_current">Marca com Actual</string>
+    <string name="mark_as_not_started">Marca como não iniciado</string>
     <string name="pref_suggest_idea">Sugerir uma ideia</string>
-    <string name="pref_use_grid">Usar modo em grade</string>
+    <string name="pref_use_grid">Utilizar a disposição da grelha</string>
     <string name="pref_report_issue">Reportar um problema</string>
-    <string name="pref_help_translating">Ajude a traduzir o Voice</string>
-    <string name="pref_get_support">Obtenha ajuda</string>
-    <string name="pref_app_version">Versão do Aplicativo</string>
+    <string name="pref_help_translating">Ajuda traduzindo Voice</string>
+    <string name="pref_get_support">Obter apoio</string>
+    <string name="pref_app_version">Versão</string>
     <string name="close">Fechar</string>
-    <string name="delete">Deletar</string>
+    <string name="delete">Apagar</string>
     <string name="add">Adicionar</string>
     <string name="folder_mode_root">Pasta de Audiobook padrão. Cada subpasta representa um livro/volume diferente.</string>
     <string name="folder_mode_single">Pasta única de Audiobook. Cada pasta representa um único livro.</string>
     <plurals name="folder_type_file_count">
-        <item quantity="one">%d arquivo de áudio</item>
-        <item quantity="many">%d arquivos de áudio</item>
-        <item quantity="other">%d arquivos de áudio</item>
+        <item quantity="one">%d ficheiro de áudio</item>
+        <item quantity="many">%d ficheiros de áudio</item>
+        <item quantity="other">%d ficheiros de áudio</item>
     </plurals>
-    <string name="folder_type_book_example_header">Isso fará com que os respectivos livros sejam reconhecidos</string>
-    <string name="folder_type_no_books">Voice não conseguiu encontrar nenhum livro. O arquivo está no formato certo\?</string>
-    <string name="folder_type_title">Como estão organizados seus arquivos\?</string>
+    <string name="folder_type_book_example_header">Isto fará com que os respectivos livros sejam reconhecidos</string>
+    <string name="folder_type_no_books">Voice não conseguiu encontrar nenhum livro. O ficheiro está no formato certo?</string>
+    <string name="folder_type_title">Como os seus ficheiros estão organizados?</string>
     <string name="bookmark_just_now">Nesse exato momento</string>
-    <string name="voice_intro_first_book">Vamos adicionar uma pasta de Audiolivros para você começar a ouvir!</string>
-    <string name="migration_hint_title">Acessar posições de livros antigos</string>
-    <string name="migration_hint_content">Devido alterações na versão do Android, é necessário selecionar a pasta de Audiolivros manualmente no seu dispositivo.
+    <string name="voice_intro_first_book">Vamos adicionar uma pasta de Audiolivros para começar a ouvir!</string>
+    <string name="migration_hint_title">Aceder posições de livros antigos</string>
+    <string name="migration_hint_content">Devido alterações na versão do Android, é necessário selecionar a pasta de Audiolivros manualmente no seu aparelho.
 \n
 \nClique no ícone acima para ver a localização antiga dos livros.</string>
-    <string name="migration_hint_confirm">Entendido</string>
+    <string name="migration_hint_confirm">Percebido</string>
     <string name="migration_detail_title">Posições antigas de livro</string>
     <string name="migration_detail_content_name">Nome</string>
     <string name="migration_detail_content_root">Pasta raiz</string>
     <string name="migration_detail_content_position">Posição</string>
     <string name="migration_detail_content_bookmarks">Marcadores de página</string>
     <string name="migration_detail_content_added_at">Adicionado em</string>
-    <string name="migration_detail_content_position_current_file_title">Arquivo atual</string>
-    <string name="migration_detail_content_position_current_file_position">Posição no arquivo</string>
+    <string name="migration_detail_content_position_current_file_title">Ficheiro atual</string>
+    <string name="migration_detail_content_position_current_file_position">Posição no ficheiro</string>
     <string name="migration_detail_content_position_current_chapter_title">Capítulo atual</string>
     <string name="migration_detail_content_position_current_chapter_position">Posição no capítulo</string>
     <string name="migration_delete_dialog_title">Deletar posições</string>
     <string name="delete_book_bottom_sheet_title">Deletar livro</string>
     <string name="delete_book_dialog_title">Deletar livro</string>
-    <string name="migration_delete_dialog_content">Assim que você deletar posições antigas, você não poderá recupera-las.</string>
+    <string name="migration_delete_dialog_content">Assim que deletar posições antigas, não poderá recupera-las.</string>
     <string name="migration_delete_dialog_action_delete">Deletar</string>
-    <string name="delete_book_dialog_deletion_confirmation">Deletar meus arquivos</string>
+    <string name="delete_book_dialog_deletion_confirmation">Deletar os meus ficheiros</string>
     <string name="migration_delete_dialog_action_keep">Manter</string>
-    <string name="delete_book_dialog_content">Isso deletará os arquivos em seu aparelho.</string>
-    <string name="search_hint">O que você está buscando\?</string>
+    <string name="delete_book_dialog_content">Isto apagará os ficheiros no seu aparelho.</string>
+    <string name="search_hint">O que procura?</string>
     <string name="battery_optimization_rationale">Devido à restrições de energia, podem haver interrupções durante a reprodução do livro.</string>
     <string name="battery_optimization_action">Atualizar</string>
     <string name="pause">Parar</string>
-    <string name="volume_boost">Aumentar volume</string>
+    <string name="volume_boost">Aumento de volume</string>
     <string name="more">Mais</string>
     <string name="play">Play</string>
     <string name="media_session_root">Audiolivros</string>
@@ -119,18 +119,18 @@
     <string name="sleep_timer.button.decrement">Mais curto</string>
     <string name="review.feedback.content">Poderia nos dizer o que errado? A gente valoriza o seu feedback e com ele sabemos como melhorar a sua experiência.</string>
     <string name="storage_bug_title">Permissão necessária</string>
-    <string name="storage_bug_button">Permissão concedida</string>
+    <string name="storage_bug_button">Conceder permissão</string>
     <string name="select_folder_title_onboarding">Adicione o Seu Primeiro Audiobook</string>
-    <string name="review.request.button.yes">Avaliar Agora</string>
+    <string name="review.request.button.yes">Avalie agora</string>
     <string name="review.request.button.no">Não, obrigado</string>
     <string name="review.feedback.title">A gente sente muito por isso!</string>
     <string name="cover_search_template_with_author">Capa do audiobook %1$s, feito por %2$s</string>
     <string name="cover_search.icon_recent">Pesquisa recente</string>
     <string name="cover_search.author">Autor</string>
     <string name="select_folder_title_default">Adicionar seus Audiobook(s)</string>
-    <string name="select_folder_type_file">Arquivo</string>
+    <string name="select_folder_type_file">Ficheiro</string>
     <string name="select_folder_type_folder">Pasta</string>
     <string name="select_folder_subtitle">Gostaria de adicionar um único arquivo como um livro ou pasta?</string>
     <string name="onboarding_welcome_title">Seja bem vindo ao Voice!</string>
-    <string name="onboarding.completion.next_button">Começar a Ouvir</string>
+    <string name="onboarding.completion.next_button">Começar a ouvir</string>
 </resources>
\ No newline at end of file

From c8da3168af32341c108893e7721e411cc99a86ba Mon Sep 17 00:00:00 2001
From: ssantos <ssantos@web.de>
Date: Fri, 12 Apr 2024 19:47:59 +0000
Subject: [PATCH 028/236] Translated using Weblate (Portuguese)

Currently translated at 99.1% (118 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/pt/
---
 strings/src/main/res/values-pt/strings.xml | 136 +++++++++++++++++++--
 1 file changed, 125 insertions(+), 11 deletions(-)

diff --git a/strings/src/main/res/values-pt/strings.xml b/strings/src/main/res/values-pt/strings.xml
index 2700852439..b5ee3c0f67 100644
--- a/strings/src/main/res/values-pt/strings.xml
+++ b/strings/src/main/res/values-pt/strings.xml
@@ -1,21 +1,135 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="play_pause">Reproduzir / Pausar</string>
-    <string name="next_track">Faixa seguinte</string>
-    <string name="pause">Pausa</string>
-    <string name="fast_forward">Avançar</string>
+    <string name="play_pause">Tocar / Pausar</string>
+    <string name="next_track">Próximo capítulo</string>
+    <string name="pause">Parar</string>
+    <string name="fast_forward">Avanço rápido</string>
     <string name="cover">Capa</string>
-    <string name="skip_silence">Saltar silencio</string>
-    <string name="previous_track">Faixa anterior</string>
+    <string name="skip_silence">Pular silêncio</string>
+    <string name="previous_track">Capítulo anterior</string>
     <string name="more">Mais</string>
     <string name="dialog_confirm">Definir</string>
     <string name="dialog_cancel">Cancelar</string>
     <string name="play">Reproduzir</string>
-    <string name="action_sleep">Temporizador</string>
-    <string name="volume_boost">Aumentar volume</string>
-    <string name="download_book_cover">Obter capa na Internet</string>
+    <string name="action_sleep">Desligamento automático</string>
+    <string name="volume_boost">Aumento de volume</string>
+    <string name="download_book_cover">Capa da internet</string>
     <string name="onboarding.completion.subtitle">Seu primeiro audiolivro está pronto para ser reproduzido. Aproveite sua jornada com o Voice!</string>
     <string name="rewind">Retroceder</string>
-    <string name="change_book_name">Nome</string>
-    <string name="pick_book_cover">Obter capa nos arquivos</string>
+    <string name="change_book_name">Título</string>
+    <string name="pick_book_cover">Capa do sistema de ficheiros</string>
+    <string name="generic_error_message">Algo deu errado 😢</string>
+    <string name="storage_bug_title">Permissão necessária</string>
+    <string name="onboarding_welcome_subtitle">O seu reprodutor de bolso pessoal de audiobook. Vamos preparar-nos para isso.</string>
+    <string name="review.feedback.button.no">Cancelar</string>
+    <string name="review.feedback.button.yes">Enviar Feedback</string>
+    <string name="book_header_not_started">Não iniciado ainda</string>
+    <string name="book_header_completed">Concluído</string>
+    <string name="close">Fechar</string>
+    <string name="delete">Apagar</string>
+    <string name="add">Adicionar</string>
+    <string name="folder_mode_author">Modo Autor de Livro: Subpastas são autores, sub-subpasta são livros.</string>
+    <string name="migration_detail_content_name">Nome</string>
+    <string name="battery_optimization_action">Atualizar</string>
+    <string name="storage_bug_subtitle">Em certos dispositivos, a app do sistema pode exigir permissões para aceder o armazenamento externo. Esse acesso é essencial para Voice ler os seus audiobooks.</string>
+    <string name="select_folder_title_onboarding">Adicione o Seu Primeiro Audiobook</string>
+    <string name="select_folder_title_default">Adicionar os seus Audiobook(s)</string>
+    <string name="onboarding.button_next">Próximo</string>
+    <string name="onboarding.completion.next_button">Começar a ouvir</string>
+    <string name="onboarding.explanation.title">A sua Livraria, do Seu Jeito</string>
+    <string name="onboarding.explanation.subtitle">Com Voice, pode adicionar livros como ficheiros individuais ou organizar eles em pastas. Voçê decide como!</string>
+    <string name="edit_book_title">Editar livro</string>
+    <string name="mark_as_completed">Marcar como Concluído</string>
+    <string name="mark_as_current">Marca com Actual</string>
+    <string name="mark_as_not_started">Marca como não iniciado</string>
+    <string name="audiobook_folders_title">Pastas de audiolivros</string>
+    <string name="playback_speed">Velocidade de reprodução</string>
+    <string name="bookmark">Marcador</string>
+    <string name="bookmark_edit_title">Editar marcador</string>
+    <string name="bookmark_edit_hint">Título do marcador</string>
+    <string name="bookmark_added">Marcador adicionado</string>
+    <string name="action_settings">Preferências</string>
+    <plurals name="seconds">
+        <item quantity="one">%d segundo</item>
+        <item quantity="many">%d segundos</item>
+        <item quantity="other">%d segundos</item>
+    </plurals>
+    <string name="pref_seek_time">Quantidade de Salto</string>
+    <string name="pref_theme_dark">Tema Escuro</string>
+    <string name="pref_auto_rewind_title">Rebobin automaticamente</string>
+    <string name="pref_suggest_idea">Sugerir uma ideia</string>
+    <string name="pref_use_grid">Utilizar a disposição da grelha</string>
+    <string name="pref_report_issue">Reportar um problema</string>
+    <string name="pref_help_translating">Ajuda traduzindo Voice</string>
+    <string name="pref_get_support">Obter apoio</string>
+    <string name="pref_app_version">Versão</string>
+    <string name="popup_edit">Editar</string>
+    <string name="remove">Remover</string>
+    <string name="play_current">Reproduzir atual</string>
+    <string name="book_header_current">Actual</string>
+    <plurals name="folder_type_file_count">
+        <item quantity="one">%d ficheiro de áudio</item>
+        <item quantity="many">%d ficheiros de áudio</item>
+        <item quantity="other">%d ficheiros de áudio</item>
+    </plurals>
+    <string name="folder_type_book_example_header">Isto fará com que os respectivos livros sejam reconhecidos</string>
+    <string name="folder_type_no_books">Voice não conseguiu encontrar nenhum livro. O ficheiro está no formato certo?</string>
+    <string name="folder_type_title">Como os seus ficheiros estão organizados?</string>
+    <string name="bookmark_just_now">Nesse exato momento</string>
+    <string name="voice_intro_first_book">Vamos adicionar uma pasta de Audiolivros para começar a ouvir!</string>
+    <string name="migration_hint_title">Aceder posições de livros antigos</string>
+    <string name="migration_hint_content">Devido alterações na versão do Android, é necessário selecionar a pasta de Audiolivros manualmente no seu aparelho.
+\n
+\nClique no ícone acima para ver a localização antiga dos livros.</string>
+    <string name="migration_hint_confirm">Percebido</string>
+    <string name="migration_detail_title">Posições antigas de livro</string>
+    <string name="migration_detail_content_root">Pasta raiz</string>
+    <string name="migration_detail_content_position">Posição</string>
+    <string name="migration_detail_content_bookmarks">Marcadores de página</string>
+    <string name="migration_detail_content_added_at">Adicionado em</string>
+    <string name="migration_detail_content_position_current_file_title">Ficheiro atual</string>
+    <string name="migration_detail_content_position_current_file_position">Posição no ficheiro</string>
+    <string name="migration_detail_content_position_current_chapter_title">Capítulo atual</string>
+    <string name="migration_detail_content_position_current_chapter_position">Posição no capítulo</string>
+    <string name="migration_delete_dialog_title">Deletar posições</string>
+    <string name="migration_delete_dialog_content">Assim que deletar posições antigas, não poderá recupera-las.</string>
+    <string name="migration_delete_dialog_action_delete">Deletar</string>
+    <string name="migration_delete_dialog_action_keep">Manter</string>
+    <string name="delete_book_bottom_sheet_title">Deletar livro</string>
+    <string name="delete_book_dialog_title">Deletar livro</string>
+    <string name="delete_book_dialog_deletion_confirmation">Deletar os meus ficheiros</string>
+    <string name="delete_book_dialog_content">Isto apagará os ficheiros no seu aparelho.</string>
+    <string name="search_hint">O que procura?</string>
+    <string name="battery_optimization_rationale">Devido à restrições de energia, podem haver interrupções durante a reprodução do livro.</string>
+    <string name="media_session_root">Audiolivros</string>
+    <string name="media_session_recent">Recente</string>
+    <string name="notification_sleep_timer_enable">Ativar desligamento automático</string>
+    <string name="notification_sleep_timer_disable">Desativar desligamento automático</string>
+    <string name="generic_error_retry">Tentar novamente</string>
+    <string name="storage_bug_button">Conceder permissão</string>
+    <string name="select_folder_type_file">Ficheiro</string>
+    <string name="select_folder_type_folder">Pasta</string>
+    <string name="review.request.button.yes">Avalie agora</string>
+    <string name="review.request.button.no">Não, obrigado</string>
+    <string name="select_folder_subtitle">Gostaria de adicionar um único ficheiro como um livro ou pasta?</string>
+    <string name="onboarding_welcome_title">Seja bem vindo ao Voice!</string>
+    <string name="onboarding.completion.title">Está tudo pronto!</string>
+    <string name="review.request.title">Gosta de Voice?</string>
+    <string name="review.request.content">O seu feedback é importante para nós! Se tiver um momento, avalie-nos e partilhe a sua experiência. Ele ajuda a gente a melhorar ainda mais as suas lidas.</string>
+    <string name="review.feedback.title">Sentimos muito por isso!</string>
+    <string name="review.feedback.content">Poderia nos dizer o que errado? Valorizamos o seu feedback e com ele sabemos como melhorar a sua experiência.</string>
+    <string name="sleep_timer.title">Bons sonhos! 🌙</string>
+    <string name="sleep_timer.button.increment">Mais longo</string>
+    <string name="sleep_timer.button.decrement">Mais curto</string>
+    <plurals name="minutes">
+        <item quantity="one">%d minuto</item>
+        <item quantity="many">%d minutos</item>
+        <item quantity="other">%d minutos</item>
+    </plurals>
+    <string name="folder_mode_single">Pasta única de Audiobook. Cada pasta representa um único livro.</string>
+    <string name="cover_search_template_no_author">Capa do audiobook %s</string>
+    <string name="cover_search_template_with_author">Capa do audiobook %1$s, feito por %2$s</string>
+    <string name="cover_search.icon_recent">Pesquisa recente</string>
+    <string name="content_cover">Mostra capas para escolher</string>
+    <string name="cover_search.author">Autor</string>
 </resources>
\ No newline at end of file

From fbbeae7d1dc90293c1d137482996db0c0b96e953 Mon Sep 17 00:00:00 2001
From: Kakaeo <monirzadeh@gmail.com>
Date: Tue, 16 Apr 2024 09:02:46 +0000
Subject: [PATCH 029/236] Translated using Weblate (Persian)

Currently translated at 100.0% (119 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/fa/
---
 strings/src/main/res/values-fa-rIR/strings.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/strings/src/main/res/values-fa-rIR/strings.xml b/strings/src/main/res/values-fa-rIR/strings.xml
index 376623b30f..0381ac67b4 100644
--- a/strings/src/main/res/values-fa-rIR/strings.xml
+++ b/strings/src/main/res/values-fa-rIR/strings.xml
@@ -91,7 +91,7 @@
     <string name="storage_bug_button">اعطا مجوز</string>
     <string name="review.request.button.no">نه، متشکرم</string>
     <string name="review.feedback.button.yes">فرستادن بازخورد</string>
-    <string name="cover_search_template_with_author">%1$s به وسیله %2$s کاور کتاب صوتی</string>
+    <string name="cover_search_template_with_author">%1$s توسط %2$s کاور کتاب صوتی</string>
     <string name="cover_search_template_no_author">%s کاور کتاب صوتی</string>
     <string name="pref_help_translating">کمک برای ترجمه Voice</string>
     <string name="generic_error_message">مشکلی پیش آمد 😢</string>
@@ -129,6 +129,5 @@
     <string name="onboarding.button_next">بعدی</string>
     <string name="migration_hint_content">با توجه به تغییرات نسخه های جدیدتر اندروید، لازم است پوشه کتاب صوتی خود را با استفاده از انتخابگر سیستم انتخاب کنید.
 \n
-\n
 \nبرای مشاهده موقعیت های کتاب قدیمی خود روی آیکن بالا کلیک کنید.</string>
 </resources>
\ No newline at end of file

From 0712220f956bf635cc001554ae35ee440129bc2f Mon Sep 17 00:00:00 2001
From: Lina Debeer <linadebeer2000@gmail.com>
Date: Wed, 22 May 2024 19:44:10 +0000
Subject: [PATCH 030/236] Translated using Weblate (Dutch)

Currently translated at 97.4% (116 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/nl/
---
 .../src/main/res/values-nl-rNL/strings.xml    | 37 +++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/strings/src/main/res/values-nl-rNL/strings.xml b/strings/src/main/res/values-nl-rNL/strings.xml
index 24c078e065..13788dbac7 100644
--- a/strings/src/main/res/values-nl-rNL/strings.xml
+++ b/strings/src/main/res/values-nl-rNL/strings.xml
@@ -49,8 +49,8 @@
     <string name="close">Sluiten</string>
     <string name="delete">Verwijderen</string>
     <string name="add">Toevoegen</string>
-    <string name="folder_mode_root">De hoofdmap met luisterboeken. Eén onderliggende map = één boek.</string>
-    <string name="folder_mode_single">Losse luisterboekmap</string>
+    <string name="folder_mode_root">De hoofdmap met luisterboeken. Subfolders bevatten boeken.</string>
+    <string name="folder_mode_single">Losse luisterboekmap: één folder bevat één boek.</string>
     <plurals name="folder_type_file_count">
         <item quantity="one">%d audiobestand</item>
         <item quantity="other">%d audiobestanden</item>
@@ -94,4 +94,35 @@
     <string name="pause">Pauzeren</string>
     <string name="cover_search_template_no_author">%s audioboek omslag</string>
     <string name="cover_search_template_with_author">%1$s door %2$s audioboekomslag</string>
-</resources>
+    <string name="select_folder_type_file">Bestand</string>
+    <string name="select_folder_title_default">Voeg Audioboek(en) toe</string>
+    <string name="folder_mode_author">Auteur-boek mode: Subfolders zijn auteurs, sub-subfolders bevatten boeken.</string>
+    <string name="storage_bug_subtitle">Voor sommige toestellen mist een systeem applicatie toegang tot de externe opslag. Deze toegang is essentieel voor Voice om de je audioboeken te kunnen lezen.</string>
+    <string name="storage_bug_title">Toegang vereist</string>
+    <string name="storage_bug_button">Toegang geven</string>
+    <string name="select_folder_title_onboarding">Voeg je eerste audiobook toe</string>
+    <string name="review.request.title">Tevreden met Voice?</string>
+    <string name="review.request.button.yes">Beoordeeld Nu</string>
+    <string name="review.request.button.no">Nee, bedankt</string>
+    <string name="review.feedback.title">Het spijt ons dit te horen!</string>
+    <string name="review.feedback.content">Kan je ons vertellen wat misliep? We appreciëren jou mening en dit help ons je ervaring te verbeteren.</string>
+    <string name="review.feedback.button.no">Annuleer</string>
+    <string name="sleep_timer.title">Slaapwel! 🌙</string>
+    <string name="sleep_timer.button.increment">Langer</string>
+    <string name="sleep_timer.button.decrement">Korter</string>
+    <plurals name="minutes">
+        <item quantity="one">minuut</item>
+        <item quantity="other">minuten</item>
+    </plurals>
+    <string name="cover_search.author">Auteur</string>
+    <string name="onboarding_welcome_title">Welkom bij Voice!</string>
+    <string name="onboarding.button_next">Volgende</string>
+    <string name="select_folder_type_folder">Map</string>
+    <string name="onboarding.explanation.subtitle">Met Voice kan je individuele boeken toevoegen of ze organiseren in folders. Jij kiest!</string>
+    <string name="onboarding.explanation.title">Jouw bibliotheek, jouw manier</string>
+    <string name="onboarding.completion.next_button">Begin te luisteren</string>
+    <string name="cover_search.icon_recent">Recente zoekopdracht</string>
+    <string name="select_folder_subtitle">Wil je een enkel bestand toevoegen als een boek of een folder?</string>
+    <string name="onboarding.completion.subtitle">Je eerste audioboek is klaar om af te spelen. Geniet van je ervaring met Voice!</string>
+    <string name="review.request.content">Je menig is van belang voor ons. Neem even de tijd, beoordeeld ons en deel je ervaring. Dit helpt ons verbeteringen aan te brengen en een betere ervaring aan te bieden.</string>
+</resources>
\ No newline at end of file

From d06e92f76c2c2d532ed3570a8772caeff49ac0d9 Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@posteo.de>
Date: Wed, 12 Jun 2024 19:42:54 +0000
Subject: [PATCH 031/236] Translated using Weblate (Czech)

Currently translated at 100.0% (119 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/cs/
---
 strings/src/main/res/values-cs/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/strings/src/main/res/values-cs/strings.xml b/strings/src/main/res/values-cs/strings.xml
index c739902b5c..40c835b569 100644
--- a/strings/src/main/res/values-cs/strings.xml
+++ b/strings/src/main/res/values-cs/strings.xml
@@ -86,7 +86,7 @@
     <plurals name="folder_type_file_count">
         <item quantity="one">%d zvukový soubor</item>
         <item quantity="few">%d zvukové soubory</item>
-        <item quantity="other">%d zvukových souborů</item>
+        <item quantity="other">"%d  zvukových souborů"</item>
     </plurals>
     <string name="voice_intro_first_book">Pojďme přidat vaši složku s audioknihami ať můžete začít poslouchat!</string>
     <string name="migration_detail_content_position">Pozice</string>

From 42b9c70741c685508b51be4530e746369ff917d7 Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@posteo.de>
Date: Wed, 12 Jun 2024 19:43:52 +0000
Subject: [PATCH 032/236] Translated using Weblate (Czech)

Currently translated at 100.0% (119 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/cs/
---
 strings/src/main/res/values-cs/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/strings/src/main/res/values-cs/strings.xml b/strings/src/main/res/values-cs/strings.xml
index 40c835b569..c739902b5c 100644
--- a/strings/src/main/res/values-cs/strings.xml
+++ b/strings/src/main/res/values-cs/strings.xml
@@ -86,7 +86,7 @@
     <plurals name="folder_type_file_count">
         <item quantity="one">%d zvukový soubor</item>
         <item quantity="few">%d zvukové soubory</item>
-        <item quantity="other">"%d  zvukových souborů"</item>
+        <item quantity="other">%d zvukových souborů</item>
     </plurals>
     <string name="voice_intro_first_book">Pojďme přidat vaši složku s audioknihami ať můžete začít poslouchat!</string>
     <string name="migration_detail_content_position">Pozice</string>

From 75fbf49892d960f02d4eccc18fa048cfc9bf4ebc Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Wed, 12 Jun 2024 21:50:52 +0200
Subject: [PATCH 033/236] Suppress czech quantity lint warnings

---
 lint.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lint.xml b/lint.xml
index dad4d05afb..1d98677c6c 100644
--- a/lint.xml
+++ b/lint.xml
@@ -3,9 +3,11 @@
   <issue id="Typos" severity="informational" />
   <issue id="TypographyEllipsis" severity="informational" />
   <issue id="MissingTranslation" severity="informational" />
+  <!-- https://github.com/WeblateOrg/weblate/issues/7520 -->
   <issue id="MissingQuantity">
     <ignore regexp=".*?French.*?many" />
     <ignore regexp=".*?Slovak.*?many" />
+    <ignore regexp=".*?Czech.*?many" />
   </issue>
   <issue id="Overdraw" severity="informational" />
   <issue id="RestrictedApi" severity="informational" />

From 4fb7dc8bb9385d9c60ef173b53a238805b3dd8ea Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Wed, 12 Jun 2024 21:51:23 +0200
Subject: [PATCH 034/236] Migrate the config cache flag

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 5eb040f3d7..089dcf6411 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,6 +10,6 @@ android.uniquePackageNames=true
 android.useAndroidX=true
 org.gradle.caching=true
 org.gradle.parallel=true
-org.gradle.unsafe.configuration-cache=true
+org.gradle.configuration-cache=true
 kotlin.daemon.useFallbackStrategy=false
 org.gradle.kotlin.dsl.allWarningsAsErrors=true

From 5d2557225c2fb765b1501c25e8ab8287a29aa58b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 12 Jun 2024 19:52:04 +0000
Subject: [PATCH 035/236] Update actions/checkout digest to 692973e

---
 .github/workflows/voice.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index 9832188f8f..a777eef232 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -61,7 +61,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@6ccd57f4c5d15bdc2fef309bd9fb6cc9db2ef1c6
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
 
       - name: Set up JDK
         uses: actions/setup-java@v4.2.1

From fe0bb374ba7c0d5929e98fd55b2252052cadc912 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 13 Jun 2024 19:09:22 +0000
Subject: [PATCH 036/236] Update actions/checkout digest to 692973e

---
 .github/workflows/voice.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index a777eef232..c1540d3292 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -25,7 +25,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v3

From 4d73c1c667ab4d687d4613da128a430cd06aeb6e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 13 Jun 2024 19:09:26 +0000
Subject: [PATCH 037/236] Update agp to v8.5.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fc90001076..dbd386b57f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ materialDialog = "3.3.0"
 dagger = "2.51.1"
 kotlin = "2.0.0"
 media3 = "1.3.1"
-agp = "8.4.2"
+agp = "8.5.0"
 ktlint-core = "1.2.1"
 ktlint-gradlePlugin = "0.9.0"
 retrofit = "2.11.0"

From 2cf01d7865469d9c0f9128fa9eed001b802a14f7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 07:57:14 +0000
Subject: [PATCH 038/236] Update plugin playPublish to v3.10.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index dbd386b57f..58a7428502 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -159,6 +159,6 @@ compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "
 anvil = { id = "com.squareup.anvil", version = "2.5.0-beta09" }
 ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
 ksp = { id = "com.google.devtools.ksp", version = "2.0.0-1.0.22" }
-playPublish = { id = "com.github.triplet.play", version = "3.9.1" }
+playPublish = { id = "com.github.triplet.play", version = "3.10.0" }
 android-app = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }

From eb39d5b880f8316a5f5f93a4db41893898e6828b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Jun 2024 17:50:18 +0000
Subject: [PATCH 039/236] Update plugin playPublish to v3.10.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 58a7428502..b6c24c30fa 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -159,6 +159,6 @@ compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "
 anvil = { id = "com.squareup.anvil", version = "2.5.0-beta09" }
 ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
 ksp = { id = "com.google.devtools.ksp", version = "2.0.0-1.0.22" }
-playPublish = { id = "com.github.triplet.play", version = "3.10.0" }
+playPublish = { id = "com.github.triplet.play", version = "3.10.1" }
 android-app = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }

From 19ec80bd94b9946a74bcb20287b322763472147e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 21:53:03 +0000
Subject: [PATCH 040/236] Update dependency
 androidx.test.espresso:espresso-core to v3.6.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b6c24c30fa..7d5df24057 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -74,7 +74,7 @@ androidX-test-core = "androidx.test:core-ktx:1.5.0"
 androidTest-orchestrator = "androidx.test:orchestrator:1.4.2"
 androidTest-services-testServices = "androidx.test.services:test-services:1.4.2"
 androidTest-services-storage = "androidx.test.services:storage:1.4.2"
-androidTest-espresso = "androidx.test.espresso:espresso-core:3.5.1"
+androidTest-espresso = "androidx.test.espresso:espresso-core:3.6.0"
 androidTest-rules = "androidx.test:rules:1.5.0"
 
 conductor = "com.bluelinelabs:conductor:4.0.0-preview-4"

From fe438ef033b025ab7550ea8ff3ca39bec97b1a55 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 21:53:17 +0000
Subject: [PATCH 041/236] Update dependency
 androidx.test.services:test-services to v1.5.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7d5df24057..e365c0db94 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -72,7 +72,7 @@ androidX-test-junit = "androidx.test.ext:junit:1.1.5"
 androidX-test-core = "androidx.test:core-ktx:1.5.0"
 
 androidTest-orchestrator = "androidx.test:orchestrator:1.4.2"
-androidTest-services-testServices = "androidx.test.services:test-services:1.4.2"
+androidTest-services-testServices = "androidx.test.services:test-services:1.5.0"
 androidTest-services-storage = "androidx.test.services:storage:1.4.2"
 androidTest-espresso = "androidx.test.espresso:espresso-core:3.6.0"
 androidTest-rules = "androidx.test:rules:1.5.0"

From 1cd0455c867c9abc98952018d049bd6f0f41ef9e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 21:53:08 +0000
Subject: [PATCH 042/236] Update dependency androidx.test.ext:junit to v1.2.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e365c0db94..70ad97fbf3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -68,7 +68,7 @@ room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
 room-testing = { module = "androidx.room:room-testing", version.ref = "room" }
 
 androidX-test-runner = "androidx.test:runner:1.5.2"
-androidX-test-junit = "androidx.test.ext:junit:1.1.5"
+androidX-test-junit = "androidx.test.ext:junit:1.2.0"
 androidX-test-core = "androidx.test:core-ktx:1.5.0"
 
 androidTest-orchestrator = "androidx.test:orchestrator:1.4.2"

From 89516b18a89cddf1d0d1b26e16726c9064a3f7c4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 25 Jun 2024 00:55:20 +0000
Subject: [PATCH 043/236] Update dependency androidx.test.services:storage to
 v1.5.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 70ad97fbf3..869670e03f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -73,7 +73,7 @@ androidX-test-core = "androidx.test:core-ktx:1.5.0"
 
 androidTest-orchestrator = "androidx.test:orchestrator:1.4.2"
 androidTest-services-testServices = "androidx.test.services:test-services:1.5.0"
-androidTest-services-storage = "androidx.test.services:storage:1.4.2"
+androidTest-services-storage = "androidx.test.services:storage:1.5.0"
 androidTest-espresso = "androidx.test.espresso:espresso-core:3.6.0"
 androidTest-rules = "androidx.test:rules:1.5.0"
 

From 7a31ecaa4d07e58428aec16de2c68a4337c78d40 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 25 Jun 2024 00:55:31 +0000
Subject: [PATCH 044/236] Update dependency androidx.test:rules to v1.6.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 869670e03f..0c49b2d226 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -75,7 +75,7 @@ androidTest-orchestrator = "androidx.test:orchestrator:1.4.2"
 androidTest-services-testServices = "androidx.test.services:test-services:1.5.0"
 androidTest-services-storage = "androidx.test.services:storage:1.5.0"
 androidTest-espresso = "androidx.test.espresso:espresso-core:3.6.0"
-androidTest-rules = "androidx.test:rules:1.5.0"
+androidTest-rules = "androidx.test:rules:1.6.0"
 
 conductor = "com.bluelinelabs:conductor:4.0.0-preview-4"
 

From f00667fc93e9d873091478495fa7276eda01e9d9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 25 Jun 2024 00:55:27 +0000
Subject: [PATCH 045/236] Update dependency androidx.test:orchestrator to
 v1.5.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0c49b2d226..a992d4ec4d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -71,7 +71,7 @@ androidX-test-runner = "androidx.test:runner:1.5.2"
 androidX-test-junit = "androidx.test.ext:junit:1.2.0"
 androidX-test-core = "androidx.test:core-ktx:1.5.0"
 
-androidTest-orchestrator = "androidx.test:orchestrator:1.4.2"
+androidTest-orchestrator = "androidx.test:orchestrator:1.5.0"
 androidTest-services-testServices = "androidx.test.services:test-services:1.5.0"
 androidTest-services-storage = "androidx.test.services:storage:1.5.0"
 androidTest-espresso = "androidx.test.espresso:espresso-core:3.6.0"

From 228cb731e7256ecf9f8b6ea6ca13ff9e426f388d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 25 Jun 2024 00:55:24 +0000
Subject: [PATCH 046/236] Update dependency androidx.test:core-ktx to v1.6.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a992d4ec4d..d4acc724fa 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -69,7 +69,7 @@ room-testing = { module = "androidx.room:room-testing", version.ref = "room" }
 
 androidX-test-runner = "androidx.test:runner:1.5.2"
 androidX-test-junit = "androidx.test.ext:junit:1.2.0"
-androidX-test-core = "androidx.test:core-ktx:1.5.0"
+androidX-test-core = "androidx.test:core-ktx:1.6.0"
 
 androidTest-orchestrator = "androidx.test:orchestrator:1.5.0"
 androidTest-services-testServices = "androidx.test.services:test-services:1.5.0"

From 2558863902284c39abb4356d208e9c2ed203dd73 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 25 Jun 2024 00:55:35 +0000
Subject: [PATCH 047/236] Update dependency androidx.test:runner to v1.6.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d4acc724fa..c97570ed03 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -67,7 +67,7 @@ room-runtime = { module = "androidx.room:room-ktx", version.ref = "room" }
 room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
 room-testing = { module = "androidx.room:room-testing", version.ref = "room" }
 
-androidX-test-runner = "androidx.test:runner:1.5.2"
+androidX-test-runner = "androidx.test:runner:1.6.0"
 androidX-test-junit = "androidx.test.ext:junit:1.2.0"
 androidX-test-core = "androidx.test:core-ktx:1.6.0"
 

From 3b2ecd2bc6b991a5bc3f053bd4b50095176c379b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 25 Jun 2024 16:33:05 +0000
Subject: [PATCH 048/236] Update dependency
 org.jetbrains.kotlinx:kotlinx-serialization-json to v1.7.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c97570ed03..a8c10bff81 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -61,7 +61,7 @@ coroutines-guava = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-guava",
 coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
 coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
 
-serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0"
+serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1"
 
 room-runtime = { module = "androidx.room:room-ktx", version.ref = "room" }
 room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }

From e5a6c9e16e3458fc15f744896a5583d8f816f2a2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 27 Jun 2024 01:11:26 +0000
Subject: [PATCH 049/236] Update dependency
 androidx.test.espresso:espresso-core to v3.6.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a8c10bff81..e4ae12e018 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -74,7 +74,7 @@ androidX-test-core = "androidx.test:core-ktx:1.6.0"
 androidTest-orchestrator = "androidx.test:orchestrator:1.5.0"
 androidTest-services-testServices = "androidx.test.services:test-services:1.5.0"
 androidTest-services-storage = "androidx.test.services:storage:1.5.0"
-androidTest-espresso = "androidx.test.espresso:espresso-core:3.6.0"
+androidTest-espresso = "androidx.test.espresso:espresso-core:3.6.1"
 androidTest-rules = "androidx.test:rules:1.6.0"
 
 conductor = "com.bluelinelabs:conductor:4.0.0-preview-4"

From 88c7e51b832bff333a8c106ccaa2c38ca3572a86 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 27 Jun 2024 01:11:30 +0000
Subject: [PATCH 050/236] Update dependency androidx.test.ext:junit to v1.2.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e4ae12e018..3c56ac166a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -68,7 +68,7 @@ room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
 room-testing = { module = "androidx.room:room-testing", version.ref = "room" }
 
 androidX-test-runner = "androidx.test:runner:1.6.0"
-androidX-test-junit = "androidx.test.ext:junit:1.2.0"
+androidX-test-junit = "androidx.test.ext:junit:1.2.1"
 androidX-test-core = "androidx.test:core-ktx:1.6.0"
 
 androidTest-orchestrator = "androidx.test:orchestrator:1.5.0"

From 7aa3ef62a6f0fa53eccf6ea446db17fef65dc23b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 27 Jun 2024 04:17:18 +0000
Subject: [PATCH 051/236] Update dependency androidx.test:core-ktx to v1.6.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3c56ac166a..ae599a1bf2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -69,7 +69,7 @@ room-testing = { module = "androidx.room:room-testing", version.ref = "room" }
 
 androidX-test-runner = "androidx.test:runner:1.6.0"
 androidX-test-junit = "androidx.test.ext:junit:1.2.1"
-androidX-test-core = "androidx.test:core-ktx:1.6.0"
+androidX-test-core = "androidx.test:core-ktx:1.6.1"
 
 androidTest-orchestrator = "androidx.test:orchestrator:1.5.0"
 androidTest-services-testServices = "androidx.test.services:test-services:1.5.0"

From a2681acd53b75d19f87713b6ee43b250402ab0fc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 27 Jun 2024 04:17:25 +0000
Subject: [PATCH 052/236] Update dependency androidx.test:runner to v1.6.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ae599a1bf2..9909b5e70a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -67,7 +67,7 @@ room-runtime = { module = "androidx.room:room-ktx", version.ref = "room" }
 room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
 room-testing = { module = "androidx.room:room-testing", version.ref = "room" }
 
-androidX-test-runner = "androidx.test:runner:1.6.0"
+androidX-test-runner = "androidx.test:runner:1.6.1"
 androidX-test-junit = "androidx.test.ext:junit:1.2.1"
 androidX-test-core = "androidx.test:core-ktx:1.6.1"
 

From 78f654158d0640508edf6012c238ab70779d97e6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 27 Jun 2024 04:17:21 +0000
Subject: [PATCH 053/236] Update dependency androidx.test:rules to v1.6.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9909b5e70a..a7901721f1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -75,7 +75,7 @@ androidTest-orchestrator = "androidx.test:orchestrator:1.5.0"
 androidTest-services-testServices = "androidx.test.services:test-services:1.5.0"
 androidTest-services-storage = "androidx.test.services:storage:1.5.0"
 androidTest-espresso = "androidx.test.espresso:espresso-core:3.6.1"
-androidTest-rules = "androidx.test:rules:1.6.0"
+androidTest-rules = "androidx.test:rules:1.6.1"
 
 conductor = "com.bluelinelabs:conductor:4.0.0-preview-4"
 

From f45b5f2f0dbefc1525bd1e76b51fab75ca289795 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 19:15:54 +0000
Subject: [PATCH 054/236] Update dependency
 androidx.lifecycle:lifecycle-runtime-ktx to v2.8.3

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a7901721f1..f6a4b32538 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -94,7 +94,7 @@ media3-session = { module = "androidx.media3:media3-session", version.ref = "med
 media3-testUtils-core = { module = "androidx.media3:media3-test-utils", version.ref = "media3" }
 media3-testUtils-robolectric = { module = "androidx.media3:media3-test-utils-robolectric", version.ref = "media3" }
 
-lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.2"
+lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.3"
 
 compose-bom = "androidx.compose:compose-bom:2024.06.00"
 compose-ui-ui = { module = "androidx.compose.ui:ui" }

From db429c4026d4e82d0eeade86554f6e6b20492b01 Mon Sep 17 00:00:00 2001
From: ovl-1 <ovl-002@mailinator.com>
Date: Fri, 21 Jun 2024 14:02:53 +0000
Subject: [PATCH 055/236] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 83.1% (99 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/nb_NO/
---
 .../src/main/res/values-nb-rNO/strings.xml    | 48 +++++++++++--------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/strings/src/main/res/values-nb-rNO/strings.xml b/strings/src/main/res/values-nb-rNO/strings.xml
index 16db38049e..174b9c08d9 100644
--- a/strings/src/main/res/values-nb-rNO/strings.xml
+++ b/strings/src/main/res/values-nb-rNO/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="fast_forward">Hurtigspoling</string>
+    <string name="fast_forward">Spol raskt framover</string>
     <string name="skip_silence">Hopp over stillhet</string>
     <string name="volume_boost">Lydstyrkeforsterkning</string>
     <string name="more">Mer</string>
@@ -8,33 +8,33 @@
     <string name="playback_speed">Avspillingshastighet</string>
     <string name="bookmark">Bokmerke</string>
     <string name="bookmark_edit_hint">Bokmerkenavn</string>
-    <string name="pref_seek_time">Hopp over mengde</string>
-    <string name="pref_use_grid">Bruk rutenettsoppsett</string>
-    <string name="pref_help_translating">Bistå oversettelsen</string>
+    <string name="pref_seek_time">Hoppintervall</string>
+    <string name="pref_use_grid">Bruk rutenettoppsett</string>
+    <string name="pref_help_translating">Hjelp til å oversette Voice</string>
     <string name="pref_get_support">Få støtte</string>
     <string name="book_header_current">Nåværende</string>
     <string name="book_header_completed">Fullført</string>
-    <string name="folder_mode_root">Rot-lydboksmappe. Én lydbok = én bok.</string>
-    <string name="folder_mode_single">Enkelt lydboksmappe</string>
+    <string name="folder_mode_root">Bokmodus på øverste nivå: Undermapper er bøker</string>
+    <string name="folder_mode_single">Singelbokmodus: Én mappe tilsvarer én bok.</string>
     <string name="folder_type_title">Hvilken struktur har filene dine\?</string>
     <string name="migration_detail_content_bookmarks">Bokmerker</string>
-    <string name="voice_intro_first_book">Legg til lydboksmappen din for å begynne å lytte.</string>
+    <string name="voice_intro_first_book">Legg til lydbokmappen din så du kan begynne å lytte!</string>
     <string name="migration_hint_confirm">Skjønner</string>
     <string name="migration_detail_title">Gamle bokposisjoner</string>
     <string name="migration_detail_content_name">Navn</string>
-    <string name="migration_hint_content">Siden du har nylig Android må du velge lydboksmappe med systemfilvelgeren.
+    <string name="migration_hint_content">På grunn av endringer i nyere Android-versjoner er det nødvendig å velge lydbokmappen din ved hjelp av systemvelgeren.
 \n
 \nKlikk på ikonet ovenfor for å vise dine gamle bokposisjoner.</string>
     <string name="migration_detail_content_position_current_chapter_title">Nåværende kapittel</string>
     <string name="migration_delete_dialog_content">Når du sletter de gamle posisjonene vil du ikke kunne gjenopprette dine gamle avspillingsposisjoner.</string>
     <string name="search_hint">Hva leter du etter\?</string>
-    <string name="delete_book_dialog_content">Sletter filene på enheten din.</string>
+    <string name="delete_book_dialog_content">Dette sletter filene på enheten din.</string>
     <string name="media_session_root">Alle lydbøker</string>
     <string name="media_session_recent">Nylig</string>
     <string name="battery_optimization_action">Gjenoppfrisk</string>
     <string name="cover">Omslag</string>
     <string name="play_pause">Spill/pause</string>
-    <string name="action_sleep">Søvntidsur</string>
+    <string name="action_sleep">Sove-timer</string>
     <string name="rewind">Spol tilbake</string>
     <string name="previous_track">Forrige spor</string>
     <string name="next_track">Neste spor</string>
@@ -44,12 +44,12 @@
     <string name="change_book_name">Navn</string>
     <string name="download_book_cover">Omslag fra Internett</string>
     <string name="mark_as_completed">Marker som fullført</string>
-    <string name="audiobook_folders_title">Lydboksmapper</string>
+    <string name="audiobook_folders_title">Lydbokmapper</string>
     <string name="edit_book_title">Rediger bok</string>
     <string name="mark_as_current">Marker som pågående</string>
     <string name="mark_as_not_started">Marker som ikke startet enda</string>
     <string name="bookmark_edit_title">Rediger bokmerke</string>
-    <string name="bookmark_added">Bokmerket</string>
+    <string name="bookmark_added">Bokmerke lagt til</string>
     <string name="action_settings">Innstillinger</string>
     <string name="pref_report_issue">Rapporter problem</string>
     <string name="bookmark_just_now">Akkurat nå</string>
@@ -68,7 +68,7 @@
     <string name="play_current">Spill nåværende</string>
     <string name="close">Lukk</string>
     <string name="add">Legg til</string>
-    <string name="folder_type_book_example_header">Følgende bøker vil bli lagt til</string>
+    <string name="folder_type_book_example_header">Dette vil føre til at følgende bøker oppdages</string>
     <plurals name="folder_type_file_count">
         <item quantity="one">%d lydfil</item>
         <item quantity="other">%d lydfiler</item>
@@ -79,17 +79,17 @@
     <string name="migration_delete_dialog_action_keep">Behold</string>
     <string name="delete_book_dialog_deletion_confirmation">Slett filene mine</string>
     <string name="migration_detail_content_position_current_file_title">Nåværende fil</string>
-    <string name="notification_sleep_timer_enable">Skru på søvntidsur</string>
-    <string name="notification_sleep_timer_disable">Skru av søvntidsur</string>
-    <string name="migration_detail_content_added_at">Tillagt</string>
+    <string name="notification_sleep_timer_enable">Slå på sove-timer</string>
+    <string name="notification_sleep_timer_disable">Slå av sove-timer</string>
+    <string name="migration_detail_content_added_at">Lagt til på</string>
     <string name="migration_detail_content_position_current_chapter_position">Posisjon i kapittel</string>
-    <string name="folder_type_no_books">Fant ingen lydbøker. Finnes de\?</string>
+    <string name="folder_type_no_books">Voice klarte ikke å finne noen bøker. Finnes det noen lydfiler?</string>
     <string name="migration_detail_content_position_current_file_position">Posisjon i filen</string>
     <string name="migration_detail_content_root">Rot-mappe</string>
     <string name="migration_delete_dialog_title">Slett posisjoner</string>
     <string name="migration_detail_content_position">Posisjon</string>
     <string name="migration_hint_title">Tilgang til gamle bokposisjoner</string>
-    <string name="battery_optimization_rationale">Som følge av strømsparing kan avspillingen bli forstyrret.</string>
+    <string name="battery_optimization_rationale">På grunn av strømsparingsinnstillinger kan det forekomme avbrudd i avspillingen.</string>
     <string name="generic_error_retry">Prøv igjen</string>
     <string name="generic_error_message">Noe gikk galt 😢</string>
     <string name="play">Spill</string>
@@ -101,4 +101,14 @@
     <string name="select_folder_title_onboarding">Legg til din første lydbok</string>
     <string name="select_folder_type_folder">Mappe</string>
     <string name="onboarding.button_next">Neste</string>
-</resources>
+    <string name="storage_bug_title">Tillatelse kreves</string>
+    <string name="storage_bug_subtitle">På enkelte enheter mangler en systemapp den nødvendige tillatelsen for å få tilgang til det eksterne lagringsmediet. Denne tilgangen er avgjørende for at Voice skal kunne lese lydbøkene dine.</string>
+    <string name="storage_bug_button">Gi tillatelse</string>
+    <string name="select_folder_title_default">Legg til dine lydbøker</string>
+    <string name="cover_search_template_no_author">%s lydbokomslag</string>
+    <string name="folder_mode_author">Forfatter-bok-modus: Undermapper er forfattere, under-undermapper er bøker.</string>
+    <string name="cover_search.icon_recent">Siste søk</string>
+    <string name="cover_search.author">Forfatter</string>
+    <string name="select_folder_type_file">Fil</string>
+    <string name="cover_search_template_with_author">%1$s av %2$s lydbokomslag</string>
+</resources>
\ No newline at end of file

From ef28b52f40df00ae8d6077aa96197b1ad2092733 Mon Sep 17 00:00:00 2001
From: ovl-1 <ovl-002@mailinator.com>
Date: Fri, 21 Jun 2024 14:18:31 +0000
Subject: [PATCH 056/236] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (119 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/nb_NO/
---
 .../src/main/res/values-nb-rNO/strings.xml    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/strings/src/main/res/values-nb-rNO/strings.xml b/strings/src/main/res/values-nb-rNO/strings.xml
index 174b9c08d9..263d398006 100644
--- a/strings/src/main/res/values-nb-rNO/strings.xml
+++ b/strings/src/main/res/values-nb-rNO/strings.xml
@@ -111,4 +111,23 @@
     <string name="cover_search.author">Forfatter</string>
     <string name="select_folder_type_file">Fil</string>
     <string name="cover_search_template_with_author">%1$s av %2$s lydbokomslag</string>
+    <string name="review.feedback.content">Kan du fortelle oss hva som gikk galt? Vi setter pris på tilbakemeldingen din, og det hjelper oss med å forbedre opplevelsen din.</string>
+    <string name="sleep_timer.title">Sov godt! 🌙</string>
+    <string name="sleep_timer.button.decrement">Kortere</string>
+    <string name="sleep_timer.button.increment">Lengre</string>
+    <string name="onboarding.completion.next_button">Start lytting</string>
+    <string name="review.request.title">Liker du Voice?</string>
+    <string name="review.request.button.yes">Vurder nå</string>
+    <string name="review.request.button.no">Nei takk</string>
+    <string name="review.feedback.title">Det var leit å høre!</string>
+    <string name="review.feedback.button.yes">Send tilbakemelding</string>
+    <string name="review.feedback.button.no">Avbryt</string>
+    <string name="select_folder_subtitle">Vil du legge til en enkelt fil som en bok eller en mappe?</string>
+    <string name="onboarding.explanation.subtitle">Med Voice kan du legge til bøker som individuelle filer eller organisere dem i mapper. Ditt valg!</string>
+    <string name="onboarding.completion.title">Du er ferdig!</string>
+    <string name="onboarding_welcome_title">Velkommen til Voice!</string>
+    <string name="onboarding.completion.subtitle">Din første lydbok er klar til å spilles av. Nyt din reise med Voice!</string>
+    <string name="onboarding_welcome_subtitle">Din personlige lydbokspiller. La oss gjøre deg klar.</string>
+    <string name="onboarding.explanation.title">Ditt bibliotek, din måte</string>
+    <string name="review.request.content">Din tilbakemelding er viktig for oss! Hvis du har tid, kan du rangere oss og dele din opplevelse. Det hjelper oss med å gjøre forbedringer og tilby en bedre lytteopplevelse.</string>
 </resources>
\ No newline at end of file

From 3b948b945dd0913f0e964897df910ad54df84279 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Fri, 21 Jun 2024 14:15:26 +0000
Subject: [PATCH 057/236] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (119 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/nb_NO/
---
 strings/src/main/res/values-nb-rNO/strings.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/strings/src/main/res/values-nb-rNO/strings.xml b/strings/src/main/res/values-nb-rNO/strings.xml
index 263d398006..8332bfb3c9 100644
--- a/strings/src/main/res/values-nb-rNO/strings.xml
+++ b/strings/src/main/res/values-nb-rNO/strings.xml
@@ -9,13 +9,13 @@
     <string name="bookmark">Bokmerke</string>
     <string name="bookmark_edit_hint">Bokmerkenavn</string>
     <string name="pref_seek_time">Hoppintervall</string>
-    <string name="pref_use_grid">Bruk rutenettoppsett</string>
-    <string name="pref_help_translating">Hjelp til å oversette Voice</string>
+    <string name="pref_use_grid">Bruk rutenett</string>
+    <string name="pref_help_translating">Bistå oversettelsen</string>
     <string name="pref_get_support">Få støtte</string>
     <string name="book_header_current">Nåværende</string>
     <string name="book_header_completed">Fullført</string>
     <string name="folder_mode_root">Bokmodus på øverste nivå: Undermapper er bøker</string>
-    <string name="folder_mode_single">Singelbokmodus: Én mappe tilsvarer én bok.</string>
+    <string name="folder_mode_single">Enkeltboksmodus: Én mappe tilsvarer én bok.</string>
     <string name="folder_type_title">Hvilken struktur har filene dine\?</string>
     <string name="migration_detail_content_bookmarks">Bokmerker</string>
     <string name="voice_intro_first_book">Legg til lydbokmappen din så du kan begynne å lytte!</string>
@@ -34,7 +34,7 @@
     <string name="battery_optimization_action">Gjenoppfrisk</string>
     <string name="cover">Omslag</string>
     <string name="play_pause">Spill/pause</string>
-    <string name="action_sleep">Sove-timer</string>
+    <string name="action_sleep">Innsovningstidsur</string>
     <string name="rewind">Spol tilbake</string>
     <string name="previous_track">Forrige spor</string>
     <string name="next_track">Neste spor</string>
@@ -79,8 +79,8 @@
     <string name="migration_delete_dialog_action_keep">Behold</string>
     <string name="delete_book_dialog_deletion_confirmation">Slett filene mine</string>
     <string name="migration_detail_content_position_current_file_title">Nåværende fil</string>
-    <string name="notification_sleep_timer_enable">Slå på sove-timer</string>
-    <string name="notification_sleep_timer_disable">Slå av sove-timer</string>
+    <string name="notification_sleep_timer_enable">Slå på innsovningstidsur</string>
+    <string name="notification_sleep_timer_disable">Slå av innsovningstidsur</string>
     <string name="migration_detail_content_added_at">Lagt til på</string>
     <string name="migration_detail_content_position_current_chapter_position">Posisjon i kapittel</string>
     <string name="folder_type_no_books">Voice klarte ikke å finne noen bøker. Finnes det noen lydfiler?</string>
@@ -103,10 +103,10 @@
     <string name="onboarding.button_next">Neste</string>
     <string name="storage_bug_title">Tillatelse kreves</string>
     <string name="storage_bug_subtitle">På enkelte enheter mangler en systemapp den nødvendige tillatelsen for å få tilgang til det eksterne lagringsmediet. Denne tilgangen er avgjørende for at Voice skal kunne lese lydbøkene dine.</string>
-    <string name="storage_bug_button">Gi tillatelse</string>
+    <string name="storage_bug_button">Innvilg tillatelse</string>
     <string name="select_folder_title_default">Legg til dine lydbøker</string>
     <string name="cover_search_template_no_author">%s lydbokomslag</string>
-    <string name="folder_mode_author">Forfatter-bok-modus: Undermapper er forfattere, under-undermapper er bøker.</string>
+    <string name="folder_mode_author">Forfatter/bok-modus: Undermapper er forfattere, under-undermapper er bøker.</string>
     <string name="cover_search.icon_recent">Siste søk</string>
     <string name="cover_search.author">Forfatter</string>
     <string name="select_folder_type_file">Fil</string>

From c8f8f240e151d4e620c5705413df7373527f2834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Fri, 21 Jun 2024 14:31:32 +0000
Subject: [PATCH 058/236] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (119 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/nb_NO/
---
 strings/src/main/res/values-nb-rNO/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/strings/src/main/res/values-nb-rNO/strings.xml b/strings/src/main/res/values-nb-rNO/strings.xml
index 8332bfb3c9..6dbf00b81d 100644
--- a/strings/src/main/res/values-nb-rNO/strings.xml
+++ b/strings/src/main/res/values-nb-rNO/strings.xml
@@ -123,11 +123,11 @@
     <string name="review.feedback.button.yes">Send tilbakemelding</string>
     <string name="review.feedback.button.no">Avbryt</string>
     <string name="select_folder_subtitle">Vil du legge til en enkelt fil som en bok eller en mappe?</string>
-    <string name="onboarding.explanation.subtitle">Med Voice kan du legge til bøker som individuelle filer eller organisere dem i mapper. Ditt valg!</string>
+    <string name="onboarding.explanation.subtitle">Med Voice kan du legge til bøker som individuelle filer, eller organisere dem i mapper.</string>
     <string name="onboarding.completion.title">Du er ferdig!</string>
     <string name="onboarding_welcome_title">Velkommen til Voice!</string>
     <string name="onboarding.completion.subtitle">Din første lydbok er klar til å spilles av. Nyt din reise med Voice!</string>
     <string name="onboarding_welcome_subtitle">Din personlige lydbokspiller. La oss gjøre deg klar.</string>
-    <string name="onboarding.explanation.title">Ditt bibliotek, din måte</string>
+    <string name="onboarding.explanation.title">Ditt bibliotek, ditt opplegg</string>
     <string name="review.request.content">Din tilbakemelding er viktig for oss! Hvis du har tid, kan du rangere oss og dele din opplevelse. Det hjelper oss med å gjøre forbedringer og tilby en bedre lytteopplevelse.</string>
 </resources>
\ No newline at end of file

From 6bb4eb5bc40a5cc6e1454d07899ec5e7abc013fc Mon Sep 17 00:00:00 2001
From: ovl-1 <ovl-002@mailinator.com>
Date: Sat, 22 Jun 2024 09:52:22 +0000
Subject: [PATCH 059/236] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (119 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/nb_NO/
---
 strings/src/main/res/values-nb-rNO/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/strings/src/main/res/values-nb-rNO/strings.xml b/strings/src/main/res/values-nb-rNO/strings.xml
index 6dbf00b81d..dcfdd431f9 100644
--- a/strings/src/main/res/values-nb-rNO/strings.xml
+++ b/strings/src/main/res/values-nb-rNO/strings.xml
@@ -15,7 +15,7 @@
     <string name="book_header_current">Nåværende</string>
     <string name="book_header_completed">Fullført</string>
     <string name="folder_mode_root">Bokmodus på øverste nivå: Undermapper er bøker</string>
-    <string name="folder_mode_single">Enkeltboksmodus: Én mappe tilsvarer én bok.</string>
+    <string name="folder_mode_single">Enkeltbokmodus: Én mappe tilsvarer én bok.</string>
     <string name="folder_type_title">Hvilken struktur har filene dine\?</string>
     <string name="migration_detail_content_bookmarks">Bokmerker</string>
     <string name="voice_intro_first_book">Legg til lydbokmappen din så du kan begynne å lytte!</string>
@@ -106,7 +106,7 @@
     <string name="storage_bug_button">Innvilg tillatelse</string>
     <string name="select_folder_title_default">Legg til dine lydbøker</string>
     <string name="cover_search_template_no_author">%s lydbokomslag</string>
-    <string name="folder_mode_author">Forfatter/bok-modus: Undermapper er forfattere, under-undermapper er bøker.</string>
+    <string name="folder_mode_author">Forfatterbokmodus: Undermapper er forfattere, under-undermapper er bøker.</string>
     <string name="cover_search.icon_recent">Siste søk</string>
     <string name="cover_search.author">Forfatter</string>
     <string name="select_folder_type_file">Fil</string>

From 574d77b33c874be48c54c628978b2a5d6139a27d Mon Sep 17 00:00:00 2001
From: yesmodeset <ojkoskinen@gmail.com>
Date: Tue, 25 Jun 2024 18:18:12 +0200
Subject: [PATCH 060/236] Added translation using Weblate (Finnish)

---
 strings/src/main/res/values-fi/strings.xml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 strings/src/main/res/values-fi/strings.xml

diff --git a/strings/src/main/res/values-fi/strings.xml b/strings/src/main/res/values-fi/strings.xml
new file mode 100644
index 0000000000..a6b3daec93
--- /dev/null
+++ b/strings/src/main/res/values-fi/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file

From f09a56cae281770a3129fcf8d4ea0ddb266f3fe1 Mon Sep 17 00:00:00 2001
From: yesmodeset <ojkoskinen@gmail.com>
Date: Tue, 25 Jun 2024 16:21:17 +0000
Subject: [PATCH 061/236] Translated using Weblate (Finnish)

Currently translated at 37.8% (45 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/fi/
---
 strings/src/main/res/values-fi/strings.xml | 52 +++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/strings/src/main/res/values-fi/strings.xml b/strings/src/main/res/values-fi/strings.xml
index a6b3daec93..d13bbc89cd 100644
--- a/strings/src/main/res/values-fi/strings.xml
+++ b/strings/src/main/res/values-fi/strings.xml
@@ -1,2 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="pause">Tauko</string>
+    <string name="play_pause">Toisto / Tauko</string>
+    <string name="play">Toisto</string>
+    <string name="action_sleep">Uni-ajastin</string>
+    <string name="rewind">Takaisinkelaus</string>
+    <string name="cover_search.author">Tekijä</string>
+    <string name="edit_book_title">Muokkaa kirjaa</string>
+    <string name="mark_as_completed">Merkitse valmiiksi</string>
+    <string name="mark_as_current">Merkitse nykyseksi</string>
+    <string name="mark_as_not_started">Merkitse ei vielä aloitetuksi</string>
+    <string name="audiobook_folders_title">Äänikirjakansiot</string>
+    <string name="fast_forward">Pikakelaus</string>
+    <string name="previous_track">Edellinen ääniraita</string>
+    <string name="next_track">Seuraava ääniraita</string>
+    <string name="skip_silence">Ohita Hiljaisuus</string>
+    <string name="volume_boost">Äänenvoimakkuuden tehostus</string>
+    <string name="dialog_confirm">Aseta</string>
+    <string name="playback_speed">Toiston nopeus</string>
+    <string name="bookmark">Kirjanmerkki</string>
+    <string name="bookmark_edit_title">Muokkaa kirjanmerkkiä</string>
+    <string name="action_settings">Asetukset</string>
+    <plurals name="seconds">
+        <item quantity="one">%d sekuntti</item>
+        <item quantity="other">%d sekunttia</item>
+    </plurals>
+    <string name="pref_theme_dark">Tumma teema</string>
+    <string name="add">Lisää</string>
+    <string name="cover_search.icon_recent">Viimeisin haku</string>
+    <string name="generic_error_message">Jotakin meni pieleen 😢</string>
+    <string name="generic_error_retry">Yritä uudelleen</string>
+    <string name="storage_bug_title">Käyttöoikeus tarvitaan</string>
+    <string name="storage_bug_subtitle">Eräillä laitteilla joltakin järjestelmän sovellukselta puuttuu tarvittava käyttöoikeus ulkoiseen tallennustilaan. Tämä oikeus on välttämätön jotta Voice voi lukea äänikirjojasi.</string>
+    <string name="select_folder_subtitle">Haluaisitko lisätä yksittäisen tietoston kirjana vai kansiona?</string>
+    <string name="cover">Kansi</string>
+    <string name="more">Enemmän</string>
+    <string name="change_book_name">Nimi</string>
+    <string name="download_book_cover">Kansi internetistä</string>
+    <string name="bookmark_edit_hint">Kirjanmerkin nimi</string>
+    <string name="pick_book_cover">Kansi tiedostojärjestelmästä</string>
+    <string name="dialog_cancel">Peruuta</string>
+    <string name="bookmark_added">Kirjanmerkki lisätty</string>
+    <string name="battery_optimization_action">Päivitä</string>
+    <string name="media_session_recent">Viimeisin</string>
+    <string name="media_session_root">Kaikki äänikirjat</string>
+    <string name="select_folder_type_folder">Kansio</string>
+    <string name="storage_bug_button">Anna käyttöoikeus</string>
+    <string name="select_folder_title_onboarding">Lisää ensimmäinen äänikirjasi</string>
+    <string name="select_folder_title_default">Lisää äänikirjasi</string>
+    <string name="select_folder_type_file">Tiedosto</string>
+</resources>
\ No newline at end of file

From b3d7c14bfcbe1bb559fed0118381380df4944e92 Mon Sep 17 00:00:00 2001
From: yesmodeset <ojkoskinen@gmail.com>
Date: Tue, 25 Jun 2024 16:45:31 +0000
Subject: [PATCH 062/236] Translated using Weblate (Finnish)

Currently translated at 68.0% (81 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/fi/
---
 strings/src/main/res/values-fi/strings.xml | 39 ++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/strings/src/main/res/values-fi/strings.xml b/strings/src/main/res/values-fi/strings.xml
index d13bbc89cd..0d93599cb6 100644
--- a/strings/src/main/res/values-fi/strings.xml
+++ b/strings/src/main/res/values-fi/strings.xml
@@ -49,4 +49,43 @@
     <string name="select_folder_title_onboarding">Lisää ensimmäinen äänikirjasi</string>
     <string name="select_folder_title_default">Lisää äänikirjasi</string>
     <string name="select_folder_type_file">Tiedosto</string>
+    <string name="content_cover">Näyttää kannen jonka valita</string>
+    <string name="book_header_completed">Valmiina</string>
+    <string name="close">Sulje</string>
+    <string name="delete">Poista</string>
+    <string name="book_header_current">Nykyinen</string>
+    <string name="book_header_not_started">Ei vielä aloitettu</string>
+    <string name="cover_search_template_no_author">%s äänikirjan kansi</string>
+    <string name="cover_search_template_with_author">Tekijän %2$s äänikirjan kansi %1$s</string>
+    <string name="onboarding.button_next">Seuraava</string>
+    <string name="onboarding.explanation.title">Sinun kirjastosi, sinun tavallasi</string>
+    <string name="battery_optimization_rationale">Laitteesi virtarajoitusten takija äänentoisto voi katkeilla.</string>
+    <string name="delete_book_bottom_sheet_title">Poista kirja</string>
+    <string name="delete_book_dialog_title">Poista kirja</string>
+    <string name="delete_book_dialog_deletion_confirmation">Poista tiedostoni</string>
+    <string name="delete_book_dialog_content">Tämä poistaa tiedostot laitteeltasi.</string>
+    <string name="search_hint">Mitä etsit?</string>
+    <string name="bookmark_just_now">Juuri äskettäin</string>
+    <string name="migration_hint_title">Vanhojen kirjan paikkohin pääsy</string>
+    <string name="onboarding.explanation.subtitle">Voicella voit lisätä kirjoja yksittäisinä tiedostoina tai järjestellä ne kansioissa. Sinä saat valita!</string>
+    <string name="onboarding.completion.title">Olet valmiina!</string>
+    <string name="onboarding.completion.subtitle">Ensimmäinen äänikirjasi on valmiina kuunneltavaksi. Nauti matkastasi Voicen kanssa!</string>
+    <string name="onboarding.completion.next_button">Aloita kuuntelemaan</string>
+    <string name="review.request.title">Pidätkö Voicesta?</string>
+    <string name="review.request.content">Palautteesi on tärkeätä meille! Jos sinulla on hetki aikaa, arvioi meidät ja jaa kokemuksesi. Se auttaa meitä tekemään parannuksia sovellukseen ja tarjoamaan paremman kuuntelukokemuksen.</string>
+    <string name="review.request.button.yes">Arvioi nyt</string>
+    <string name="review.request.button.no">Ei kiitos</string>
+    <string name="review.feedback.title">Tämäpä on harmillista kuulla!</string>
+    <string name="review.feedback.content">Voisitko kertoa meille mikä meni väärin? Arvostaisimme palautettasi ja se auttaa meitä parantamaan käyttökokemustasi.</string>
+    <string name="review.feedback.button.yes">Lähetä palautetta</string>
+    <string name="review.feedback.button.no">Peruuta</string>
+    <string name="sleep_timer.title">Hyviä unia! 🌙</string>
+    <string name="sleep_timer.button.increment">Pidempään</string>
+    <string name="sleep_timer.button.decrement">Lyhyempään</string>
+    <plurals name="minutes">
+        <item quantity="one">1 minuutti</item>
+        <item quantity="other">%d minuuttia</item>
+    </plurals>
+    <string name="onboarding_welcome_title">Tervetuloa Voiceen!</string>
+    <string name="voice_intro_first_book">Lisätään äänikirjakansiosi jotta voit aloittaa kuuntelemisen!</string>
 </resources>
\ No newline at end of file

From fa42096e9ab8937b5024384d41ee1c78db8be49a Mon Sep 17 00:00:00 2001
From: yesmodeset <ojkoskinen@gmail.com>
Date: Wed, 26 Jun 2024 08:21:29 +0000
Subject: [PATCH 063/236] Translated using Weblate (Finnish)

Currently translated at 100.0% (119 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/fi/
---
 strings/src/main/res/values-fi/strings.xml | 42 ++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/strings/src/main/res/values-fi/strings.xml b/strings/src/main/res/values-fi/strings.xml
index 0d93599cb6..9b22b1b7a4 100644
--- a/strings/src/main/res/values-fi/strings.xml
+++ b/strings/src/main/res/values-fi/strings.xml
@@ -88,4 +88,46 @@
     </plurals>
     <string name="onboarding_welcome_title">Tervetuloa Voiceen!</string>
     <string name="voice_intro_first_book">Lisätään äänikirjakansiosi jotta voit aloittaa kuuntelemisen!</string>
+    <string name="folder_mode_author">Tekijä-Kirja-tila: Alikansiot ovat tekijöitä, ali-alikansiot ovat kirjoja.</string>
+    <plurals name="folder_type_file_count">
+        <item quantity="one">%d äänitiedosto</item>
+        <item quantity="other">%d äänitiedostoa</item>
+    </plurals>
+    <string name="folder_type_book_example_header">Tämä johtaisi seuraavien kirjojen havaitsemiseen</string>
+    <string name="folder_type_no_books">Voice ei havainnut mitään kirjoja. Onko äänitiedostoja olemassa?</string>
+    <string name="folder_mode_root">Ylätasokirjatila: Alikansiot ovat kirjoja</string>
+    <string name="folder_mode_single">Yksittäisten kirjojen tila: Yksi kansio on yhtä kuin yksi kirja.</string>
+    <string name="pref_report_issue">Ilmoita ongelmasta</string>
+    <string name="pref_help_translating">Auta kääntämään Voicea</string>
+    <string name="pref_get_support">Hanki tukea</string>
+    <string name="pref_app_version">Sovelluksen versio</string>
+    <string name="popup_edit">Muokkaa</string>
+    <string name="remove">Poista</string>
+    <string name="play_current">Toista nykyinen</string>
+    <string name="pref_seek_time">Ohita määrä</string>
+    <string name="pref_auto_rewind_title">Automaattinen takaisinkelaus</string>
+    <string name="pref_suggest_idea">Ehdota ideaa</string>
+    <string name="pref_use_grid">Käytä ruudukkoasettelua</string>
+    <string name="onboarding_welcome_subtitle">Henkilökohtainen taskuäänikirjasoittimesi. Laitetaanpas homma rullaamaan.</string>
+    <string name="migration_detail_content_position">Sijainti</string>
+    <string name="migration_detail_content_bookmarks">Kirjanmerkit</string>
+    <string name="migration_detail_content_added_at">Lisätty aikaan</string>
+    <string name="migration_detail_content_position_current_file_title">Nykyinen tiedosto</string>
+    <string name="migration_detail_content_position_current_file_position">Sijainti tiedostossa</string>
+    <string name="migration_detail_content_position_current_chapter_title">Nykyinen luku</string>
+    <string name="migration_detail_content_position_current_chapter_position">Sijainti luvussa</string>
+    <string name="migration_delete_dialog_title">Poista sijainnit</string>
+    <string name="migration_delete_dialog_content">Poistettaessasi vanhat sijainnit et enää voi saada takaisin vanhoja sijaintejasi.</string>
+    <string name="migration_delete_dialog_action_delete">Poista</string>
+    <string name="migration_delete_dialog_action_keep">Säilytä</string>
+    <string name="folder_type_title">Miten tiedostosi ovat järjestelty?</string>
+    <string name="migration_hint_content">Johtuen muutoksista uusimmissa Android-versioissa, äänikirjakansiosi täytyy valita järjestelmän valitsimella
+\n
+\nPaina yllä olevaa kuvaketta nähdäksesi vanhat sijaintisi kirjassa.</string>
+    <string name="migration_hint_confirm">Ymmärretty</string>
+    <string name="migration_detail_title">Vanhat sijainnit kirjoissa</string>
+    <string name="migration_detail_content_name">Nimi</string>
+    <string name="migration_detail_content_root">Juurikansio</string>
+    <string name="notification_sleep_timer_disable">Laita uniajastin pois päältä</string>
+    <string name="notification_sleep_timer_enable">Laita uniajastin päälle</string>
 </resources>
\ No newline at end of file

From 59c50864732f0c5a50fc4560beaa5eda97aff17f Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Fri, 5 Jul 2024 16:11:25 +0200
Subject: [PATCH 064/236] Migrate the bookmarks to compose

---
 .gitignore                                    |   1 +
 .idea/.gitignore                              |   1 +
 .idea/inspectionProfiles/ktlint.xml           |  29 ++
 .../features/bookmarks/BookmarkController.kt  | 144 ++--------
 .../bookmarks/BookmarkItemViewState.kt        |  14 +
 .../features/bookmarks/BookmarkPresenter.kt   | 117 +++++---
 .../app/features/bookmarks/BookmarkScreen.kt  | 251 ++++++++++++++++++
 .../app/features/bookmarks/BookmarkView.kt    |  17 --
 .../bookmarks/dialogs/EditBookmarkDialog.kt   |   7 +-
 .../features/bookmarks/list/BookMarkHolder.kt |  68 -----
 .../bookmarks/list/BookmarkAdapter.kt         |  50 ----
 .../bookmarks/list/BookmarkClickListener.kt   |  12 -
 .../list/BookmarkDiffUtilCallback.kt          |  29 --
 .../voice/app/injection/AppComponent.kt       |   2 +-
 .../kotlin/voice/app/mvp/MvpController.kt     |  73 -----
 .../main/kotlin/voice/app/mvp/Presenter.kt    |  58 ----
 .../kotlin/voice/app/mvp/PresenterTest.kt     |  27 --
 plugins/src/main/kotlin/ComposePlugin.kt      |   8 +-
 18 files changed, 418 insertions(+), 490 deletions(-)
 create mode 100644 app/src/main/kotlin/voice/app/features/bookmarks/BookmarkItemViewState.kt
 create mode 100644 app/src/main/kotlin/voice/app/features/bookmarks/BookmarkScreen.kt
 delete mode 100644 app/src/main/kotlin/voice/app/features/bookmarks/BookmarkView.kt
 delete mode 100644 app/src/main/kotlin/voice/app/features/bookmarks/list/BookMarkHolder.kt
 delete mode 100644 app/src/main/kotlin/voice/app/features/bookmarks/list/BookmarkAdapter.kt
 delete mode 100644 app/src/main/kotlin/voice/app/features/bookmarks/list/BookmarkClickListener.kt
 delete mode 100644 app/src/main/kotlin/voice/app/features/bookmarks/list/BookmarkDiffUtilCallback.kt
 delete mode 100644 app/src/main/kotlin/voice/app/mvp/MvpController.kt
 delete mode 100644 app/src/main/kotlin/voice/app/mvp/Presenter.kt
 delete mode 100644 app/src/test/kotlin/voice/app/mvp/PresenterTest.kt

diff --git a/.gitignore b/.gitignore
index 66c0be8699..221c49023e 100755
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ releases
 .transifexrc
 /plugins/.idea/workspace.xml
 /.kotlin
+/.idea/deviceManager.xml
diff --git a/.idea/.gitignore b/.idea/.gitignore
index 115257d44c..de2fdd4af1 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -17,3 +17,4 @@ kotlinScripting.xml
 /modules.xml
 /deploymentTargetSelector.xml
 /other.xml
+/studiobot.xml
diff --git a/.idea/inspectionProfiles/ktlint.xml b/.idea/inspectionProfiles/ktlint.xml
index 867c7a6275..e40a7a8872 100644
--- a/.idea/inspectionProfiles/ktlint.xml
+++ b/.idea/inspectionProfiles/ktlint.xml
@@ -1,6 +1,34 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="ktlint" />
+    <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
@@ -31,6 +59,7 @@
     </inspection_tool>
     <inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
diff --git a/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkController.kt b/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkController.kt
index 2f07976d21..5bb9c5e201 100644
--- a/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkController.kt
+++ b/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkController.kt
@@ -1,39 +1,21 @@
 package voice.app.features.bookmarks
 
 import android.os.Bundle
-import android.view.View
-import androidx.appcompat.widget.PopupMenu
-import androidx.recyclerview.widget.DefaultItemAnimator
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.snackbar.Snackbar
-import voice.app.R
-import voice.app.databinding.BookmarkBinding
+import androidx.compose.runtime.Composable
 import voice.app.features.bookmarks.dialogs.AddBookmarkDialog
 import voice.app.features.bookmarks.dialogs.EditBookmarkDialog
-import voice.app.features.bookmarks.list.BookMarkHolder
-import voice.app.features.bookmarks.list.BookmarkAdapter
-import voice.app.features.bookmarks.list.BookmarkClickListener
 import voice.app.injection.appComponent
-import voice.app.misc.conductor.context
-import voice.app.mvp.MvpController
 import voice.common.BookId
+import voice.common.compose.ComposeController
 import voice.data.Bookmark
-import voice.data.Chapter
 import voice.data.getBookId
 import voice.data.putBookId
-import voice.strings.R as StringsR
 
-/**
- * Dialog for creating a bookmark
- */
 private const val NI_BOOK_ID = "ni#bookId"
 
+@Suppress("unused")
 class BookmarkController(args: Bundle) :
-  MvpController<BookmarkView, BookmarkPresenter, BookmarkBinding>(BookmarkBinding::inflate, args),
-  BookmarkView,
-  BookmarkClickListener,
+  ComposeController(args),
   AddBookmarkDialog.Callback,
   EditBookmarkDialog.Callback {
 
@@ -44,29 +26,25 @@ class BookmarkController(args: Bundle) :
   )
 
   private val bookId = args.getBookId(NI_BOOK_ID)!!
-  private val adapter = BookmarkAdapter(this)
 
-  override fun createPresenter() = appComponent.bookmarkPresenter.apply {
-    bookId = this@BookmarkController.bookId
-  }
-
-  override fun render(
-    bookmarks: List<Bookmark>,
-    chapters: List<Chapter>,
-  ) {
-    adapter.newData(bookmarks, chapters)
-  }
-
-  override fun showBookmarkAdded(bookmark: Bookmark) {
-    val index = adapter.indexOf(bookmark)
-    binding.recycler.smoothScrollToPosition(index)
-    Snackbar.make(view!!, StringsR.string.bookmark_added, Snackbar.LENGTH_SHORT)
-      .show()
-  }
-
-  override fun onBookmarkClicked(bookmark: Bookmark) {
-    presenter.selectBookmark(bookmark.id)
-    router.popController(this)
+  private val presenter = appComponent.bookmarkPresenterFactory.create(bookId)
+
+  @Composable
+  override fun Content() {
+    val viewState = presenter.viewState()
+    BookmarkScreen(
+      viewState = viewState,
+      onClose = { router.popController(this) },
+      onAdd = {
+        showAddBookmarkDialog()
+      },
+      onDelete = presenter::deleteBookmark,
+      onEdit = { bookmark, title ->
+        showEditBookmarkDialog(bookmark, title)
+      },
+      onScrollConfirmed = presenter::onScrollConfirmed,
+      onClick = presenter::selectBookmark,
+    )
   }
 
   override fun onEditBookmark(
@@ -80,81 +58,11 @@ class BookmarkController(args: Bundle) :
     presenter.addBookmark(name)
   }
 
-  override fun finish() {
-    router.popController(this)
-  }
-
-  override fun BookmarkBinding.onBindingCreated() {
-    setupToolbar()
-    setupList()
-
-    addBookmarkFab.setOnClickListener {
-      showAddBookmarkDialog()
-    }
-  }
-
-  override fun onDestroyView() {
-    binding.recycler.adapter = null
-  }
-
-  private fun BookmarkBinding.setupToolbar() {
-    toolbar.setNavigationIcon(R.drawable.close)
-    toolbar.setNavigationOnClickListener {
-      router.popController(this@BookmarkController)
-    }
-  }
-
-  private fun BookmarkBinding.setupList() {
-    val layoutManager = LinearLayoutManager(context)
-    recycler.layoutManager = layoutManager
-    recycler.adapter = adapter
-    val itemAnimator = recycler.itemAnimator as DefaultItemAnimator
-    itemAnimator.supportsChangeAnimations = false
-
-    val swipeCallback = object : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.RIGHT) {
-      override fun onMove(
-        recyclerView: RecyclerView,
-        viewHolder: RecyclerView.ViewHolder,
-        target: RecyclerView.ViewHolder,
-      ): Boolean {
-        return false
-      }
-
-      override fun onSwiped(
-        viewHolder: RecyclerView.ViewHolder,
-        direction: Int,
-      ) {
-        val boundBookmark = (viewHolder as BookMarkHolder).boundBookmark
-        boundBookmark?.let { presenter.deleteBookmark(it.id) }
-      }
-    }
-    ItemTouchHelper(swipeCallback).attachToRecyclerView(recycler)
-  }
-
-  override fun onOptionsMenuClicked(
-    bookmark: Bookmark,
-    v: View,
+  private fun showEditBookmarkDialog(
+    bookmark: Bookmark.Id,
+    title: String?,
   ) {
-    val popup = PopupMenu(context, v)
-    popup.menuInflater.inflate(R.menu.bookmark_popup, popup.menu)
-    popup.setOnMenuItemClickListener {
-      when (it.itemId) {
-        R.id.edit -> {
-          showEditBookmarkDialog(bookmark)
-          true
-        }
-        R.id.delete -> {
-          presenter.deleteBookmark(bookmark.id)
-          true
-        }
-        else -> false
-      }
-    }
-    popup.show()
-  }
-
-  private fun showEditBookmarkDialog(bookmark: Bookmark) {
-    EditBookmarkDialog(this, bookmark).showDialog(router)
+    EditBookmarkDialog(this, bookmark, title).showDialog(router)
   }
 
   private fun showAddBookmarkDialog() {
diff --git a/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkItemViewState.kt b/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkItemViewState.kt
new file mode 100644
index 0000000000..161a947d0d
--- /dev/null
+++ b/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkItemViewState.kt
@@ -0,0 +1,14 @@
+package voice.app.features.bookmarks
+
+import voice.data.Bookmark
+
+data class BookmarkItemViewState(
+  val title: String,
+  val subtitle: String,
+  val id: Bookmark.Id,
+)
+
+data class BookmarkViewState(
+  val bookmarks: List<BookmarkItemViewState>,
+  val shouldScrollTo: Bookmark.Id?,
+)
diff --git a/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkPresenter.kt b/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkPresenter.kt
index 6f5370cf6f..9e8e022f07 100644
--- a/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkPresenter.kt
+++ b/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkPresenter.kt
@@ -1,53 +1,103 @@
 package voice.app.features.bookmarks
 
+import android.content.Context
+import android.text.format.DateUtils
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
 import androidx.datastore.core.DataStore
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
-import voice.app.mvp.Presenter
 import voice.common.BookId
+import voice.common.formatTime
+import voice.common.navigation.Navigator
 import voice.common.pref.CurrentBook
 import voice.data.Bookmark
 import voice.data.Chapter
+import voice.data.markForPosition
 import voice.data.repo.BookRepository
 import voice.data.repo.BookmarkRepo
 import voice.playback.PlayerController
 import voice.playback.playstate.PlayStateManager
-import javax.inject.Inject
+import voice.strings.R
+import java.time.Instant
+import java.time.temporal.ChronoUnit
+import kotlin.time.Duration.Companion.days
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.minutes
 
 class BookmarkPresenter
-@Inject constructor(
+@AssistedInject constructor(
   @CurrentBook
   private val currentBook: DataStore<BookId?>,
   private val repo: BookRepository,
   private val bookmarkRepo: BookmarkRepo,
   private val playStateManager: PlayStateManager,
   private val playerController: PlayerController,
-) : Presenter<BookmarkView>() {
+  private val navigator: Navigator,
+  private val context: Context,
+  @Assisted
+  private val bookId: BookId,
+) {
 
-  lateinit var bookId: BookId
-  private val bookmarks = ArrayList<Bookmark>()
-  private val chapters = ArrayList<Chapter>()
+  private val scope = MainScope()
+  private var bookmarks by mutableStateOf<List<Bookmark>>(emptyList())
+  private var chapters by mutableStateOf<List<Chapter>>(emptyList())
 
-  override fun onAttach(view: BookmarkView) {
-    onAttachScope.launch {
-      val book = repo.get(bookId) ?: return@launch
-      bookmarks.clear()
-      bookmarks.addAll(
-        bookmarkRepo.bookmarks(book.content)
-          .sortedByDescending { it.addedAt },
-      )
-      chapters.clear()
-      chapters.addAll(book.chapters)
+  private var shouldScrollTo by mutableStateOf<Bookmark.Id?>(null)
 
-      renderView()
+  @Composable
+  fun viewState(): BookmarkViewState {
+    LaunchedEffect(bookId) {
+      val book = repo.get(bookId)
+      if (book != null) {
+        bookmarks = bookmarkRepo.bookmarks(book.content)
+          .sortedByDescending { it.addedAt }
+        chapters = book.chapters
+      }
     }
+    return BookmarkViewState(
+      bookmarks = bookmarks.map { bookmark ->
+        val currentChapter = chapters.single { it.id == bookmark.chapterId }
+        val bookmarkTitle = bookmark.title
+        val title: String = when {
+          bookmark.setBySleepTimer -> {
+            val justNowThreshold = 1.minutes
+            if (ChronoUnit.MILLIS.between(bookmark.addedAt, Instant.now()).milliseconds < justNowThreshold) {
+              context.getString(R.string.bookmark_just_now)
+            } else {
+              DateUtils.getRelativeDateTimeString(
+                context,
+                bookmark.addedAt.toEpochMilli(),
+                justNowThreshold.inWholeMilliseconds,
+                2.days.inWholeMilliseconds,
+                0,
+              ).toString()
+            }
+          }
+          !bookmarkTitle.isNullOrEmpty() -> bookmarkTitle
+          else -> currentChapter.markForPosition(bookmark.time).name ?: ""
+        }
+
+        BookmarkItemViewState(
+          title = title,
+          subtitle = formatTime(bookmark.time),
+          id = bookmark.id,
+        )
+      },
+      shouldScrollTo = shouldScrollTo,
+    )
   }
 
   fun deleteBookmark(id: Bookmark.Id) {
     scope.launch {
       bookmarkRepo.deleteBookmark(id)
-      bookmarks.removeAll { it.id == id }
-
-      renderView()
+      bookmarks = bookmarks.filter { it.id != id }
     }
   }
 
@@ -66,7 +116,7 @@ class BookmarkPresenter
       playerController.play()
     }
 
-    view.finish()
+    navigator.goBack()
   }
 
   fun editBookmark(
@@ -81,8 +131,9 @@ class BookmarkPresenter
         )
         bookmarkRepo.addBookmark(withNewTitle)
         val index = bookmarks.indexOfFirst { bookmarkId -> bookmarkId.id == id }
-        bookmarks[index] = withNewTitle
-        if (attached) renderView()
+        bookmarks = bookmarks.toMutableList().apply {
+          this[index] = withNewTitle
+        }
       }
     }
   }
@@ -90,19 +141,23 @@ class BookmarkPresenter
   fun addBookmark(name: String) {
     scope.launch {
       val book = repo.get(bookId) ?: return@launch
-      val addedBookmark = bookmarkRepo.addBookmarkAtBookPosition(
+      val newBookmark = bookmarkRepo.addBookmarkAtBookPosition(
         book = book,
         title = name,
         setBySleepTimer = false,
       )
-      bookmarks.add(addedBookmark)
-      if (attached) renderView()
+      bookmarks = (bookmarks + newBookmark)
+        .sortedByDescending { it.addedAt }
+      shouldScrollTo = newBookmark.id
     }
   }
 
-  private fun renderView() {
-    if (attached) {
-      view.render(bookmarks, chapters)
-    }
+  fun onScrollConfirmed() {
+    shouldScrollTo = null
+  }
+
+  @AssistedFactory
+  interface Factory {
+    fun create(id: BookId): BookmarkPresenter
   }
 }
diff --git a/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkScreen.kt b/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkScreen.kt
new file mode 100644
index 0000000000..a229e42f76
--- /dev/null
+++ b/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkScreen.kt
@@ -0,0 +1,251 @@
+package voice.app.features.bookmarks
+
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.gestures.AnchoredDraggableState
+import androidx.compose.foundation.gestures.DraggableAnchors
+import androidx.compose.foundation.gestures.Orientation
+import androidx.compose.foundation.gestures.anchoredDraggable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.Close
+import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.material.icons.outlined.Delete
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clipToBounds
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.dp
+import voice.data.Bookmark
+import java.util.UUID
+import kotlin.math.roundToInt
+import voice.strings.R as StringsR
+
+@Composable
+fun BookmarkScreen(
+  viewState: BookmarkViewState,
+  onClose: () -> Unit,
+  onAdd: () -> Unit,
+  onDelete: (Bookmark.Id) -> Unit,
+  onEdit: (Bookmark.Id, String) -> Unit,
+  onScrollConfirmed: () -> Unit,
+  onClick: (Bookmark.Id) -> Unit,
+  modifier: Modifier = Modifier,
+) {
+  val snackbarHostState = remember { SnackbarHostState() }
+
+  Scaffold(
+    modifier = modifier,
+    snackbarHost = {
+      SnackbarHost(hostState = snackbarHostState)
+    },
+    topBar = {
+      TopAppBar(
+        title = { Text(text = stringResource(id = StringsR.string.bookmark)) },
+        navigationIcon = {
+          IconButton(onClick = onClose) {
+            Icon(
+              imageVector = Icons.Default.Close,
+              contentDescription = stringResource(id = StringsR.string.close),
+            )
+          }
+        },
+      )
+    },
+    floatingActionButton = {
+      FloatingActionButton(
+        onClick = onAdd,
+        content = {
+          Icon(Icons.Default.Add, contentDescription = stringResource(id = StringsR.string.add))
+        },
+      )
+    },
+  ) { paddingValues ->
+    val lazyListState = rememberLazyListState()
+    LaunchedEffect(viewState.shouldScrollTo, onScrollConfirmed) {
+      val index = viewState.bookmarks.indexOfFirst { it.id == viewState.shouldScrollTo }
+      if (index != -1) {
+        lazyListState.animateScrollToItem(index)
+        onScrollConfirmed()
+      }
+    }
+    LazyColumn(
+      state = lazyListState,
+      modifier = Modifier
+        .padding(paddingValues)
+        .fillMaxSize()
+        .padding(bottom = 88.dp)
+        .clipToBounds(),
+    ) {
+      items(
+        items = viewState.bookmarks,
+        key = { it.id.value.toString() },
+      ) { bookmark ->
+        BookmarkItem(
+          modifier = Modifier.animateItemPlacement(),
+          bookmark = bookmark,
+          onDelete = onDelete,
+          onEdit = onEdit,
+          onClick = onClick,
+        )
+      }
+    }
+  }
+}
+
+enum class DragAnchors {
+  Start,
+  End,
+}
+
+@Composable
+fun BookmarkItem(
+  bookmark: BookmarkItemViewState,
+  onDelete: (Bookmark.Id) -> Unit,
+  onEdit: (Bookmark.Id, String) -> Unit,
+  onClick: (Bookmark.Id) -> Unit,
+  modifier: Modifier = Modifier,
+) {
+  val density = LocalDensity.current
+
+  val deleteIconSize = 72.dp
+
+  var expanded by remember { mutableStateOf(false) }
+
+  val state = remember {
+    AnchoredDraggableState(
+      initialValue = DragAnchors.Start,
+      positionalThreshold = { distance: Float -> distance },
+      velocityThreshold = { with(density) { 100.dp.toPx() } },
+      animationSpec = tween(),
+      confirmValueChange = {
+        if (it == DragAnchors.End) {
+          onDelete(bookmark.id)
+        }
+        true
+      },
+    ).apply {
+      updateAnchors(
+        DraggableAnchors {
+          DragAnchors.Start at 0f
+          DragAnchors.End at with(density) { deleteIconSize.toPx() }
+        },
+      )
+    }
+  }
+  Box(modifier) {
+    Box(
+      Modifier
+        .size(deleteIconSize)
+        .background(Color.Red),
+    ) {
+      Icon(
+        modifier = Modifier.align(Alignment.Center),
+        imageVector = Icons.Outlined.Delete,
+        contentDescription = stringResource(id = StringsR.string.delete),
+        tint = Color.White,
+      )
+    }
+    ListItem(
+      modifier = Modifier
+        .offset {
+          IntOffset(
+            x = state
+              .requireOffset()
+              .roundToInt(),
+            y = 0,
+          )
+        }
+        .anchoredDraggable(state, Orientation.Horizontal)
+        .clickable {
+          onClick(bookmark.id)
+        },
+      headlineContent = {
+        Text(text = bookmark.title)
+      },
+      trailingContent = {
+        Box {
+          IconButton(
+            onClick = {
+              expanded = !expanded
+            },
+            content = {
+              Icon(
+                imageVector = Icons.Default.MoreVert,
+                contentDescription = stringResource(id = StringsR.string.popup_edit),
+              )
+            },
+          )
+          DropdownMenu(
+            expanded = expanded,
+            onDismissRequest = { expanded = false },
+          ) {
+            DropdownMenuItem(
+              text = { Text(stringResource(id = StringsR.string.popup_edit)) },
+              onClick = {
+                expanded = false
+                onEdit(bookmark.id, bookmark.title)
+              },
+            )
+            DropdownMenuItem(
+              text = { Text(stringResource(id = StringsR.string.remove)) },
+              onClick = {
+                expanded = false
+                onDelete(bookmark.id)
+              },
+            )
+          }
+        }
+      },
+
+      supportingContent = {
+        Text(text = bookmark.subtitle)
+      },
+    )
+  }
+}
+
+@Composable
+@Preview
+private fun BookmarkItemPreview() {
+  BookmarkItem(
+    bookmark = BookmarkItemViewState(
+      title = "Bookmark 1",
+      subtitle = "10:10:10 / 12:12:12",
+      id = Bookmark.Id(UUID.randomUUID()),
+    ),
+    onDelete = {},
+    onEdit = { _, _ -> },
+    onClick = {},
+  )
+}
diff --git a/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkView.kt b/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkView.kt
deleted file mode 100644
index 4e6452e23c..0000000000
--- a/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkView.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package voice.app.features.bookmarks
-
-import voice.data.Bookmark
-import voice.data.Chapter
-
-/**
- * View of the bookmarks
- */
-interface BookmarkView {
-
-  fun render(
-    bookmarks: List<Bookmark>,
-    chapters: List<Chapter>,
-  )
-  fun showBookmarkAdded(bookmark: Bookmark)
-  fun finish()
-}
diff --git a/app/src/main/kotlin/voice/app/features/bookmarks/dialogs/EditBookmarkDialog.kt b/app/src/main/kotlin/voice/app/features/bookmarks/dialogs/EditBookmarkDialog.kt
index b8dbbd76a0..90b6ca9609 100644
--- a/app/src/main/kotlin/voice/app/features/bookmarks/dialogs/EditBookmarkDialog.kt
+++ b/app/src/main/kotlin/voice/app/features/bookmarks/dialogs/EditBookmarkDialog.kt
@@ -71,11 +71,12 @@ class EditBookmarkDialog(args: Bundle) : DialogController(args) {
 
     operator fun <T> invoke(
       target: T,
-      bookmark: Bookmark,
+      bookmark: Bookmark.Id,
+      title: String?,
     ): EditBookmarkDialog where T : Controller, T : Callback {
       val args = Bundle().apply {
-        putBookmarkId(NI_BOOKMARK_ID, bookmark.id)
-        putString(NI_BOOKMARK_TITLE, bookmark.title)
+        putBookmarkId(NI_BOOKMARK_ID, bookmark)
+        putString(NI_BOOKMARK_TITLE, title)
       }
       return EditBookmarkDialog(args).apply {
         targetController = target
diff --git a/app/src/main/kotlin/voice/app/features/bookmarks/list/BookMarkHolder.kt b/app/src/main/kotlin/voice/app/features/bookmarks/list/BookMarkHolder.kt
deleted file mode 100644
index fd0af943ac..0000000000
--- a/app/src/main/kotlin/voice/app/features/bookmarks/list/BookMarkHolder.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-package voice.app.features.bookmarks.list
-
-import android.text.format.DateUtils
-import android.view.ViewGroup
-import voice.app.R
-import voice.app.databinding.BookmarkRowLayoutBinding
-import voice.app.uitools.ViewBindingHolder
-import voice.common.formatTime
-import voice.data.Bookmark
-import voice.data.Chapter
-import voice.data.markForPosition
-import java.time.Instant
-import java.time.temporal.ChronoUnit
-import kotlin.time.Duration.Companion.days
-import kotlin.time.Duration.Companion.milliseconds
-import kotlin.time.Duration.Companion.minutes
-import voice.strings.R as StringsR
-
-class BookMarkHolder(
-  parent: ViewGroup,
-  private val listener: BookmarkClickListener,
-) : ViewBindingHolder<BookmarkRowLayoutBinding>(parent, BookmarkRowLayoutBinding::inflate) {
-
-  var boundBookmark: Bookmark? = null
-    private set
-
-  init {
-    binding.edit.setOnClickListener { view ->
-      boundBookmark?.let {
-        listener.onOptionsMenuClicked(it, view)
-      }
-    }
-    itemView.setOnClickListener {
-      boundBookmark?.let { bookmark ->
-        listener.onBookmarkClicked(bookmark)
-      }
-    }
-  }
-
-  fun bind(
-    bookmark: Bookmark,
-    chapters: List<Chapter>,
-  ) {
-    boundBookmark = bookmark
-    val currentChapter = chapters.single { it.id == bookmark.chapterId }
-    val bookmarkTitle = bookmark.title
-    binding.title.text = when {
-      bookmark.setBySleepTimer -> {
-        val justNowThreshold = 1.minutes
-        if (ChronoUnit.MILLIS.between(bookmark.addedAt, Instant.now()).milliseconds < justNowThreshold) {
-          itemView.context.getString(StringsR.string.bookmark_just_now)
-        } else {
-          DateUtils.getRelativeDateTimeString(
-            itemView.context,
-            bookmark.addedAt.toEpochMilli(),
-            justNowThreshold.inWholeMilliseconds,
-            2.days.inWholeMilliseconds,
-            0,
-          )
-        }
-      }
-      !bookmarkTitle.isNullOrEmpty() -> bookmarkTitle
-      else -> currentChapter.markForPosition(bookmark.time).name
-    }
-    binding.title.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, if (bookmark.setBySleepTimer) R.drawable.ic_sleep else 0, 0)
-    binding.time.text = formatTime(bookmark.time)
-  }
-}
diff --git a/app/src/main/kotlin/voice/app/features/bookmarks/list/BookmarkAdapter.kt b/app/src/main/kotlin/voice/app/features/bookmarks/list/BookmarkAdapter.kt
deleted file mode 100644
index 43d5a3bb97..0000000000
--- a/app/src/main/kotlin/voice/app/features/bookmarks/list/BookmarkAdapter.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package voice.app.features.bookmarks.list
-
-import android.view.ViewGroup
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import voice.data.Bookmark
-import voice.data.Chapter
-
-/**
- * Adapter for displaying a list of bookmarks.
- */
-class BookmarkAdapter(
-  private val listener: BookmarkClickListener,
-) : RecyclerView.Adapter<BookMarkHolder>() {
-
-  private val bookmarks = ArrayList<Bookmark>()
-  private val chapters = ArrayList<Chapter>()
-
-  fun newData(
-    bookmarks: List<Bookmark>,
-    chapters: List<Chapter>,
-  ) {
-    this.chapters.clear()
-    this.chapters.addAll(chapters)
-
-    val newBookmarks = bookmarks
-    val callback = BookmarkDiffUtilCallback(this.bookmarks, newBookmarks)
-    val diff = DiffUtil.calculateDiff(callback)
-    this.bookmarks.clear()
-    this.bookmarks.addAll(newBookmarks)
-    diff.dispatchUpdatesTo(this)
-  }
-
-  fun indexOf(bookmark: Bookmark) = bookmarks.indexOf(bookmark)
-
-  override fun onCreateViewHolder(
-    parent: ViewGroup,
-    viewType: Int,
-  ) = BookMarkHolder(parent, listener)
-
-  override fun onBindViewHolder(
-    holder: BookMarkHolder,
-    position: Int,
-  ) {
-    val bookMark = bookmarks[position]
-    holder.bind(bookMark, chapters)
-  }
-
-  override fun getItemCount(): Int = bookmarks.size
-}
diff --git a/app/src/main/kotlin/voice/app/features/bookmarks/list/BookmarkClickListener.kt b/app/src/main/kotlin/voice/app/features/bookmarks/list/BookmarkClickListener.kt
deleted file mode 100644
index ae74e0c002..0000000000
--- a/app/src/main/kotlin/voice/app/features/bookmarks/list/BookmarkClickListener.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package voice.app.features.bookmarks.list
-
-import voice.data.Bookmark
-
-interface BookmarkClickListener {
-
-  fun onOptionsMenuClicked(
-    bookmark: Bookmark,
-    v: android.view.View,
-  )
-  fun onBookmarkClicked(bookmark: Bookmark)
-}
diff --git a/app/src/main/kotlin/voice/app/features/bookmarks/list/BookmarkDiffUtilCallback.kt b/app/src/main/kotlin/voice/app/features/bookmarks/list/BookmarkDiffUtilCallback.kt
deleted file mode 100644
index c45f933fda..0000000000
--- a/app/src/main/kotlin/voice/app/features/bookmarks/list/BookmarkDiffUtilCallback.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package voice.app.features.bookmarks.list
-
-import androidx.recyclerview.widget.DiffUtil
-import voice.data.Bookmark
-
-/**
- * Calculates the diff between two bookmark lists.
- */
-class BookmarkDiffUtilCallback(
-  private val oldItems: List<Bookmark>,
-  private val newItems: List<Bookmark>,
-) : DiffUtil.Callback() {
-
-  override fun areItemsTheSame(
-    oldItemPosition: Int,
-    newItemPosition: Int,
-  ): Boolean {
-    return oldItems[oldItemPosition] == newItems[newItemPosition]
-  }
-
-  override fun getOldListSize() = oldItems.size
-
-  override fun getNewListSize() = newItems.size
-
-  override fun areContentsTheSame(
-    oldItemPosition: Int,
-    newItemPosition: Int,
-  ) = areItemsTheSame(oldItemPosition, newItemPosition)
-}
diff --git a/app/src/main/kotlin/voice/app/injection/AppComponent.kt b/app/src/main/kotlin/voice/app/injection/AppComponent.kt
index 04ecce888a..55b021137d 100644
--- a/app/src/main/kotlin/voice/app/injection/AppComponent.kt
+++ b/app/src/main/kotlin/voice/app/injection/AppComponent.kt
@@ -19,7 +19,7 @@ import javax.inject.Singleton
 )
 interface AppComponent {
 
-  val bookmarkPresenter: BookmarkPresenter
+  val bookmarkPresenterFactory: BookmarkPresenter.Factory
   val context: Context
 
   fun inject(target: App)
diff --git a/app/src/main/kotlin/voice/app/mvp/MvpController.kt b/app/src/main/kotlin/voice/app/mvp/MvpController.kt
deleted file mode 100644
index cdb770c104..0000000000
--- a/app/src/main/kotlin/voice/app/mvp/MvpController.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-package voice.app.mvp
-
-import android.os.Bundle
-import android.view.View
-import androidx.viewbinding.ViewBinding
-import com.bluelinelabs.conductor.Controller
-import voice.common.checkMainThread
-import voice.common.conductor.InflateBinding
-import voice.common.conductor.ViewBindingController
-
-/**
- * Base controller that provides a convenient way for binding a view to a presenter
- */
-abstract class MvpController<V : Any, out P, B : ViewBinding>(
-  inflateBinding: InflateBinding<B>,
-  args: Bundle = Bundle(),
-) : ViewBindingController<B>(args, inflateBinding) where P : Presenter<V> {
-
-  private var internalPresenter: P? = null
-  val presenter: P
-    get() {
-      checkMainThread()
-      check(!isDestroyed) { "Must not call presenter when destroyed!" }
-      if (internalPresenter == null) {
-        internalPresenter = createPresenter()
-      }
-      return internalPresenter!!
-    }
-
-  init {
-    addLifecycleListener(
-      object : LifecycleListener() {
-
-        override fun onRestoreInstanceState(
-          controller: Controller,
-          savedInstanceState: Bundle,
-        ) {
-          presenter.onRestore(savedInstanceState)
-        }
-
-        override fun postAttach(
-          controller: Controller,
-          view: View,
-        ) {
-          presenter.attach(provideView())
-        }
-
-        override fun preDetach(
-          controller: Controller,
-          view: View,
-        ) {
-          presenter.detach()
-        }
-
-        override fun onSaveInstanceState(
-          controller: Controller,
-          outState: Bundle,
-        ) {
-          presenter.onSave(outState)
-        }
-
-        override fun postDestroy(controller: Controller) {
-          internalPresenter = null
-        }
-      },
-    )
-  }
-
-  @Suppress("UNCHECKED_CAST")
-  open fun provideView(): V = this as V
-
-  abstract fun createPresenter(): P
-}
diff --git a/app/src/main/kotlin/voice/app/mvp/Presenter.kt b/app/src/main/kotlin/voice/app/mvp/Presenter.kt
deleted file mode 100644
index 177e520655..0000000000
--- a/app/src/main/kotlin/voice/app/mvp/Presenter.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package voice.app.mvp
-
-import android.os.Bundle
-import androidx.annotation.CallSuper
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.cancel
-import voice.common.checkMainThread
-import voice.logging.core.Logger
-
-abstract class Presenter<V : Any> {
-
-  protected val scope = MainScope()
-  protected var onAttachScope = MainScope().also { it.cancel() }
-
-  val view: V
-    get() {
-      checkMainThread()
-      return internalView!!
-    }
-  val attached: Boolean
-    get() {
-      checkMainThread()
-      return internalView != null
-    }
-
-  private var internalView: V? = null
-
-  @CallSuper
-  open fun onRestore(savedState: Bundle) {
-    checkMainThread()
-  }
-
-  fun attach(view: V) {
-    Logger.i("attach $view")
-    checkMainThread()
-    check(internalView == null) {
-      "$internalView already bound."
-    }
-
-    internalView = view
-    onAttachScope = MainScope()
-    onAttach(view)
-  }
-
-  fun detach() {
-    Logger.i("detach $internalView")
-    checkMainThread()
-    onAttachScope.cancel()
-    internalView = null
-  }
-
-  @CallSuper
-  open fun onSave(state: Bundle) {
-    checkMainThread()
-  }
-
-  open fun onAttach(view: V) {}
-}
diff --git a/app/src/test/kotlin/voice/app/mvp/PresenterTest.kt b/app/src/test/kotlin/voice/app/mvp/PresenterTest.kt
deleted file mode 100644
index 78f9012bf4..0000000000
--- a/app/src/test/kotlin/voice/app/mvp/PresenterTest.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package voice.app.mvp
-
-import io.kotest.matchers.booleans.shouldBeFalse
-import io.kotest.matchers.booleans.shouldBeTrue
-import org.junit.Before
-import org.junit.Test
-
-class PresenterTest {
-
-  private lateinit var presenter: Presenter<View>
-
-  @Before
-  fun setUp() {
-    presenter = object : Presenter<View>() {}
-  }
-
-  @Test
-  fun attached() {
-    presenter.attached.shouldBeFalse()
-    presenter.attach(View)
-    presenter.attached.shouldBeTrue()
-    presenter.detach()
-    presenter.attached.shouldBeFalse()
-  }
-
-  private object View
-}
diff --git a/plugins/src/main/kotlin/ComposePlugin.kt b/plugins/src/main/kotlin/ComposePlugin.kt
index d33ab54d96..302e3944ac 100644
--- a/plugins/src/main/kotlin/ComposePlugin.kt
+++ b/plugins/src/main/kotlin/ComposePlugin.kt
@@ -1,6 +1,7 @@
 @file:Suppress("UnstableApiUsage")
 
 import com.android.build.api.dsl.ApplicationExtension
+import com.android.build.api.dsl.CommonExtension
 import com.android.build.api.dsl.LibraryExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -14,21 +15,22 @@ class ComposePlugin : Plugin<Project> {
   override fun apply(target: Project) {
     target.pluginManager.withPlugin("com.android.application") {
       target.extensions.configure<ApplicationExtension> {
-        configureCompose(target)
+        configureCompose(this, target)
       }
     }
     target.pluginManager.withPlugin("com.android.library") {
       target.extensions.configure<LibraryExtension> {
-        configureCompose(target)
+        configureCompose(this, target)
       }
     }
   }
 
-  private fun configureCompose(target: Project) {
+  private fun configureCompose(extension: CommonExtension<*, *, *, *, *, *>, target: Project) {
     val libs = target.extensions.getByType(VersionCatalogsExtension::class.java).named("libs")
     target.dependencies.add("implementation", libs.findBundle("compose").get())
     target.dependencies.add("debugImplementation", libs.findLibrary("compose-ui-tooling-core").get())
     target.plugins.apply("org.jetbrains.kotlin.plugin.compose")
+    extension.buildFeatures.compose = true
     target.tasks.withType<KotlinCompile> {
       kotlinOptions {
         freeCompilerArgs = freeCompilerArgs + listOf(

From 28481ac48f2112d7b646402fe5d691b99267eea0 Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Fri, 5 Jul 2024 16:40:22 +0200
Subject: [PATCH 065/236] Move the bookmarks to a separate module

---
 app/build.gradle.kts                          |  1 +
 .../kotlin/voice/app/features/MainActivity.kt |  2 +-
 .../voice/app/injection/AppComponent.kt       |  5 -----
 bookmark/build.gradle.kts                     | 20 +++++++++++++++++++
 .../voice/bookmark}/BookmarkController.kt     | 19 +++++++++++++-----
 .../voice/bookmark}/BookmarkItemViewState.kt  |  2 +-
 .../voice/bookmark}/BookmarkPresenter.kt      |  2 +-
 .../kotlin/voice/bookmark}/BookmarkScreen.kt  |  2 +-
 .../bookmark}/dialogs/AddBookmarkDialog.kt    |  2 +-
 .../bookmark}/dialogs/EditBookmarkDialog.kt   |  2 +-
 settings.gradle.kts                           |  1 +
 11 files changed, 42 insertions(+), 16 deletions(-)
 create mode 100644 bookmark/build.gradle.kts
 rename {app/src/main/kotlin/voice/app/features/bookmarks => bookmark/src/main/kotlin/voice/bookmark}/BookmarkController.kt (76%)
 rename {app/src/main/kotlin/voice/app/features/bookmarks => bookmark/src/main/kotlin/voice/bookmark}/BookmarkItemViewState.kt (87%)
 rename {app/src/main/kotlin/voice/app/features/bookmarks => bookmark/src/main/kotlin/voice/bookmark}/BookmarkPresenter.kt (99%)
 rename {app/src/main/kotlin/voice/app/features/bookmarks => bookmark/src/main/kotlin/voice/bookmark}/BookmarkScreen.kt (99%)
 rename {app/src/main/kotlin/voice/app/features/bookmarks => bookmark/src/main/kotlin/voice/bookmark}/dialogs/AddBookmarkDialog.kt (97%)
 rename {app/src/main/kotlin/voice/app/features/bookmarks => bookmark/src/main/kotlin/voice/bookmark}/dialogs/EditBookmarkDialog.kt (98%)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index dee022b3f8..94b804ce59 100755
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -170,6 +170,7 @@ dependencies {
   implementation(projects.cover)
   implementation(projects.documentfile)
   implementation(projects.onboarding)
+  implementation(projects.bookmark)
 
   implementation(libs.appCompat)
   implementation(libs.recyclerView)
diff --git a/app/src/main/kotlin/voice/app/features/MainActivity.kt b/app/src/main/kotlin/voice/app/features/MainActivity.kt
index 4c1ae6b617..59e39b2914 100644
--- a/app/src/main/kotlin/voice/app/features/MainActivity.kt
+++ b/app/src/main/kotlin/voice/app/features/MainActivity.kt
@@ -18,9 +18,9 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import voice.app.AppController
 import voice.app.features.bookOverview.EditCoverDialogController
-import voice.app.features.bookmarks.BookmarkController
 import voice.app.injection.appComponent
 import voice.app.misc.conductor.asVerticalChangeHandlerTransaction
+import voice.bookmark.BookmarkController
 import voice.common.BookId
 import voice.common.navigation.Destination
 import voice.common.navigation.NavigationCommand
diff --git a/app/src/main/kotlin/voice/app/injection/AppComponent.kt b/app/src/main/kotlin/voice/app/injection/AppComponent.kt
index 55b021137d..00b7e93410 100644
--- a/app/src/main/kotlin/voice/app/injection/AppComponent.kt
+++ b/app/src/main/kotlin/voice/app/injection/AppComponent.kt
@@ -1,14 +1,12 @@
 package voice.app.injection
 
 import android.app.Application
-import android.content.Context
 import com.squareup.anvil.annotations.MergeComponent
 import dagger.BindsInstance
 import dagger.Component
 import voice.app.AppController
 import voice.app.features.MainActivity
 import voice.app.features.bookOverview.EditCoverDialogController
-import voice.app.features.bookmarks.BookmarkPresenter
 import voice.app.features.widget.BaseWidgetProvider
 import voice.common.AppScope
 import javax.inject.Singleton
@@ -19,9 +17,6 @@ import javax.inject.Singleton
 )
 interface AppComponent {
 
-  val bookmarkPresenterFactory: BookmarkPresenter.Factory
-  val context: Context
-
   fun inject(target: App)
   fun inject(target: BaseWidgetProvider)
   fun inject(target: AppController)
diff --git a/bookmark/build.gradle.kts b/bookmark/build.gradle.kts
new file mode 100644
index 0000000000..89f27c0cf3
--- /dev/null
+++ b/bookmark/build.gradle.kts
@@ -0,0 +1,20 @@
+plugins {
+  id("voice.library")
+  id("voice.compose")
+  alias(libs.plugins.anvil)
+}
+
+anvil {
+  generateDaggerFactories.set(true)
+}
+
+dependencies {
+  implementation(projects.common)
+  implementation(projects.strings)
+  implementation(projects.playback)
+  implementation(projects.data)
+  implementation(projects.datastore)
+  implementation(libs.dagger.core)
+  implementation(libs.materialDialog.core)
+  implementation(libs.materialDialog.input)
+}
diff --git a/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkController.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
similarity index 76%
rename from app/src/main/kotlin/voice/app/features/bookmarks/BookmarkController.kt
rename to bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
index 5bb9c5e201..8df88269fb 100644
--- a/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkController.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
@@ -1,12 +1,14 @@
-package voice.app.features.bookmarks
+package voice.bookmark
 
 import android.os.Bundle
 import androidx.compose.runtime.Composable
-import voice.app.features.bookmarks.dialogs.AddBookmarkDialog
-import voice.app.features.bookmarks.dialogs.EditBookmarkDialog
-import voice.app.injection.appComponent
+import com.squareup.anvil.annotations.ContributesTo
+import voice.bookmark.dialogs.AddBookmarkDialog
+import voice.bookmark.dialogs.EditBookmarkDialog
+import voice.common.AppScope
 import voice.common.BookId
 import voice.common.compose.ComposeController
+import voice.common.rootComponentAs
 import voice.data.Bookmark
 import voice.data.getBookId
 import voice.data.putBookId
@@ -27,7 +29,9 @@ class BookmarkController(args: Bundle) :
 
   private val bookId = args.getBookId(NI_BOOK_ID)!!
 
-  private val presenter = appComponent.bookmarkPresenterFactory.create(bookId)
+  private val presenter = rootComponentAs<Component>()
+    .bookmarkPresenterFactory
+    .create(bookId)
 
   @Composable
   override fun Content() {
@@ -68,4 +72,9 @@ class BookmarkController(args: Bundle) :
   private fun showAddBookmarkDialog() {
     AddBookmarkDialog(this).showDialog(router)
   }
+
+  @ContributesTo(AppScope::class)
+  interface Component {
+    val bookmarkPresenterFactory: BookmarkPresenter.Factory
+  }
 }
diff --git a/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkItemViewState.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkItemViewState.kt
similarity index 87%
rename from app/src/main/kotlin/voice/app/features/bookmarks/BookmarkItemViewState.kt
rename to bookmark/src/main/kotlin/voice/bookmark/BookmarkItemViewState.kt
index 161a947d0d..56e8991029 100644
--- a/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkItemViewState.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkItemViewState.kt
@@ -1,4 +1,4 @@
-package voice.app.features.bookmarks
+package voice.bookmark
 
 import voice.data.Bookmark
 
diff --git a/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkPresenter.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkPresenter.kt
similarity index 99%
rename from app/src/main/kotlin/voice/app/features/bookmarks/BookmarkPresenter.kt
rename to bookmark/src/main/kotlin/voice/bookmark/BookmarkPresenter.kt
index 9e8e022f07..c98745f5fd 100644
--- a/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkPresenter.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkPresenter.kt
@@ -1,4 +1,4 @@
-package voice.app.features.bookmarks
+package voice.bookmark
 
 import android.content.Context
 import android.text.format.DateUtils
diff --git a/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkScreen.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
similarity index 99%
rename from app/src/main/kotlin/voice/app/features/bookmarks/BookmarkScreen.kt
rename to bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
index a229e42f76..3797f48bd5 100644
--- a/app/src/main/kotlin/voice/app/features/bookmarks/BookmarkScreen.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
@@ -1,4 +1,4 @@
-package voice.app.features.bookmarks
+package voice.bookmark
 
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background
diff --git a/app/src/main/kotlin/voice/app/features/bookmarks/dialogs/AddBookmarkDialog.kt b/bookmark/src/main/kotlin/voice/bookmark/dialogs/AddBookmarkDialog.kt
similarity index 97%
rename from app/src/main/kotlin/voice/app/features/bookmarks/dialogs/AddBookmarkDialog.kt
rename to bookmark/src/main/kotlin/voice/bookmark/dialogs/AddBookmarkDialog.kt
index 1a366185b1..103f2184e0 100644
--- a/app/src/main/kotlin/voice/app/features/bookmarks/dialogs/AddBookmarkDialog.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/dialogs/AddBookmarkDialog.kt
@@ -1,4 +1,4 @@
-package voice.app.features.bookmarks.dialogs
+package voice.bookmark.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
diff --git a/app/src/main/kotlin/voice/app/features/bookmarks/dialogs/EditBookmarkDialog.kt b/bookmark/src/main/kotlin/voice/bookmark/dialogs/EditBookmarkDialog.kt
similarity index 98%
rename from app/src/main/kotlin/voice/app/features/bookmarks/dialogs/EditBookmarkDialog.kt
rename to bookmark/src/main/kotlin/voice/bookmark/dialogs/EditBookmarkDialog.kt
index 90b6ca9609..c27bc8d28a 100644
--- a/app/src/main/kotlin/voice/app/features/bookmarks/dialogs/EditBookmarkDialog.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/dialogs/EditBookmarkDialog.kt
@@ -1,4 +1,4 @@
-package voice.app.features.bookmarks.dialogs
+package voice.bookmark.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b429256c2a..9933bd4a75 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -45,6 +45,7 @@ develocity {
 include(":app")
 include(":strings")
 include(":common")
+include(":bookmark")
 include(":data")
 include(":playback")
 include(":ffmpeg")

From 11cfa74549d4045d2a5da65103c31f4b86f80928 Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Fri, 5 Jul 2024 22:46:51 +0200
Subject: [PATCH 066/236] Remove the old bookmark layouts, recyclerview and
 constraint layout

---
 app/build.gradle.kts                          |  2 -
 .../voice/app/uitools/ViewBindingHolder.kt    | 14 -----
 app/src/main/res/layout/bookmark.xml          | 36 ------------
 .../main/res/layout/bookmark_row_layout.xml   | 58 -------------------
 app/src/main/res/menu/bookmark_popup.xml      | 11 ----
 gradle/libs.versions.toml                     |  2 -
 settings/build.gradle.kts                     |  1 -
 sleepTimer/build.gradle.kts                   |  1 -
 8 files changed, 125 deletions(-)
 delete mode 100644 app/src/main/kotlin/voice/app/uitools/ViewBindingHolder.kt
 delete mode 100644 app/src/main/res/layout/bookmark.xml
 delete mode 100644 app/src/main/res/layout/bookmark_row_layout.xml
 delete mode 100644 app/src/main/res/menu/bookmark_popup.xml

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 94b804ce59..f3338ef736 100755
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -173,9 +173,7 @@ dependencies {
   implementation(projects.bookmark)
 
   implementation(libs.appCompat)
-  implementation(libs.recyclerView)
   implementation(libs.material)
-  implementation(libs.constraintLayout)
   implementation(libs.datastore)
   implementation(libs.appStartup)
 
diff --git a/app/src/main/kotlin/voice/app/uitools/ViewBindingHolder.kt b/app/src/main/kotlin/voice/app/uitools/ViewBindingHolder.kt
deleted file mode 100644
index cf876786e1..0000000000
--- a/app/src/main/kotlin/voice/app/uitools/ViewBindingHolder.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package voice.app.uitools
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import androidx.viewbinding.ViewBinding
-import voice.common.conductor.InflateBinding
-
-abstract class ViewBindingHolder<B : ViewBinding>(val binding: B) : RecyclerView.ViewHolder(binding.root) {
-
-  constructor(parent: ViewGroup, inflateBinding: InflateBinding<B>) : this(
-    inflateBinding(LayoutInflater.from(parent.context), parent, false),
-  )
-}
diff --git a/app/src/main/res/layout/bookmark.xml b/app/src/main/res/layout/bookmark.xml
deleted file mode 100644
index a5069f5c18..0000000000
--- a/app/src/main/res/layout/bookmark.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:fitsSystemWindows="true"
-  android:background="?android:windowBackground"
-  android:focusableInTouchMode="true"
-  android:orientation="vertical">
-
-  <com.google.android.material.appbar.MaterialToolbar
-    android:id="@+id/toolbar"
-    android:layout_width="match_parent"
-    android:layout_height="?attr/actionBarSize"
-    app:title="@string/bookmark" />
-
-  <!-- 88 dp bottom padding is the sum of the FAB + vertical margins.
-  that way, the controls for the last bookmark are always visible -->
-  <androidx.recyclerview.widget.RecyclerView
-    android:id="@+id/recycler"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginTop="?attr/actionBarSize"
-    android:clipToPadding="false"
-    android:paddingBottom="88dp" />
-
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
-    android:id="@+id/addBookmarkFab"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="end|bottom"
-    android:layout_margin="16dp"
-    android:contentDescription="@string/bookmark"
-    android:src="@drawable/plus" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/bookmark_row_layout.xml b/app/src/main/res/layout/bookmark_row_layout.xml
deleted file mode 100644
index 1fa494cad7..0000000000
--- a/app/src/main/res/layout/bookmark_row_layout.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:paddingTop="8dp"
-  android:paddingBottom="8dp"
-  android:background="?android:attr/windowBackground"
-  android:foreground="?attr/selectableItemBackground"
-  android:descendantFocusability="blocksDescendants"
-  android:gravity="center_vertical"
-  android:orientation="horizontal"
-  tools:ignore="Overdraw">
-
-  <ImageView
-    android:id="@+id/edit"
-    android:layout_width="40dp"
-    android:scaleType="center"
-    android:layout_height="40dp"
-    android:layout_alignParentEnd="true"
-    android:contentDescription="@string/popup_edit"
-    android:src="@drawable/ic_more_vert"
-    app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintTop_toTopOf="parent" />
-
-  <TextView
-    android:id="@+id/title"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="16dp"
-    android:layout_marginEnd="16dp"
-    android:drawablePadding="4dp"
-    android:textAppearance="?textAppearanceBodyMedium"
-    app:layout_constrainedWidth="true"
-    app:layout_constraintEnd_toStartOf="@+id/edit"
-    app:layout_constraintHorizontal_bias="0"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent"
-    tools:drawableEnd="@drawable/ic_sleep"
-    tools:text="Fictive bookmark title that might be too long to fit" />
-
-  <TextView
-    android:id="@+id/time"
-    android:layout_width="0dp"
-    android:layout_marginStart="16dp"
-    android:layout_height="wrap_content"
-    android:layout_marginEnd="16dp"
-    android:ellipsize="end"
-    android:textAppearance="?textAppearanceBodySmall"
-    app:layout_constraintStart_toStartOf="parent"
-    android:layout_marginTop="8dp"
-    app:layout_constraintEnd_toStartOf="@+id/edit"
-    app:layout_constraintTop_toBottomOf="@+id/title"
-    tools:text="10:10:10 / 12:12:12" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/menu/bookmark_popup.xml b/app/src/main/res/menu/bookmark_popup.xml
deleted file mode 100644
index 674bb24547..0000000000
--- a/app/src/main/res/menu/bookmark_popup.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-  <item
-    android:id="@+id/edit"
-    android:title="@string/popup_edit" />
-
-  <item
-    android:id="@+id/delete"
-    android:title="@string/remove" />
-</menu>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f6a4b32538..b4ef1858af 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -35,8 +35,6 @@ retrofit-serialization = { module = "com.squareup.retrofit2:converter-kotlinx-se
 robolectric = "org.robolectric:robolectric:4.12.2"
 coil = "io.coil-kt:coil-compose:2.6.0"
 appCompat = "androidx.appcompat:appcompat:1.7.0"
-constraintLayout = "androidx.constraintlayout:constraintlayout:2.1.4"
-recyclerView = "androidx.recyclerview:recyclerview:1.3.2"
 androidxCore = "androidx.core:core-ktx:1.13.1"
 kotlin-pluginForGradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-compilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }
diff --git a/settings/build.gradle.kts b/settings/build.gradle.kts
index 4bbd38e207..7289b44b98 100644
--- a/settings/build.gradle.kts
+++ b/settings/build.gradle.kts
@@ -18,7 +18,6 @@ dependencies {
   implementation(libs.prefs.core)
   implementation(libs.materialDialog.core)
   implementation(libs.androidxCore)
-  implementation(libs.constraintLayout)
   implementation(libs.material)
 
   implementation(libs.dagger.core)
diff --git a/sleepTimer/build.gradle.kts b/sleepTimer/build.gradle.kts
index b852ea3a13..6de590e5e6 100644
--- a/sleepTimer/build.gradle.kts
+++ b/sleepTimer/build.gradle.kts
@@ -18,7 +18,6 @@ dependencies {
   implementation(libs.prefs.core)
   implementation(libs.materialDialog.core)
   implementation(libs.androidxCore)
-  implementation(libs.constraintLayout)
   implementation(libs.material)
   implementation(libs.seismic)
 

From 6a32f9ee2e6c124b99754f439da974314188c83b Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Fri, 5 Jul 2024 23:01:58 +0200
Subject: [PATCH 067/236] Migrate the AddBookmarkDialog to compose

---
 .../voice/bookmark/BookmarkController.kt      |  18 +--
 .../voice/bookmark/BookmarkItemViewState.kt   |   6 +
 .../voice/bookmark/BookmarkPresenter.kt       |  10 ++
 .../kotlin/voice/bookmark/BookmarkScreen.kt   |  20 ++-
 .../bookmark/dialogs/AddBookmarkDialog.kt     | 121 +++++++++++-------
 5 files changed, 115 insertions(+), 60 deletions(-)

diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
index 8df88269fb..32f9fd0ad7 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
@@ -3,7 +3,6 @@ package voice.bookmark
 import android.os.Bundle
 import androidx.compose.runtime.Composable
 import com.squareup.anvil.annotations.ContributesTo
-import voice.bookmark.dialogs.AddBookmarkDialog
 import voice.bookmark.dialogs.EditBookmarkDialog
 import voice.common.AppScope
 import voice.common.BookId
@@ -18,7 +17,6 @@ private const val NI_BOOK_ID = "ni#bookId"
 @Suppress("unused")
 class BookmarkController(args: Bundle) :
   ComposeController(args),
-  AddBookmarkDialog.Callback,
   EditBookmarkDialog.Callback {
 
   constructor(bookId: BookId) : this(
@@ -40,7 +38,7 @@ class BookmarkController(args: Bundle) :
       viewState = viewState,
       onClose = { router.popController(this) },
       onAdd = {
-        showAddBookmarkDialog()
+        presenter.onAddClicked()
       },
       onDelete = presenter::deleteBookmark,
       onEdit = { bookmark, title ->
@@ -48,6 +46,12 @@ class BookmarkController(args: Bundle) :
       },
       onScrollConfirmed = presenter::onScrollConfirmed,
       onClick = presenter::selectBookmark,
+      onNewBookmarkNameChosen = {
+        presenter.addBookmark(it)
+      },
+      onCloseDialog = {
+        presenter.closeDialog()
+      },
     )
   }
 
@@ -58,10 +62,6 @@ class BookmarkController(args: Bundle) :
     presenter.editBookmark(id, title)
   }
 
-  override fun onBookmarkNameChosen(name: String) {
-    presenter.addBookmark(name)
-  }
-
   private fun showEditBookmarkDialog(
     bookmark: Bookmark.Id,
     title: String?,
@@ -69,10 +69,6 @@ class BookmarkController(args: Bundle) :
     EditBookmarkDialog(this, bookmark, title).showDialog(router)
   }
 
-  private fun showAddBookmarkDialog() {
-    AddBookmarkDialog(this).showDialog(router)
-  }
-
   @ContributesTo(AppScope::class)
   interface Component {
     val bookmarkPresenterFactory: BookmarkPresenter.Factory
diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkItemViewState.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkItemViewState.kt
index 56e8991029..8cb13cc461 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/BookmarkItemViewState.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkItemViewState.kt
@@ -11,4 +11,10 @@ data class BookmarkItemViewState(
 data class BookmarkViewState(
   val bookmarks: List<BookmarkItemViewState>,
   val shouldScrollTo: Bookmark.Id?,
+  val dialogViewState: BookmarkDialogViewState,
 )
+
+sealed interface BookmarkDialogViewState {
+  data object None : BookmarkDialogViewState
+  data object AddBookmark : BookmarkDialogViewState
+}
diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkPresenter.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkPresenter.kt
index c98745f5fd..c171c643f0 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/BookmarkPresenter.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkPresenter.kt
@@ -50,6 +50,7 @@ class BookmarkPresenter
   private var chapters by mutableStateOf<List<Chapter>>(emptyList())
 
   private var shouldScrollTo by mutableStateOf<Bookmark.Id?>(null)
+  private var dialogViewState: BookmarkDialogViewState by mutableStateOf(BookmarkDialogViewState.None)
 
   @Composable
   fun viewState(): BookmarkViewState {
@@ -91,6 +92,7 @@ class BookmarkPresenter
         )
       },
       shouldScrollTo = shouldScrollTo,
+      dialogViewState = dialogViewState,
     )
   }
 
@@ -156,6 +158,14 @@ class BookmarkPresenter
     shouldScrollTo = null
   }
 
+  fun closeDialog() {
+    dialogViewState = BookmarkDialogViewState.None
+  }
+
+  fun onAddClicked() {
+    dialogViewState = BookmarkDialogViewState.AddBookmark
+  }
+
   @AssistedFactory
   interface Factory {
     fun create(id: BookId): BookmarkPresenter
diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
index 3797f48bd5..0db008bd66 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
@@ -46,13 +46,14 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
+import voice.bookmark.dialogs.AddBookmarkDialog
 import voice.data.Bookmark
 import java.util.UUID
 import kotlin.math.roundToInt
 import voice.strings.R as StringsR
 
 @Composable
-fun BookmarkScreen(
+internal fun BookmarkScreen(
   viewState: BookmarkViewState,
   onClose: () -> Unit,
   onAdd: () -> Unit,
@@ -60,6 +61,8 @@ fun BookmarkScreen(
   onEdit: (Bookmark.Id, String) -> Unit,
   onScrollConfirmed: () -> Unit,
   onClick: (Bookmark.Id) -> Unit,
+  onCloseDialog: () -> Unit,
+  onNewBookmarkNameChosen: (String) -> Unit,
   modifier: Modifier = Modifier,
 ) {
   val snackbarHostState = remember { SnackbarHostState() }
@@ -121,15 +124,26 @@ fun BookmarkScreen(
       }
     }
   }
+
+  when (viewState.dialogViewState) {
+    BookmarkDialogViewState.AddBookmark -> {
+      AddBookmarkDialog(
+        onDismissRequest = onCloseDialog,
+        onBookmarkNameChosen = onNewBookmarkNameChosen,
+      )
+    }
+    BookmarkDialogViewState.None -> {
+    }
+  }
 }
 
-enum class DragAnchors {
+internal enum class DragAnchors {
   Start,
   End,
 }
 
 @Composable
-fun BookmarkItem(
+internal fun BookmarkItem(
   bookmark: BookmarkItemViewState,
   onDelete: (Bookmark.Id) -> Unit,
   onEdit: (Bookmark.Id, String) -> Unit,
diff --git a/bookmark/src/main/kotlin/voice/bookmark/dialogs/AddBookmarkDialog.kt b/bookmark/src/main/kotlin/voice/bookmark/dialogs/AddBookmarkDialog.kt
index 103f2184e0..3d9accd887 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/dialogs/AddBookmarkDialog.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/dialogs/AddBookmarkDialog.kt
@@ -1,55 +1,84 @@
 package voice.bookmark.dialogs
 
-import android.app.Dialog
-import android.os.Bundle
-import android.text.InputType
-import android.view.inputmethod.EditorInfo
-import com.afollestad.materialdialogs.MaterialDialog
-import com.afollestad.materialdialogs.input.getInputField
-import com.afollestad.materialdialogs.input.input
-import com.bluelinelabs.conductor.Controller
-import voice.common.conductor.DialogController
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Button
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.unit.dp
 import voice.strings.R as StringsR
 
-class AddBookmarkDialog : DialogController() {
-
-  override fun onCreateDialog(savedViewState: Bundle?): Dialog {
-    val inputType = InputType.TYPE_CLASS_TEXT or
-      InputType.TYPE_TEXT_FLAG_CAP_SENTENCES or
-      InputType.TYPE_TEXT_FLAG_AUTO_CORRECT or
-      InputType.TYPE_TEXT_FLAG_MULTI_LINE
-    val dialog = MaterialDialog(activity!!).apply {
-      title(StringsR.string.bookmark)
-      @Suppress("CheckResult")
-      input(hintRes = StringsR.string.bookmark_edit_hint, allowEmpty = true, inputType = inputType) { _, charSequence ->
-        val title = charSequence.toString()
-        val callback = targetController as Callback
-        callback.onBookmarkNameChosen(title)
+@Composable
+internal fun AddBookmarkDialog(
+  onDismissRequest: () -> Unit,
+  onBookmarkNameChosen: (String) -> Unit,
+) {
+  var bookmarkName by remember { mutableStateOf("") }
+  val focusRequester = remember { FocusRequester() }
+  AlertDialog(
+    onDismissRequest = onDismissRequest,
+    title = { Text(text = stringResource(StringsR.string.bookmark)) },
+    text = {
+      Column {
+        OutlinedTextField(
+          value = bookmarkName,
+          onValueChange = { bookmarkName = it },
+          label = { Text(stringResource(StringsR.string.bookmark_edit_hint)) },
+          modifier = Modifier
+            .fillMaxWidth()
+            .padding(vertical = 8.dp)
+            .focusRequester(focusRequester),
+          keyboardOptions = KeyboardOptions(
+            capitalization = KeyboardCapitalization.Sentences,
+            autoCorrect = true,
+            keyboardType = KeyboardType.Text,
+            imeAction = ImeAction.Done,
+          ),
+          keyboardActions = KeyboardActions(
+            onDone = {
+              onBookmarkNameChosen(bookmarkName)
+            },
+          ),
+          singleLine = true,
+        )
       }
-      positiveButton(StringsR.string.dialog_confirm)
-    }
-    val editText = dialog.getInputField()
-    editText.setOnEditorActionListener { _, actionId, _ ->
-      if (actionId == EditorInfo.IME_ACTION_DONE) {
-        val title = editText.text.toString()
-        val callback = targetController as Callback
-        callback.onBookmarkNameChosen(title)
-        dismissDialog()
-        true
-      } else {
-        false
+    },
+    confirmButton = {
+      Button(
+        onClick = {
+          onBookmarkNameChosen(bookmarkName)
+          onDismissRequest()
+        },
+      ) {
+        Text(stringResource(StringsR.string.dialog_confirm))
       }
-    }
-    return dialog
-  }
-
-  interface Callback {
-    fun onBookmarkNameChosen(name: String)
-  }
+    },
+    dismissButton = {
+      TextButton(onClick = onDismissRequest) {
+        Text(stringResource(StringsR.string.dialog_cancel))
+      }
+    },
+  )
 
-  companion object {
-    operator fun <T> invoke(target: T) where T : Controller, T : Callback = AddBookmarkDialog().apply {
-      targetController = target
-    }
+  LaunchedEffect(Unit) {
+    focusRequester.requestFocus()
   }
 }

From d1ed61e35aa4ad78425e7e701b26045c5839a6da Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Fri, 5 Jul 2024 23:13:56 +0200
Subject: [PATCH 068/236] Migrate the EditBookmarkDialog to compose

---
 .../voice/bookmark/BookmarkController.kt      |  36 +---
 .../voice/bookmark/BookmarkItemViewState.kt   |   4 +
 .../voice/bookmark/BookmarkPresenter.kt       |   5 +
 .../kotlin/voice/bookmark/BookmarkScreen.kt   |  18 +-
 .../bookmark/dialogs/EditBookmarkDialog.kt    | 165 ++++++++++--------
 5 files changed, 120 insertions(+), 108 deletions(-)

diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
index 32f9fd0ad7..a1b03be715 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
@@ -3,12 +3,10 @@ package voice.bookmark
 import android.os.Bundle
 import androidx.compose.runtime.Composable
 import com.squareup.anvil.annotations.ContributesTo
-import voice.bookmark.dialogs.EditBookmarkDialog
 import voice.common.AppScope
 import voice.common.BookId
 import voice.common.compose.ComposeController
 import voice.common.rootComponentAs
-import voice.data.Bookmark
 import voice.data.getBookId
 import voice.data.putBookId
 
@@ -16,8 +14,7 @@ private const val NI_BOOK_ID = "ni#bookId"
 
 @Suppress("unused")
 class BookmarkController(args: Bundle) :
-  ComposeController(args),
-  EditBookmarkDialog.Callback {
+  ComposeController(args) {
 
   constructor(bookId: BookId) : this(
     Bundle().apply {
@@ -37,38 +34,17 @@ class BookmarkController(args: Bundle) :
     BookmarkScreen(
       viewState = viewState,
       onClose = { router.popController(this) },
-      onAdd = {
-        presenter.onAddClicked()
-      },
+      onAdd = presenter::onAddClicked,
       onDelete = presenter::deleteBookmark,
-      onEdit = { bookmark, title ->
-        showEditBookmarkDialog(bookmark, title)
-      },
+      onEdit = presenter::onEditClicked,
       onScrollConfirmed = presenter::onScrollConfirmed,
       onClick = presenter::selectBookmark,
-      onNewBookmarkNameChosen = {
-        presenter.addBookmark(it)
-      },
-      onCloseDialog = {
-        presenter.closeDialog()
-      },
+      onNewBookmarkNameChosen = presenter::addBookmark,
+      onCloseDialog = presenter::closeDialog,
+      onEditBookmark = presenter::editBookmark,
     )
   }
 
-  override fun onEditBookmark(
-    id: Bookmark.Id,
-    title: String,
-  ) {
-    presenter.editBookmark(id, title)
-  }
-
-  private fun showEditBookmarkDialog(
-    bookmark: Bookmark.Id,
-    title: String?,
-  ) {
-    EditBookmarkDialog(this, bookmark, title).showDialog(router)
-  }
-
   @ContributesTo(AppScope::class)
   interface Component {
     val bookmarkPresenterFactory: BookmarkPresenter.Factory
diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkItemViewState.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkItemViewState.kt
index 8cb13cc461..2f85a1221d 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/BookmarkItemViewState.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkItemViewState.kt
@@ -17,4 +17,8 @@ data class BookmarkViewState(
 sealed interface BookmarkDialogViewState {
   data object None : BookmarkDialogViewState
   data object AddBookmark : BookmarkDialogViewState
+  data class EditBookmark(
+    val id: Bookmark.Id,
+    val title: String?,
+  ) : BookmarkDialogViewState
 }
diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkPresenter.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkPresenter.kt
index c171c643f0..15c2bc65a5 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/BookmarkPresenter.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkPresenter.kt
@@ -166,6 +166,11 @@ class BookmarkPresenter
     dialogViewState = BookmarkDialogViewState.AddBookmark
   }
 
+  fun onEditClicked(id: Bookmark.Id) {
+    val bookmark = bookmarks.find { it.id == id } ?: return
+    dialogViewState = BookmarkDialogViewState.EditBookmark(id, bookmark.title)
+  }
+
   @AssistedFactory
   interface Factory {
     fun create(id: BookId): BookmarkPresenter
diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
index 0db008bd66..4cb4e79751 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
@@ -47,6 +47,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import voice.bookmark.dialogs.AddBookmarkDialog
+import voice.bookmark.dialogs.EditBookmarkDialog
 import voice.data.Bookmark
 import java.util.UUID
 import kotlin.math.roundToInt
@@ -58,11 +59,12 @@ internal fun BookmarkScreen(
   onClose: () -> Unit,
   onAdd: () -> Unit,
   onDelete: (Bookmark.Id) -> Unit,
-  onEdit: (Bookmark.Id, String) -> Unit,
+  onEdit: (Bookmark.Id) -> Unit,
   onScrollConfirmed: () -> Unit,
   onClick: (Bookmark.Id) -> Unit,
   onCloseDialog: () -> Unit,
   onNewBookmarkNameChosen: (String) -> Unit,
+  onEditBookmark: (Bookmark.Id, String) -> Unit,
   modifier: Modifier = Modifier,
 ) {
   val snackbarHostState = remember { SnackbarHostState() }
@@ -134,6 +136,14 @@ internal fun BookmarkScreen(
     }
     BookmarkDialogViewState.None -> {
     }
+    is BookmarkDialogViewState.EditBookmark -> {
+      EditBookmarkDialog(
+        onDismissRequest = onCloseDialog,
+        onEditBookmark = onEditBookmark,
+        bookmarkId = viewState.dialogViewState.id,
+        initialTitle = viewState.dialogViewState.title ?: "",
+      )
+    }
   }
 }
 
@@ -146,7 +156,7 @@ internal enum class DragAnchors {
 internal fun BookmarkItem(
   bookmark: BookmarkItemViewState,
   onDelete: (Bookmark.Id) -> Unit,
-  onEdit: (Bookmark.Id, String) -> Unit,
+  onEdit: (Bookmark.Id) -> Unit,
   onClick: (Bookmark.Id) -> Unit,
   modifier: Modifier = Modifier,
 ) {
@@ -228,7 +238,7 @@ internal fun BookmarkItem(
               text = { Text(stringResource(id = StringsR.string.popup_edit)) },
               onClick = {
                 expanded = false
-                onEdit(bookmark.id, bookmark.title)
+                onEdit(bookmark.id)
               },
             )
             DropdownMenuItem(
@@ -259,7 +269,7 @@ private fun BookmarkItemPreview() {
       id = Bookmark.Id(UUID.randomUUID()),
     ),
     onDelete = {},
-    onEdit = { _, _ -> },
+    onEdit = { },
     onClick = {},
   )
 }
diff --git a/bookmark/src/main/kotlin/voice/bookmark/dialogs/EditBookmarkDialog.kt b/bookmark/src/main/kotlin/voice/bookmark/dialogs/EditBookmarkDialog.kt
index c27bc8d28a..6163038b27 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/dialogs/EditBookmarkDialog.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/dialogs/EditBookmarkDialog.kt
@@ -1,86 +1,103 @@
 package voice.bookmark.dialogs
 
-import android.app.Dialog
-import android.os.Bundle
-import android.text.InputType
-import android.view.inputmethod.EditorInfo
-import com.afollestad.materialdialogs.MaterialDialog
-import com.afollestad.materialdialogs.input.getInputField
-import com.afollestad.materialdialogs.input.input
-import com.bluelinelabs.conductor.Controller
-import voice.common.conductor.DialogController
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Button
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.unit.dp
 import voice.data.Bookmark
-import voice.data.getBookmarkId
-import voice.data.putBookmarkId
 import voice.strings.R as StringsR
 
-/**
- * Dialog for changing the bookmark title.
- */
-class EditBookmarkDialog(args: Bundle) : DialogController(args) {
-
-  override fun onCreateDialog(savedViewState: Bundle?): Dialog {
-    val bookmarkTitle = args.getString(NI_BOOKMARK_TITLE)
-    val bookmarkId = args.getBookmarkId(NI_BOOKMARK_ID)!!
-
-    val dialog = MaterialDialog(activity!!).apply {
-      title(StringsR.string.bookmark_edit_title)
-      val inputType = InputType.TYPE_CLASS_TEXT or
-        InputType.TYPE_TEXT_FLAG_CAP_SENTENCES or
-        InputType.TYPE_TEXT_FLAG_AUTO_CORRECT or
-        InputType.TYPE_TEXT_FLAG_MULTI_LINE
-      @Suppress("CheckResult")
-      input(
-        hintRes = StringsR.string.bookmark_edit_hint,
-        prefill = bookmarkTitle,
-        allowEmpty = false,
-        inputType = inputType,
-      ) { _, charSequence ->
-        val callback = targetController as Callback
-        val newTitle = charSequence.toString()
-        callback.onEditBookmark(bookmarkId, newTitle)
-      }
-      positiveButton(StringsR.string.dialog_confirm)
-    }
-    val editText = dialog.getInputField()
-    editText.setOnEditorActionListener { _, actionId, _ ->
-      if (actionId == EditorInfo.IME_ACTION_DONE) {
-        val callback = targetController as Callback
-        val newTitle = editText.text.toString()
-        callback.onEditBookmark(bookmarkId, newTitle)
-        dismissDialog()
-        true
-      } else {
-        false
-      }
-    }
-    return dialog
-  }
-
-  interface Callback {
-    fun onEditBookmark(
-      id: Bookmark.Id,
-      title: String,
+@Composable
+internal fun EditBookmarkDialog(
+  onDismissRequest: () -> Unit,
+  onEditBookmark: (Bookmark.Id, String) -> Unit,
+  bookmarkId: Bookmark.Id,
+  initialTitle: String,
+) {
+  var bookmarkTitle by remember {
+    mutableStateOf(
+      TextFieldValue(
+        text = initialTitle,
+        selection = TextRange(0, initialTitle.length),
+      ),
     )
   }
+  val focusRequester = remember { FocusRequester() }
 
-  companion object {
-
-    private const val NI_BOOKMARK_ID = "ni#bookMarkId"
-    private const val NI_BOOKMARK_TITLE = "ni#bookmarkTitle"
-
-    operator fun <T> invoke(
-      target: T,
-      bookmark: Bookmark.Id,
-      title: String?,
-    ): EditBookmarkDialog where T : Controller, T : Callback {
-      val args = Bundle().apply {
-        putBookmarkId(NI_BOOKMARK_ID, bookmark)
-        putString(NI_BOOKMARK_TITLE, title)
+  AlertDialog(
+    onDismissRequest = onDismissRequest,
+    title = { Text(text = stringResource(StringsR.string.bookmark_edit_title)) },
+    text = {
+      Column {
+        OutlinedTextField(
+          value = bookmarkTitle,
+          onValueChange = { bookmarkTitle = it },
+          label = { Text(stringResource(StringsR.string.bookmark_edit_hint)) },
+          modifier = Modifier
+            .fillMaxWidth()
+            .padding(vertical = 8.dp)
+            .focusRequester(focusRequester),
+          keyboardOptions = KeyboardOptions(
+            capitalization = KeyboardCapitalization.Sentences,
+            autoCorrect = true,
+            keyboardType = KeyboardType.Text,
+            imeAction = ImeAction.Done,
+          ),
+          keyboardActions = KeyboardActions(
+            onDone = {
+              if (bookmarkTitle.text.isNotEmpty()) {
+                onEditBookmark(bookmarkId, bookmarkTitle.text)
+                onDismissRequest()
+              }
+            },
+          ),
+          singleLine = true,
+        )
       }
-      return EditBookmarkDialog(args).apply {
-        targetController = target
+    },
+    confirmButton = {
+      Button(
+        onClick = {
+          if (bookmarkTitle.text.isNotEmpty()) {
+            onEditBookmark(bookmarkId, bookmarkTitle.text)
+            onDismissRequest()
+          }
+        },
+        enabled = bookmarkTitle.text.isNotEmpty(),
+      ) {
+        Text(stringResource(StringsR.string.dialog_confirm))
       }
-    }
+    },
+    dismissButton = {
+      TextButton(onClick = onDismissRequest) {
+        Text(stringResource(StringsR.string.dialog_cancel))
+      }
+    },
+  )
+
+  LaunchedEffect(Unit) {
+    focusRequester.requestFocus()
   }
 }

From 74bb723df3b9cf892ca432df93ea9816ba9771ca Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 8 Jul 2024 08:08:51 +0000
Subject: [PATCH 069/236] Update dependency org.robolectric:robolectric to
 v4.13

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f6a4b32538..058659c5cc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -32,7 +32,7 @@ paging-compose = "androidx.paging:paging-compose:3.3.0"
 retrofit-core = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-scalars = { module = "com.squareup.retrofit2:converter-scalars", version.ref = "retrofit" }
 retrofit-serialization = { module = "com.squareup.retrofit2:converter-kotlinx-serialization", version.ref = "retrofit" }
-robolectric = "org.robolectric:robolectric:4.12.2"
+robolectric = "org.robolectric:robolectric:4.13"
 coil = "io.coil-kt:coil-compose:2.6.0"
 appCompat = "androidx.appcompat:appcompat:1.7.0"
 constraintLayout = "androidx.constraintlayout:constraintlayout:2.1.4"

From 72a418ecbf36bdd5fa3873993a23416bad8e60c2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 11 Jul 2024 17:36:15 +0000
Subject: [PATCH 070/236] Update dependency gradle to v8.9

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 43453 -> 43504 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   5 ++++-
 gradlew.bat                              |   2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e6441136f3d4ba8a0da8d277868979cfbc8ad796..2c3521197d7c4586c843d1d3e9090525f1898cde 100644
GIT binary patch
delta 8703
zcmYLtRag{&)-BQ@Dc#cDDP2Q%r*wBHJ*0FE-92<lryvbOBMc!OLwAGsobz!1{j%cQ
z>)X$3_b$L+F2Fa28UVeg>}yRjC}^a^+(Cdu_FTlV;w_x7ig{yd(N<xeI3x2bgeiOg
zc|3&3NCBi(o6yMlAI%#Xl;E@s))Y*R2rbgYd1>Yi_;SHXEq`|Qa`qPMf1B~v#%<*D
zn+KWJfX#=$FMopqZ>C<bC6r_*%gn%Q4LzPG6O%Pvtz%|lB)~d!Jvsks#~K<yi3H&?
z4>v7|0<k8=3A0$elLJL=kkJ<$*aB_90#vq(Wu<g@!QVv}=tf<9hhiD_<8SZrsr`dt
zh-w|%)`Rt~2V2=o%P*}Dpwk3;A29;udrP0f0;OHH+J;(@8dn?Y>WiA^M(L@tZ=_Hi
z*{?)#Cn^{TIzYD|H>J3dyXQCNy8f@~OAUfR*Y@C6r=~KMZ{X}q`<IsIj*Qc~&Gn!d
z%JH#1>t@Er8NRiCUcR=?Y+RMv`o0i{krhWT6XgmUt!&X=e_Q2=u@F=PXKpr9-FL@0
zfKigQcGHyPn{3vStLFk=`h@+Lh1XBNC-_nwNU<D$Gy~aUvek0EhgLYEGgIZu4Rr?i
z>{ytxZF$o}oyVfHMj|ZHWmEmZeNIlO5eLco<=RI&3=fYK*=kmv*75aqE~&GtAp(VJ
z`VN#&v2&}|)s~*yQ)-V2@RmCG8lz5Ysu&I_N*G5njY`<@HOc*Bj)ZwC%2|2O<%W;M
z+T{{_bHLh~n(rM|8SpGi8Whep9(cURNRVfCBQQ2VG<6*L$Ckvq<!5xBgeVlJ$s@M(
zjCrWae(Hmb5mpAzkNuQV{}0gyAMTZmbOEeP2D8e+@?fuQ>uqJ~9WZ~!<6-EZ&L(TN
zpSEGXrDiZNz)`CzG>5&_bxzBlXBVs|RTTQi5GX6s5^)a3{6l)Wzpnc|Cc~(5mO)6;
z6gVO2Zf)srRQ&BSeg0)P2en#<)X30qXB{sujc3Ppm4*)}zOa)@YZ<%1oV9K%+(VzJ
zk(|p>q-$v>lImtsB)`Mm;Z0LaU;4T1BX!wbnu-PSlH1%`)jZZJ(uvbmM^is*r=Y{B
zI?(l;2n)Nx!goxrWfUnZ?y5$=*mVU$Lpc_vS2UyW>tD%i&YYXvcr1v7hL2zWkHf42
z_8q$Gvl>%468i#uV`RoLgrO+R1>x<o!mt>P8I^7~&3(=c-Z-#I`VDnL`6stnsRlYL
zJNiI`4J_0fppF<(Ot3o2w?UT*8QQrk1{#n;FW@4M7kR}oW-}k6KNQaGPTs=$5{Oz}
zUj0qo@;PTg#5moUF`+?5qBZ)<%-$qw(Z?_amW*X}KW4j*FmblWo@SiU16V>;nm`Eg
zE0MjvGKN_eA%R0X&RDT!hSVkLbF`BFf;{8Nym#1<P{PD5H<MfZATs*~iib@X5X*3*
z*|E#vmnA_W9?K8s<!6ueQP`(J#djaP&(4##ZaBYmP)!^YfuijYfT%0I7fxr4s~!yS
z{GFkppD%v@XM44`Sdi9Y$t+#{4RxUw%;=eK;TjwLN2IEMQcCk+C+}MRW+v<#`0o9a
zP+erNKg|%`{=rkHO!>?#5Fb<mbm(r2FPQI=^L$Zfpl1lSiBC&*><L@FKGB#tgiZ52
zlLr+`mfL>?bAHY(?me2tww}5K9AV9y+T7YaqaVx8n{d=K`dxS|=))*KJn(~8u@^J%
zj;8EM+=Dq^`HL~VPag9poTmeP$E`npJFh^|=}Mxs2El)bOyoimzw8(RQle(f$n#*v
zzzG@VOO(xXiG8d?gcsp-Trn-36}+S^w$U(IaP`-5*OrmjB%Ozzd;jfaeRHAzc_#?-
z`0&PVZANQIcb1sS_JNA2TFyN$*yFSvmZbqrRhfME3(PJ62u%KDeJ$ZeLYuiQMC2Sc
z35+Vxg^@gSR6flp>mS|$p&IS7#fL@n20YbNE9(fH;n%C{w?Y0=N5?3GnQLIJLu{lm
zV6h@UDB+23dQoS>>)p`xYe^<jdqa_A);hYas@Ye$d!y(s>IvcXD*6n<D<Yo-^*X!<
z-m+s+fO)&*qg=5B-;)EIc^g=ZW-GXS-l@bpLoVJLIl<mPReTEwUY3*bp?$+%VE!cM
zFfp>DsR;xo?1aNTCMdbZ{uyF^zMyloFDiS~P7W>WuaH2+`xp0`!d<H>_@>Fn<2GMt
z&UTBc5QlWv1)K5CoShN@|0y1M?<kPExYVEQ0U|JZOc7>_^8$Y*U(9VrroVq6NwAJe
zxxiTWHnD#cN0kEds(wN8YGEjK&5%|1pjwMH*81r^aXR*$qf~WiD2%J^=PHDUl|=+f
zkB=@_7{K$Fo0%-WmFN_pyXBxl^+lLG+m8Bk1OxtFU}$fQU8gTYCK2hOC0sVEPCb5S
z4jI0<O>7>MWhA%cA{R2M7O_ltorFkJ-BbmPc`{g&<M0U>Keq!IvDeg8s^PI3a^FcF
z@g<M64n!hIC(lkLx~54d;sVFP-k8NOXGqRa7zu%z?i;6vjzsuz9x}`kVY!fj9e=Fo
z*JM}KTRY@+6YPJxN+T*3>Z2SB8$BPfenkFc*x#6&Z;7A5#mOR5qtgE}hjZ)b!MkOQ
zEqmM3s>cI_v>MzM<2>U*eHoC69t`W`^9QBU^<zRr#IOnYZ(BGWtl|399~{O%VBjZX
z9!*q`XLTo|2ozmll8pRy?w=x-J!omEcREFPS^F96WTjl`qpojv@<)tJpuN4T6St0{
zVIMp<(y7Kb?PI$;#r`KgyL|@E<fcpuF0C(dIc^2G0@wU$M#q=d`D3%cXJM`kA+>F$
z;nU4%0$)$ILukM6$6U+Xts8FhOFb|>J-*fOLsqVfB=vC0v2U&q8kYy~x@xKXS*b6i
zy=HxwsDz%)!*T5Bj3DY1r`#@Tc%LKv`?V|g6Qv~iAnrqS+48TfuhmM)V_$<?C}(L6
z=Kvl+!N9L{xx@6WJlyhzcE>F8#CJ1j4;L}TBZM~PX!88IT+lSza{BY#ER3TpyMqi#
z#{nTi!IsLYt9cH?*y^bxWw4djrd!#)YaG3|3>|^1mzTuXW6SV4+X8sA2dUWcjH)a3
z&rXUMHbOO?Vcdf3H<_T-=DB0M4wsB;EL3lx?|T(}@)`*C5m`H%le54I{bfg7GHqYB
z9p+30u+QXMt4z&iG%LSOk1uw7KqC<k<yLYfyaGwUNYfj(l8SI+Mr6aG`K?AHuutdV
zkJLbwtbHTmDzojA6nw6J+tu2>2}ogMEFzc{;5x`hU(rh0%SvFCBQe}M#RSWJv;`KM
zf7D&z0a)3285{R$ZW%+I@JFa^oZN)vx77y_;@p0(-gz6HEE!w&b}>0b)mqz-(lfh4
zGt}~Hl@{P63b#dc`trFkguB}6Flu!S;w7lp_>yt|3U=c|@>N~mMK_t#LO{n;_wp%E
zQUm=z6?JMkuQHJ!1JV$gq)q)zeBg<TvaL6-lsUX7Kov_C%rzdAet|2L<(Ky^koxh|
zr(xpzO;Aacze$f6H7WC6SoSVtxvX5XGcmf>)g7yCrP=3Z<j;W%I<|TUpIgnN1%@YL
za^~<e`>A|wt9%_l#yPjsS#C7qn<QO<>gav8etSX+s?JJ1eX-n-%WvP!IH1%o9j!QH
zeP<8aW}@S2w|qQ`=YNC}+hN+lxv-Wh1lMh?Y;LbIHDZ<F0zDSG>qVvW^r;^i1O<9e
z%)ukq=r=Sd{AKp;kj?YUpRcCr*6)<@Mnp-cx{rPayiJ0!7Jng}27Xl93WgthgVEn2
zQlvj!%Q#V#j#gRWx7((Y>;cC;AVbPoX*mhbqK*QnDQQ?qH+Q*$u6_2QISr!<PZ6s@
zgK*-J+}=}g%Ly9}v;~l(44bd~4TMjOEd6X<*z{HOm?`NHfq>Fn;B-F@!E+`S9?+Jr
zt`)cc(ZJ$9q^rFohZJoRbP&X3)sw9CLh#-?;TD}!i>`a;FkY6(1N8U-T;F#dGE&VI
zm<*Tn>EGW(TioP@h<vV`%Hr5laim6Mmg~xnZCOFtkhm_?369&eHG2DZsh!PTI>qBg
zn6nEolK5(}I*c;XjG!hcI0R=WPzT)auX-g4Znr;P`GfMa*!!KLiiTqOE*STX4C(PD
z&}1K|kY#>~>sx6I0;0mUn8)=lV?o#Bcn3tn|M*AQ$FscYD$0H(UKzC0R588Mi}sFl
z@hG4h^*;_;PVW#KW=?>N)4?&PJF&EO(X?BKOT)OCi+Iw)B$^uE)H>KQZ54R8_2z2_
z%d-F7n<LAk>Y_WQiSB5vWd0+>^;G^j{1A%-B359C(Eji{4oLT9wJ~80H`6oKa&{G-
z)2n<z2d3jtkZV-ez7WYK5+{+V66%87>-~d8S0PIkT<jW6{nJ_SYGT4@I25B?ZZL#c
zi)CSF0h|0(5*)pu{ia>W_*Cu~nwVlE&Zd{?7QbsGKmwETa=m*RG>g??WkZ|_WH7q@
zfaxzTsOY2B3!Fu;rBIJ~aW^yqn{V;<E47?tiz9&Q*`@pr=_Yn(lwe{zwk>~4LS$xA
zGHP@f>X^FPnSOxEbrnEOd*W7{c(c`b;RlOEQ*x!*Ek<AT)5Gup^zyPpCB|RW5oIG=
zGOB#od`5;JcsF{O+ZT^nE1~U89yOd9Y-~xK`F+E2!1=fnd^GLUPr`&qLGTUqx7uOL
zgDrHe3U&6BWj;*EPr(N3e_7{|uc{h{2$niT2pwp<;2b___hR><^p*C#8L=Ty^S&hg
zaV)g8<@!3p6(@zW$n7O8H$Zej+%gf^)WYc$WT{zp<8hmn!PR&#MMOLm^hcL2;$o=Q
zXJ=9_0vO)ZpNxPjYs$nukEGK2bbL%kc2|o|zxYMqK8F?$YtXk9Owx&^tf`VvCCgUz
zLNmDWtociY`(}KqT~qnVUkflu#9iVqXw7Qi7}YT@{K2Uk(Wx7Q-L}u^h+M(81;I*J
ze^vW&-D&=aOQq0lF5nLd)OxY&duq#IdK?-r7En0MnL~W51UXJQFVVTgSl#85=q$+|
zHI%I(T3G8ci9Ubq4(snkbQ*L&ksLCnX_I(xa1`&(Bp)|f<D~;s2yV5_n)Zv<<BdeF
z3VcE3k63f^Z21;#<S3);h~B@vyE$^L;U}NihNY>W$kFot17I)jyIi06dDTTiI%gNR
z8i*F<vY(<B(D^sJ)W8pd%Y$B%Y01y7*G{C@Yyjod8{9{LW9xrKHRV@9kw02>pB0y0
zjzWln{UG1qk!{DEE5?0R5jsNkJ(IbGMjgeeNL4I9;cP&>qm%q7cHT}@l0v;TrsuY0
zUg;Z53O-rR*W!{Q*Gp26h`zJ^p&FmF0!EEt@R3aT4YFR0&uI%ko6U0jzEYk_xScP@
zyk%nw`+Ic4)gm4xvCS$)y;<Iz#gM-lP@kd9tE<ozN;W5j`r8~5uVkPc9kwr!!~L5_
z{D!3kMeQY|Ecqu+3P(yEj$U@pBJ975ql;>^)B9^}O0wYFEPas)!=ijoBCbF0DbVMP
z`QI7N8;88x{*g=51AfHx+*hoW3hK(?kr(xVtKE&F-%Tb}Iz1Z8FW>usLnoCwr$iWv
ztOVMNMV27l*fFE29x}veeYCJ&TUVuxsd`hV-8*SxX@UD6au5NDhCQ4Qs{{CJQHE#4
z#bg6dIGO2oUZQVY0iL1(Q>%-5)<7rhnenUjOV53*9Qq?aU$exS6>;BJqz2|#{We_|
zX;Nsg$KS<+`*5=WA?idE6G~kF9oQPSSAs#Mh-|)@kh#pPCgp&?&=H@Xfnz`5G2(95
z`Gx2RfBV~`&Eyq2S9m1}T~LI6q*#xC^o*EeZ#`}Uw)@RD>~<_Kvgt2?bRbO&H3&h-
zjB&3bBuWs|YZSkmcZvX|GJ5u7#PAF$wj0ULv;~$7a?_R%e%<A?JBl@1KmMFfG8U(g
zOrU0Bt4tfCybvDNa^hv!C60Vl#{<`e3)ME_FND@8VNB(ZH}7IHfl$=1xUTYh376^A
zuu77h8U&eF&0kR>ST{al;=nqj-<0pZiEgNznHM;TVjCy5E#4f?hudTr0W8)a6o;H;
zhnh6iNyI^F-l_Jz$F`!KZFTG$yWdioL=A<LS43Wc%cz@}63v|Yp09UGNTM4OUKWW|
zd>hImGr!$AJihd{j(YwqVmqxMKlqFj<_Hlj@~4nmrd~&6#f~9>r2_e-^nca(nucjf
z;(VFfBrd0?k--U9L*iey5GTc|Msnn6prtF*!5AW3_BZ9<MHMqsVfuGWUhbEblyIrN
zolFGsKWo*1efNCL%Z~hgMx(|t6_v!i2}m7!kZ)?DI3K%;YhRcTX=GIWy(@34bd_*9
zX%TANJ^EXMuy|C0eGB+@%JkhG$Kt*QJ(zuadl}o2m7F}S_d0bk{cHYN#~s!x*PvSj
z<k9~pA^9uAD3FT+HnW|`=par*!T0y~rs3`4fJF?7;>KRO2(q7mmJZ5kz-yms`04e;
z=uvr2o^{lVBnAkB_~7b7?1#rDUh4>LI$CH1&QdEFN4J%Bz6I$1lFZjDz?dGjmNYlD
zDt}f;+xn-iHYk~V-7Fx!EkS``+w`-f&Ow>**}c5I*^1tpFdJk>vG23PKw}FrW4J#x
zBm1zcp^){Bf}M|l+0UjvJXRjP3~!#`I%q*E=>?HLZ>AvB5$;cqwSf_*jzEmxxscH;
zcl>V3s>*IpK`Kz1vP#APs#|tV9~#yMnCm&FOllccilcNmAwFdaaY7GKg&(AKG3KFj
zk@%9hYvfMO;Vvo#%8&H<M3O~BQI78Yae<)Sn;TLdxtG~>_OO~XHlwKd()gD36!_;o
z*7pl*o>x9fbe?jaGUO25ZZ@#qqn@|$B+q49TvTQnasc$oy`i~*o}Ka*>Wg4csQOZR
z|Fs_6-04vj-Dl|B2y{&mf!JlPJBf3qG~lY=a*I7SBno8rLRdid7*Kl@sG|JLCt60#
zqMJ^1u^Gsb&pBPXh8m1@4;)}mx}m%P6V8$1oK?|tAk5V6yyd@Ez}AlRPGcz_b!c;;
z%(uLm1Cp=NT(4Hcbk;m`oSeW5&c^lybx8+nAn&fT(!HOi@^&l1lDci*?L#*J7-u}}
z%`-*V&`F1;4fWsvcHOlZF#SD&j+I-P(Mu$L;|2IjK*aGG3QXmN$e}7IIRko8{`0h9
z7JC2vi2Nm>g`D;QeN@^AhC0hKnvL(>GUqs|X8UD1r3iUc+-R4$=!U!y+?p6rHD@TL
zI!&;6+LK_E*REZ2V`IeFP;qyS*&-EOu)3%3Q2Hw19hpM$3>v!!YAB<i^4GquQW3zx
z%`&IX5s;@gxCjGt0|IizR_izBd%Il2>s?mG44{L=@rjD%X-%$ajTW7%t_$7to%9d3
z8<IE#xVVV8i!NizWhIp%rbbLwqSn7O+|ik$u?9Y)S4M}?@XS1cY8^5mcMr-lVw<}?
zeK&72PxryETfgB5V|C%zIJ=!8Am!@r+gS!$%6crFs4ig5NsWwN?Q;BaqQmeTH>>lk
z?_e}(m&>emlIx3%7{ER?KOVXi>MG_)cDK}v3skwd%Vqn0WaKa1;e=bK$~Jy}p#~`B
zGk-XGN9v)Y<lg;}!nKP_y5UUcJTJGaOiIYlb`_NXS<0-&fj8<-SBZ$%wOz!?vZbd<
zNQt0KBn2h}q4l;eEAX`qxyUC04%sv`sJT2!`wZRUkFOMVp{8UB$)&$&xl9uoD0o+i
zn|F$>X)K2FM{HNY-{mloSX|a?<qu`+k}1VDPgR}BHd)%U^=NMx(eQ6_8XZJfArX>>
z8Om9viiwL|vbVF~j%~hr;|1wlC0`PUGXdK12w;5Wubw}miQZ)nUguh?7asm90n>q=
z;+x?3haT5#62bg^_?VozZ-=|h2NbG%+-pJ?CY(wdMiJ6!0ma2x{R{!ys=%in;;5@v
z{-rpytg){PNbCGP4Ig>=nJV#^ie|N68J4D;C<1=$<qIyOA$cK=$bGbHokqzPuZw{u
z7y{LMg|J4Qvf@ZX$7yNSD5g6XK(>6&boh&ol~#A?F-{9sBL*1rlZshXm~6EvG!X9S
zD5O{ZC{EEpHvmD5K}ck+3$E~{xr<hlfuv9EEeofbHIk134VTCTTH-v743T-b5T|M`
z4+!3dzHQ=H!Nu^n!Sv6H<W4X|tH&UP68J^c9A3D)WU{S9anztrM9i#KCE$CP<bH~_
z^Z?_L^l@>rg*ITiA}@ZCoIm`%kVqaX$|#ddV$bxA{jux^uRHkH)o6#}fT6XE|2BzU
zJiNOAqcxdcQdrD=U7OVqer@p>30l|ke$<qis@@mtn&Q#1uvP>8h;Mny-+PP&OM&AN
z9)!bENg5Mr2g+GDIMyzQpS1RHE6ow;O*ye;(Qqej%JC?!D`u;<;Y}1qi5cL&jm6d9
za{plRJ0i|4?Q%(t)l_6f8An9e2<)bL3eULUVdWanGSP9mm?PqFbyOeeSs9{qLEO-)
zTeH*<$kRyrHPr*li6p+K!HUCf$OQIqwIw^R#mTN>@bm^E=H=Ger_E=ztfGV9<p8zI
z&{ZW7rV&HzeI-g-l$S=i-?kcmh~yk1mQsg6IesUjmIL&Ud?(#}0i;?Jv9i*cI|PA%
z-}~_hu43erUgRV=JH~gyfd$K^Qo>xTgh=}Hep!i97A;IMEC9nb5DBA5J#a8H_Daq~
z6^lZ=VT)7=y}H3=gm5&j!Q79#e%J>w(L?xBcj_RNj44r*6^~nCZZYtCrLG#Njm$$E
z7wP?E?@mdLN~xyWosgwkCot8bEY-rUJLDo7gukwm@;TjXeQ>fr(wKP%7LnH4Xsv?o
zUh6ta5qPx8a5)WO<m~&s1T?2TpD6KX(8dqU)Yxd!YY}X3v6i|Dh*$o;`+~1|j5~E+
z$6D9tyEy+Fl8r2D?om+V#rF7w@S1$~f@|Z&6Wjz{n;8D501X`DUiGCqKTMENBTC>4
zK37@GE@?tG{!2_CGeq}M8VW(gU6QXSfadNDhZEZ}W2dwm)>Y7V1G^I<aLufan$5&i
z4%70TVjdWH-9h=mbjBw<$cJp2mj(slpvXN&Qp(X!@R28f>aRI9ugWCP#s<kr<k{rZ
zoqX{FNTRS@lylRv|5g3icqB2!1>w1tPtU|13R!nwd1;Zw8VMx4hUJECJkocrIMbJI
zS9k2|`0$SD%;g_d0cmE7^MXP_;_6`APcj1yOy_NXU22taG9Z;C2=Z1|?|5c^E}dR&
zRfK2Eo=Y=sHm@O1`62ciS1iKv9BX=_l7PO9VUkWS7xlqo<@OxlR*tn$_WbrR8F?ha
zBQ4Y!is^AIsq-46^u<nZkY<z|zI`{bYK}Vf@8BBgQswt%AOS~$dfrOea|3+6&skKp
z?lk#XAQ6yraP#u-(JIqE%OfMno<W@+l`e)qLOgLAD{X@m)z(+izoY%*z2dx-ZO_gG
z|B4kfWloQ5^M3g|*1JK({7W`Em>h;=9B`gE#Sh+4m>o@RMZFHHi=qb7QcUrgTos$e
z^4-0Z?q<7XfCP~d#*7?hwdj%LyPj2}bsdWL6HctL)@!tU$ftMmV=miEvZ2KCJXP%q
zLMG&%rVu8HaaM-tn4abcSE$88EYmK|5%_29B*L9NyO|~j3m><l3fNH^yl=wWH6*;@
zeExQWURb%Osx42zgGahR5tUz9A4AeySl~31P!rY%6y5ODGdC>YGXf6fQL$(7>Bm9o
zjHfJ+lmYu_`+}xUa^&i81%9UGQ6t|LV45I)^+m@Lz@jEeF;?_*y>-JbK`=ZVsSEWZ
z$p^SK_v(0d02AyIv$}*8m)9kjef1-%H*_daPdSXD6mpc>TW`R$h9On=Z9n>+f4swL
zBz^(d9uaQ_J&hjDvEP{&6pNz-bg;A===!Ac%}bu^>0}E)wdH1nc}?W*q^J2SX_A*d
zBLF@n+=flfH96zs@2RlOz&;vJPiG6In>$&{D+`DNgzPYVu8<(N&0yPt?G|>D6COM#
zVd)6v$i-VtYfYi1h)pXvO}8KO#wuF=F^WJXPC+;hqpv>{Z+FZTP1w&KaPl?D)*A=(
z8$S{Fh;Ww&GqSvia6|MvKJg-RpNL<6MXTl(>1}XFfziRvPaLDT1y_tjLYSGS$N;8|
zZC*Hcp!~u?v~ty3&dBm`1A&kUe6@`q!#>P>ZZZgGRYhNIxFU6B>@f@YL%hOV0=9s#
z?@0~aR1|d9LFoSI+li~@?g({Y0_{~~E_MycHTXz`EZmR2$J$3QVoA25j$9pe?Ub)d
z`jbm8v&V0JVfY-^1mG=a`70a_tjafgi}z-8$smw7Mc`-!*6y{rB-xN1l`G3PLBGk~
z{o(KCV0HEfj*rMAiluQuIZ1tevmU@m{adQQr3xgS!e_WXw&eE?GjlS+tL0@x%Hm{1
zzUF^q<T!<Y47*%#M8+WAY+4;IsNcW+Cy{e{^RY-GGT>F*2KAxY0$~pzVRpg9dA*)^
z7&wu-V$7+Jgb<5g;U1z*ymus?oZi7&gr!_3zEttV`=5VlLtf!e&~zv~PdspA0JCRz
zZi|bO5d)>E;<idklsDQ=dxc0t+xKq;a$0bU$FJBx(Z+7^tUCo5TTqH9=^!ifDd*eU
z=l13sM?2Wb{H`FjYD|dMY*_|TC&xztf(;t@{p0&2k!EJeeg~};G2s|$z5*;{^v4k8
zf1(ln>q)?}OADAhGgey#6(>+36XVThP%b#8%|a9B_H^)Nps1md_lV<D!F?D{aT}3<
zpH@l7`T|s(X{17y*+x}K1&W-zJ3FF@$|O#jqxY=C7<o!kDD6Q^m}eSp$sp%N#l8|w
zT3Deng<gr&U4)1r=UO<gHpih9)9Ibj&~j%*^TuL0>v5~OO@(*IJO@;eqE@@(y}KA-
z`zj@%6q#>hIgm9}*-)n(^Xbdp8`>w~3JCC`(H{NUh8Umm{NUntE+eMg^WvSyL+ilV
zff54-b59jg&r_*;*#P~ON#I=gAW99hTD;}nh_j;)B6*<?!bG79N?k<(Q)!*iEAi{4
zdXuMfg3~QC%9bpv%7Bb<{Gbup24CGg8V)>tMgP_gz4?=2EJZg$8IU;Ly<(TTC?^)&
zj@%V!4?DU&tE=8)<A{<`Pr-;T$5h0mU8#WiroHn#O;r2f#S{T#H}P6@A~nuy6P$U1
z`yY7cUjFo7Q@dWDZYJ&NtzPiI&~AG1-`qu~crx%mK?!f7|H!LzyzfXiAUyRDzb~PO
z03Ezb^gKnl^$&u7N<#`>BX6f~x0K+w$%=M3;Fpq$VhETRlJ8<sM`DOax-+c8oY)z<
zI3#0OBee7pZR(Y|$9s|Y&oMN%u`HUqQMA`{x4ewCl8oVdU;ftv1aHDI_b}k#{t^7Q
z2mGA$%V9(N|J@+f6>LEEe;aUcG;nBe|2Gw>+h7CuJ-^gYFhQzDg(`e=!2f7t0AXrl
zAx`RQ1u1+}?EkEWSb|jQN)~wOg#Ss&1oHoFBvg{Z|4#g$)mNzjKLq+8rLR(jC(QUC
Ojj7^59?Sdh$^Qpp*~F><

delta 8662
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6f7a6eb33e..dedd5d1e69 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index b740cf1339..f5feea6d6b 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/gradlew.bat b/gradlew.bat
index 7101f8e467..9b42019c79 100755
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

From 67280da90ef1a012ec8a5377dcc6c9ad868e8b15 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 11 Jul 2024 20:47:01 +0000
Subject: [PATCH 071/236] Update plugin ksp to v2.0.0-1.0.23

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 058659c5cc..e89baabcec 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -158,7 +158,7 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 anvil = { id = "com.squareup.anvil", version = "2.5.0-beta09" }
 ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
-ksp = { id = "com.google.devtools.ksp", version = "2.0.0-1.0.22" }
+ksp = { id = "com.google.devtools.ksp", version = "2.0.0-1.0.23" }
 playPublish = { id = "com.github.triplet.play", version = "3.10.1" }
 android-app = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }

From 4c7991fde585feb10fe10bf11c54baf8f1222da7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 11 Jul 2024 22:19:33 +0000
Subject: [PATCH 072/236] Update agp to v8.5.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e89baabcec..373efc91f1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ materialDialog = "3.3.0"
 dagger = "2.51.1"
 kotlin = "2.0.0"
 media3 = "1.3.1"
-agp = "8.5.0"
+agp = "8.5.1"
 ktlint-core = "1.2.1"
 ktlint-gradlePlugin = "0.9.0"
 retrofit = "2.11.0"

From bded9b259e9b15e595cbe5561bcf98a80f68694a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 15 Jul 2024 16:26:45 +0000
Subject: [PATCH 073/236] Update dependency io.mockk:mockk to v1.13.12

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 373efc91f1..60d26a1573 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,7 +26,7 @@ leakcanary-plumber = { module = "com.squareup.leakcanary:plumber-android-startup
 material = "com.google.android.material:material:1.12.0"
 ffmpeg = "com.arthenica:ffmpeg-kit-audio:6.0-2"
 junit = "junit:junit:4.13.2"
-mockk = "io.mockk:mockk:1.13.11"
+mockk = "io.mockk:mockk:1.13.12"
 paging-runtime = "androidx.paging:paging-runtime-ktx:3.3.0"
 paging-compose = "androidx.paging:paging-compose:3.3.0"
 retrofit-core = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }

From 76c57f46659e8b91c321ebe487710ec4a4aea863 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 17 Jul 2024 19:58:15 +0000
Subject: [PATCH 074/236] Update dependency io.coil-kt:coil-compose to v2.7.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 60d26a1573..6e048e0893 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -33,7 +33,7 @@ retrofit-core = { module = "com.squareup.retrofit2:retrofit", version.ref = "ret
 retrofit-scalars = { module = "com.squareup.retrofit2:converter-scalars", version.ref = "retrofit" }
 retrofit-serialization = { module = "com.squareup.retrofit2:converter-kotlinx-serialization", version.ref = "retrofit" }
 robolectric = "org.robolectric:robolectric:4.13"
-coil = "io.coil-kt:coil-compose:2.6.0"
+coil = "io.coil-kt:coil-compose:2.7.0"
 appCompat = "androidx.appcompat:appcompat:1.7.0"
 constraintLayout = "androidx.constraintlayout:constraintlayout:2.1.4"
 recyclerView = "androidx.recyclerview:recyclerview:1.3.2"

From 40a3982948cff4d4b0d04719e970d4b323550c6f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 10:33:47 +0000
Subject: [PATCH 075/236] Update plugin com.gradle.develocity to v3.17.6

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index b429256c2a..a4280046bb 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -31,7 +31,7 @@ dependencyResolutionManagement {
 }
 
 plugins {
-  id("com.gradle.develocity") version "3.17.5"
+  id("com.gradle.develocity") version "3.17.6"
   id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.0")
 }
 

From 4808f306f647957971600efaddb331b61128b30c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 23:27:02 +0000
Subject: [PATCH 076/236] Update plugin anvil to v2.5.0-beta10

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6e048e0893..5f63365350 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -156,7 +156,7 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
-anvil = { id = "com.squareup.anvil", version = "2.5.0-beta09" }
+anvil = { id = "com.squareup.anvil", version = "2.5.0-beta10" }
 ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
 ksp = { id = "com.google.devtools.ksp", version = "2.0.0-1.0.23" }
 playPublish = { id = "com.github.triplet.play", version = "3.10.1" }

From ee5a135b5c4d8aeb68e3bd307370794e7bbbc84e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 24 Jul 2024 17:43:02 +0000
Subject: [PATCH 077/236] Update dependency androidx.paging:paging-runtime-ktx
 to v3.3.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5f63365350..6d17554a60 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -27,7 +27,7 @@ material = "com.google.android.material:material:1.12.0"
 ffmpeg = "com.arthenica:ffmpeg-kit-audio:6.0-2"
 junit = "junit:junit:4.13.2"
 mockk = "io.mockk:mockk:1.13.12"
-paging-runtime = "androidx.paging:paging-runtime-ktx:3.3.0"
+paging-runtime = "androidx.paging:paging-runtime-ktx:3.3.1"
 paging-compose = "androidx.paging:paging-compose:3.3.0"
 retrofit-core = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-scalars = { module = "com.squareup.retrofit2:converter-scalars", version.ref = "retrofit" }

From 91a47c4772664dacbe93302a0d90855acd9f4a78 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 24 Jul 2024 17:42:53 +0000
Subject: [PATCH 078/236] Update dependency
 androidx.lifecycle:lifecycle-runtime-ktx to v2.8.4

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6d17554a60..c3d264e7e9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -94,7 +94,7 @@ media3-session = { module = "androidx.media3:media3-session", version.ref = "med
 media3-testUtils-core = { module = "androidx.media3:media3-test-utils", version.ref = "media3" }
 media3-testUtils-robolectric = { module = "androidx.media3:media3-test-utils-robolectric", version.ref = "media3" }
 
-lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.3"
+lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.4"
 
 compose-bom = "androidx.compose:compose-bom:2024.06.00"
 compose-ui-ui = { module = "androidx.compose.ui:ui" }

From 7792c694b8234db5304e3b9974a2cc869e364e10 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 24 Jul 2024 17:42:48 +0000
Subject: [PATCH 079/236] Update dependency androidx.activity:activity-compose
 to v1.9.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c3d264e7e9..7657db331c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -110,7 +110,7 @@ compose-material-icons-extended = { module = "androidx.compose.material:material
 compose-animation-graphics = { module = "androidx.compose.animation:animation-graphics" }
 compose-animation-animation = { module = "androidx.compose.animation:animation" }
 compose-material3 = { module = "androidx.compose.material3:material3" }
-compose-activity = "androidx.activity:activity-compose:1.9.0"
+compose-activity = "androidx.activity:activity-compose:1.9.1"
 compose-navigation = "dev.olshevski.navigation:reimagined:1.5.0"
 
 ktlint-core = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint-core" }

From b75e9029437fbb8a7b72b123f30fb274c1699bf3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 24 Jul 2024 19:50:13 +0000
Subject: [PATCH 080/236] Update dependency androidx.paging:paging-compose to
 v3.3.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7657db331c..e9a660c3f2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -28,7 +28,7 @@ ffmpeg = "com.arthenica:ffmpeg-kit-audio:6.0-2"
 junit = "junit:junit:4.13.2"
 mockk = "io.mockk:mockk:1.13.12"
 paging-runtime = "androidx.paging:paging-runtime-ktx:3.3.1"
-paging-compose = "androidx.paging:paging-compose:3.3.0"
+paging-compose = "androidx.paging:paging-compose:3.3.1"
 retrofit-core = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-scalars = { module = "com.squareup.retrofit2:converter-scalars", version.ref = "retrofit" }
 retrofit-serialization = { module = "com.squareup.retrofit2:converter-kotlinx-serialization", version.ref = "retrofit" }

From 28f6835efee7be10d25d5bcce3c0bc12c7775b66 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2024 21:37:40 +0000
Subject: [PATCH 081/236] Update actions/checkout digest to 9a9194f

---
 .github/workflows/voice.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index c1540d3292..6d02f985d6 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -61,7 +61,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08
 
       - name: Set up JDK
         uses: actions/setup-java@v4.2.1

From 08b00d675328172f34cc456c693db15818b44dbc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2024 00:46:01 +0000
Subject: [PATCH 082/236] Update plugin ksp to v2.0.0-1.0.24

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e9a660c3f2..a004b22cfe 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -158,7 +158,7 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 anvil = { id = "com.squareup.anvil", version = "2.5.0-beta10" }
 ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
-ksp = { id = "com.google.devtools.ksp", version = "2.0.0-1.0.23" }
+ksp = { id = "com.google.devtools.ksp", version = "2.0.0-1.0.24" }
 playPublish = { id = "com.github.triplet.play", version = "3.10.1" }
 android-app = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }

From 4e18b073c2a6375e71128ea23eeaae4faec0df65 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2024 04:36:04 +0000
Subject: [PATCH 083/236] Update plugin anvil to v2.5.0-beta11

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a004b22cfe..0c84ded9f6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -156,7 +156,7 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
-anvil = { id = "com.squareup.anvil", version = "2.5.0-beta10" }
+anvil = { id = "com.squareup.anvil", version = "2.5.0-beta11" }
 ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
 ksp = { id = "com.google.devtools.ksp", version = "2.0.0-1.0.24" }
 playPublish = { id = "com.github.triplet.play", version = "3.10.1" }

From 11a64a4d226f211f28cb7aad58f6177c89dbe5c1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 4 Aug 2024 04:24:58 +0000
Subject: [PATCH 084/236] Update dependency com.airbnb.android:lottie-compose
 to v6.5.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0c84ded9f6..36033c604d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -53,7 +53,7 @@ immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7"
 uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0"
 okhttp = "com.squareup.okhttp3:okhttp:4.12.0"
 review = "com.google.android.play:review-ktx:2.0.1"
-lottie = "com.airbnb.android:lottie-compose:6.4.1"
+lottie = "com.airbnb.android:lottie-compose:6.5.0"
 clikt = "com.github.ajalt.clikt:clikt:4.4.0"
 
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }

From 425d14e8d1034857d7af57e2e6116ea8704dbad6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 Aug 2024 15:59:26 +0000
Subject: [PATCH 085/236] Update actions/setup-java action to v4.2.2

---
 .github/workflows/voice.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index 6d02f985d6..2e1e499c74 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -31,7 +31,7 @@ jobs:
         uses: gradle/gradle-build-action@v3
 
       - name: Set up JDK
-        uses: actions/setup-java@v4.2.1
+        uses: actions/setup-java@v4.2.2
         with:
           distribution: 'zulu'
           java-version: 17
@@ -64,7 +64,7 @@ jobs:
       - uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08
 
       - name: Set up JDK
-        uses: actions/setup-java@v4.2.1
+        uses: actions/setup-java@v4.2.2
         with:
           distribution: 'zulu'
           java-version: 17

From c8f62456dcb30ae2cea3e46b148c0b96119d5229 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 Aug 2024 19:30:36 +0000
Subject: [PATCH 086/236] Update dagger to v2.52

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 36033c604d..8730d194e5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ coroutines = "1.8.1"
 room = "2.6.1"
 prefs = "1.0.1"
 materialDialog = "3.3.0"
-dagger = "2.51.1"
+dagger = "2.52"
 kotlin = "2.0.0"
 media3 = "1.3.1"
 agp = "8.5.1"

From f568be6626b894f342235480a33df2b5055c1c72 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Aug 2024 09:12:21 +0000
Subject: [PATCH 087/236] Migrate config renovate.json

---
 renovate.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/renovate.json b/renovate.json
index 661282491e..08b384acfd 100644
--- a/renovate.json
+++ b/renovate.json
@@ -15,18 +15,18 @@
     },
     {
       "groupName": "Kotlin, KSP",
-      "matchPackagePrefixes": [
-        "org.jetbrains.kotlin:",
-        "org.jetbrains.kotlin.",
-        "com.google.devtools.ksp"
+      "matchPackageNames": [
+        "org.jetbrains.kotlin:{/,}**",
+        "org.jetbrains.kotlin.{/,}**",
+        "com.google.devtools.ksp{/,}**"
       ]
     },
     {
       "groupName": "Ktlint",
-      "matchPackagePrefixes": [
-        "com.pinterest.ktlint",
-        "io.nlopez.compose.rules",
-        "io.github.usefulness"
+      "matchPackageNames": [
+        "com.pinterest.ktlint{/,}**",
+        "io.nlopez.compose.rules{/,}**",
+        "io.github.usefulness{/,}**"
       ]
     },
     {
@@ -36,8 +36,8 @@
       "registryUrls": [
         "https://jitpack.io/"
       ],
-      "matchPackagePrefixes": [
-        "com.github.PaulWoitaschek"
+      "matchPackageNames": [
+        "com.github.PaulWoitaschek{/,}**"
       ]
     },
     {

From 50535e20cabb6126905344a089e0fe7dd833153b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Aug 2024 14:52:51 +0000
Subject: [PATCH 088/236] Update Kotlin, KSP to v2.0.10

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8730d194e5..7815b1e968 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ room = "2.6.1"
 prefs = "1.0.1"
 materialDialog = "3.3.0"
 dagger = "2.52"
-kotlin = "2.0.0"
+kotlin = "2.0.10"
 media3 = "1.3.1"
 agp = "8.5.1"
 ktlint-core = "1.2.1"

From c7255040298b026ae57bc67322d2d23d7877b8bd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Aug 2024 22:43:23 +0000
Subject: [PATCH 089/236] Update plugin ksp to v2.0.10-1.0.24

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7815b1e968..40d22f562c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -158,7 +158,7 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 anvil = { id = "com.squareup.anvil", version = "2.5.0-beta11" }
 ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
-ksp = { id = "com.google.devtools.ksp", version = "2.0.0-1.0.24" }
+ksp = { id = "com.google.devtools.ksp", version = "2.0.10-1.0.24" }
 playPublish = { id = "com.github.triplet.play", version = "3.10.1" }
 android-app = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }

From 3737507d8697e5a21dec07243325e7bb9a841487 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 18:18:26 +0000
Subject: [PATCH 090/236] Update dependency androidx.paging:paging-runtime-ktx
 to v3.3.2

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 40d22f562c..a7f80a5a3f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -27,7 +27,7 @@ material = "com.google.android.material:material:1.12.0"
 ffmpeg = "com.arthenica:ffmpeg-kit-audio:6.0-2"
 junit = "junit:junit:4.13.2"
 mockk = "io.mockk:mockk:1.13.12"
-paging-runtime = "androidx.paging:paging-runtime-ktx:3.3.1"
+paging-runtime = "androidx.paging:paging-runtime-ktx:3.3.2"
 paging-compose = "androidx.paging:paging-compose:3.3.1"
 retrofit-core = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-scalars = { module = "com.squareup.retrofit2:converter-scalars", version.ref = "retrofit" }

From 8861c787f3f7c7ce7ee1ec04a81cd1e4f86dfcfd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 21:04:26 +0000
Subject: [PATCH 091/236] Update dependency androidx.paging:paging-compose to
 v3.3.2

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a7f80a5a3f..8ccffba9c8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -28,7 +28,7 @@ ffmpeg = "com.arthenica:ffmpeg-kit-audio:6.0-2"
 junit = "junit:junit:4.13.2"
 mockk = "io.mockk:mockk:1.13.12"
 paging-runtime = "androidx.paging:paging-runtime-ktx:3.3.2"
-paging-compose = "androidx.paging:paging-compose:3.3.1"
+paging-compose = "androidx.paging:paging-compose:3.3.2"
 retrofit-core = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-scalars = { module = "com.squareup.retrofit2:converter-scalars", version.ref = "retrofit" }
 retrofit-serialization = { module = "com.squareup.retrofit2:converter-kotlinx-serialization", version.ref = "retrofit" }

From 5dd1072c8240acf92006b2d716f2cda95cb4acf9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 9 Aug 2024 02:07:16 +0000
Subject: [PATCH 092/236] Update agp to v8.5.2

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8ccffba9c8..e887ebbcf5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ materialDialog = "3.3.0"
 dagger = "2.52"
 kotlin = "2.0.10"
 media3 = "1.3.1"
-agp = "8.5.1"
+agp = "8.5.2"
 ktlint-core = "1.2.1"
 ktlint-gradlePlugin = "0.9.0"
 retrofit = "2.11.0"

From 09b0ae67021b0c907b59b98878c87876b8eddcdb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 12:06:26 +0000
Subject: [PATCH 093/236] Update dependency gradle to v8.10

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 43504 -> 43583 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 2c3521197d7c4586c843d1d3e9090525f1898cde..a4b76b9530d66f5e68d973ea569d8e19de379189 100644
GIT binary patch
delta 3990
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

delta 3889
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index dedd5d1e69..66cd5a0e49 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From cbf8afafc19c3d3298b87d2e69370e51c7a8b711 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 22:29:50 +0000
Subject: [PATCH 094/236] Update dependency androidx.test:runner to v1.6.2

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e887ebbcf5..5967a8e5cc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -67,7 +67,7 @@ room-runtime = { module = "androidx.room:room-ktx", version.ref = "room" }
 room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
 room-testing = { module = "androidx.room:room-testing", version.ref = "room" }
 
-androidX-test-runner = "androidx.test:runner:1.6.1"
+androidX-test-runner = "androidx.test:runner:1.6.2"
 androidX-test-junit = "androidx.test.ext:junit:1.2.1"
 androidX-test-core = "androidx.test:core-ktx:1.6.1"
 

From 7fafb36d30eb081fb69085d31528d23660984b5a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 11:47:59 +0000
Subject: [PATCH 095/236] Update plugin com.gradle.develocity to v3.18

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index a4280046bb..7e11348d6a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -31,7 +31,7 @@ dependencyResolutionManagement {
 }
 
 plugins {
-  id("com.gradle.develocity") version "3.17.6"
+  id("com.gradle.develocity") version "3.18"
   id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.0")
 }
 

From 3d1c0928b1615d8d95d2971d17a068f8696d5e3d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 21 Aug 2024 18:18:40 +0000
Subject: [PATCH 096/236] Update dependency androidx.compose:compose-bom to
 v2024.08.00

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5967a8e5cc..fbaf8e9c92 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -96,7 +96,7 @@ media3-testUtils-robolectric = { module = "androidx.media3:media3-test-utils-rob
 
 lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.4"
 
-compose-bom = "androidx.compose:compose-bom:2024.06.00"
+compose-bom = "androidx.compose:compose-bom:2024.08.00"
 compose-ui-ui = { module = "androidx.compose.ui:ui" }
 compose-ui-tooling-core = { module = "androidx.compose.ui:ui-tooling" }
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }

From a418a1d6baf175ebb25aa949b8e4cf8a54c71b37 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 22 Aug 2024 11:48:51 +0000
Subject: [PATCH 097/236] Update Kotlin, KSP to v2.0.20

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fbaf8e9c92..4a90a75665 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ room = "2.6.1"
 prefs = "1.0.1"
 materialDialog = "3.3.0"
 dagger = "2.52"
-kotlin = "2.0.10"
+kotlin = "2.0.20"
 media3 = "1.3.1"
 agp = "8.5.2"
 ktlint-core = "1.2.1"

From da497b7660fd5ced88bce1294a28d09e6f0c6090 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 22 Aug 2024 22:29:04 +0000
Subject: [PATCH 098/236] Update plugin ksp to v2.0.20-1.0.24

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4a90a75665..b91a1551c1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -158,7 +158,7 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 anvil = { id = "com.squareup.anvil", version = "2.5.0-beta11" }
 ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
-ksp = { id = "com.google.devtools.ksp", version = "2.0.10-1.0.24" }
+ksp = { id = "com.google.devtools.ksp", version = "2.0.20-1.0.24" }
 playPublish = { id = "com.github.triplet.play", version = "3.10.1" }
 android-app = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }

From 9a0a985518a4e01b83489f48001257c5ba4376c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aindri=C3=BA=20Mac=20Giolla=20Eoin?= <aindriu80@gmail.com>
Date: Thu, 25 Jul 2024 14:21:05 +0000
Subject: [PATCH 099/236] Translated using Weblate (Irish)

Currently translated at 100.0% (119 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/ga/
---
 strings/src/main/res/values-ga/strings.xml | 124 ++++++++++++++++++++-
 1 file changed, 121 insertions(+), 3 deletions(-)

diff --git a/strings/src/main/res/values-ga/strings.xml b/strings/src/main/res/values-ga/strings.xml
index b2a40f2af0..0b6f6fb2be 100644
--- a/strings/src/main/res/values-ga/strings.xml
+++ b/strings/src/main/res/values-ga/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="cover">Clúdach</string>
     <string name="play_pause">Seinn / Tabhair sos</string>
@@ -8,7 +8,7 @@
     <string name="dialog_confirm">Socraigh</string>
     <string name="dialog_cancel">Cealaigh</string>
     <string name="change_book_name">Ainm</string>
-    <string name="download_book_cover">Clúdach ón idirlín</string>
+    <string name="download_book_cover">Clúdach ón Idirlíon</string>
     <string name="edit_book_title">Athraigh an closleabhar</string>
     <string name="audiobook_folders_title">Fillteáin na closleabhar</string>
     <string name="playback_speed">Luas an seinntora</string>
@@ -21,4 +21,122 @@
     <string name="remove">Bain de</string>
     <string name="book_header_not_started">Níl tosnaithe go fóill</string>
     <string name="book_header_completed">Críochnaithe</string>
-</resources>
+    <string name="rewind">Athchasadh</string>
+    <string name="pick_book_cover">Clúdach ón gcóras comhad</string>
+    <string name="pref_report_issue">Tuairiscigh fadhb</string>
+    <string name="pref_theme_dark">Téama Dorcha</string>
+    <string name="folder_type_title">Cén struchtúr atá ar do chuid comhad?</string>
+    <string name="migration_detail_content_added_at">Curtha leis ag</string>
+    <string name="migration_detail_content_position_current_chapter_position">Seasamh sa chaibidil</string>
+    <string name="migration_delete_dialog_title">Scrios Poist</string>
+    <string name="search_hint">Cad atá tú ag féachaint faoi?</string>
+    <string name="battery_optimization_rationale">Mar gheall ar do shrianta Cumhachta, d\'fhéadfadh go gcuirfí isteach ar athsheinm.</string>
+    <plurals name="minutes">
+        <item quantity="one">%d nóiméad</item>
+        <item quantity="two">%d nóiméad</item>
+        <item quantity="few">%d nóiméad</item>
+        <item quantity="many">%d nóiméad</item>
+        <item quantity="other">%d nóiméad</item>
+    </plurals>
+    <string name="migration_detail_content_name">Ainm</string>
+    <string name="migration_detail_title">Seasamh leabhar sean</string>
+    <string name="review.feedback.button.yes">Seol Aiseolas</string>
+    <string name="storage_bug_title">Cead ag teastáil</string>
+    <string name="select_folder_subtitle">Ar mhaith leat comhad amháin a chur leis mar leabhar nó mar fhillteán?</string>
+    <string name="onboarding.completion.title">Tá tú Socraithe go léir!</string>
+    <string name="onboarding.completion.next_button">Tosaigh Éisteacht</string>
+    <string name="sleep_timer.title">Codladh sámh! 🌙</string>
+    <string name="sleep_timer.button.increment">Níos faide</string>
+    <string name="cover_search_template_no_author">%s clúdach fuaime</string>
+    <string name="pref_seek_time">Scipeáil méid</string>
+    <string name="pref_auto_rewind_title">Athchasadh uathoibríoch</string>
+    <string name="generic_error_retry">Bain triail eile as</string>
+    <string name="play">Imirt</string>
+    <string name="pause">Sos</string>
+    <string name="fast_forward">Aghaidh go tapa</string>
+    <string name="skip_silence">Scipeáil ar Chiúin</string>
+    <string name="volume_boost">Treisiú toirte</string>
+    <string name="more">Tuilleadh</string>
+    <string name="content_cover">Taispeáin clúdach a roghnú</string>
+    <string name="cover_search.icon_recent">Ceist le déanaí</string>
+    <string name="cover_search.author">Údar</string>
+    <string name="mark_as_current">Marcáil mar Reatha</string>
+    <string name="mark_as_not_started">Marcáil mar Gan Tosú fós</string>
+    <plurals name="seconds">
+        <item quantity="one">%d soicind</item>
+        <item quantity="two">%d soicindí</item>
+        <item quantity="few">%d soicindí</item>
+        <item quantity="many">%d soicindí</item>
+        <item quantity="other">%d soicindí</item>
+    </plurals>
+    <string name="pref_use_grid">Bain úsáid as leagan amach na greille</string>
+    <string name="select_folder_type_file">Comhad</string>
+    <string name="migration_delete_dialog_action_keep">Coinnigh</string>
+    <string name="onboarding.button_next">Ar aghaidh</string>
+    <string name="onboarding.explanation.title">Do Leabharlann, Do Bhealach Féin</string>
+    <string name="onboarding.explanation.subtitle">Le Guth, is féidir leat leabhair a chur leis mar chomhaid aonair nó iad a eagrú i bhfillteáin. Roghnaíonn tú!</string>
+    <string name="cover_search_template_with_author">%1$s le %2$s clúdach fuaime</string>
+    <string name="pref_get_support">Faigh tacaíocht</string>
+    <string name="mark_as_completed">Marcáil mar Críochnaithe</string>
+    <string name="pref_suggest_idea">Mol smaoineamh</string>
+    <string name="pref_help_translating">Cabhrú le Guth a aistriú</string>
+    <string name="pref_app_version">Leagan aip</string>
+    <string name="play_current">Seinn reatha</string>
+    <string name="migration_delete_dialog_content">Nuair a scriosann tú na seanphoist ní bheidh tú in ann do sheansuímh athsheinm a ghnóthú.</string>
+    <string name="book_header_current">Reatha</string>
+    <string name="delete">Scrios</string>
+    <string name="folder_mode_single">Mód Leabhar Aonair: Is ionann fillteán amháin agus leabhar amháin.</string>
+    <string name="close">Dún</string>
+    <string name="add">Cuir</string>
+    <string name="folder_mode_root">Mód Leabhar Barrleibhéil: Is leabhair iad fofhillteáin</string>
+    <string name="folder_mode_author">Mód Údair-Leabhar: Is údair iad fofhillteáin, is leabhair iad fo-fhillteáin.</string>
+    <plurals name="folder_type_file_count">
+        <item quantity="one">%d comhad fuaime</item>
+        <item quantity="two">%d comhaid fuaime</item>
+        <item quantity="few">%d comhaid fuaime</item>
+        <item quantity="many">%d comhaid fuaime</item>
+        <item quantity="other">%d comhaid fuaime</item>
+    </plurals>
+    <string name="folder_type_book_example_header">D’fhágfadh sin go mbraithfí na leabhair seo a leanas</string>
+    <string name="folder_type_no_books">Níorbh fhéidir le Voice aon leabhar a bhrath. An bhfuil aon chomhaid fuaime ann?</string>
+    <string name="bookmark_just_now">Anois féin</string>
+    <string name="voice_intro_first_book">Cuirimis d’fhillteán closleabhar leis ionas gur féidir leat tosú ag éisteacht!</string>
+    <string name="migration_hint_title">Teacht ar phoist na Seanleabhar</string>
+    <string name="migration_hint_content">De bharr athruithe ar Leaganacha Android níos nuaí, ní mór d’fhillteán closleabhar a roghnú ag baint úsáide as an roghnóir córais.
+\n
+\nCliceáil ar an deilbhín thuas chun féachaint ar do sheanleabhair.</string>
+    <string name="migration_hint_confirm">Tuigeadh</string>
+    <string name="migration_detail_content_position_current_file_title">Comhad reatha</string>
+    <string name="migration_detail_content_root">Fillteán fréimhe</string>
+    <string name="migration_detail_content_position">Post</string>
+    <string name="migration_detail_content_position_current_file_position">Seasamh sa chomhad</string>
+    <string name="migration_detail_content_position_current_chapter_title">Caibidil reatha</string>
+    <string name="migration_detail_content_bookmarks">Leabharmharcanna</string>
+    <string name="media_session_root">Gach closleabhair</string>
+    <string name="notification_sleep_timer_enable">Cumasaigh Uaineadóir Codlata</string>
+    <string name="onboarding_welcome_subtitle">Seinnteoir fuaime do phóca pearsanta. A ligean ar a fháil tú a shocrú.</string>
+    <string name="migration_delete_dialog_action_delete">Scrios</string>
+    <string name="delete_book_bottom_sheet_title">Scrios Leabhar</string>
+    <string name="storage_bug_subtitle">I gcás feistí áirithe, tá an cead riachtanach chun rochtain a fháil ar an stóras seachtrach in easnamh ar aip córais. Tá an rochtain seo riachtanach do Voice chun do chlosleabhair a léamh.</string>
+    <string name="onboarding_welcome_title">Fáilte go Guth!</string>
+    <string name="delete_book_dialog_title">Scrios Leabhar</string>
+    <string name="delete_book_dialog_content">Scriosfaidh sé seo na comhaid ar do ghléas.</string>
+    <string name="battery_optimization_action">Nuashonrú</string>
+    <string name="notification_sleep_timer_disable">Díchumasaigh an lasc ama codlata</string>
+    <string name="generic_error_message">Chuaigh rud éigin mícheart 😢</string>
+    <string name="delete_book_dialog_deletion_confirmation">Scrios mo chomhaid</string>
+    <string name="storage_bug_button">Cead a dheonú</string>
+    <string name="media_session_recent">le déanaí</string>
+    <string name="select_folder_title_onboarding">Cuir Do Chéad Leabhar Closleabhar leis</string>
+    <string name="select_folder_title_default">Cuir do Closleabhair leis</string>
+    <string name="select_folder_type_folder">Fillteán</string>
+    <string name="onboarding.completion.subtitle">Tá do chéad chlosleabhar réidh le himirt. Bain sult as do thuras le Voice!</string>
+    <string name="review.request.title">Taitneamh a bhaint as Guth?</string>
+    <string name="review.request.content">Tá d\'aiseolas tábhachtach dúinn! Má tá nóiméad agat, déan rátáil orainn agus roinn do thaithí. Cuidíonn sé linn feabhsúcháin a dhéanamh agus eispéireas éisteachta níos fearr a thairiscint.</string>
+    <string name="review.request.button.yes">Ráta Anois</string>
+    <string name="review.request.button.no">Níl sé uaim go raibh maith agat</string>
+    <string name="review.feedback.title">Tá brón orainn é sin a chloisteáil!</string>
+    <string name="review.feedback.button.no">Cealaigh</string>
+    <string name="review.feedback.content">An bhféadfá a insint dúinn cad a chuaigh mícheart? Is mór againn d’aiseolas agus cabhraíonn sé linn d’eispéireas a fheabhsú.</string>
+    <string name="sleep_timer.button.decrement">Níos giorra</string>
+</resources>
\ No newline at end of file

From 3a0ff326a78059f069d6a2c7f95c6aab5daec84d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 08:07:40 +0000
Subject: [PATCH 100/236] Update plugin playPublish to v3.11.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b91a1551c1..b9682dadac 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -159,6 +159,6 @@ compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "
 anvil = { id = "com.squareup.anvil", version = "2.5.0-beta11" }
 ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
 ksp = { id = "com.google.devtools.ksp", version = "2.0.20-1.0.24" }
-playPublish = { id = "com.github.triplet.play", version = "3.10.1" }
+playPublish = { id = "com.github.triplet.play", version = "3.11.0" }
 android-app = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }

From c244e652ab7bf0c828032f040ca98f95d4a89c57 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 14:15:41 +0000
Subject: [PATCH 101/236] Update dependency com.android.tools:desugar_jdk_libs
 to v2.1.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b9682dadac..de0bd57f80 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -40,7 +40,7 @@ recyclerView = "androidx.recyclerview:recyclerview:1.3.2"
 androidxCore = "androidx.core:core-ktx:1.13.1"
 kotlin-pluginForGradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-compilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }
-desugar = "com.android.tools:desugar_jdk_libs:2.0.4"
+desugar = "com.android.tools:desugar_jdk_libs:2.1.0"
 documentFile = "androidx.documentfile:documentfile:1.0.1"
 koTest-assert = "io.kotest:kotest-assertions-core:5.9.1"
 datastore = "androidx.datastore:datastore-preferences:1.1.1"

From b8df685f74f5760516370a5ca34b29b27ba342fe Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 28 Aug 2024 14:47:02 +0000
Subject: [PATCH 102/236] Update dependency com.android.tools:desugar_jdk_libs
 to v2.1.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index de0bd57f80..06a4f31cae 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -40,7 +40,7 @@ recyclerView = "androidx.recyclerview:recyclerview:1.3.2"
 androidxCore = "androidx.core:core-ktx:1.13.1"
 kotlin-pluginForGradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-compilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }
-desugar = "com.android.tools:desugar_jdk_libs:2.1.0"
+desugar = "com.android.tools:desugar_jdk_libs:2.1.1"
 documentFile = "androidx.documentfile:documentfile:1.0.1"
 koTest-assert = "io.kotest:kotest-assertions-core:5.9.1"
 datastore = "androidx.datastore:datastore-preferences:1.1.1"

From 82318ebb534bb1a55497f2440395139a1490510c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 28 Aug 2024 18:09:51 +0000
Subject: [PATCH 103/236] Update dependency com.airbnb.android:lottie-compose
 to v6.5.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 06a4f31cae..5ef9831681 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -53,7 +53,7 @@ immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7"
 uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0"
 okhttp = "com.squareup.okhttp3:okhttp:4.12.0"
 review = "com.google.android.play:review-ktx:2.0.1"
-lottie = "com.airbnb.android:lottie-compose:6.5.0"
+lottie = "com.airbnb.android:lottie-compose:6.5.1"
 clikt = "com.github.ajalt.clikt:clikt:4.4.0"
 
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }

From 82d5d9cdf2f8095b38458b52dfc726750824c1c9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 28 Aug 2024 18:09:56 +0000
Subject: [PATCH 104/236] Update dependency
 org.jetbrains.kotlinx:kotlinx-serialization-json to v1.7.2

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5ef9831681..06b551cdc4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -61,7 +61,7 @@ coroutines-guava = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-guava",
 coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
 coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
 
-serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1"
+serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.2"
 
 room-runtime = { module = "androidx.room:room-ktx", version.ref = "room" }
 room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }

From d7df027bca4a9bdfb2e586f0f623dc74a2c854ab Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 29 Aug 2024 19:35:32 +0000
Subject: [PATCH 105/236] Update agp to v8.6.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 06b551cdc4..0edf23461e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ materialDialog = "3.3.0"
 dagger = "2.52"
 kotlin = "2.0.20"
 media3 = "1.3.1"
-agp = "8.5.2"
+agp = "8.6.0"
 ktlint-core = "1.2.1"
 ktlint-gradlePlugin = "0.9.0"
 retrofit = "2.11.0"

From 6448c6ae3e12398403598627c07d1ee766d02afd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2024 15:01:41 +0000
Subject: [PATCH 106/236] Update actions/checkout digest to 2d7d9f7

---
 .github/workflows/voice.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index 2e1e499c74..378b574d21 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -61,7 +61,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08
+      - uses: actions/checkout@2d7d9f7ff5b310f983d059b68785b3c74d8b8edd
 
       - name: Set up JDK
         uses: actions/setup-java@v4.2.2

From c0564a955dbb644bd4d954722af327d3c4759d8a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 4 Sep 2024 01:26:39 +0000
Subject: [PATCH 107/236] Update dependency com.airbnb.android:lottie-compose
 to v6.5.2

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0edf23461e..514183ffdd 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -53,7 +53,7 @@ immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7"
 uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0"
 okhttp = "com.squareup.okhttp3:okhttp:4.12.0"
 review = "com.google.android.play:review-ktx:2.0.1"
-lottie = "com.airbnb.android:lottie-compose:6.5.1"
+lottie = "com.airbnb.android:lottie-compose:6.5.2"
 clikt = "com.github.ajalt.clikt:clikt:4.4.0"
 
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }

From 406e1b5637aba9c1865388de995a7abb0613a8b7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 4 Sep 2024 09:37:39 +0000
Subject: [PATCH 108/236] Update dependency com.android.tools:desugar_jdk_libs
 to v2.1.2

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 514183ffdd..e9ffe3d3c6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -40,7 +40,7 @@ recyclerView = "androidx.recyclerview:recyclerview:1.3.2"
 androidxCore = "androidx.core:core-ktx:1.13.1"
 kotlin-pluginForGradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-compilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }
-desugar = "com.android.tools:desugar_jdk_libs:2.1.1"
+desugar = "com.android.tools:desugar_jdk_libs:2.1.2"
 documentFile = "androidx.documentfile:documentfile:1.0.1"
 koTest-assert = "io.kotest:kotest-assertions-core:5.9.1"
 datastore = "androidx.datastore:datastore-preferences:1.1.1"

From d83418e9fd9b55124453d7ff963ab166b7cff86b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 5 Sep 2024 00:41:38 +0000
Subject: [PATCH 109/236] Update dependency
 androidx.lifecycle:lifecycle-runtime-ktx to v2.8.5

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e9ffe3d3c6..5d2f670afd 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -94,7 +94,7 @@ media3-session = { module = "androidx.media3:media3-session", version.ref = "med
 media3-testUtils-core = { module = "androidx.media3:media3-test-utils", version.ref = "media3" }
 media3-testUtils-robolectric = { module = "androidx.media3:media3-test-utils-robolectric", version.ref = "media3" }
 
-lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.4"
+lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.5"
 
 compose-bom = "androidx.compose:compose-bom:2024.08.00"
 compose-ui-ui = { module = "androidx.compose.ui:ui" }

From 4e9a92fda6916f039d1aa0c07551834fe23ce08e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 5 Sep 2024 00:41:34 +0000
Subject: [PATCH 110/236] Update dependency androidx.activity:activity-compose
 to v1.9.2

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5d2f670afd..ab11c82188 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -110,7 +110,7 @@ compose-material-icons-extended = { module = "androidx.compose.material:material
 compose-animation-graphics = { module = "androidx.compose.animation:animation-graphics" }
 compose-animation-animation = { module = "androidx.compose.animation:animation" }
 compose-material3 = { module = "androidx.compose.material3:material3" }
-compose-activity = "androidx.activity:activity-compose:1.9.1"
+compose-activity = "androidx.activity:activity-compose:1.9.2"
 compose-navigation = "dev.olshevski.navigation:reimagined:1.5.0"
 
 ktlint-core = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint-core" }

From 46bcedb5476978eb0d892fbc7a988da11b77c7d4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 5 Sep 2024 16:44:50 +0000
Subject: [PATCH 111/236] Update actions/checkout digest to b684943

---
 .github/workflows/voice.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index 378b574d21..6a367f746a 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -61,7 +61,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@2d7d9f7ff5b310f983d059b68785b3c74d8b8edd
+      - uses: actions/checkout@b6849436894e144dbce29d7d7fda2ae3bf9d8365
 
       - name: Set up JDK
         uses: actions/setup-java@v4.2.2

From fba6bc0937131efd4665301ab6dbda45721cbe36 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 5 Sep 2024 16:44:55 +0000
Subject: [PATCH 112/236] Update dependency
 org.jetbrains.kotlinx:kotlinx-collections-immutable to v0.3.8

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ab11c82188..a0c26d3cd4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -49,7 +49,7 @@ viewBinding = { module = "androidx.databinding:viewbinding", version.ref = "agp"
 appStartup = "androidx.startup:startup-runtime:1.1.1"
 turbine = "app.cash.turbine:turbine:1.1.0"
 molecule = "app.cash.molecule:molecule-runtime:2.0.0"
-immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7"
+immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8"
 uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0"
 okhttp = "com.squareup.okhttp3:okhttp:4.12.0"
 review = "com.google.android.play:review-ktx:2.0.1"

From fc4b163893cb2057ce28703642d4bb7cf7206be0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 5 Sep 2024 22:54:52 +0000
Subject: [PATCH 113/236] Update actions/checkout digest to 6d193bf

---
 .github/workflows/voice.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index 6a367f746a..386d00470d 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -61,7 +61,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@b6849436894e144dbce29d7d7fda2ae3bf9d8365
+      - uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc
 
       - name: Set up JDK
         uses: actions/setup-java@v4.2.2

From c9f10a83b54d8ae11a6e2b5fa5f39466288f63e2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 5 Sep 2024 22:54:56 +0000
Subject: [PATCH 114/236] Update plugin ksp to v2.0.20-1.0.25

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a0c26d3cd4..a34ebacabf 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -158,7 +158,7 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 anvil = { id = "com.squareup.anvil", version = "2.5.0-beta11" }
 ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
-ksp = { id = "com.google.devtools.ksp", version = "2.0.20-1.0.24" }
+ksp = { id = "com.google.devtools.ksp", version = "2.0.20-1.0.25" }
 playPublish = { id = "com.github.triplet.play", version = "3.11.0" }
 android-app = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }

From 722e4ef2960481dea825229c25651f8a37b31f65 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 9 Sep 2024 11:19:22 +0000
Subject: [PATCH 115/236] Update dependency gradle to v8.10.1

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 66cd5a0e49..1ed247ec13 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From f14e98d82982661fabc087387743bd21a1c77c77 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 9 Sep 2024 15:09:34 +0000
Subject: [PATCH 116/236] Update actions/setup-java action to v4.3.0

---
 .github/workflows/voice.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index 386d00470d..baac0050f4 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -31,7 +31,7 @@ jobs:
         uses: gradle/gradle-build-action@v3
 
       - name: Set up JDK
-        uses: actions/setup-java@v4.2.2
+        uses: actions/setup-java@v4.3.0
         with:
           distribution: 'zulu'
           java-version: 17
@@ -64,7 +64,7 @@ jobs:
       - uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc
 
       - name: Set up JDK
-        uses: actions/setup-java@v4.2.2
+        uses: actions/setup-java@v4.3.0
         with:
           distribution: 'zulu'
           java-version: 17

From fb5e7f06fe0759b590feacfb92ffbebbf8027687 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 10 Sep 2024 16:33:25 +0000
Subject: [PATCH 117/236] Update plugin com.gradle.develocity to v3.18.1

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7e11348d6a..24631729bc 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -31,7 +31,7 @@ dependencyResolutionManagement {
 }
 
 plugins {
-  id("com.gradle.develocity") version "3.18"
+  id("com.gradle.develocity") version "3.18.1"
   id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.0")
 }
 

From 0847d17ed634f80912ed2b894b9d439028275cbe Mon Sep 17 00:00:00 2001
From: Reza Almanda <rezaalmanda27@gmail.com>
Date: Thu, 29 Aug 2024 22:34:26 +0000
Subject: [PATCH 118/236] Translated using Weblate (Indonesian)

Currently translated at 64.7% (77 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/id/
---
 strings/src/main/res/values-in/strings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/strings/src/main/res/values-in/strings.xml b/strings/src/main/res/values-in/strings.xml
index 8f7df27b46..37fd023b4b 100644
--- a/strings/src/main/res/values-in/strings.xml
+++ b/strings/src/main/res/values-in/strings.xml
@@ -72,4 +72,15 @@
     <string name="migration_hint_content">Karena adanya perubahan pada Versi Android yang lebih baru, Anda perlu memilih folder buku audio Anda menggunakan pemilih sistem.
 \n
 \nKlik ikon di atas untuk melihat posisi buku lama Anda.</string>
+    <string name="migration_detail_content_position">Posisi</string>
+    <string name="migration_detail_content_added_at">Ditambahkan di</string>
+    <string name="migration_detail_content_bookmarks">Markah</string>
+    <string name="migration_detail_content_position_current_file_title">File saat ini</string>
+    <string name="migration_detail_content_position_current_chapter_title">Bab saat ini</string>
+    <string name="migration_delete_dialog_action_delete">Hapus</string>
+    <string name="migration_detail_content_root">Folder root</string>
+    <string name="migration_detail_content_position_current_file_position">Posisi dalam file</string>
+    <string name="migration_delete_dialog_content">Setelah Anda menghapus posisi lama, Anda tidak akan dapat memulihkan posisi pemutaran lama Anda.</string>
+    <string name="migration_detail_content_position_current_chapter_position">Posisi dalam bab</string>
+    <string name="migration_delete_dialog_title">Hapus Posisi</string>
 </resources>
\ No newline at end of file

From e1d2181f830b110ad6c12ae19a2dea87e2942c7c Mon Sep 17 00:00:00 2001
From: Elisabeth Pieringer <mail@elisabethpieringer.at>
Date: Mon, 2 Sep 2024 14:17:01 +0000
Subject: [PATCH 119/236] Translated using Weblate (German)

Currently translated at 100.0% (119 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/de/
---
 strings/src/main/res/values-de/strings.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/strings/src/main/res/values-de/strings.xml b/strings/src/main/res/values-de/strings.xml
index 3ff4aaf81b..3a0effaff0 100644
--- a/strings/src/main/res/values-de/strings.xml
+++ b/strings/src/main/res/values-de/strings.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="cover">Cover</string>
-    <string name="play_pause">Play / Pause</string>
+    <string name="cover">Titelbild</string>
+    <string name="play_pause">Abspielen / Pausieren</string>
     <string name="action_sleep">Einschlaf-Timer</string>
     <string name="rewind">Zurückspulen</string>
     <string name="fast_forward">Vorspulen</string>
     <string name="previous_track">Vorheriger Track</string>
-    <string name="next_track">Nächster Track</string>
+    <string name="next_track">Nächster Titel</string>
     <string name="skip_silence">Stille überspringen</string>
-    <string name="volume_boost">Lautstärke Boost</string>
+    <string name="volume_boost">Lautstärke erhöhen</string>
     <string name="more">Mehr</string>
     <string name="dialog_confirm">Okay</string>
     <string name="dialog_cancel">Abbrechen</string>
     <string name="content_cover">Zeigt aktuelles Cover an</string>
     <string name="change_book_name">Name</string>
-    <string name="download_book_cover">Cover (Internet)</string>
+    <string name="download_book_cover">Titelbild aus dem Internet</string>
     <string name="pick_book_cover">Cover (Lokal)</string>
     <string name="edit_book_title">Buch bearbeiten</string>
     <string name="mark_as_completed">Als \"Abgeschlossen\" markieren</string>
     <string name="mark_as_current">Als \"Aktuelles\" markieren</string>
     <string name="mark_as_not_started">Als \"Neu\" markieren</string>
     <string name="audiobook_folders_title">Hörbuch Ordner</string>
-    <string name="playback_speed">Geschwindigkeit</string>
+    <string name="playback_speed">Abspielgeschwindigkeit</string>
     <string name="bookmark">Lesezeichen</string>
     <string name="bookmark_edit_title">Lesezeichen bearbeiten</string>
     <string name="bookmark_edit_hint">Lesezeichenname</string>
@@ -41,7 +41,7 @@
     <string name="pref_get_support">Erhalte Unterstützung</string>
     <string name="pref_app_version">App Version</string>
     <string name="popup_edit">Bearbeiten</string>
-    <string name="remove">Löschen</string>
+    <string name="remove">Entfernen</string>
     <string name="play_current">Spiel aktuelles</string>
     <string name="book_header_current">Aktuelles</string>
     <string name="book_header_not_started">Neu</string>
@@ -90,12 +90,12 @@
     <string name="media_session_recent">Kürzlich</string>
     <string name="notification_sleep_timer_enable">Einschlaftimer einschalten</string>
     <string name="notification_sleep_timer_disable">Einschlaftimer ausschalten</string>
-    <string name="play">Play</string>
+    <string name="play">Abspielen</string>
     <string name="pause">Pause</string>
     <string name="generic_error_message">Etwas ist schief gelaufen 😢</string>
     <string name="generic_error_retry">Erneut versuchen</string>
-    <string name="cover_search_template_with_author">%1$s von %2$s Hörbuch cover</string>
-    <string name="cover_search_template_no_author">%s Hörbuch cover</string>
+    <string name="cover_search_template_with_author">%1$s von %2$s Hörbuch Titelbild</string>
+    <string name="cover_search_template_no_author">%s Hörbuch Titelbild</string>
     <string name="storage_bug_title">Berechtigung benötigt</string>
     <string name="storage_bug_subtitle">Für bestimmte Geräte fehlt einer System-App die notwendige Berechtigung, auf den externen Speicher zuzugreifen. Dieser Zugriff ist jedoch für Voice essentiell, um Ihre Hörbücher lesen zu können.</string>
     <string name="storage_bug_button">Berechtigung erteilen</string>
@@ -130,4 +130,4 @@
         <item quantity="one">%d Minute</item>
         <item quantity="other">%d Minuten</item>
     </plurals>
-</resources>
+</resources>
\ No newline at end of file

From 039a2115c84a077e605eab2ec3f50caad3e72a22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Mon, 2 Sep 2024 14:56:24 +0000
Subject: [PATCH 120/236] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (119 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/nb_NO/
---
 strings/src/main/res/values-nb-rNO/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/strings/src/main/res/values-nb-rNO/strings.xml b/strings/src/main/res/values-nb-rNO/strings.xml
index dcfdd431f9..d576a103d4 100644
--- a/strings/src/main/res/values-nb-rNO/strings.xml
+++ b/strings/src/main/res/values-nb-rNO/strings.xml
@@ -14,8 +14,8 @@
     <string name="pref_get_support">Få støtte</string>
     <string name="book_header_current">Nåværende</string>
     <string name="book_header_completed">Fullført</string>
-    <string name="folder_mode_root">Bokmodus på øverste nivå: Undermapper er bøker</string>
-    <string name="folder_mode_single">Enkeltbokmodus: Én mappe tilsvarer én bok.</string>
+    <string name="folder_mode_root">Samlet lydboksmappe: hver undermappe er én bok</string>
+    <string name="folder_mode_single">Enkelvis lydboksmappe: denne mappen er én bok.</string>
     <string name="folder_type_title">Hvilken struktur har filene dine\?</string>
     <string name="migration_detail_content_bookmarks">Bokmerker</string>
     <string name="voice_intro_first_book">Legg til lydbokmappen din så du kan begynne å lytte!</string>
@@ -106,7 +106,7 @@
     <string name="storage_bug_button">Innvilg tillatelse</string>
     <string name="select_folder_title_default">Legg til dine lydbøker</string>
     <string name="cover_search_template_no_author">%s lydbokomslag</string>
-    <string name="folder_mode_author">Forfatterbokmodus: Undermapper er forfattere, under-undermapper er bøker.</string>
+    <string name="folder_mode_author">Samlet forfatter/kategori-modus: undermapper er forfattere, hver mappe under er én bok.</string>
     <string name="cover_search.icon_recent">Siste søk</string>
     <string name="cover_search.author">Forfatter</string>
     <string name="select_folder_type_file">Fil</string>

From 6cd7c8e5416386683984b363a22aaa76efd6b024 Mon Sep 17 00:00:00 2001
From: Elisabeth Pieringer <mail@elisabethpieringer.at>
Date: Tue, 3 Sep 2024 11:45:37 +0000
Subject: [PATCH 121/236] Translated using Weblate (German)

Currently translated at 100.0% (119 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/de/
---
 strings/src/main/res/values-de/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/strings/src/main/res/values-de/strings.xml b/strings/src/main/res/values-de/strings.xml
index 3a0effaff0..6832fcb964 100644
--- a/strings/src/main/res/values-de/strings.xml
+++ b/strings/src/main/res/values-de/strings.xml
@@ -12,10 +12,10 @@
     <string name="more">Mehr</string>
     <string name="dialog_confirm">Okay</string>
     <string name="dialog_cancel">Abbrechen</string>
-    <string name="content_cover">Zeigt aktuelles Cover an</string>
+    <string name="content_cover">Zeigt aktuelles Titelbild an</string>
     <string name="change_book_name">Name</string>
     <string name="download_book_cover">Titelbild aus dem Internet</string>
-    <string name="pick_book_cover">Cover (Lokal)</string>
+    <string name="pick_book_cover">Titelbild aus dem Dateisystem</string>
     <string name="edit_book_title">Buch bearbeiten</string>
     <string name="mark_as_completed">Als \"Abgeschlossen\" markieren</string>
     <string name="mark_as_current">Als \"Aktuelles\" markieren</string>

From 1718b84cf05068400105ad5eff0da62f68236dff Mon Sep 17 00:00:00 2001
From: MattSolo451 <mattsolo45@vivaldi.net>
Date: Thu, 12 Sep 2024 20:38:53 +0000
Subject: [PATCH 122/236] Translated using Weblate (Polish)

Currently translated at 100.0% (119 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/pl/
---
 strings/src/main/res/values-pl/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/strings/src/main/res/values-pl/strings.xml b/strings/src/main/res/values-pl/strings.xml
index d5e5210bd9..fba1ebf7fc 100644
--- a/strings/src/main/res/values-pl/strings.xml
+++ b/strings/src/main/res/values-pl/strings.xml
@@ -109,7 +109,7 @@
     <string name="storage_bug_title">Wymagany dostęp</string>
     <string name="storage_bug_subtitle">W przypadku niektórych urządzeń aplikacja systemowa nie ma uprawnień niezbędnych do uzyskania dostępu do pamięci zewnętrznej. Dostęp ten jest niezbędny, aby aplikacja Voice mogła odczytywać książki audio.</string>
     <string name="review.feedback.title">Przykro nam to słyszeć!</string>
-    <string name="onboarding.explanation.title">Twoja biblioteka, Twoja Wybór</string>
+    <string name="onboarding.explanation.title">Twoja Biblioteka, Twój Wybór</string>
     <string name="review.request.button.yes">Oceń Teraz</string>
     <string name="select_folder_type_file">Plik</string>
     <string name="onboarding_welcome_title">Witamy w Voice!</string>

From d3f84dc238fa1132ecafa76a38a25c5b8b22effa Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Sun, 15 Sep 2024 10:27:21 +0200
Subject: [PATCH 123/236] Decouple the composable from the controller. Rename
 the Presenter to ViewModel

---
 .idea/.gitignore                              |  1 +
 .../voice/bookmark/BookmarkController.kt      | 26 +---------------
 .../kotlin/voice/bookmark/BookmarkScreen.kt   | 30 +++++++++++++++++++
 ...kmarkPresenter.kt => BookmarkViewModel.kt} |  8 +++--
 4 files changed, 38 insertions(+), 27 deletions(-)
 rename bookmark/src/main/kotlin/voice/bookmark/{BookmarkPresenter.kt => BookmarkViewModel.kt} (97%)

diff --git a/.idea/.gitignore b/.idea/.gitignore
index de2fdd4af1..30f6a0680a 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -18,3 +18,4 @@ kotlinScripting.xml
 /deploymentTargetSelector.xml
 /other.xml
 /studiobot.xml
+/runConfigurations.xml
diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
index a1b03be715..d717cbcf4c 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
@@ -2,11 +2,8 @@ package voice.bookmark
 
 import android.os.Bundle
 import androidx.compose.runtime.Composable
-import com.squareup.anvil.annotations.ContributesTo
-import voice.common.AppScope
 import voice.common.BookId
 import voice.common.compose.ComposeController
-import voice.common.rootComponentAs
 import voice.data.getBookId
 import voice.data.putBookId
 
@@ -24,29 +21,8 @@ class BookmarkController(args: Bundle) :
 
   private val bookId = args.getBookId(NI_BOOK_ID)!!
 
-  private val presenter = rootComponentAs<Component>()
-    .bookmarkPresenterFactory
-    .create(bookId)
-
   @Composable
   override fun Content() {
-    val viewState = presenter.viewState()
-    BookmarkScreen(
-      viewState = viewState,
-      onClose = { router.popController(this) },
-      onAdd = presenter::onAddClicked,
-      onDelete = presenter::deleteBookmark,
-      onEdit = presenter::onEditClicked,
-      onScrollConfirmed = presenter::onScrollConfirmed,
-      onClick = presenter::selectBookmark,
-      onNewBookmarkNameChosen = presenter::addBookmark,
-      onCloseDialog = presenter::closeDialog,
-      onEditBookmark = presenter::editBookmark,
-    )
-  }
-
-  @ContributesTo(AppScope::class)
-  interface Component {
-    val bookmarkPresenterFactory: BookmarkPresenter.Factory
+    BookmarkScreen(bookId)
   }
 }
diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
index 4cb4e79751..b1051c4fc5 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
@@ -46,13 +46,43 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
+import com.squareup.anvil.annotations.ContributesTo
 import voice.bookmark.dialogs.AddBookmarkDialog
 import voice.bookmark.dialogs.EditBookmarkDialog
+import voice.common.AppScope
+import voice.common.BookId
+import voice.common.compose.rememberScoped
+import voice.common.rootComponentAs
 import voice.data.Bookmark
 import java.util.UUID
 import kotlin.math.roundToInt
 import voice.strings.R as StringsR
 
+@ContributesTo(AppScope::class)
+interface Component {
+  val bookmarkViewModelFactory: BookmarkViewModel.Factory
+}
+
+@Composable
+fun BookmarkScreen(bookId: BookId) {
+  val viewModel = rememberScoped(bookId.value) {
+    rootComponentAs<Component>().bookmarkViewModelFactory.create(bookId)
+  }
+  val viewState = viewModel.viewState()
+  BookmarkScreen(
+    viewState = viewState,
+    onClose = viewModel::closeScreen,
+    onAdd = viewModel::onAddClicked,
+    onDelete = viewModel::deleteBookmark,
+    onEdit = viewModel::onEditClicked,
+    onScrollConfirmed = viewModel::onScrollConfirmed,
+    onClick = viewModel::selectBookmark,
+    onNewBookmarkNameChosen = viewModel::addBookmark,
+    onCloseDialog = viewModel::closeDialog,
+    onEditBookmark = viewModel::editBookmark,
+  )
+}
+
 @Composable
 internal fun BookmarkScreen(
   viewState: BookmarkViewState,
diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkPresenter.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkViewModel.kt
similarity index 97%
rename from bookmark/src/main/kotlin/voice/bookmark/BookmarkPresenter.kt
rename to bookmark/src/main/kotlin/voice/bookmark/BookmarkViewModel.kt
index 15c2bc65a5..aee0d9bd85 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/BookmarkPresenter.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkViewModel.kt
@@ -31,7 +31,7 @@ import kotlin.time.Duration.Companion.days
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.minutes
 
-class BookmarkPresenter
+class BookmarkViewModel
 @AssistedInject constructor(
   @CurrentBook
   private val currentBook: DataStore<BookId?>,
@@ -171,8 +171,12 @@ class BookmarkPresenter
     dialogViewState = BookmarkDialogViewState.EditBookmark(id, bookmark.title)
   }
 
+  fun closeScreen() {
+    navigator.goBack()
+  }
+
   @AssistedFactory
   interface Factory {
-    fun create(id: BookId): BookmarkPresenter
+    fun create(id: BookId): BookmarkViewModel
   }
 }

From 8a007919a0ac9c0f2a89e3e0e2d93980d9f6375c Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Sun, 15 Sep 2024 10:29:41 +0200
Subject: [PATCH 124/236] Fix the bottom padding.

---
 .../main/kotlin/voice/bookmark/BookmarkScreen.kt    | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
index b1051c4fc5..fb13c76b62 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
@@ -8,9 +8,8 @@ import androidx.compose.foundation.gestures.DraggableAnchors
 import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.gestures.anchoredDraggable
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
@@ -39,7 +38,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.stringResource
@@ -136,11 +134,7 @@ internal fun BookmarkScreen(
     }
     LazyColumn(
       state = lazyListState,
-      modifier = Modifier
-        .padding(paddingValues)
-        .fillMaxSize()
-        .padding(bottom = 88.dp)
-        .clipToBounds(),
+      contentPadding = paddingValues,
     ) {
       items(
         items = viewState.bookmarks,
@@ -154,6 +148,9 @@ internal fun BookmarkScreen(
           onClick = onClick,
         )
       }
+      item {
+        Spacer(Modifier.size(88.dp))
+      }
     }
   }
 

From 861faa1344c47bef1202b3e8a35f2bdec4fc771d Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Sun, 15 Sep 2024 10:37:25 +0200
Subject: [PATCH 125/236] Add the sleep timer icon

---
 .../voice/bookmark/BookmarkItemViewState.kt     |  1 +
 .../kotlin/voice/bookmark/BookmarkScreen.kt     | 17 ++++++++++++++++-
 .../kotlin/voice/bookmark/BookmarkViewModel.kt  |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkItemViewState.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkItemViewState.kt
index 2f85a1221d..8b981475dc 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/BookmarkItemViewState.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkItemViewState.kt
@@ -6,6 +6,7 @@ data class BookmarkItemViewState(
   val title: String,
   val subtitle: String,
   val id: Bookmark.Id,
+  val showSleepIcon: Boolean,
 )
 
 data class BookmarkViewState(
diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
index fb13c76b62..99308b0ffe 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
@@ -8,8 +8,10 @@ import androidx.compose.foundation.gestures.DraggableAnchors
 import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.gestures.anchoredDraggable
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
@@ -19,6 +21,7 @@ import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.outlined.Delete
+import androidx.compose.material.icons.outlined.Timer
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.FloatingActionButton
@@ -242,7 +245,18 @@ internal fun BookmarkItem(
           onClick(bookmark.id)
         },
       headlineContent = {
-        Text(text = bookmark.title)
+        Row(verticalAlignment = Alignment.CenterVertically) {
+          Text(text = bookmark.title)
+          if (bookmark.showSleepIcon) {
+            Icon(
+              modifier = Modifier
+                .padding(start = 4.dp)
+                .size(16.dp),
+              imageVector = Icons.Outlined.Timer,
+              contentDescription = stringResource(StringsR.string.action_sleep),
+            )
+          }
+        }
       },
       trailingContent = {
         Box {
@@ -294,6 +308,7 @@ private fun BookmarkItemPreview() {
       title = "Bookmark 1",
       subtitle = "10:10:10 / 12:12:12",
       id = Bookmark.Id(UUID.randomUUID()),
+      showSleepIcon = true,
     ),
     onDelete = {},
     onEdit = { },
diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkViewModel.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkViewModel.kt
index aee0d9bd85..d6d319773b 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/BookmarkViewModel.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkViewModel.kt
@@ -89,6 +89,7 @@ class BookmarkViewModel
           title = title,
           subtitle = formatTime(bookmark.time),
           id = bookmark.id,
+          showSleepIcon = bookmark.setBySleepTimer,
         )
       },
       shouldScrollTo = shouldScrollTo,

From 4d35ddd91ce98a5d1764ea454cd468f4052895ef Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 17 Sep 2024 22:55:21 +0000
Subject: [PATCH 126/236] Update agp to v8.6.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b642c181b9..b35f1913bb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ materialDialog = "3.3.0"
 dagger = "2.52"
 kotlin = "2.0.20"
 media3 = "1.3.1"
-agp = "8.6.0"
+agp = "8.6.1"
 ktlint-core = "1.2.1"
 ktlint-gradlePlugin = "0.9.0"
 retrofit = "2.11.0"

From d435bf0c9bd5f0d76c722c414e7f59f7a53c8184 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 18 Sep 2024 18:17:20 +0000
Subject: [PATCH 127/236] Update dependency
 androidx.lifecycle:lifecycle-runtime-ktx to v2.8.6

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b35f1913bb..a3058aaa72 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -92,7 +92,7 @@ media3-session = { module = "androidx.media3:media3-session", version.ref = "med
 media3-testUtils-core = { module = "androidx.media3:media3-test-utils", version.ref = "media3" }
 media3-testUtils-robolectric = { module = "androidx.media3:media3-test-utils-robolectric", version.ref = "media3" }
 
-lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.5"
+lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.6"
 
 compose-bom = "androidx.compose:compose-bom:2024.08.00"
 compose-ui-ui = { module = "androidx.compose.ui:ui" }

From eb6c946c5923f67c75ff90bad82c0e1d0151215e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 18 Sep 2024 18:17:29 +0000
Subject: [PATCH 128/236] Update dependency androidx.startup:startup-runtime to
 v1.2.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a3058aaa72..b2b73a96e8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -44,7 +44,7 @@ koTest-assert = "io.kotest:kotest-assertions-core:5.9.1"
 datastore = "androidx.datastore:datastore-preferences:1.1.1"
 seismic = "com.squareup:seismic:1.0.3"
 viewBinding = { module = "androidx.databinding:viewbinding", version.ref = "agp" }
-appStartup = "androidx.startup:startup-runtime:1.1.1"
+appStartup = "androidx.startup:startup-runtime:1.2.0"
 turbine = "app.cash.turbine:turbine:1.1.0"
 molecule = "app.cash.molecule:molecule-runtime:2.0.0"
 immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8"

From 7ba596e2ebd9b09cbe182c17935aa20a1e54ff07 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 19 Sep 2024 18:07:16 +0000
Subject: [PATCH 129/236] Update dependency
 org.jetbrains.kotlinx:kotlinx-serialization-json to v1.7.3

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b2b73a96e8..b2142d6654 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -59,7 +59,7 @@ coroutines-guava = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-guava",
 coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
 coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
 
-serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.2"
+serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3"
 
 room-runtime = { module = "androidx.room:room-ktx", version.ref = "room" }
 room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }

From 2690dc71a39490db6cc5759e626d0446f40f16fb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 19 Sep 2024 21:14:33 +0000
Subject: [PATCH 130/236] Update dependency androidx.compose:compose-bom to
 v2024.09.02

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b2142d6654..349be630c0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -94,7 +94,7 @@ media3-testUtils-robolectric = { module = "androidx.media3:media3-test-utils-rob
 
 lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.6"
 
-compose-bom = "androidx.compose:compose-bom:2024.08.00"
+compose-bom = "androidx.compose:compose-bom:2024.09.02"
 compose-ui-ui = { module = "androidx.compose.ui:ui" }
 compose-ui-tooling-core = { module = "androidx.compose.ui:ui-tooling" }
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }

From 726c10666b04dddc1a075c2390380e29408ac9f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EC=9C=A4=EC=A7=84?= <peacemiller@konkuk.ac.kr>
Date: Fri, 20 Sep 2024 04:18:30 +0000
Subject: [PATCH 131/236] Translated using Weblate (Korean)

Currently translated at 26.8% (32 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/ko/
---
 strings/src/main/res/values-ko/strings.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/strings/src/main/res/values-ko/strings.xml b/strings/src/main/res/values-ko/strings.xml
index b94f12e94b..2681c9ffa3 100644
--- a/strings/src/main/res/values-ko/strings.xml
+++ b/strings/src/main/res/values-ko/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="cover">책표지</string>
     <string name="play_pause">재생 / 일시정지</string>
@@ -33,4 +33,7 @@
     <string name="book_header_current">현재</string>
     <string name="book_header_not_started">아직 재생 안 됨</string>
     <string name="book_header_completed">완료됨</string>
-</resources>
+    <string name="cover_search_template_no_author">%s 오디오북 커버</string>
+    <string name="pause">일시정지</string>
+    <string name="play">재생</string>
+</resources>
\ No newline at end of file

From 4f299ee1b0c6af8041819829b8b3c394d1413723 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 21 Sep 2024 11:50:22 +0000
Subject: [PATCH 132/236] Update dependency androidx.compose:compose-bom to
 v2024.09.02

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b2142d6654..349be630c0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -94,7 +94,7 @@ media3-testUtils-robolectric = { module = "androidx.media3:media3-test-utils-rob
 
 lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.6"
 
-compose-bom = "androidx.compose:compose-bom:2024.08.00"
+compose-bom = "androidx.compose:compose-bom:2024.09.02"
 compose-ui-ui = { module = "androidx.compose.ui:ui" }
 compose-ui-tooling-core = { module = "androidx.compose.ui:ui-tooling" }
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }

From d453df610cfbf78cbf7c2c6584356ec000618ac9 Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Sun, 22 Sep 2024 07:59:49 +0200
Subject: [PATCH 133/236] Adjust the components for the m3 api updates

---
 .../bookOverview/search/BookSearchScreen.kt   |   4 +
 .../voice/bookOverview/views/BookOverview.kt  |   2 +-
 .../voice/bookOverview/views/GridBooks.kt     |  22 +-
 .../voice/bookOverview/views/ListBooks.kt     |  80 +++----
 .../views/topbar/BookOverviewSearchBar.kt     |  74 ++++---
 .../kotlin/voice/bookmark/BookmarkScreen.kt   | 195 ++++++++----------
 .../bookmark/dialogs/AddBookmarkDialog.kt     |   2 +-
 .../bookmark/dialogs/EditBookmarkDialog.kt    |   2 +-
 .../voice/common/compose/LongClickableCard.kt |  37 ----
 .../main/kotlin/voice/cover/CoverContents.kt  |   2 +-
 .../main/kotlin/voice/cover/CoverSearchBar.kt |  66 +++---
 .../playbackScreen/SelectChapterDialog.kt     |   3 +
 .../playbackScreen/view/BookPlayAppBar.kt     |   4 +-
 .../voice/playbackScreen/view/OverflowMenu.kt |  34 ++-
 .../voice/playbackScreen/view/SkipButton.kt   |   6 +-
 .../voice/sleepTimer/SleepTimerDialog.kt      |   4 +
 16 files changed, 255 insertions(+), 282 deletions(-)
 delete mode 100644 common/src/main/kotlin/voice/common/compose/LongClickableCard.kt

diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/search/BookSearchScreen.kt b/bookOverview/src/main/kotlin/voice/bookOverview/search/BookSearchScreen.kt
index f5dfd0bb1e..7b0dff0d94 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/search/BookSearchScreen.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/search/BookSearchScreen.kt
@@ -16,9 +16,11 @@ import androidx.compose.material.icons.outlined.History
 import androidx.compose.material.icons.outlined.SentimentSatisfied
 import androidx.compose.material3.Icon
 import androidx.compose.material3.ListItem
+import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import voice.bookOverview.overview.BookOverviewLayoutMode
@@ -46,6 +48,7 @@ internal fun BookSearchContent(
           ListItem(
             modifier = Modifier.clickable { onQueryChange(query) },
             headlineContent = { Text(query) },
+            colors = ListItemDefaults.colors(containerColor = Color.Transparent),
             leadingContent = {
               Icon(
                 imageVector = Icons.Outlined.History,
@@ -58,6 +61,7 @@ internal fun BookSearchContent(
           ListItem(
             modifier = Modifier.clickable { onQueryChange(author) },
             headlineContent = { Text(author) },
+            colors = ListItemDefaults.colors(containerColor = Color.Transparent),
             leadingContent = {
               Icon(
                 imageVector = Icons.Outlined.SentimentSatisfied,
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/views/BookOverview.kt b/bookOverview/src/main/kotlin/voice/bookOverview/views/BookOverview.kt
index e323254f04..2222f0a7e6 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/views/BookOverview.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/views/BookOverview.kt
@@ -19,13 +19,13 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.coroutines.launch
 import voice.bookOverview.bottomSheet.BottomSheetContent
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/views/GridBooks.kt b/bookOverview/src/main/kotlin/voice/bookOverview/views/GridBooks.kt
index 74eff8115d..16ec21b2b8 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/views/GridBooks.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/views/GridBooks.kt
@@ -1,5 +1,6 @@
 package voice.bookOverview.views
 
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -15,6 +16,7 @@ import androidx.compose.foundation.lazy.grid.GridItemSpan
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Card
 import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -31,7 +33,6 @@ import kotlinx.collections.immutable.ImmutableMap
 import voice.bookOverview.overview.BookOverviewCategory
 import voice.bookOverview.overview.BookOverviewItemViewState
 import voice.common.BookId
-import voice.common.compose.LongClickableCard
 import kotlin.math.roundToInt
 import voice.common.R as CommonR
 
@@ -95,14 +96,17 @@ internal fun GridBook(
   onBookClick: (BookId) -> Unit,
   onBookLongClick: (BookId) -> Unit,
 ) {
-  LongClickableCard(
-    onClick = {
-      onBookClick(book.id)
-    },
-    onLongClick = {
-      onBookLongClick(book.id)
-    },
-    modifier = Modifier.fillMaxWidth(),
+  Card(
+    modifier = Modifier
+      .fillMaxWidth()
+      .combinedClickable(
+        onClick = {
+          onBookClick(book.id)
+        },
+        onLongClick = {
+          onBookLongClick(book.id)
+        },
+      ),
   ) {
     Column {
       AsyncImage(
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/views/ListBooks.kt b/bookOverview/src/main/kotlin/voice/bookOverview/views/ListBooks.kt
index 2880774108..3de29e58ae 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/views/ListBooks.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/views/ListBooks.kt
@@ -1,6 +1,7 @@
 package voice.bookOverview.views
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -15,6 +16,7 @@ import androidx.compose.foundation.layout.windowInsetsBottomHeight
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Card
 import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -32,7 +34,6 @@ import voice.bookOverview.overview.BookOverviewCategory
 import voice.bookOverview.overview.BookOverviewItemViewState
 import voice.common.BookId
 import voice.common.compose.ImmutableFile
-import voice.common.compose.LongClickableCard
 import voice.common.R as CommonR
 
 @Composable
@@ -91,50 +92,53 @@ internal fun ListBookRow(
   onBookLongClick: (BookId) -> Unit,
   modifier: Modifier = Modifier,
 ) {
-  LongClickableCard(
-    onClick = {
-      onBookClick(book.id)
-    },
-    onLongClick = {
-      onBookLongClick(book.id)
-    },
+  Card(
     modifier = modifier
-      .fillMaxWidth(),
-  ) {
-    Column {
-      Row {
-        CoverImage(book.cover)
-        Column(
-          Modifier
-            .padding(start = 8.dp, end = 8.dp, top = 8.dp, bottom = 8.dp)
-            .align(Alignment.CenterVertically),
-        ) {
-          if (book.author != null) {
+      .fillMaxWidth()
+      .combinedClickable(
+        onClick = {
+          onBookClick(book.id)
+        },
+        onLongClick = {
+          onBookLongClick(book.id)
+        },
+      ),
+    content = {
+      Column {
+        Row {
+          CoverImage(book.cover)
+          Column(
+            Modifier
+              .padding(start = 8.dp, end = 8.dp, top = 8.dp, bottom = 8.dp)
+              .align(Alignment.CenterVertically),
+          ) {
+            if (book.author != null) {
+              Text(
+                text = book.author.toUpperCase(LocaleList.current),
+                style = MaterialTheme.typography.labelSmall,
+                maxLines = 1,
+              )
+            }
+            Text(
+              text = book.name,
+              style = MaterialTheme.typography.bodyMedium,
+            )
             Text(
-              text = book.author.toUpperCase(LocaleList.current),
-              style = MaterialTheme.typography.labelSmall,
-              maxLines = 1,
+              text = book.remainingTime,
+              style = MaterialTheme.typography.bodySmall,
             )
           }
-          Text(
-            text = book.name,
-            style = MaterialTheme.typography.bodyMedium,
-          )
-          Text(
-            text = book.remainingTime,
-            style = MaterialTheme.typography.bodySmall,
-          )
         }
-      }
 
-      if (book.progress > 0.05) {
-        LinearProgressIndicator(
-          modifier = Modifier.fillMaxWidth(),
-          progress = { book.progress },
-        )
+        if (book.progress > 0.05) {
+          LinearProgressIndicator(
+            modifier = Modifier.fillMaxWidth(),
+            progress = { book.progress },
+          )
+        }
       }
-    }
-  }
+    },
+  )
 }
 
 @Composable
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/views/topbar/BookOverviewSearchBar.kt b/bookOverview/src/main/kotlin/voice/bookOverview/views/topbar/BookOverviewSearchBar.kt
index 638ae842ca..ac578d68f3 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/views/topbar/BookOverviewSearchBar.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/views/topbar/BookOverviewSearchBar.kt
@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.SearchBar
+import androidx.compose.material3.SearchBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.Dp
@@ -29,42 +30,49 @@ internal fun ColumnScope.BookOverviewSearchBar(
   searchViewState: BookSearchViewState,
 ) {
   SearchBar(
+    inputField = {
+      SearchBarDefaults.InputField(
+        query = if (searchActive) {
+          searchViewState.query
+        } else {
+          ""
+        },
+        onQueryChange = onQueryChange,
+        onSearch = onQueryChange,
+        expanded = searchActive,
+        onExpandedChange = onActiveChange,
+        leadingIcon = {
+          TopBarLeadingIcon(
+            searchActive = searchActive,
+            onActiveChange = onActiveChange,
+          )
+        },
+        trailingIcon = {
+          TopBarTrailingIcon(
+            searchActive = searchActive,
+            showMigrateIcon = showMigrateIcon,
+            showMigrateHint = showMigrateHint,
+            showAddBookHint = showAddBookHint,
+            onBookMigrationClick = onBookMigrationClick,
+            onBoomMigrationHelperConfirmClick = onBoomMigrationHelperConfirmClick,
+            onBookFolderClick = onBookFolderClick,
+            onSettingsClick = onSettingsClick,
+          )
+        },
+      )
+    },
+    expanded = searchActive,
+    onExpandedChange = onActiveChange,
     modifier = Modifier
       .fillMaxWidth()
       .padding(horizontal = horizontalPadding),
-    query = if (searchActive) {
-      searchViewState.query
-    } else {
-      ""
-    },
-    onQueryChange = onQueryChange,
-    onSearch = onQueryChange,
-    active = searchActive,
-    onActiveChange = onActiveChange,
-    leadingIcon = {
-      TopBarLeadingIcon(
-        searchActive = searchActive,
-        onActiveChange = onActiveChange,
-      )
-    },
-    trailingIcon = {
-      TopBarTrailingIcon(
-        searchActive = searchActive,
-        showMigrateIcon = showMigrateIcon,
-        showMigrateHint = showMigrateHint,
-        showAddBookHint = showAddBookHint,
-        onBookMigrationClick = onBookMigrationClick,
-        onBoomMigrationHelperConfirmClick = onBoomMigrationHelperConfirmClick,
-        onBookFolderClick = onBookFolderClick,
-        onSettingsClick = onSettingsClick,
+    content = {
+      BookSearchContent(
+        viewState = searchViewState,
+        contentPadding = PaddingValues(),
+        onQueryChange = onQueryChange,
+        onBookClick = onSearchBookClick,
       )
     },
-  ) {
-    BookSearchContent(
-      viewState = searchViewState,
-      contentPadding = PaddingValues(),
-      onQueryChange = onQueryChange,
-      onBookClick = onSearchBookClick,
-    )
-  }
+  )
 }
diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
index 99308b0ffe..f410508d59 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
@@ -1,16 +1,11 @@
 package voice.bookmark
 
-import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.gestures.AnchoredDraggableState
-import androidx.compose.foundation.gestures.DraggableAnchors
-import androidx.compose.foundation.gestures.Orientation
-import androidx.compose.foundation.gestures.anchoredDraggable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
@@ -31,8 +26,11 @@ import androidx.compose.material3.ListItem
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.SwipeToDismissBox
+import androidx.compose.material3.SwipeToDismissBoxValue
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.rememberSwipeToDismissBoxState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -42,10 +40,8 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import com.squareup.anvil.annotations.ContributesTo
 import voice.bookmark.dialogs.AddBookmarkDialog
@@ -56,7 +52,6 @@ import voice.common.compose.rememberScoped
 import voice.common.rootComponentAs
 import voice.data.Bookmark
 import java.util.UUID
-import kotlin.math.roundToInt
 import voice.strings.R as StringsR
 
 @ContributesTo(AppScope::class)
@@ -144,7 +139,7 @@ internal fun BookmarkScreen(
         key = { it.id.value.toString() },
       ) { bookmark ->
         BookmarkItem(
-          modifier = Modifier.animateItemPlacement(),
+          modifier = Modifier.animateItem(),
           bookmark = bookmark,
           onDelete = onDelete,
           onEdit = onEdit,
@@ -177,11 +172,6 @@ internal fun BookmarkScreen(
   }
 }
 
-internal enum class DragAnchors {
-  Start,
-  End,
-}
-
 @Composable
 internal fun BookmarkItem(
   bookmark: BookmarkItemViewState,
@@ -190,114 +180,99 @@ internal fun BookmarkItem(
   onClick: (Bookmark.Id) -> Unit,
   modifier: Modifier = Modifier,
 ) {
-  val density = LocalDensity.current
-
-  val deleteIconSize = 72.dp
-
   var expanded by remember { mutableStateOf(false) }
 
-  val state = remember {
-    AnchoredDraggableState(
-      initialValue = DragAnchors.Start,
-      positionalThreshold = { distance: Float -> distance },
-      velocityThreshold = { with(density) { 100.dp.toPx() } },
-      animationSpec = tween(),
+  SwipeToDismissBox(
+    modifier = modifier,
+    state = rememberSwipeToDismissBoxState(
       confirmValueChange = {
-        if (it == DragAnchors.End) {
-          onDelete(bookmark.id)
-        }
-        true
-      },
-    ).apply {
-      updateAnchors(
-        DraggableAnchors {
-          DragAnchors.Start at 0f
-          DragAnchors.End at with(density) { deleteIconSize.toPx() }
-        },
-      )
-    }
-  }
-  Box(modifier) {
-    Box(
-      Modifier
-        .size(deleteIconSize)
-        .background(Color.Red),
-    ) {
-      Icon(
-        modifier = Modifier.align(Alignment.Center),
-        imageVector = Icons.Outlined.Delete,
-        contentDescription = stringResource(id = StringsR.string.delete),
-        tint = Color.White,
-      )
-    }
-    ListItem(
-      modifier = Modifier
-        .offset {
-          IntOffset(
-            x = state
-              .requireOffset()
-              .roundToInt(),
-            y = 0,
-          )
-        }
-        .anchoredDraggable(state, Orientation.Horizontal)
-        .clickable {
-          onClick(bookmark.id)
-        },
-      headlineContent = {
-        Row(verticalAlignment = Alignment.CenterVertically) {
-          Text(text = bookmark.title)
-          if (bookmark.showSleepIcon) {
-            Icon(
-              modifier = Modifier
-                .padding(start = 4.dp)
-                .size(16.dp),
-              imageVector = Icons.Outlined.Timer,
-              contentDescription = stringResource(StringsR.string.action_sleep),
-            )
+        when (it) {
+          SwipeToDismissBoxValue.StartToEnd -> {
+            onDelete(bookmark.id)
+            true
           }
+          SwipeToDismissBoxValue.EndToStart,
+          SwipeToDismissBoxValue.Settled,
+            -> false
         }
       },
-      trailingContent = {
-        Box {
-          IconButton(
-            onClick = {
-              expanded = !expanded
-            },
-            content = {
+    ),
+    backgroundContent = {
+      Box(
+        Modifier
+          .fillMaxSize()
+          .background(Color.Red),
+      ) {
+        Icon(
+          modifier = Modifier
+            .padding(start = 16.dp)
+            .align(Alignment.CenterStart),
+          imageVector = Icons.Outlined.Delete,
+          contentDescription = stringResource(id = StringsR.string.delete),
+          tint = Color.White,
+        )
+      }
+    },
+    content = {
+      ListItem(
+        modifier = Modifier
+          .clickable {
+            onClick(bookmark.id)
+          },
+        headlineContent = {
+          Row(verticalAlignment = Alignment.CenterVertically) {
+            Text(text = bookmark.title)
+            if (bookmark.showSleepIcon) {
               Icon(
-                imageVector = Icons.Default.MoreVert,
-                contentDescription = stringResource(id = StringsR.string.popup_edit),
+                modifier = Modifier
+                  .padding(start = 4.dp)
+                  .size(16.dp),
+                imageVector = Icons.Outlined.Timer,
+                contentDescription = stringResource(StringsR.string.action_sleep),
               )
-            },
-          )
-          DropdownMenu(
-            expanded = expanded,
-            onDismissRequest = { expanded = false },
-          ) {
-            DropdownMenuItem(
-              text = { Text(stringResource(id = StringsR.string.popup_edit)) },
+            }
+          }
+        },
+        trailingContent = {
+          Box {
+            IconButton(
               onClick = {
-                expanded = false
-                onEdit(bookmark.id)
+                expanded = !expanded
               },
-            )
-            DropdownMenuItem(
-              text = { Text(stringResource(id = StringsR.string.remove)) },
-              onClick = {
-                expanded = false
-                onDelete(bookmark.id)
+              content = {
+                Icon(
+                  imageVector = Icons.Default.MoreVert,
+                  contentDescription = stringResource(id = StringsR.string.popup_edit),
+                )
               },
             )
+            DropdownMenu(
+              expanded = expanded,
+              onDismissRequest = { expanded = false },
+            ) {
+              DropdownMenuItem(
+                text = { Text(stringResource(id = StringsR.string.popup_edit)) },
+                onClick = {
+                  expanded = false
+                  onEdit(bookmark.id)
+                },
+              )
+              DropdownMenuItem(
+                text = { Text(stringResource(id = StringsR.string.remove)) },
+                onClick = {
+                  expanded = false
+                  onDelete(bookmark.id)
+                },
+              )
+            }
           }
-        }
-      },
-
-      supportingContent = {
-        Text(text = bookmark.subtitle)
-      },
-    )
-  }
+        },
+        supportingContent = {
+          Text(text = bookmark.subtitle)
+        },
+      )
+    },
+  )
 }
 
 @Composable
diff --git a/bookmark/src/main/kotlin/voice/bookmark/dialogs/AddBookmarkDialog.kt b/bookmark/src/main/kotlin/voice/bookmark/dialogs/AddBookmarkDialog.kt
index 3d9accd887..47ecf38f46 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/dialogs/AddBookmarkDialog.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/dialogs/AddBookmarkDialog.kt
@@ -48,7 +48,7 @@ internal fun AddBookmarkDialog(
             .focusRequester(focusRequester),
           keyboardOptions = KeyboardOptions(
             capitalization = KeyboardCapitalization.Sentences,
-            autoCorrect = true,
+            autoCorrectEnabled = true,
             keyboardType = KeyboardType.Text,
             imeAction = ImeAction.Done,
           ),
diff --git a/bookmark/src/main/kotlin/voice/bookmark/dialogs/EditBookmarkDialog.kt b/bookmark/src/main/kotlin/voice/bookmark/dialogs/EditBookmarkDialog.kt
index 6163038b27..b9319e7e67 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/dialogs/EditBookmarkDialog.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/dialogs/EditBookmarkDialog.kt
@@ -61,7 +61,7 @@ internal fun EditBookmarkDialog(
             .focusRequester(focusRequester),
           keyboardOptions = KeyboardOptions(
             capitalization = KeyboardCapitalization.Sentences,
-            autoCorrect = true,
+            autoCorrectEnabled = true,
             keyboardType = KeyboardType.Text,
             imeAction = ImeAction.Done,
           ),
diff --git a/common/src/main/kotlin/voice/common/compose/LongClickableCard.kt b/common/src/main/kotlin/voice/common/compose/LongClickableCard.kt
deleted file mode 100644
index bbcfa1c799..0000000000
--- a/common/src/main/kotlin/voice/common/compose/LongClickableCard.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package voice.common.compose
-
-import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material.ripple.rememberRipple
-import androidx.compose.material3.Card
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.semantics.Role
-
-@Composable
-fun LongClickableCard(
-  onClick: () -> Unit,
-  onLongClick: () -> Unit,
-  modifier: Modifier = Modifier,
-  content: @Composable () -> Unit,
-) {
-  Card(modifier = modifier) {
-    Box(
-      modifier = Modifier
-        .fillMaxSize()
-        .combinedClickable(
-          interactionSource = remember { MutableInteractionSource() },
-          indication = rememberRipple(),
-          enabled = true,
-          role = Role.Button,
-          onClick = onClick,
-          onLongClick = onLongClick,
-        ),
-    ) {
-      content()
-    }
-  }
-}
diff --git a/cover/src/main/kotlin/voice/cover/CoverContents.kt b/cover/src/main/kotlin/voice/cover/CoverContents.kt
index 32a23da938..5a7dfbf87d 100644
--- a/cover/src/main/kotlin/voice/cover/CoverContents.kt
+++ b/cover/src/main/kotlin/voice/cover/CoverContents.kt
@@ -82,7 +82,7 @@ private fun ItemsContent(
   val items = viewState.items
   LazyVerticalStaggeredGrid(
     columns = StaggeredGridCells.Adaptive(minSize = 150.dp),
-    contentPadding = PaddingValues(top = 80.dp),
+    contentPadding = PaddingValues(top = 96.dp),
     content = {
       items(
         count = items.itemCount,
diff --git a/cover/src/main/kotlin/voice/cover/CoverSearchBar.kt b/cover/src/main/kotlin/voice/cover/CoverSearchBar.kt
index 80b3904280..9db0525d4e 100644
--- a/cover/src/main/kotlin/voice/cover/CoverSearchBar.kt
+++ b/cover/src/main/kotlin/voice/cover/CoverSearchBar.kt
@@ -8,6 +8,7 @@ import androidx.compose.material.icons.outlined.Close
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.SearchBar
+import androidx.compose.material3.SearchBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -21,34 +22,47 @@ internal fun CoverSearchBar(
   viewState: SelectCoverFromInternetViewModel.ViewState,
 ) {
   SearchBar(
+    inputField = {
+      SearchBarDefaults.InputField(
+        query = viewState.query,
+        onQueryChange = onQueryChange,
+        onSearch = {},
+        expanded = false,
+        onExpandedChange = {},
+        enabled = true,
+        placeholder = null,
+        leadingIcon = {
+          IconButton(onClick = onCloseClick) {
+            Icon(
+              imageVector = Icons.AutoMirrored.Outlined.ArrowBack,
+              contentDescription = stringResource(id = R.string.close),
+            )
+          }
+        },
+        trailingIcon = {
+          IconButton(
+            onClick = {
+              onQueryChange("")
+            },
+          ) {
+            Icon(
+              imageVector = Icons.Outlined.Close,
+              contentDescription = stringResource(id = R.string.delete),
+            )
+          }
+        },
+        interactionSource = null,
+      )
+    },
+    expanded = false,
+    onExpandedChange = {},
     modifier = Modifier
       .fillMaxWidth()
       .padding(horizontal = 16.dp),
-    leadingIcon = {
-      IconButton(onClick = onCloseClick) {
-        Icon(
-          imageVector = Icons.AutoMirrored.Outlined.ArrowBack,
-          contentDescription = stringResource(id = R.string.close),
-        )
-      }
-    },
-    trailingIcon = {
-      IconButton(
-        onClick = {
-          onQueryChange("")
-        },
-      ) {
-        Icon(
-          imageVector = Icons.Outlined.Close,
-          contentDescription = stringResource(id = R.string.delete),
-        )
-      }
-    },
-    query = viewState.query,
-    onQueryChange = onQueryChange,
-    onSearch = {},
-    active = false,
-    onActiveChange = {},
-    content = {},
+    shape = SearchBarDefaults.inputFieldShape,
+    tonalElevation = SearchBarDefaults.TonalElevation,
+    shadowElevation = SearchBarDefaults.ShadowElevation,
+    windowInsets = SearchBarDefaults.windowInsets,
+    content = { },
   )
 }
diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/SelectChapterDialog.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/SelectChapterDialog.kt
index c786fc1db7..f2d14e3ca2 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/SelectChapterDialog.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/SelectChapterDialog.kt
@@ -9,9 +9,11 @@ import androidx.compose.material.icons.outlined.Equalizer
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Icon
 import androidx.compose.material3.ListItem
+import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import voice.strings.R as StringsR
 
@@ -29,6 +31,7 @@ internal fun SelectChapterDialog(
         content = {
           itemsIndexed(dialogState.chapters) { index, chapter ->
             ListItem(
+              colors = ListItemDefaults.colors(containerColor = Color.Transparent),
               modifier = Modifier.clickable {
                 viewModel.onChapterClicked(index)
               },
diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/view/BookPlayAppBar.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/view/BookPlayAppBar.kt
index f4aff9a15d..6954d055eb 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/view/BookPlayAppBar.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/view/BookPlayAppBar.kt
@@ -10,11 +10,11 @@ import androidx.compose.material.icons.outlined.Bedtime
 import androidx.compose.material.icons.outlined.BedtimeOff
 import androidx.compose.material.icons.outlined.CollectionsBookmark
 import androidx.compose.material.icons.outlined.Speed
-import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.LargeTopAppBar
 import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -54,7 +54,7 @@ internal fun BookPlayAppBar(
         .combinedClickable(
           onClick = onBookmarkClick,
           onLongClick = onBookmarkLongClick,
-          indication = rememberRipple(bounded = false, radius = 20.dp),
+          indication = ripple(bounded = false, radius = 20.dp),
           interactionSource = remember { MutableInteractionSource() },
         ),
       contentAlignment = Alignment.Center,
diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/view/OverflowMenu.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/view/OverflowMenu.kt
index 0c7222fe83..b2be6671be 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/view/OverflowMenu.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/view/OverflowMenu.kt
@@ -1,21 +1,19 @@
 package voice.playbackScreen.view
 
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.MoreVert
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.ListItem
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import voice.strings.R
 
@@ -41,17 +39,15 @@ internal fun OverflowMenu(
       expanded = expanded,
       onDismissRequest = { expanded = false },
     ) {
-      ListItem(
-        modifier = Modifier.clickable(
-          onClick = {
-            expanded = false
-            onSkipSilenceClick()
-          },
-        ),
-        headlineContent = {
+      DropdownMenuItem(
+        onClick = {
+          expanded = false
+          onSkipSilenceClick()
+        },
+        text = {
           Text(text = stringResource(id = R.string.skip_silence))
         },
-        trailingContent = {
+        trailingIcon = {
           Checkbox(
             checked = skipSilence,
             onCheckedChange = {
@@ -61,14 +57,12 @@ internal fun OverflowMenu(
           )
         },
       )
-      ListItem(
-        modifier = Modifier.clickable(
-          onClick = {
-            expanded = false
-            onVolumeBoostClick()
-          },
-        ),
-        headlineContent = {
+      DropdownMenuItem(
+        onClick = {
+          expanded = false
+          onVolumeBoostClick()
+        },
+        text = {
           Text(text = stringResource(id = R.string.volume_boost))
         },
       )
diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/view/SkipButton.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/view/SkipButton.kt
index 53798638bd..b12ec28d11 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/view/SkipButton.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/view/SkipButton.kt
@@ -5,8 +5,8 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.Undo
-import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.material3.Icon
+import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
@@ -24,10 +24,10 @@ internal fun SkipButton(
     modifier = Modifier
       .clickable(
         interactionSource = remember { MutableInteractionSource() },
-        indication = rememberRipple(bounded = false),
+        indication = ripple(bounded = false),
         onClick = onClick,
       )
-      .size(50.dp)
+      .size(48.dp)
       .scale(scaleX = if (forward) -1f else 1F, scaleY = 1f),
     imageVector = Icons.AutoMirrored.Filled.Undo,
     contentDescription = stringResource(
diff --git a/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimerDialog.kt b/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimerDialog.kt
index c3567d57e3..2a7f04d63e 100644
--- a/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimerDialog.kt
+++ b/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimerDialog.kt
@@ -13,6 +13,7 @@ import androidx.compose.material.icons.outlined.Remove
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.ListItem
+import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Text
@@ -20,6 +21,7 @@ import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
@@ -55,6 +57,7 @@ fun SleepTimerDialog(
           modifier = Modifier.clickable {
             onAcceptSleepTime(time)
           },
+          colors = ListItemDefaults.colors(containerColor = Color.Transparent),
           headlineContent = {
             Text(text = minutes(minutes = time))
           },
@@ -64,6 +67,7 @@ fun SleepTimerDialog(
         modifier = Modifier.clickable {
           onAcceptSleepTime(viewState.customSleepTime)
         },
+        colors = ListItemDefaults.colors(containerColor = Color.Transparent),
         headlineContent = {
           Text(text = minutes(minutes = viewState.customSleepTime))
         },

From 7704cc2eab949296cc377b272810009ec8fcd5f7 Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Sun, 22 Sep 2024 08:06:44 +0200
Subject: [PATCH 134/236] Fix lint

---
 bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
index f410508d59..441ac82da3 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
@@ -193,7 +193,7 @@ internal fun BookmarkItem(
           }
           SwipeToDismissBoxValue.EndToStart,
           SwipeToDismissBoxValue.Settled,
-            -> false
+          -> false
         }
       },
     ),

From 19522f291441b21e62a5b50f28e658a95c504744 Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Sun, 22 Sep 2024 08:11:25 +0200
Subject: [PATCH 135/236] Marquee the book title

---
 .../main/kotlin/voice/playbackScreen/view/AppBarTitle.kt   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/view/AppBarTitle.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/view/AppBarTitle.kt
index 874e41815e..07d0a547b4 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/view/AppBarTitle.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/view/AppBarTitle.kt
@@ -1,9 +1,14 @@
 package voice.playbackScreen.view
 
+import androidx.compose.foundation.basicMarquee
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 
 @Composable
 internal fun AppBarTitle(title: String) {
-  Text(text = title)
+  Text(
+    text = title,
+    modifier = Modifier.basicMarquee(),
+  )
 }

From 7bcbcda5c3290e96e30182428eeb263ecd87e0d3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 22 Sep 2024 06:13:39 +0000
Subject: [PATCH 136/236] Update Ktlint

---
 gradle/libs.versions.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 349be630c0..2acecacdf8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,8 +15,8 @@ dagger = "2.52"
 kotlin = "2.0.20"
 media3 = "1.3.1"
 agp = "8.6.1"
-ktlint-core = "1.2.1"
-ktlint-gradlePlugin = "0.9.0"
+ktlint-core = "1.3.1"
+ktlint-gradlePlugin = "0.10.0"
 retrofit = "2.11.0"
 
 [libraries]
@@ -113,7 +113,7 @@ compose-navigation = "dev.olshevski.navigation:reimagined:1.5.0"
 
 ktlint-core = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint-core" }
 ktlint-gradlePlugin = { module = "io.github.usefulness:ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
-ktlint-compose = "io.nlopez.compose.rules:ktlint:0.4.1"
+ktlint-compose = "io.nlopez.compose.rules:ktlint:0.4.12"
 
 [bundles]
 compose = [

From 130417965547b8fcb0cd1581d29ce8ad57c4fc93 Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Sun, 22 Sep 2024 20:35:22 +0200
Subject: [PATCH 137/236] Adjust the code style.

Disable ktlint_compose_parameter-naming for now
---
 .editorconfig                                  |  3 +++
 .../app/misc/MainActivityIntentProviderImpl.kt |  4 +---
 .../voice/app/uitools/CropTransformation.kt    |  6 ++++--
 .../bottomSheet/BottomSheetViewModel.kt        |  4 +---
 .../bottomSheet/EditBookBottomSheetState.kt    |  4 +---
 .../EditBookCategoryViewModel.kt               |  4 +---
 .../editTitle/EditBookTitleViewModel.kt        |  4 +---
 .../fileCover/FileCoverViewModel.kt            |  4 +---
 .../internetCover/InternetCoverViewModel.kt    |  4 +---
 .../voice/bookmark/BookmarkController.kt       |  3 +--
 .../main/kotlin/voice/common/grid/GridCount.kt |  4 +---
 .../common/navigation/NavigationCommand.kt     | 18 ++++++++++++------
 .../main/kotlin/voice/cover/api/CoverApi.kt    |  4 +---
 .../main/kotlin/voice/data/BookComparator.kt   |  4 +---
 .../kotlin/voice/data/repo/BookContentRepo.kt  |  4 +---
 .../main/kotlin/voice/data/repo/ChapterRepo.kt |  4 +---
 .../internals/migrations/Migration32to34.kt    |  6 +++++-
 data/src/test/kotlin/voice/data/ChapterTest.kt |  5 ++++-
 .../repo/internals/DataBaseMigratorTest.kt     | 11 +++++++++--
 .../documentfile/FileBasedDocumentFile.kt      |  4 +---
 .../RealCachedDocumentFileFactory.kt           |  4 +---
 .../folderPicker/FolderPickerViewState.kt      |  4 +---
 .../kotlin/voice/playback/misc/VolumeGain.kt   |  4 +---
 .../player/DurationInconsistenciesUpdater.kt   |  4 +---
 .../player/OnlyAudioRenderersFactory.kt        |  4 +---
 .../playstate/PlayStateDelegatingListener.kt   |  4 +---
 .../playback/session/ImageFileProvider.kt      |  4 +---
 .../session/SleepTimerCommandUpdater.kt        |  4 +---
 .../voice/playbackScreen/BookPlayViewState.kt  |  8 ++------
 .../IsIgnoringBatteryOptimizations.kt          |  4 +---
 .../voice/review/InstallationTimeProvider.kt   |  4 +---
 .../kotlin/voice/review/ReviewTranslated.kt    |  4 +---
 .../scanner/DeviceHasStoragePermissionBug.kt   |  4 +---
 .../kotlin/voice/app/scanner/FFProbeAnalyze.kt |  4 +---
 .../kotlin/voice/app/scanner/MediaAnalyzer.kt  |  4 +---
 .../main/kotlin/voice/app/scanner/Metadata.kt  |  4 +---
 .../voice/sleepTimer/SleepTimerViewState.kt    |  4 +---
 37 files changed, 69 insertions(+), 107 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 68f67b96db..3dd3f63e7f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,7 +13,10 @@ ktlint_standard_filename = disabled
 ktlint_standard_function-naming = disabled
 ktlint_standard_backing-property-naming = disabled
 ktlint_code_style = intellij_idea
+ktlint_standard_function-expression-body = disabled
 ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 2
+ktlint_class_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 2
+ktlint_compose_parameter-naming = disabled
 ij_java_class_count_to_use_import_on_demand = 999
 ij_kotlin_allow_trailing_comma = true
 ij_kotlin_allow_trailing_comma_on_call_site = true
diff --git a/app/src/main/kotlin/voice/app/misc/MainActivityIntentProviderImpl.kt b/app/src/main/kotlin/voice/app/misc/MainActivityIntentProviderImpl.kt
index 4d58dda952..17c06a0b56 100644
--- a/app/src/main/kotlin/voice/app/misc/MainActivityIntentProviderImpl.kt
+++ b/app/src/main/kotlin/voice/app/misc/MainActivityIntentProviderImpl.kt
@@ -7,9 +7,7 @@ import voice.playback.notification.MainActivityIntentProvider
 import javax.inject.Inject
 
 class MainActivityIntentProviderImpl
-@Inject constructor(
-  private val context: Context,
-) : MainActivityIntentProvider {
+@Inject constructor(private val context: Context) : MainActivityIntentProvider {
 
   override fun toCurrentBook(): PendingIntent {
     val intent = MainActivity.goToBookIntent(context)
diff --git a/app/src/main/kotlin/voice/app/uitools/CropTransformation.kt b/app/src/main/kotlin/voice/app/uitools/CropTransformation.kt
index 2a2e0e4f42..281636c5d2 100644
--- a/app/src/main/kotlin/voice/app/uitools/CropTransformation.kt
+++ b/app/src/main/kotlin/voice/app/uitools/CropTransformation.kt
@@ -7,8 +7,10 @@ import coil.size.Size
 import coil.transform.Transformation
 import voice.app.features.imagepicker.CropOverlay
 
-class CropTransformation(cropOverlay: CropOverlay, private val cropSource: ImageView) :
-  Transformation {
+class CropTransformation(
+  cropOverlay: CropOverlay,
+  private val cropSource: ImageView,
+) : Transformation {
 
   private val rect = cropOverlay.selectedRect
 
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetViewModel.kt
index 5da211230b..ebdcc310ce 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetViewModel.kt
@@ -11,9 +11,7 @@ import javax.inject.Inject
 
 @BookOverviewScope
 class BottomSheetViewModel
-@Inject constructor(
-  private val viewModels: Set<@JvmSuppressWildcards BottomSheetItemViewModel>,
-) {
+@Inject constructor(private val viewModels: Set<@JvmSuppressWildcards BottomSheetItemViewModel>) {
 
   private val scope = MainScope()
 
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/EditBookBottomSheetState.kt b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/EditBookBottomSheetState.kt
index 37275eaf03..ae6b556650 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/EditBookBottomSheetState.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/EditBookBottomSheetState.kt
@@ -12,9 +12,7 @@ import androidx.compose.material.icons.outlined.Title
 import androidx.compose.ui.graphics.vector.ImageVector
 import voice.strings.R as StringsR
 
-internal data class EditBookBottomSheetState(
-  val items: List<BottomSheetItem>,
-)
+internal data class EditBookBottomSheetState(val items: List<BottomSheetItem>)
 
 enum class BottomSheetItem(
   @StringRes val titleRes: Int,
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/editBookCategory/EditBookCategoryViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/editBookCategory/EditBookCategoryViewModel.kt
index d5bb5dc9f5..926f959805 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/editBookCategory/EditBookCategoryViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/editBookCategory/EditBookCategoryViewModel.kt
@@ -18,9 +18,7 @@ import javax.inject.Inject
 )
 class EditBookCategoryViewModel
 @Inject
-constructor(
-  private val repo: BookRepository,
-) : BottomSheetItemViewModel {
+constructor(private val repo: BookRepository) : BottomSheetItemViewModel {
 
   override suspend fun items(bookId: BookId): List<BottomSheetItem> {
     val book = repo.get(bookId) ?: return emptyList()
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/editTitle/EditBookTitleViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/editTitle/EditBookTitleViewModel.kt
index 8f3b7a2bb8..f4e46ecdbf 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/editTitle/EditBookTitleViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/editTitle/EditBookTitleViewModel.kt
@@ -19,9 +19,7 @@ import javax.inject.Inject
 )
 class EditBookTitleViewModel
 @Inject
-constructor(
-  private val repo: BookRepository,
-) : BottomSheetItemViewModel {
+constructor(private val repo: BookRepository) : BottomSheetItemViewModel {
 
   private val scope = MainScope()
 
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/fileCover/FileCoverViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/fileCover/FileCoverViewModel.kt
index 308a04ce99..84aea92256 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/fileCover/FileCoverViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/fileCover/FileCoverViewModel.kt
@@ -14,9 +14,7 @@ import javax.inject.Inject
 @ContributesMultibinding(BookOverviewScope::class, boundType = BottomSheetItemViewModel::class)
 class FileCoverViewModel
 @Inject
-constructor(
-  private val navigator: Navigator,
-) : BottomSheetItemViewModel {
+constructor(private val navigator: Navigator) : BottomSheetItemViewModel {
 
   private var bookId: BookId? = null
 
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/internetCover/InternetCoverViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/internetCover/InternetCoverViewModel.kt
index 9accc6bf2f..057da039d5 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/internetCover/InternetCoverViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/internetCover/InternetCoverViewModel.kt
@@ -13,9 +13,7 @@ import javax.inject.Inject
 @ContributesMultibinding(BookOverviewScope::class)
 class InternetCoverViewModel
 @Inject
-constructor(
-  private val navigator: Navigator,
-) : BottomSheetItemViewModel {
+constructor(private val navigator: Navigator) : BottomSheetItemViewModel {
 
   override suspend fun items(bookId: BookId): List<BottomSheetItem> {
     return listOf(BottomSheetItem.InternetCover)
diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
index d717cbcf4c..2d48e4637a 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
@@ -10,8 +10,7 @@ import voice.data.putBookId
 private const val NI_BOOK_ID = "ni#bookId"
 
 @Suppress("unused")
-class BookmarkController(args: Bundle) :
-  ComposeController(args) {
+class BookmarkController(args: Bundle) : ComposeController(args) {
 
   constructor(bookId: BookId) : this(
     Bundle().apply {
diff --git a/common/src/main/kotlin/voice/common/grid/GridCount.kt b/common/src/main/kotlin/voice/common/grid/GridCount.kt
index 7b97f27bc5..3c7d98db79 100644
--- a/common/src/main/kotlin/voice/common/grid/GridCount.kt
+++ b/common/src/main/kotlin/voice/common/grid/GridCount.kt
@@ -4,9 +4,7 @@ import android.content.Context
 import javax.inject.Inject
 
 class GridCount
-@Inject constructor(
-  private val context: Context,
-) {
+@Inject constructor(private val context: Context) {
 
   fun useGridAsDefault(): Boolean {
     val displayMetrics = context.resources.displayMetrics
diff --git a/common/src/main/kotlin/voice/common/navigation/NavigationCommand.kt b/common/src/main/kotlin/voice/common/navigation/NavigationCommand.kt
index 048e5dcaf5..e6e296c996 100644
--- a/common/src/main/kotlin/voice/common/navigation/NavigationCommand.kt
+++ b/common/src/main/kotlin/voice/common/navigation/NavigationCommand.kt
@@ -14,9 +14,7 @@ sealed interface NavigationCommand {
     val replace: Boolean,
   ) : NavigationCommand
 
-  data class Execute(
-    val action: (NavController<Destination.Compose>) -> Unit,
-  ) : NavigationCommand
+  data class Execute(val action: (NavController<Destination.Compose>) -> Unit) : NavigationCommand
 }
 
 sealed interface Destination {
@@ -26,11 +24,16 @@ sealed interface Destination {
   @Parcelize
   data class CoverFromInternet(val bookId: BookId) : Compose
   data class Website(val url: String) : Destination
-  data class EditCover(val bookId: BookId, val cover: Uri) : Destination
+  data class EditCover(
+    val bookId: BookId,
+    val cover: Uri,
+  ) : Destination
 
   data class Activity(val intent: Intent) : Destination
 
-  sealed interface Compose : Destination, Parcelable
+  sealed interface Compose :
+    Destination,
+    Parcelable
 
   @Parcelize
   object Migration : Compose
@@ -45,7 +48,10 @@ sealed interface Destination {
   object FolderPicker : Compose
 
   @Parcelize
-  data class SelectFolderType(val uri: Uri, val mode: Mode) : Compose {
+  data class SelectFolderType(
+    val uri: Uri,
+    val mode: Mode,
+  ) : Compose {
 
     enum class Mode {
       Default,
diff --git a/cover/src/main/kotlin/voice/cover/api/CoverApi.kt b/cover/src/main/kotlin/voice/cover/api/CoverApi.kt
index 86f7924a34..7f0519f775 100644
--- a/cover/src/main/kotlin/voice/cover/api/CoverApi.kt
+++ b/cover/src/main/kotlin/voice/cover/api/CoverApi.kt
@@ -4,9 +4,7 @@ import voice.logging.core.Logger
 import javax.inject.Inject
 
 class CoverApi
-@Inject constructor(
-  private val api: InternalCoverApi,
-) {
+@Inject constructor(private val api: InternalCoverApi) {
 
   internal suspend fun token(query: String): String? {
     Logger.d("query token")
diff --git a/data/src/main/kotlin/voice/data/BookComparator.kt b/data/src/main/kotlin/voice/data/BookComparator.kt
index a2829d4ce0..e10d7012ad 100644
--- a/data/src/main/kotlin/voice/data/BookComparator.kt
+++ b/data/src/main/kotlin/voice/data/BookComparator.kt
@@ -2,9 +2,7 @@ package voice.data
 
 import voice.common.comparator.NaturalOrderComparator
 
-enum class BookComparator(
-  private val comparatorFunction: Comparator<Book>,
-) : Comparator<Book> by comparatorFunction {
+enum class BookComparator(private val comparatorFunction: Comparator<Book>) : Comparator<Book> by comparatorFunction {
 
   ByLastPlayed(
     compareByDescending {
diff --git a/data/src/main/kotlin/voice/data/repo/BookContentRepo.kt b/data/src/main/kotlin/voice/data/repo/BookContentRepo.kt
index 9ee4ed41d0..4e37946e1e 100644
--- a/data/src/main/kotlin/voice/data/repo/BookContentRepo.kt
+++ b/data/src/main/kotlin/voice/data/repo/BookContentRepo.kt
@@ -18,9 +18,7 @@ import javax.inject.Singleton
 
 @Singleton
 class BookContentRepo
-@Inject constructor(
-  private val dao: BookContentDao,
-) {
+@Inject constructor(private val dao: BookContentDao) {
 
   private val cacheMutex = Mutex()
   private var cacheFilled = false
diff --git a/data/src/main/kotlin/voice/data/repo/ChapterRepo.kt b/data/src/main/kotlin/voice/data/repo/ChapterRepo.kt
index 663808dff8..be4b7f015d 100644
--- a/data/src/main/kotlin/voice/data/repo/ChapterRepo.kt
+++ b/data/src/main/kotlin/voice/data/repo/ChapterRepo.kt
@@ -10,9 +10,7 @@ import javax.inject.Singleton
 
 @Singleton
 class ChapterRepo
-@Inject constructor(
-  private val dao: ChapterDao,
-) {
+@Inject constructor(private val dao: ChapterDao) {
 
   private val cache = mutableMapOf<ChapterId, Chapter?>()
 
diff --git a/data/src/main/kotlin/voice/data/repo/internals/migrations/Migration32to34.kt b/data/src/main/kotlin/voice/data/repo/internals/migrations/Migration32to34.kt
index 1110fdb9aa..2a91750880 100644
--- a/data/src/main/kotlin/voice/data/repo/internals/migrations/Migration32to34.kt
+++ b/data/src/main/kotlin/voice/data/repo/internals/migrations/Migration32to34.kt
@@ -71,5 +71,9 @@ class Migration32to34
     }
   }
 
-  private data class Holder(val path: String, val title: String, val time: Long)
+  private data class Holder(
+    val path: String,
+    val title: String,
+    val time: Long,
+  )
 }
diff --git a/data/src/test/kotlin/voice/data/ChapterTest.kt b/data/src/test/kotlin/voice/data/ChapterTest.kt
index 7cd398a6dd..87e51caada 100644
--- a/data/src/test/kotlin/voice/data/ChapterTest.kt
+++ b/data/src/test/kotlin/voice/data/ChapterTest.kt
@@ -128,5 +128,8 @@ class ChapterTest {
     positions.shouldContainInOrder(expected)
   }
 
-  data class MarkPosition(val start: Long, val end: Long)
+  data class MarkPosition(
+    val start: Long,
+    val end: Long,
+  )
 }
diff --git a/data/src/test/kotlin/voice/data/repo/internals/DataBaseMigratorTest.kt b/data/src/test/kotlin/voice/data/repo/internals/DataBaseMigratorTest.kt
index da04c07e23..5e0213d847 100644
--- a/data/src/test/kotlin/voice/data/repo/internals/DataBaseMigratorTest.kt
+++ b/data/src/test/kotlin/voice/data/repo/internals/DataBaseMigratorTest.kt
@@ -47,8 +47,15 @@ class DataBaseMigratorTest {
     val dbName = "testDb"
     val db = helper.createDatabase(dbName, 44)
 
-    data class BookSetting(val id: String, val currentFile: String, val positionInChapter: Int)
-    data class Chapter(val file: String, val bookId: String)
+    data class BookSetting(
+      val id: String,
+      val currentFile: String,
+      val positionInChapter: Int,
+    )
+    data class Chapter(
+      val file: String,
+      val bookId: String,
+    )
 
     fun insertBookSettings(settings: BookSetting) {
       db.execSQL(
diff --git a/documentfile/src/main/kotlin/voice/documentfile/FileBasedDocumentFile.kt b/documentfile/src/main/kotlin/voice/documentfile/FileBasedDocumentFile.kt
index 1e96c62704..fbf90a4c4c 100644
--- a/documentfile/src/main/kotlin/voice/documentfile/FileBasedDocumentFile.kt
+++ b/documentfile/src/main/kotlin/voice/documentfile/FileBasedDocumentFile.kt
@@ -5,9 +5,7 @@ import androidx.core.net.toFile
 import androidx.core.net.toUri
 import java.io.File
 
-data class FileBasedDocumentFile(
-  private val file: File,
-) : CachedDocumentFile {
+data class FileBasedDocumentFile(private val file: File) : CachedDocumentFile {
 
   override val children: List<CachedDocumentFile> get() = file.listFiles()?.map { FileBasedDocumentFile(it) } ?: emptyList()
   override val name: String? get() = file.name
diff --git a/documentfile/src/main/kotlin/voice/documentfile/RealCachedDocumentFileFactory.kt b/documentfile/src/main/kotlin/voice/documentfile/RealCachedDocumentFileFactory.kt
index 742d9262e5..6c040004ca 100644
--- a/documentfile/src/main/kotlin/voice/documentfile/RealCachedDocumentFileFactory.kt
+++ b/documentfile/src/main/kotlin/voice/documentfile/RealCachedDocumentFileFactory.kt
@@ -8,9 +8,7 @@ import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
 class RealCachedDocumentFileFactory
-@Inject constructor(
-  private val context: Context,
-) : CachedDocumentFileFactory {
+@Inject constructor(private val context: Context) : CachedDocumentFileFactory {
   override fun create(uri: Uri): CachedDocumentFile {
     return RealCachedDocumentFile(context = context, uri = uri, preFilledContent = null)
   }
diff --git a/folderPicker/src/main/kotlin/voice/folderPicker/folderPicker/FolderPickerViewState.kt b/folderPicker/src/main/kotlin/voice/folderPicker/folderPicker/FolderPickerViewState.kt
index 9be1aabdcf..f4a4400d69 100644
--- a/folderPicker/src/main/kotlin/voice/folderPicker/folderPicker/FolderPickerViewState.kt
+++ b/folderPicker/src/main/kotlin/voice/folderPicker/folderPicker/FolderPickerViewState.kt
@@ -3,9 +3,7 @@ package voice.folderPicker.folderPicker
 import android.net.Uri
 import voice.data.folders.FolderType
 
-data class FolderPickerViewState(
-  val items: List<Item>,
-) {
+data class FolderPickerViewState(val items: List<Item>) {
 
   data class Item(
     val name: String,
diff --git a/playback/src/main/kotlin/voice/playback/misc/VolumeGain.kt b/playback/src/main/kotlin/voice/playback/misc/VolumeGain.kt
index c75235dcfd..b412a2b995 100644
--- a/playback/src/main/kotlin/voice/playback/misc/VolumeGain.kt
+++ b/playback/src/main/kotlin/voice/playback/misc/VolumeGain.kt
@@ -97,9 +97,7 @@ class VolumeGainSetter
 
 @Singleton
 class VolumeGain
-@Inject constructor(
-  private val volumeGainSetter: VolumeGainSetter,
-) {
+@Inject constructor(private val volumeGainSetter: VolumeGainSetter) {
 
   var gain: Decibel by Delegates.observable(Decibel(0F)) { _, _, _ -> updateLoudnessEnhancer() }
   var audioSessionId: Int? by Delegates.observable(null) { _, _, _ -> updateLoudnessEnhancer() }
diff --git a/playback/src/main/kotlin/voice/playback/player/DurationInconsistenciesUpdater.kt b/playback/src/main/kotlin/voice/playback/player/DurationInconsistenciesUpdater.kt
index 0a2dc3b72d..be0d206e88 100644
--- a/playback/src/main/kotlin/voice/playback/player/DurationInconsistenciesUpdater.kt
+++ b/playback/src/main/kotlin/voice/playback/player/DurationInconsistenciesUpdater.kt
@@ -10,9 +10,7 @@ import voice.playback.session.toMediaIdOrNull
 import javax.inject.Inject
 
 class DurationInconsistenciesUpdater
-@Inject constructor(
-  private val chapterRepo: ChapterRepo,
-) : Player.Listener {
+@Inject constructor(private val chapterRepo: ChapterRepo) : Player.Listener {
 
   private lateinit var player: Player
 
diff --git a/playback/src/main/kotlin/voice/playback/player/OnlyAudioRenderersFactory.kt b/playback/src/main/kotlin/voice/playback/player/OnlyAudioRenderersFactory.kt
index d37dda8606..aefca2bc75 100644
--- a/playback/src/main/kotlin/voice/playback/player/OnlyAudioRenderersFactory.kt
+++ b/playback/src/main/kotlin/voice/playback/player/OnlyAudioRenderersFactory.kt
@@ -12,9 +12,7 @@ import androidx.media3.exoplayer.video.VideoRendererEventListener
 import javax.inject.Inject
 
 class OnlyAudioRenderersFactory
-@Inject constructor(
-  context: Context,
-) : DefaultRenderersFactory(context) {
+@Inject constructor(context: Context) : DefaultRenderersFactory(context) {
 
   override fun buildVideoRenderers(
     context: Context,
diff --git a/playback/src/main/kotlin/voice/playback/playstate/PlayStateDelegatingListener.kt b/playback/src/main/kotlin/voice/playback/playstate/PlayStateDelegatingListener.kt
index 3951d5fea0..8b670de9f0 100644
--- a/playback/src/main/kotlin/voice/playback/playstate/PlayStateDelegatingListener.kt
+++ b/playback/src/main/kotlin/voice/playback/playstate/PlayStateDelegatingListener.kt
@@ -4,9 +4,7 @@ import androidx.media3.common.Player
 import javax.inject.Inject
 
 class PlayStateDelegatingListener
-@Inject constructor(
-  private val playStateManager: PlayStateManager,
-) : Player.Listener {
+@Inject constructor(private val playStateManager: PlayStateManager) : Player.Listener {
 
   private lateinit var player: Player
 
diff --git a/playback/src/main/kotlin/voice/playback/session/ImageFileProvider.kt b/playback/src/main/kotlin/voice/playback/session/ImageFileProvider.kt
index 8964deffcf..0db8fcca61 100644
--- a/playback/src/main/kotlin/voice/playback/session/ImageFileProvider.kt
+++ b/playback/src/main/kotlin/voice/playback/session/ImageFileProvider.kt
@@ -8,9 +8,7 @@ import java.io.File
 import javax.inject.Inject
 
 class ImageFileProvider
-@Inject constructor(
-  private val application: Application,
-) {
+@Inject constructor(private val application: Application) {
 
   internal fun uri(file: File): Uri {
     return FileProvider
diff --git a/playback/src/main/kotlin/voice/playback/session/SleepTimerCommandUpdater.kt b/playback/src/main/kotlin/voice/playback/session/SleepTimerCommandUpdater.kt
index 5c0cf1ebe1..c7125e5a03 100644
--- a/playback/src/main/kotlin/voice/playback/session/SleepTimerCommandUpdater.kt
+++ b/playback/src/main/kotlin/voice/playback/session/SleepTimerCommandUpdater.kt
@@ -8,9 +8,7 @@ import javax.inject.Inject
 import voice.strings.R as StringsR
 
 class SleepTimerCommandUpdater
-@Inject constructor(
-  private val context: Context,
-) {
+@Inject constructor(private val context: Context) {
 
   fun update(
     session: MediaSession,
diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewState.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewState.kt
index fb0a550b61..cf44031126 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewState.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewState.kt
@@ -28,9 +28,7 @@ data class BookPlayViewState(
 }
 
 internal sealed interface BookPlayDialogViewState {
-  data class SpeedDialog(
-    val speed: Float,
-  ) : BookPlayDialogViewState {
+  data class SpeedDialog(val speed: Float) : BookPlayDialogViewState {
 
     val maxSpeed: Float get() = if (speed < 2F) 2F else 3.5F
   }
@@ -47,7 +45,5 @@ internal sealed interface BookPlayDialogViewState {
   ) : BookPlayDialogViewState
 
   @JvmInline
-  value class SleepTimer(
-    val viewState: SleepTimerViewState,
-  ) : BookPlayDialogViewState
+  value class SleepTimer(val viewState: SleepTimerViewState) : BookPlayDialogViewState
 }
diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/batteryOptimization/IsIgnoringBatteryOptimizations.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/batteryOptimization/IsIgnoringBatteryOptimizations.kt
index 1d7fa5ba47..9fa7ad297b 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/batteryOptimization/IsIgnoringBatteryOptimizations.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/batteryOptimization/IsIgnoringBatteryOptimizations.kt
@@ -13,9 +13,7 @@ fun interface IsIgnoringBatteryOptimizations {
 
 @ContributesBinding(AppScope::class)
 class IsIgnoringBatteryOptimizationsImpl
-@Inject constructor(
-  private val context: Application,
-) : IsIgnoringBatteryOptimizations {
+@Inject constructor(private val context: Application) : IsIgnoringBatteryOptimizations {
   override fun invoke(): Boolean {
     val powerManager = context.getSystemService<PowerManager>()
       ?: return true
diff --git a/review/play/src/main/kotlin/voice/review/InstallationTimeProvider.kt b/review/play/src/main/kotlin/voice/review/InstallationTimeProvider.kt
index da5b3dbc67..a1ca0a3a08 100644
--- a/review/play/src/main/kotlin/voice/review/InstallationTimeProvider.kt
+++ b/review/play/src/main/kotlin/voice/review/InstallationTimeProvider.kt
@@ -7,9 +7,7 @@ import java.time.Instant
 import javax.inject.Inject
 
 class InstallationTimeProvider
-@Inject constructor(
-  private val context: Context,
-) {
+@Inject constructor(private val context: Context) {
 
   internal fun installationTime(): Instant {
     val packageManager = context.packageManager
diff --git a/review/play/src/main/kotlin/voice/review/ReviewTranslated.kt b/review/play/src/main/kotlin/voice/review/ReviewTranslated.kt
index 41d4037093..54741ca3c9 100644
--- a/review/play/src/main/kotlin/voice/review/ReviewTranslated.kt
+++ b/review/play/src/main/kotlin/voice/review/ReviewTranslated.kt
@@ -4,9 +4,7 @@ import android.content.Context
 import javax.inject.Inject
 
 class ReviewTranslated
-@Inject constructor(
-  private val context: Context,
-) {
+@Inject constructor(private val context: Context) {
 
   fun translated(): Boolean {
     val language = context.resources.configuration.locales[0].language.lowercase()
diff --git a/scanner/src/main/kotlin/voice/app/scanner/DeviceHasStoragePermissionBug.kt b/scanner/src/main/kotlin/voice/app/scanner/DeviceHasStoragePermissionBug.kt
index f4c5a3b706..da33e8a01b 100644
--- a/scanner/src/main/kotlin/voice/app/scanner/DeviceHasStoragePermissionBug.kt
+++ b/scanner/src/main/kotlin/voice/app/scanner/DeviceHasStoragePermissionBug.kt
@@ -13,9 +13,7 @@ import javax.inject.Singleton
 
 @Singleton
 class DeviceHasStoragePermissionBug
-@Inject constructor(
-  private val context: Context,
-) {
+@Inject constructor(private val context: Context) {
 
   private val _hasBug = MutableStateFlow(false)
   val hasBug: StateFlow<Boolean> get() = _hasBug
diff --git a/scanner/src/main/kotlin/voice/app/scanner/FFProbeAnalyze.kt b/scanner/src/main/kotlin/voice/app/scanner/FFProbeAnalyze.kt
index f629c878b8..05a1f0262b 100644
--- a/scanner/src/main/kotlin/voice/app/scanner/FFProbeAnalyze.kt
+++ b/scanner/src/main/kotlin/voice/app/scanner/FFProbeAnalyze.kt
@@ -9,9 +9,7 @@ import voice.logging.core.Logger
 import javax.inject.Inject
 
 class FFProbeAnalyze
-@Inject constructor(
-  private val context: Context,
-) {
+@Inject constructor(private val context: Context) {
 
   private val json = Json {
     ignoreUnknownKeys = true
diff --git a/scanner/src/main/kotlin/voice/app/scanner/MediaAnalyzer.kt b/scanner/src/main/kotlin/voice/app/scanner/MediaAnalyzer.kt
index 53d5950fe3..d3c1ca62aa 100644
--- a/scanner/src/main/kotlin/voice/app/scanner/MediaAnalyzer.kt
+++ b/scanner/src/main/kotlin/voice/app/scanner/MediaAnalyzer.kt
@@ -8,9 +8,7 @@ import javax.inject.Inject
 import kotlin.time.Duration.Companion.seconds
 
 class MediaAnalyzer
-@Inject constructor(
-  private val ffProbeAnalyze: FFProbeAnalyze,
-) {
+@Inject constructor(private val ffProbeAnalyze: FFProbeAnalyze) {
 
   suspend fun analyze(file: CachedDocumentFile): Metadata? {
     val result = ffProbeAnalyze.analyze(file) ?: return null
diff --git a/scanner/src/main/kotlin/voice/app/scanner/Metadata.kt b/scanner/src/main/kotlin/voice/app/scanner/Metadata.kt
index 234cbfd2d3..846256f5b1 100644
--- a/scanner/src/main/kotlin/voice/app/scanner/Metadata.kt
+++ b/scanner/src/main/kotlin/voice/app/scanner/Metadata.kt
@@ -41,9 +41,7 @@ internal fun Map<String, String>.find(tagType: TagType): String? {
 }
 
 @Serializable
-internal data class MetaDataStream(
-  val tags: Map<String, String>? = null,
-)
+internal data class MetaDataStream(val tags: Map<String, String>? = null)
 
 @Serializable
 internal data class MetaDataChapter(
diff --git a/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimerViewState.kt b/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimerViewState.kt
index eb1db71bc9..8dbe08c962 100644
--- a/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimerViewState.kt
+++ b/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimerViewState.kt
@@ -1,5 +1,3 @@
 package voice.sleepTimer
 
-data class SleepTimerViewState(
-  val customSleepTime: Int,
-)
+data class SleepTimerViewState(val customSleepTime: Int)

From 9b8977a1213e63c9c083451d05153bab05751bc5 Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Sun, 22 Sep 2024 20:37:06 +0200
Subject: [PATCH 138/236] mend

---
 .editorconfig                                 |  2 +-
 .../bookOverview/EditCoverDialogController.kt |  4 ++-
 .../misc/MainActivityIntentProviderImpl.kt    |  4 ++-
 .../bottomSheet/BottomSheetViewModel.kt       |  4 ++-
 .../bottomSheet/EditBookBottomSheetState.kt   |  4 ++-
 .../EditBookCategoryViewModel.kt              |  4 ++-
 .../editTitle/EditBookTitleViewModel.kt       |  4 ++-
 .../fileCover/FileCoverViewModel.kt           |  4 ++-
 .../internetCover/InternetCoverViewModel.kt   |  4 ++-
 .../voice/bookmark/BookmarkController.kt      |  4 ++-
 common/src/main/kotlin/voice/common/BookId.kt |  4 ++-
 .../voice/common/compose/ComposeController.kt |  4 ++-
 .../voice/common/compose/ImmutableFile.kt     |  4 ++-
 .../kotlin/voice/common/compose/ViewModel.kt  |  4 ++-
 .../common/conductor/DialogController.kt      |  4 ++-
 .../kotlin/voice/common/grid/GridCount.kt     |  4 ++-
 .../common/navigation/NavigationCommand.kt    | 28 ++++++++++++++-----
 .../cover/SelectCoverFromInternetViewModel.kt | 16 ++++++++---
 .../main/kotlin/voice/cover/api/CoverApi.kt   |  4 ++-
 .../main/kotlin/voice/data/BookComparator.kt  |  4 ++-
 data/src/main/kotlin/voice/data/Bookmark.kt   |  4 ++-
 data/src/main/kotlin/voice/data/ChapterId.kt  |  4 ++-
 .../kotlin/voice/data/repo/BookContentRepo.kt |  4 ++-
 .../kotlin/voice/data/repo/ChapterRepo.kt     |  4 ++-
 .../migrations/IncrementalMigration.kt        |  4 ++-
 .../documentfile/FileBasedDocumentFile.kt     |  4 ++-
 .../RealCachedDocumentFileFactory.kt          |  4 ++-
 .../folderPicker/FolderPickerViewState.kt     |  4 ++-
 .../kotlin/voice/playback/misc/Decibel.kt     |  4 ++-
 .../kotlin/voice/playback/misc/VolumeGain.kt  |  4 ++-
 .../player/DurationInconsistenciesUpdater.kt  |  4 ++-
 .../player/OnlyAudioRenderersFactory.kt       |  4 ++-
 .../playstate/PlayStateDelegatingListener.kt  |  4 ++-
 .../voice/playback/session/CustomCommand.kt   |  8 ++++--
 .../playback/session/ImageFileProvider.kt     |  4 ++-
 .../kotlin/voice/playback/session/MediaId.kt  |  4 ++-
 .../session/SleepTimerCommandUpdater.kt       |  4 ++-
 .../session/VoiceMediaNotificationProvider.kt |  4 ++-
 .../session/search/BookSearchHandlerTest.kt   |  4 ++-
 .../playbackScreen/BookPlayController.kt      |  4 ++-
 .../voice/playbackScreen/BookPlayViewState.kt |  8 ++++--
 .../IsIgnoringBatteryOptimizations.kt         |  4 ++-
 .../BatteryOptimizationTest.kt                |  4 ++-
 .../voice/review/InstallationTimeProvider.kt  |  4 ++-
 .../kotlin/voice/review/ReviewTranslated.kt   |  4 ++-
 .../scanner/DeviceHasStoragePermissionBug.kt  |  4 ++-
 .../voice/app/scanner/FFProbeAnalyze.kt       |  4 ++-
 .../kotlin/voice/app/scanner/MediaAnalyzer.kt |  4 ++-
 .../main/kotlin/voice/app/scanner/Metadata.kt |  8 ++++--
 .../kotlin/voice/search/BookSearchTest.kt     |  4 ++-
 .../kotlin/voice/sleepTimer/ShakeDetector.kt  |  4 ++-
 .../voice/sleepTimer/SleepTimerViewState.kt   |  4 ++-
 52 files changed, 190 insertions(+), 64 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 3dd3f63e7f..2c1d0d4b90 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -15,7 +15,7 @@ ktlint_standard_backing-property-naming = disabled
 ktlint_code_style = intellij_idea
 ktlint_standard_function-expression-body = disabled
 ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 2
-ktlint_class_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 2
+ktlint_class_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 1
 ktlint_compose_parameter-naming = disabled
 ij_java_class_count_to_use_import_on_demand = 999
 ij_kotlin_allow_trailing_comma = true
diff --git a/app/src/main/kotlin/voice/app/features/bookOverview/EditCoverDialogController.kt b/app/src/main/kotlin/voice/app/features/bookOverview/EditCoverDialogController.kt
index 7c9ba5893e..155ac96507 100644
--- a/app/src/main/kotlin/voice/app/features/bookOverview/EditCoverDialogController.kt
+++ b/app/src/main/kotlin/voice/app/features/bookOverview/EditCoverDialogController.kt
@@ -29,7 +29,9 @@ import voice.strings.R as StringsR
 
 private const val NI_ARGS = "ni#bundle"
 
-class EditCoverDialogController(bundle: Bundle) : DialogController(bundle) {
+class EditCoverDialogController(
+  bundle: Bundle,
+) : DialogController(bundle) {
 
   constructor(args: Arguments) : this(
     Bundle().apply {
diff --git a/app/src/main/kotlin/voice/app/misc/MainActivityIntentProviderImpl.kt b/app/src/main/kotlin/voice/app/misc/MainActivityIntentProviderImpl.kt
index 17c06a0b56..4d58dda952 100644
--- a/app/src/main/kotlin/voice/app/misc/MainActivityIntentProviderImpl.kt
+++ b/app/src/main/kotlin/voice/app/misc/MainActivityIntentProviderImpl.kt
@@ -7,7 +7,9 @@ import voice.playback.notification.MainActivityIntentProvider
 import javax.inject.Inject
 
 class MainActivityIntentProviderImpl
-@Inject constructor(private val context: Context) : MainActivityIntentProvider {
+@Inject constructor(
+  private val context: Context,
+) : MainActivityIntentProvider {
 
   override fun toCurrentBook(): PendingIntent {
     val intent = MainActivity.goToBookIntent(context)
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetViewModel.kt
index ebdcc310ce..5da211230b 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetViewModel.kt
@@ -11,7 +11,9 @@ import javax.inject.Inject
 
 @BookOverviewScope
 class BottomSheetViewModel
-@Inject constructor(private val viewModels: Set<@JvmSuppressWildcards BottomSheetItemViewModel>) {
+@Inject constructor(
+  private val viewModels: Set<@JvmSuppressWildcards BottomSheetItemViewModel>,
+) {
 
   private val scope = MainScope()
 
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/EditBookBottomSheetState.kt b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/EditBookBottomSheetState.kt
index ae6b556650..37275eaf03 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/EditBookBottomSheetState.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/EditBookBottomSheetState.kt
@@ -12,7 +12,9 @@ import androidx.compose.material.icons.outlined.Title
 import androidx.compose.ui.graphics.vector.ImageVector
 import voice.strings.R as StringsR
 
-internal data class EditBookBottomSheetState(val items: List<BottomSheetItem>)
+internal data class EditBookBottomSheetState(
+  val items: List<BottomSheetItem>,
+)
 
 enum class BottomSheetItem(
   @StringRes val titleRes: Int,
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/editBookCategory/EditBookCategoryViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/editBookCategory/EditBookCategoryViewModel.kt
index 926f959805..d5bb5dc9f5 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/editBookCategory/EditBookCategoryViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/editBookCategory/EditBookCategoryViewModel.kt
@@ -18,7 +18,9 @@ import javax.inject.Inject
 )
 class EditBookCategoryViewModel
 @Inject
-constructor(private val repo: BookRepository) : BottomSheetItemViewModel {
+constructor(
+  private val repo: BookRepository,
+) : BottomSheetItemViewModel {
 
   override suspend fun items(bookId: BookId): List<BottomSheetItem> {
     val book = repo.get(bookId) ?: return emptyList()
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/editTitle/EditBookTitleViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/editTitle/EditBookTitleViewModel.kt
index f4e46ecdbf..8f3b7a2bb8 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/editTitle/EditBookTitleViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/editTitle/EditBookTitleViewModel.kt
@@ -19,7 +19,9 @@ import javax.inject.Inject
 )
 class EditBookTitleViewModel
 @Inject
-constructor(private val repo: BookRepository) : BottomSheetItemViewModel {
+constructor(
+  private val repo: BookRepository,
+) : BottomSheetItemViewModel {
 
   private val scope = MainScope()
 
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/fileCover/FileCoverViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/fileCover/FileCoverViewModel.kt
index 84aea92256..308a04ce99 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/fileCover/FileCoverViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/fileCover/FileCoverViewModel.kt
@@ -14,7 +14,9 @@ import javax.inject.Inject
 @ContributesMultibinding(BookOverviewScope::class, boundType = BottomSheetItemViewModel::class)
 class FileCoverViewModel
 @Inject
-constructor(private val navigator: Navigator) : BottomSheetItemViewModel {
+constructor(
+  private val navigator: Navigator,
+) : BottomSheetItemViewModel {
 
   private var bookId: BookId? = null
 
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/internetCover/InternetCoverViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/internetCover/InternetCoverViewModel.kt
index 057da039d5..9accc6bf2f 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/internetCover/InternetCoverViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/internetCover/InternetCoverViewModel.kt
@@ -13,7 +13,9 @@ import javax.inject.Inject
 @ContributesMultibinding(BookOverviewScope::class)
 class InternetCoverViewModel
 @Inject
-constructor(private val navigator: Navigator) : BottomSheetItemViewModel {
+constructor(
+  private val navigator: Navigator,
+) : BottomSheetItemViewModel {
 
   override suspend fun items(bookId: BookId): List<BottomSheetItem> {
     return listOf(BottomSheetItem.InternetCover)
diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
index 2d48e4637a..d4d77613f6 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
@@ -10,7 +10,9 @@ import voice.data.putBookId
 private const val NI_BOOK_ID = "ni#bookId"
 
 @Suppress("unused")
-class BookmarkController(args: Bundle) : ComposeController(args) {
+class BookmarkController(
+  args: Bundle,
+) : ComposeController(args) {
 
   constructor(bookId: BookId) : this(
     Bundle().apply {
diff --git a/common/src/main/kotlin/voice/common/BookId.kt b/common/src/main/kotlin/voice/common/BookId.kt
index a4caaa858c..1a1eab40f3 100644
--- a/common/src/main/kotlin/voice/common/BookId.kt
+++ b/common/src/main/kotlin/voice/common/BookId.kt
@@ -14,7 +14,9 @@ import kotlinx.serialization.encoding.Encoder
 
 @Serializable(with = BookIdSerializer::class)
 @Parcelize
-data class BookId(val value: String) : Parcelable {
+data class BookId(
+  val value: String,
+) : Parcelable {
 
   constructor(uri: Uri) : this(uri.toString())
 
diff --git a/common/src/main/kotlin/voice/common/compose/ComposeController.kt b/common/src/main/kotlin/voice/common/compose/ComposeController.kt
index 678470bb30..16313d6287 100644
--- a/common/src/main/kotlin/voice/common/compose/ComposeController.kt
+++ b/common/src/main/kotlin/voice/common/compose/ComposeController.kt
@@ -8,7 +8,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.ComposeView
 import com.bluelinelabs.conductor.Controller
 
-abstract class ComposeController(args: Bundle = Bundle()) : Controller(args) {
+abstract class ComposeController(
+  args: Bundle = Bundle(),
+) : Controller(args) {
 
   final override fun onCreateView(
     inflater: LayoutInflater,
diff --git a/common/src/main/kotlin/voice/common/compose/ImmutableFile.kt b/common/src/main/kotlin/voice/common/compose/ImmutableFile.kt
index dabad98f70..25a21f5905 100644
--- a/common/src/main/kotlin/voice/common/compose/ImmutableFile.kt
+++ b/common/src/main/kotlin/voice/common/compose/ImmutableFile.kt
@@ -4,4 +4,6 @@ import androidx.compose.runtime.Immutable
 import java.io.File
 
 @Immutable
-data class ImmutableFile(val file: File)
+data class ImmutableFile(
+  val file: File,
+)
diff --git a/common/src/main/kotlin/voice/common/compose/ViewModel.kt b/common/src/main/kotlin/voice/common/compose/ViewModel.kt
index cef0e079ab..9f9e1708ea 100644
--- a/common/src/main/kotlin/voice/common/compose/ViewModel.kt
+++ b/common/src/main/kotlin/voice/common/compose/ViewModel.kt
@@ -5,7 +5,9 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewmodel.compose.viewModel
 
 @PublishedApi
-internal class HoldingViewModel<T>(val value: T) : ViewModel()
+internal class HoldingViewModel<T>(
+  val value: T,
+) : ViewModel()
 
 @Composable
 inline fun <reified T> rememberScoped(
diff --git a/common/src/main/kotlin/voice/common/conductor/DialogController.kt b/common/src/main/kotlin/voice/common/conductor/DialogController.kt
index 702c219330..11ea9e0367 100644
--- a/common/src/main/kotlin/voice/common/conductor/DialogController.kt
+++ b/common/src/main/kotlin/voice/common/conductor/DialogController.kt
@@ -18,7 +18,9 @@ private const val SI_DIALOG = "android:savedDialogState"
 /**
  * A wrapper that wraps a dialog in a controller
  */
-abstract class DialogController(args: Bundle = Bundle()) : Controller(args) {
+abstract class DialogController(
+  args: Bundle = Bundle(),
+) : Controller(args) {
 
   private var dialog: Dialog? = null
   private var dismissed = false
diff --git a/common/src/main/kotlin/voice/common/grid/GridCount.kt b/common/src/main/kotlin/voice/common/grid/GridCount.kt
index 3c7d98db79..7b97f27bc5 100644
--- a/common/src/main/kotlin/voice/common/grid/GridCount.kt
+++ b/common/src/main/kotlin/voice/common/grid/GridCount.kt
@@ -4,7 +4,9 @@ import android.content.Context
 import javax.inject.Inject
 
 class GridCount
-@Inject constructor(private val context: Context) {
+@Inject constructor(
+  private val context: Context,
+) {
 
   fun useGridAsDefault(): Boolean {
     val displayMetrics = context.resources.displayMetrics
diff --git a/common/src/main/kotlin/voice/common/navigation/NavigationCommand.kt b/common/src/main/kotlin/voice/common/navigation/NavigationCommand.kt
index e6e296c996..5b8b4af6b3 100644
--- a/common/src/main/kotlin/voice/common/navigation/NavigationCommand.kt
+++ b/common/src/main/kotlin/voice/common/navigation/NavigationCommand.kt
@@ -14,22 +14,34 @@ sealed interface NavigationCommand {
     val replace: Boolean,
   ) : NavigationCommand
 
-  data class Execute(val action: (NavController<Destination.Compose>) -> Unit) : NavigationCommand
+  data class Execute(
+    val action: (NavController<Destination.Compose>) -> Unit,
+  ) : NavigationCommand
 }
 
 sealed interface Destination {
-  data class Playback(val bookId: BookId) : Destination
-  data class Bookmarks(val bookId: BookId) : Destination
+  data class Playback(
+    val bookId: BookId,
+  ) : Destination
+  data class Bookmarks(
+    val bookId: BookId,
+  ) : Destination
 
   @Parcelize
-  data class CoverFromInternet(val bookId: BookId) : Compose
-  data class Website(val url: String) : Destination
+  data class CoverFromInternet(
+    val bookId: BookId,
+  ) : Compose
+  data class Website(
+    val url: String,
+  ) : Destination
   data class EditCover(
     val bookId: BookId,
     val cover: Uri,
   ) : Destination
 
-  data class Activity(val intent: Intent) : Destination
+  data class Activity(
+    val intent: Intent,
+  ) : Destination
 
   sealed interface Compose :
     Destination,
@@ -69,7 +81,9 @@ sealed interface Destination {
   object OnboardingExplanation : Compose
 
   @Parcelize
-  data class AddContent(val mode: Mode) : Compose {
+  data class AddContent(
+    val mode: Mode,
+  ) : Compose {
 
     enum class Mode {
       Default,
diff --git a/cover/src/main/kotlin/voice/cover/SelectCoverFromInternetViewModel.kt b/cover/src/main/kotlin/voice/cover/SelectCoverFromInternetViewModel.kt
index 90dbbe2efb..f06fb9e37e 100644
--- a/cover/src/main/kotlin/voice/cover/SelectCoverFromInternetViewModel.kt
+++ b/cover/src/main/kotlin/voice/cover/SelectCoverFromInternetViewModel.kt
@@ -106,8 +106,12 @@ class SelectCoverFromInternetViewModel
 
     val query: String
 
-    data class Loading(override val query: String) : ViewState
-    data class Error(override val query: String) : ViewState
+    data class Loading(
+      override val query: String,
+    ) : ViewState
+    data class Error(
+      override val query: String,
+    ) : ViewState
     data class Content(
       val items: LazyPagingItems<SearchResponse.ImageResult>,
       override val query: String,
@@ -116,8 +120,12 @@ class SelectCoverFromInternetViewModel
 
   internal sealed interface Events {
     data object Retry : Events
-    data class CoverClick(val cover: SearchResponse.ImageResult) : Events
-    data class QueryChange(val query: String) : Events
+    data class CoverClick(
+      val cover: SearchResponse.ImageResult,
+    ) : Events
+    data class QueryChange(
+      val query: String,
+    ) : Events
   }
 
   @AssistedFactory
diff --git a/cover/src/main/kotlin/voice/cover/api/CoverApi.kt b/cover/src/main/kotlin/voice/cover/api/CoverApi.kt
index 7f0519f775..86f7924a34 100644
--- a/cover/src/main/kotlin/voice/cover/api/CoverApi.kt
+++ b/cover/src/main/kotlin/voice/cover/api/CoverApi.kt
@@ -4,7 +4,9 @@ import voice.logging.core.Logger
 import javax.inject.Inject
 
 class CoverApi
-@Inject constructor(private val api: InternalCoverApi) {
+@Inject constructor(
+  private val api: InternalCoverApi,
+) {
 
   internal suspend fun token(query: String): String? {
     Logger.d("query token")
diff --git a/data/src/main/kotlin/voice/data/BookComparator.kt b/data/src/main/kotlin/voice/data/BookComparator.kt
index e10d7012ad..a2829d4ce0 100644
--- a/data/src/main/kotlin/voice/data/BookComparator.kt
+++ b/data/src/main/kotlin/voice/data/BookComparator.kt
@@ -2,7 +2,9 @@ package voice.data
 
 import voice.common.comparator.NaturalOrderComparator
 
-enum class BookComparator(private val comparatorFunction: Comparator<Book>) : Comparator<Book> by comparatorFunction {
+enum class BookComparator(
+  private val comparatorFunction: Comparator<Book>,
+) : Comparator<Book> by comparatorFunction {
 
   ByLastPlayed(
     compareByDescending {
diff --git a/data/src/main/kotlin/voice/data/Bookmark.kt b/data/src/main/kotlin/voice/data/Bookmark.kt
index 4fa1f36b07..71ec490314 100644
--- a/data/src/main/kotlin/voice/data/Bookmark.kt
+++ b/data/src/main/kotlin/voice/data/Bookmark.kt
@@ -19,7 +19,9 @@ data class Bookmark(
   val id: Id,
 ) {
 
-  data class Id(val value: UUID) {
+  data class Id(
+    val value: UUID,
+  ) {
     companion object {
       fun random(): Id = Id(UUID.randomUUID())
     }
diff --git a/data/src/main/kotlin/voice/data/ChapterId.kt b/data/src/main/kotlin/voice/data/ChapterId.kt
index 510aaee16c..438b189297 100644
--- a/data/src/main/kotlin/voice/data/ChapterId.kt
+++ b/data/src/main/kotlin/voice/data/ChapterId.kt
@@ -6,7 +6,9 @@ import kotlinx.serialization.Serializable
 import voice.common.comparator.NaturalOrderComparator
 
 @Serializable(with = ChapterIdSerializer::class)
-data class ChapterId(val value: String) : Comparable<ChapterId> {
+data class ChapterId(
+  val value: String,
+) : Comparable<ChapterId> {
   constructor(uri: Uri) : this(uri.toString())
 
   override fun compareTo(other: ChapterId): Int {
diff --git a/data/src/main/kotlin/voice/data/repo/BookContentRepo.kt b/data/src/main/kotlin/voice/data/repo/BookContentRepo.kt
index 4e37946e1e..9ee4ed41d0 100644
--- a/data/src/main/kotlin/voice/data/repo/BookContentRepo.kt
+++ b/data/src/main/kotlin/voice/data/repo/BookContentRepo.kt
@@ -18,7 +18,9 @@ import javax.inject.Singleton
 
 @Singleton
 class BookContentRepo
-@Inject constructor(private val dao: BookContentDao) {
+@Inject constructor(
+  private val dao: BookContentDao,
+) {
 
   private val cacheMutex = Mutex()
   private var cacheFilled = false
diff --git a/data/src/main/kotlin/voice/data/repo/ChapterRepo.kt b/data/src/main/kotlin/voice/data/repo/ChapterRepo.kt
index be4b7f015d..663808dff8 100644
--- a/data/src/main/kotlin/voice/data/repo/ChapterRepo.kt
+++ b/data/src/main/kotlin/voice/data/repo/ChapterRepo.kt
@@ -10,7 +10,9 @@ import javax.inject.Singleton
 
 @Singleton
 class ChapterRepo
-@Inject constructor(private val dao: ChapterDao) {
+@Inject constructor(
+  private val dao: ChapterDao,
+) {
 
   private val cache = mutableMapOf<ChapterId, Chapter?>()
 
diff --git a/data/src/main/kotlin/voice/data/repo/internals/migrations/IncrementalMigration.kt b/data/src/main/kotlin/voice/data/repo/internals/migrations/IncrementalMigration.kt
index c2534d1061..749a87f3ce 100644
--- a/data/src/main/kotlin/voice/data/repo/internals/migrations/IncrementalMigration.kt
+++ b/data/src/main/kotlin/voice/data/repo/internals/migrations/IncrementalMigration.kt
@@ -2,4 +2,6 @@ package voice.data.repo.internals.migrations
 
 import androidx.room.migration.Migration
 
-abstract class IncrementalMigration(from: Int) : Migration(from, from + 1)
+abstract class IncrementalMigration(
+  from: Int,
+) : Migration(from, from + 1)
diff --git a/documentfile/src/main/kotlin/voice/documentfile/FileBasedDocumentFile.kt b/documentfile/src/main/kotlin/voice/documentfile/FileBasedDocumentFile.kt
index fbf90a4c4c..1e96c62704 100644
--- a/documentfile/src/main/kotlin/voice/documentfile/FileBasedDocumentFile.kt
+++ b/documentfile/src/main/kotlin/voice/documentfile/FileBasedDocumentFile.kt
@@ -5,7 +5,9 @@ import androidx.core.net.toFile
 import androidx.core.net.toUri
 import java.io.File
 
-data class FileBasedDocumentFile(private val file: File) : CachedDocumentFile {
+data class FileBasedDocumentFile(
+  private val file: File,
+) : CachedDocumentFile {
 
   override val children: List<CachedDocumentFile> get() = file.listFiles()?.map { FileBasedDocumentFile(it) } ?: emptyList()
   override val name: String? get() = file.name
diff --git a/documentfile/src/main/kotlin/voice/documentfile/RealCachedDocumentFileFactory.kt b/documentfile/src/main/kotlin/voice/documentfile/RealCachedDocumentFileFactory.kt
index 6c040004ca..742d9262e5 100644
--- a/documentfile/src/main/kotlin/voice/documentfile/RealCachedDocumentFileFactory.kt
+++ b/documentfile/src/main/kotlin/voice/documentfile/RealCachedDocumentFileFactory.kt
@@ -8,7 +8,9 @@ import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
 class RealCachedDocumentFileFactory
-@Inject constructor(private val context: Context) : CachedDocumentFileFactory {
+@Inject constructor(
+  private val context: Context,
+) : CachedDocumentFileFactory {
   override fun create(uri: Uri): CachedDocumentFile {
     return RealCachedDocumentFile(context = context, uri = uri, preFilledContent = null)
   }
diff --git a/folderPicker/src/main/kotlin/voice/folderPicker/folderPicker/FolderPickerViewState.kt b/folderPicker/src/main/kotlin/voice/folderPicker/folderPicker/FolderPickerViewState.kt
index f4a4400d69..9be1aabdcf 100644
--- a/folderPicker/src/main/kotlin/voice/folderPicker/folderPicker/FolderPickerViewState.kt
+++ b/folderPicker/src/main/kotlin/voice/folderPicker/folderPicker/FolderPickerViewState.kt
@@ -3,7 +3,9 @@ package voice.folderPicker.folderPicker
 import android.net.Uri
 import voice.data.folders.FolderType
 
-data class FolderPickerViewState(val items: List<Item>) {
+data class FolderPickerViewState(
+  val items: List<Item>,
+) {
 
   data class Item(
     val name: String,
diff --git a/playback/src/main/kotlin/voice/playback/misc/Decibel.kt b/playback/src/main/kotlin/voice/playback/misc/Decibel.kt
index a052da2ded..fcfc6aa33c 100644
--- a/playback/src/main/kotlin/voice/playback/misc/Decibel.kt
+++ b/playback/src/main/kotlin/voice/playback/misc/Decibel.kt
@@ -4,7 +4,9 @@ import kotlinx.serialization.Serializable
 
 @JvmInline
 @Serializable
-value class Decibel(val value: Float) {
+value class Decibel(
+  val value: Float,
+) {
 
   val milliBel: Int get() = (value * 100).toInt()
 
diff --git a/playback/src/main/kotlin/voice/playback/misc/VolumeGain.kt b/playback/src/main/kotlin/voice/playback/misc/VolumeGain.kt
index b412a2b995..c75235dcfd 100644
--- a/playback/src/main/kotlin/voice/playback/misc/VolumeGain.kt
+++ b/playback/src/main/kotlin/voice/playback/misc/VolumeGain.kt
@@ -97,7 +97,9 @@ class VolumeGainSetter
 
 @Singleton
 class VolumeGain
-@Inject constructor(private val volumeGainSetter: VolumeGainSetter) {
+@Inject constructor(
+  private val volumeGainSetter: VolumeGainSetter,
+) {
 
   var gain: Decibel by Delegates.observable(Decibel(0F)) { _, _, _ -> updateLoudnessEnhancer() }
   var audioSessionId: Int? by Delegates.observable(null) { _, _, _ -> updateLoudnessEnhancer() }
diff --git a/playback/src/main/kotlin/voice/playback/player/DurationInconsistenciesUpdater.kt b/playback/src/main/kotlin/voice/playback/player/DurationInconsistenciesUpdater.kt
index be0d206e88..0a2dc3b72d 100644
--- a/playback/src/main/kotlin/voice/playback/player/DurationInconsistenciesUpdater.kt
+++ b/playback/src/main/kotlin/voice/playback/player/DurationInconsistenciesUpdater.kt
@@ -10,7 +10,9 @@ import voice.playback.session.toMediaIdOrNull
 import javax.inject.Inject
 
 class DurationInconsistenciesUpdater
-@Inject constructor(private val chapterRepo: ChapterRepo) : Player.Listener {
+@Inject constructor(
+  private val chapterRepo: ChapterRepo,
+) : Player.Listener {
 
   private lateinit var player: Player
 
diff --git a/playback/src/main/kotlin/voice/playback/player/OnlyAudioRenderersFactory.kt b/playback/src/main/kotlin/voice/playback/player/OnlyAudioRenderersFactory.kt
index aefca2bc75..d37dda8606 100644
--- a/playback/src/main/kotlin/voice/playback/player/OnlyAudioRenderersFactory.kt
+++ b/playback/src/main/kotlin/voice/playback/player/OnlyAudioRenderersFactory.kt
@@ -12,7 +12,9 @@ import androidx.media3.exoplayer.video.VideoRendererEventListener
 import javax.inject.Inject
 
 class OnlyAudioRenderersFactory
-@Inject constructor(context: Context) : DefaultRenderersFactory(context) {
+@Inject constructor(
+  context: Context,
+) : DefaultRenderersFactory(context) {
 
   override fun buildVideoRenderers(
     context: Context,
diff --git a/playback/src/main/kotlin/voice/playback/playstate/PlayStateDelegatingListener.kt b/playback/src/main/kotlin/voice/playback/playstate/PlayStateDelegatingListener.kt
index 8b670de9f0..3951d5fea0 100644
--- a/playback/src/main/kotlin/voice/playback/playstate/PlayStateDelegatingListener.kt
+++ b/playback/src/main/kotlin/voice/playback/playstate/PlayStateDelegatingListener.kt
@@ -4,7 +4,9 @@ import androidx.media3.common.Player
 import javax.inject.Inject
 
 class PlayStateDelegatingListener
-@Inject constructor(private val playStateManager: PlayStateManager) : Player.Listener {
+@Inject constructor(
+  private val playStateManager: PlayStateManager,
+) : Player.Listener {
 
   private lateinit var player: Player
 
diff --git a/playback/src/main/kotlin/voice/playback/session/CustomCommand.kt b/playback/src/main/kotlin/voice/playback/session/CustomCommand.kt
index b4237ce6bd..03e495992d 100644
--- a/playback/src/main/kotlin/voice/playback/session/CustomCommand.kt
+++ b/playback/src/main/kotlin/voice/playback/session/CustomCommand.kt
@@ -17,10 +17,14 @@ internal sealed interface CustomCommand {
   data object ForceSeekToPrevious : CustomCommand
 
   @Serializable
-  data class SetSkipSilence(val skipSilence: Boolean) : CustomCommand
+  data class SetSkipSilence(
+    val skipSilence: Boolean,
+  ) : CustomCommand
 
   @Serializable
-  data class SetGain(val gain: Decibel) : CustomCommand
+  data class SetGain(
+    val gain: Decibel,
+  ) : CustomCommand
 
   companion object {
 
diff --git a/playback/src/main/kotlin/voice/playback/session/ImageFileProvider.kt b/playback/src/main/kotlin/voice/playback/session/ImageFileProvider.kt
index 0db8fcca61..8964deffcf 100644
--- a/playback/src/main/kotlin/voice/playback/session/ImageFileProvider.kt
+++ b/playback/src/main/kotlin/voice/playback/session/ImageFileProvider.kt
@@ -8,7 +8,9 @@ import java.io.File
 import javax.inject.Inject
 
 class ImageFileProvider
-@Inject constructor(private val application: Application) {
+@Inject constructor(
+  private val application: Application,
+) {
 
   internal fun uri(file: File): Uri {
     return FileProvider
diff --git a/playback/src/main/kotlin/voice/playback/session/MediaId.kt b/playback/src/main/kotlin/voice/playback/session/MediaId.kt
index ad7bf13150..d99a3cae12 100644
--- a/playback/src/main/kotlin/voice/playback/session/MediaId.kt
+++ b/playback/src/main/kotlin/voice/playback/session/MediaId.kt
@@ -13,7 +13,9 @@ sealed interface MediaId {
 
   @Serializable
   @SerialName("book")
-  data class Book(val id: BookId) : MediaId
+  data class Book(
+    val id: BookId,
+  ) : MediaId
 
   @Serializable
   @SerialName("chapter")
diff --git a/playback/src/main/kotlin/voice/playback/session/SleepTimerCommandUpdater.kt b/playback/src/main/kotlin/voice/playback/session/SleepTimerCommandUpdater.kt
index c7125e5a03..5c0cf1ebe1 100644
--- a/playback/src/main/kotlin/voice/playback/session/SleepTimerCommandUpdater.kt
+++ b/playback/src/main/kotlin/voice/playback/session/SleepTimerCommandUpdater.kt
@@ -8,7 +8,9 @@ import javax.inject.Inject
 import voice.strings.R as StringsR
 
 class SleepTimerCommandUpdater
-@Inject constructor(private val context: Context) {
+@Inject constructor(
+  private val context: Context,
+) {
 
   fun update(
     session: MediaSession,
diff --git a/playback/src/main/kotlin/voice/playback/session/VoiceMediaNotificationProvider.kt b/playback/src/main/kotlin/voice/playback/session/VoiceMediaNotificationProvider.kt
index 0bf3e80703..6a3971a8bc 100644
--- a/playback/src/main/kotlin/voice/playback/session/VoiceMediaNotificationProvider.kt
+++ b/playback/src/main/kotlin/voice/playback/session/VoiceMediaNotificationProvider.kt
@@ -9,7 +9,9 @@ import com.google.common.collect.ImmutableList
 import javax.inject.Inject
 
 class VoiceMediaNotificationProvider
-@Inject constructor(context: Context) : DefaultMediaNotificationProvider(context) {
+@Inject constructor(
+  context: Context,
+) : DefaultMediaNotificationProvider(context) {
 
   override fun getMediaButtons(
     session: MediaSession,
diff --git a/playback/src/test/kotlin/voice/playback/session/search/BookSearchHandlerTest.kt b/playback/src/test/kotlin/voice/playback/session/search/BookSearchHandlerTest.kt
index 90bb5b28e8..edf99ad44f 100644
--- a/playback/src/test/kotlin/voice/playback/session/search/BookSearchHandlerTest.kt
+++ b/playback/src/test/kotlin/voice/playback/session/search/BookSearchHandlerTest.kt
@@ -134,7 +134,9 @@ private fun chapter(): Chapter {
   )
 }
 
-private class MemoryDataStore<T>(initial: T) : DataStore<T> {
+private class MemoryDataStore<T>(
+  initial: T,
+) : DataStore<T> {
 
   private val value = MutableStateFlow(initial)
 
diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayController.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayController.kt
index c85a8e5fca..b1ffebae71 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayController.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayController.kt
@@ -28,7 +28,9 @@ import voice.strings.R as StringsR
 
 private const val NI_BOOK_ID = "niBookId"
 
-class BookPlayController(bundle: Bundle) : ComposeController(bundle) {
+class BookPlayController(
+  bundle: Bundle,
+) : ComposeController(bundle) {
 
   constructor(bookId: BookId) : this(Bundle().apply { putBookId(NI_BOOK_ID, bookId) })
 
diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewState.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewState.kt
index cf44031126..fb0a550b61 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewState.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewState.kt
@@ -28,7 +28,9 @@ data class BookPlayViewState(
 }
 
 internal sealed interface BookPlayDialogViewState {
-  data class SpeedDialog(val speed: Float) : BookPlayDialogViewState {
+  data class SpeedDialog(
+    val speed: Float,
+  ) : BookPlayDialogViewState {
 
     val maxSpeed: Float get() = if (speed < 2F) 2F else 3.5F
   }
@@ -45,5 +47,7 @@ internal sealed interface BookPlayDialogViewState {
   ) : BookPlayDialogViewState
 
   @JvmInline
-  value class SleepTimer(val viewState: SleepTimerViewState) : BookPlayDialogViewState
+  value class SleepTimer(
+    val viewState: SleepTimerViewState,
+  ) : BookPlayDialogViewState
 }
diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/batteryOptimization/IsIgnoringBatteryOptimizations.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/batteryOptimization/IsIgnoringBatteryOptimizations.kt
index 9fa7ad297b..1d7fa5ba47 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/batteryOptimization/IsIgnoringBatteryOptimizations.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/batteryOptimization/IsIgnoringBatteryOptimizations.kt
@@ -13,7 +13,9 @@ fun interface IsIgnoringBatteryOptimizations {
 
 @ContributesBinding(AppScope::class)
 class IsIgnoringBatteryOptimizationsImpl
-@Inject constructor(private val context: Application) : IsIgnoringBatteryOptimizations {
+@Inject constructor(
+  private val context: Application,
+) : IsIgnoringBatteryOptimizations {
   override fun invoke(): Boolean {
     val powerManager = context.getSystemService<PowerManager>()
       ?: return true
diff --git a/playbackScreen/src/test/kotlin/voice/playbackScreen/batteryOptimization/BatteryOptimizationTest.kt b/playbackScreen/src/test/kotlin/voice/playbackScreen/batteryOptimization/BatteryOptimizationTest.kt
index b9024d911a..9cd5afd316 100644
--- a/playbackScreen/src/test/kotlin/voice/playbackScreen/batteryOptimization/BatteryOptimizationTest.kt
+++ b/playbackScreen/src/test/kotlin/voice/playbackScreen/batteryOptimization/BatteryOptimizationTest.kt
@@ -44,7 +44,9 @@ class BatteryOptimizationTest {
   }
 }
 
-private class MemoryDataStore<T>(initial: T) : DataStore<T> {
+private class MemoryDataStore<T>(
+  initial: T,
+) : DataStore<T> {
 
   private val value = MutableStateFlow(initial)
 
diff --git a/review/play/src/main/kotlin/voice/review/InstallationTimeProvider.kt b/review/play/src/main/kotlin/voice/review/InstallationTimeProvider.kt
index a1ca0a3a08..da5b3dbc67 100644
--- a/review/play/src/main/kotlin/voice/review/InstallationTimeProvider.kt
+++ b/review/play/src/main/kotlin/voice/review/InstallationTimeProvider.kt
@@ -7,7 +7,9 @@ import java.time.Instant
 import javax.inject.Inject
 
 class InstallationTimeProvider
-@Inject constructor(private val context: Context) {
+@Inject constructor(
+  private val context: Context,
+) {
 
   internal fun installationTime(): Instant {
     val packageManager = context.packageManager
diff --git a/review/play/src/main/kotlin/voice/review/ReviewTranslated.kt b/review/play/src/main/kotlin/voice/review/ReviewTranslated.kt
index 54741ca3c9..41d4037093 100644
--- a/review/play/src/main/kotlin/voice/review/ReviewTranslated.kt
+++ b/review/play/src/main/kotlin/voice/review/ReviewTranslated.kt
@@ -4,7 +4,9 @@ import android.content.Context
 import javax.inject.Inject
 
 class ReviewTranslated
-@Inject constructor(private val context: Context) {
+@Inject constructor(
+  private val context: Context,
+) {
 
   fun translated(): Boolean {
     val language = context.resources.configuration.locales[0].language.lowercase()
diff --git a/scanner/src/main/kotlin/voice/app/scanner/DeviceHasStoragePermissionBug.kt b/scanner/src/main/kotlin/voice/app/scanner/DeviceHasStoragePermissionBug.kt
index da33e8a01b..f4c5a3b706 100644
--- a/scanner/src/main/kotlin/voice/app/scanner/DeviceHasStoragePermissionBug.kt
+++ b/scanner/src/main/kotlin/voice/app/scanner/DeviceHasStoragePermissionBug.kt
@@ -13,7 +13,9 @@ import javax.inject.Singleton
 
 @Singleton
 class DeviceHasStoragePermissionBug
-@Inject constructor(private val context: Context) {
+@Inject constructor(
+  private val context: Context,
+) {
 
   private val _hasBug = MutableStateFlow(false)
   val hasBug: StateFlow<Boolean> get() = _hasBug
diff --git a/scanner/src/main/kotlin/voice/app/scanner/FFProbeAnalyze.kt b/scanner/src/main/kotlin/voice/app/scanner/FFProbeAnalyze.kt
index 05a1f0262b..f629c878b8 100644
--- a/scanner/src/main/kotlin/voice/app/scanner/FFProbeAnalyze.kt
+++ b/scanner/src/main/kotlin/voice/app/scanner/FFProbeAnalyze.kt
@@ -9,7 +9,9 @@ import voice.logging.core.Logger
 import javax.inject.Inject
 
 class FFProbeAnalyze
-@Inject constructor(private val context: Context) {
+@Inject constructor(
+  private val context: Context,
+) {
 
   private val json = Json {
     ignoreUnknownKeys = true
diff --git a/scanner/src/main/kotlin/voice/app/scanner/MediaAnalyzer.kt b/scanner/src/main/kotlin/voice/app/scanner/MediaAnalyzer.kt
index d3c1ca62aa..53d5950fe3 100644
--- a/scanner/src/main/kotlin/voice/app/scanner/MediaAnalyzer.kt
+++ b/scanner/src/main/kotlin/voice/app/scanner/MediaAnalyzer.kt
@@ -8,7 +8,9 @@ import javax.inject.Inject
 import kotlin.time.Duration.Companion.seconds
 
 class MediaAnalyzer
-@Inject constructor(private val ffProbeAnalyze: FFProbeAnalyze) {
+@Inject constructor(
+  private val ffProbeAnalyze: FFProbeAnalyze,
+) {
 
   suspend fun analyze(file: CachedDocumentFile): Metadata? {
     val result = ffProbeAnalyze.analyze(file) ?: return null
diff --git a/scanner/src/main/kotlin/voice/app/scanner/Metadata.kt b/scanner/src/main/kotlin/voice/app/scanner/Metadata.kt
index 846256f5b1..902eca424c 100644
--- a/scanner/src/main/kotlin/voice/app/scanner/Metadata.kt
+++ b/scanner/src/main/kotlin/voice/app/scanner/Metadata.kt
@@ -12,7 +12,9 @@ internal data class MetaDataScanResult(
   val format: MetaDataFormat? = null,
 )
 
-internal enum class TagType(val keys: List<String>) {
+internal enum class TagType(
+  val keys: List<String>,
+) {
   Title(listOf("title")),
   Artist(listOf("author", "artist", "album_artist")),
   Album(listOf("album")),
@@ -41,7 +43,9 @@ internal fun Map<String, String>.find(tagType: TagType): String? {
 }
 
 @Serializable
-internal data class MetaDataStream(val tags: Map<String, String>? = null)
+internal data class MetaDataStream(
+  val tags: Map<String, String>? = null,
+)
 
 @Serializable
 internal data class MetaDataChapter(
diff --git a/search/src/test/kotlin/voice/search/BookSearchTest.kt b/search/src/test/kotlin/voice/search/BookSearchTest.kt
index 33696d35a1..05be74d21f 100644
--- a/search/src/test/kotlin/voice/search/BookSearchTest.kt
+++ b/search/src/test/kotlin/voice/search/BookSearchTest.kt
@@ -126,7 +126,9 @@ private fun Book.withNewIdAndInactive(): Book {
   }
 }
 
-private class TestBase(private val search: BookSearch) {
+private class TestBase(
+  private val search: BookSearch,
+) {
 
   suspend fun expectSearchResult(
     query: String,
diff --git a/sleepTimer/src/main/kotlin/voice/sleepTimer/ShakeDetector.kt b/sleepTimer/src/main/kotlin/voice/sleepTimer/ShakeDetector.kt
index a53594690e..3d61b3b67b 100644
--- a/sleepTimer/src/main/kotlin/voice/sleepTimer/ShakeDetector.kt
+++ b/sleepTimer/src/main/kotlin/voice/sleepTimer/ShakeDetector.kt
@@ -8,7 +8,9 @@ import kotlin.coroutines.resume
 import com.squareup.seismic.ShakeDetector as SeismicShakeDetector
 
 class ShakeDetector
-@Inject constructor(private val context: Context) {
+@Inject constructor(
+  private val context: Context,
+) {
 
   /**
    * This function returns once a shake was detected
diff --git a/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimerViewState.kt b/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimerViewState.kt
index 8dbe08c962..eb1db71bc9 100644
--- a/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimerViewState.kt
+++ b/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimerViewState.kt
@@ -1,3 +1,5 @@
 package voice.sleepTimer
 
-data class SleepTimerViewState(val customSleepTime: Int)
+data class SleepTimerViewState(
+  val customSleepTime: Int,
+)

From 9820cca40fa95377be59b07e2a58244012d7eebe Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Sun, 22 Sep 2024 20:38:57 +0200
Subject: [PATCH 139/236] mend

---
 .editorconfig                                 |  2 +-
 .../bookOverview/EditCoverDialogController.kt |  4 +--
 .../misc/MainActivityIntentProviderImpl.kt    |  4 +--
 .../bottomSheet/BottomSheetViewModel.kt       |  4 +--
 .../bottomSheet/EditBookBottomSheetState.kt   |  4 +--
 .../EditBookCategoryViewModel.kt              |  4 +--
 .../editTitle/EditBookTitleViewModel.kt       |  4 +--
 .../fileCover/FileCoverViewModel.kt           |  4 +--
 .../internetCover/InternetCoverViewModel.kt   |  4 +--
 .../voice/bookmark/BookmarkController.kt      |  4 +--
 common/src/main/kotlin/voice/common/BookId.kt |  4 +--
 .../voice/common/compose/ComposeController.kt |  4 +--
 .../voice/common/compose/ImmutableFile.kt     |  4 +--
 .../kotlin/voice/common/compose/ViewModel.kt  |  4 +--
 .../common/conductor/DialogController.kt      |  4 +--
 .../kotlin/voice/common/grid/GridCount.kt     |  4 +--
 .../common/navigation/NavigationCommand.kt    | 28 +++++--------------
 .../cover/SelectCoverFromInternetViewModel.kt | 16 +++--------
 .../main/kotlin/voice/cover/api/CoverApi.kt   |  4 +--
 .../main/kotlin/voice/data/BookComparator.kt  |  4 +--
 data/src/main/kotlin/voice/data/Bookmark.kt   |  4 +--
 data/src/main/kotlin/voice/data/ChapterId.kt  |  4 +--
 .../kotlin/voice/data/repo/BookContentRepo.kt |  4 +--
 .../kotlin/voice/data/repo/ChapterRepo.kt     |  4 +--
 .../migrations/IncrementalMigration.kt        |  4 +--
 .../documentfile/FileBasedDocumentFile.kt     |  4 +--
 .../RealCachedDocumentFileFactory.kt          |  4 +--
 .../folderPicker/FolderPickerViewState.kt     |  4 +--
 .../kotlin/voice/playback/misc/Decibel.kt     |  4 +--
 .../kotlin/voice/playback/misc/VolumeGain.kt  |  4 +--
 .../player/DurationInconsistenciesUpdater.kt  |  4 +--
 .../player/OnlyAudioRenderersFactory.kt       |  4 +--
 .../playstate/PlayStateDelegatingListener.kt  |  4 +--
 .../voice/playback/session/CustomCommand.kt   |  8 ++----
 .../playback/session/ImageFileProvider.kt     |  4 +--
 .../kotlin/voice/playback/session/MediaId.kt  |  4 +--
 .../session/SleepTimerCommandUpdater.kt       |  4 +--
 .../session/VoiceMediaNotificationProvider.kt |  4 +--
 .../session/search/BookSearchHandlerTest.kt   |  4 +--
 .../playbackScreen/BookPlayController.kt      |  4 +--
 .../voice/playbackScreen/BookPlayViewState.kt |  8 ++----
 .../IsIgnoringBatteryOptimizations.kt         |  4 +--
 .../BatteryOptimizationTest.kt                |  4 +--
 .../voice/review/InstallationTimeProvider.kt  |  4 +--
 .../kotlin/voice/review/ReviewTranslated.kt   |  4 +--
 .../scanner/DeviceHasStoragePermissionBug.kt  |  4 +--
 .../voice/app/scanner/FFProbeAnalyze.kt       |  4 +--
 .../kotlin/voice/app/scanner/MediaAnalyzer.kt |  4 +--
 .../main/kotlin/voice/app/scanner/Metadata.kt |  8 ++----
 .../kotlin/voice/search/BookSearchTest.kt     |  4 +--
 .../kotlin/voice/sleepTimer/ShakeDetector.kt  |  4 +--
 .../voice/sleepTimer/SleepTimerViewState.kt   |  4 +--
 52 files changed, 64 insertions(+), 190 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 2c1d0d4b90..3dd3f63e7f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -15,7 +15,7 @@ ktlint_standard_backing-property-naming = disabled
 ktlint_code_style = intellij_idea
 ktlint_standard_function-expression-body = disabled
 ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 2
-ktlint_class_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 1
+ktlint_class_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 2
 ktlint_compose_parameter-naming = disabled
 ij_java_class_count_to_use_import_on_demand = 999
 ij_kotlin_allow_trailing_comma = true
diff --git a/app/src/main/kotlin/voice/app/features/bookOverview/EditCoverDialogController.kt b/app/src/main/kotlin/voice/app/features/bookOverview/EditCoverDialogController.kt
index 155ac96507..7c9ba5893e 100644
--- a/app/src/main/kotlin/voice/app/features/bookOverview/EditCoverDialogController.kt
+++ b/app/src/main/kotlin/voice/app/features/bookOverview/EditCoverDialogController.kt
@@ -29,9 +29,7 @@ import voice.strings.R as StringsR
 
 private const val NI_ARGS = "ni#bundle"
 
-class EditCoverDialogController(
-  bundle: Bundle,
-) : DialogController(bundle) {
+class EditCoverDialogController(bundle: Bundle) : DialogController(bundle) {
 
   constructor(args: Arguments) : this(
     Bundle().apply {
diff --git a/app/src/main/kotlin/voice/app/misc/MainActivityIntentProviderImpl.kt b/app/src/main/kotlin/voice/app/misc/MainActivityIntentProviderImpl.kt
index 4d58dda952..17c06a0b56 100644
--- a/app/src/main/kotlin/voice/app/misc/MainActivityIntentProviderImpl.kt
+++ b/app/src/main/kotlin/voice/app/misc/MainActivityIntentProviderImpl.kt
@@ -7,9 +7,7 @@ import voice.playback.notification.MainActivityIntentProvider
 import javax.inject.Inject
 
 class MainActivityIntentProviderImpl
-@Inject constructor(
-  private val context: Context,
-) : MainActivityIntentProvider {
+@Inject constructor(private val context: Context) : MainActivityIntentProvider {
 
   override fun toCurrentBook(): PendingIntent {
     val intent = MainActivity.goToBookIntent(context)
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetViewModel.kt
index 5da211230b..ebdcc310ce 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetViewModel.kt
@@ -11,9 +11,7 @@ import javax.inject.Inject
 
 @BookOverviewScope
 class BottomSheetViewModel
-@Inject constructor(
-  private val viewModels: Set<@JvmSuppressWildcards BottomSheetItemViewModel>,
-) {
+@Inject constructor(private val viewModels: Set<@JvmSuppressWildcards BottomSheetItemViewModel>) {
 
   private val scope = MainScope()
 
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/EditBookBottomSheetState.kt b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/EditBookBottomSheetState.kt
index 37275eaf03..ae6b556650 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/EditBookBottomSheetState.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/EditBookBottomSheetState.kt
@@ -12,9 +12,7 @@ import androidx.compose.material.icons.outlined.Title
 import androidx.compose.ui.graphics.vector.ImageVector
 import voice.strings.R as StringsR
 
-internal data class EditBookBottomSheetState(
-  val items: List<BottomSheetItem>,
-)
+internal data class EditBookBottomSheetState(val items: List<BottomSheetItem>)
 
 enum class BottomSheetItem(
   @StringRes val titleRes: Int,
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/editBookCategory/EditBookCategoryViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/editBookCategory/EditBookCategoryViewModel.kt
index d5bb5dc9f5..926f959805 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/editBookCategory/EditBookCategoryViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/editBookCategory/EditBookCategoryViewModel.kt
@@ -18,9 +18,7 @@ import javax.inject.Inject
 )
 class EditBookCategoryViewModel
 @Inject
-constructor(
-  private val repo: BookRepository,
-) : BottomSheetItemViewModel {
+constructor(private val repo: BookRepository) : BottomSheetItemViewModel {
 
   override suspend fun items(bookId: BookId): List<BottomSheetItem> {
     val book = repo.get(bookId) ?: return emptyList()
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/editTitle/EditBookTitleViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/editTitle/EditBookTitleViewModel.kt
index 8f3b7a2bb8..f4e46ecdbf 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/editTitle/EditBookTitleViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/editTitle/EditBookTitleViewModel.kt
@@ -19,9 +19,7 @@ import javax.inject.Inject
 )
 class EditBookTitleViewModel
 @Inject
-constructor(
-  private val repo: BookRepository,
-) : BottomSheetItemViewModel {
+constructor(private val repo: BookRepository) : BottomSheetItemViewModel {
 
   private val scope = MainScope()
 
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/fileCover/FileCoverViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/fileCover/FileCoverViewModel.kt
index 308a04ce99..84aea92256 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/fileCover/FileCoverViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/fileCover/FileCoverViewModel.kt
@@ -14,9 +14,7 @@ import javax.inject.Inject
 @ContributesMultibinding(BookOverviewScope::class, boundType = BottomSheetItemViewModel::class)
 class FileCoverViewModel
 @Inject
-constructor(
-  private val navigator: Navigator,
-) : BottomSheetItemViewModel {
+constructor(private val navigator: Navigator) : BottomSheetItemViewModel {
 
   private var bookId: BookId? = null
 
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/internetCover/InternetCoverViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/internetCover/InternetCoverViewModel.kt
index 9accc6bf2f..057da039d5 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/internetCover/InternetCoverViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/internetCover/InternetCoverViewModel.kt
@@ -13,9 +13,7 @@ import javax.inject.Inject
 @ContributesMultibinding(BookOverviewScope::class)
 class InternetCoverViewModel
 @Inject
-constructor(
-  private val navigator: Navigator,
-) : BottomSheetItemViewModel {
+constructor(private val navigator: Navigator) : BottomSheetItemViewModel {
 
   override suspend fun items(bookId: BookId): List<BottomSheetItem> {
     return listOf(BottomSheetItem.InternetCover)
diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
index d4d77613f6..2d48e4637a 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
@@ -10,9 +10,7 @@ import voice.data.putBookId
 private const val NI_BOOK_ID = "ni#bookId"
 
 @Suppress("unused")
-class BookmarkController(
-  args: Bundle,
-) : ComposeController(args) {
+class BookmarkController(args: Bundle) : ComposeController(args) {
 
   constructor(bookId: BookId) : this(
     Bundle().apply {
diff --git a/common/src/main/kotlin/voice/common/BookId.kt b/common/src/main/kotlin/voice/common/BookId.kt
index 1a1eab40f3..a4caaa858c 100644
--- a/common/src/main/kotlin/voice/common/BookId.kt
+++ b/common/src/main/kotlin/voice/common/BookId.kt
@@ -14,9 +14,7 @@ import kotlinx.serialization.encoding.Encoder
 
 @Serializable(with = BookIdSerializer::class)
 @Parcelize
-data class BookId(
-  val value: String,
-) : Parcelable {
+data class BookId(val value: String) : Parcelable {
 
   constructor(uri: Uri) : this(uri.toString())
 
diff --git a/common/src/main/kotlin/voice/common/compose/ComposeController.kt b/common/src/main/kotlin/voice/common/compose/ComposeController.kt
index 16313d6287..678470bb30 100644
--- a/common/src/main/kotlin/voice/common/compose/ComposeController.kt
+++ b/common/src/main/kotlin/voice/common/compose/ComposeController.kt
@@ -8,9 +8,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.ComposeView
 import com.bluelinelabs.conductor.Controller
 
-abstract class ComposeController(
-  args: Bundle = Bundle(),
-) : Controller(args) {
+abstract class ComposeController(args: Bundle = Bundle()) : Controller(args) {
 
   final override fun onCreateView(
     inflater: LayoutInflater,
diff --git a/common/src/main/kotlin/voice/common/compose/ImmutableFile.kt b/common/src/main/kotlin/voice/common/compose/ImmutableFile.kt
index 25a21f5905..dabad98f70 100644
--- a/common/src/main/kotlin/voice/common/compose/ImmutableFile.kt
+++ b/common/src/main/kotlin/voice/common/compose/ImmutableFile.kt
@@ -4,6 +4,4 @@ import androidx.compose.runtime.Immutable
 import java.io.File
 
 @Immutable
-data class ImmutableFile(
-  val file: File,
-)
+data class ImmutableFile(val file: File)
diff --git a/common/src/main/kotlin/voice/common/compose/ViewModel.kt b/common/src/main/kotlin/voice/common/compose/ViewModel.kt
index 9f9e1708ea..cef0e079ab 100644
--- a/common/src/main/kotlin/voice/common/compose/ViewModel.kt
+++ b/common/src/main/kotlin/voice/common/compose/ViewModel.kt
@@ -5,9 +5,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewmodel.compose.viewModel
 
 @PublishedApi
-internal class HoldingViewModel<T>(
-  val value: T,
-) : ViewModel()
+internal class HoldingViewModel<T>(val value: T) : ViewModel()
 
 @Composable
 inline fun <reified T> rememberScoped(
diff --git a/common/src/main/kotlin/voice/common/conductor/DialogController.kt b/common/src/main/kotlin/voice/common/conductor/DialogController.kt
index 11ea9e0367..702c219330 100644
--- a/common/src/main/kotlin/voice/common/conductor/DialogController.kt
+++ b/common/src/main/kotlin/voice/common/conductor/DialogController.kt
@@ -18,9 +18,7 @@ private const val SI_DIALOG = "android:savedDialogState"
 /**
  * A wrapper that wraps a dialog in a controller
  */
-abstract class DialogController(
-  args: Bundle = Bundle(),
-) : Controller(args) {
+abstract class DialogController(args: Bundle = Bundle()) : Controller(args) {
 
   private var dialog: Dialog? = null
   private var dismissed = false
diff --git a/common/src/main/kotlin/voice/common/grid/GridCount.kt b/common/src/main/kotlin/voice/common/grid/GridCount.kt
index 7b97f27bc5..3c7d98db79 100644
--- a/common/src/main/kotlin/voice/common/grid/GridCount.kt
+++ b/common/src/main/kotlin/voice/common/grid/GridCount.kt
@@ -4,9 +4,7 @@ import android.content.Context
 import javax.inject.Inject
 
 class GridCount
-@Inject constructor(
-  private val context: Context,
-) {
+@Inject constructor(private val context: Context) {
 
   fun useGridAsDefault(): Boolean {
     val displayMetrics = context.resources.displayMetrics
diff --git a/common/src/main/kotlin/voice/common/navigation/NavigationCommand.kt b/common/src/main/kotlin/voice/common/navigation/NavigationCommand.kt
index 5b8b4af6b3..e6e296c996 100644
--- a/common/src/main/kotlin/voice/common/navigation/NavigationCommand.kt
+++ b/common/src/main/kotlin/voice/common/navigation/NavigationCommand.kt
@@ -14,34 +14,22 @@ sealed interface NavigationCommand {
     val replace: Boolean,
   ) : NavigationCommand
 
-  data class Execute(
-    val action: (NavController<Destination.Compose>) -> Unit,
-  ) : NavigationCommand
+  data class Execute(val action: (NavController<Destination.Compose>) -> Unit) : NavigationCommand
 }
 
 sealed interface Destination {
-  data class Playback(
-    val bookId: BookId,
-  ) : Destination
-  data class Bookmarks(
-    val bookId: BookId,
-  ) : Destination
+  data class Playback(val bookId: BookId) : Destination
+  data class Bookmarks(val bookId: BookId) : Destination
 
   @Parcelize
-  data class CoverFromInternet(
-    val bookId: BookId,
-  ) : Compose
-  data class Website(
-    val url: String,
-  ) : Destination
+  data class CoverFromInternet(val bookId: BookId) : Compose
+  data class Website(val url: String) : Destination
   data class EditCover(
     val bookId: BookId,
     val cover: Uri,
   ) : Destination
 
-  data class Activity(
-    val intent: Intent,
-  ) : Destination
+  data class Activity(val intent: Intent) : Destination
 
   sealed interface Compose :
     Destination,
@@ -81,9 +69,7 @@ sealed interface Destination {
   object OnboardingExplanation : Compose
 
   @Parcelize
-  data class AddContent(
-    val mode: Mode,
-  ) : Compose {
+  data class AddContent(val mode: Mode) : Compose {
 
     enum class Mode {
       Default,
diff --git a/cover/src/main/kotlin/voice/cover/SelectCoverFromInternetViewModel.kt b/cover/src/main/kotlin/voice/cover/SelectCoverFromInternetViewModel.kt
index f06fb9e37e..90dbbe2efb 100644
--- a/cover/src/main/kotlin/voice/cover/SelectCoverFromInternetViewModel.kt
+++ b/cover/src/main/kotlin/voice/cover/SelectCoverFromInternetViewModel.kt
@@ -106,12 +106,8 @@ class SelectCoverFromInternetViewModel
 
     val query: String
 
-    data class Loading(
-      override val query: String,
-    ) : ViewState
-    data class Error(
-      override val query: String,
-    ) : ViewState
+    data class Loading(override val query: String) : ViewState
+    data class Error(override val query: String) : ViewState
     data class Content(
       val items: LazyPagingItems<SearchResponse.ImageResult>,
       override val query: String,
@@ -120,12 +116,8 @@ class SelectCoverFromInternetViewModel
 
   internal sealed interface Events {
     data object Retry : Events
-    data class CoverClick(
-      val cover: SearchResponse.ImageResult,
-    ) : Events
-    data class QueryChange(
-      val query: String,
-    ) : Events
+    data class CoverClick(val cover: SearchResponse.ImageResult) : Events
+    data class QueryChange(val query: String) : Events
   }
 
   @AssistedFactory
diff --git a/cover/src/main/kotlin/voice/cover/api/CoverApi.kt b/cover/src/main/kotlin/voice/cover/api/CoverApi.kt
index 86f7924a34..7f0519f775 100644
--- a/cover/src/main/kotlin/voice/cover/api/CoverApi.kt
+++ b/cover/src/main/kotlin/voice/cover/api/CoverApi.kt
@@ -4,9 +4,7 @@ import voice.logging.core.Logger
 import javax.inject.Inject
 
 class CoverApi
-@Inject constructor(
-  private val api: InternalCoverApi,
-) {
+@Inject constructor(private val api: InternalCoverApi) {
 
   internal suspend fun token(query: String): String? {
     Logger.d("query token")
diff --git a/data/src/main/kotlin/voice/data/BookComparator.kt b/data/src/main/kotlin/voice/data/BookComparator.kt
index a2829d4ce0..e10d7012ad 100644
--- a/data/src/main/kotlin/voice/data/BookComparator.kt
+++ b/data/src/main/kotlin/voice/data/BookComparator.kt
@@ -2,9 +2,7 @@ package voice.data
 
 import voice.common.comparator.NaturalOrderComparator
 
-enum class BookComparator(
-  private val comparatorFunction: Comparator<Book>,
-) : Comparator<Book> by comparatorFunction {
+enum class BookComparator(private val comparatorFunction: Comparator<Book>) : Comparator<Book> by comparatorFunction {
 
   ByLastPlayed(
     compareByDescending {
diff --git a/data/src/main/kotlin/voice/data/Bookmark.kt b/data/src/main/kotlin/voice/data/Bookmark.kt
index 71ec490314..4fa1f36b07 100644
--- a/data/src/main/kotlin/voice/data/Bookmark.kt
+++ b/data/src/main/kotlin/voice/data/Bookmark.kt
@@ -19,9 +19,7 @@ data class Bookmark(
   val id: Id,
 ) {
 
-  data class Id(
-    val value: UUID,
-  ) {
+  data class Id(val value: UUID) {
     companion object {
       fun random(): Id = Id(UUID.randomUUID())
     }
diff --git a/data/src/main/kotlin/voice/data/ChapterId.kt b/data/src/main/kotlin/voice/data/ChapterId.kt
index 438b189297..510aaee16c 100644
--- a/data/src/main/kotlin/voice/data/ChapterId.kt
+++ b/data/src/main/kotlin/voice/data/ChapterId.kt
@@ -6,9 +6,7 @@ import kotlinx.serialization.Serializable
 import voice.common.comparator.NaturalOrderComparator
 
 @Serializable(with = ChapterIdSerializer::class)
-data class ChapterId(
-  val value: String,
-) : Comparable<ChapterId> {
+data class ChapterId(val value: String) : Comparable<ChapterId> {
   constructor(uri: Uri) : this(uri.toString())
 
   override fun compareTo(other: ChapterId): Int {
diff --git a/data/src/main/kotlin/voice/data/repo/BookContentRepo.kt b/data/src/main/kotlin/voice/data/repo/BookContentRepo.kt
index 9ee4ed41d0..4e37946e1e 100644
--- a/data/src/main/kotlin/voice/data/repo/BookContentRepo.kt
+++ b/data/src/main/kotlin/voice/data/repo/BookContentRepo.kt
@@ -18,9 +18,7 @@ import javax.inject.Singleton
 
 @Singleton
 class BookContentRepo
-@Inject constructor(
-  private val dao: BookContentDao,
-) {
+@Inject constructor(private val dao: BookContentDao) {
 
   private val cacheMutex = Mutex()
   private var cacheFilled = false
diff --git a/data/src/main/kotlin/voice/data/repo/ChapterRepo.kt b/data/src/main/kotlin/voice/data/repo/ChapterRepo.kt
index 663808dff8..be4b7f015d 100644
--- a/data/src/main/kotlin/voice/data/repo/ChapterRepo.kt
+++ b/data/src/main/kotlin/voice/data/repo/ChapterRepo.kt
@@ -10,9 +10,7 @@ import javax.inject.Singleton
 
 @Singleton
 class ChapterRepo
-@Inject constructor(
-  private val dao: ChapterDao,
-) {
+@Inject constructor(private val dao: ChapterDao) {
 
   private val cache = mutableMapOf<ChapterId, Chapter?>()
 
diff --git a/data/src/main/kotlin/voice/data/repo/internals/migrations/IncrementalMigration.kt b/data/src/main/kotlin/voice/data/repo/internals/migrations/IncrementalMigration.kt
index 749a87f3ce..c2534d1061 100644
--- a/data/src/main/kotlin/voice/data/repo/internals/migrations/IncrementalMigration.kt
+++ b/data/src/main/kotlin/voice/data/repo/internals/migrations/IncrementalMigration.kt
@@ -2,6 +2,4 @@ package voice.data.repo.internals.migrations
 
 import androidx.room.migration.Migration
 
-abstract class IncrementalMigration(
-  from: Int,
-) : Migration(from, from + 1)
+abstract class IncrementalMigration(from: Int) : Migration(from, from + 1)
diff --git a/documentfile/src/main/kotlin/voice/documentfile/FileBasedDocumentFile.kt b/documentfile/src/main/kotlin/voice/documentfile/FileBasedDocumentFile.kt
index 1e96c62704..fbf90a4c4c 100644
--- a/documentfile/src/main/kotlin/voice/documentfile/FileBasedDocumentFile.kt
+++ b/documentfile/src/main/kotlin/voice/documentfile/FileBasedDocumentFile.kt
@@ -5,9 +5,7 @@ import androidx.core.net.toFile
 import androidx.core.net.toUri
 import java.io.File
 
-data class FileBasedDocumentFile(
-  private val file: File,
-) : CachedDocumentFile {
+data class FileBasedDocumentFile(private val file: File) : CachedDocumentFile {
 
   override val children: List<CachedDocumentFile> get() = file.listFiles()?.map { FileBasedDocumentFile(it) } ?: emptyList()
   override val name: String? get() = file.name
diff --git a/documentfile/src/main/kotlin/voice/documentfile/RealCachedDocumentFileFactory.kt b/documentfile/src/main/kotlin/voice/documentfile/RealCachedDocumentFileFactory.kt
index 742d9262e5..6c040004ca 100644
--- a/documentfile/src/main/kotlin/voice/documentfile/RealCachedDocumentFileFactory.kt
+++ b/documentfile/src/main/kotlin/voice/documentfile/RealCachedDocumentFileFactory.kt
@@ -8,9 +8,7 @@ import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
 class RealCachedDocumentFileFactory
-@Inject constructor(
-  private val context: Context,
-) : CachedDocumentFileFactory {
+@Inject constructor(private val context: Context) : CachedDocumentFileFactory {
   override fun create(uri: Uri): CachedDocumentFile {
     return RealCachedDocumentFile(context = context, uri = uri, preFilledContent = null)
   }
diff --git a/folderPicker/src/main/kotlin/voice/folderPicker/folderPicker/FolderPickerViewState.kt b/folderPicker/src/main/kotlin/voice/folderPicker/folderPicker/FolderPickerViewState.kt
index 9be1aabdcf..f4a4400d69 100644
--- a/folderPicker/src/main/kotlin/voice/folderPicker/folderPicker/FolderPickerViewState.kt
+++ b/folderPicker/src/main/kotlin/voice/folderPicker/folderPicker/FolderPickerViewState.kt
@@ -3,9 +3,7 @@ package voice.folderPicker.folderPicker
 import android.net.Uri
 import voice.data.folders.FolderType
 
-data class FolderPickerViewState(
-  val items: List<Item>,
-) {
+data class FolderPickerViewState(val items: List<Item>) {
 
   data class Item(
     val name: String,
diff --git a/playback/src/main/kotlin/voice/playback/misc/Decibel.kt b/playback/src/main/kotlin/voice/playback/misc/Decibel.kt
index fcfc6aa33c..a052da2ded 100644
--- a/playback/src/main/kotlin/voice/playback/misc/Decibel.kt
+++ b/playback/src/main/kotlin/voice/playback/misc/Decibel.kt
@@ -4,9 +4,7 @@ import kotlinx.serialization.Serializable
 
 @JvmInline
 @Serializable
-value class Decibel(
-  val value: Float,
-) {
+value class Decibel(val value: Float) {
 
   val milliBel: Int get() = (value * 100).toInt()
 
diff --git a/playback/src/main/kotlin/voice/playback/misc/VolumeGain.kt b/playback/src/main/kotlin/voice/playback/misc/VolumeGain.kt
index c75235dcfd..b412a2b995 100644
--- a/playback/src/main/kotlin/voice/playback/misc/VolumeGain.kt
+++ b/playback/src/main/kotlin/voice/playback/misc/VolumeGain.kt
@@ -97,9 +97,7 @@ class VolumeGainSetter
 
 @Singleton
 class VolumeGain
-@Inject constructor(
-  private val volumeGainSetter: VolumeGainSetter,
-) {
+@Inject constructor(private val volumeGainSetter: VolumeGainSetter) {
 
   var gain: Decibel by Delegates.observable(Decibel(0F)) { _, _, _ -> updateLoudnessEnhancer() }
   var audioSessionId: Int? by Delegates.observable(null) { _, _, _ -> updateLoudnessEnhancer() }
diff --git a/playback/src/main/kotlin/voice/playback/player/DurationInconsistenciesUpdater.kt b/playback/src/main/kotlin/voice/playback/player/DurationInconsistenciesUpdater.kt
index 0a2dc3b72d..be0d206e88 100644
--- a/playback/src/main/kotlin/voice/playback/player/DurationInconsistenciesUpdater.kt
+++ b/playback/src/main/kotlin/voice/playback/player/DurationInconsistenciesUpdater.kt
@@ -10,9 +10,7 @@ import voice.playback.session.toMediaIdOrNull
 import javax.inject.Inject
 
 class DurationInconsistenciesUpdater
-@Inject constructor(
-  private val chapterRepo: ChapterRepo,
-) : Player.Listener {
+@Inject constructor(private val chapterRepo: ChapterRepo) : Player.Listener {
 
   private lateinit var player: Player
 
diff --git a/playback/src/main/kotlin/voice/playback/player/OnlyAudioRenderersFactory.kt b/playback/src/main/kotlin/voice/playback/player/OnlyAudioRenderersFactory.kt
index d37dda8606..aefca2bc75 100644
--- a/playback/src/main/kotlin/voice/playback/player/OnlyAudioRenderersFactory.kt
+++ b/playback/src/main/kotlin/voice/playback/player/OnlyAudioRenderersFactory.kt
@@ -12,9 +12,7 @@ import androidx.media3.exoplayer.video.VideoRendererEventListener
 import javax.inject.Inject
 
 class OnlyAudioRenderersFactory
-@Inject constructor(
-  context: Context,
-) : DefaultRenderersFactory(context) {
+@Inject constructor(context: Context) : DefaultRenderersFactory(context) {
 
   override fun buildVideoRenderers(
     context: Context,
diff --git a/playback/src/main/kotlin/voice/playback/playstate/PlayStateDelegatingListener.kt b/playback/src/main/kotlin/voice/playback/playstate/PlayStateDelegatingListener.kt
index 3951d5fea0..8b670de9f0 100644
--- a/playback/src/main/kotlin/voice/playback/playstate/PlayStateDelegatingListener.kt
+++ b/playback/src/main/kotlin/voice/playback/playstate/PlayStateDelegatingListener.kt
@@ -4,9 +4,7 @@ import androidx.media3.common.Player
 import javax.inject.Inject
 
 class PlayStateDelegatingListener
-@Inject constructor(
-  private val playStateManager: PlayStateManager,
-) : Player.Listener {
+@Inject constructor(private val playStateManager: PlayStateManager) : Player.Listener {
 
   private lateinit var player: Player
 
diff --git a/playback/src/main/kotlin/voice/playback/session/CustomCommand.kt b/playback/src/main/kotlin/voice/playback/session/CustomCommand.kt
index 03e495992d..b4237ce6bd 100644
--- a/playback/src/main/kotlin/voice/playback/session/CustomCommand.kt
+++ b/playback/src/main/kotlin/voice/playback/session/CustomCommand.kt
@@ -17,14 +17,10 @@ internal sealed interface CustomCommand {
   data object ForceSeekToPrevious : CustomCommand
 
   @Serializable
-  data class SetSkipSilence(
-    val skipSilence: Boolean,
-  ) : CustomCommand
+  data class SetSkipSilence(val skipSilence: Boolean) : CustomCommand
 
   @Serializable
-  data class SetGain(
-    val gain: Decibel,
-  ) : CustomCommand
+  data class SetGain(val gain: Decibel) : CustomCommand
 
   companion object {
 
diff --git a/playback/src/main/kotlin/voice/playback/session/ImageFileProvider.kt b/playback/src/main/kotlin/voice/playback/session/ImageFileProvider.kt
index 8964deffcf..0db8fcca61 100644
--- a/playback/src/main/kotlin/voice/playback/session/ImageFileProvider.kt
+++ b/playback/src/main/kotlin/voice/playback/session/ImageFileProvider.kt
@@ -8,9 +8,7 @@ import java.io.File
 import javax.inject.Inject
 
 class ImageFileProvider
-@Inject constructor(
-  private val application: Application,
-) {
+@Inject constructor(private val application: Application) {
 
   internal fun uri(file: File): Uri {
     return FileProvider
diff --git a/playback/src/main/kotlin/voice/playback/session/MediaId.kt b/playback/src/main/kotlin/voice/playback/session/MediaId.kt
index d99a3cae12..ad7bf13150 100644
--- a/playback/src/main/kotlin/voice/playback/session/MediaId.kt
+++ b/playback/src/main/kotlin/voice/playback/session/MediaId.kt
@@ -13,9 +13,7 @@ sealed interface MediaId {
 
   @Serializable
   @SerialName("book")
-  data class Book(
-    val id: BookId,
-  ) : MediaId
+  data class Book(val id: BookId) : MediaId
 
   @Serializable
   @SerialName("chapter")
diff --git a/playback/src/main/kotlin/voice/playback/session/SleepTimerCommandUpdater.kt b/playback/src/main/kotlin/voice/playback/session/SleepTimerCommandUpdater.kt
index 5c0cf1ebe1..c7125e5a03 100644
--- a/playback/src/main/kotlin/voice/playback/session/SleepTimerCommandUpdater.kt
+++ b/playback/src/main/kotlin/voice/playback/session/SleepTimerCommandUpdater.kt
@@ -8,9 +8,7 @@ import javax.inject.Inject
 import voice.strings.R as StringsR
 
 class SleepTimerCommandUpdater
-@Inject constructor(
-  private val context: Context,
-) {
+@Inject constructor(private val context: Context) {
 
   fun update(
     session: MediaSession,
diff --git a/playback/src/main/kotlin/voice/playback/session/VoiceMediaNotificationProvider.kt b/playback/src/main/kotlin/voice/playback/session/VoiceMediaNotificationProvider.kt
index 6a3971a8bc..0bf3e80703 100644
--- a/playback/src/main/kotlin/voice/playback/session/VoiceMediaNotificationProvider.kt
+++ b/playback/src/main/kotlin/voice/playback/session/VoiceMediaNotificationProvider.kt
@@ -9,9 +9,7 @@ import com.google.common.collect.ImmutableList
 import javax.inject.Inject
 
 class VoiceMediaNotificationProvider
-@Inject constructor(
-  context: Context,
-) : DefaultMediaNotificationProvider(context) {
+@Inject constructor(context: Context) : DefaultMediaNotificationProvider(context) {
 
   override fun getMediaButtons(
     session: MediaSession,
diff --git a/playback/src/test/kotlin/voice/playback/session/search/BookSearchHandlerTest.kt b/playback/src/test/kotlin/voice/playback/session/search/BookSearchHandlerTest.kt
index edf99ad44f..90bb5b28e8 100644
--- a/playback/src/test/kotlin/voice/playback/session/search/BookSearchHandlerTest.kt
+++ b/playback/src/test/kotlin/voice/playback/session/search/BookSearchHandlerTest.kt
@@ -134,9 +134,7 @@ private fun chapter(): Chapter {
   )
 }
 
-private class MemoryDataStore<T>(
-  initial: T,
-) : DataStore<T> {
+private class MemoryDataStore<T>(initial: T) : DataStore<T> {
 
   private val value = MutableStateFlow(initial)
 
diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayController.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayController.kt
index b1ffebae71..c85a8e5fca 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayController.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayController.kt
@@ -28,9 +28,7 @@ import voice.strings.R as StringsR
 
 private const val NI_BOOK_ID = "niBookId"
 
-class BookPlayController(
-  bundle: Bundle,
-) : ComposeController(bundle) {
+class BookPlayController(bundle: Bundle) : ComposeController(bundle) {
 
   constructor(bookId: BookId) : this(Bundle().apply { putBookId(NI_BOOK_ID, bookId) })
 
diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewState.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewState.kt
index fb0a550b61..cf44031126 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewState.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewState.kt
@@ -28,9 +28,7 @@ data class BookPlayViewState(
 }
 
 internal sealed interface BookPlayDialogViewState {
-  data class SpeedDialog(
-    val speed: Float,
-  ) : BookPlayDialogViewState {
+  data class SpeedDialog(val speed: Float) : BookPlayDialogViewState {
 
     val maxSpeed: Float get() = if (speed < 2F) 2F else 3.5F
   }
@@ -47,7 +45,5 @@ internal sealed interface BookPlayDialogViewState {
   ) : BookPlayDialogViewState
 
   @JvmInline
-  value class SleepTimer(
-    val viewState: SleepTimerViewState,
-  ) : BookPlayDialogViewState
+  value class SleepTimer(val viewState: SleepTimerViewState) : BookPlayDialogViewState
 }
diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/batteryOptimization/IsIgnoringBatteryOptimizations.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/batteryOptimization/IsIgnoringBatteryOptimizations.kt
index 1d7fa5ba47..9fa7ad297b 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/batteryOptimization/IsIgnoringBatteryOptimizations.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/batteryOptimization/IsIgnoringBatteryOptimizations.kt
@@ -13,9 +13,7 @@ fun interface IsIgnoringBatteryOptimizations {
 
 @ContributesBinding(AppScope::class)
 class IsIgnoringBatteryOptimizationsImpl
-@Inject constructor(
-  private val context: Application,
-) : IsIgnoringBatteryOptimizations {
+@Inject constructor(private val context: Application) : IsIgnoringBatteryOptimizations {
   override fun invoke(): Boolean {
     val powerManager = context.getSystemService<PowerManager>()
       ?: return true
diff --git a/playbackScreen/src/test/kotlin/voice/playbackScreen/batteryOptimization/BatteryOptimizationTest.kt b/playbackScreen/src/test/kotlin/voice/playbackScreen/batteryOptimization/BatteryOptimizationTest.kt
index 9cd5afd316..b9024d911a 100644
--- a/playbackScreen/src/test/kotlin/voice/playbackScreen/batteryOptimization/BatteryOptimizationTest.kt
+++ b/playbackScreen/src/test/kotlin/voice/playbackScreen/batteryOptimization/BatteryOptimizationTest.kt
@@ -44,9 +44,7 @@ class BatteryOptimizationTest {
   }
 }
 
-private class MemoryDataStore<T>(
-  initial: T,
-) : DataStore<T> {
+private class MemoryDataStore<T>(initial: T) : DataStore<T> {
 
   private val value = MutableStateFlow(initial)
 
diff --git a/review/play/src/main/kotlin/voice/review/InstallationTimeProvider.kt b/review/play/src/main/kotlin/voice/review/InstallationTimeProvider.kt
index da5b3dbc67..a1ca0a3a08 100644
--- a/review/play/src/main/kotlin/voice/review/InstallationTimeProvider.kt
+++ b/review/play/src/main/kotlin/voice/review/InstallationTimeProvider.kt
@@ -7,9 +7,7 @@ import java.time.Instant
 import javax.inject.Inject
 
 class InstallationTimeProvider
-@Inject constructor(
-  private val context: Context,
-) {
+@Inject constructor(private val context: Context) {
 
   internal fun installationTime(): Instant {
     val packageManager = context.packageManager
diff --git a/review/play/src/main/kotlin/voice/review/ReviewTranslated.kt b/review/play/src/main/kotlin/voice/review/ReviewTranslated.kt
index 41d4037093..54741ca3c9 100644
--- a/review/play/src/main/kotlin/voice/review/ReviewTranslated.kt
+++ b/review/play/src/main/kotlin/voice/review/ReviewTranslated.kt
@@ -4,9 +4,7 @@ import android.content.Context
 import javax.inject.Inject
 
 class ReviewTranslated
-@Inject constructor(
-  private val context: Context,
-) {
+@Inject constructor(private val context: Context) {
 
   fun translated(): Boolean {
     val language = context.resources.configuration.locales[0].language.lowercase()
diff --git a/scanner/src/main/kotlin/voice/app/scanner/DeviceHasStoragePermissionBug.kt b/scanner/src/main/kotlin/voice/app/scanner/DeviceHasStoragePermissionBug.kt
index f4c5a3b706..da33e8a01b 100644
--- a/scanner/src/main/kotlin/voice/app/scanner/DeviceHasStoragePermissionBug.kt
+++ b/scanner/src/main/kotlin/voice/app/scanner/DeviceHasStoragePermissionBug.kt
@@ -13,9 +13,7 @@ import javax.inject.Singleton
 
 @Singleton
 class DeviceHasStoragePermissionBug
-@Inject constructor(
-  private val context: Context,
-) {
+@Inject constructor(private val context: Context) {
 
   private val _hasBug = MutableStateFlow(false)
   val hasBug: StateFlow<Boolean> get() = _hasBug
diff --git a/scanner/src/main/kotlin/voice/app/scanner/FFProbeAnalyze.kt b/scanner/src/main/kotlin/voice/app/scanner/FFProbeAnalyze.kt
index f629c878b8..05a1f0262b 100644
--- a/scanner/src/main/kotlin/voice/app/scanner/FFProbeAnalyze.kt
+++ b/scanner/src/main/kotlin/voice/app/scanner/FFProbeAnalyze.kt
@@ -9,9 +9,7 @@ import voice.logging.core.Logger
 import javax.inject.Inject
 
 class FFProbeAnalyze
-@Inject constructor(
-  private val context: Context,
-) {
+@Inject constructor(private val context: Context) {
 
   private val json = Json {
     ignoreUnknownKeys = true
diff --git a/scanner/src/main/kotlin/voice/app/scanner/MediaAnalyzer.kt b/scanner/src/main/kotlin/voice/app/scanner/MediaAnalyzer.kt
index 53d5950fe3..d3c1ca62aa 100644
--- a/scanner/src/main/kotlin/voice/app/scanner/MediaAnalyzer.kt
+++ b/scanner/src/main/kotlin/voice/app/scanner/MediaAnalyzer.kt
@@ -8,9 +8,7 @@ import javax.inject.Inject
 import kotlin.time.Duration.Companion.seconds
 
 class MediaAnalyzer
-@Inject constructor(
-  private val ffProbeAnalyze: FFProbeAnalyze,
-) {
+@Inject constructor(private val ffProbeAnalyze: FFProbeAnalyze) {
 
   suspend fun analyze(file: CachedDocumentFile): Metadata? {
     val result = ffProbeAnalyze.analyze(file) ?: return null
diff --git a/scanner/src/main/kotlin/voice/app/scanner/Metadata.kt b/scanner/src/main/kotlin/voice/app/scanner/Metadata.kt
index 902eca424c..846256f5b1 100644
--- a/scanner/src/main/kotlin/voice/app/scanner/Metadata.kt
+++ b/scanner/src/main/kotlin/voice/app/scanner/Metadata.kt
@@ -12,9 +12,7 @@ internal data class MetaDataScanResult(
   val format: MetaDataFormat? = null,
 )
 
-internal enum class TagType(
-  val keys: List<String>,
-) {
+internal enum class TagType(val keys: List<String>) {
   Title(listOf("title")),
   Artist(listOf("author", "artist", "album_artist")),
   Album(listOf("album")),
@@ -43,9 +41,7 @@ internal fun Map<String, String>.find(tagType: TagType): String? {
 }
 
 @Serializable
-internal data class MetaDataStream(
-  val tags: Map<String, String>? = null,
-)
+internal data class MetaDataStream(val tags: Map<String, String>? = null)
 
 @Serializable
 internal data class MetaDataChapter(
diff --git a/search/src/test/kotlin/voice/search/BookSearchTest.kt b/search/src/test/kotlin/voice/search/BookSearchTest.kt
index 05be74d21f..33696d35a1 100644
--- a/search/src/test/kotlin/voice/search/BookSearchTest.kt
+++ b/search/src/test/kotlin/voice/search/BookSearchTest.kt
@@ -126,9 +126,7 @@ private fun Book.withNewIdAndInactive(): Book {
   }
 }
 
-private class TestBase(
-  private val search: BookSearch,
-) {
+private class TestBase(private val search: BookSearch) {
 
   suspend fun expectSearchResult(
     query: String,
diff --git a/sleepTimer/src/main/kotlin/voice/sleepTimer/ShakeDetector.kt b/sleepTimer/src/main/kotlin/voice/sleepTimer/ShakeDetector.kt
index 3d61b3b67b..a53594690e 100644
--- a/sleepTimer/src/main/kotlin/voice/sleepTimer/ShakeDetector.kt
+++ b/sleepTimer/src/main/kotlin/voice/sleepTimer/ShakeDetector.kt
@@ -8,9 +8,7 @@ import kotlin.coroutines.resume
 import com.squareup.seismic.ShakeDetector as SeismicShakeDetector
 
 class ShakeDetector
-@Inject constructor(
-  private val context: Context,
-) {
+@Inject constructor(private val context: Context) {
 
   /**
    * This function returns once a shake was detected
diff --git a/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimerViewState.kt b/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimerViewState.kt
index eb1db71bc9..8dbe08c962 100644
--- a/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimerViewState.kt
+++ b/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimerViewState.kt
@@ -1,5 +1,3 @@
 package voice.sleepTimer
 
-data class SleepTimerViewState(
-  val customSleepTime: Int,
-)
+data class SleepTimerViewState(val customSleepTime: Int)

From cd643c2c429d88268a66c2f44a792cdbfe0b9a2e Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Sun, 22 Sep 2024 20:46:24 +0200
Subject: [PATCH 140/236] Enable the composable parameter naming rule

---
 .editorconfig                                 |  1 -
 .../bottomSheet/BottomSheetContent.kt         |  4 ++--
 .../bottomSheet/BottomSheetItemViewModel.kt   |  2 +-
 .../bottomSheet/BottomSheetViewModel.kt       |  2 +-
 .../deleteBook/DeleteBookDialog.kt            |  6 +++---
 .../deleteBook/DeleteBookViewModel.kt         |  4 ++--
 .../EditBookCategoryViewModel.kt              |  2 +-
 .../editTitle/EditBookTitleViewModel.kt       |  2 +-
 .../fileCover/FileCoverViewModel.kt           |  2 +-
 .../internetCover/InternetCoverViewModel.kt   |  2 +-
 .../overview/BookOverviewViewModel.kt         |  2 +-
 .../voice/bookOverview/views/BookOverview.kt  | 14 ++++++-------
 .../voice/bookOverview/views/GridBooks.kt     |  4 ++--
 .../voice/bookOverview/views/ListBooks.kt     |  4 ++--
 .../bookOverview/views/PermissionBugCard.kt   |  6 +++---
 .../kotlin/voice/bookmark/BookmarkScreen.kt   | 18 ++++++++---------
 .../voice/bookmark/BookmarkViewModel.kt       |  6 +++---
 .../bookmark/dialogs/AddBookmarkDialog.kt     |  6 +++---
 .../selectType/FolderModeSelectionCard.kt     |  6 +++---
 .../selectType/SelectFolderType.kt            | 12 +++++------
 .../voice/migration/MigrationViewModel.kt     | 12 +++++------
 .../kotlin/voice/migration/views/Migration.kt | 20 +++++++++----------
 .../migration/views/MigrationViewState.kt     |  6 +++---
 .../playbackScreen/BookPlayController.kt      | 10 +++++-----
 .../voice/playbackScreen/BookPlayViewModel.kt | 12 +++++------
 .../playbackScreen/SelectChapterDialog.kt     |  2 +-
 .../kotlin/voice/review/AskForReviewDialog.kt | 12 +++++------
 .../main/kotlin/voice/review/ReviewFeature.kt |  4 ++--
 .../kotlin/voice/settings/SettingsListener.kt |  6 +++---
 .../voice/settings/SettingsViewModel.kt       |  6 +++---
 .../voice/settings/views/AutoRewindRow.kt     |  4 ++--
 .../voice/settings/views/SeekTimeRow.kt       |  4 ++--
 .../kotlin/voice/settings/views/Settings.kt   | 14 ++++++-------
 .../voice/settings/views/TimeSettingDialog.kt |  4 ++--
 34 files changed, 110 insertions(+), 111 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 3dd3f63e7f..20d412a0e5 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -16,7 +16,6 @@ ktlint_code_style = intellij_idea
 ktlint_standard_function-expression-body = disabled
 ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 2
 ktlint_class_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 2
-ktlint_compose_parameter-naming = disabled
 ij_java_class_count_to_use_import_on_demand = 999
 ij_kotlin_allow_trailing_comma = true
 ij_kotlin_allow_trailing_comma_on_call_site = true
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetContent.kt b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetContent.kt
index 476200f7f4..a57f2131ea 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetContent.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetContent.kt
@@ -15,13 +15,13 @@ import androidx.compose.ui.unit.dp
 @Composable
 internal fun BottomSheetContent(
   state: EditBookBottomSheetState,
-  onItemClicked: (BottomSheetItem) -> Unit,
+  onItemClick: (BottomSheetItem) -> Unit,
 ) {
   Column {
     state.items.forEach { item ->
       ListItem(
         modifier = Modifier.clickable {
-          onItemClicked(item)
+          onItemClick(item)
         },
         headlineContent = {
           Text(text = stringResource(item.titleRes))
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetItemViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetItemViewModel.kt
index d3894aa662..3686ef6e57 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetItemViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetItemViewModel.kt
@@ -5,7 +5,7 @@ import voice.common.BookId
 interface BottomSheetItemViewModel {
 
   suspend fun items(bookId: BookId): List<BottomSheetItem>
-  suspend fun onItemClicked(
+  suspend fun onItemClick(
     bookId: BookId,
     item: BottomSheetItem,
   )
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetViewModel.kt
index ebdcc310ce..56e7b59d92 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetViewModel.kt
@@ -34,7 +34,7 @@ class BottomSheetViewModel
     val bookId = bookId ?: return
     scope.launch {
       viewModels.forEach {
-        it.onItemClicked(bookId, item)
+        it.onItemClick(bookId, item)
       }
     }
   }
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/deleteBook/DeleteBookDialog.kt b/bookOverview/src/main/kotlin/voice/bookOverview/deleteBook/DeleteBookDialog.kt
index 737e86adcc..e56401cbbe 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/deleteBook/DeleteBookDialog.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/deleteBook/DeleteBookDialog.kt
@@ -26,7 +26,7 @@ internal fun DeleteBookDialog(
   viewState: DeleteBookViewState,
   onDismiss: () -> Unit,
   onConfirmDeletion: () -> Unit,
-  onDeleteCheckBoxChecked: (Boolean) -> Unit,
+  onDeleteCheckBoxCheck: (Boolean) -> Unit,
 ) {
   AlertDialog(
     onDismissRequest = onDismiss,
@@ -65,12 +65,12 @@ internal fun DeleteBookDialog(
             .padding(top = 8.dp)
             .fillMaxWidth()
             .clickable {
-              onDeleteCheckBoxChecked(!viewState.deleteCheckBoxChecked)
+              onDeleteCheckBoxCheck(!viewState.deleteCheckBoxChecked)
             },
         ) {
           Checkbox(
             checked = viewState.deleteCheckBoxChecked,
-            onCheckedChange = onDeleteCheckBoxChecked,
+            onCheckedChange = onDeleteCheckBoxCheck,
           )
           Text(stringResource(id = StringsR.string.delete_book_dialog_deletion_confirmation))
         }
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/deleteBook/DeleteBookViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/deleteBook/DeleteBookViewModel.kt
index cc30b9a017..e49d5d65f0 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/deleteBook/DeleteBookViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/deleteBook/DeleteBookViewModel.kt
@@ -36,7 +36,7 @@ constructor(
     return listOf(BottomSheetItem.DeleteBook)
   }
 
-  override suspend fun onItemClicked(
+  override suspend fun onItemClick(
     bookId: BookId,
     item: BottomSheetItem,
   ) {
@@ -62,7 +62,7 @@ constructor(
     _state.value = null
   }
 
-  internal fun onDeleteCheckBoxChecked(checked: Boolean) {
+  internal fun onDeleteCheckBoxCheck(checked: Boolean) {
     _state.value = _state.value?.copy(deleteCheckBoxChecked = checked)
   }
 
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/editBookCategory/EditBookCategoryViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/editBookCategory/EditBookCategoryViewModel.kt
index 926f959805..0bce415e07 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/editBookCategory/EditBookCategoryViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/editBookCategory/EditBookCategoryViewModel.kt
@@ -38,7 +38,7 @@ constructor(private val repo: BookRepository) : BottomSheetItemViewModel {
     }
   }
 
-  override suspend fun onItemClicked(
+  override suspend fun onItemClick(
     bookId: BookId,
     item: BottomSheetItem,
   ) {
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/editTitle/EditBookTitleViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/editTitle/EditBookTitleViewModel.kt
index f4e46ecdbf..e9fa900e8a 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/editTitle/EditBookTitleViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/editTitle/EditBookTitleViewModel.kt
@@ -30,7 +30,7 @@ constructor(private val repo: BookRepository) : BottomSheetItemViewModel {
     return listOf(BottomSheetItem.Title)
   }
 
-  override suspend fun onItemClicked(
+  override suspend fun onItemClick(
     bookId: BookId,
     item: BottomSheetItem,
   ) {
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/fileCover/FileCoverViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/fileCover/FileCoverViewModel.kt
index 84aea92256..62aa721061 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/fileCover/FileCoverViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/fileCover/FileCoverViewModel.kt
@@ -22,7 +22,7 @@ constructor(private val navigator: Navigator) : BottomSheetItemViewModel {
     return listOf(BottomSheetItem.FileCover)
   }
 
-  override suspend fun onItemClicked(
+  override suspend fun onItemClick(
     bookId: BookId,
     item: BottomSheetItem,
   ) {
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/internetCover/InternetCoverViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/internetCover/InternetCoverViewModel.kt
index 057da039d5..3f22f57cee 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/internetCover/InternetCoverViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/internetCover/InternetCoverViewModel.kt
@@ -19,7 +19,7 @@ constructor(private val navigator: Navigator) : BottomSheetItemViewModel {
     return listOf(BottomSheetItem.InternetCover)
   }
 
-  override suspend fun onItemClicked(
+  override suspend fun onItemClick(
     bookId: BookId,
     item: BottomSheetItem,
   ) {
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/overview/BookOverviewViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/overview/BookOverviewViewModel.kt
index 652d78e3a4..a54c6978bd 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/overview/BookOverviewViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/overview/BookOverviewViewModel.kt
@@ -237,7 +237,7 @@ constructor(
     playerController.playPause()
   }
 
-  fun onPermissionBugCardClicked() {
+  fun onPermissionBugCardClick() {
     if (Build.VERSION.SDK_INT >= 30) {
       navigator.goTo(
         Destination.Activity(
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/views/BookOverview.kt b/bookOverview/src/main/kotlin/voice/bookOverview/views/BookOverview.kt
index 2222f0a7e6..3ce0a8d30a 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/views/BookOverview.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/views/BookOverview.kt
@@ -102,7 +102,7 @@ fun BookOverviewScreen(modifier: Modifier = Modifier) {
     onSearchActiveChange = bookOverviewViewModel::onSearchActiveChange,
     onSearchQueryChange = bookOverviewViewModel::onSearchQueryChange,
     onSearchBookClick = bookOverviewViewModel::onSearchBookClick,
-    onPermissionBugCardClicked = bookOverviewViewModel::onPermissionBugCardClicked,
+    onPermissionBugCardClick = bookOverviewViewModel::onPermissionBugCardClick,
   )
   val deleteBookViewState = deleteBookViewModel.state.value
   if (deleteBookViewState != null) {
@@ -110,7 +110,7 @@ fun BookOverviewScreen(modifier: Modifier = Modifier) {
       viewState = deleteBookViewState,
       onDismiss = deleteBookViewModel::onDismiss,
       onConfirmDeletion = deleteBookViewModel::onConfirmDeletion,
-      onDeleteCheckBoxChecked = deleteBookViewModel::onDeleteCheckBoxChecked,
+      onDeleteCheckBoxCheck = deleteBookViewModel::onDeleteCheckBoxCheck,
     )
   }
   val editBookTitleState = editBookTitleViewModel.state.value
@@ -131,7 +131,7 @@ fun BookOverviewScreen(modifier: Modifier = Modifier) {
       content = {
         BottomSheetContent(
           state = bottomSheetViewModel.state.value,
-          onItemClicked = { item ->
+          onItemClick = { item ->
             if (item == BottomSheetItem.FileCover) {
               getContentLauncher.launch("image/*")
             }
@@ -163,7 +163,7 @@ internal fun BookOverview(
   onSearchActiveChange: (Boolean) -> Unit,
   onSearchQueryChange: (String) -> Unit,
   onSearchBookClick: (BookId) -> Unit,
-  onPermissionBugCardClicked: () -> Unit,
+  onPermissionBugCardClick: () -> Unit,
   modifier: Modifier = Modifier,
 ) {
   val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
@@ -205,7 +205,7 @@ internal fun BookOverview(
             onBookClick = onBookClick,
             onBookLongClick = onBookLongClick,
             showPermissionBugCard = viewState.showStoragePermissionBugCard,
-            onPermissionBugCardClicked = onPermissionBugCardClicked,
+            onPermissionBugCardClick = onPermissionBugCardClick,
           )
         }
         BookOverviewLayoutMode.Grid -> {
@@ -214,7 +214,7 @@ internal fun BookOverview(
             onBookClick = onBookClick,
             onBookLongClick = onBookLongClick,
             showPermissionBugCard = viewState.showStoragePermissionBugCard,
-            onPermissionBugCardClicked = onPermissionBugCardClicked,
+            onPermissionBugCardClick = onPermissionBugCardClick,
           )
         }
       }
@@ -242,7 +242,7 @@ fun BookOverviewPreview(
       onSearchActiveChange = {},
       onSearchQueryChange = {},
       onSearchBookClick = {},
-      onPermissionBugCardClicked = {},
+      onPermissionBugCardClick = {},
     )
   }
 }
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/views/GridBooks.kt b/bookOverview/src/main/kotlin/voice/bookOverview/views/GridBooks.kt
index 16ec21b2b8..73d155df04 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/views/GridBooks.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/views/GridBooks.kt
@@ -42,7 +42,7 @@ internal fun GridBooks(
   onBookClick: (BookId) -> Unit,
   onBookLongClick: (BookId) -> Unit,
   showPermissionBugCard: Boolean,
-  onPermissionBugCardClicked: () -> Unit,
+  onPermissionBugCardClick: () -> Unit,
 ) {
   val cellCount = gridColumnCount()
   LazyVerticalGrid(
@@ -55,7 +55,7 @@ internal fun GridBooks(
       item(
         span = { GridItemSpan(maxLineSpan) },
       ) {
-        PermissionBugCard(onPermissionBugCardClicked)
+        PermissionBugCard(onPermissionBugCardClick)
       }
     }
     books.forEach { (category, books) ->
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/views/ListBooks.kt b/bookOverview/src/main/kotlin/voice/bookOverview/views/ListBooks.kt
index 3de29e58ae..a6f5893fb3 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/views/ListBooks.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/views/ListBooks.kt
@@ -42,7 +42,7 @@ internal fun ListBooks(
   onBookClick: (BookId) -> Unit,
   onBookLongClick: (BookId) -> Unit,
   showPermissionBugCard: Boolean,
-  onPermissionBugCardClicked: () -> Unit,
+  onPermissionBugCardClick: () -> Unit,
 ) {
   LazyColumn(
     verticalArrangement = Arrangement.spacedBy(8.dp),
@@ -50,7 +50,7 @@ internal fun ListBooks(
   ) {
     if (showPermissionBugCard) {
       item {
-        PermissionBugCard(onPermissionBugCardClicked)
+        PermissionBugCard(onPermissionBugCardClick)
       }
     }
     books.forEach { (category, books) ->
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/views/PermissionBugCard.kt b/bookOverview/src/main/kotlin/voice/bookOverview/views/PermissionBugCard.kt
index d461b84a65..708a139032 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/views/PermissionBugCard.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/views/PermissionBugCard.kt
@@ -17,7 +17,7 @@ import androidx.compose.ui.unit.dp
 import voice.strings.R as StringsR
 
 @Composable
-internal fun PermissionBugCard(onPermissionBugCardClicked: () -> Unit) {
+internal fun PermissionBugCard(onPermissionBugCardClick: () -> Unit) {
   Card(
     Modifier
       .padding(horizontal = 8.dp)
@@ -29,7 +29,7 @@ internal fun PermissionBugCard(onPermissionBugCardClicked: () -> Unit) {
       Text(text = stringResource(id = StringsR.string.storage_bug_subtitle))
       Spacer(modifier = Modifier.size(16.dp))
       Button(
-        onClick = onPermissionBugCardClicked,
+        onClick = onPermissionBugCardClick,
       ) {
         Text(text = stringResource(id = StringsR.string.storage_bug_button))
       }
@@ -40,5 +40,5 @@ internal fun PermissionBugCard(onPermissionBugCardClicked: () -> Unit) {
 @Composable
 @Preview
 private fun PermissionBugCardPreview() {
-  PermissionBugCard(onPermissionBugCardClicked = {})
+  PermissionBugCard(onPermissionBugCardClick = {})
 }
diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
index 441ac82da3..40ce8bd056 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt
@@ -68,12 +68,12 @@ fun BookmarkScreen(bookId: BookId) {
   BookmarkScreen(
     viewState = viewState,
     onClose = viewModel::closeScreen,
-    onAdd = viewModel::onAddClicked,
+    onAdd = viewModel::onAddClick,
     onDelete = viewModel::deleteBookmark,
-    onEdit = viewModel::onEditClicked,
-    onScrollConfirmed = viewModel::onScrollConfirmed,
+    onEdit = viewModel::onEditClick,
+    onScrollConfirm = viewModel::onScrollConfirm,
     onClick = viewModel::selectBookmark,
-    onNewBookmarkNameChosen = viewModel::addBookmark,
+    onNewBookmarkNameChoose = viewModel::addBookmark,
     onCloseDialog = viewModel::closeDialog,
     onEditBookmark = viewModel::editBookmark,
   )
@@ -86,10 +86,10 @@ internal fun BookmarkScreen(
   onAdd: () -> Unit,
   onDelete: (Bookmark.Id) -> Unit,
   onEdit: (Bookmark.Id) -> Unit,
-  onScrollConfirmed: () -> Unit,
+  onScrollConfirm: () -> Unit,
   onClick: (Bookmark.Id) -> Unit,
   onCloseDialog: () -> Unit,
-  onNewBookmarkNameChosen: (String) -> Unit,
+  onNewBookmarkNameChoose: (String) -> Unit,
   onEditBookmark: (Bookmark.Id, String) -> Unit,
   modifier: Modifier = Modifier,
 ) {
@@ -123,11 +123,11 @@ internal fun BookmarkScreen(
     },
   ) { paddingValues ->
     val lazyListState = rememberLazyListState()
-    LaunchedEffect(viewState.shouldScrollTo, onScrollConfirmed) {
+    LaunchedEffect(viewState.shouldScrollTo, onScrollConfirm) {
       val index = viewState.bookmarks.indexOfFirst { it.id == viewState.shouldScrollTo }
       if (index != -1) {
         lazyListState.animateScrollToItem(index)
-        onScrollConfirmed()
+        onScrollConfirm()
       }
     }
     LazyColumn(
@@ -156,7 +156,7 @@ internal fun BookmarkScreen(
     BookmarkDialogViewState.AddBookmark -> {
       AddBookmarkDialog(
         onDismissRequest = onCloseDialog,
-        onBookmarkNameChosen = onNewBookmarkNameChosen,
+        onBookmarkNameChoose = onNewBookmarkNameChoose,
       )
     }
     BookmarkDialogViewState.None -> {
diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkViewModel.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkViewModel.kt
index d6d319773b..9e13d78343 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/BookmarkViewModel.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkViewModel.kt
@@ -155,7 +155,7 @@ class BookmarkViewModel
     }
   }
 
-  fun onScrollConfirmed() {
+  fun onScrollConfirm() {
     shouldScrollTo = null
   }
 
@@ -163,11 +163,11 @@ class BookmarkViewModel
     dialogViewState = BookmarkDialogViewState.None
   }
 
-  fun onAddClicked() {
+  fun onAddClick() {
     dialogViewState = BookmarkDialogViewState.AddBookmark
   }
 
-  fun onEditClicked(id: Bookmark.Id) {
+  fun onEditClick(id: Bookmark.Id) {
     val bookmark = bookmarks.find { it.id == id } ?: return
     dialogViewState = BookmarkDialogViewState.EditBookmark(id, bookmark.title)
   }
diff --git a/bookmark/src/main/kotlin/voice/bookmark/dialogs/AddBookmarkDialog.kt b/bookmark/src/main/kotlin/voice/bookmark/dialogs/AddBookmarkDialog.kt
index 47ecf38f46..adbaf954e0 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/dialogs/AddBookmarkDialog.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/dialogs/AddBookmarkDialog.kt
@@ -29,7 +29,7 @@ import voice.strings.R as StringsR
 @Composable
 internal fun AddBookmarkDialog(
   onDismissRequest: () -> Unit,
-  onBookmarkNameChosen: (String) -> Unit,
+  onBookmarkNameChoose: (String) -> Unit,
 ) {
   var bookmarkName by remember { mutableStateOf("") }
   val focusRequester = remember { FocusRequester() }
@@ -54,7 +54,7 @@ internal fun AddBookmarkDialog(
           ),
           keyboardActions = KeyboardActions(
             onDone = {
-              onBookmarkNameChosen(bookmarkName)
+              onBookmarkNameChoose(bookmarkName)
             },
           ),
           singleLine = true,
@@ -64,7 +64,7 @@ internal fun AddBookmarkDialog(
     confirmButton = {
       Button(
         onClick = {
-          onBookmarkNameChosen(bookmarkName)
+          onBookmarkNameChoose(bookmarkName)
           onDismissRequest()
         },
       ) {
diff --git a/folderPicker/src/main/kotlin/voice/folderPicker/selectType/FolderModeSelectionCard.kt b/folderPicker/src/main/kotlin/voice/folderPicker/selectType/FolderModeSelectionCard.kt
index 185bd0087c..a6e4d232af 100644
--- a/folderPicker/src/main/kotlin/voice/folderPicker/selectType/FolderModeSelectionCard.kt
+++ b/folderPicker/src/main/kotlin/voice/folderPicker/selectType/FolderModeSelectionCard.kt
@@ -25,7 +25,7 @@ import voice.strings.R as StringsR
 
 @Composable
 internal fun FolderModeSelectionCard(
-  onFolderModeSelected: (FolderMode) -> Unit,
+  onFolderModeSelect: (FolderMode) -> Unit,
   selectedFolderMode: FolderMode,
 ) {
   Card(
@@ -38,7 +38,7 @@ internal fun FolderModeSelectionCard(
       verticalArrangement = Arrangement.spacedBy(8.dp),
     ) {
       FolderMode.entries.forEach { folderMode ->
-        val selectFolder = { onFolderModeSelected(folderMode) }
+        val selectFolder = { onFolderModeSelect(folderMode) }
         FolderModeColumn(selectFolder = selectFolder, selectedFolderMode = selectedFolderMode, folderMode = folderMode)
       }
     }
@@ -92,7 +92,7 @@ private fun FolderMode.title(): Int {
 private fun FolderModeSelectionCardPreview() {
   VoiceTheme {
     FolderModeSelectionCard(
-      onFolderModeSelected = {},
+      onFolderModeSelect = {},
       selectedFolderMode = FolderMode.Audiobooks,
     )
   }
diff --git a/folderPicker/src/main/kotlin/voice/folderPicker/selectType/SelectFolderType.kt b/folderPicker/src/main/kotlin/voice/folderPicker/selectType/SelectFolderType.kt
index f252807b7b..aa814d8bb7 100644
--- a/folderPicker/src/main/kotlin/voice/folderPicker/selectType/SelectFolderType.kt
+++ b/folderPicker/src/main/kotlin/voice/folderPicker/selectType/SelectFolderType.kt
@@ -60,7 +60,7 @@ fun SelectFolderType(
   }
   SelectFolderType(
     viewState = viewModel.viewState(),
-    onFolderModeSelected = viewModel::setFolderMode,
+    onFolderModeSelect = viewModel::setFolderMode,
     onAddClick = viewModel::add,
     onBackClick = viewModel::onCloseClick,
   )
@@ -69,7 +69,7 @@ fun SelectFolderType(
 @Composable
 private fun SelectFolderType(
   viewState: SelectFolderTypeViewState,
-  onFolderModeSelected: (FolderMode) -> Unit,
+  onFolderModeSelect: (FolderMode) -> Unit,
   onAddClick: () -> Unit,
   onBackClick: () -> Unit,
 ) {
@@ -85,7 +85,7 @@ private fun SelectFolderType(
   ) { contentPadding ->
     Content(
       contentPadding = contentPadding,
-      onFolderModeSelected = onFolderModeSelected,
+      onFolderModeSelect = onFolderModeSelect,
       viewState = viewState,
     )
   }
@@ -95,7 +95,7 @@ private fun SelectFolderType(
 private fun Content(
   contentPadding: PaddingValues,
   viewState: SelectFolderTypeViewState,
-  onFolderModeSelected: (FolderMode) -> Unit,
+  onFolderModeSelect: (FolderMode) -> Unit,
 ) {
   LazyVerticalGrid(
     columns = GridCells.Adaptive(150.dp),
@@ -107,7 +107,7 @@ private fun Content(
       span = { GridItemSpan(maxLineSpan) },
     ) {
       FolderModeSelectionCard(
-        onFolderModeSelected = onFolderModeSelected,
+        onFolderModeSelect = onFolderModeSelect,
         selectedFolderMode = viewState.selectedFolderMode,
       )
     }
@@ -186,7 +186,7 @@ private fun AppBar(
 private fun SelectFolderTypePreview() {
   SelectFolderType(
     onBackClick = {},
-    onFolderModeSelected = {},
+    onFolderModeSelect = {},
     viewState = SelectFolderTypeViewState(
       books = listOf(
         SelectFolderTypeViewState.Book("Cats", 42),
diff --git a/migration/src/main/kotlin/voice/migration/MigrationViewModel.kt b/migration/src/main/kotlin/voice/migration/MigrationViewModel.kt
index 03a95182f6..d856d5419d 100644
--- a/migration/src/main/kotlin/voice/migration/MigrationViewModel.kt
+++ b/migration/src/main/kotlin/voice/migration/MigrationViewModel.kt
@@ -36,17 +36,17 @@ class MigrationViewModel
     var showDeletionConfirmationDialog by remember {
       mutableStateOf(false)
     }
-    val onDeleteClicked = {
+    val onDeleteClick = {
       showDeletionConfirmationDialog = true
     }
-    val onDeletionAborted = {
+    val onDeletionAbort = {
       showDeletionConfirmationDialog = false
     }
     var items by remember {
       mutableStateOf(listOf<MigrationViewState.Item>())
     }
     val scope = rememberCoroutineScope()
-    val onDeletionConfirmed: () -> Unit = {
+    val onDeletionConfirm: () -> Unit = {
       showDeletionConfirmationDialog = false
       scope.launch {
         dao.deleteAll()
@@ -59,10 +59,10 @@ class MigrationViewModel
 
     return MigrationViewState(
       items = items,
-      onDeleteClicked = onDeleteClicked,
+      onDeleteClick = onDeleteClick,
       showDeletionConfirmationDialog = showDeletionConfirmationDialog,
-      onDeletionConfirmed = onDeletionConfirmed,
-      onDeletionAborted = onDeletionAborted,
+      onDeletionConfirm = onDeletionConfirm,
+      onDeletionAbort = onDeletionAbort,
     )
   }
 
diff --git a/migration/src/main/kotlin/voice/migration/views/Migration.kt b/migration/src/main/kotlin/voice/migration/views/Migration.kt
index e7ca555f48..ee4db3d359 100644
--- a/migration/src/main/kotlin/voice/migration/views/Migration.kt
+++ b/migration/src/main/kotlin/voice/migration/views/Migration.kt
@@ -55,7 +55,7 @@ fun Migration() {
   val viewState = viewModel.viewState()
   Migration(
     viewState = viewState,
-    onCloseClicked = {
+    onCloseClick = {
       viewModel.onCloseClick()
     },
   )
@@ -64,7 +64,7 @@ fun Migration() {
 @Composable
 internal fun Migration(
   viewState: MigrationViewState,
-  onCloseClicked: () -> Unit,
+  onCloseClick: () -> Unit,
 ) {
   val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()
   Scaffold(
@@ -77,7 +77,7 @@ internal fun Migration(
         },
         navigationIcon = {
           IconButton(
-            onClick = onCloseClicked,
+            onClick = onCloseClick,
           ) {
             Icon(
               imageVector = Icons.Outlined.Close,
@@ -88,7 +88,7 @@ internal fun Migration(
       )
     },
     floatingActionButton = {
-      FloatingActionButton(onClick = viewState.onDeleteClicked) {
+      FloatingActionButton(onClick = viewState.onDeleteClick) {
         Icon(
           imageVector = Icons.Outlined.Delete,
           contentDescription = stringResource(id = StringsR.string.delete),
@@ -106,8 +106,8 @@ internal fun Migration(
     }
     if (viewState.showDeletionConfirmationDialog) {
       DeletionConfirmationDialog(
-        onCancel = viewState.onDeletionAborted,
-        onConfirm = viewState.onDeletionConfirmed,
+        onCancel = viewState.onDeletionAbort,
+        onConfirm = viewState.onDeletionConfirm,
       )
     }
   }
@@ -236,7 +236,7 @@ private fun MigrationPreview(
   viewState: MigrationViewState,
 ) {
   VoiceTheme {
-    Migration(viewState, onCloseClicked = {})
+    Migration(viewState, onCloseClick = {})
   }
 }
 
@@ -272,10 +272,10 @@ internal class MigrationViewStatePreviewProvider : PreviewParameterProvider<Migr
       yield(
         MigrationViewState(
           items = listOf(item(), item()),
-          onDeleteClicked = {},
+          onDeleteClick = {},
           showDeletionConfirmationDialog = false,
-          onDeletionConfirmed = {},
-          onDeletionAborted = {},
+          onDeletionConfirm = {},
+          onDeletionAbort = {},
         ),
       )
     }
diff --git a/migration/src/main/kotlin/voice/migration/views/MigrationViewState.kt b/migration/src/main/kotlin/voice/migration/views/MigrationViewState.kt
index 862111fba4..2193480004 100644
--- a/migration/src/main/kotlin/voice/migration/views/MigrationViewState.kt
+++ b/migration/src/main/kotlin/voice/migration/views/MigrationViewState.kt
@@ -4,10 +4,10 @@ import java.time.Instant
 
 internal data class MigrationViewState(
   val items: List<Item>,
-  val onDeleteClicked: () -> Unit,
+  val onDeleteClick: () -> Unit,
   val showDeletionConfirmationDialog: Boolean,
-  val onDeletionConfirmed: () -> Unit,
-  val onDeletionAborted: () -> Unit,
+  val onDeletionConfirm: () -> Unit,
+  val onDeletionAbort: () -> Unit,
 ) {
   data class Item(
     val name: String,
diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayController.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayController.kt
index c85a8e5fca..896e26062a 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayController.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayController.kt
@@ -70,16 +70,16 @@ class BookPlayController(bundle: Bundle) : ComposeController(bundle) {
       onFastForwardClick = viewModel::fastForward,
       onRewindClick = viewModel::rewind,
       onSeek = viewModel::seekTo,
-      onBookmarkClick = viewModel::onBookmarkClicked,
-      onBookmarkLongClick = viewModel::onBookmarkLongClicked,
+      onBookmarkClick = viewModel::onBookmarkClick,
+      onBookmarkLongClick = viewModel::onBookmarkLongClick,
       onSkipSilenceClick = viewModel::toggleSkipSilence,
       onSleepTimerClick = viewModel::toggleSleepTimer,
-      onVolumeBoostClick = viewModel::onVolumeGainIconClicked,
-      onSpeedChangeClick = viewModel::onPlaybackSpeedIconClicked,
+      onVolumeBoostClick = viewModel::onVolumeGainIconClick,
+      onSpeedChangeClick = viewModel::onPlaybackSpeedIconClick,
       onCloseClick = { router.popController(this@BookPlayController) },
       onSkipToNext = viewModel::next,
       onSkipToPrevious = viewModel::previous,
-      onCurrentChapterClick = viewModel::onCurrentChapterClicked,
+      onCurrentChapterClick = viewModel::onCurrentChapterClick,
       useLandscapeLayout = LocalConfiguration.current.orientation == ORIENTATION_LANDSCAPE,
       snackbarHostState = snackbarHostState,
     )
diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewModel.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewModel.kt
index d01e55aee7..c7b406dd72 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewModel.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewModel.kt
@@ -193,7 +193,7 @@ class BookPlayViewModel
     player.fastForward()
   }
 
-  fun onCurrentChapterClicked() {
+  fun onCurrentChapterClick() {
     scope.launch {
       val book = bookRepository.get(bookId) ?: return@launch
       val chapterMarks = book.chapters.flatMap {
@@ -207,7 +207,7 @@ class BookPlayViewModel
     }
   }
 
-  fun onChapterClicked(index: Int) {
+  fun onChapterClick(index: Int) {
     scope.launch {
       val book = bookRepository.get(bookId) ?: return@launch
       var currentIndex = -1
@@ -224,7 +224,7 @@ class BookPlayViewModel
     }
   }
 
-  fun onPlaybackSpeedIconClicked() {
+  fun onPlaybackSpeedIconClick() {
     scope.launch {
       val playbackSpeed = bookRepository.get(bookId)?.content?.playbackSpeed
       if (playbackSpeed != null) {
@@ -233,7 +233,7 @@ class BookPlayViewModel
     }
   }
 
-  fun onVolumeGainIconClicked() {
+  fun onVolumeGainIconClick() {
     scope.launch {
       val content = bookRepository.get(bookId)?.content
       if (content != null) {
@@ -250,11 +250,11 @@ class BookPlayViewModel
     )
   }
 
-  fun onBookmarkClicked() {
+  fun onBookmarkClick() {
     navigator.goTo(Destination.Bookmarks(bookId))
   }
 
-  fun onBookmarkLongClicked() {
+  fun onBookmarkLongClick() {
     scope.launch {
       val book = bookRepository.get(bookId) ?: return@launch
       bookmarkRepository.addBookmarkAtBookPosition(
diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/SelectChapterDialog.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/SelectChapterDialog.kt
index f2d14e3ca2..4f2995b1c3 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/SelectChapterDialog.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/SelectChapterDialog.kt
@@ -33,7 +33,7 @@ internal fun SelectChapterDialog(
             ListItem(
               colors = ListItemDefaults.colors(containerColor = Color.Transparent),
               modifier = Modifier.clickable {
-                viewModel.onChapterClicked(index)
+                viewModel.onChapterClick(index)
               },
               headlineContent = {
                 Text(text = chapter.name ?: "")
diff --git a/review/play/src/main/kotlin/voice/review/AskForReviewDialog.kt b/review/play/src/main/kotlin/voice/review/AskForReviewDialog.kt
index de91af2d8c..7d13e74e06 100644
--- a/review/play/src/main/kotlin/voice/review/AskForReviewDialog.kt
+++ b/review/play/src/main/kotlin/voice/review/AskForReviewDialog.kt
@@ -28,8 +28,8 @@ import voice.strings.R as StringsR
 
 @Composable
 internal fun AskForReviewDialog(
-  onReviewed: (Int) -> Unit,
-  onReviewDenied: () -> Unit,
+  onReview: (Int) -> Unit,
+  onReviewDeny: () -> Unit,
   onDismiss: () -> Unit,
 ) {
   var selectedStars by remember { mutableIntStateOf(5) }
@@ -70,14 +70,14 @@ internal fun AskForReviewDialog(
       }
     },
     dismissButton = {
-      TextButton(onClick = onReviewDenied) {
+      TextButton(onClick = onReviewDeny) {
         Text(stringResource(StringsR.string.review_request_button_no))
       }
     },
     confirmButton = {
       TextButton(
         onClick = {
-          onReviewed(selectedStars)
+          onReview(selectedStars)
         },
       ) {
         Text(stringResource(StringsR.string.review_request_button_yes))
@@ -90,8 +90,8 @@ internal fun AskForReviewDialog(
 @Preview
 private fun AskForReviewDialogPreview() {
   AskForReviewDialog(
-    onReviewed = {},
-    onReviewDenied = {},
+    onReview = {},
+    onReviewDeny = {},
     onDismiss = {},
   )
 }
diff --git a/review/play/src/main/kotlin/voice/review/ReviewFeature.kt b/review/play/src/main/kotlin/voice/review/ReviewFeature.kt
index 993ea95044..6a377a8d93 100644
--- a/review/play/src/main/kotlin/voice/review/ReviewFeature.kt
+++ b/review/play/src/main/kotlin/voice/review/ReviewFeature.kt
@@ -51,7 +51,7 @@ fun ReviewFeature() {
     val reviewManager = reviewComponent.reviewManager
     val activity = LocalContext.current.findActivity() ?: return
     AskForReviewDialog(
-      onReviewed = { stars ->
+      onReview = { stars ->
         Logger.d("User rated $stars")
         scope.launch {
           shouldShowReviewDialog.setShown()
@@ -67,7 +67,7 @@ fun ReviewFeature() {
           showReviewDialog = false
         }
       },
-      onReviewDenied = {
+      onReviewDeny = {
         showReviewDialog = false
         scope.launch {
           shouldShowReviewDialog.setShown()
diff --git a/settings/src/main/kotlin/voice/settings/SettingsListener.kt b/settings/src/main/kotlin/voice/settings/SettingsListener.kt
index d87a907d0c..16e705898c 100644
--- a/settings/src/main/kotlin/voice/settings/SettingsListener.kt
+++ b/settings/src/main/kotlin/voice/settings/SettingsListener.kt
@@ -5,9 +5,9 @@ interface SettingsListener {
   fun toggleDarkTheme()
   fun toggleGrid()
   fun seekAmountChanged(seconds: Int)
-  fun onSeekAmountRowClicked()
-  fun autoRewindAmountChanged(seconds: Int)
-  fun onAutoRewindRowClicked()
+  fun onSeekAmountRowClick()
+  fun autoRewindAmountChang(seconds: Int)
+  fun onAutoRewindRowClick()
   fun dismissDialog()
   fun getSupport()
   fun suggestIdea()
diff --git a/settings/src/main/kotlin/voice/settings/SettingsViewModel.kt b/settings/src/main/kotlin/voice/settings/SettingsViewModel.kt
index d1c22de7cc..f0263b3346 100644
--- a/settings/src/main/kotlin/voice/settings/SettingsViewModel.kt
+++ b/settings/src/main/kotlin/voice/settings/SettingsViewModel.kt
@@ -80,15 +80,15 @@ class SettingsViewModel
     seekTimePref.value = seconds
   }
 
-  override fun onSeekAmountRowClicked() {
+  override fun onSeekAmountRowClick() {
     dialog.value = SettingsViewState.Dialog.SeekTime
   }
 
-  override fun autoRewindAmountChanged(seconds: Int) {
+  override fun autoRewindAmountChang(seconds: Int) {
     autoRewindAmountPref.value = seconds
   }
 
-  override fun onAutoRewindRowClicked() {
+  override fun onAutoRewindRowClick() {
     dialog.value = SettingsViewState.Dialog.AutoRewindAmount
   }
 
diff --git a/settings/src/main/kotlin/voice/settings/views/AutoRewindRow.kt b/settings/src/main/kotlin/voice/settings/views/AutoRewindRow.kt
index a2dde50283..59ebff00be 100644
--- a/settings/src/main/kotlin/voice/settings/views/AutoRewindRow.kt
+++ b/settings/src/main/kotlin/voice/settings/views/AutoRewindRow.kt
@@ -48,7 +48,7 @@ internal fun AutoRewindRow(
 @Composable
 internal fun AutoRewindAmountDialog(
   currentSeconds: Int,
-  onSecondsConfirmed: (Int) -> Unit,
+  onSecondsConfirm: (Int) -> Unit,
   onDismiss: () -> Unit,
 ) {
   TimeSettingDialog(
@@ -57,7 +57,7 @@ internal fun AutoRewindAmountDialog(
     minSeconds = 0,
     maxSeconds = 20,
     textPluralRes = StringsR.plurals.seconds,
-    onSecondsConfirmed = onSecondsConfirmed,
+    onSecondsConfirm = onSecondsConfirm,
     onDismiss = onDismiss,
   )
 }
diff --git a/settings/src/main/kotlin/voice/settings/views/SeekTimeRow.kt b/settings/src/main/kotlin/voice/settings/views/SeekTimeRow.kt
index 725f655e63..438ea4be21 100644
--- a/settings/src/main/kotlin/voice/settings/views/SeekTimeRow.kt
+++ b/settings/src/main/kotlin/voice/settings/views/SeekTimeRow.kt
@@ -48,7 +48,7 @@ internal fun SeekTimeRow(
 @Composable
 internal fun SeekAmountDialog(
   currentSeconds: Int,
-  onSecondsConfirmed: (Int) -> Unit,
+  onSecondsConfirm: (Int) -> Unit,
   onDismiss: () -> Unit,
 ) {
   TimeSettingDialog(
@@ -57,7 +57,7 @@ internal fun SeekAmountDialog(
     minSeconds = 3,
     maxSeconds = 60,
     textPluralRes = StringsR.plurals.seconds,
-    onSecondsConfirmed = onSecondsConfirmed,
+    onSecondsConfirm = onSecondsConfirm,
     onDismiss = onDismiss,
   )
 }
diff --git a/settings/src/main/kotlin/voice/settings/views/Settings.kt b/settings/src/main/kotlin/voice/settings/views/Settings.kt
index b6bcc34d78..2f80e52740 100644
--- a/settings/src/main/kotlin/voice/settings/views/Settings.kt
+++ b/settings/src/main/kotlin/voice/settings/views/Settings.kt
@@ -57,9 +57,9 @@ private fun SettingsPreview() {
         override fun close() {}
         override fun toggleDarkTheme() {}
         override fun seekAmountChanged(seconds: Int) {}
-        override fun onSeekAmountRowClicked() {}
-        override fun autoRewindAmountChanged(seconds: Int) {}
-        override fun onAutoRewindRowClicked() {}
+        override fun onSeekAmountRowClick() {}
+        override fun autoRewindAmountChang(seconds: Int) {}
+        override fun onAutoRewindRowClick() {}
         override fun dismissDialog() {}
         override fun openTranslations() {}
         override fun getSupport() {}
@@ -131,10 +131,10 @@ private fun Settings(
           },
         )
         SeekTimeRow(viewState.seekTimeInSeconds) {
-          listener.onSeekAmountRowClicked()
+          listener.onSeekAmountRowClick()
         }
         AutoRewindRow(viewState.autoRewindInSeconds) {
-          listener.onAutoRewindRowClicked()
+          listener.onAutoRewindRowClick()
         }
         ListItem(
           modifier = Modifier.clickable { listener.suggestIdea() },
@@ -185,14 +185,14 @@ private fun Dialog(
     SettingsViewState.Dialog.AutoRewindAmount -> {
       AutoRewindAmountDialog(
         currentSeconds = viewState.autoRewindInSeconds,
-        onSecondsConfirmed = listener::autoRewindAmountChanged,
+        onSecondsConfirm = listener::autoRewindAmountChang,
         onDismiss = listener::dismissDialog,
       )
     }
     SettingsViewState.Dialog.SeekTime -> {
       SeekAmountDialog(
         currentSeconds = viewState.seekTimeInSeconds,
-        onSecondsConfirmed = listener::seekAmountChanged,
+        onSecondsConfirm = listener::seekAmountChanged,
         onDismiss = listener::dismissDialog,
       )
     }
diff --git a/settings/src/main/kotlin/voice/settings/views/TimeSettingDialog.kt b/settings/src/main/kotlin/voice/settings/views/TimeSettingDialog.kt
index 376b333991..ab6e4f4640 100644
--- a/settings/src/main/kotlin/voice/settings/views/TimeSettingDialog.kt
+++ b/settings/src/main/kotlin/voice/settings/views/TimeSettingDialog.kt
@@ -23,7 +23,7 @@ fun TimeSettingDialog(
   @PluralsRes textPluralRes: Int,
   minSeconds: Int,
   maxSeconds: Int,
-  onSecondsConfirmed: (Int) -> Unit,
+  onSecondsConfirm: (Int) -> Unit,
   onDismiss: () -> Unit,
 ) {
   var sliderValue by remember { mutableFloatStateOf(currentSeconds.toFloat()) }
@@ -53,7 +53,7 @@ fun TimeSettingDialog(
     confirmButton = {
       TextButton(
         onClick = {
-          onSecondsConfirmed(sliderValue.roundToInt())
+          onSecondsConfirm(sliderValue.roundToInt())
           onDismiss()
         },
       ) {

From 7632b76026dca4617e0512dbce6e484dff671ade Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2024 22:58:55 +0000
Subject: [PATCH 141/236] Update dependency gradle to v8.10.2

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1ed247ec13..79eb9d003f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From 9e9a46a9475b22f270bd761ec1806ba53e1c7c76 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 24 Sep 2024 14:14:53 +0000
Subject: [PATCH 142/236] Update actions/setup-java action to v4.4.0

---
 .github/workflows/voice.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index baac0050f4..d407808be7 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -31,7 +31,7 @@ jobs:
         uses: gradle/gradle-build-action@v3
 
       - name: Set up JDK
-        uses: actions/setup-java@v4.3.0
+        uses: actions/setup-java@v4.4.0
         with:
           distribution: 'zulu'
           java-version: 17
@@ -64,7 +64,7 @@ jobs:
       - uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc
 
       - name: Set up JDK
-        uses: actions/setup-java@v4.3.0
+        uses: actions/setup-java@v4.4.0
         with:
           distribution: 'zulu'
           java-version: 17

From e1f9e9ce91ac0860d1114d379a5edca82e08a67c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 25 Sep 2024 20:05:32 +0000
Subject: [PATCH 143/236] Update actions/checkout digest to d632683

---
 .github/workflows/voice.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index d407808be7..1213965067 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -61,7 +61,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
 
       - name: Set up JDK
         uses: actions/setup-java@v4.4.0

From c4b3bfb95ca567d16f1db9b63713b8f67b3bb78a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 1 Oct 2024 19:08:43 +0000
Subject: [PATCH 144/236] Update agp to v8.7.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2acecacdf8..f1fc65ea32 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ materialDialog = "3.3.0"
 dagger = "2.52"
 kotlin = "2.0.20"
 media3 = "1.3.1"
-agp = "8.6.1"
+agp = "8.7.0"
 ktlint-core = "1.3.1"
 ktlint-gradlePlugin = "0.10.0"
 retrofit = "2.11.0"

From 4a57298dd128c408d0bf96a77beff773b911266f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 2 Oct 2024 00:32:58 +0000
Subject: [PATCH 145/236] Update actions/checkout digest to de5a000

---
 .github/workflows/voice.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index 1213965067..54b81cb491 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -61,7 +61,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+      - uses: actions/checkout@de5a000abf73b6f4965bd1bcdf8f8d94a56ea815
 
       - name: Set up JDK
         uses: actions/setup-java@v4.4.0

From 1c12b29299ae5fdea3c53494716dcff8e9472e38 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 2 Oct 2024 19:32:13 +0000
Subject: [PATCH 146/236] Update dependency androidx.compose:compose-bom to
 v2024.09.03

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f1fc65ea32..a6ab78cdcf 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -94,7 +94,7 @@ media3-testUtils-robolectric = { module = "androidx.media3:media3-test-utils-rob
 
 lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.6"
 
-compose-bom = "androidx.compose:compose-bom:2024.09.02"
+compose-bom = "androidx.compose:compose-bom:2024.09.03"
 compose-ui-ui = { module = "androidx.compose.ui:ui" }
 compose-ui-tooling-core = { module = "androidx.compose.ui:ui-tooling" }
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }

From ae752782036521fb1362aebbae4ff2357cc7d65a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 3 Oct 2024 13:57:14 +0000
Subject: [PATCH 147/236] Update dependency io.nlopez.compose.rules:ktlint to
 v0.4.14

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a6ab78cdcf..cfd7af30d9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -113,7 +113,7 @@ compose-navigation = "dev.olshevski.navigation:reimagined:1.5.0"
 
 ktlint-core = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint-core" }
 ktlint-gradlePlugin = { module = "io.github.usefulness:ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
-ktlint-compose = "io.nlopez.compose.rules:ktlint:0.4.12"
+ktlint-compose = "io.nlopez.compose.rules:ktlint:0.4.14"
 
 [bundles]
 compose = [

From 8053d92070e0bbc50303436c0a2a9e4f2161875e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 3 Oct 2024 13:57:10 +0000
Subject: [PATCH 148/236] Update actions/checkout digest to 6b42224

---
 .github/workflows/voice.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index 54b81cb491..c2dd00bab3 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -61,7 +61,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@de5a000abf73b6f4965bd1bcdf8f8d94a56ea815
+      - uses: actions/checkout@6b42224f41ee5dfe5395e27c8b2746f1f9955030
 
       - name: Set up JDK
         uses: actions/setup-java@v4.4.0

From fb7467cdf33b5df68e46f8fde2390b701100a870 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 3 Oct 2024 16:18:20 +0000
Subject: [PATCH 149/236] Update dependency io.nlopez.compose.rules:ktlint to
 v0.4.15

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index cfd7af30d9..4f94d24d39 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -113,7 +113,7 @@ compose-navigation = "dev.olshevski.navigation:reimagined:1.5.0"
 
 ktlint-core = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint-core" }
 ktlint-gradlePlugin = { module = "io.github.usefulness:ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
-ktlint-compose = "io.nlopez.compose.rules:ktlint:0.4.14"
+ktlint-compose = "io.nlopez.compose.rules:ktlint:0.4.15"
 
 [bundles]
 compose = [

From 3926962d960f0da99995b0bc2bc39c94a771ea90 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2024 16:44:48 +0000
Subject: [PATCH 150/236] Update actions/checkout digest to eef6144

---
 .github/workflows/voice.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index c2dd00bab3..86c444df99 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -61,7 +61,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@6b42224f41ee5dfe5395e27c8b2746f1f9955030
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
 
       - name: Set up JDK
         uses: actions/setup-java@v4.4.0

From 483cf689a0dbbe4d6e3087c282246298ebd6e4f5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 9 Oct 2024 10:03:23 +0000
Subject: [PATCH 151/236] Update dependency io.mockk:mockk to v1.13.13

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4f94d24d39..4a1b2101a2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,7 +26,7 @@ leakcanary-plumber = { module = "com.squareup.leakcanary:plumber-android-startup
 material = "com.google.android.material:material:1.12.0"
 ffmpeg = "com.arthenica:ffmpeg-kit-audio:6.0-2"
 junit = "junit:junit:4.13.2"
-mockk = "io.mockk:mockk:1.13.12"
+mockk = "io.mockk:mockk:1.13.13"
 paging-runtime = "androidx.paging:paging-runtime-ktx:3.3.2"
 paging-compose = "androidx.paging:paging-compose:3.3.2"
 retrofit-core = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }

From a595e5be9ad531ecf0d6e496d79dd633b82bd6de Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 10 Oct 2024 10:14:56 +0000
Subject: [PATCH 152/236] Update Kotlin, KSP to v2.0.21

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4a1b2101a2..7978ad8c7f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ room = "2.6.1"
 prefs = "1.0.1"
 materialDialog = "3.3.0"
 dagger = "2.52"
-kotlin = "2.0.20"
+kotlin = "2.0.21"
 media3 = "1.3.1"
 agp = "8.7.0"
 ktlint-core = "1.3.1"

From 7db870f38adbb31663650a51f8698cec414d0586 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 11 Oct 2024 06:11:49 +0000
Subject: [PATCH 153/236] Update plugin ksp to v2.0.21-1.0.25

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7978ad8c7f..7c7a147143 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -156,7 +156,7 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 anvil = { id = "com.squareup.anvil", version = "2.5.0-beta11" }
 ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
-ksp = { id = "com.google.devtools.ksp", version = "2.0.20-1.0.25" }
+ksp = { id = "com.google.devtools.ksp", version = "2.0.21-1.0.25" }
 playPublish = { id = "com.github.triplet.play", version = "3.11.0" }
 android-app = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }

From ab952807dbb0e7c1e604d4afcc0882f6a87675f8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 14 Oct 2024 10:57:47 +0000
Subject: [PATCH 154/236] Update dependency io.nlopez.compose.rules:ktlint to
 v0.4.16

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7c7a147143..7b8ed966d1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -113,7 +113,7 @@ compose-navigation = "dev.olshevski.navigation:reimagined:1.5.0"
 
 ktlint-core = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint-core" }
 ktlint-gradlePlugin = { module = "io.github.usefulness:ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
-ktlint-compose = "io.nlopez.compose.rules:ktlint:0.4.15"
+ktlint-compose = "io.nlopez.compose.rules:ktlint:0.4.16"
 
 [bundles]
 compose = [

From ed7bb5a90dc565c3d561bd9becc8c94e22fb8ccf Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 14 Oct 2024 20:44:01 +0000
Subject: [PATCH 155/236] Update agp to v8.7.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7b8ed966d1..f67e99d2c8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ materialDialog = "3.3.0"
 dagger = "2.52"
 kotlin = "2.0.21"
 media3 = "1.3.1"
-agp = "8.7.0"
+agp = "8.7.1"
 ktlint-core = "1.3.1"
 ktlint-gradlePlugin = "0.10.0"
 retrofit = "2.11.0"

From 6cc6bc543dfabec3f1fc85cb4544c1c9232bdc22 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 16 Oct 2024 17:12:28 +0000
Subject: [PATCH 156/236] Update dependency androidx.test:orchestrator to
 v1.5.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f67e99d2c8..3718d0f948 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -69,7 +69,7 @@ androidX-test-runner = "androidx.test:runner:1.6.2"
 androidX-test-junit = "androidx.test.ext:junit:1.2.1"
 androidX-test-core = "androidx.test:core-ktx:1.6.1"
 
-androidTest-orchestrator = "androidx.test:orchestrator:1.5.0"
+androidTest-orchestrator = "androidx.test:orchestrator:1.5.1"
 androidTest-services-testServices = "androidx.test.services:test-services:1.5.0"
 androidTest-services-storage = "androidx.test.services:storage:1.5.0"
 androidTest-espresso = "androidx.test.espresso:espresso-core:3.6.1"

From 7a28b2c61806a62938724785540911011b209612 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 16 Oct 2024 17:12:32 +0000
Subject: [PATCH 157/236] Update dependency androidx.compose:compose-bom to
 v2024.10.00

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3718d0f948..2d4650aa4c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -94,7 +94,7 @@ media3-testUtils-robolectric = { module = "androidx.media3:media3-test-utils-rob
 
 lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.6"
 
-compose-bom = "androidx.compose:compose-bom:2024.09.03"
+compose-bom = "androidx.compose:compose-bom:2024.10.00"
 compose-ui-ui = { module = "androidx.compose.ui:ui" }
 compose-ui-tooling-core = { module = "androidx.compose.ui:ui-tooling" }
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }

From 601c56060589638bf3a934d2c92a65a04b95186a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 16 Oct 2024 18:15:39 +0000
Subject: [PATCH 158/236] Update dependency androidx.activity:activity-compose
 to v1.9.3

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2d4650aa4c..b606efb8ca 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -108,7 +108,7 @@ compose-material-icons-extended = { module = "androidx.compose.material:material
 compose-animation-graphics = { module = "androidx.compose.animation:animation-graphics" }
 compose-animation-animation = { module = "androidx.compose.animation:animation" }
 compose-material3 = { module = "androidx.compose.material3:material3" }
-compose-activity = "androidx.activity:activity-compose:1.9.2"
+compose-activity = "androidx.activity:activity-compose:1.9.3"
 compose-navigation = "dev.olshevski.navigation:reimagined:1.5.0"
 
 ktlint-core = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint-core" }

From c11ffb4a7e84bc7e23e7692d1636306deb803715 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 09:31:21 +0000
Subject: [PATCH 159/236] Update actions/checkout digest

---
 .github/workflows/voice.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index 86c444df99..f7532580cf 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -25,7 +25,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v3
@@ -61,7 +61,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
+      - uses: actions/checkout@163217dfcd28294438ea1c1c149cfaf66eec283e
 
       - name: Set up JDK
         uses: actions/setup-java@v4.4.0

From dace195fda28ef42c08bf5e9936389de705a89aa Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 16:54:06 +0000
Subject: [PATCH 160/236] Update dependency com.google.android.play:review-ktx
 to v2.0.2

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b606efb8ca..7f3085ac3b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -50,7 +50,7 @@ molecule = "app.cash.molecule:molecule-runtime:2.0.0"
 immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8"
 uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0"
 okhttp = "com.squareup.okhttp3:okhttp:4.12.0"
-review = "com.google.android.play:review-ktx:2.0.1"
+review = "com.google.android.play:review-ktx:2.0.2"
 lottie = "com.airbnb.android:lottie-compose:6.5.2"
 clikt = "com.github.ajalt.clikt:clikt:4.4.0"
 

From d31cad393e9a878723473bbea8818f79e78c8b2a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 23 Oct 2024 14:23:17 +0000
Subject: [PATCH 161/236] Update actions/checkout digest to e3d2460

---
 .github/workflows/voice.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index f7532580cf..42d374312d 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -61,7 +61,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@163217dfcd28294438ea1c1c149cfaf66eec283e
+      - uses: actions/checkout@e3d2460bbb42d7710191569f88069044cfb9d8cf
 
       - name: Set up JDK
         uses: actions/setup-java@v4.4.0

From f38163e293c8efeba68e4ddc4a36373f26f2415f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 23 Oct 2024 15:51:51 +0000
Subject: [PATCH 162/236] Update actions/checkout digest to 11bd719

---
 .github/workflows/voice.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index 42d374312d..34c2aec75c 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -61,7 +61,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@e3d2460bbb42d7710191569f88069044cfb9d8cf
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
       - name: Set up JDK
         uses: actions/setup-java@v4.4.0

From 04c29f7aab4e55e4b5a74b1a84b1ab8ef2ab5291 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 23 Oct 2024 22:20:32 +0000
Subject: [PATCH 163/236] Update plugin ksp to v2.0.21-1.0.26

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7f3085ac3b..ae125e71e3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -156,7 +156,7 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 anvil = { id = "com.squareup.anvil", version = "2.5.0-beta11" }
 ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
-ksp = { id = "com.google.devtools.ksp", version = "2.0.21-1.0.25" }
+ksp = { id = "com.google.devtools.ksp", version = "2.0.21-1.0.26" }
 playPublish = { id = "com.github.triplet.play", version = "3.11.0" }
 android-app = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }

From 9a8e07cc314f6aab83eabfceea00cdfbd86c5686 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 24 Oct 2024 16:18:12 +0000
Subject: [PATCH 164/236] Update actions/setup-java action to v4.5.0

---
 .github/workflows/voice.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index 34c2aec75c..8e74a85d2f 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -31,7 +31,7 @@ jobs:
         uses: gradle/gradle-build-action@v3
 
       - name: Set up JDK
-        uses: actions/setup-java@v4.4.0
+        uses: actions/setup-java@v4.5.0
         with:
           distribution: 'zulu'
           java-version: 17
@@ -64,7 +64,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
       - name: Set up JDK
-        uses: actions/setup-java@v4.4.0
+        uses: actions/setup-java@v4.5.0
         with:
           distribution: 'zulu'
           java-version: 17

From b9e6c920537439e55840909a2a4316f2527ee09e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 24 Oct 2024 16:18:17 +0000
Subject: [PATCH 165/236] Update dependency com.pinterest.ktlint:ktlint-cli to
 v1.4.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ae125e71e3..64cd6236c2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ dagger = "2.52"
 kotlin = "2.0.21"
 media3 = "1.3.1"
 agp = "8.7.1"
-ktlint-core = "1.3.1"
+ktlint-core = "1.4.0"
 ktlint-gradlePlugin = "0.10.0"
 retrofit = "2.11.0"
 

From cc71fae39bdd1b1a4f9070f73a16f3076ed8793f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 27 Oct 2024 22:29:35 +0000
Subject: [PATCH 166/236] Update dependency com.airbnb.android:lottie-compose
 to v6.6.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 64cd6236c2..93a51771af 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -51,7 +51,7 @@ immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8"
 uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0"
 okhttp = "com.squareup.okhttp3:okhttp:4.12.0"
 review = "com.google.android.play:review-ktx:2.0.2"
-lottie = "com.airbnb.android:lottie-compose:6.5.2"
+lottie = "com.airbnb.android:lottie-compose:6.6.0"
 clikt = "com.github.ajalt.clikt:clikt:4.4.0"
 
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }

From 823055e8bddf28c9cf3ccf44baa09329ae6ac204 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 28 Oct 2024 12:32:53 +0000
Subject: [PATCH 167/236] Update dependency io.nlopez.compose.rules:ktlint to
 v0.4.17

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 93a51771af..54531c726d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -113,7 +113,7 @@ compose-navigation = "dev.olshevski.navigation:reimagined:1.5.0"
 
 ktlint-core = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint-core" }
 ktlint-gradlePlugin = { module = "io.github.usefulness:ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
-ktlint-compose = "io.nlopez.compose.rules:ktlint:0.4.16"
+ktlint-compose = "io.nlopez.compose.rules:ktlint:0.4.17"
 
 [bundles]
 compose = [

From 5079d5b3def6cfeb333baad5e7a004acc16cefc4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 30 Oct 2024 17:57:53 +0000
Subject: [PATCH 168/236] Update dependency
 androidx.lifecycle:lifecycle-runtime-ktx to v2.8.7

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 54531c726d..1d1401f4f5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -92,7 +92,7 @@ media3-session = { module = "androidx.media3:media3-session", version.ref = "med
 media3-testUtils-core = { module = "androidx.media3:media3-test-utils", version.ref = "media3" }
 media3-testUtils-robolectric = { module = "androidx.media3:media3-test-utils-robolectric", version.ref = "media3" }
 
-lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.6"
+lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.7"
 
 compose-bom = "androidx.compose:compose-bom:2024.10.00"
 compose-ui-ui = { module = "androidx.compose.ui:ui" }

From 377adc7cb8ed93fd36a8cbcd6426f8d5a0dd7c2b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 30 Oct 2024 17:57:48 +0000
Subject: [PATCH 169/236] Update dependency androidx.compose:compose-bom to
 v2024.10.01

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1d1401f4f5..1092cab331 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -94,7 +94,7 @@ media3-testUtils-robolectric = { module = "androidx.media3:media3-test-utils-rob
 
 lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.7"
 
-compose-bom = "androidx.compose:compose-bom:2024.10.00"
+compose-bom = "androidx.compose:compose-bom:2024.10.01"
 compose-ui-ui = { module = "androidx.compose.ui:ui" }
 compose-ui-tooling-core = { module = "androidx.compose.ui:ui-tooling" }
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }

From 40259a8aca8257ec7c71fbf4da8df3555b7d1e2b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 31 Oct 2024 23:13:43 +0000
Subject: [PATCH 170/236] Update agp to v8.7.2

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1092cab331..a80fa36d26 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ materialDialog = "3.3.0"
 dagger = "2.52"
 kotlin = "2.0.21"
 media3 = "1.3.1"
-agp = "8.7.1"
+agp = "8.7.2"
 ktlint-core = "1.4.0"
 ktlint-gradlePlugin = "0.10.0"
 retrofit = "2.11.0"

From 8c89fc88b3e958d6fe80e23cee2f600acc2319a3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 3 Nov 2024 14:00:13 +0000
Subject: [PATCH 171/236] Update mikepenz/action-junit-report action to v5

---
 .github/workflows/voice.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index 8e74a85d2f..60f0c73c81 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -51,7 +51,7 @@ jobs:
             app/build/reports/*.html
 
       - name: Publish Test Report
-        uses: mikepenz/action-junit-report@v4
+        uses: mikepenz/action-junit-report@v5
         if: always()
         with:
           report_paths: '**/test-results/**/TEST-*.xml'

From fe3d1e8ea52a52cb34b575d53b9d214868924219 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 5 Nov 2024 18:37:26 +0000
Subject: [PATCH 172/236] Update dependency com.pinterest.ktlint:ktlint-cli to
 v1.4.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a80fa36d26..43c1476800 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ dagger = "2.52"
 kotlin = "2.0.21"
 media3 = "1.3.1"
 agp = "8.7.2"
-ktlint-core = "1.4.0"
+ktlint-core = "1.4.1"
 ktlint-gradlePlugin = "0.10.0"
 retrofit = "2.11.0"
 

From e206fe0e18f3167d80226ea9870c0cfd573052ff Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 7 Nov 2024 09:26:21 +0000
Subject: [PATCH 173/236] Update dependency com.android.tools:desugar_jdk_libs
 to v2.1.3

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 43c1476800..738eb7e605 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -38,7 +38,7 @@ appCompat = "androidx.appcompat:appcompat:1.7.0"
 androidxCore = "androidx.core:core-ktx:1.13.1"
 kotlin-pluginForGradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-compilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }
-desugar = "com.android.tools:desugar_jdk_libs:2.1.2"
+desugar = "com.android.tools:desugar_jdk_libs:2.1.3"
 documentFile = "androidx.documentfile:documentfile:1.0.1"
 koTest-assert = "io.kotest:kotest-assertions-core:5.9.1"
 datastore = "androidx.datastore:datastore-preferences:1.1.1"

From d80ef24d7b2ccb63e088f56dcfaac76bb5d32926 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 8 Nov 2024 00:28:43 +0000
Subject: [PATCH 174/236] Update plugin ksp to v2.0.21-1.0.27 (#2611)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 738eb7e605..5d0a16bd1c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -156,7 +156,7 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 anvil = { id = "com.squareup.anvil", version = "2.5.0-beta11" }
 ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
-ksp = { id = "com.google.devtools.ksp", version = "2.0.21-1.0.26" }
+ksp = { id = "com.google.devtools.ksp", version = "2.0.21-1.0.27" }
 playPublish = { id = "com.github.triplet.play", version = "3.11.0" }
 android-app = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }

From 4384f60fc26b3dfb2c3f057108754c6acc870e35 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 8 Nov 2024 16:36:15 +0000
Subject: [PATCH 175/236] Update actions/checkout digest (#2593)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/voice.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index 60f0c73c81..fdefab5b56 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -25,7 +25,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v3
@@ -61,7 +61,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - uses: actions/checkout@3b9b8c884f6b4bb4d5be2779c26374abadae0871
 
       - name: Set up JDK
         uses: actions/setup-java@v4.5.0

From 552262210359f82cf353a28f8706a4785e70bf7a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 11 Nov 2024 17:22:43 +0000
Subject: [PATCH 176/236] Update dependency gradle to v8.11 (#2614)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 79eb9d003f..7cf748e743 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From a13ffead2422740efdfae1cac0a0213412781062 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 12 Nov 2024 04:02:47 +0000
Subject: [PATCH 177/236] Update plugin playPublish to v3.12.0 (#2615)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5d0a16bd1c..e3dca3c21a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -157,6 +157,6 @@ compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "
 anvil = { id = "com.squareup.anvil", version = "2.5.0-beta11" }
 ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
 ksp = { id = "com.google.devtools.ksp", version = "2.0.21-1.0.27" }
-playPublish = { id = "com.github.triplet.play", version = "3.11.0" }
+playPublish = { id = "com.github.triplet.play", version = "3.12.0" }
 android-app = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }

From c4d8e1bfbb1111233e358c27fa582af836cf87fb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 12 Nov 2024 20:17:17 +0000
Subject: [PATCH 178/236] Update dependency io.nlopez.compose.rules:ktlint to
 v0.4.18 (#2616)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e3dca3c21a..16f65fe3ca 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -113,7 +113,7 @@ compose-navigation = "dev.olshevski.navigation:reimagined:1.5.0"
 
 ktlint-core = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint-core" }
 ktlint-gradlePlugin = { module = "io.github.usefulness:ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
-ktlint-compose = "io.nlopez.compose.rules:ktlint:0.4.17"
+ktlint-compose = "io.nlopez.compose.rules:ktlint:0.4.18"
 
 [bundles]
 compose = [

From df0e4625cc2f359fef534fd1304f60abfc6314ad Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 13 Nov 2024 12:40:47 +0000
Subject: [PATCH 179/236] Update plugin com.gradle.develocity to v3.18.2
 (#2618)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index ce3e7e851e..ffb8065882 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -31,7 +31,7 @@ dependencyResolutionManagement {
 }
 
 plugins {
-  id("com.gradle.develocity") version "3.18.1"
+  id("com.gradle.develocity") version "3.18.2"
   id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.0")
 }
 

From 7f95be8df59ab98d5da1d82671fda2f687e963c4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 13 Nov 2024 18:34:54 +0000
Subject: [PATCH 180/236] Update dependency androidx.compose:compose-bom to
 v2024.11.00 (#2621)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 16f65fe3ca..f8814dcbf6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -94,7 +94,7 @@ media3-testUtils-robolectric = { module = "androidx.media3:media3-test-utils-rob
 
 lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.7"
 
-compose-bom = "androidx.compose:compose-bom:2024.10.01"
+compose-bom = "androidx.compose:compose-bom:2024.11.00"
 compose-ui-ui = { module = "androidx.compose.ui:ui" }
 compose-ui-tooling-core = { module = "androidx.compose.ui:ui-tooling" }
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }

From 0b3a9872de758ac9693ed3ef59a4f52a94601f5a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 13 Nov 2024 18:35:34 +0000
Subject: [PATCH 181/236] Update dependency androidx.paging:paging-compose to
 v3.3.4 (#2619)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f8814dcbf6..54cd626023 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -28,7 +28,7 @@ ffmpeg = "com.arthenica:ffmpeg-kit-audio:6.0-2"
 junit = "junit:junit:4.13.2"
 mockk = "io.mockk:mockk:1.13.13"
 paging-runtime = "androidx.paging:paging-runtime-ktx:3.3.2"
-paging-compose = "androidx.paging:paging-compose:3.3.2"
+paging-compose = "androidx.paging:paging-compose:3.3.4"
 retrofit-core = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-scalars = { module = "com.squareup.retrofit2:converter-scalars", version.ref = "retrofit" }
 retrofit-serialization = { module = "com.squareup.retrofit2:converter-kotlinx-serialization", version.ref = "retrofit" }

From 8d236bd91af85be2818584cb29b779a26ab1235c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 13 Nov 2024 22:31:37 +0000
Subject: [PATCH 182/236] Update dependency androidx.paging:paging-runtime-ktx
 to v3.3.4 (#2620)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 54cd626023..792bd10b70 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -27,7 +27,7 @@ material = "com.google.android.material:material:1.12.0"
 ffmpeg = "com.arthenica:ffmpeg-kit-audio:6.0-2"
 junit = "junit:junit:4.13.2"
 mockk = "io.mockk:mockk:1.13.13"
-paging-runtime = "androidx.paging:paging-runtime-ktx:3.3.2"
+paging-runtime = "androidx.paging:paging-runtime-ktx:3.3.4"
 paging-compose = "androidx.paging:paging-compose:3.3.4"
 retrofit-core = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-scalars = { module = "com.squareup.retrofit2:converter-scalars", version.ref = "retrofit" }

From 9bf1d53be75b6dbb4dcf12eb0ea6d40c9557aa81 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 14 Nov 2024 16:55:04 +0000
Subject: [PATCH 183/236] Update actions/checkout digest to cbb7224 (#2622)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/voice.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index fdefab5b56..ddfbed9333 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -61,7 +61,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@3b9b8c884f6b4bb4d5be2779c26374abadae0871
+      - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb
 
       - name: Set up JDK
         uses: actions/setup-java@v4.5.0

From 2ecd9f28e2874946ce3ce50504d45c06de1ceebd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 15 Nov 2024 04:45:54 +0000
Subject: [PATCH 184/236] Update plugin playPublish to v3.12.1 (#2623)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 792bd10b70..0d9014710b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -157,6 +157,6 @@ compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "
 anvil = { id = "com.squareup.anvil", version = "2.5.0-beta11" }
 ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
 ksp = { id = "com.google.devtools.ksp", version = "2.0.21-1.0.27" }
-playPublish = { id = "com.github.triplet.play", version = "3.12.0" }
+playPublish = { id = "com.github.triplet.play", version = "3.12.1" }
 android-app = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }

From 4de2439289e529b5622c14e24ce561f7899d5a68 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 15 Nov 2024 09:06:34 +0000
Subject: [PATCH 185/236] Update dependency org.robolectric:robolectric to
 v4.14 (#2624)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0d9014710b..16d0b65176 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -32,7 +32,7 @@ paging-compose = "androidx.paging:paging-compose:3.3.4"
 retrofit-core = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-scalars = { module = "com.squareup.retrofit2:converter-scalars", version.ref = "retrofit" }
 retrofit-serialization = { module = "com.squareup.retrofit2:converter-kotlinx-serialization", version.ref = "retrofit" }
-robolectric = "org.robolectric:robolectric:4.13"
+robolectric = "org.robolectric:robolectric:4.14"
 coil = "io.coil-kt:coil-compose:2.7.0"
 appCompat = "androidx.appcompat:appcompat:1.7.0"
 androidxCore = "androidx.core:core-ktx:1.13.1"

From 8e49b6a5cf03cdf02d7bc473e046a80966ff2c90 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 16 Nov 2024 04:48:47 +0000
Subject: [PATCH 186/236] Update plugin ksp to v2.0.21-1.0.28 (#2625)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 16d0b65176..12c3a2a989 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -156,7 +156,7 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 anvil = { id = "com.squareup.anvil", version = "2.5.0-beta11" }
 ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
-ksp = { id = "com.google.devtools.ksp", version = "2.0.21-1.0.27" }
+ksp = { id = "com.google.devtools.ksp", version = "2.0.21-1.0.28" }
 playPublish = { id = "com.github.triplet.play", version = "3.12.1" }
 android-app = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }

From edd16398bcd4b52a5e1ed66d4ac47c3d9945464c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 19 Nov 2024 15:23:19 +0000
Subject: [PATCH 187/236] Update dependency io.nlopez.compose.rules:ktlint to
 v0.4.19 (#2626)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 12c3a2a989..6d3a154b35 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -113,7 +113,7 @@ compose-navigation = "dev.olshevski.navigation:reimagined:1.5.0"
 
 ktlint-core = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint-core" }
 ktlint-gradlePlugin = { module = "io.github.usefulness:ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
-ktlint-compose = "io.nlopez.compose.rules:ktlint:0.4.18"
+ktlint-compose = "io.nlopez.compose.rules:ktlint:0.4.19"
 
 [bundles]
 compose = [

From 654c17871af3cfdb69db4252860f8f40af28fad7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 20 Nov 2024 20:44:33 +0000
Subject: [PATCH 188/236] Update dependency gradle to v8.11.1 (#2628)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7cf748e743..c1d5e01859 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From 1fe918700a0145a9bbab448a123180b282169903 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 21 Nov 2024 04:10:38 +0000
Subject: [PATCH 189/236] Update dependency org.robolectric:robolectric to
 v4.14.1 (#2629)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6d3a154b35..9bbccb676b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -32,7 +32,7 @@ paging-compose = "androidx.paging:paging-compose:3.3.4"
 retrofit-core = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-scalars = { module = "com.squareup.retrofit2:converter-scalars", version.ref = "retrofit" }
 retrofit-serialization = { module = "com.squareup.retrofit2:converter-kotlinx-serialization", version.ref = "retrofit" }
-robolectric = "org.robolectric:robolectric:4.14"
+robolectric = "org.robolectric:robolectric:4.14.1"
 coil = "io.coil-kt:coil-compose:2.7.0"
 appCompat = "androidx.appcompat:appcompat:1.7.0"
 androidxCore = "androidx.core:core-ktx:1.13.1"

From f2a5af2371ed64db6fde7d5a69845f2d147dae5b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 27 Nov 2024 15:40:18 +0000
Subject: [PATCH 190/236] Update Kotlin, KSP to v2.1.0 (#2631)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9bbccb676b..712ba124a8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ room = "2.6.1"
 prefs = "1.0.1"
 materialDialog = "3.3.0"
 dagger = "2.52"
-kotlin = "2.0.21"
+kotlin = "2.1.0"
 media3 = "1.3.1"
 agp = "8.7.2"
 ktlint-core = "1.4.1"

From 600ffb6e84fa5704cc3e38bcef3e770c3bc5132c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 27 Nov 2024 22:56:33 +0000
Subject: [PATCH 191/236] Update plugin ksp to v2.1.0-1.0.28 (#2632)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 712ba124a8..1483f80f09 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -156,7 +156,7 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 anvil = { id = "com.squareup.anvil", version = "2.5.0-beta11" }
 ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
-ksp = { id = "com.google.devtools.ksp", version = "2.0.21-1.0.28" }
+ksp = { id = "com.google.devtools.ksp", version = "2.1.0-1.0.28" }
 playPublish = { id = "com.github.triplet.play", version = "3.12.1" }
 android-app = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }

From 99490b086868dfd3ce899f258a5a4d8453e16c64 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 28 Nov 2024 02:10:30 +0000
Subject: [PATCH 192/236] Update plugin ksp to v2.1.0-1.0.29 (#2633)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1483f80f09..dee235d070 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -156,7 +156,7 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 anvil = { id = "com.squareup.anvil", version = "2.5.0-beta11" }
 ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
-ksp = { id = "com.google.devtools.ksp", version = "2.1.0-1.0.28" }
+ksp = { id = "com.google.devtools.ksp", version = "2.1.0-1.0.29" }
 playPublish = { id = "com.github.triplet.play", version = "3.12.1" }
 android-app = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }

From 0059d82079cfe7e8d735ec29f1599708ed298e6f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 2 Dec 2024 11:18:49 +0000
Subject: [PATCH 193/236] Update plugin
 org.gradle.toolchains.foojay-resolver-convention to v0.9.0 (#2634)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 plugins/settings.gradle.kts | 2 +-
 settings.gradle.kts         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/settings.gradle.kts b/plugins/settings.gradle.kts
index 1bc45ceaa3..940e1b78e3 100644
--- a/plugins/settings.gradle.kts
+++ b/plugins/settings.gradle.kts
@@ -5,7 +5,7 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 rootProject.name = "plugins"
 
 plugins {
-  id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.0")
+  id("org.gradle.toolchains.foojay-resolver-convention") version ("0.9.0")
 }
 
 dependencyResolutionManagement {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index ffb8065882..526fe8bbd4 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -32,7 +32,7 @@ dependencyResolutionManagement {
 
 plugins {
   id("com.gradle.develocity") version "3.18.2"
-  id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.0")
+  id("org.gradle.toolchains.foojay-resolver-convention") version ("0.9.0")
 }
 
 develocity {

From 194ddfedbdaae008165b63ae2839ae155f7548b8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 2 Dec 2024 18:23:12 +0000
Subject: [PATCH 194/236] Update agp to v8.7.3 (#2635)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index dee235d070..3bf9b707c8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ materialDialog = "3.3.0"
 dagger = "2.52"
 kotlin = "2.1.0"
 media3 = "1.3.1"
-agp = "8.7.2"
+agp = "8.7.3"
 ktlint-core = "1.4.1"
 ktlint-gradlePlugin = "0.10.0"
 retrofit = "2.11.0"

From 7778bdaf226fbef71ab44592c59f8b0675219ea4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 3 Dec 2024 02:16:00 +0000
Subject: [PATCH 195/236] Update dagger to v2.53 (#2637)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3bf9b707c8..2f3aa3c75a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ coroutines = "1.8.1"
 room = "2.6.1"
 prefs = "1.0.1"
 materialDialog = "3.3.0"
-dagger = "2.52"
+dagger = "2.53"
 kotlin = "2.1.0"
 media3 = "1.3.1"
 agp = "8.7.3"

From a9d3ff643fd56a9361980bcc3a9f00ba2b389b1b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 4 Dec 2024 07:16:39 +0000
Subject: [PATCH 196/236] Update dependency com.airbnb.android:lottie-compose
 to v6.6.1 (#2638)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2f3aa3c75a..fd44687220 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -51,7 +51,7 @@ immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8"
 uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0"
 okhttp = "com.squareup.okhttp3:okhttp:4.12.0"
 review = "com.google.android.play:review-ktx:2.0.2"
-lottie = "com.airbnb.android:lottie-compose:6.6.0"
+lottie = "com.airbnb.android:lottie-compose:6.6.1"
 clikt = "com.github.ajalt.clikt:clikt:4.4.0"
 
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }

From b908ad6dc6c97006a8d449c365ef7e16c317b4de Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 4 Dec 2024 18:32:13 +0000
Subject: [PATCH 197/236] Update plugin anvil to v2.5.0 (#2639)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fd44687220..8044a3589c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -154,7 +154,7 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
-anvil = { id = "com.squareup.anvil", version = "2.5.0-beta11" }
+anvil = { id = "com.squareup.anvil", version = "2.5.0" }
 ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
 ksp = { id = "com.google.devtools.ksp", version = "2.1.0-1.0.29" }
 playPublish = { id = "com.github.triplet.play", version = "3.12.1" }

From dcca07bea503741bc4b9c41d67fb91f0cbf27309 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 4 Dec 2024 22:30:18 +0000
Subject: [PATCH 198/236] Update dependency com.pinterest.ktlint:ktlint-cli to
 v1.5.0 (#2640)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8044a3589c..296854a02e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ dagger = "2.53"
 kotlin = "2.1.0"
 media3 = "1.3.1"
 agp = "8.7.3"
-ktlint-core = "1.4.1"
+ktlint-core = "1.5.0"
 ktlint-gradlePlugin = "0.10.0"
 retrofit = "2.11.0"
 

From ee23089b4369ad419357f2b9e7215f8ddef90d00 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 9 Dec 2024 20:26:40 +0000
Subject: [PATCH 199/236] Update dagger to v2.53.1 (#2642)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 296854a02e..6ba64bef7f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ coroutines = "1.8.1"
 room = "2.6.1"
 prefs = "1.0.1"
 materialDialog = "3.3.0"
-dagger = "2.53"
+dagger = "2.53.1"
 kotlin = "2.1.0"
 media3 = "1.3.1"
 agp = "8.7.3"

From ae95afb6eca3dd7463712312ef55d70a5faf0a1f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 10 Dec 2024 14:21:39 +0000
Subject: [PATCH 200/236] Update dependency io.nlopez.compose.rules:ktlint to
 v0.4.20 (#2644)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6ba64bef7f..11e6ccff03 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -113,7 +113,7 @@ compose-navigation = "dev.olshevski.navigation:reimagined:1.5.0"
 
 ktlint-core = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint-core" }
 ktlint-gradlePlugin = { module = "io.github.usefulness:ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
-ktlint-compose = "io.nlopez.compose.rules:ktlint:0.4.19"
+ktlint-compose = "io.nlopez.compose.rules:ktlint:0.4.20"
 
 [bundles]
 compose = [

From ed878950f060a16c38475312f8706f258015f56e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 10 Dec 2024 20:53:33 +0000
Subject: [PATCH 201/236] Update dependency io.nlopez.compose.rules:ktlint to
 v0.4.22 (#2645)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 11e6ccff03..03bab5f71f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -113,7 +113,7 @@ compose-navigation = "dev.olshevski.navigation:reimagined:1.5.0"
 
 ktlint-core = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint-core" }
 ktlint-gradlePlugin = { module = "io.github.usefulness:ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
-ktlint-compose = "io.nlopez.compose.rules:ktlint:0.4.20"
+ktlint-compose = "io.nlopez.compose.rules:ktlint:0.4.22"
 
 [bundles]
 compose = [

From 868f005826ff8044cc73e7c683d828d199aeeace Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 11 Dec 2024 18:21:08 +0000
Subject: [PATCH 202/236] Update dependency androidx.paging:paging-compose to
 v3.3.5 (#2647)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 03bab5f71f..e144f39e0b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -28,7 +28,7 @@ ffmpeg = "com.arthenica:ffmpeg-kit-audio:6.0-2"
 junit = "junit:junit:4.13.2"
 mockk = "io.mockk:mockk:1.13.13"
 paging-runtime = "androidx.paging:paging-runtime-ktx:3.3.4"
-paging-compose = "androidx.paging:paging-compose:3.3.4"
+paging-compose = "androidx.paging:paging-compose:3.3.5"
 retrofit-core = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-scalars = { module = "com.squareup.retrofit2:converter-scalars", version.ref = "retrofit" }
 retrofit-serialization = { module = "com.squareup.retrofit2:converter-kotlinx-serialization", version.ref = "retrofit" }

From 852810a85bd179fb126736c43e052053c2a5e00f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 11 Dec 2024 18:23:51 +0000
Subject: [PATCH 203/236] Update dependency androidx.compose:compose-bom to
 v2024.12.01 (#2649)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e144f39e0b..380731d44b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -94,7 +94,7 @@ media3-testUtils-robolectric = { module = "androidx.media3:media3-test-utils-rob
 
 lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.7"
 
-compose-bom = "androidx.compose:compose-bom:2024.11.00"
+compose-bom = "androidx.compose:compose-bom:2024.12.01"
 compose-ui-ui = { module = "androidx.compose.ui:ui" }
 compose-ui-tooling-core = { module = "androidx.compose.ui:ui-tooling" }
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }

From 59b7aa44be5c6dceeeac4da52731e667e630610a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 11 Dec 2024 22:15:49 +0000
Subject: [PATCH 204/236] Update dependency androidx.paging:paging-runtime-ktx
 to v3.3.5 (#2648)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 380731d44b..1acb243014 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -27,7 +27,7 @@ material = "com.google.android.material:material:1.12.0"
 ffmpeg = "com.arthenica:ffmpeg-kit-audio:6.0-2"
 junit = "junit:junit:4.13.2"
 mockk = "io.mockk:mockk:1.13.13"
-paging-runtime = "androidx.paging:paging-runtime-ktx:3.3.4"
+paging-runtime = "androidx.paging:paging-runtime-ktx:3.3.5"
 paging-compose = "androidx.paging:paging-compose:3.3.5"
 retrofit-core = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-scalars = { module = "com.squareup.retrofit2:converter-scalars", version.ref = "retrofit" }

From b2c18612f065000ae18024ab4adbeb8eb0690f57 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 12 Dec 2024 13:26:58 +0000
Subject: [PATCH 205/236] Update plugin com.gradle.develocity to v3.19 (#2650)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 526fe8bbd4..88b98f3f03 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -31,7 +31,7 @@ dependencyResolutionManagement {
 }
 
 plugins {
-  id("com.gradle.develocity") version "3.18.2"
+  id("com.gradle.develocity") version "3.19"
   id("org.gradle.toolchains.foojay-resolver-convention") version ("0.9.0")
 }
 

From 8a2c2c80301e233891eecfcb85ee8b86d4572f8c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 16 Dec 2024 23:56:30 +0000
Subject: [PATCH 206/236] Update dependency com.airbnb.android:lottie-compose
 to v6.6.2 (#2654)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1acb243014..d6faad7de6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -51,7 +51,7 @@ immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8"
 uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0"
 okhttp = "com.squareup.okhttp3:okhttp:4.12.0"
 review = "com.google.android.play:review-ktx:2.0.2"
-lottie = "com.airbnb.android:lottie-compose:6.6.1"
+lottie = "com.airbnb.android:lottie-compose:6.6.2"
 clikt = "com.github.ajalt.clikt:clikt:4.4.0"
 
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }

From 37ff99c37f4b4b4dcae385c0701512817c024a28 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 18 Dec 2024 07:00:16 +0000
Subject: [PATCH 207/236] Update actions/setup-java action to v4.6.0 (#2655)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/voice.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index ddfbed9333..65eca435f9 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -31,7 +31,7 @@ jobs:
         uses: gradle/gradle-build-action@v3
 
       - name: Set up JDK
-        uses: actions/setup-java@v4.5.0
+        uses: actions/setup-java@v4.6.0
         with:
           distribution: 'zulu'
           java-version: 17
@@ -64,7 +64,7 @@ jobs:
       - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb
 
       - name: Set up JDK
-        uses: actions/setup-java@v4.5.0
+        uses: actions/setup-java@v4.6.0
         with:
           distribution: 'zulu'
           java-version: 17

From e7203332784ec16827f973c5409787e929aa9f34 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 20 Dec 2024 11:58:10 +0000
Subject: [PATCH 208/236] Update dependency com.android.tools:desugar_jdk_libs
 to v2.1.4 (#2658)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d6faad7de6..a61133651d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -38,7 +38,7 @@ appCompat = "androidx.appcompat:appcompat:1.7.0"
 androidxCore = "androidx.core:core-ktx:1.13.1"
 kotlin-pluginForGradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-compilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }
-desugar = "com.android.tools:desugar_jdk_libs:2.1.3"
+desugar = "com.android.tools:desugar_jdk_libs:2.1.4"
 documentFile = "androidx.documentfile:documentfile:1.0.1"
 koTest-assert = "io.kotest:kotest-assertions-core:5.9.1"
 datastore = "androidx.datastore:datastore-preferences:1.1.1"

From 378cd6bb820f9065163f6a49a5489602534649a5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 20 Dec 2024 17:24:39 +0000
Subject: [PATCH 209/236] Update dependency io.mockk:mockk to v1.13.14 (#2659)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a61133651d..4c190c1fae 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,7 +26,7 @@ leakcanary-plumber = { module = "com.squareup.leakcanary:plumber-android-startup
 material = "com.google.android.material:material:1.12.0"
 ffmpeg = "com.arthenica:ffmpeg-kit-audio:6.0-2"
 junit = "junit:junit:4.13.2"
-mockk = "io.mockk:mockk:1.13.13"
+mockk = "io.mockk:mockk:1.13.14"
 paging-runtime = "androidx.paging:paging-runtime-ktx:3.3.5"
 paging-compose = "androidx.paging:paging-compose:3.3.5"
 retrofit-core = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }

From 1a9ecc518ae96c3087057087977939b09702a7db Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 20 Dec 2024 17:36:38 +0000
Subject: [PATCH 210/236] Update dependency gradle to v8.12 (#2660)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 gradlew                                  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c1d5e01859..e0fd02028b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f5feea6d6b..f3b75f3b0d 100755
--- a/gradlew
+++ b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

From adefba2b00facfea961828c235d8cfd44e7ff61a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 20 Dec 2024 20:33:40 +0000
Subject: [PATCH 211/236] Update dagger to v2.54 (#2661)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4c190c1fae..1d699ea0b5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ coroutines = "1.8.1"
 room = "2.6.1"
 prefs = "1.0.1"
 materialDialog = "3.3.0"
-dagger = "2.53.1"
+dagger = "2.54"
 kotlin = "2.1.0"
 media3 = "1.3.1"
 agp = "8.7.3"

From f7a0b86d4f11cd7a6a8dde7670924964809dff0d Mon Sep 17 00:00:00 2001
From: Nick Wick <NickWick@users.noreply.hosted.weblate.org>
Date: Mon, 4 Nov 2024 05:44:30 +0000
Subject: [PATCH 212/236] Translated using Weblate (Swedish)

Currently translated at 100.0% (119 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/sv/
---
 strings/src/main/res/values-sv/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/strings/src/main/res/values-sv/strings.xml b/strings/src/main/res/values-sv/strings.xml
index d30c99b813..556c262efd 100644
--- a/strings/src/main/res/values-sv/strings.xml
+++ b/strings/src/main/res/values-sv/strings.xml
@@ -44,7 +44,7 @@
     <string name="remove">Ta bort</string>
     <string name="play_current">Spela aktuell</string>
     <string name="book_header_current">Aktuella</string>
-    <string name="book_header_not_started">Inte påbörjad ännu</string>
+    <string name="book_header_not_started">Inte påbörjade ännu</string>
     <string name="book_header_completed">Avslutad</string>
     <string name="close">Stäng</string>
     <string name="delete">Ta bort</string>
@@ -128,4 +128,4 @@
         <item quantity="one">%d minut</item>
         <item quantity="other">%d minuter</item>
     </plurals>
-</resources>
+</resources>
\ No newline at end of file

From 87a464372da6814a01ba87dba5fb7722da6782ad Mon Sep 17 00:00:00 2001
From: Dragibus Noir <dragibusnoir@pm.me>
Date: Sat, 9 Nov 2024 06:38:44 +0000
Subject: [PATCH 213/236] Translated using Weblate (French)

Currently translated at 100.0% (119 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/fr/
---
 strings/src/main/res/values-fr/strings.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/strings/src/main/res/values-fr/strings.xml b/strings/src/main/res/values-fr/strings.xml
index dc4f49328a..89a703b7e7 100644
--- a/strings/src/main/res/values-fr/strings.xml
+++ b/strings/src/main/res/values-fr/strings.xml
@@ -2,13 +2,13 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation" tools:locale="fr">
     <string name="cover">Couverture</string>
     <string name="play_pause">Lecture / Pause</string>
-    <string name="action_sleep">Minuteur</string>
-    <string name="rewind">Rembobiner</string>
+    <string name="action_sleep">Minuterie de mise en veille</string>
+    <string name="rewind">Revenir en arrière</string>
     <string name="fast_forward">Avance rapide</string>
     <string name="previous_track">Piste précédente</string>
     <string name="next_track">Piste suivante</string>
     <string name="skip_silence">Sauter les silences</string>
-    <string name="volume_boost">Hausser le volume </string>
+    <string name="volume_boost">Augmentation du volume</string>
     <string name="more">Plus</string>
     <string name="dialog_confirm">Définir</string>
     <string name="dialog_cancel">Annuler</string>
@@ -46,7 +46,7 @@
     <string name="play_current">Lire l\'actuel</string>
     <string name="book_header_current">En cours</string>
     <string name="book_header_not_started">Pas encore commencé</string>
-    <string name="book_header_completed">Complété</string>
+    <string name="book_header_completed">Terminé</string>
     <string name="close">Fermer</string>
     <string name="delete">Supprimer</string>
     <string name="add">Ajouter</string>
@@ -88,8 +88,8 @@
     <string name="battery_optimization_action">Mise à jour</string>
     <string name="media_session_root">Tous les livres audio</string>
     <string name="media_session_recent">Récent</string>
-    <string name="notification_sleep_timer_enable">Activer la minuterie de sommeil</string>
-    <string name="notification_sleep_timer_disable">Désactiver la minuterie de sommeil</string>
+    <string name="notification_sleep_timer_enable">Activer la minuterie de mise en veille</string>
+    <string name="notification_sleep_timer_disable">Désactiver la minuterie de mise en veille</string>
     <string name="onboarding_welcome_title">Bienvenue dans Voice !</string>
     <string name="sleep_timer.title">Bonne nuit ! 🌙</string>
     <string name="sleep_timer.button.increment">Plus long</string>

From f07c0b868f9ac038471a112ad53b3fdc08610126 Mon Sep 17 00:00:00 2001
From: Dragibus Noir <dragibusnoir@pm.me>
Date: Sun, 10 Nov 2024 22:10:22 +0000
Subject: [PATCH 214/236] Translated using Weblate (French)

Currently translated at 100.0% (119 of 119 strings)

Translation: Voice/strings
Translate-URL: https://hosted.weblate.org/projects/voice/strings/fr/
---
 strings/src/main/res/values-fr/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/strings/src/main/res/values-fr/strings.xml b/strings/src/main/res/values-fr/strings.xml
index 89a703b7e7..37cfa806b6 100644
--- a/strings/src/main/res/values-fr/strings.xml
+++ b/strings/src/main/res/values-fr/strings.xml
@@ -94,7 +94,7 @@
     <string name="sleep_timer.title">Bonne nuit ! 🌙</string>
     <string name="sleep_timer.button.increment">Plus long</string>
     <string name="folder_mode_author">Mode auteurs : chaque sous-dossier est un auteur, dont chaque sous-dossier est un livre.</string>
-    <string name="generic_error_message">Quelque chose a planté 😢</string>
+    <string name="generic_error_message">Quelque chose s\'est mal passé 😢</string>
     <string name="generic_error_retry">Réessayer</string>
     <string name="storage_bug_subtitle">Sur certains appareils, il manque les permissions nécessaires à une application système pour accéder au stockage externe. Cet accès est essentiel pour que Voice puisse lire les livres audio.</string>
     <string name="storage_bug_button">Accorder la permission</string>

From 69a98f221e70aa8b6e83a10372f76a69ae23d7de Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 20 Dec 2024 22:51:05 +0000
Subject: [PATCH 215/236] Update media3 to v1.5.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1d699ea0b5..71d6abcb5a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@ prefs = "1.0.1"
 materialDialog = "3.3.0"
 dagger = "2.54"
 kotlin = "2.1.0"
-media3 = "1.3.1"
+media3 = "1.5.1"
 agp = "8.7.3"
 ktlint-core = "1.5.0"
 ktlint-gradlePlugin = "0.10.0"

From 60e396d8d3411ea959f5b33a2b4b48de4be39d52 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 27 Dec 2024 17:15:38 +0000
Subject: [PATCH 216/236] Update dependency androidx.core:core-ktx to v1.15.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1d699ea0b5..d3dfc7b6de 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -35,7 +35,7 @@ retrofit-serialization = { module = "com.squareup.retrofit2:converter-kotlinx-se
 robolectric = "org.robolectric:robolectric:4.14.1"
 coil = "io.coil-kt:coil-compose:2.7.0"
 appCompat = "androidx.appcompat:appcompat:1.7.0"
-androidxCore = "androidx.core:core-ktx:1.13.1"
+androidxCore = "androidx.core:core-ktx:1.15.0"
 kotlin-pluginForGradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-compilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }
 desugar = "com.android.tools:desugar_jdk_libs:2.1.4"

From bc13969a562ee5eeeba7ade15defcd29b62fdec8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 27 Dec 2024 17:15:42 +0000
Subject: [PATCH 217/236] Update dependency app.cash.turbine:turbine to v1.2.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1d699ea0b5..092999f01b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -45,7 +45,7 @@ datastore = "androidx.datastore:datastore-preferences:1.1.1"
 seismic = "com.squareup:seismic:1.0.3"
 viewBinding = { module = "androidx.databinding:viewbinding", version.ref = "agp" }
 appStartup = "androidx.startup:startup-runtime:1.2.0"
-turbine = "app.cash.turbine:turbine:1.1.0"
+turbine = "app.cash.turbine:turbine:1.2.0"
 molecule = "app.cash.molecule:molecule-runtime:2.0.0"
 immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8"
 uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0"

From 17abf8829defed2bf32aaaab730a48ec542f616a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 27 Dec 2024 17:15:48 +0000
Subject: [PATCH 218/236] Update media3 to v1.5.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1d699ea0b5..71d6abcb5a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@ prefs = "1.0.1"
 materialDialog = "3.3.0"
 dagger = "2.54"
 kotlin = "2.1.0"
-media3 = "1.3.1"
+media3 = "1.5.1"
 agp = "8.7.3"
 ktlint-core = "1.5.0"
 ktlint-gradlePlugin = "0.10.0"

From 183968e54ee128f2d495f9ede21a0d85b02b1edc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 27 Dec 2024 17:15:50 +0000
Subject: [PATCH 219/236] Update dependency com.github.ajalt.clikt:clikt to v5

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1d699ea0b5..dc17a50017 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -52,7 +52,7 @@ uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0"
 okhttp = "com.squareup.okhttp3:okhttp:4.12.0"
 review = "com.google.android.play:review-ktx:2.0.2"
 lottie = "com.airbnb.android:lottie-compose:6.6.2"
-clikt = "com.github.ajalt.clikt:clikt:4.4.0"
+clikt = "com.github.ajalt.clikt:clikt:5.0.2"
 
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 coroutines-guava = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-guava", version.ref = "coroutines" }

From ebaf192539dfd1c3879549398c2125b8771b218b Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Fri, 27 Dec 2024 18:30:54 +0100
Subject: [PATCH 220/236] Apply the embedded kotlin compiler as compileOnly

---
 plugins/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/build.gradle.kts b/plugins/build.gradle.kts
index 41885afedc..73e56a8786 100644
--- a/plugins/build.gradle.kts
+++ b/plugins/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 dependencies {
   implementation(libs.androidPluginForGradle)
   implementation(libs.kotlin.pluginForGradle)
-  implementation(libs.kotlin.compilerEmbeddable)
+  compileOnly(libs.kotlin.compilerEmbeddable)
   implementation(libs.ktlint.gradlePlugin)
 }
 

From 1212d849b167b8df56769558e16f05fe9bd693e5 Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Fri, 27 Dec 2024 18:31:13 +0100
Subject: [PATCH 221/236] Bump the compile sdk to 35

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 71d6abcb5a..2bc53baf75 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ leakcanary = "2.14"
 versionCode = "3603035"
 versionName = "8.2.4"
 
-sdk-compile = "34"
+sdk-compile = "35"
 sdk-min = "26"
 sdk-target = "34"
 

From 17aec4f1ea850a33c0b098fb233f74572bebfe17 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 27 Dec 2024 17:35:17 +0000
Subject: [PATCH 222/236] Update kotlinx-coroutines monorepo to v1.10.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 65c76fda15..6dad8235cc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,7 +7,7 @@ sdk-compile = "35"
 sdk-min = "26"
 sdk-target = "34"
 
-coroutines = "1.8.1"
+coroutines = "1.10.1"
 room = "2.6.1"
 prefs = "1.0.1"
 materialDialog = "3.3.0"

From 839530a4a4123ae11cf0b9d3fa4c6a177205d5ec Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Fri, 27 Dec 2024 18:36:13 +0100
Subject: [PATCH 223/236] Remove the unnecessary cast

---
 plugins/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/build.gradle.kts b/plugins/build.gradle.kts
index 73e56a8786..ccf8d46cfa 100644
--- a/plugins/build.gradle.kts
+++ b/plugins/build.gradle.kts
@@ -32,6 +32,6 @@ gradlePlugin {
 
 kotlin {
   jvmToolchain {
-    (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(17))
+    languageVersion.set(JavaLanguageVersion.of(17))
   }
 }

From 53de9c4396d68843a867f38127598a3a3e6aa332 Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Fri, 27 Dec 2024 19:07:35 +0100
Subject: [PATCH 224/236] Remove the unused checkMainThread

---
 common/src/main/kotlin/voice/common/AndroidExtensions.kt | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/common/src/main/kotlin/voice/common/AndroidExtensions.kt b/common/src/main/kotlin/voice/common/AndroidExtensions.kt
index f1f6e8c1b1..6b4549ffdf 100644
--- a/common/src/main/kotlin/voice/common/AndroidExtensions.kt
+++ b/common/src/main/kotlin/voice/common/AndroidExtensions.kt
@@ -3,7 +3,6 @@ package voice.common
 import android.content.Context
 import android.os.Build
 import android.os.Bundle
-import android.os.Looper
 import android.os.Parcelable
 import android.util.TypedValue
 import android.view.LayoutInflater
@@ -15,12 +14,6 @@ fun Context.dpToPx(dp: Float) = TypedValue.applyDimension(TypedValue.COMPLEX_UNI
 
 fun Context.dpToPxRounded(dp: Float): Int = dpToPx(dp).roundToInt()
 
-fun checkMainThread() {
-  check(Looper.getMainLooper() == Looper.myLooper()) {
-    "Is not on ui thread!"
-  }
-}
-
 inline fun <reified T : Parcelable> Bundle.parcelable(key: String): T? {
   return if (Build.VERSION.SDK_INT >= 33) {
     getParcelable(key, T::class.java)

From 3eae4e90ccea4a32b27c767a56d75ed25e7b61fa Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Fri, 27 Dec 2024 19:07:51 +0100
Subject: [PATCH 225/236] Remove the unused put and get bookmark id functions

---
 data/src/main/kotlin/voice/data/Bookmark.kt | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/data/src/main/kotlin/voice/data/Bookmark.kt b/data/src/main/kotlin/voice/data/Bookmark.kt
index 4fa1f36b07..37dbe7b36d 100644
--- a/data/src/main/kotlin/voice/data/Bookmark.kt
+++ b/data/src/main/kotlin/voice/data/Bookmark.kt
@@ -1,6 +1,5 @@
 package voice.data
 
-import android.os.Bundle
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import voice.common.BookId
@@ -25,15 +24,3 @@ data class Bookmark(
     }
   }
 }
-
-fun Bundle.putBookmarkId(
-  key: String,
-  value: Bookmark.Id,
-) {
-  putString(key, value.value.toString())
-}
-
-fun Bundle.getBookmarkId(key: String): Bookmark.Id? {
-  val value = getString(key) ?: return null
-  return Bookmark.Id(UUID.fromString(value))
-}

From 973e620a1c7de3573395784630cfba115258eaee Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Fri, 27 Dec 2024 19:08:04 +0100
Subject: [PATCH 226/236] Remove the unnecessary suppress

---
 bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
index 2d48e4637a..5d1daded76 100644
--- a/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
+++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkController.kt
@@ -9,7 +9,6 @@ import voice.data.putBookId
 
 private const val NI_BOOK_ID = "ni#bookId"
 
-@Suppress("unused")
 class BookmarkController(args: Bundle) : ComposeController(args) {
 
   constructor(bookId: BookId) : this(

From b0946eb73d25b52bb5a414bc955ba8729cec0f5b Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Fri, 27 Dec 2024 19:08:18 +0100
Subject: [PATCH 227/236] Make use of the correct error value namespace

---
 .../kotlin/voice/playback/session/LibrarySessionCallback.kt  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/playback/src/main/kotlin/voice/playback/session/LibrarySessionCallback.kt b/playback/src/main/kotlin/voice/playback/session/LibrarySessionCallback.kt
index 7a19891db4..42967ef1fa 100644
--- a/playback/src/main/kotlin/voice/playback/session/LibrarySessionCallback.kt
+++ b/playback/src/main/kotlin/voice/playback/session/LibrarySessionCallback.kt
@@ -13,6 +13,7 @@ import androidx.media3.session.MediaSession.ConnectionResult
 import androidx.media3.session.MediaSession.ControllerInfo
 import androidx.media3.session.MediaSession.MediaItemsWithStartPosition
 import androidx.media3.session.SessionCommand
+import androidx.media3.session.SessionError
 import androidx.media3.session.SessionResult
 import com.google.common.collect.ImmutableList
 import com.google.common.util.concurrent.Futures
@@ -117,7 +118,7 @@ class LibrarySessionCallback
     if (item != null) {
       LibraryResult.ofItem(item, null)
     } else {
-      LibraryResult.ofError(LibraryResult.RESULT_ERROR_BAD_VALUE)
+      LibraryResult.ofError(SessionError.ERROR_BAD_VALUE)
     }
   }
 
@@ -134,7 +135,7 @@ class LibrarySessionCallback
     if (children != null) {
       LibraryResult.ofItemList(children, params)
     } else {
-      LibraryResult.ofError(LibraryResult.RESULT_ERROR_BAD_VALUE)
+      LibraryResult.ofError(SessionError.ERROR_BAD_VALUE)
     }
   }
 

From d83f2478e58a52e34899b7ae35468648524782c8 Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Fri, 27 Dec 2024 19:08:27 +0100
Subject: [PATCH 228/236] Migrate to the compiler options

---
 plugins/src/main/kotlin/ComposePlugin.kt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/plugins/src/main/kotlin/ComposePlugin.kt b/plugins/src/main/kotlin/ComposePlugin.kt
index 302e3944ac..0b739c26e5 100644
--- a/plugins/src/main/kotlin/ComposePlugin.kt
+++ b/plugins/src/main/kotlin/ComposePlugin.kt
@@ -1,5 +1,3 @@
-@file:Suppress("UnstableApiUsage")
-
 import com.android.build.api.dsl.ApplicationExtension
 import com.android.build.api.dsl.CommonExtension
 import com.android.build.api.dsl.LibraryExtension
@@ -32,15 +30,15 @@ class ComposePlugin : Plugin<Project> {
     target.plugins.apply("org.jetbrains.kotlin.plugin.compose")
     extension.buildFeatures.compose = true
     target.tasks.withType<KotlinCompile> {
-      kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + listOf(
+      compilerOptions {
+        optIn.addAll(
           "androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi",
           "androidx.compose.material3.ExperimentalMaterial3Api",
           "androidx.compose.foundation.ExperimentalFoundationApi",
           "androidx.compose.ui.ExperimentalComposeUiApi",
           "androidx.compose.animation.ExperimentalAnimationApi",
           "androidx.compose.foundation.layout.ExperimentalLayoutApi",
-        ).map { "-opt-in=$it" }
+        )
       }
     }
   }

From d9a77ffaffed74b22c8f5c2789977cca0cad368f Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Fri, 27 Dec 2024 19:08:37 +0100
Subject: [PATCH 229/236] Remove the unused ViewBindingController

---
 .../common/conductor/ViewBindingController.kt | 42 -------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 common/src/main/kotlin/voice/common/conductor/ViewBindingController.kt

diff --git a/common/src/main/kotlin/voice/common/conductor/ViewBindingController.kt b/common/src/main/kotlin/voice/common/conductor/ViewBindingController.kt
deleted file mode 100644
index ee2360d689..0000000000
--- a/common/src/main/kotlin/voice/common/conductor/ViewBindingController.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package voice.common.conductor
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.viewbinding.ViewBinding
-import com.bluelinelabs.conductor.Controller
-
-typealias InflateBinding<B> = (LayoutInflater, ViewGroup?, Boolean) -> B
-
-abstract class ViewBindingController<B : ViewBinding>(
-  args: Bundle = Bundle(),
-  private val inflateBinding: InflateBinding<B>,
-) : Controller(args) {
-
-  private var _binding: B? = null
-  val binding: B get() = _binding ?: error("No binding present.")
-
-  final override fun onCreateView(
-    inflater: LayoutInflater,
-    container: ViewGroup,
-    savedViewState: Bundle?,
-  ): View {
-    return inflateBinding(inflater, container, false)
-      .also {
-        _binding = it
-        it.onBindingCreated()
-      }
-      .root
-  }
-
-  final override fun onDestroyView(view: View) {
-    super.onDestroyView(view)
-    onDestroyView()
-    _binding = null
-  }
-
-  open fun onDestroyView() {}
-
-  open fun B.onBindingCreated() {}
-}

From 9c49816e51cdd67d129c3ac90c734d62077d7e2f Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Sat, 28 Dec 2024 11:58:22 +0100
Subject: [PATCH 230/236] Add the flowpref library to the local sources

---
 app/build.gradle.kts                          |   3 +-
 bookOverview/build.gradle.kts                 |   2 +-
 common/build.gradle.kts                       |   3 +-
 data/build.gradle.kts                         |   3 +-
 folderPicker/build.gradle.kts                 |   2 +-
 gradle/libs.versions.toml                     |   4 -
 migration/build.gradle.kts                    |   2 +-
 playback/build.gradle.kts                     |   3 +-
 playbackScreen/build.gradle.kts               |   3 +-
 pref/build.gradle.kts                         |  11 ++
 .../kotlin/de/paulwoitaschek/flowpref/Pref.kt |  21 +++
 .../flowpref/android/AndroidPreferences.kt    |  41 +++++
 .../flowpref/android/PrefAdapter.kt           |   7 +
 .../flowpref/android/builtins.kt              |  64 +++++++
 .../flowpref/android/internal/AndroidPref.kt  |  58 ++++++
 .../android/internal/InternalPrefAdapter.kt   |  18 ++
 .../android/internal/PrefAdapterToInternal.kt |  28 +++
 .../internal/adapter/BooleanAdapter.kt        |  24 +++
 .../android/internal/adapter/EnumAdapter.kt   |  25 +++
 .../android/internal/adapter/IntAdapter.kt    |  24 +++
 .../android/internal/adapter/LongAdapter.kt   |  24 +++
 .../android/internal/adapter/StringAdapter.kt |  26 +++
 .../internal/adapter/StringSetAdapter.kt      |  24 +++
 .../flowpref/inmemory/InMemoryPref.kt         |  36 ++++
 .../android/AndroidPreferencesTest.kt         | 165 ++++++++++++++++++
 .../android/internal/adapter/AdapterTester.kt |  20 +++
 .../internal/adapter/BooleanAdapterTest.kt    |  18 ++
 .../internal/adapter/EnumAdapterTest.kt       |  25 +++
 .../internal/adapter/IntAdapterTest.kt        |  20 +++
 .../internal/adapter/LongAdapterTest.kt       |  20 +++
 .../internal/adapter/StringAdapterTest.kt     |  19 ++
 .../internal/adapter/StringSetAdapterTest.kt  |  19 ++
 scanner/build.gradle.kts                      |   3 +-
 settings.gradle.kts                           |   1 +
 settings/build.gradle.kts                     |   2 +-
 sleepTimer/build.gradle.kts                   |   4 +-
 36 files changed, 751 insertions(+), 21 deletions(-)
 create mode 100644 pref/build.gradle.kts
 create mode 100644 pref/src/main/kotlin/de/paulwoitaschek/flowpref/Pref.kt
 create mode 100644 pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/AndroidPreferences.kt
 create mode 100644 pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/PrefAdapter.kt
 create mode 100644 pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/builtins.kt
 create mode 100644 pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/AndroidPref.kt
 create mode 100644 pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/InternalPrefAdapter.kt
 create mode 100644 pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/PrefAdapterToInternal.kt
 create mode 100644 pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/BooleanAdapter.kt
 create mode 100644 pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/EnumAdapter.kt
 create mode 100644 pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/IntAdapter.kt
 create mode 100644 pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/LongAdapter.kt
 create mode 100644 pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringAdapter.kt
 create mode 100644 pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringSetAdapter.kt
 create mode 100644 pref/src/main/kotlin/de/paulwoitaschek/flowpref/inmemory/InMemoryPref.kt
 create mode 100644 pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/AndroidPreferencesTest.kt
 create mode 100644 pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/AdapterTester.kt
 create mode 100644 pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/BooleanAdapterTest.kt
 create mode 100644 pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/EnumAdapterTest.kt
 create mode 100644 pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/IntAdapterTest.kt
 create mode 100644 pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/LongAdapterTest.kt
 create mode 100644 pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringAdapterTest.kt
 create mode 100644 pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringSetAdapterTest.kt

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f3338ef736..fe1b8c164a 100755
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -204,8 +204,7 @@ dependencies {
 
   implementation(libs.conductor)
 
-  implementation(libs.prefs.android)
-  testImplementation(libs.prefs.inMemory)
+  implementation(projects.pref)
 
   testImplementation(libs.androidX.test.runner)
   testImplementation(libs.androidX.test.junit)
diff --git a/bookOverview/build.gradle.kts b/bookOverview/build.gradle.kts
index 5960900419..4aadaf3195 100644
--- a/bookOverview/build.gradle.kts
+++ b/bookOverview/build.gradle.kts
@@ -16,12 +16,12 @@ dependencies {
   implementation(projects.data)
   implementation(projects.sleepTimer)
   implementation(projects.scanner)
+  implementation(projects.pref)
 
   implementation(libs.lifecycle)
   implementation(libs.documentFile)
   implementation(libs.dagger.core)
   implementation(libs.datastore)
-  implementation(libs.prefs.core)
 
   testImplementation(libs.bundles.testing.jvm)
 }
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 08919ad623..1d8cc5bd67 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -18,11 +18,12 @@ android {
 
 dependencies {
   implementation(projects.strings)
+  implementation(projects.pref)
+
   implementation(libs.appCompat)
   implementation(libs.dagger.core)
   implementation(libs.material)
   api(libs.immutable)
-  implementation(libs.prefs.core)
   api(libs.conductor)
   implementation(libs.androidxCore)
   implementation(libs.viewBinding)
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
index 8625afd0fb..df8a08bc9d 100644
--- a/data/build.gradle.kts
+++ b/data/build.gradle.kts
@@ -35,7 +35,7 @@ dependencies {
   implementation(libs.appCompat)
   implementation(libs.androidxCore)
   implementation(libs.serialization.json)
-  implementation(libs.prefs.core)
+  implementation(projects.pref)
 
   api(libs.room.runtime)
   ksp(libs.room.compiler)
@@ -51,7 +51,6 @@ dependencies {
   testImplementation(libs.androidX.test.runner)
   testImplementation(libs.junit)
   testImplementation(libs.robolectric)
-  testImplementation(libs.prefs.inMemory)
   testImplementation(libs.koTest.assert)
   testImplementation(libs.coroutines.test)
 }
diff --git a/folderPicker/build.gradle.kts b/folderPicker/build.gradle.kts
index 1ba4f00f8e..c5311d5488 100644
--- a/folderPicker/build.gradle.kts
+++ b/folderPicker/build.gradle.kts
@@ -17,10 +17,10 @@ dependencies {
   implementation(projects.data)
   implementation(projects.sleepTimer)
   implementation(projects.documentfile)
+  implementation(projects.pref)
 
   implementation(libs.datastore)
   implementation(libs.coil)
-  implementation(libs.prefs.core)
   implementation(libs.materialDialog.core)
   implementation(libs.androidxCore)
   implementation(libs.documentFile)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index da22636987..b6de6c15e2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -77,10 +77,6 @@ androidTest-rules = "androidx.test:rules:1.6.1"
 
 conductor = "com.bluelinelabs:conductor:4.0.0-preview-4"
 
-prefs-core = { module = "com.github.PaulWoitaschek.FlowPref:core", version.ref = "prefs" }
-prefs-android = { module = "com.github.PaulWoitaschek.FlowPref:android", version.ref = "prefs" }
-prefs-inMemory = { module = "com.github.PaulWoitaschek.FlowPref:in-memory", version.ref = "prefs" }
-
 materialDialog-core = { module = "com.afollestad.material-dialogs:core", version.ref = "materialDialog" }
 materialDialog-input = { module = "com.afollestad.material-dialogs:input", version.ref = "materialDialog" }
 
diff --git a/migration/build.gradle.kts b/migration/build.gradle.kts
index 1c51d3d3be..842c1d2368 100644
--- a/migration/build.gradle.kts
+++ b/migration/build.gradle.kts
@@ -15,10 +15,10 @@ dependencies {
   implementation(projects.data)
   implementation(projects.sleepTimer)
   implementation(projects.scanner)
+  implementation(projects.pref)
 
   implementation(libs.dagger.core)
   implementation(libs.datastore)
-  implementation(libs.prefs.core)
 
   testImplementation(libs.bundles.testing.jvm)
 }
diff --git a/playback/build.gradle.kts b/playback/build.gradle.kts
index 281b45db1d..43b96717b8 100644
--- a/playback/build.gradle.kts
+++ b/playback/build.gradle.kts
@@ -18,9 +18,9 @@ dependencies {
   implementation(projects.common)
   implementation(projects.strings)
   implementation(projects.data)
+  implementation(projects.pref)
 
   implementation(libs.androidxCore)
-  implementation(libs.prefs.core)
   implementation(libs.datastore)
   implementation(libs.coil)
   implementation(libs.coroutines.guava)
@@ -31,7 +31,6 @@ dependencies {
   implementation(libs.media3.session)
 
   testImplementation(libs.bundles.testing.jvm)
-  testImplementation(libs.prefs.inMemory)
   testImplementation(libs.media3.testUtils.core)
   testImplementation(libs.media3.testUtils.robolectric)
 }
diff --git a/playbackScreen/build.gradle.kts b/playbackScreen/build.gradle.kts
index f49726de51..aa485168fb 100644
--- a/playbackScreen/build.gradle.kts
+++ b/playbackScreen/build.gradle.kts
@@ -21,17 +21,16 @@ dependencies {
   implementation(projects.data)
   implementation(projects.datastore)
   implementation(projects.sleepTimer)
+  implementation(projects.pref)
 
   implementation(libs.datastore)
   implementation(libs.coil)
   implementation(libs.androidxCore)
-  implementation(libs.prefs.core)
   implementation(libs.materialDialog.core)
   implementation(libs.androidxCore)
   implementation(libs.material)
 
   implementation(libs.dagger.core)
 
-  testImplementation(libs.prefs.inMemory)
   testImplementation(libs.turbine)
 }
diff --git a/pref/build.gradle.kts b/pref/build.gradle.kts
new file mode 100644
index 0000000000..c0f55d5bdb
--- /dev/null
+++ b/pref/build.gradle.kts
@@ -0,0 +1,11 @@
+plugins {
+  id("voice.library")
+}
+
+dependencies {
+  implementation(libs.androidxCore)
+
+  testImplementation(libs.junit)
+  testImplementation(libs.robolectric)
+  testImplementation(libs.koTest.assert)
+}
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/Pref.kt b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/Pref.kt
new file mode 100644
index 0000000000..29ce26fdcc
--- /dev/null
+++ b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/Pref.kt
@@ -0,0 +1,21 @@
+package de.paulwoitaschek.flowpref
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.filterNotNull
+import kotlin.properties.ReadWriteProperty
+
+abstract class Pref<T> : ReadWriteProperty<Any, T> {
+
+  @Suppress("LeakingThis")
+  var value: T by this
+
+  abstract fun setAndCommit(value: T)
+
+  abstract val flow: Flow<T>
+
+  abstract fun delete(commit: Boolean = false)
+}
+
+@Suppress("unused")
+val <T : Any> Pref<T?>.flowNotNull: Flow<T>
+  get() = flow.filterNotNull()
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/AndroidPreferences.kt b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/AndroidPreferences.kt
new file mode 100644
index 0000000000..4a9c811e2e
--- /dev/null
+++ b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/AndroidPreferences.kt
@@ -0,0 +1,41 @@
+package de.paulwoitaschek.flowpref.android
+
+import android.content.SharedPreferences
+import de.paulwoitaschek.flowpref.Pref
+import de.paulwoitaschek.flowpref.android.internal.AndroidPref
+import de.paulwoitaschek.flowpref.android.internal.DelegatingPrefAdapter
+import de.paulwoitaschek.flowpref.android.internal.InternalPrefAdapter
+import java.util.concurrent.CopyOnWriteArrayList
+
+class AndroidPreferences(private val sharedPrefs: SharedPreferences) {
+
+  private val registered = CopyOnWriteArrayList<AndroidPref<*>>()
+
+  @Suppress("unused")
+  fun <T> create(
+    key: String,
+    default: T,
+    adapter: PrefAdapter<T>,
+  ): Pref<T> {
+    return create(key, default, DelegatingPrefAdapter(adapter))
+  }
+
+  internal fun <T> create(
+    key: String,
+    default: T,
+    adapter: InternalPrefAdapter<T>,
+  ): Pref<T> {
+    return AndroidPref(
+      sharedPrefs,
+      adapter,
+      key,
+      default,
+    ).also {
+      registered += it
+    }
+  }
+
+  fun clear(commit: Boolean = false) {
+    registered.forEach { it.delete(commit = commit) }
+  }
+}
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/PrefAdapter.kt b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/PrefAdapter.kt
new file mode 100644
index 0000000000..0ccfd391a1
--- /dev/null
+++ b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/PrefAdapter.kt
@@ -0,0 +1,7 @@
+package de.paulwoitaschek.flowpref.android
+
+interface PrefAdapter<T> {
+
+  fun toString(value: T): String
+  fun fromString(string: String): T
+}
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/builtins.kt b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/builtins.kt
new file mode 100644
index 0000000000..f31ac54d84
--- /dev/null
+++ b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/builtins.kt
@@ -0,0 +1,64 @@
+package de.paulwoitaschek.flowpref.android
+
+import de.paulwoitaschek.flowpref.Pref
+import de.paulwoitaschek.flowpref.android.internal.adapter.BooleanAdapter
+import de.paulwoitaschek.flowpref.android.internal.adapter.EnumAdapter
+import de.paulwoitaschek.flowpref.android.internal.adapter.IntAdapter
+import de.paulwoitaschek.flowpref.android.internal.adapter.LongAdapter
+import de.paulwoitaschek.flowpref.android.internal.adapter.StringAdapter
+import de.paulwoitaschek.flowpref.android.internal.adapter.StringSetAdapter
+
+@Suppress("unused")
+fun AndroidPreferences.boolean(
+  key: String,
+  default: Boolean,
+): Pref<Boolean> {
+  return create(key, default, BooleanAdapter)
+}
+
+fun <E : Enum<E>> AndroidPreferences.enum(
+  key: String,
+  default: E,
+  clazz: Class<E>,
+): Pref<E> {
+  return create(key, default, EnumAdapter(clazz))
+}
+
+@Suppress("unused")
+inline fun <reified E : Enum<E>> AndroidPreferences.enum(
+  key: String,
+  default: E,
+): Pref<E> {
+  return enum(key, default, E::class.java)
+}
+
+@Suppress("unused")
+fun AndroidPreferences.int(
+  key: String,
+  default: Int,
+): Pref<Int> {
+  return create(key, default, IntAdapter)
+}
+
+@Suppress("unused")
+fun AndroidPreferences.long(
+  key: String,
+  default: Long,
+): Pref<Long> {
+  return create(key, default, LongAdapter)
+}
+
+fun AndroidPreferences.string(
+  key: String,
+  default: String,
+): Pref<String> {
+  return create(key, default, StringAdapter)
+}
+
+@Suppress("unused")
+fun AndroidPreferences.stringSet(
+  key: String,
+  default: Set<String>,
+): Pref<Set<String>> {
+  return create(key, default, StringSetAdapter)
+}
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/AndroidPref.kt b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/AndroidPref.kt
new file mode 100644
index 0000000000..c0a03a26c3
--- /dev/null
+++ b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/AndroidPref.kt
@@ -0,0 +1,58 @@
+package de.paulwoitaschek.flowpref.android.internal
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import de.paulwoitaschek.flowpref.Pref
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlin.reflect.KProperty
+
+internal class AndroidPref<T>(
+  private val prefs: SharedPreferences,
+  private val adapter: InternalPrefAdapter<T>,
+  val key: String,
+  private val default: T,
+) : Pref<T>() {
+
+  private val channel = MutableStateFlow(valueFromPrefOrDefault())
+
+  private fun valueFromPrefOrDefault(): T {
+    return if (prefs.contains(key)) {
+      adapter.get(key, prefs)
+    } else {
+      default
+    }
+  }
+
+  override val flow: Flow<T> = channel
+
+  override fun getValue(
+    thisRef: Any,
+    property: KProperty<*>,
+  ): T = channel.value
+
+  override fun setValue(
+    thisRef: Any,
+    property: KProperty<*>,
+    value: T,
+  ) {
+    set(value, commit = false)
+  }
+
+  override fun setAndCommit(value: T) {
+    set(value, commit = true)
+  }
+
+  private fun set(
+    value: T,
+    commit: Boolean,
+  ) {
+    adapter.set(key, prefs, value, commit = commit)
+    channel.value = value
+  }
+
+  override fun delete(commit: Boolean) {
+    prefs.edit(commit = commit) { remove(key) }
+    channel.value = default
+  }
+}
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/InternalPrefAdapter.kt b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/InternalPrefAdapter.kt
new file mode 100644
index 0000000000..bd6e620772
--- /dev/null
+++ b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/InternalPrefAdapter.kt
@@ -0,0 +1,18 @@
+package de.paulwoitaschek.flowpref.android.internal
+
+import android.content.SharedPreferences
+
+internal interface InternalPrefAdapter<T> {
+
+  fun get(
+    key: String,
+    prefs: SharedPreferences,
+  ): T
+
+  fun set(
+    key: String,
+    prefs: SharedPreferences,
+    value: T,
+    commit: Boolean = false,
+  )
+}
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/PrefAdapterToInternal.kt b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/PrefAdapterToInternal.kt
new file mode 100644
index 0000000000..acb50a9c8f
--- /dev/null
+++ b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/PrefAdapterToInternal.kt
@@ -0,0 +1,28 @@
+package de.paulwoitaschek.flowpref.android.internal
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import de.paulwoitaschek.flowpref.android.PrefAdapter
+
+internal class DelegatingPrefAdapter<T>(private val delegate: PrefAdapter<T>) : InternalPrefAdapter<T> {
+
+  override fun get(
+    key: String,
+    prefs: SharedPreferences,
+  ): T {
+    val stringValue = prefs.getString(key, null)!!
+    return delegate.fromString(stringValue)
+  }
+
+  override fun set(
+    key: String,
+    prefs: SharedPreferences,
+    value: T,
+    commit: Boolean,
+  ) {
+    val stringValue = delegate.toString(value)
+    prefs.edit(commit = commit) {
+      putString(key, stringValue)
+    }
+  }
+}
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/BooleanAdapter.kt b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/BooleanAdapter.kt
new file mode 100644
index 0000000000..8bd2cba014
--- /dev/null
+++ b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/BooleanAdapter.kt
@@ -0,0 +1,24 @@
+package de.paulwoitaschek.flowpref.android.internal.adapter
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import de.paulwoitaschek.flowpref.android.internal.InternalPrefAdapter
+
+internal object BooleanAdapter : InternalPrefAdapter<Boolean> {
+
+  override fun get(
+    key: String,
+    prefs: SharedPreferences,
+  ): Boolean {
+    return prefs.getBoolean(key, false)
+  }
+
+  override fun set(
+    key: String,
+    prefs: SharedPreferences,
+    value: Boolean,
+    commit: Boolean,
+  ) {
+    prefs.edit(commit = commit) { putBoolean(key, value) }
+  }
+}
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/EnumAdapter.kt b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/EnumAdapter.kt
new file mode 100644
index 0000000000..7ca0e774f4
--- /dev/null
+++ b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/EnumAdapter.kt
@@ -0,0 +1,25 @@
+package de.paulwoitaschek.flowpref.android.internal.adapter
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import de.paulwoitaschek.flowpref.android.internal.InternalPrefAdapter
+
+internal class EnumAdapter<E : Enum<E>>(private val clazz: Class<E>) : InternalPrefAdapter<E> {
+
+  override fun get(
+    key: String,
+    prefs: SharedPreferences,
+  ): E {
+    val stringValue = prefs.getString(key, "")!!
+    return java.lang.Enum.valueOf(clazz, stringValue)
+  }
+
+  override fun set(
+    key: String,
+    prefs: SharedPreferences,
+    value: E,
+    commit: Boolean,
+  ) {
+    prefs.edit(commit = commit) { putString(key, value.name) }
+  }
+}
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/IntAdapter.kt b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/IntAdapter.kt
new file mode 100644
index 0000000000..80b69f6ff1
--- /dev/null
+++ b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/IntAdapter.kt
@@ -0,0 +1,24 @@
+package de.paulwoitaschek.flowpref.android.internal.adapter
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import de.paulwoitaschek.flowpref.android.internal.InternalPrefAdapter
+
+internal object IntAdapter : InternalPrefAdapter<Int> {
+
+  override fun get(
+    key: String,
+    prefs: SharedPreferences,
+  ): Int {
+    return prefs.getInt(key, 0)
+  }
+
+  override fun set(
+    key: String,
+    prefs: SharedPreferences,
+    value: Int,
+    commit: Boolean,
+  ) {
+    prefs.edit(commit = commit) { putInt(key, value) }
+  }
+}
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/LongAdapter.kt b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/LongAdapter.kt
new file mode 100644
index 0000000000..e68b048542
--- /dev/null
+++ b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/LongAdapter.kt
@@ -0,0 +1,24 @@
+package de.paulwoitaschek.flowpref.android.internal.adapter
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import de.paulwoitaschek.flowpref.android.internal.InternalPrefAdapter
+
+internal object LongAdapter : InternalPrefAdapter<Long> {
+
+  override fun get(
+    key: String,
+    prefs: SharedPreferences,
+  ): Long {
+    return prefs.getLong(key, 0)
+  }
+
+  override fun set(
+    key: String,
+    prefs: SharedPreferences,
+    value: Long,
+    commit: Boolean,
+  ) {
+    prefs.edit(commit = commit) { putLong(key, value) }
+  }
+}
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringAdapter.kt b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringAdapter.kt
new file mode 100644
index 0000000000..264faad5cc
--- /dev/null
+++ b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringAdapter.kt
@@ -0,0 +1,26 @@
+package de.paulwoitaschek.flowpref.android.internal.adapter
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import de.paulwoitaschek.flowpref.android.internal.InternalPrefAdapter
+
+internal object StringAdapter : InternalPrefAdapter<String> {
+
+  override fun get(
+    key: String,
+    prefs: SharedPreferences,
+  ): String {
+    return prefs.getString(key, null)!!
+  }
+
+  override fun set(
+    key: String,
+    prefs: SharedPreferences,
+    value: String,
+    commit: Boolean,
+  ) {
+    prefs.edit(commit = commit) {
+      putString(key, value)
+    }
+  }
+}
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringSetAdapter.kt b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringSetAdapter.kt
new file mode 100644
index 0000000000..f76b729b29
--- /dev/null
+++ b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringSetAdapter.kt
@@ -0,0 +1,24 @@
+package de.paulwoitaschek.flowpref.android.internal.adapter
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import de.paulwoitaschek.flowpref.android.internal.InternalPrefAdapter
+
+internal object StringSetAdapter : InternalPrefAdapter<Set<String>> {
+
+  override fun get(
+    key: String,
+    prefs: SharedPreferences,
+  ): Set<String> {
+    return prefs.getStringSet(key, emptySet())!!
+  }
+
+  override fun set(
+    key: String,
+    prefs: SharedPreferences,
+    value: Set<String>,
+    commit: Boolean,
+  ) {
+    prefs.edit(commit = commit) { putStringSet(key, value) }
+  }
+}
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/inmemory/InMemoryPref.kt b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/inmemory/InMemoryPref.kt
new file mode 100644
index 0000000000..1b5afb6cf1
--- /dev/null
+++ b/pref/src/main/kotlin/de/paulwoitaschek/flowpref/inmemory/InMemoryPref.kt
@@ -0,0 +1,36 @@
+package de.paulwoitaschek.flowpref.inmemory
+
+import de.paulwoitaschek.flowpref.Pref
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlin.reflect.KProperty
+
+class InMemoryPref<T>(private val default: T) : Pref<T>() {
+
+  private val channel = MutableStateFlow(default)
+
+  override fun setAndCommit(value: T) {
+    channel.tryEmit(value)
+  }
+
+  override val flow: Flow<T> = channel
+
+  override fun delete(commit: Boolean) {
+    channel.tryEmit(default)
+  }
+
+  override fun getValue(
+    thisRef: Any,
+    property: KProperty<*>,
+  ): T {
+    return channel.value
+  }
+
+  override fun setValue(
+    thisRef: Any,
+    property: KProperty<*>,
+    value: T,
+  ) {
+    channel.tryEmit(value)
+  }
+}
diff --git a/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/AndroidPreferencesTest.kt b/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/AndroidPreferencesTest.kt
new file mode 100644
index 0000000000..5a036db07f
--- /dev/null
+++ b/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/AndroidPreferencesTest.kt
@@ -0,0 +1,165 @@
+package de.paulwoitaschek.flowpref.android
+
+import android.content.Context
+import android.content.SharedPreferences
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import app.cash.turbine.test
+import app.cash.turbine.turbineScope
+import de.paulwoitaschek.flowpref.Pref
+import io.kotest.matchers.shouldBe
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import org.junit.runner.RunWith
+
+private const val DEFAULT_KEY = "key"
+
+@RunWith(AndroidJUnit4::class)
+class AndroidPreferencesTest {
+
+  private val prefs: AndroidPreferences
+  private val sharedPrefs: SharedPreferences
+
+  init {
+    val context = ApplicationProvider.getApplicationContext<Context>()
+    sharedPrefs = context.getSharedPreferences("testPrefs", Context.MODE_PRIVATE)
+    prefs = AndroidPreferences(sharedPrefs)
+  }
+
+  @Test
+  fun clearWithCommit() {
+    val pref = prefs.string(DEFAULT_KEY, "Bob")
+    pref.setAndCommit("Alice")
+    prefs.clear(commit = true)
+    assertSharedPrefValue(null)
+    pref.value shouldBe "Bob"
+  }
+
+  @Test
+  fun clearWithoutCommit() {
+    val pref = prefs.string(DEFAULT_KEY, "Bob")
+    pref.setAndCommit("Alice")
+    prefs.clear(commit = true)
+    assertSharedPrefValue(null)
+    pref.value shouldBe "Bob"
+  }
+
+  @Test
+  fun flow() = runTest {
+    val pref = prefs.string(DEFAULT_KEY, "Bob")
+    pref.flow.test {
+      awaitItem() shouldBe "Bob"
+
+      pref.value = "1"
+      awaitItem() shouldBe "1"
+
+      pref.setAndCommit("2")
+      awaitItem() shouldBe "2"
+
+      pref.delete(commit = true)
+      awaitItem() shouldBe "Bob"
+
+      pref.setAndCommit("John")
+      awaitItem() shouldBe "John"
+
+      pref.delete(commit = false)
+      awaitItem() shouldBe "Bob"
+
+      pref.value = "Alice"
+      awaitItem() shouldBe "Alice"
+
+      prefs.clear(commit = false)
+      awaitItem() shouldBe "Bob"
+    }
+  }
+
+  @Test
+  fun setWithCommit() {
+    val pref = prefs.string(DEFAULT_KEY, "Bob")
+
+    assertSharedPrefValue(null)
+    pref.assertValue("Bob")
+
+    pref.setAndCommit("Alice")
+    pref.assertValue("Alice")
+    assertSharedPrefValue("Alice")
+
+    pref.setAndCommit("John")
+    pref.assertValue("John")
+    assertSharedPrefValue("John")
+  }
+
+  @Test
+  fun setWithoutCommit() {
+    val pref = prefs.string(DEFAULT_KEY, "Bob")
+
+    assertSharedPrefValue(null)
+    pref.assertValue("Bob")
+
+    pref.value = "Alice"
+    pref.assertValue("Alice")
+    assertSharedPrefValue("Alice")
+
+    pref.value = "John"
+    pref.assertValue("John")
+    assertSharedPrefValue("John")
+  }
+
+  @Test
+  fun deleteWithCommit() {
+    val pref = prefs.string(DEFAULT_KEY, "Bob")
+    assertSharedPrefValue(null)
+    pref.setAndCommit("Alice")
+    pref.delete(commit = true)
+    pref.assertValue("Bob")
+    assertSharedPrefValue(null)
+  }
+
+  @Test
+  fun deleteWithoutCommit() {
+    val pref = prefs.string(DEFAULT_KEY, "Bob")
+    assertSharedPrefValue(null)
+    pref.setAndCommit("Alice")
+    pref.delete(commit = false)
+    pref.assertValue("Bob")
+    assertSharedPrefValue(null)
+  }
+
+  private fun <T> Pref<T>.assertValue(value: T?) {
+    this.value shouldBe value
+  }
+
+  private fun assertSharedPrefValue(value: String?) {
+    sharedPrefs.getString(DEFAULT_KEY, null) shouldBe value
+  }
+
+  @Test
+  fun onlyChangedFlowTriggers() = runTest {
+    turbineScope {
+      val prefA = prefs.int("preA", 42)
+      val prefB = prefs.int("prefB", 42)
+
+      val aTurbine = prefA.flow.testIn(this)
+      val bTurbine = prefB.flow.testIn(this)
+
+      aTurbine.awaitItem() shouldBe 42
+      bTurbine.awaitItem() shouldBe 42
+
+      prefA.setAndCommit(1)
+
+      aTurbine.awaitItem() shouldBe 1
+
+      prefA.setAndCommit(2)
+      aTurbine.awaitItem() shouldBe 2
+
+      prefB.setAndCommit(1)
+      bTurbine.awaitItem() shouldBe 1
+
+      aTurbine.expectNoEvents()
+      bTurbine.expectNoEvents()
+
+      aTurbine.cancel()
+      bTurbine.cancel()
+    }
+  }
+}
diff --git a/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/AdapterTester.kt b/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/AdapterTester.kt
new file mode 100644
index 0000000000..b2ed4558ab
--- /dev/null
+++ b/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/AdapterTester.kt
@@ -0,0 +1,20 @@
+package de.paulwoitaschek.flowpref.android.internal.adapter
+
+import android.content.Context
+import android.content.SharedPreferences
+import androidx.test.core.app.ApplicationProvider
+import de.paulwoitaschek.flowpref.android.internal.InternalPrefAdapter
+import io.kotest.matchers.shouldBe
+
+internal class AdapterTester<T>(private val adapter: InternalPrefAdapter<T>) {
+
+  private val key = System.nanoTime().toString()
+
+  private val prefs: SharedPreferences = ApplicationProvider.getApplicationContext<Context>()
+    .getSharedPreferences(key, Context.MODE_PRIVATE)
+
+  fun test(value: T) {
+    adapter.set(key, prefs, value)
+    adapter.get(key, prefs) shouldBe value
+  }
+}
diff --git a/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/BooleanAdapterTest.kt b/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/BooleanAdapterTest.kt
new file mode 100644
index 0000000000..0b02b4bcf7
--- /dev/null
+++ b/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/BooleanAdapterTest.kt
@@ -0,0 +1,18 @@
+package de.paulwoitaschek.flowpref.android.internal.adapter
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class BooleanAdapterTest {
+
+  @Test
+  fun test() {
+    AdapterTester(BooleanAdapter).apply {
+      test(true)
+      test(false)
+      test(true)
+    }
+  }
+}
diff --git a/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/EnumAdapterTest.kt b/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/EnumAdapterTest.kt
new file mode 100644
index 0000000000..d5e1f5008d
--- /dev/null
+++ b/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/EnumAdapterTest.kt
@@ -0,0 +1,25 @@
+package de.paulwoitaschek.flowpref.android.internal.adapter
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class EnumAdapterTest {
+
+  @Test
+  fun test() {
+    AdapterTester(EnumAdapter(RPS::class.java)).apply {
+      test(RPS.Rock)
+      test(RPS.Paper)
+      test(RPS.Scissors)
+      test(RPS.Rock)
+    }
+  }
+
+  private enum class RPS {
+    Rock,
+    Paper,
+    Scissors,
+  }
+}
diff --git a/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/IntAdapterTest.kt b/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/IntAdapterTest.kt
new file mode 100644
index 0000000000..a4d99d7cc4
--- /dev/null
+++ b/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/IntAdapterTest.kt
@@ -0,0 +1,20 @@
+package de.paulwoitaschek.flowpref.android.internal.adapter
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class IntAdapterTest {
+
+  @Test
+  fun test() {
+    AdapterTester(IntAdapter).apply {
+      test(0)
+      test(1)
+      test(2)
+      test(Int.MAX_VALUE)
+      test(Int.MIN_VALUE)
+    }
+  }
+}
diff --git a/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/LongAdapterTest.kt b/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/LongAdapterTest.kt
new file mode 100644
index 0000000000..25922e9194
--- /dev/null
+++ b/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/LongAdapterTest.kt
@@ -0,0 +1,20 @@
+package de.paulwoitaschek.flowpref.android.internal.adapter
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class LongAdapterTest {
+
+  @Test
+  fun test() {
+    AdapterTester(LongAdapter).apply {
+      test(0)
+      test(1)
+      test(2)
+      test(Long.MAX_VALUE)
+      test(Long.MIN_VALUE)
+    }
+  }
+}
diff --git a/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringAdapterTest.kt b/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringAdapterTest.kt
new file mode 100644
index 0000000000..9b2863aae0
--- /dev/null
+++ b/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringAdapterTest.kt
@@ -0,0 +1,19 @@
+package de.paulwoitaschek.flowpref.android.internal.adapter
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class StringAdapterTest {
+
+  @Test
+  fun test() {
+    AdapterTester(StringAdapter).apply {
+      test("")
+      test("hello")
+      test("bye")
+      test("")
+    }
+  }
+}
diff --git a/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringSetAdapterTest.kt b/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringSetAdapterTest.kt
new file mode 100644
index 0000000000..71abb17c76
--- /dev/null
+++ b/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringSetAdapterTest.kt
@@ -0,0 +1,19 @@
+package de.paulwoitaschek.flowpref.android.internal.adapter
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class StringSetAdapterTest {
+
+  @Test
+  fun test() {
+    AdapterTester(StringSetAdapter).apply {
+      test(emptySet())
+      test(setOf("Hello"))
+      test(setOf("Apple", "Candy"))
+      test(emptySet())
+    }
+  }
+}
diff --git a/scanner/build.gradle.kts b/scanner/build.gradle.kts
index 358957820a..927858ad73 100644
--- a/scanner/build.gradle.kts
+++ b/scanner/build.gradle.kts
@@ -13,7 +13,8 @@ dependencies {
   implementation(projects.ffmpeg)
   implementation(projects.data)
   implementation(projects.common)
-  implementation(libs.prefs.core)
+  implementation(projects.pref)
+
   implementation(libs.appCompat)
   implementation(libs.dagger.core)
   implementation(libs.serialization.json)
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 88b98f3f03..7d3cb16cac 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -60,6 +60,7 @@ include(":folderPicker")
 include(":bookOverview")
 include(":migration")
 include(":scripts")
+include(":pref")
 include(":logging:core")
 include(":logging:debug")
 include(":documentfile")
diff --git a/settings/build.gradle.kts b/settings/build.gradle.kts
index 7289b44b98..d10935abb8 100644
--- a/settings/build.gradle.kts
+++ b/settings/build.gradle.kts
@@ -13,9 +13,9 @@ dependencies {
   implementation(projects.strings)
   implementation(projects.playback)
   implementation(projects.data)
+  implementation(projects.pref)
 
   implementation(libs.androidxCore)
-  implementation(libs.prefs.core)
   implementation(libs.materialDialog.core)
   implementation(libs.androidxCore)
   implementation(libs.material)
diff --git a/sleepTimer/build.gradle.kts b/sleepTimer/build.gradle.kts
index 6de590e5e6..dc8db31313 100644
--- a/sleepTimer/build.gradle.kts
+++ b/sleepTimer/build.gradle.kts
@@ -13,15 +13,13 @@ dependencies {
   implementation(projects.strings)
   implementation(projects.playback)
   implementation(projects.data)
+  implementation(projects.pref)
 
   implementation(libs.androidxCore)
-  implementation(libs.prefs.core)
   implementation(libs.materialDialog.core)
   implementation(libs.androidxCore)
   implementation(libs.material)
   implementation(libs.seismic)
 
   implementation(libs.dagger.core)
-
-  testImplementation(libs.prefs.inMemory)
 }

From 75d8caa36bab752e0363304afb435f7a7401aef8 Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Sat, 28 Dec 2024 12:06:00 +0100
Subject: [PATCH 231/236] Rename the pref package

---
 app/src/main/kotlin/voice/app/injection/App.kt  |  2 +-
 .../kotlin/voice/app/injection/PrefsModule.kt   | 12 ++++++------
 .../overview/BookOverviewViewModel.kt           |  2 +-
 .../voice/common/compose/SharedComponent.kt     |  2 +-
 .../src/test/kotlin/voice/data/TestComponent.kt |  4 ++--
 .../kotlin/voice/playback/player/VoicePlayer.kt |  2 +-
 .../voice/playback/player/VoicePlayerTest.kt    |  2 +-
 .../voice/playbackScreen/BookPlayViewModel.kt   |  2 +-
 .../playbackScreen/BookPlayViewModelTest.kt     |  2 +-
 .../pref}/AndroidPreferences.kt                 |  9 ++++-----
 .../flowpref => voice/pref}/Pref.kt             |  2 +-
 .../android => voice/pref}/PrefAdapter.kt       |  2 +-
 .../flowpref/android => voice/pref}/builtins.kt | 17 ++++++++---------
 .../pref}/inmemory/InMemoryPref.kt              |  4 ++--
 .../pref}/internal/AndroidPref.kt               |  4 ++--
 .../pref}/internal/InternalPrefAdapter.kt       |  2 +-
 .../pref}/internal/PrefAdapterToInternal.kt     |  4 ++--
 .../pref}/internal/adapter/BooleanAdapter.kt    |  4 ++--
 .../pref}/internal/adapter/EnumAdapter.kt       |  4 ++--
 .../pref}/internal/adapter/IntAdapter.kt        |  4 ++--
 .../pref}/internal/adapter/LongAdapter.kt       |  4 ++--
 .../pref}/internal/adapter/StringAdapter.kt     |  4 ++--
 .../pref}/internal/adapter/StringSetAdapter.kt  |  4 ++--
 .../android/AndroidPreferencesTest.kt           |  7 +++++--
 .../android/internal/adapter/AdapterTester.kt   |  4 ++--
 .../internal/adapter/BooleanAdapterTest.kt      |  3 ++-
 .../android/internal/adapter/EnumAdapterTest.kt |  3 ++-
 .../android/internal/adapter/IntAdapterTest.kt  |  3 ++-
 .../android/internal/adapter/LongAdapterTest.kt |  3 ++-
 .../internal/adapter/StringAdapterTest.kt       |  3 ++-
 .../internal/adapter/StringSetAdapterTest.kt    |  3 ++-
 .../kotlin/voice/settings/SettingsViewModel.kt  |  2 +-
 .../main/kotlin/voice/sleepTimer/SleepTimer.kt  |  2 +-
 33 files changed, 69 insertions(+), 62 deletions(-)
 rename pref/src/main/kotlin/{de/paulwoitaschek/flowpref/android => voice/pref}/AndroidPreferences.kt (72%)
 rename pref/src/main/kotlin/{de/paulwoitaschek/flowpref => voice/pref}/Pref.kt (92%)
 rename pref/src/main/kotlin/{de/paulwoitaschek/flowpref/android => voice/pref}/PrefAdapter.kt (69%)
 rename pref/src/main/kotlin/{de/paulwoitaschek/flowpref/android => voice/pref}/builtins.kt (67%)
 rename pref/src/main/kotlin/{de/paulwoitaschek/flowpref => voice/pref}/inmemory/InMemoryPref.kt (88%)
 rename pref/src/main/kotlin/{de/paulwoitaschek/flowpref/android => voice/pref}/internal/AndroidPref.kt (92%)
 rename pref/src/main/kotlin/{de/paulwoitaschek/flowpref/android => voice/pref}/internal/InternalPrefAdapter.kt (83%)
 rename pref/src/main/kotlin/{de/paulwoitaschek/flowpref/android => voice/pref}/internal/PrefAdapterToInternal.kt (84%)
 rename pref/src/main/kotlin/{de/paulwoitaschek/flowpref/android => voice/pref}/internal/adapter/BooleanAdapter.kt (77%)
 rename pref/src/main/kotlin/{de/paulwoitaschek/flowpref/android => voice/pref}/internal/adapter/EnumAdapter.kt (80%)
 rename pref/src/main/kotlin/{de/paulwoitaschek/flowpref/android => voice/pref}/internal/adapter/IntAdapter.kt (76%)
 rename pref/src/main/kotlin/{de/paulwoitaschek/flowpref/android => voice/pref}/internal/adapter/LongAdapter.kt (76%)
 rename pref/src/main/kotlin/{de/paulwoitaschek/flowpref/android => voice/pref}/internal/adapter/StringAdapter.kt (77%)
 rename pref/src/main/kotlin/{de/paulwoitaschek/flowpref/android => voice/pref}/internal/adapter/StringSetAdapter.kt (78%)
 rename pref/src/test/kotlin/de/paulwoitaschek/{flowpref => pref}/android/AndroidPreferencesTest.kt (96%)
 rename pref/src/test/kotlin/de/paulwoitaschek/{flowpref => pref}/android/internal/adapter/AdapterTester.kt (80%)
 rename pref/src/test/kotlin/de/paulwoitaschek/{flowpref => pref}/android/internal/adapter/BooleanAdapterTest.kt (73%)
 rename pref/src/test/kotlin/de/paulwoitaschek/{flowpref => pref}/android/internal/adapter/EnumAdapterTest.kt (80%)
 rename pref/src/test/kotlin/de/paulwoitaschek/{flowpref => pref}/android/internal/adapter/IntAdapterTest.kt (76%)
 rename pref/src/test/kotlin/de/paulwoitaschek/{flowpref => pref}/android/internal/adapter/LongAdapterTest.kt (76%)
 rename pref/src/test/kotlin/de/paulwoitaschek/{flowpref => pref}/android/internal/adapter/StringAdapterTest.kt (74%)
 rename pref/src/test/kotlin/de/paulwoitaschek/{flowpref => pref}/android/internal/adapter/StringSetAdapterTest.kt (76%)

diff --git a/app/src/main/kotlin/voice/app/injection/App.kt b/app/src/main/kotlin/voice/app/injection/App.kt
index 49ca8596a8..748ece431f 100644
--- a/app/src/main/kotlin/voice/app/injection/App.kt
+++ b/app/src/main/kotlin/voice/app/injection/App.kt
@@ -6,7 +6,6 @@ import androidx.appcompat.app.AppCompatDelegate
 import coil.Coil
 import coil.ImageLoader
 import com.google.android.material.color.DynamicColors
-import de.paulwoitaschek.flowpref.Pref
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.launch
@@ -15,6 +14,7 @@ import voice.app.scanner.MediaScanTrigger
 import voice.common.DARK_THEME_SETTABLE
 import voice.common.pref.PrefKeys
 import voice.common.rootComponent
+import voice.pref.Pref
 import javax.inject.Inject
 import javax.inject.Named
 
diff --git a/app/src/main/kotlin/voice/app/injection/PrefsModule.kt b/app/src/main/kotlin/voice/app/injection/PrefsModule.kt
index 6980d0eaed..ce6dfedbef 100644
--- a/app/src/main/kotlin/voice/app/injection/PrefsModule.kt
+++ b/app/src/main/kotlin/voice/app/injection/PrefsModule.kt
@@ -7,12 +7,6 @@ import androidx.datastore.core.DataStore
 import com.squareup.anvil.annotations.ContributesTo
 import dagger.Module
 import dagger.Provides
-import de.paulwoitaschek.flowpref.Pref
-import de.paulwoitaschek.flowpref.android.AndroidPreferences
-import de.paulwoitaschek.flowpref.android.boolean
-import de.paulwoitaschek.flowpref.android.enum
-import de.paulwoitaschek.flowpref.android.int
-import de.paulwoitaschek.flowpref.android.stringSet
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.builtins.nullable
 import kotlinx.serialization.builtins.serializer
@@ -31,6 +25,12 @@ import voice.common.pref.RootAudiobookFolders
 import voice.common.pref.SingleFileAudiobookFolders
 import voice.common.pref.SingleFolderAudiobookFolders
 import voice.datastore.VoiceDataStoreFactory
+import voice.pref.AndroidPreferences
+import voice.pref.Pref
+import voice.pref.boolean
+import voice.pref.enum
+import voice.pref.int
+import voice.pref.stringSet
 import javax.inject.Named
 import javax.inject.Singleton
 
diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/overview/BookOverviewViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/overview/BookOverviewViewModel.kt
index a54c6978bd..d307513306 100644
--- a/bookOverview/src/main/kotlin/voice/bookOverview/overview/BookOverviewViewModel.kt
+++ b/bookOverview/src/main/kotlin/voice/bookOverview/overview/BookOverviewViewModel.kt
@@ -13,7 +13,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.core.net.toUri
 import androidx.datastore.core.DataStore
-import de.paulwoitaschek.flowpref.Pref
 import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
@@ -37,6 +36,7 @@ import voice.data.repo.internals.dao.LegacyBookDao
 import voice.data.repo.internals.dao.RecentBookSearchDao
 import voice.playback.PlayerController
 import voice.playback.playstate.PlayStateManager
+import voice.pref.Pref
 import voice.search.BookSearch
 import javax.inject.Inject
 import javax.inject.Named
diff --git a/common/src/main/kotlin/voice/common/compose/SharedComponent.kt b/common/src/main/kotlin/voice/common/compose/SharedComponent.kt
index fcef111f7a..8a4108898a 100644
--- a/common/src/main/kotlin/voice/common/compose/SharedComponent.kt
+++ b/common/src/main/kotlin/voice/common/compose/SharedComponent.kt
@@ -1,9 +1,9 @@
 package voice.common.compose
 
 import com.squareup.anvil.annotations.ContributesTo
-import de.paulwoitaschek.flowpref.Pref
 import voice.common.AppScope
 import voice.common.pref.PrefKeys
+import voice.pref.Pref
 import javax.inject.Named
 
 @ContributesTo(AppScope::class)
diff --git a/data/src/test/kotlin/voice/data/TestComponent.kt b/data/src/test/kotlin/voice/data/TestComponent.kt
index dc89522eca..d1c71413cb 100644
--- a/data/src/test/kotlin/voice/data/TestComponent.kt
+++ b/data/src/test/kotlin/voice/data/TestComponent.kt
@@ -3,10 +3,10 @@ package voice.data
 import androidx.room.migration.Migration
 import com.squareup.anvil.annotations.MergeComponent
 import dagger.BindsInstance
-import de.paulwoitaschek.flowpref.Pref
-import de.paulwoitaschek.flowpref.inmemory.InMemoryPref
 import voice.common.AppScope
 import voice.common.pref.PrefKeys
+import voice.pref.Pref
+import voice.pref.inmemory.InMemoryPref
 import javax.inject.Named
 import javax.inject.Singleton
 
diff --git a/playback/src/main/kotlin/voice/playback/player/VoicePlayer.kt b/playback/src/main/kotlin/voice/playback/player/VoicePlayer.kt
index aa0c51af38..40492fff26 100644
--- a/playback/src/main/kotlin/voice/playback/player/VoicePlayer.kt
+++ b/playback/src/main/kotlin/voice/playback/player/VoicePlayer.kt
@@ -6,7 +6,6 @@ import androidx.media3.common.ForwardingPlayer
 import androidx.media3.common.MediaItem
 import androidx.media3.common.Player
 import androidx.media3.exoplayer.ExoPlayer
-import de.paulwoitaschek.flowpref.Pref
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
@@ -24,6 +23,7 @@ import voice.playback.misc.VolumeGain
 import voice.playback.session.MediaId
 import voice.playback.session.MediaItemProvider
 import voice.playback.session.toMediaIdOrNull
+import voice.pref.Pref
 import java.time.Instant
 import javax.inject.Inject
 import javax.inject.Named
diff --git a/playback/src/test/kotlin/voice/playback/player/VoicePlayerTest.kt b/playback/src/test/kotlin/voice/playback/player/VoicePlayerTest.kt
index fb6c0e08d1..33072e873b 100644
--- a/playback/src/test/kotlin/voice/playback/player/VoicePlayerTest.kt
+++ b/playback/src/test/kotlin/voice/playback/player/VoicePlayerTest.kt
@@ -9,7 +9,6 @@ import androidx.media3.test.utils.TestExoPlayerBuilder
 import androidx.media3.test.utils.robolectric.TestPlayerRunHelper
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import de.paulwoitaschek.flowpref.inmemory.InMemoryPref
 import io.kotest.matchers.MatcherResult
 import io.kotest.matchers.should
 import io.mockk.Runs
@@ -37,6 +36,7 @@ import voice.playback.session.MediaId
 import voice.playback.session.MediaItemProvider
 import voice.playback.session.search.book
 import voice.playback.session.toMediaIdOrNull
+import voice.pref.inmemory.InMemoryPref
 import java.time.Instant
 import java.util.UUID
 import java.util.concurrent.TimeUnit
diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewModel.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewModel.kt
index c7b406dd72..460c6a72ad 100644
--- a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewModel.kt
+++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewModel.kt
@@ -11,7 +11,6 @@ import androidx.datastore.core.DataStore
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import de.paulwoitaschek.flowpref.Pref
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.flow.Flow
@@ -35,6 +34,7 @@ import voice.playback.misc.Decibel
 import voice.playback.misc.VolumeGain
 import voice.playback.playstate.PlayStateManager
 import voice.playbackScreen.batteryOptimization.BatteryOptimization
+import voice.pref.Pref
 import voice.sleepTimer.SleepTimer
 import voice.sleepTimer.SleepTimerViewState
 import javax.inject.Named
diff --git a/playbackScreen/src/test/kotlin/voice/playbackScreen/BookPlayViewModelTest.kt b/playbackScreen/src/test/kotlin/voice/playbackScreen/BookPlayViewModelTest.kt
index cd01f0cad4..c747df7bd3 100644
--- a/playbackScreen/src/test/kotlin/voice/playbackScreen/BookPlayViewModelTest.kt
+++ b/playbackScreen/src/test/kotlin/voice/playbackScreen/BookPlayViewModelTest.kt
@@ -1,6 +1,5 @@
 package voice.playbackScreen
 
-import de.paulwoitaschek.flowpref.inmemory.InMemoryPref
 import io.kotest.matchers.shouldBe
 import io.mockk.coEvery
 import io.mockk.every
@@ -17,6 +16,7 @@ import voice.data.BookContent
 import voice.data.Bookmark
 import voice.data.Chapter
 import voice.data.ChapterId
+import voice.pref.inmemory.InMemoryPref
 import voice.sleepTimer.SleepTimer
 import voice.sleepTimer.SleepTimerViewState
 import java.time.Instant
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/AndroidPreferences.kt b/pref/src/main/kotlin/voice/pref/AndroidPreferences.kt
similarity index 72%
rename from pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/AndroidPreferences.kt
rename to pref/src/main/kotlin/voice/pref/AndroidPreferences.kt
index 4a9c811e2e..3f05387b58 100644
--- a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/AndroidPreferences.kt
+++ b/pref/src/main/kotlin/voice/pref/AndroidPreferences.kt
@@ -1,10 +1,9 @@
-package de.paulwoitaschek.flowpref.android
+package voice.pref
 
 import android.content.SharedPreferences
-import de.paulwoitaschek.flowpref.Pref
-import de.paulwoitaschek.flowpref.android.internal.AndroidPref
-import de.paulwoitaschek.flowpref.android.internal.DelegatingPrefAdapter
-import de.paulwoitaschek.flowpref.android.internal.InternalPrefAdapter
+import voice.pref.internal.AndroidPref
+import voice.pref.internal.DelegatingPrefAdapter
+import voice.pref.internal.InternalPrefAdapter
 import java.util.concurrent.CopyOnWriteArrayList
 
 class AndroidPreferences(private val sharedPrefs: SharedPreferences) {
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/Pref.kt b/pref/src/main/kotlin/voice/pref/Pref.kt
similarity index 92%
rename from pref/src/main/kotlin/de/paulwoitaschek/flowpref/Pref.kt
rename to pref/src/main/kotlin/voice/pref/Pref.kt
index 29ce26fdcc..e34549000f 100644
--- a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/Pref.kt
+++ b/pref/src/main/kotlin/voice/pref/Pref.kt
@@ -1,4 +1,4 @@
-package de.paulwoitaschek.flowpref
+package voice.pref
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.filterNotNull
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/PrefAdapter.kt b/pref/src/main/kotlin/voice/pref/PrefAdapter.kt
similarity index 69%
rename from pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/PrefAdapter.kt
rename to pref/src/main/kotlin/voice/pref/PrefAdapter.kt
index 0ccfd391a1..c36f07557e 100644
--- a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/PrefAdapter.kt
+++ b/pref/src/main/kotlin/voice/pref/PrefAdapter.kt
@@ -1,4 +1,4 @@
-package de.paulwoitaschek.flowpref.android
+package voice.pref
 
 interface PrefAdapter<T> {
 
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/builtins.kt b/pref/src/main/kotlin/voice/pref/builtins.kt
similarity index 67%
rename from pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/builtins.kt
rename to pref/src/main/kotlin/voice/pref/builtins.kt
index f31ac54d84..549478a0a2 100644
--- a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/builtins.kt
+++ b/pref/src/main/kotlin/voice/pref/builtins.kt
@@ -1,12 +1,11 @@
-package de.paulwoitaschek.flowpref.android
-
-import de.paulwoitaschek.flowpref.Pref
-import de.paulwoitaschek.flowpref.android.internal.adapter.BooleanAdapter
-import de.paulwoitaschek.flowpref.android.internal.adapter.EnumAdapter
-import de.paulwoitaschek.flowpref.android.internal.adapter.IntAdapter
-import de.paulwoitaschek.flowpref.android.internal.adapter.LongAdapter
-import de.paulwoitaschek.flowpref.android.internal.adapter.StringAdapter
-import de.paulwoitaschek.flowpref.android.internal.adapter.StringSetAdapter
+package voice.pref
+
+import voice.pref.internal.adapter.BooleanAdapter
+import voice.pref.internal.adapter.EnumAdapter
+import voice.pref.internal.adapter.IntAdapter
+import voice.pref.internal.adapter.LongAdapter
+import voice.pref.internal.adapter.StringAdapter
+import voice.pref.internal.adapter.StringSetAdapter
 
 @Suppress("unused")
 fun AndroidPreferences.boolean(
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/inmemory/InMemoryPref.kt b/pref/src/main/kotlin/voice/pref/inmemory/InMemoryPref.kt
similarity index 88%
rename from pref/src/main/kotlin/de/paulwoitaschek/flowpref/inmemory/InMemoryPref.kt
rename to pref/src/main/kotlin/voice/pref/inmemory/InMemoryPref.kt
index 1b5afb6cf1..a83c1ef715 100644
--- a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/inmemory/InMemoryPref.kt
+++ b/pref/src/main/kotlin/voice/pref/inmemory/InMemoryPref.kt
@@ -1,8 +1,8 @@
-package de.paulwoitaschek.flowpref.inmemory
+package voice.pref.inmemory
 
-import de.paulwoitaschek.flowpref.Pref
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
+import voice.pref.Pref
 import kotlin.reflect.KProperty
 
 class InMemoryPref<T>(private val default: T) : Pref<T>() {
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/AndroidPref.kt b/pref/src/main/kotlin/voice/pref/internal/AndroidPref.kt
similarity index 92%
rename from pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/AndroidPref.kt
rename to pref/src/main/kotlin/voice/pref/internal/AndroidPref.kt
index c0a03a26c3..f5d6c34fbf 100644
--- a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/AndroidPref.kt
+++ b/pref/src/main/kotlin/voice/pref/internal/AndroidPref.kt
@@ -1,10 +1,10 @@
-package de.paulwoitaschek.flowpref.android.internal
+package voice.pref.internal
 
 import android.content.SharedPreferences
 import androidx.core.content.edit
-import de.paulwoitaschek.flowpref.Pref
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
+import voice.pref.Pref
 import kotlin.reflect.KProperty
 
 internal class AndroidPref<T>(
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/InternalPrefAdapter.kt b/pref/src/main/kotlin/voice/pref/internal/InternalPrefAdapter.kt
similarity index 83%
rename from pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/InternalPrefAdapter.kt
rename to pref/src/main/kotlin/voice/pref/internal/InternalPrefAdapter.kt
index bd6e620772..ba1edcfa9b 100644
--- a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/InternalPrefAdapter.kt
+++ b/pref/src/main/kotlin/voice/pref/internal/InternalPrefAdapter.kt
@@ -1,4 +1,4 @@
-package de.paulwoitaschek.flowpref.android.internal
+package voice.pref.internal
 
 import android.content.SharedPreferences
 
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/PrefAdapterToInternal.kt b/pref/src/main/kotlin/voice/pref/internal/PrefAdapterToInternal.kt
similarity index 84%
rename from pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/PrefAdapterToInternal.kt
rename to pref/src/main/kotlin/voice/pref/internal/PrefAdapterToInternal.kt
index acb50a9c8f..8d6150e583 100644
--- a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/PrefAdapterToInternal.kt
+++ b/pref/src/main/kotlin/voice/pref/internal/PrefAdapterToInternal.kt
@@ -1,8 +1,8 @@
-package de.paulwoitaschek.flowpref.android.internal
+package voice.pref.internal
 
 import android.content.SharedPreferences
 import androidx.core.content.edit
-import de.paulwoitaschek.flowpref.android.PrefAdapter
+import voice.pref.PrefAdapter
 
 internal class DelegatingPrefAdapter<T>(private val delegate: PrefAdapter<T>) : InternalPrefAdapter<T> {
 
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/BooleanAdapter.kt b/pref/src/main/kotlin/voice/pref/internal/adapter/BooleanAdapter.kt
similarity index 77%
rename from pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/BooleanAdapter.kt
rename to pref/src/main/kotlin/voice/pref/internal/adapter/BooleanAdapter.kt
index 8bd2cba014..f98b5bc000 100644
--- a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/BooleanAdapter.kt
+++ b/pref/src/main/kotlin/voice/pref/internal/adapter/BooleanAdapter.kt
@@ -1,8 +1,8 @@
-package de.paulwoitaschek.flowpref.android.internal.adapter
+package voice.pref.internal.adapter
 
 import android.content.SharedPreferences
 import androidx.core.content.edit
-import de.paulwoitaschek.flowpref.android.internal.InternalPrefAdapter
+import voice.pref.internal.InternalPrefAdapter
 
 internal object BooleanAdapter : InternalPrefAdapter<Boolean> {
 
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/EnumAdapter.kt b/pref/src/main/kotlin/voice/pref/internal/adapter/EnumAdapter.kt
similarity index 80%
rename from pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/EnumAdapter.kt
rename to pref/src/main/kotlin/voice/pref/internal/adapter/EnumAdapter.kt
index 7ca0e774f4..c09a7c0e4f 100644
--- a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/EnumAdapter.kt
+++ b/pref/src/main/kotlin/voice/pref/internal/adapter/EnumAdapter.kt
@@ -1,8 +1,8 @@
-package de.paulwoitaschek.flowpref.android.internal.adapter
+package voice.pref.internal.adapter
 
 import android.content.SharedPreferences
 import androidx.core.content.edit
-import de.paulwoitaschek.flowpref.android.internal.InternalPrefAdapter
+import voice.pref.internal.InternalPrefAdapter
 
 internal class EnumAdapter<E : Enum<E>>(private val clazz: Class<E>) : InternalPrefAdapter<E> {
 
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/IntAdapter.kt b/pref/src/main/kotlin/voice/pref/internal/adapter/IntAdapter.kt
similarity index 76%
rename from pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/IntAdapter.kt
rename to pref/src/main/kotlin/voice/pref/internal/adapter/IntAdapter.kt
index 80b69f6ff1..a12fea9955 100644
--- a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/IntAdapter.kt
+++ b/pref/src/main/kotlin/voice/pref/internal/adapter/IntAdapter.kt
@@ -1,8 +1,8 @@
-package de.paulwoitaschek.flowpref.android.internal.adapter
+package voice.pref.internal.adapter
 
 import android.content.SharedPreferences
 import androidx.core.content.edit
-import de.paulwoitaschek.flowpref.android.internal.InternalPrefAdapter
+import voice.pref.internal.InternalPrefAdapter
 
 internal object IntAdapter : InternalPrefAdapter<Int> {
 
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/LongAdapter.kt b/pref/src/main/kotlin/voice/pref/internal/adapter/LongAdapter.kt
similarity index 76%
rename from pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/LongAdapter.kt
rename to pref/src/main/kotlin/voice/pref/internal/adapter/LongAdapter.kt
index e68b048542..3bf0832b14 100644
--- a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/LongAdapter.kt
+++ b/pref/src/main/kotlin/voice/pref/internal/adapter/LongAdapter.kt
@@ -1,8 +1,8 @@
-package de.paulwoitaschek.flowpref.android.internal.adapter
+package voice.pref.internal.adapter
 
 import android.content.SharedPreferences
 import androidx.core.content.edit
-import de.paulwoitaschek.flowpref.android.internal.InternalPrefAdapter
+import voice.pref.internal.InternalPrefAdapter
 
 internal object LongAdapter : InternalPrefAdapter<Long> {
 
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringAdapter.kt b/pref/src/main/kotlin/voice/pref/internal/adapter/StringAdapter.kt
similarity index 77%
rename from pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringAdapter.kt
rename to pref/src/main/kotlin/voice/pref/internal/adapter/StringAdapter.kt
index 264faad5cc..d844f228a9 100644
--- a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringAdapter.kt
+++ b/pref/src/main/kotlin/voice/pref/internal/adapter/StringAdapter.kt
@@ -1,8 +1,8 @@
-package de.paulwoitaschek.flowpref.android.internal.adapter
+package voice.pref.internal.adapter
 
 import android.content.SharedPreferences
 import androidx.core.content.edit
-import de.paulwoitaschek.flowpref.android.internal.InternalPrefAdapter
+import voice.pref.internal.InternalPrefAdapter
 
 internal object StringAdapter : InternalPrefAdapter<String> {
 
diff --git a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringSetAdapter.kt b/pref/src/main/kotlin/voice/pref/internal/adapter/StringSetAdapter.kt
similarity index 78%
rename from pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringSetAdapter.kt
rename to pref/src/main/kotlin/voice/pref/internal/adapter/StringSetAdapter.kt
index f76b729b29..8b8d9b5dcb 100644
--- a/pref/src/main/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringSetAdapter.kt
+++ b/pref/src/main/kotlin/voice/pref/internal/adapter/StringSetAdapter.kt
@@ -1,8 +1,8 @@
-package de.paulwoitaschek.flowpref.android.internal.adapter
+package voice.pref.internal.adapter
 
 import android.content.SharedPreferences
 import androidx.core.content.edit
-import de.paulwoitaschek.flowpref.android.internal.InternalPrefAdapter
+import voice.pref.internal.InternalPrefAdapter
 
 internal object StringSetAdapter : InternalPrefAdapter<Set<String>> {
 
diff --git a/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/AndroidPreferencesTest.kt b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/AndroidPreferencesTest.kt
similarity index 96%
rename from pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/AndroidPreferencesTest.kt
rename to pref/src/test/kotlin/de/paulwoitaschek/pref/android/AndroidPreferencesTest.kt
index 5a036db07f..8577a449b2 100644
--- a/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/AndroidPreferencesTest.kt
+++ b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/AndroidPreferencesTest.kt
@@ -1,4 +1,4 @@
-package de.paulwoitaschek.flowpref.android
+package de.paulwoitaschek.pref.android
 
 import android.content.Context
 import android.content.SharedPreferences
@@ -6,11 +6,14 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import app.cash.turbine.test
 import app.cash.turbine.turbineScope
-import de.paulwoitaschek.flowpref.Pref
 import io.kotest.matchers.shouldBe
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 import org.junit.runner.RunWith
+import voice.pref.AndroidPreferences
+import voice.pref.Pref
+import voice.pref.int
+import voice.pref.string
 
 private const val DEFAULT_KEY = "key"
 
diff --git a/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/AdapterTester.kt b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/AdapterTester.kt
similarity index 80%
rename from pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/AdapterTester.kt
rename to pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/AdapterTester.kt
index b2ed4558ab..affd454c0b 100644
--- a/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/AdapterTester.kt
+++ b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/AdapterTester.kt
@@ -1,10 +1,10 @@
-package de.paulwoitaschek.flowpref.android.internal.adapter
+package de.paulwoitaschek.pref.android.internal.adapter
 
 import android.content.Context
 import android.content.SharedPreferences
 import androidx.test.core.app.ApplicationProvider
-import de.paulwoitaschek.flowpref.android.internal.InternalPrefAdapter
 import io.kotest.matchers.shouldBe
+import voice.pref.internal.InternalPrefAdapter
 
 internal class AdapterTester<T>(private val adapter: InternalPrefAdapter<T>) {
 
diff --git a/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/BooleanAdapterTest.kt b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/BooleanAdapterTest.kt
similarity index 73%
rename from pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/BooleanAdapterTest.kt
rename to pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/BooleanAdapterTest.kt
index 0b02b4bcf7..1f97517a88 100644
--- a/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/BooleanAdapterTest.kt
+++ b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/BooleanAdapterTest.kt
@@ -1,8 +1,9 @@
-package de.paulwoitaschek.flowpref.android.internal.adapter
+package de.paulwoitaschek.pref.android.internal.adapter
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Test
 import org.junit.runner.RunWith
+import voice.pref.internal.adapter.BooleanAdapter
 
 @RunWith(AndroidJUnit4::class)
 class BooleanAdapterTest {
diff --git a/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/EnumAdapterTest.kt b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/EnumAdapterTest.kt
similarity index 80%
rename from pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/EnumAdapterTest.kt
rename to pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/EnumAdapterTest.kt
index d5e1f5008d..e1950398dc 100644
--- a/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/EnumAdapterTest.kt
+++ b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/EnumAdapterTest.kt
@@ -1,8 +1,9 @@
-package de.paulwoitaschek.flowpref.android.internal.adapter
+package de.paulwoitaschek.pref.android.internal.adapter
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Test
 import org.junit.runner.RunWith
+import voice.pref.internal.adapter.EnumAdapter
 
 @RunWith(AndroidJUnit4::class)
 class EnumAdapterTest {
diff --git a/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/IntAdapterTest.kt b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/IntAdapterTest.kt
similarity index 76%
rename from pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/IntAdapterTest.kt
rename to pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/IntAdapterTest.kt
index a4d99d7cc4..68a64a84b0 100644
--- a/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/IntAdapterTest.kt
+++ b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/IntAdapterTest.kt
@@ -1,8 +1,9 @@
-package de.paulwoitaschek.flowpref.android.internal.adapter
+package de.paulwoitaschek.pref.android.internal.adapter
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Test
 import org.junit.runner.RunWith
+import voice.pref.internal.adapter.IntAdapter
 
 @RunWith(AndroidJUnit4::class)
 class IntAdapterTest {
diff --git a/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/LongAdapterTest.kt b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/LongAdapterTest.kt
similarity index 76%
rename from pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/LongAdapterTest.kt
rename to pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/LongAdapterTest.kt
index 25922e9194..b3de7d66cd 100644
--- a/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/LongAdapterTest.kt
+++ b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/LongAdapterTest.kt
@@ -1,8 +1,9 @@
-package de.paulwoitaschek.flowpref.android.internal.adapter
+package de.paulwoitaschek.pref.android.internal.adapter
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Test
 import org.junit.runner.RunWith
+import voice.pref.internal.adapter.LongAdapter
 
 @RunWith(AndroidJUnit4::class)
 class LongAdapterTest {
diff --git a/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringAdapterTest.kt b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/StringAdapterTest.kt
similarity index 74%
rename from pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringAdapterTest.kt
rename to pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/StringAdapterTest.kt
index 9b2863aae0..54ad7028d0 100644
--- a/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringAdapterTest.kt
+++ b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/StringAdapterTest.kt
@@ -1,8 +1,9 @@
-package de.paulwoitaschek.flowpref.android.internal.adapter
+package de.paulwoitaschek.pref.android.internal.adapter
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Test
 import org.junit.runner.RunWith
+import voice.pref.internal.adapter.StringAdapter
 
 @RunWith(AndroidJUnit4::class)
 class StringAdapterTest {
diff --git a/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringSetAdapterTest.kt b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/StringSetAdapterTest.kt
similarity index 76%
rename from pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringSetAdapterTest.kt
rename to pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/StringSetAdapterTest.kt
index 71abb17c76..7a71e5aa38 100644
--- a/pref/src/test/kotlin/de/paulwoitaschek/flowpref/android/internal/adapter/StringSetAdapterTest.kt
+++ b/pref/src/test/kotlin/de/paulwoitaschek/pref/android/internal/adapter/StringSetAdapterTest.kt
@@ -1,8 +1,9 @@
-package de.paulwoitaschek.flowpref.android.internal.adapter
+package de.paulwoitaschek.pref.android.internal.adapter
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Test
 import org.junit.runner.RunWith
+import voice.pref.internal.adapter.StringSetAdapter
 
 @RunWith(AndroidJUnit4::class)
 class StringSetAdapterTest {
diff --git a/settings/src/main/kotlin/voice/settings/SettingsViewModel.kt b/settings/src/main/kotlin/voice/settings/SettingsViewModel.kt
index f0263b3346..77bf131725 100644
--- a/settings/src/main/kotlin/voice/settings/SettingsViewModel.kt
+++ b/settings/src/main/kotlin/voice/settings/SettingsViewModel.kt
@@ -7,7 +7,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.core.net.toUri
-import de.paulwoitaschek.flowpref.Pref
 import voice.common.AppInfoProvider
 import voice.common.DARK_THEME_SETTABLE
 import voice.common.grid.GridCount
@@ -15,6 +14,7 @@ import voice.common.grid.GridMode
 import voice.common.navigation.Destination
 import voice.common.navigation.Navigator
 import voice.common.pref.PrefKeys
+import voice.pref.Pref
 import javax.inject.Inject
 import javax.inject.Named
 
diff --git a/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimer.kt b/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimer.kt
index 8680e8f405..5cbe945b45 100644
--- a/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimer.kt
+++ b/sleepTimer/src/main/kotlin/voice/sleepTimer/SleepTimer.kt
@@ -2,7 +2,6 @@ package voice.sleepTimer
 
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import com.squareup.anvil.annotations.ContributesBinding
-import de.paulwoitaschek.flowpref.Pref
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.delay
@@ -18,6 +17,7 @@ import voice.logging.core.Logger
 import voice.playback.PlayerController
 import voice.playback.playstate.PlayStateManager
 import voice.playback.playstate.PlayStateManager.PlayState.Playing
+import voice.pref.Pref
 import javax.inject.Inject
 import javax.inject.Named
 import javax.inject.Singleton

From 801a54281e002668a245696bc3b3e3a9e167223a Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@gmail.com>
Date: Sat, 28 Dec 2024 12:37:18 +0100
Subject: [PATCH 232/236] Adjust to the latest clikt changes

---
 scripts/build.gradle.kts                                   | 7 +++++++
 scripts/src/main/kotlin/voice/scripts/NewFeatureModule.kt  | 4 +++-
 scripts/src/main/kotlin/voice/scripts/PopulateTestFiles.kt | 5 ++++-
 scripts/src/main/kotlin/voice/scripts/Script.kt            | 1 +
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/scripts/build.gradle.kts b/scripts/build.gradle.kts
index 051feb3896..350b60b87f 100644
--- a/scripts/build.gradle.kts
+++ b/scripts/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
   alias(libs.plugins.kotlin.jvm)
+  id("voice.ktlint")
   application
 }
 
@@ -10,3 +11,9 @@ application {
 dependencies {
   implementation(libs.clikt)
 }
+
+kotlin {
+  jvmToolchain {
+    languageVersion.set(JavaLanguageVersion.of(17))
+  }
+}
diff --git a/scripts/src/main/kotlin/voice/scripts/NewFeatureModule.kt b/scripts/src/main/kotlin/voice/scripts/NewFeatureModule.kt
index f15ce6d0af..2ee0894f2a 100644
--- a/scripts/src/main/kotlin/voice/scripts/NewFeatureModule.kt
+++ b/scripts/src/main/kotlin/voice/scripts/NewFeatureModule.kt
@@ -1,11 +1,12 @@
 package voice.scripts
 
 import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.Context
 import com.github.ajalt.clikt.parameters.arguments.argument
 import com.github.ajalt.clikt.parameters.arguments.validate
 import java.io.File
 
-class NewFeatureModule : CliktCommand(help = "Creates a new feature module") {
+class NewFeatureModule : CliktCommand() {
 
   private val name: String by argument("The new module name, i.e. :unicorn:wings")
     .validate { name ->
@@ -18,6 +19,7 @@ class NewFeatureModule : CliktCommand(help = "Creates a new feature module") {
     name.removePrefix(":").split(":")
   }
 
+  override fun help(context: Context): String = "Creates a new feature module"
   override fun run() {
     val moduleRoot = File(components.joinToString(separator = "/"))
 
diff --git a/scripts/src/main/kotlin/voice/scripts/PopulateTestFiles.kt b/scripts/src/main/kotlin/voice/scripts/PopulateTestFiles.kt
index 2bbf9c607e..e6ec0646f3 100644
--- a/scripts/src/main/kotlin/voice/scripts/PopulateTestFiles.kt
+++ b/scripts/src/main/kotlin/voice/scripts/PopulateTestFiles.kt
@@ -1,9 +1,10 @@
 package voice.scripts
 
 import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.Context
 import java.io.File
 
-class PopulateTestFiles : CliktCommand(help = "Populates test files using adb") {
+class PopulateTestFiles : CliktCommand() {
 
   private val testFilesRoot = File("build/testfiles/")
 
@@ -17,6 +18,8 @@ class PopulateTestFiles : CliktCommand(help = "Populates test files using adb")
     pushToAdb()
   }
 
+  override fun help(context: Context): String = "Populates test files using adb"
+
   private fun pushToAdb() {
     println("Pushing to adb")
     runCommand("adb", "shell", "rm", "-rf", "/sdcard/testfiles")
diff --git a/scripts/src/main/kotlin/voice/scripts/Script.kt b/scripts/src/main/kotlin/voice/scripts/Script.kt
index bc654103bc..06b2b75f66 100644
--- a/scripts/src/main/kotlin/voice/scripts/Script.kt
+++ b/scripts/src/main/kotlin/voice/scripts/Script.kt
@@ -1,6 +1,7 @@
 package voice.scripts
 
 import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.main
 import com.github.ajalt.clikt.core.subcommands
 
 class Script : CliktCommand() {

From cb16f9ffb84882b8b54d1c724a86a39857002516 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 6 Jan 2025 16:34:45 +0000
Subject: [PATCH 233/236] Update dependency
 org.jetbrains.kotlinx:kotlinx-serialization-json to v1.8.0 (#2669)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b6de6c15e2..0ea59b2334 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -59,7 +59,7 @@ coroutines-guava = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-guava",
 coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
 coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
 
-serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3"
+serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0"
 
 room-runtime = { module = "androidx.room:room-ktx", version.ref = "room" }
 room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }

From c65a85d46c7d3b09f9eaee3f13959c8a94f15cb2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 9 Jan 2025 18:30:17 +0000
Subject: [PATCH 234/236] Update agp to v8.8.0 (#2670)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0ea59b2334..e801dbaece 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ materialDialog = "3.3.0"
 dagger = "2.54"
 kotlin = "2.1.0"
 media3 = "1.5.1"
-agp = "8.7.3"
+agp = "8.8.0"
 ktlint-core = "1.5.0"
 ktlint-gradlePlugin = "0.10.0"
 retrofit = "2.11.0"

From f4a7906404da7ad62de960d92fffc260c37a707c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 9 Jan 2025 21:56:14 +0000
Subject: [PATCH 235/236] Update dagger to v2.55 (#2671)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e801dbaece..d8191f3f25 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ coroutines = "1.10.1"
 room = "2.6.1"
 prefs = "1.0.1"
 materialDialog = "3.3.0"
-dagger = "2.54"
+dagger = "2.55"
 kotlin = "2.1.0"
 media3 = "1.5.1"
 agp = "8.8.0"

From 59da4a1156dde4b3482625d80d8fb1fce67a1e86 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 Jan 2025 13:53:30 +0000
Subject: [PATCH 236/236] Update dependency io.mockk:mockk to v1.13.16 (#2672)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d8191f3f25..134ceeb3bc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,7 +26,7 @@ leakcanary-plumber = { module = "com.squareup.leakcanary:plumber-android-startup
 material = "com.google.android.material:material:1.12.0"
 ffmpeg = "com.arthenica:ffmpeg-kit-audio:6.0-2"
 junit = "junit:junit:4.13.2"
-mockk = "io.mockk:mockk:1.13.14"
+mockk = "io.mockk:mockk:1.13.16"
 paging-runtime = "androidx.paging:paging-runtime-ktx:3.3.5"
 paging-compose = "androidx.paging:paging-compose:3.3.5"
 retrofit-core = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }