Merge pull request #2427 from PaulWoitaschek/renovate/ktlint

Update Ktlint

.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

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)

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
 

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()
 

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,

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()

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()
 

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
 

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)

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 {

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

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,

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")

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 {

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

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?>()
 

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,
+  )
 }

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,
+  )
 }

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(

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

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)
   }

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,

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 = [

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() }

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
 

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,

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
 

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

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,

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
 }

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