Skip to content

Commit d77d18a

Browse files
Jays2KingsJays2Kings
committed
Running ktlint (trailing commas added everywhere)
1 parent fd1f5a4 commit d77d18a

File tree

331 files changed

+1526
-1492
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

331 files changed

+1526
-1492
lines changed

‎.editorconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[*.{kt,kts}]
2+
indent_size=4
3+
insert_final_newline=true
4+
ij_kotlin_allow_trailing_comma=true
5+
ij_kotlin_allow_trailing_comma_on_call_site=true

‎app/src/main/java/eu/kanade/tachiyomi/App.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ open class App : Application(), DefaultLifecycleObserver {
101101
this@App,
102102
0,
103103
Intent(ACTION_DISABLE_INCOGNITO_MODE),
104-
PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
104+
PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE,
105105
)
106106
setContentIntent(pendingIntent)
107107
}

‎app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ abstract class AbstractBackupRestore<T : AbstractBackupManager>(protected val co
114114
internal fun showRestoreProgress(
115115
progress: Int,
116116
amount: Int,
117-
title: String
117+
title: String,
118118
) {
119119
notifier.showRestoreProgress(title, progress, amount)
120120
}

‎app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupNotifier.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class BackupNotifier(private val context: Context) {
7373
addAction(
7474
R.drawable.ic_share_24dp,
7575
context.getString(R.string.share),
76-
NotificationReceiver.shareBackupPendingBroadcast(context, unifile.uri, Notifications.ID_BACKUP_COMPLETE)
76+
NotificationReceiver.shareBackupPendingBroadcast(context, unifile.uri, Notifications.ID_BACKUP_COMPLETE),
7777
)
7878

7979
show(Notifications.ID_BACKUP_COMPLETE)
@@ -97,7 +97,7 @@ class BackupNotifier(private val context: Context) {
9797
addAction(
9898
R.drawable.ic_close_24dp,
9999
context.getString(R.string.stop),
100-
NotificationReceiver.cancelRestorePendingBroadcast(context, Notifications.ID_RESTORE_PROGRESS)
100+
NotificationReceiver.cancelRestorePendingBroadcast(context, Notifications.ID_RESTORE_PROGRESS),
101101
)
102102
}
103103

@@ -124,8 +124,8 @@ class BackupNotifier(private val context: Context) {
124124
R.string.restore_duration,
125125
TimeUnit.MILLISECONDS.toMinutes(time),
126126
TimeUnit.MILLISECONDS.toSeconds(time) - TimeUnit.MINUTES.toSeconds(
127-
TimeUnit.MILLISECONDS.toMinutes(time)
128-
)
127+
TimeUnit.MILLISECONDS.toMinutes(time),
128+
),
129129
)
130130

131131
with(completeNotificationBuilder) {
@@ -142,7 +142,7 @@ class BackupNotifier(private val context: Context) {
142142
addAction(
143143
R.drawable.ic_eye_24dp,
144144
context.getString(R.string.open_log),
145-
NotificationReceiver.openErrorOrSkippedLogPendingActivity(context, uri)
145+
NotificationReceiver.openErrorOrSkippedLogPendingActivity(context, uri),
146146
)
147147
}
148148

‎app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBa
9898
history: List<BackupHistory>,
9999
tracks: List<Track>,
100100
backupCategories: List<BackupCategory>,
101-
customManga: CustomMangaManager.MangaJson?
101+
customManga: CustomMangaManager.MangaJson?,
102102
) {
103103
db.inTransaction {
104104
val dbManga = backupManager.getMangaFromDatabase(manga)
@@ -129,7 +129,7 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBa
129129
history: List<BackupHistory>,
130130
tracks: List<Track>,
131131
backupCategories: List<BackupCategory>,
132-
customManga: CustomMangaManager.MangaJson?
132+
customManga: CustomMangaManager.MangaJson?,
133133
) {
134134
try {
135135
val fetchedManga = backupManager.restoreManga(manga)
@@ -149,7 +149,7 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBa
149149
history: List<BackupHistory>,
150150
tracks: List<Track>,
151151
backupCategories: List<BackupCategory>,
152-
customManga: CustomMangaManager.MangaJson?
152+
customManga: CustomMangaManager.MangaJson?,
153153
) {
154154
backupManager.restoreChaptersForManga(backupManga, chapters)
155155

@@ -162,7 +162,7 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBa
162162
history: List<BackupHistory>,
163163
tracks: List<Track>,
164164
backupCategories: List<BackupCategory>,
165-
customManga: CustomMangaManager.MangaJson?
165+
customManga: CustomMangaManager.MangaJson?,
166166
) {
167167
// Restore categories
168168
backupManager.restoreCategoriesForManga(manga, categories, backupCategories)

‎app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/Backup.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ data class Backup(
99
@ProtoNumber(2) var backupCategories: List<BackupCategory> = emptyList(),
1010
// Bump by 100 to specify this is a 0.x value
1111
@ProtoNumber(100) var backupBrokenSources: List<BrokenBackupSource> = emptyList(),
12-
@ProtoNumber(101) var backupSources: List<BackupSource> = emptyList()
12+
@ProtoNumber(101) var backupSources: List<BackupSource> = emptyList(),
1313
)

‎app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupCategory.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class BackupCategory(
3131
name = category.name,
3232
order = category.order,
3333
flags = category.flags,
34-
mangaSort = category.mangaSort
34+
mangaSort = category.mangaSort,
3535
)
3636
}
3737
}

‎app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupChapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ data class BackupChapter(
5454
dateFetch = chapter.date_fetch,
5555
dateUpload = chapter.date_upload,
5656
sourceOrder = chapter.source_order,
57-
pagesLeft = chapter.pages_left
57+
pagesLeft = chapter.pages_left,
5858
)
5959
}
6060
}

‎app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupHistory.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import kotlinx.serialization.protobuf.ProtoNumber
66
@Serializable
77
data class BrokenBackupHistory(
88
@ProtoNumber(0) var url: String,
9-
@ProtoNumber(1) var lastRead: Long
9+
@ProtoNumber(1) var lastRead: Long,
1010
)
1111

1212
@Serializable
1313
data class BackupHistory(
1414
@ProtoNumber(1) var url: String,
15-
@ProtoNumber(2) var lastRead: Long
15+
@ProtoNumber(2) var lastRead: Long,
1616
)

‎app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupManga.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ data class BackupManga(
4747
@ProtoNumber(802) var customAuthor: String? = null,
4848
// skipping 803 due to using duplicate value in previous builds
4949
@ProtoNumber(804) var customDescription: String? = null,
50-
@ProtoNumber(805) var customGenre: List<String>? = null
50+
@ProtoNumber(805) var customGenre: List<String>? = null,
5151
) {
5252
fun getMangaImpl(): MangaImpl {
5353
return MangaImpl().apply {
@@ -92,7 +92,7 @@ data class BackupManga(
9292
artist = customArtist,
9393
description = customDescription,
9494
genre = customGenre?.toTypedArray(),
95-
status = customStatus.takeUnless { it == 0 }
95+
status = customStatus.takeUnless { it == 0 },
9696
)
9797
}
9898
return null
@@ -120,7 +120,7 @@ data class BackupManga(
120120
dateAdded = manga.date_added,
121121
viewer = manga.readingModeType,
122122
viewer_flags = manga.viewer_flags.takeIf { it != -1 } ?: 0,
123-
chapterFlags = manga.chapter_flags
123+
chapterFlags = manga.chapter_flags,
124124
).also { backupManga ->
125125
customMangaManager?.getManga(manga)?.let {
126126
backupManga.customTitle = it.title

‎app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupSource.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ import kotlinx.serialization.protobuf.ProtoNumber
77
@Serializable
88
data class BrokenBackupSource(
99
@ProtoNumber(0) var name: String = "",
10-
@ProtoNumber(1) var sourceId: Long
10+
@ProtoNumber(1) var sourceId: Long,
1111
)
1212

1313
@Serializable
1414
data class BackupSource(
1515
@ProtoNumber(1) var name: String = "",
16-
@ProtoNumber(2) var sourceId: Long
16+
@ProtoNumber(2) var sourceId: Long,
1717
) {
1818
companion object {
1919
fun copyFrom(source: Source): BackupSource {
2020
return BackupSource(
2121
name = source.name,
22-
sourceId = source.id
22+
sourceId = source.id,
2323
)
2424
}
2525
}

‎app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupTracking.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ data class BackupTracking(
5858
status = track.status,
5959
startedReadingDate = track.started_reading_date,
6060
finishedReadingDate = track.finished_reading_date,
61-
trackingUrl = track.tracking_url
61+
trackingUrl = track.tracking_url,
6262
)
6363
}
6464
}

‎app/src/main/java/eu/kanade/tachiyomi/data/cache/ChapterCache.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class ChapterCache(private val context: Context) {
9797
PARAMETER_APP_VERSION,
9898
PARAMETER_VALUE_COUNT,
9999
// 4 pages = 115MB, 6 = ~150MB, 10 = ~200MB, 20 = ~300MB
100-
(PARAMETER_CACHE_SIZE * cacheSize.toFloat().pow(0.6f)).roundToLong()
100+
(PARAMETER_CACHE_SIZE * cacheSize.toFloat().pow(0.6f)).roundToLong(),
101101
)
102102
}
103103

‎app/src/main/java/eu/kanade/tachiyomi/data/cache/CoverCache.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ class CoverCache(val context: Context) {
8585
context.toast(
8686
context.getString(
8787
R.string.deleted_,
88-
Formatter.formatFileSize(context, deletedSize)
89-
)
88+
Formatter.formatFileSize(context, deletedSize),
89+
),
9090
)
9191
}
9292
}
@@ -108,8 +108,8 @@ class CoverCache(val context: Context) {
108108
context.toast(
109109
context.getString(
110110
R.string.deleted_,
111-
Formatter.formatFileSize(context, deletedSize)
112-
)
111+
Formatter.formatFileSize(context, deletedSize),
112+
),
113113
)
114114
}
115115
context.imageLoader.memoryCache.clear()
@@ -217,7 +217,7 @@ class CoverCache(val context: Context) {
217217
*/
218218
fun deleteFromCache(
219219
manga: Manga,
220-
deleteCustom: Boolean = true
220+
deleteCustom: Boolean = true,
221221
) {
222222
// Check if url is empty.
223223
if (manga.thumbnail_url.isNullOrEmpty()) return

‎app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
4646
// Fix kissmanga covers after supporting cloudflare
4747
db.execSQL(
4848
"""UPDATE mangas SET thumbnail_url =
49-
REPLACE(thumbnail_url, '93.174.95.110', 'kissmanga.com') WHERE source = 4"""
49+
REPLACE(thumbnail_url, '93.174.95.110', 'kissmanga.com') WHERE source = 4""",
5050
)
5151
}
5252
if (oldVersion < 3) {

‎app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/CategoryTypeMapping.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import eu.kanade.tachiyomi.data.database.tables.CategoryTable.TABLE
2121
class CategoryTypeMapping : SQLiteTypeMapping<Category>(
2222
CategoryPutResolver(),
2323
CategoryGetResolver(),
24-
CategoryDeleteResolver()
24+
CategoryDeleteResolver(),
2525
)
2626

2727
class CategoryPutResolver : DefaultPutResolver<Category>() {

‎app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/ChapterTypeMapping.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import eu.kanade.tachiyomi.data.database.tables.ChapterTable.TABLE
2929
class ChapterTypeMapping : SQLiteTypeMapping<Chapter>(
3030
ChapterPutResolver(),
3131
ChapterGetResolver(),
32-
ChapterDeleteResolver()
32+
ChapterDeleteResolver(),
3333
)
3434

3535
class ChapterPutResolver : DefaultPutResolver<Chapter>() {

‎app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/HistoryTypeMapping.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import eu.kanade.tachiyomi.data.database.tables.HistoryTable.TABLE
2020
class HistoryTypeMapping : SQLiteTypeMapping<History>(
2121
HistoryPutResolver(),
2222
HistoryGetResolver(),
23-
HistoryDeleteResolver()
23+
HistoryDeleteResolver(),
2424
)
2525

2626
open class HistoryPutResolver : DefaultPutResolver<History>() {

‎app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaCategoryTypeMapping.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable.TABLE
1818
class MangaCategoryTypeMapping : SQLiteTypeMapping<MangaCategory>(
1919
MangaCategoryPutResolver(),
2020
MangaCategoryGetResolver(),
21-
MangaCategoryDeleteResolver()
21+
MangaCategoryDeleteResolver(),
2222
)
2323

2424
class MangaCategoryPutResolver : DefaultPutResolver<MangaCategory>() {

‎app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaTypeMapping.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import eu.kanade.tachiyomi.data.database.tables.MangaTable.TABLE
3434
class MangaTypeMapping : SQLiteTypeMapping<Manga>(
3535
MangaPutResolver(),
3636
MangaGetResolver(),
37-
MangaDeleteResolver()
37+
MangaDeleteResolver(),
3838
)
3939

4040
class MangaPutResolver : DefaultPutResolver<Manga>() {

‎app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/SearchMetadataTypeMapping.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import eu.kanade.tachiyomi.data.database.tables.SearchMetadataTable.TABLE
2020
class SearchMetadataTypeMapping : SQLiteTypeMapping<SearchMetadata>(
2121
SearchMetadataPutResolver(),
2222
SearchMetadataGetResolver(),
23-
SearchMetadataDeleteResolver()
23+
SearchMetadataDeleteResolver(),
2424
)
2525

2626
class SearchMetadataPutResolver : DefaultPutResolver<SearchMetadata>() {
@@ -51,7 +51,7 @@ class SearchMetadataGetResolver : DefaultGetResolver<SearchMetadata>() {
5151
uploader = cursor.getString(cursor.getColumnIndex(COL_UPLOADER)),
5252
extra = cursor.getString(cursor.getColumnIndex(COL_EXTRA)),
5353
indexedExtra = cursor.getString(cursor.getColumnIndex(COL_INDEXED_EXTRA)),
54-
extraVersion = cursor.getInt(cursor.getColumnIndex(COL_EXTRA_VERSION))
54+
extraVersion = cursor.getInt(cursor.getColumnIndex(COL_EXTRA_VERSION)),
5555
)
5656
}
5757

‎app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/TrackTypeMapping.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import eu.kanade.tachiyomi.data.database.tables.TrackTable.TABLE
2929
class TrackTypeMapping : SQLiteTypeMapping<Track>(
3030
TrackPutResolver(),
3131
TrackGetResolver(),
32-
TrackDeleteResolver()
32+
TrackDeleteResolver(),
3333
)
3434

3535
class TrackPutResolver : DefaultPutResolver<Track>() {

‎app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ interface Manga : SManga {
9696
TYPE_MANHUA -> R.string.manhua
9797
TYPE_COMIC -> R.string.comic
9898
else -> R.string.manga
99-
}
99+
},
100100
).lowercase(Locale.getDefault())
101101
}
102102

@@ -133,7 +133,7 @@ interface Manga : SManga {
133133
TYPE_WEBTOON
134134
} else if (currentTags.any { tag -> isManhuaTag(tag) } || sourceName.contains(
135135
"manhua",
136-
true
136+
true,
137137
)
138138
) {
139139
TYPE_MANHUA
@@ -348,6 +348,6 @@ fun Manga.toMangaInfo(): MangaInfo {
348348
genres = this.getGenres() ?: emptyList(),
349349
key = this.url,
350350
status = this.status,
351-
title = this.title
351+
title = this.title,
352352
)
353353
}

‎app/src/main/java/eu/kanade/tachiyomi/data/database/models/SearchMetadata.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ data class SearchMetadata(
1414
val indexedExtra: String?,
1515

1616
// The version of this metadata's extra. Used to track changes to the 'extra' field's schema
17-
val extraVersion: Int
17+
val extraVersion: Int,
1818
) {
1919
// Transient information attached to this piece of metadata, useful for caching
2020
var transientCache: Map<String, Any>? = null

‎app/src/main/java/eu/kanade/tachiyomi/data/database/queries/CategoryQueries.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ interface CategoryQueries : DbProvider {
1515
Query.builder()
1616
.table(CategoryTable.TABLE)
1717
.orderBy(CategoryTable.COL_ORDER)
18-
.build()
18+
.build(),
1919
)
2020
.prepare()
2121

@@ -25,7 +25,7 @@ interface CategoryQueries : DbProvider {
2525
RawQuery.builder()
2626
.query(getCategoriesForMangaQuery())
2727
.args(manga.id)
28-
.build()
28+
.build(),
2929
)
3030
.prepare()
3131

0 commit comments

Comments
 (0)