Running ktlint (trailing commas added everywhere)

Clouddark75 · May 2, 2022 · d77d18a · d77d18a
1 parent fd1f5a4
commit d77d18a
Show file tree

Hide file tree

Showing 331 changed files with 1,526 additions and 1,492 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,5 @@
+[*.{kt,kts}]
+indent_size=4
+insert_final_newline=true
+ij_kotlin_allow_trailing_comma=true
+ij_kotlin_allow_trailing_comma_on_call_site=true
diff --git a/app/src/main/java/eu/kanade/tachiyomi/App.kt b/app/src/main/java/eu/kanade/tachiyomi/App.kt
@@ -101,7 +101,7 @@ open class App : Application(), DefaultLifecycleObserver {
                             this@App,
                             0,
                             Intent(ACTION_DISABLE_INCOGNITO_MODE),
-                            PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
+                            PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE,
                         )
                         setContentIntent(pendingIntent)
                     }

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt
@@ -114,7 +114,7 @@ abstract class AbstractBackupRestore<T : AbstractBackupManager>(protected val co
     internal fun showRestoreProgress(
         progress: Int,
         amount: Int,
-        title: String
+        title: String,
     ) {
         notifier.showRestoreProgress(title, progress, amount)
     }

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupNotifier.kt
@@ -73,7 +73,7 @@ class BackupNotifier(private val context: Context) {
             addAction(
                 R.drawable.ic_share_24dp,
                 context.getString(R.string.share),
-                NotificationReceiver.shareBackupPendingBroadcast(context, unifile.uri, Notifications.ID_BACKUP_COMPLETE)
+                NotificationReceiver.shareBackupPendingBroadcast(context, unifile.uri, Notifications.ID_BACKUP_COMPLETE),
             )
 
             show(Notifications.ID_BACKUP_COMPLETE)
@@ -97,7 +97,7 @@ class BackupNotifier(private val context: Context) {
             addAction(
                 R.drawable.ic_close_24dp,
                 context.getString(R.string.stop),
-                NotificationReceiver.cancelRestorePendingBroadcast(context, Notifications.ID_RESTORE_PROGRESS)
+                NotificationReceiver.cancelRestorePendingBroadcast(context, Notifications.ID_RESTORE_PROGRESS),
             )
         }
 
@@ -124,8 +124,8 @@ class BackupNotifier(private val context: Context) {
             R.string.restore_duration,
             TimeUnit.MILLISECONDS.toMinutes(time),
             TimeUnit.MILLISECONDS.toSeconds(time) - TimeUnit.MINUTES.toSeconds(
-                TimeUnit.MILLISECONDS.toMinutes(time)
-            )
+                TimeUnit.MILLISECONDS.toMinutes(time),
+            ),
         )
 
         with(completeNotificationBuilder) {
@@ -142,7 +142,7 @@ class BackupNotifier(private val context: Context) {
                 addAction(
                     R.drawable.ic_eye_24dp,
                     context.getString(R.string.open_log),
-                    NotificationReceiver.openErrorOrSkippedLogPendingActivity(context, uri)
+                    NotificationReceiver.openErrorOrSkippedLogPendingActivity(context, uri),
                 )
             }
 

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt
@@ -98,7 +98,7 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBa
         history: List<BackupHistory>,
         tracks: List<Track>,
         backupCategories: List<BackupCategory>,
-        customManga: CustomMangaManager.MangaJson?
+        customManga: CustomMangaManager.MangaJson?,
     ) {
         db.inTransaction {
             val dbManga = backupManager.getMangaFromDatabase(manga)
@@ -129,7 +129,7 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBa
         history: List<BackupHistory>,
         tracks: List<Track>,
         backupCategories: List<BackupCategory>,
-        customManga: CustomMangaManager.MangaJson?
+        customManga: CustomMangaManager.MangaJson?,
     ) {
         try {
             val fetchedManga = backupManager.restoreManga(manga)
@@ -149,7 +149,7 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBa
         history: List<BackupHistory>,
         tracks: List<Track>,
         backupCategories: List<BackupCategory>,
-        customManga: CustomMangaManager.MangaJson?
+        customManga: CustomMangaManager.MangaJson?,
     ) {
         backupManager.restoreChaptersForManga(backupManga, chapters)
 
@@ -162,7 +162,7 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBa
         history: List<BackupHistory>,
         tracks: List<Track>,
         backupCategories: List<BackupCategory>,
-        customManga: CustomMangaManager.MangaJson?
+        customManga: CustomMangaManager.MangaJson?,
     ) {
         // Restore categories
         backupManager.restoreCategoriesForManga(manga, categories, backupCategories)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/Backup.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/Backup.kt
@@ -9,5 +9,5 @@ data class Backup(
     @ProtoNumber(2) var backupCategories: List<BackupCategory> = emptyList(),
     // Bump by 100 to specify this is a 0.x value
     @ProtoNumber(100) var backupBrokenSources: List<BrokenBackupSource> = emptyList(),
-    @ProtoNumber(101) var backupSources: List<BackupSource> = emptyList()
+    @ProtoNumber(101) var backupSources: List<BackupSource> = emptyList(),
 )
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupCategory.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupCategory.kt
@@ -31,7 +31,7 @@ class BackupCategory(
                 name = category.name,
                 order = category.order,
                 flags = category.flags,
-                mangaSort = category.mangaSort
+                mangaSort = category.mangaSort,
             )
         }
     }

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupChapter.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupChapter.kt
@@ -54,7 +54,7 @@ data class BackupChapter(
                 dateFetch = chapter.date_fetch,
                 dateUpload = chapter.date_upload,
                 sourceOrder = chapter.source_order,
-                pagesLeft = chapter.pages_left
+                pagesLeft = chapter.pages_left,
             )
         }
     }

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupHistory.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupHistory.kt
@@ -6,11 +6,11 @@ import kotlinx.serialization.protobuf.ProtoNumber
 @Serializable
 data class BrokenBackupHistory(
     @ProtoNumber(0) var url: String,
-    @ProtoNumber(1) var lastRead: Long
+    @ProtoNumber(1) var lastRead: Long,
 )
 
 @Serializable
 data class BackupHistory(
     @ProtoNumber(1) var url: String,
-    @ProtoNumber(2) var lastRead: Long
+    @ProtoNumber(2) var lastRead: Long,
 )
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupManga.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupManga.kt
@@ -47,7 +47,7 @@ data class BackupManga(
     @ProtoNumber(802) var customAuthor: String? = null,
     // skipping 803 due to using duplicate value in previous builds
     @ProtoNumber(804) var customDescription: String? = null,
-    @ProtoNumber(805) var customGenre: List<String>? = null
+    @ProtoNumber(805) var customGenre: List<String>? = null,
 ) {
     fun getMangaImpl(): MangaImpl {
         return MangaImpl().apply {
@@ -92,7 +92,7 @@ data class BackupManga(
                 artist = customArtist,
                 description = customDescription,
                 genre = customGenre?.toTypedArray(),
-                status = customStatus.takeUnless { it == 0 }
+                status = customStatus.takeUnless { it == 0 },
             )
         }
         return null
@@ -120,7 +120,7 @@ data class BackupManga(
                 dateAdded = manga.date_added,
                 viewer = manga.readingModeType,
                 viewer_flags = manga.viewer_flags.takeIf { it != -1 } ?: 0,
-                chapterFlags = manga.chapter_flags
+                chapterFlags = manga.chapter_flags,
             ).also { backupManga ->
                 customMangaManager?.getManga(manga)?.let {
                     backupManga.customTitle = it.title

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupSource.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupSource.kt
@@ -7,19 +7,19 @@ import kotlinx.serialization.protobuf.ProtoNumber
 @Serializable
 data class BrokenBackupSource(
     @ProtoNumber(0) var name: String = "",
-    @ProtoNumber(1) var sourceId: Long
+    @ProtoNumber(1) var sourceId: Long,
 )
 
 @Serializable
 data class BackupSource(
     @ProtoNumber(1) var name: String = "",
-    @ProtoNumber(2) var sourceId: Long
+    @ProtoNumber(2) var sourceId: Long,
 ) {
     companion object {
         fun copyFrom(source: Source): BackupSource {
             return BackupSource(
                 name = source.name,
-                sourceId = source.id
+                sourceId = source.id,
             )
         }
     }

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupTracking.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupTracking.kt
@@ -58,7 +58,7 @@ data class BackupTracking(
                 status = track.status,
                 startedReadingDate = track.started_reading_date,
                 finishedReadingDate = track.finished_reading_date,
-                trackingUrl = track.tracking_url
+                trackingUrl = track.tracking_url,
             )
         }
     }

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/cache/ChapterCache.kt b/app/src/main/java/eu/kanade/tachiyomi/data/cache/ChapterCache.kt
@@ -97,7 +97,7 @@ class ChapterCache(private val context: Context) {
             PARAMETER_APP_VERSION,
             PARAMETER_VALUE_COUNT,
             // 4 pages = 115MB, 6 = ~150MB, 10 = ~200MB, 20 = ~300MB
-            (PARAMETER_CACHE_SIZE * cacheSize.toFloat().pow(0.6f)).roundToLong()
+            (PARAMETER_CACHE_SIZE * cacheSize.toFloat().pow(0.6f)).roundToLong(),
         )
     }
 

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/cache/CoverCache.kt b/app/src/main/java/eu/kanade/tachiyomi/data/cache/CoverCache.kt
@@ -85,8 +85,8 @@ class CoverCache(val context: Context) {
             context.toast(
                 context.getString(
                     R.string.deleted_,
-                    Formatter.formatFileSize(context, deletedSize)
-                )
+                    Formatter.formatFileSize(context, deletedSize),
+                ),
             )
         }
     }
@@ -108,8 +108,8 @@ class CoverCache(val context: Context) {
             context.toast(
                 context.getString(
                     R.string.deleted_,
-                    Formatter.formatFileSize(context, deletedSize)
-                )
+                    Formatter.formatFileSize(context, deletedSize),
+                ),
             )
         }
         context.imageLoader.memoryCache.clear()
@@ -217,7 +217,7 @@ class CoverCache(val context: Context) {
      */
     fun deleteFromCache(
         manga: Manga,
-        deleteCustom: Boolean = true
+        deleteCustom: Boolean = true,
     ) {
         // Check if url is empty.
         if (manga.thumbnail_url.isNullOrEmpty()) return

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt
@@ -46,7 +46,7 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
             // Fix kissmanga covers after supporting cloudflare
             db.execSQL(
                 """UPDATE mangas SET thumbnail_url =
-                    REPLACE(thumbnail_url, '93.174.95.110', 'kissmanga.com') WHERE source = 4"""
+                    REPLACE(thumbnail_url, '93.174.95.110', 'kissmanga.com') WHERE source = 4""",
             )
         }
         if (oldVersion < 3) {

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/CategoryTypeMapping.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/CategoryTypeMapping.kt
@@ -21,7 +21,7 @@ import eu.kanade.tachiyomi.data.database.tables.CategoryTable.TABLE
 class CategoryTypeMapping : SQLiteTypeMapping<Category>(
     CategoryPutResolver(),
     CategoryGetResolver(),
-    CategoryDeleteResolver()
+    CategoryDeleteResolver(),
 )
 
 class CategoryPutResolver : DefaultPutResolver<Category>() {

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/ChapterTypeMapping.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/ChapterTypeMapping.kt
@@ -29,7 +29,7 @@ import eu.kanade.tachiyomi.data.database.tables.ChapterTable.TABLE
 class ChapterTypeMapping : SQLiteTypeMapping<Chapter>(
     ChapterPutResolver(),
     ChapterGetResolver(),
-    ChapterDeleteResolver()
+    ChapterDeleteResolver(),
 )
 
 class ChapterPutResolver : DefaultPutResolver<Chapter>() {

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/HistoryTypeMapping.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/HistoryTypeMapping.kt
@@ -20,7 +20,7 @@ import eu.kanade.tachiyomi.data.database.tables.HistoryTable.TABLE
 class HistoryTypeMapping : SQLiteTypeMapping<History>(
     HistoryPutResolver(),
     HistoryGetResolver(),
-    HistoryDeleteResolver()
+    HistoryDeleteResolver(),
 )
 
 open class HistoryPutResolver : DefaultPutResolver<History>() {

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaCategoryTypeMapping.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaCategoryTypeMapping.kt
@@ -18,7 +18,7 @@ import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable.TABLE
 class MangaCategoryTypeMapping : SQLiteTypeMapping<MangaCategory>(
     MangaCategoryPutResolver(),
     MangaCategoryGetResolver(),
-    MangaCategoryDeleteResolver()
+    MangaCategoryDeleteResolver(),
 )
 
 class MangaCategoryPutResolver : DefaultPutResolver<MangaCategory>() {

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaTypeMapping.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaTypeMapping.kt
@@ -34,7 +34,7 @@ import eu.kanade.tachiyomi.data.database.tables.MangaTable.TABLE
 class MangaTypeMapping : SQLiteTypeMapping<Manga>(
     MangaPutResolver(),
     MangaGetResolver(),
-    MangaDeleteResolver()
+    MangaDeleteResolver(),
 )
 
 class MangaPutResolver : DefaultPutResolver<Manga>() {

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/SearchMetadataTypeMapping.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/SearchMetadataTypeMapping.kt
@@ -20,7 +20,7 @@ import eu.kanade.tachiyomi.data.database.tables.SearchMetadataTable.TABLE
 class SearchMetadataTypeMapping : SQLiteTypeMapping<SearchMetadata>(
     SearchMetadataPutResolver(),
     SearchMetadataGetResolver(),
-    SearchMetadataDeleteResolver()
+    SearchMetadataDeleteResolver(),
 )
 
 class SearchMetadataPutResolver : DefaultPutResolver<SearchMetadata>() {
@@ -51,7 +51,7 @@ class SearchMetadataGetResolver : DefaultGetResolver<SearchMetadata>() {
         uploader = cursor.getString(cursor.getColumnIndex(COL_UPLOADER)),
         extra = cursor.getString(cursor.getColumnIndex(COL_EXTRA)),
         indexedExtra = cursor.getString(cursor.getColumnIndex(COL_INDEXED_EXTRA)),
-        extraVersion = cursor.getInt(cursor.getColumnIndex(COL_EXTRA_VERSION))
+        extraVersion = cursor.getInt(cursor.getColumnIndex(COL_EXTRA_VERSION)),
     )
 }
 

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/TrackTypeMapping.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/TrackTypeMapping.kt
@@ -29,7 +29,7 @@ import eu.kanade.tachiyomi.data.database.tables.TrackTable.TABLE
 class TrackTypeMapping : SQLiteTypeMapping<Track>(
     TrackPutResolver(),
     TrackGetResolver(),
-    TrackDeleteResolver()
+    TrackDeleteResolver(),
 )
 
 class TrackPutResolver : DefaultPutResolver<Track>() {

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
@@ -96,7 +96,7 @@ interface Manga : SManga {
                 TYPE_MANHUA -> R.string.manhua
                 TYPE_COMIC -> R.string.comic
                 else -> R.string.manga
-            }
+            },
         ).lowercase(Locale.getDefault())
     }
 
@@ -133,7 +133,7 @@ interface Manga : SManga {
             TYPE_WEBTOON
         } else if (currentTags.any { tag -> isManhuaTag(tag) } || sourceName.contains(
                 "manhua",
-                true
+                true,
             )
         ) {
             TYPE_MANHUA
@@ -348,6 +348,6 @@ fun Manga.toMangaInfo(): MangaInfo {
         genres = this.getGenres() ?: emptyList(),
         key = this.url,
         status = this.status,
-        title = this.title
+        title = this.title,
     )
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/SearchMetadata.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/SearchMetadata.kt
@@ -14,7 +14,7 @@ data class SearchMetadata(
     val indexedExtra: String?,
 
     // The version of this metadata's extra. Used to track changes to the 'extra' field's schema
-    val extraVersion: Int
+    val extraVersion: Int,
 ) {
     // Transient information attached to this piece of metadata, useful for caching
     var transientCache: Map<String, Any>? = null

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/CategoryQueries.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/CategoryQueries.kt
@@ -15,7 +15,7 @@ interface CategoryQueries : DbProvider {
             Query.builder()
                 .table(CategoryTable.TABLE)
                 .orderBy(CategoryTable.COL_ORDER)
-                .build()
+                .build(),
         )
         .prepare()
 
@@ -25,7 +25,7 @@ interface CategoryQueries : DbProvider {
             RawQuery.builder()
                 .query(getCategoriesForMangaQuery())
                 .args(manga.id)
-                .build()
+                .build(),
         )
         .prepare()