Address more spotless lint errors from KMK & SY

komikku-app · Aug 22, 2024 · ef268d9 · ef268d9
1 parent c43ff3c
commit ef268d9
Show file tree

Hide file tree

Showing 118 changed files with 634 additions and 379 deletions.
diff --git a/app/src/main/java/eu/kanade/domain/extension/interactor/TrustExtension.kt b/app/src/main/java/eu/kanade/domain/extension/interactor/TrustExtension.kt
@@ -13,7 +13,7 @@ class TrustExtension(
 ) {
 
     suspend fun isTrusted(pkgInfo: PackageInfo, fingerprints: List<String>): Boolean {
-        // KMK --> 
+        // KMK -->
         if (fingerprints.contains(CreateExtensionRepo.OFFICIAL_REPO_SIGNATURE)) return true
         // KMK <--
         val trustedFingerprints = extensionRepoRepository.getAll().map { it.signingKeyFingerprint }.toHashSet()

diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/GetEnabledSources.kt b/app/src/main/java/eu/kanade/domain/source/interactor/GetEnabledSources.kt
@@ -32,10 +32,11 @@ class GetEnabledSources(
             ) { a, b, c -> Triple(a, b, c) },
             // SY <--
             repository.getSources(),
-        ) { pinnedSourceIds,
-            (enabledLanguages, disabledSources, lastUsedSource),
-            (excludedFromDataSaver, sourcesInCategories, sourceCategoriesFilter),
-            sources,
+        ) {
+                pinnedSourceIds,
+                (enabledLanguages, disabledSources, lastUsedSource),
+                (excludedFromDataSaver, sourcesInCategories, sourceCategoriesFilter),
+                sources,
             ->
 
             val sourcesAndCategories = sourcesInCategories.map {

diff --git a/app/src/main/java/eu/kanade/domain/sync/SyncPreferences.kt b/app/src/main/java/eu/kanade/domain/sync/SyncPreferences.kt
@@ -58,7 +58,7 @@ class SyncPreferences(
 
             // SY -->
             customInfo = preferenceStore.getBoolean("customInfo", true).get(),
-            readEntries = preferenceStore.getBoolean("readEntries", true).get()
+            readEntries = preferenceStore.getBoolean("readEntries", true).get(),
             // SY <--
         )
     }

diff --git a/app/src/main/java/eu/kanade/domain/sync/models/SyncSettings.kt b/app/src/main/java/eu/kanade/domain/sync/models/SyncSettings.kt
@@ -12,6 +12,6 @@ data class SyncSettings(
 
     // SY -->
     val customInfo: Boolean = true,
-    val readEntries: Boolean = true
+    val readEntries: Boolean = true,
     // SY <--
 )
diff --git a/app/src/main/java/eu/kanade/presentation/browse/ExtensionFilterScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/ExtensionFilterScreen.kt
@@ -72,7 +72,7 @@ private fun ExtensionFilterContent(
         contentPadding = contentPadding,
         // KMK -->
         modifier = Modifier
-            .padding(start = MaterialTheme.padding.small)
+            .padding(start = MaterialTheme.padding.small),
         // KMK <--
     ) {
         items(state.languages) { language ->
@@ -87,7 +87,7 @@ private fun ExtensionFilterContent(
                     contentDescription = language,
                     modifier = Modifier
                         .width(48.dp)
-                        .height(32.dp)
+                        .height(32.dp),
                 )
                 // KMK <--
                 SwitchPreferenceWidget(

diff --git a/app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
@@ -369,7 +369,7 @@ private fun ExtensionItemContent(
                 contentDescription = extension.lang ?: "",
                 modifier = Modifier
                     .width(18.dp)
-                    .height(12.dp)
+                    .height(12.dp),
             )
             // KMK <--
 

diff --git a/app/src/main/java/eu/kanade/presentation/browse/GlobalSearchScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/GlobalSearchScreen.kt
@@ -127,7 +127,7 @@ internal fun GlobalSearchContent(
                     "",
                     "",
                     supportsLatest = false,
-                    isStub = false
+                    isStub = false,
                 )
                 // KMK <--
 

diff --git a/app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt
@@ -266,7 +266,7 @@ private fun MigrateSourceItem(
                             contentDescription = lang,
                             modifier = Modifier
                                 .width(18.dp)
-                                .height(12.dp)
+                                .height(12.dp),
                         )
                         // KMK <--
                         Text(

diff --git a/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt
@@ -304,12 +304,12 @@ fun SourceFeedToolbar(
             AppBarActions(
                 actions = persistentListOf(
                     bulkSelectionButton(toggleSelectionMode),
-                )
+                ),
             )
             persistentListOf(
                 if (sourceId != LocalSource.ID) {
                     IconButton(
-                        onClick = onWebViewClick
+                        onClick = onWebViewClick,
                     ) {
                         Icon(
                             imageVector = Icons.Outlined.Public,

diff --git a/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt
@@ -280,7 +280,7 @@ fun SourcesSearch(
                 ),
                 contentPadding = PaddingValues(12.dp),
             )
-        }
+        },
     )
 }
 
@@ -474,7 +474,8 @@ fun SourceOptionsDialog(
                 }
                 // SY <--
                 // KMK -->
-                if (onClickSettings != null && source.installedExtension !== null &&
+                if (onClickSettings != null &&
+                    source.installedExtension !== null &&
                     source.id !in listOf(LocalSource.ID, EH_SOURCE_ID, EXH_SOURCE_ID)
                 ) {
                     Text(

diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BaseSourceItem.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BaseSourceItem.kt
@@ -95,7 +95,7 @@ private val defaultContent: @Composable RowScope.(
                 contentDescription = lang,
                 modifier = Modifier
                     .width(18.dp)
-                    .height(12.dp)
+                    .height(12.dp),
             )
 
             // Won't look good but it's not like we can ellipsize overflowing content

diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchToolbar.kt b/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchToolbar.kt
@@ -66,7 +66,7 @@ fun GlobalSearchToolbar(
                     AppBarActions(
                         actions = persistentListOf(
                             bulkSelectionButton(toggleSelectionMode),
-                        )
+                        ),
                     )
                 },
                 // KMK <--

diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/SourceSettingsButton.kt b/app/src/main/java/eu/kanade/presentation/browse/components/SourceSettingsButton.kt
@@ -20,7 +20,7 @@ import tachiyomi.source.local.LocalSource
 @Composable
 fun SourceSettingsButton(
     id: Long,
-    @Suppress("UNUSED_PARAMETER") modifier: Modifier = Modifier
+    @Suppress("UNUSED_PARAMETER") modifier: Modifier = Modifier,
 ) {
     // Create a fake source
     val source = Source(id, "", "", supportsLatest = false, isStub = false)
@@ -30,7 +30,7 @@ fun SourceSettingsButton(
 @Composable
 fun SourceSettingsButton(
     source: Source,
-    @Suppress("UNUSED_PARAMETER") modifier: Modifier = Modifier
+    @Suppress("UNUSED_PARAMETER") modifier: Modifier = Modifier,
 ) {
     // Avoid E-Hentai & ExHentai which is built-in & not actually installed extensions
     if (source.id == LocalSource.ID || source.id == EH_SOURCE_ID || source.id == EXH_SOURCE_ID) return

diff --git a/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt b/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
@@ -520,7 +520,7 @@ private fun MangaScreenSmallImpl(
                 style = HazeStyle(
                     tint = HazeDefaults.tint(fullCoverBackground),
                     blurRadius = 10.dp,
-                )
+                ),
             ),
         // KMK <--
     ) { contentPadding ->
@@ -928,7 +928,7 @@ private fun MangaScreenLargeImpl(
                 style = HazeStyle(
                     tint = HazeDefaults.tint(fullCoverBackground),
                     blurRadius = 10.dp,
-                )
+                ),
             ),
         // KMK <--
     ) { contentPadding ->
@@ -1214,7 +1214,9 @@ private fun LazyListScope.sharedChapterItems(
                             // SY <--
                         },
                     readProgress = item.chapter.lastPageRead
-                        .takeIf { /* SY --> */(!item.chapter.read || alwaysShowReadingProgress)/* SY <-- */ && it > 0L }
+                        .takeIf {
+                            /* SY --> */(!item.chapter.read || alwaysShowReadingProgress)/* SY <-- */ && it > 0L
+                        }
                         ?.let {
                             stringResource(
                                 MR.strings.chapter_progress,

diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaChapterListItem.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaChapterListItem.kt
@@ -152,7 +152,12 @@ fun MangaChapterListItem(
                                 maxLines = 1,
                                 overflow = TextOverflow.Ellipsis,
                             )
-                            if (readProgress != null || scanlator != null/* SY --> */ || sourceName != null/* SY <-- */) DotSeparatorText()
+                            if (readProgress != null ||
+                                scanlator != null/* SY --> */ ||
+                                sourceName != null/* SY <-- */
+                            ) {
+                                DotSeparatorText()
+                            }
                         }
                         if (readProgress != null) {
                             Text(

diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaCover.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaCover.kt
@@ -86,7 +86,7 @@ enum class MangaCover(val ratio: Float) {
             // KMK -->
             loading = {
                 Box(
-                    modifier = modifierColored
+                    modifier = modifierColored,
                 ) {
                     CircularProgressIndicator(
                         color = tint?.let { Color(it) } ?: CoverPlaceholderOnBgColor,
@@ -96,7 +96,7 @@ enum class MangaCover(val ratio: Float) {
                                     Size.Big -> 16.dp
                                     Size.Medium -> 24.dp
                                     else -> 32.dp
-                                }
+                                },
                             )
                             .align(Alignment.Center),
                         strokeWidth = when (size) {
@@ -108,7 +108,7 @@ enum class MangaCover(val ratio: Float) {
             },
             error = {
                 Box(
-                    modifier = modifierColored
+                    modifier = modifierColored,
                 ) {
                     Image(
                         imageVector = ImageVector.vectorResource(R.drawable.cover_error_vector),
@@ -119,11 +119,11 @@ enum class MangaCover(val ratio: Float) {
                                     Size.Big -> 16.dp
                                     Size.Medium -> 24.dp
                                     else -> 32.dp
-                                }
+                                },
                             )
                             .align(Alignment.Center),
                         colorFilter = ColorFilter.tint(
-                            tint?.let { Color(it) } ?: CoverPlaceholderOnBgColor
+                            tint?.let { Color(it) } ?: CoverPlaceholderOnBgColor,
                         ),
                     )
                 }
@@ -178,7 +178,7 @@ enum class MangaCoverHide(private val ratio: Float) {
             )
 
         Box(
-            modifier = modifierColored
+            modifier = modifierColored,
         ) {
             Image(
                 imageVector = ImageVector.vectorResource(R.drawable.ic_baseline_menu_book_24),
@@ -187,7 +187,7 @@ enum class MangaCoverHide(private val ratio: Float) {
                     .size(32.dp)
                     .align(Alignment.Center),
                 colorFilter = ColorFilter.tint(
-                    tint?.let { Color(it) } ?: CoverPlaceholderOnBgColor
+                    tint?.let { Color(it) } ?: CoverPlaceholderOnBgColor,
                 ),
             )
         }

diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt
@@ -104,7 +104,8 @@ fun MangaToolbar(
                     }
                     // KMK -->
                     if (isHomeEnabled && navigator != null) {
-                        if (navigator.size >= 2 && navigator.items[navigator.size - 2] is MangaScreen ||
+                        if (navigator.size >= 2 &&
+                            navigator.items[navigator.size - 2] is MangaScreen ||
                             navigator.size >= 5
                         ) {
                             IconButton(onClick = { onHomeClicked() }) {

diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/OutlineButtonWithArrow.kt b/app/src/main/java/eu/kanade/presentation/manga/components/OutlineButtonWithArrow.kt
@@ -38,20 +38,20 @@ fun OutlinedButtonWithArrow(
                 vertical = MaterialTheme.padding.small,
             ),
         colors = ButtonDefaults.outlinedButtonColors(),
-        shape = RoundedCornerShape(8.dp)
+        shape = RoundedCornerShape(8.dp),
     ) {
         Row(
             modifier = Modifier.fillMaxWidth(),
             horizontalArrangement = Arrangement.Center,
-            verticalAlignment = Alignment.CenterVertically
+            verticalAlignment = Alignment.CenterVertically,
         ) {
             Text(
                 text = text,
             )
             Spacer(modifier = Modifier.width(4.dp))
             Icon(
                 imageVector = icon,
-                contentDescription = "Arrow"
+                contentDescription = "Arrow",
             )
         }
     }
@@ -62,6 +62,6 @@ fun OutlinedButtonWithArrow(
 fun OutlinedButtonWithArrowPreview() {
     OutlinedButtonWithArrow(
         text = "Click Me",
-        onClick = { /* Do nothing */ }
+        onClick = { /* Do nothing */ },
     )
 }
diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/PagePreviews.kt b/app/src/main/java/eu/kanade/presentation/manga/components/PagePreviews.kt
@@ -44,7 +44,7 @@ import tachiyomi.presentation.core.i18n.stringResource
 
 @Composable
 private fun PagePreviewLoading(
-    setMaxWidth: (Dp) -> Unit
+    setMaxWidth: (Dp) -> Unit,
 ) {
     val density = LocalDensity.current
     Box(
@@ -63,7 +63,7 @@ private fun PagePreviewLoading(
 @Composable
 private fun PagePreviewRow(
     onOpenPage: (Int) -> Unit,
-    items: ImmutableList<PagePreview>
+    items: ImmutableList<PagePreview>,
 ) {
     Row(
         modifier = Modifier
@@ -88,7 +88,7 @@ private fun PagePreviewMore(
 ) {
     Box(
         modifier = Modifier.fillMaxWidth(),
-        contentAlignment = Alignment.Center
+        contentAlignment = Alignment.Center,
     ) {
         TextButton(onClick = onMorePreviewsClicked) {
             Text(stringResource(SYMR.strings.more_previews))
@@ -116,7 +116,7 @@ fun PagePreviews(
                 pagePreviewState.pagePreviews.take(rowCount * itemPerRowCount).chunked(itemPerRowCount).forEach {
                     PagePreviewRow(
                         onOpenPage = onOpenPage,
-                        items = remember(it) { it.toImmutableList() }
+                        items = remember(it) { it.toImmutableList() },
                     )
                 }
 
@@ -153,7 +153,7 @@ fun LazyListScope.PagePreviewItems(
             ) {
                 PagePreviewRow(
                     onOpenPage = onOpenPage,
-                    items = remember(it) { it.toImmutableList() }
+                    items = remember(it) { it.toImmutableList() },
                 )
             }
             item(

diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/RelatedMangasRow.kt b/app/src/main/java/eu/kanade/presentation/manga/components/RelatedMangasRow.kt
@@ -46,7 +46,9 @@ fun RelatedMangasRow(
             )
         }
 
-        else -> { EmptyResultItem() }
+        else -> {
+            EmptyResultItem()
+        }
     }
 }
 

diff --git a/app/src/main/java/eu/kanade/presentation/more/ComingUpdatesScreen.kt b/app/src/main/java/eu/kanade/presentation/more/ComingUpdatesScreen.kt
@@ -77,7 +77,7 @@ private fun ComingUpdatesScreenPreview() {
             changelogInfo = """
                 ## Yay
                 Foobar
-                
+
                 ### More info
                 [komikku-app/[email protected]](https://github.com/komikku-app/komikku/compare/23d862d17...48fb4a2e6)
                 - Hello ([@cuong-tran](@https://github.com/cuong-tran))

diff --git a/app/src/main/java/eu/kanade/presentation/more/WhatsNewScreen.kt b/app/src/main/java/eu/kanade/presentation/more/WhatsNewScreen.kt
@@ -77,7 +77,7 @@ private fun WhatsNewScreenPreview() {
             changelogInfo = """
                 ## Yay
                 Foobar
-                
+
                 ### More info
                 [komikku-app/[email protected]](https://github.com/komikku-app/komikku/compare/23d862d17...48fb4a2e6)
                 - Hello ([@cuong-tran](@https://github.com/cuong-tran))

diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAppearanceScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAppearanceScreen.kt
@@ -263,11 +263,15 @@ object SettingsAppearanceScreen : SearchableSettings {
                 Preference.PreferenceItem.SliderPreference(
                     value = previewsRowCount,
                     title = stringResource(SYMR.strings.pref_previews_row_count),
-                    subtitle = if (previewsRowCount > 0) pluralStringResource(
-                        SYMR.plurals.row_count,
-                        previewsRowCount,
-                        previewsRowCount,
-                    ) else stringResource(MR.strings.disabled),
+                    subtitle = if (previewsRowCount > 0) {
+                        pluralStringResource(
+                            SYMR.plurals.row_count,
+                            previewsRowCount,
+                            previewsRowCount,
+                        )
+                    } else {
+                        stringResource(MR.strings.disabled)
+                    },
                     min = 0,
                     max = 10,
                     onValueChanged = {