diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..b0aa6f2c24 --- /dev/null +++ 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 \ No newline at end of file diff --git a/app/src/main/java/eu/kanade/tachiyomi/App.kt b/app/src/main/java/eu/kanade/tachiyomi/App.kt index a872587681..12c2b56080 100644 --- 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 index 094de8e231..81b2ffbfab 100644 --- 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(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 index 6bfa2d136c..a3b0028109 100644 --- 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 index 08ac567eb7..7bde590f6e 100644 --- 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, tracks: List, backupCategories: List, - 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, tracks: List, backupCategories: List, - 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, tracks: List, backupCategories: List, - customManga: CustomMangaManager.MangaJson? + customManga: CustomMangaManager.MangaJson?, ) { backupManager.restoreChaptersForManga(backupManga, chapters) @@ -162,7 +162,7 @@ class FullBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBa history: List, tracks: List, backupCategories: List, - 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 index ad0fb5b747..bc1d333d1b 100644 --- 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 = emptyList(), // Bump by 100 to specify this is a 0.x value @ProtoNumber(100) var backupBrokenSources: List = emptyList(), - @ProtoNumber(101) var backupSources: List = emptyList() + @ProtoNumber(101) var backupSources: List = 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 index 856b4abe03..8cd519021a 100644 --- 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 index 33adaea8ba..6a37362525 100644 --- 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 index 98b415e60e..790e433c91 100644 --- 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 index e66e135ef7..bc06d83e86 100644 --- 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? = null + @ProtoNumber(805) var customGenre: List? = 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 index a8c12f5843..8c823f71c4 100644 --- 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 index 1f8ecadba8..94881d9c19 100644 --- 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 index c09028b7c7..8d3fbcea0e 100644 --- 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 index 7a6796e2e3..39ce25ade9 100644 --- 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 index 4c8e9dfe89..bf18c224b5 100644 --- 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 index 7a1231338d..13e994d835 100644 --- 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( CategoryPutResolver(), CategoryGetResolver(), - CategoryDeleteResolver() + CategoryDeleteResolver(), ) class CategoryPutResolver : DefaultPutResolver() { 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 index 769bca5ee2..5f38ebf890 100644 --- 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( ChapterPutResolver(), ChapterGetResolver(), - ChapterDeleteResolver() + ChapterDeleteResolver(), ) class ChapterPutResolver : DefaultPutResolver() { 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 index e3da101695..bf842a7d2d 100644 --- 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( HistoryPutResolver(), HistoryGetResolver(), - HistoryDeleteResolver() + HistoryDeleteResolver(), ) open class HistoryPutResolver : DefaultPutResolver() { 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 index 24fff124cd..531e82bc8f 100644 --- 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( MangaCategoryPutResolver(), MangaCategoryGetResolver(), - MangaCategoryDeleteResolver() + MangaCategoryDeleteResolver(), ) class MangaCategoryPutResolver : DefaultPutResolver() { 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 index 956ea3eb62..a0b0b0388d 100644 --- 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( MangaPutResolver(), MangaGetResolver(), - MangaDeleteResolver() + MangaDeleteResolver(), ) class MangaPutResolver : DefaultPutResolver() { 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 index 1f9248a7c1..9f368813f9 100644 --- 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( SearchMetadataPutResolver(), SearchMetadataGetResolver(), - SearchMetadataDeleteResolver() + SearchMetadataDeleteResolver(), ) class SearchMetadataPutResolver : DefaultPutResolver() { @@ -51,7 +51,7 @@ class SearchMetadataGetResolver : DefaultGetResolver() { 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 index ecdbd07ee9..e29abb4afc 100644 --- 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( TrackPutResolver(), TrackGetResolver(), - TrackDeleteResolver() + TrackDeleteResolver(), ) class TrackPutResolver : DefaultPutResolver() { 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 index 5b98c1104f..7ee3b027e2 100644 --- 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 index d6bc94fe33..497b194197 100644 --- 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? = 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 index bf769b1545..f940a50c72 100644 --- 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() diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/ChapterQueries.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/ChapterQueries.kt index 48e3fc7157..767e6df96b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/ChapterQueries.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/ChapterQueries.kt @@ -25,7 +25,7 @@ interface ChapterQueries : DbProvider { .table(ChapterTable.TABLE) .where("${ChapterTable.COL_MANGA_ID} = ?") .whereArgs(mangaId) - .build() + .build(), ) .prepare() @@ -36,7 +36,7 @@ interface ChapterQueries : DbProvider { .query(getRecentsQuery(search.sqLite, offset, isResuming)) // .args(date.time, startDate.time) .observesTables(ChapterTable.TABLE) - .build() + .build(), ) .withGetResolver(MangaChapterGetResolver.INSTANCE) .prepare() @@ -53,7 +53,7 @@ interface ChapterQueries : DbProvider { .query(getRecentsQueryDistinct(search.sqLite, offset, isResuming)) // .args(date.time, startDate.time) .observesTables(ChapterTable.TABLE) - .build() + .build(), ) .withGetResolver(MangaChapterGetResolver.INSTANCE) .prepare() @@ -65,7 +65,7 @@ interface ChapterQueries : DbProvider { .table(ChapterTable.TABLE) .where("${ChapterTable.COL_ID} = ?") .whereArgs(id) - .build() + .build(), ) .prepare() @@ -76,7 +76,7 @@ interface ChapterQueries : DbProvider { .table(ChapterTable.TABLE) .where("${ChapterTable.COL_URL} = ?") .whereArgs(url) - .build() + .build(), ) .prepare() @@ -87,7 +87,7 @@ interface ChapterQueries : DbProvider { .table(ChapterTable.TABLE) .where("${ChapterTable.COL_URL} = ?") .whereArgs(url) - .build() + .build(), ) .prepare() @@ -98,7 +98,7 @@ interface ChapterQueries : DbProvider { .table(ChapterTable.TABLE) .where("${ChapterTable.COL_URL} = ? AND ${ChapterTable.COL_MANGA_ID} = ?") .whereArgs(url, mangaId) - .build() + .build(), ) .prepare() diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/HistoryQueries.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/HistoryQueries.kt index 8778e578d8..62ecf8118d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/HistoryQueries.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/HistoryQueries.kt @@ -48,7 +48,7 @@ interface HistoryQueries : DbProvider { .query(getRecentMangasLimitQuery(search.sqLite, offset, isResuming)) // .args(date.time, startDate.time) .observesTables(HistoryTable.TABLE) - .build() + .build(), ) .withGetResolver(MangaChapterHistoryGetResolver.INSTANCE) .prepare() @@ -65,7 +65,7 @@ interface HistoryQueries : DbProvider { .query(getRecentHistoryUngrouped(search.sqLite, offset, isResuming)) // .args(date.time, startDate.time) .observesTables(HistoryTable.TABLE) - .build() + .build(), ) .withGetResolver(MangaChapterHistoryGetResolver.INSTANCE) .prepare() @@ -85,12 +85,12 @@ interface HistoryQueries : DbProvider { includeRead, endless, offset, - isResuming - ) + isResuming, + ), ) // .args(date.time, startDate.time) .observesTables(HistoryTable.TABLE) - .build() + .build(), ) .withGetResolver(MangaChapterHistoryGetResolver.INSTANCE) .prepare() @@ -102,7 +102,7 @@ interface HistoryQueries : DbProvider { .query(getHistoryByMangaId()) .args(mangaId) .observesTables(HistoryTable.TABLE) - .build() + .build(), ) .prepare() @@ -113,7 +113,7 @@ interface HistoryQueries : DbProvider { .query(getHistoryByChapterUrl()) .args(chapterUrl) .observesTables(HistoryTable.TABLE) - .build() + .build(), ) .prepare() @@ -151,7 +151,7 @@ interface HistoryQueries : DbProvider { .byQuery( DeleteQuery.builder() .table(HistoryTable.TABLE) - .build() + .build(), ) .prepare() @@ -161,7 +161,7 @@ interface HistoryQueries : DbProvider { .table(HistoryTable.TABLE) .where("${HistoryTable.COL_LAST_READ} = ?") .whereArgs(0) - .build() + .build(), ) .prepare() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaCategoryQueries.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaCategoryQueries.kt index 9330f4923a..571cd23aa4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaCategoryQueries.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaCategoryQueries.kt @@ -20,7 +20,7 @@ interface MangaCategoryQueries : DbProvider { .table(MangaCategoryTable.TABLE) .where("${MangaCategoryTable.COL_MANGA_ID} IN (${Queries.placeholders(mangas.size)})") .whereArgs(*mangas.map { it.id }.toTypedArray()) - .build() + .build(), ) .prepare() diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt index 48a841bf95..cc8e6fe4c1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt @@ -29,7 +29,7 @@ interface MangaQueries : DbProvider { .withQuery( Query.builder() .table(MangaTable.TABLE) - .build() + .build(), ) .prepare() @@ -39,7 +39,7 @@ interface MangaQueries : DbProvider { RawQuery.builder() .query(libraryQuery) .observesTables(MangaTable.TABLE, ChapterTable.TABLE, MangaCategoryTable.TABLE, CategoryTable.TABLE) - .build() + .build(), ) .withGetResolver(LibraryMangaGetResolver.INSTANCE) .prepare() @@ -67,7 +67,7 @@ interface MangaQueries : DbProvider { .where("${MangaTable.COL_FAVORITE} = ?") .whereArgs(1) .orderBy(MangaTable.COL_TITLE) - .build() + .build(), ) .prepare() @@ -78,7 +78,7 @@ interface MangaQueries : DbProvider { .table(MangaTable.TABLE) .where("${MangaTable.COL_URL} = ? AND ${MangaTable.COL_SOURCE} = ?") .whereArgs(url, sourceId) - .build() + .build(), ) .prepare() @@ -89,7 +89,7 @@ interface MangaQueries : DbProvider { .table(MangaTable.TABLE) .where("${MangaTable.COL_ID} = ?") .whereArgs(id) - .build() + .build(), ) .prepare() @@ -99,7 +99,7 @@ interface MangaQueries : DbProvider { RawQuery.builder() .query(getSourceIdsWithNonLibraryMangaQuery()) .observesTables(MangaTable.TABLE) - .build() + .build(), ) .withGetResolver(SourceIdMangaCountGetResolver.INSTANCE) .prepare() @@ -163,7 +163,7 @@ interface MangaQueries : DbProvider { .table(MangaTable.TABLE) .where("${MangaTable.COL_FAVORITE} = ? AND ${MangaTable.COL_SOURCE} IN (${Queries.placeholders(sourceIds.size)})") .whereArgs(0, *sourceIds.toTypedArray()) - .build() + .build(), ) .prepare() @@ -171,7 +171,7 @@ interface MangaQueries : DbProvider { .byQuery( DeleteQuery.builder() .table(MangaTable.TABLE) - .build() + .build(), ) .prepare() @@ -181,7 +181,7 @@ interface MangaQueries : DbProvider { RawQuery.builder() .query(getLastReadMangaQuery()) .observesTables(MangaTable.TABLE) - .build() + .build(), ) .prepare() @@ -191,7 +191,7 @@ interface MangaQueries : DbProvider { RawQuery.builder() .query(getLastFetchedMangaQuery()) .observesTables(MangaTable.TABLE) - .build() + .build(), ) .prepare() diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/RawQueries.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/RawQueries.kt index f236f4af7f..2e84b1342e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/RawQueries.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/RawQueries.kt @@ -106,7 +106,7 @@ fun getRecentsQueryDistinct(search: String, offset: Int = 0, isResuming: Boolean fun getRecentMangasLimitQuery( search: String = "", offset: Int = 0, - isResuming: Boolean + isResuming: Boolean, ) = """ SELECT ${Manga.TABLE}.${Manga.COL_URL} as mangaUrl, ${Manga.TABLE}.*, ${Chapter.TABLE}.*, ${History.TABLE}.* @@ -137,7 +137,7 @@ fun getRecentMangasLimitQuery( fun getRecentHistoryUngrouped( search: String = "", offset: Int = 0, - isResuming: Boolean + isResuming: Boolean, ) = """ SELECT ${Manga.TABLE}.${Manga.COL_URL} as mangaUrl, ${Manga.TABLE}.*, ${Chapter.TABLE}.*, ${History.TABLE}.* @@ -166,7 +166,7 @@ fun getAllRecentsType( includeRead: Boolean, endless: Boolean, offset: Int = 0, - isResuming: Boolean + isResuming: Boolean, ) = """ SELECT * FROM (SELECT mangas.url as mangaUrl, mangas.*, chapters.*, history.* diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/SearchMetadataQueries.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/SearchMetadataQueries.kt index dda8d11672..844c6826f9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/SearchMetadataQueries.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/SearchMetadataQueries.kt @@ -15,7 +15,7 @@ interface SearchMetadataQueries : DbProvider { .table(SearchMetadataTable.TABLE) .where("${SearchMetadataTable.COL_MANGA_ID} = ?") .whereArgs(mangaId) - .build() + .build(), ) .prepare() @@ -24,7 +24,7 @@ interface SearchMetadataQueries : DbProvider { .withQuery( Query.builder() .table(SearchMetadataTable.TABLE) - .build() + .build(), ) .prepare() @@ -35,7 +35,7 @@ interface SearchMetadataQueries : DbProvider { .table(SearchMetadataTable.TABLE) .where("${SearchMetadataTable.COL_INDEXED_EXTRA} = ?") .whereArgs(extra) - .build() + .build(), ) .prepare() @@ -46,7 +46,7 @@ interface SearchMetadataQueries : DbProvider { fun deleteAllSearchMetadata() = db.delete().byQuery( DeleteQuery.builder() .table(SearchMetadataTable.TABLE) - .build() + .build(), ) .prepare() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/TrackQueries.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/TrackQueries.kt index 8b99503365..be5ba92580 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/TrackQueries.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/TrackQueries.kt @@ -19,7 +19,7 @@ interface TrackQueries : DbProvider { .table(TrackTable.TABLE) .where("${TrackTable.COL_MANGA_ID} = ?") .whereArgs(mangaId) - .build() + .build(), ) .prepare() @@ -33,7 +33,7 @@ interface TrackQueries : DbProvider { .table(TrackTable.TABLE) .where("${TrackTable.COL_MANGA_ID} = ? AND ${TrackTable.COL_SYNC_ID} = ?") .whereArgs(manga.id, sync.id) - .build() + .build(), ) .prepare() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterKnownBackupPutResolver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterKnownBackupPutResolver.kt index 5b8882e115..da62066c4a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterKnownBackupPutResolver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterKnownBackupPutResolver.kt @@ -29,6 +29,6 @@ class ChapterKnownBackupPutResolver : PutResolver() { contentValuesOf( ChapterTable.COL_READ to chapter.read, ChapterTable.COL_BOOKMARK to chapter.bookmark, - ChapterTable.COL_LAST_PAGE_READ to chapter.last_page_read + ChapterTable.COL_LAST_PAGE_READ to chapter.last_page_read, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/HistoryLastReadPutResolver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/HistoryLastReadPutResolver.kt index 24771204e9..9b035dcc6a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/HistoryLastReadPutResolver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/HistoryLastReadPutResolver.kt @@ -24,7 +24,7 @@ class HistoryLastReadPutResolver : HistoryPutResolver() { .table(updateQuery.table()) .where(updateQuery.where()) .whereArgs(updateQuery.whereArgs()) - .build() + .build(), ) val putResult = cursor.use { putCursor -> @@ -57,6 +57,6 @@ class HistoryLastReadPutResolver : HistoryPutResolver() { */ private fun mapToUpdateContentValues(history: History) = contentValuesOf( - HistoryTable.COL_LAST_READ to history.last_read + HistoryTable.COL_LAST_READ to history.last_read, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFilteredScanlatorsPutResolver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFilteredScanlatorsPutResolver.kt index 3c82ff9cec..fb5ebc2af9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFilteredScanlatorsPutResolver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFilteredScanlatorsPutResolver.kt @@ -26,6 +26,6 @@ class MangaFilteredScanlatorsPutResolver : PutResolver() { .build() fun mapToContentValues(manga: Manga) = contentValuesOf( - MangaTable.COL_FILTERED_SCANLATORS to manga.filtered_scanlators + MangaTable.COL_FILTERED_SCANLATORS to manga.filtered_scanlators, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFlagsPutResolver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFlagsPutResolver.kt index e19a4c889e..89e5b41faa 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFlagsPutResolver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFlagsPutResolver.kt @@ -38,6 +38,6 @@ class MangaFlagsPutResolver(private val colName: String, private val fieldGetter fun mapToContentValues(manga: Manga) = contentValuesOf( - colName to fieldGetter.get(manga) + colName to fieldGetter.get(manga), ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt index 7bb6a7e0b0..cb8b1d7f83 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt @@ -35,7 +35,7 @@ class DownloadCache( private val context: Context, private val provider: DownloadProvider, private val sourceManager: SourceManager, - private val preferences: PreferencesHelper = Injekt.get() + private val preferences: PreferencesHelper = Injekt.get(), ) { /** @@ -250,7 +250,7 @@ class DownloadCache( */ private class RootDirectory( val dir: UniFile, - var files: Map = hashMapOf() + var files: Map = hashMapOf(), ) /** @@ -258,7 +258,7 @@ class DownloadCache( */ private class SourceDirectory( val dir: UniFile, - var files: Map> = hashMapOf() + var files: Map> = hashMapOf(), ) /** @@ -266,7 +266,7 @@ class DownloadCache( */ private class MangaDirectory( val dir: UniFile, - var files: MutableSet = hashSetOf() + var files: MutableSet = hashSetOf(), ) /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt index 72f6975637..ab9e3ef6ec 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt @@ -259,7 +259,7 @@ class DownloadManager(val context: Context) { provider.findChapterDirs(chapters, manga, source) + provider.findTempChapterDirs( chapters, manga, - source + source, ) chapterDirs.forEach { it.delete() } cache.removeChapters(chapters, manga) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt index 22b142a986..b7a5625a1e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt @@ -83,7 +83,7 @@ internal class DownloadNotifier(private val context: Context) { addAction( R.drawable.ic_pause_24dp, context.getString(R.string.pause), - NotificationReceiver.pauseDownloadsPendingBroadcast(context) + NotificationReceiver.pauseDownloadsPendingBroadcast(context), ) } @@ -93,17 +93,17 @@ internal class DownloadNotifier(private val context: Context) { val chapter = download.chapter.name.replaceFirst( "$quotedTitle[\\s]*[-]*[\\s]*" .toRegex(RegexOption.IGNORE_CASE), - "" + "", ) setContentTitle("$title - $chapter".chop(30)) setContentText( - context.getString(R.string.downloading) + context.getString(R.string.downloading), ) } else { setContentTitle( context.getString( - R.string.downloading - ) + R.string.downloading, + ), ) setContentText(null) } @@ -135,7 +135,7 @@ internal class DownloadNotifier(private val context: Context) { addAction( R.drawable.ic_pause_24dp, context.getString(R.string.pause), - NotificationReceiver.pauseDownloadsPendingBroadcast(context) + NotificationReceiver.pauseDownloadsPendingBroadcast(context), ) } @@ -150,7 +150,7 @@ internal class DownloadNotifier(private val context: Context) { val quotedTitle = Pattern.quote(title) val chapter = download.chapter.name.replaceFirst( "$quotedTitle[\\s]*[-]*[\\s]*".toRegex(RegexOption.IGNORE_CASE), - "" + "", ) setContentTitle("$title - $chapter".chop(30)) setContentText(downloadingProgressText) @@ -180,13 +180,13 @@ internal class DownloadNotifier(private val context: Context) { addAction( R.drawable.ic_play_arrow_24dp, context.getString(R.string.resume), - NotificationReceiver.resumeDownloadsPendingBroadcast(context) + NotificationReceiver.resumeDownloadsPendingBroadcast(context), ) // Clear action addAction( R.drawable.ic_close_24dp, context.getString(R.string.cancel_all), - NotificationReceiver.clearDownloadsPendingBroadcast(context) + NotificationReceiver.clearDownloadsPendingBroadcast(context), ) } @@ -228,13 +228,13 @@ internal class DownloadNotifier(private val context: Context) { setSmallIcon(R.drawable.ic_warning_white_24dp) setStyle( NotificationCompat.BigTextStyle() - .bigText(context.getString(R.string.download_queue_size_warning)) + .bigText(context.getString(R.string.download_queue_size_warning)), ) setContentIntent( NotificationHandler.openUrl( context, - LibraryUpdateNotifier.HELP_WARNING_URL - ) + LibraryUpdateNotifier.HELP_WARNING_URL, + ), ) setTimeoutAfter(30000) } @@ -256,7 +256,7 @@ internal class DownloadNotifier(private val context: Context) { fun onError( error: String? = null, chapter: String? = null, - customIntent: Intent? = null + customIntent: Intent? = null, ) { // Create notification with(notification) { @@ -264,8 +264,8 @@ internal class DownloadNotifier(private val context: Context) { setContentText(error ?: context.getString(R.string.could_not_download_unexpected_error)) setStyle( NotificationCompat.BigTextStyle().bigText( - error ?: context.getString(R.string.could_not_download_unexpected_error) - ) + error ?: context.getString(R.string.could_not_download_unexpected_error), + ), ) setSmallIcon(android.R.drawable.stat_sys_warning) setCategory(NotificationCompat.CATEGORY_ERROR) @@ -277,8 +277,8 @@ internal class DownloadNotifier(private val context: Context) { context, 0, customIntent, - PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE - ) + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE, + ), ) } else { setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context)) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt index f555ec22c0..7c038fc28b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt @@ -164,7 +164,7 @@ class DownloadProvider(private val context: Context) { fun findUnmatchedChapterDirs( chapters: List, manga: Manga, - source: Source + source: Source, ): List { val mangaDir = findMangaDir(manga, source) ?: return emptyList() val chapterNameHashSet = chapters.map { it.name }.toHashSet() @@ -231,7 +231,7 @@ class DownloadProvider(private val context: Context) { fun getChapterDirName(chapter: Chapter): String { return DiskUtil.buildValidFilename( if (chapter.scanlator != null) "${chapter.scanlator}_${chapter.name}" - else chapter.name + else chapter.name, ) } @@ -244,7 +244,7 @@ class DownloadProvider(private val context: Context) { return listOf( getChapterDirName(chapter), // Legacy chapter directory name used in v0.8.4 and before - DiskUtil.buildValidFilename(chapter.name) + DiskUtil.buildValidFilename(chapter.name), ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadService.kt index e6cc4ddba6..f9e1a9c617 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadService.kt @@ -127,7 +127,7 @@ class DownloadService : Service() { override fun onCapabilitiesChanged( network: Network, - networkCapabilities: NetworkCapabilities + networkCapabilities: NetworkCapabilities, ) { onNetworkStateChanged() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt index c93492e725..fec467ff23 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt @@ -62,7 +62,7 @@ class Downloader( private val context: Context, private val provider: DownloadProvider, private val cache: DownloadCache, - private val sourceManager: SourceManager + private val sourceManager: SourceManager, ) { private val preferences: PreferencesHelper by injectLazy() private val chapterCache: ChapterCache by injectLazy() @@ -227,7 +227,7 @@ class Downloader( downloadChapter(download).subscribeOn(Schedulers.io()) } }, - 5 + 5, ) .onBackpressureLatest() .observeOn(AndroidSchedulers.mainThread()) @@ -239,7 +239,7 @@ class Downloader( DownloadService.stop(context) Timber.e(error) notifier.onError(error.message) - } + }, ) } @@ -323,13 +323,13 @@ class Downloader( ) { val intent = Intent( Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION, - "package:${context.packageName}".toUri() + "package:${context.packageName}".toUri(), ) notifier.onError( context.getString(R.string.external_storage_download_notice), download.chapter.name, - intent + intent, ) return@defer Observable.just(download) } @@ -389,7 +389,7 @@ class Downloader( private fun getOrDownloadImage( page: Page, download: Download, - tmpDir: UniFile + tmpDir: UniFile, ): Observable { // If the image URL is empty, do nothing if (page.imageUrl == null) { @@ -439,7 +439,7 @@ class Downloader( private fun moveImageFromCache( cacheFile: File, tmpDir: UniFile, - filename: String + filename: String, ): Observable { return Observable.just(cacheFile).map { val tmpFile = tmpDir.createFile("$filename.tmp") @@ -467,7 +467,7 @@ class Downloader( page: Page, source: HttpSource, tmpDir: UniFile, - filename: String + filename: String, ): Observable { page.status = Page.DOWNLOAD_IMAGE page.progress = 0 @@ -519,7 +519,7 @@ class Downloader( download: Download, mangaDir: UniFile, tmpDir: UniFile, - dirname: String + dirname: String, ) { // Ensure that the chapter folder has all the images. val downloadedImages = tmpDir.listFiles().orEmpty().filterNot { it.name!!.endsWith(".tmp") } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/model/DownloadQueue.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/model/DownloadQueue.kt index d1a2228525..11139d507a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/model/DownloadQueue.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/model/DownloadQueue.kt @@ -10,7 +10,7 @@ import java.util.concurrent.CopyOnWriteArrayList class DownloadQueue( private val store: DownloadStore, - private val queue: MutableList = CopyOnWriteArrayList() + private val queue: MutableList = CopyOnWriteArrayList(), ) : List by queue { diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/image/coil/ByteArrayFetcher.kt b/app/src/main/java/eu/kanade/tachiyomi/data/image/coil/ByteArrayFetcher.kt index b6beb02d0b..24c1b37191 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/image/coil/ByteArrayFetcher.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/image/coil/ByteArrayFetcher.kt @@ -19,12 +19,12 @@ class ByteArrayFetcher : Fetcher { pool: BitmapPool, data: ByteArray, size: Size, - options: Options + options: Options, ): FetchResult { return SourceResult( source = ByteArrayInputStream(data).source().buffer(), mimeType = "image/gif", - dataSource = DataSource.MEMORY + dataSource = DataSource.MEMORY, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/image/coil/CoverViewTarget.kt b/app/src/main/java/eu/kanade/tachiyomi/data/image/coil/CoverViewTarget.kt index 0ea7ffd5ac..4fe176bb67 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/image/coil/CoverViewTarget.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/image/coil/CoverViewTarget.kt @@ -12,7 +12,7 @@ import eu.kanade.tachiyomi.util.system.getResourceColor class CoverViewTarget( view: ImageView, val progress: View? = null, - val scaleType: ImageView.ScaleType = ImageView.ScaleType.CENTER_CROP + val scaleType: ImageView.ScaleType = ImageView.ScaleType.CENTER_CROP, ) : ImageViewTarget(view) { override fun onError(error: Drawable?) { @@ -21,7 +21,7 @@ class CoverViewTarget( val vector = VectorDrawableCompat.create( view.context.resources, R.drawable.ic_broken_image_24dp, - null + null, ) vector?.setTint(view.context.getResourceColor(android.R.attr.textColorSecondary)) view.setImageDrawable(vector) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/image/coil/LibraryMangaImageTarget.kt b/app/src/main/java/eu/kanade/tachiyomi/data/image/coil/LibraryMangaImageTarget.kt index 6fa7f450c0..3ded3692d4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/image/coil/LibraryMangaImageTarget.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/image/coil/LibraryMangaImageTarget.kt @@ -17,7 +17,7 @@ import uy.kohesive.injekt.injectLazy class LibraryMangaImageTarget( override val view: ImageView, - val manga: Manga + val manga: Manga, ) : ImageViewTarget(view) { private val coverCache: CoverCache by injectLazy() @@ -46,7 +46,7 @@ class LibraryMangaImageTarget( inline fun ImageView.loadManga( manga: Manga, imageLoader: ImageLoader = context.imageLoader, - builder: ImageRequest.Builder.() -> Unit = {} + builder: ImageRequest.Builder.() -> Unit = {}, ): Disposable { val request = ImageRequest.Builder(context) .data(manga) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/image/coil/MangaFetcher.kt b/app/src/main/java/eu/kanade/tachiyomi/data/image/coil/MangaFetcher.kt index 2fbe3c5fad..d8ce83f331 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/image/coil/MangaFetcher.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/image/coil/MangaFetcher.kt @@ -92,7 +92,7 @@ class MangaFetcher : Fetcher { } else { false }, - shouldFetchRemotely + shouldFetchRemotely, ) if (options.diskCachePolicy.writeEnabled) { @@ -159,7 +159,7 @@ class MangaFetcher : Fetcher { } private suspend fun awaitGetCall(manga: Manga, onlyCache: Boolean = false, forceNetwork: Boolean): Pair { + ResponseBody,> { val call = getCall(manga, onlyCache, forceNetwork) val response = call.await() return response to checkNotNull(response.body) { "Null response source" } @@ -221,7 +221,7 @@ class MangaFetcher : Fetcher { return SourceResult( source = file.source().buffer(), mimeType = "image/*", - dataSource = DataSource.DISK + dataSource = DataSource.DISK, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/CustomMangaManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/CustomMangaManager.kt index 293f1e9dc4..435c44e8dc 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/CustomMangaManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/CustomMangaManager.kt @@ -72,7 +72,7 @@ class CustomMangaManager(val context: Context) { artist, description, genre?.split(", ")?.toTypedArray(), - status.takeUnless { it == -1 } + status.takeUnless { it == -1 }, ) } @@ -89,7 +89,7 @@ class CustomMangaManager(val context: Context) { val artist: String? = null, val description: String? = null, val genre: Array? = null, - val status: Int? = null + val status: Int? = null, ) { fun toManga() = MangaImpl().apply { diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt index 821b370b3b..5e16f19ada 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt @@ -52,7 +52,7 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet interval.toLong(), TimeUnit.HOURS, 10, - TimeUnit.MINUTES + TimeUnit.MINUTES, ) .addTag(TAG) .setConstraints(constraints) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt index 09f4228639..a6dcdaf162 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt @@ -82,7 +82,7 @@ class LibraryUpdateNotifier(private val context: Context) { .setContentTitle("${context.getString(R.string.updating_library)} (${current + 1}/$total)") .setContentText(if (preferences.hideNotificationContent()) null else manga.title) .setProgress(total, current, false) - .build() + .build(), ) } @@ -106,18 +106,18 @@ class LibraryUpdateNotifier(private val context: Context) { NotificationCompat.BigTextStyle().bigText( errors.joinToString("\n") { it.chop(TITLE_MAX_LEN) - } - ) + }, + ), ) setContentIntent(pendingIntent) setSmallIcon(R.drawable.ic_tachij2k_notification) addAction( R.drawable.nnf_ic_file_folder, context.getString(R.string.open_log), - pendingIntent + pendingIntent, ) } - .build() + .build(), ) } @@ -141,18 +141,18 @@ class LibraryUpdateNotifier(private val context: Context) { NotificationCompat.BigTextStyle().bigText( skips.joinToString("\n") { it.chop(TITLE_MAX_LEN) - } - ) + }, + ), ) setContentIntent(NotificationHandler.openUrl(context, HELP_SKIPPED_URL)) setSmallIcon(R.drawable.ic_tachij2k_notification) addAction( R.drawable.nnf_ic_file_folder, context.getString(R.string.open_log), - NotificationReceiver.openErrorOrSkippedLogPendingActivity(context, uri) + NotificationReceiver.openErrorOrSkippedLogPendingActivity(context, uri), ) } - .build() + .build(), ) } @@ -179,7 +179,7 @@ class LibraryUpdateNotifier(private val context: Context) { val request = ImageRequest.Builder(context).data(manga) .parameters( Parameters.Builder().set(MangaFetcher.onlyCache, true) - .build() + .build(), ) .networkCachePolicy(CachePolicy.READ_ONLY) .transformations(CircleCropTransformation()) @@ -199,7 +199,7 @@ class LibraryUpdateNotifier(private val context: Context) { context.resources.getQuantityString( R.plurals.notification_and_n_more, (chapterNames.size - (MAX_CHAPTERS - 1)), - (chapterNames.size - (MAX_CHAPTERS - 1)) + (chapterNames.size - (MAX_CHAPTERS - 1)), ) } else chapterNames.joinToString(", ") setContentText(chaptersNames) @@ -210,8 +210,8 @@ class LibraryUpdateNotifier(private val context: Context) { NotificationReceiver.openChapterPendingActivity( context, manga, - chapters.first() - ) + chapters.first(), + ), ) addAction( R.drawable.ic_eye_24dp, @@ -220,8 +220,8 @@ class LibraryUpdateNotifier(private val context: Context) { context, manga, chapters, - Notifications.ID_NEW_CHAPTERS - ) + Notifications.ID_NEW_CHAPTERS, + ), ) addAction( R.drawable.ic_book_24dp, @@ -229,13 +229,13 @@ class LibraryUpdateNotifier(private val context: Context) { NotificationReceiver.openChapterPendingActivity( context, manga, - Notifications.ID_NEW_CHAPTERS - ) + Notifications.ID_NEW_CHAPTERS, + ), ) setAutoCancel(true) }, - manga.id.hashCode() - ) + manga.id.hashCode(), + ), ) } } @@ -253,8 +253,8 @@ class LibraryUpdateNotifier(private val context: Context) { context.resources.getQuantityString( R.plurals.for_n_titles, updates.size, - updates.size - ) + updates.size, + ), ) if (!preferences.hideNotificationContent()) { setStyle( @@ -262,8 +262,8 @@ class LibraryUpdateNotifier(private val context: Context) { .bigText( updates.keys.joinToString("\n") { it.title.chop(45) - } - ) + }, + ), ) } } else if (!preferences.hideNotificationContent()) { @@ -275,7 +275,7 @@ class LibraryUpdateNotifier(private val context: Context) { setGroupSummary(true) setContentIntent(getNotificationIntent()) setAutoCancel(true) - } + }, ) notifications.forEach { diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt index e0ae3336c9..7bf3091b38 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt @@ -78,7 +78,7 @@ class LibraryUpdateService( val preferences: PreferencesHelper = Injekt.get(), val downloadManager: DownloadManager = Injekt.get(), val trackManager: TrackManager = Injekt.get(), - private val mangaShortcutManager: MangaShortcutManager = Injekt.get() + private val mangaShortcutManager: MangaShortcutManager = Injekt.get(), ) : Service() { /** @@ -374,7 +374,7 @@ class LibraryUpdateService( val skippedFile = writeErrorFile( skippedUpdates, "skipped", - getString(R.string.learn_more_at_, LibraryUpdateNotifier.HELP_SKIPPED_URL) + getString(R.string.learn_more_at_, LibraryUpdateNotifier.HELP_SKIPPED_URL), ).getUriCompat(this) notifier.showUpdateSkippedNotification(skippedUpdates.map { it.key.title }, skippedFile) } @@ -410,7 +410,7 @@ class LibraryUpdateService( private suspend fun updateMangaChapters( manga: LibraryManga, progress: Int, - shouldDownload: Boolean + shouldDownload: Boolean, ): Boolean { try { @@ -442,7 +442,7 @@ class LibraryUpdateService( } } if (newChapters.first.size + newChapters.second.size > 0) listener?.onUpdateManga( - manga + manga, ) } return hasDownloads @@ -481,7 +481,7 @@ class LibraryUpdateService( notifier.showProgressNotification( manga, count.andIncrement, - mangaToUpdate.size + mangaToUpdate.size, ) val networkManga = try { @@ -628,7 +628,7 @@ class LibraryUpdateService( context: Context, category: Category? = null, target: Target = Target.CHAPTERS, - mangaToUse: List? = null + mangaToUse: List? = null, ): Boolean { return if (!isRunning()) { val intent = Intent(context, LibraryUpdateService::class.java).apply { @@ -637,7 +637,7 @@ class LibraryUpdateService( putExtra(KEY_CATEGORY, id) if (mangaToUse != null) putExtra( KEY_MANGAS, - mangaToUse.mapNotNull { it.id }.toLongArray() + mangaToUse.mapNotNull { it.id }.toLongArray(), ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt index d87ef87260..0f8b747c31 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt @@ -61,7 +61,7 @@ class NotificationReceiver : BroadcastReceiver() { ACTION_DELETE_IMAGE -> deleteImage( context, intent.getStringExtra(EXTRA_FILE_LOCATION)!!, - intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1) + intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1), ) // Cancel library update and dismiss notification ACTION_CANCEL_LIBRARY_UPDATE -> cancelLibraryUpdate(context) @@ -73,14 +73,14 @@ class NotificationReceiver : BroadcastReceiver() { shareBackup( context, intent.getParcelableExtra(EXTRA_URI)!!, - intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1) + intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1), ) ACTION_MARK_AS_READ -> { val notificationId = intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1) if (notificationId > -1) dismissNotification( context, notificationId, - intent.getIntExtra(EXTRA_GROUP_ID, 0) + intent.getIntExtra(EXTRA_GROUP_ID, 0), ) val urls = intent.getStringArrayExtra(EXTRA_CHAPTER_URL) ?: return val mangaId = intent.getLongExtra(EXTRA_MANGA_ID, -1) @@ -93,7 +93,7 @@ class NotificationReceiver : BroadcastReceiver() { context, intent.getParcelableExtra(EXTRA_URI)!!, "text/plain", - intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1) + intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1), ) } } @@ -346,7 +346,7 @@ class NotificationReceiver : BroadcastReceiver() { context: Context, notificationId: Int, groupId: Int? = - null + null, ) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { val groupKey = context.notificationManager.activeNotifications.find { @@ -385,7 +385,7 @@ class NotificationReceiver : BroadcastReceiver() { context, 0, shareIntent, - PendingIntent.FLAG_CANCEL_CURRENT or PendingIntent.FLAG_IMMUTABLE + PendingIntent.FLAG_CANCEL_CURRENT or PendingIntent.FLAG_IMMUTABLE, ) } @@ -417,14 +417,14 @@ class NotificationReceiver : BroadcastReceiver() { context: Context, manga: Manga, chapter: - Chapter + Chapter, ): PendingIntent { val newIntent = ReaderActivity.newIntent(context, manga, chapter) return PendingIntent.getActivity( context, manga.id.hashCode(), newIntent, - PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE, ) } @@ -446,7 +446,7 @@ class NotificationReceiver : BroadcastReceiver() { context, downloadLink.hashCode(), newIntent, - PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE, ) } @@ -468,7 +468,7 @@ class NotificationReceiver : BroadcastReceiver() { context, manga.id.hashCode(), newIntent, - PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE, ) } @@ -502,7 +502,7 @@ class NotificationReceiver : BroadcastReceiver() { context, 0, newIntent, - PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE, ) } @@ -517,7 +517,7 @@ class NotificationReceiver : BroadcastReceiver() { manga: Manga, chapters: Array, - groupId: Int + groupId: Int, ): PendingIntent { val newIntent = Intent(context, NotificationReceiver::class.java).apply { diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/notification/Notifications.kt b/app/src/main/java/eu/kanade/tachiyomi/data/notification/Notifications.kt index 145e798c41..e64517de72 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/notification/Notifications.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/notification/Notifications.kt @@ -85,7 +85,7 @@ object Notifications { private val deprecatedChannels = listOf( "backup_restore_channel", - "library_channel" + "library_channel", ) /** @@ -102,11 +102,11 @@ object Notifications { listOf( NotificationChannelGroup( GROUP_BACKUP_RESTORE, - context.getString(R.string.backup_and_restore) + context.getString(R.string.backup_and_restore), ), NotificationChannelGroup( GROUP_EXTENSION_UPDATES, - context.getString(R.string.extension_updates) + context.getString(R.string.extension_updates), ), NotificationChannelGroup(GROUP_LIBRARY, context.getString(R.string.library)), ).forEach(context.notificationManager::createNotificationChannelGroup) @@ -115,12 +115,12 @@ object Notifications { NotificationChannel( CHANNEL_COMMON, context.getString(R.string.common), - NotificationManager.IMPORTANCE_LOW + NotificationManager.IMPORTANCE_LOW, ), NotificationChannel( CHANNEL_LIBRARY_PROGRESS, context.getString(R.string.updating_library), - NotificationManager.IMPORTANCE_LOW + NotificationManager.IMPORTANCE_LOW, ).apply { group = GROUP_LIBRARY setShowBadge(false) @@ -128,7 +128,7 @@ object Notifications { NotificationChannel( CHANNEL_LIBRARY_ERROR, context.getString(R.string.channel_errors), - NotificationManager.IMPORTANCE_LOW + NotificationManager.IMPORTANCE_LOW, ).apply { group = GROUP_LIBRARY setShowBadge(false) @@ -136,7 +136,7 @@ object Notifications { NotificationChannel( CHANNEL_LIBRARY_SKIPPED, context.getString(R.string.channel_skipped), - NotificationManager.IMPORTANCE_LOW + NotificationManager.IMPORTANCE_LOW, ).apply { group = GROUP_LIBRARY setShowBadge(false) @@ -144,28 +144,28 @@ object Notifications { NotificationChannel( CHANNEL_DOWNLOADER, context.getString(R.string.downloads), - NotificationManager.IMPORTANCE_LOW + NotificationManager.IMPORTANCE_LOW, ).apply { setShowBadge(false) }, NotificationChannel( CHANNEL_UPDATES_TO_EXTS, context.getString(R.string.extension_updates_pending), - NotificationManager.IMPORTANCE_DEFAULT + NotificationManager.IMPORTANCE_DEFAULT, ).apply { group = GROUP_EXTENSION_UPDATES }, NotificationChannel( CHANNEL_NEW_CHAPTERS, context.getString(R.string.new_chapters), - NotificationManager.IMPORTANCE_DEFAULT + NotificationManager.IMPORTANCE_DEFAULT, ).apply { group = GROUP_LIBRARY }, NotificationChannel( CHANNEL_BACKUP_RESTORE_PROGRESS, context.getString(R.string.progress), - NotificationManager.IMPORTANCE_LOW + NotificationManager.IMPORTANCE_LOW, ).apply { group = GROUP_BACKUP_RESTORE setShowBadge(false) @@ -173,7 +173,7 @@ object Notifications { NotificationChannel( CHANNEL_BACKUP_RESTORE_COMPLETE, context.getString(R.string.complete), - NotificationManager.IMPORTANCE_HIGH + NotificationManager.IMPORTANCE_HIGH, ).apply { group = GROUP_BACKUP_RESTORE setShowBadge(false) @@ -182,17 +182,17 @@ object Notifications { NotificationChannel( CHANNEL_CRASH_LOGS, context.getString(R.string.crash_logs), - NotificationManager.IMPORTANCE_HIGH + NotificationManager.IMPORTANCE_HIGH, ), NotificationChannel( CHANNEL_INCOGNITO_MODE, context.getString(R.string.incognito_mode), - NotificationManager.IMPORTANCE_LOW + NotificationManager.IMPORTANCE_LOW, ), NotificationChannel( CHANNEL_EXT_PROGRESS, context.getString(R.string.updating_extensions), - NotificationManager.IMPORTANCE_LOW + NotificationManager.IMPORTANCE_LOW, ).apply { group = GROUP_EXTENSION_UPDATES setShowBadge(false) @@ -201,17 +201,17 @@ object Notifications { NotificationChannel( CHANNEL_EXT_UPDATED, context.getString(R.string.extensions_updated), - NotificationManager.IMPORTANCE_DEFAULT + NotificationManager.IMPORTANCE_DEFAULT, ).apply { group = GROUP_EXTENSION_UPDATES }, NotificationChannel( CHANNEL_UPDATED, context.getString(R.string.update_completed), - NotificationManager.IMPORTANCE_DEFAULT + NotificationManager.IMPORTANCE_DEFAULT, ).apply { setShowBadge(false) - } + }, ) context.notificationManager.createNotificationChannels(channels) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt index 404a4c0878..4c28f337c0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt @@ -73,16 +73,16 @@ class PreferencesHelper(val context: Context) { File( Environment.getExternalStorageDirectory().absolutePath + File.separator + context.getString(R.string.app_name), - "downloads" - ) + "downloads", + ), ) private val defaultBackupDir = Uri.fromFile( File( Environment.getExternalStorageDirectory().absolutePath + File.separator + context.getString(R.string.app_name), - "backup" - ) + "backup", + ), ) fun getInt(key: String, default: Int) = flowPrefs.getInt(key, default) @@ -182,7 +182,7 @@ class PreferencesHelper(val context: Context) { fun readerBottomButtons() = flowPrefs.getStringSet( Keys.readerBottomButtons, - ReaderBottomButton.BUTTONS_DEFAULTS + ReaderBottomButton.BUTTONS_DEFAULTS, ) fun showNavigationOverlayNewUser() = flowPrefs.getBoolean(Keys.showNavigationOverlayNewUser, true) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt index 5c3bf58837..f6164dde47 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt @@ -267,7 +267,8 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) { | status |} |} - |""".trimMargin() + | + """.trimMargin() fun deleteFromLibraryQuery() = """ @@ -276,7 +277,8 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) { |deleted |} - |}""".trimMargin() + |} + """.trimMargin() fun updateInLibraryQuery() = """ @@ -297,7 +299,8 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) { |} |} |} - |""".trimMargin() + | + """.trimMargin() fun searchQuery() = """ @@ -323,7 +326,8 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) { |} |} |} - |""".trimMargin() + | + """.trimMargin() fun findLibraryMangaQuery() = """ @@ -365,7 +369,8 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) { |} |} |} - |""".trimMargin() + | + """.trimMargin() fun currentUserQuery() = """ @@ -377,6 +382,7 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) { |} |} |} - |""".trimMargin() + | + """.trimMargin() } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/KitsuApi.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/KitsuApi.kt index deefd29bcb..ce190efd61 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/KitsuApi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/KitsuApi.kt @@ -62,10 +62,10 @@ class KitsuApi(private val client: OkHttpClient, interceptor: KitsuInterceptor) "${baseUrl}library-entries", headers = headersOf( "Content-Type", - "application/vnd.api+json" + "application/vnd.api+json", ), - body = data.toString().toRequestBody("application/vnd.api+json".toMediaType()) - ) + body = data.toString().toRequestBody("application/vnd.api+json".toMediaType()), + ), ) .await() .parseAs() @@ -98,11 +98,11 @@ class KitsuApi(private val client: OkHttpClient, interceptor: KitsuInterceptor) .headers( headersOf( "Content-Type", - "application/vnd.api+json" - ) + "application/vnd.api+json", + ), ) .patch(data.toString().toRequestBody("application/vnd.api+json".toMediaType())) - .build() + .build(), ) .await() .parseAs() @@ -140,11 +140,11 @@ class KitsuApi(private val client: OkHttpClient, interceptor: KitsuInterceptor) .headers( headersOf( "Content-Type", - "application/vnd.api+json" - ) + "application/vnd.api+json", + ), ) .delete(data.toString().toRequestBody("application/vnd.api+json".toMediaType())) - .build() + .build(), ) .await() .let { @@ -180,8 +180,8 @@ class KitsuApi(private val client: OkHttpClient, interceptor: KitsuInterceptor) "X-Algolia-API-Key", key, ), - body = jsonObject.toString().toRequestBody(jsonMime) - ) + body = jsonObject.toString().toRequestBody(jsonMime), + ), ) .await() .parseAs() @@ -293,7 +293,7 @@ class KitsuApi(private val client: OkHttpClient, interceptor: KitsuInterceptor) .add("refresh_token", token) .add("client_id", clientId) .add("client_secret", clientSecret) - .build() + .build(), ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/OAuth.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/OAuth.kt index 5cd28c4962..33dade31cc 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/OAuth.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/OAuth.kt @@ -8,7 +8,7 @@ data class OAuth( val token_type: String, val created_at: Long, val expires_in: Long, - val refresh_token: String? + val refresh_token: String?, ) { fun isExpired() = (System.currentTimeMillis() / 1000) > (created_at + expires_in - 3600) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeListApi.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeListApi.kt index 28e47cc471..4bb1f9d352 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeListApi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeListApi.kt @@ -165,7 +165,7 @@ class MyAnimeListApi(private val client: OkHttpClient, interceptor: MyAnimeListI .filter { it.jsonObject["node"]!!.jsonObject["title"]!!.jsonPrimitive.content.contains( query, - ignoreCase = true + ignoreCase = true, ) } .map { diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/OAuth.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/OAuth.kt index 6f0a02d1ac..dc5ca5137d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/OAuth.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/OAuth.kt @@ -7,7 +7,7 @@ data class OAuth( val refresh_token: String, val access_token: String, val token_type: String, - val expires_in: Long + val expires_in: Long, ) { fun isExpired() = System.currentTimeMillis() > expires_in diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateJob.kt index c81e16cb4f..450a75c352 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateJob.kt @@ -45,7 +45,7 @@ class AppUpdateJob(private val context: Context, workerParams: WorkerParameters) 2, TimeUnit.DAYS, 3, - TimeUnit.HOURS + TimeUnit.HOURS, ) .addTag(TAG) .setConstraints(constraints) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateNotifier.kt index c58041dcc6..2ef02540bc 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateNotifier.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateNotifier.kt @@ -64,8 +64,8 @@ internal class AppUpdateNotifier(private val context: Context) { R.string.new_beta_version_available } else { R.string.new_version_available - } - ) + }, + ), ) setContentIntent(pendingIntent) setAutoCancel(true) @@ -81,8 +81,8 @@ internal class AppUpdateNotifier(private val context: Context) { context, 0, intent, - PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE - ) + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE, + ), ) addReleasePageAction() } @@ -97,7 +97,7 @@ internal class AppUpdateNotifier(private val context: Context) { addAction( R.drawable.ic_new_releases_24dp, context.getString(R.string.release_page), - PendingIntent.getActivity(context, releaseUrl.hashCode(), releaseIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) + PendingIntent.getActivity(context, releaseUrl.hashCode(), releaseIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE), ) } } @@ -120,7 +120,7 @@ internal class AppUpdateNotifier(private val context: Context) { addAction( R.drawable.ic_close_24dp, context.getString(R.string.cancel), - NotificationReceiver.cancelUpdateDownloadPendingBroadcast(context) + NotificationReceiver.cancelUpdateDownloadPendingBroadcast(context), ) addReleasePageAction() } @@ -159,13 +159,13 @@ internal class AppUpdateNotifier(private val context: Context) { addAction( R.drawable.ic_system_update_24dp, context.getString(R.string.install), - NotificationHandler.installApkPendingActivity(context, uri) + NotificationHandler.installApkPendingActivity(context, uri), ) // Cancel action addAction( R.drawable.ic_close_24dp, context.getString(R.string.cancel), - NotificationReceiver.dismissNotificationPendingBroadcast(context, Notifications.ID_INSTALL) + NotificationReceiver.dismissNotificationPendingBroadcast(context, Notifications.ID_INSTALL), ) addReleasePageAction() } @@ -188,7 +188,7 @@ internal class AppUpdateNotifier(private val context: Context) { context, 0, context.packageManager.getLaunchIntentForPackage(BuildConfig.APPLICATION_ID), - PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE, ) setContentIntent(pendingIntent) clearActions() @@ -215,13 +215,13 @@ internal class AppUpdateNotifier(private val context: Context) { addAction( R.drawable.ic_refresh_24dp, context.getString(R.string.retry), - AppUpdateService.downloadApkPendingService(context, url) + AppUpdateService.downloadApkPendingService(context, url), ) // Cancel action addAction( R.drawable.ic_close_24dp, context.getString(R.string.cancel), - NotificationReceiver.dismissNotificationPendingBroadcast(context, Notifications.ID_UPDATER) + NotificationReceiver.dismissNotificationPendingBroadcast(context, Notifications.ID_UPDATER), ) addReleasePageAction() } @@ -241,13 +241,13 @@ internal class AppUpdateNotifier(private val context: Context) { addAction( R.drawable.ic_refresh_24dp, context.getString(R.string.retry), - NotificationHandler.installApkPendingActivity(context, uri) + NotificationHandler.installApkPendingActivity(context, uri), ) // Cancel action addAction( R.drawable.ic_close_24dp, context.getString(R.string.cancel), - NotificationReceiver.dismissNotificationPendingBroadcast(context, Notifications.ID_UPDATER) + NotificationReceiver.dismissNotificationPendingBroadcast(context, Notifications.ID_UPDATER), ) addReleasePageAction() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateService.kt index a1f5c0df8c..56e6f6d941 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateService.kt @@ -174,7 +174,7 @@ class AppUpdateService : Service() { val data = file.inputStream() val params = PackageInstaller.SessionParams( - PackageInstaller.SessionParams.MODE_FULL_INSTALL + PackageInstaller.SessionParams.MODE_FULL_INSTALL, ) params.setRequireUserAction(PackageInstaller.SessionParams.USER_ACTION_NOT_REQUIRED) val sessionId = packageInstaller.createSession(params) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/updater/GithubRelease.kt b/app/src/main/java/eu/kanade/tachiyomi/data/updater/GithubRelease.kt index 3c4469160d..b3312223f7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/GithubRelease.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/GithubRelease.kt @@ -18,7 +18,7 @@ data class GithubRelease( @SerialName("body") val info: String, @SerialName("html_url") val releaseLink: String, @SerialName("prerelease") val preRelease: Boolean?, - @SerialName("assets") private val assets: List + @SerialName("assets") private val assets: List, ) { /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionInstallNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionInstallNotifier.kt index 3c3c4308e3..3db7e3bb86 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionInstallNotifier.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionInstallNotifier.kt @@ -57,7 +57,7 @@ class ExtensionInstallNotifier(private val context: Context) { .setChannelId(Notifications.CHANNEL_EXT_PROGRESS) .setContentTitle(context.getString(R.string.updating_extensions)) .setProgress(max, progress, progress == 0) - .build() + .build(), ) } @@ -70,8 +70,8 @@ class ExtensionInstallNotifier(private val context: Context) { context.resources.getQuantityString( R.plurals.extensions_updated_plural, extensions.size, - extensions.size - ) + extensions.size, + ), ) .setSmallIcon(R.drawable.ic_extension_updated_24dp) .setOngoing(false) @@ -82,7 +82,7 @@ class ExtensionInstallNotifier(private val context: Context) { setContentText(extensions.joinToString(", ") { it.name }) } } - .build() + .build(), ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt index ce321d4e30..2acd73d31d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt @@ -41,7 +41,7 @@ import uy.kohesive.injekt.api.get */ class ExtensionManager( private val context: Context, - private val preferences: PreferencesHelper = Injekt.get() + private val preferences: PreferencesHelper = Injekt.get(), ) { /** @@ -467,7 +467,7 @@ class ExtensionManager( apkName = extension.apkName, pkgName = extension.pkgName, name = extension.name, - versionCode = extension.versionCode + versionCode = extension.versionCode, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt index 587b273a61..080f84f6d2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt @@ -92,7 +92,7 @@ class ExtensionUpdateJob(private val context: Context, workerParams: WorkerParam 1 } else { 2 - } + }, ) ContextCompat.startForegroundService(context, intent) if (extensionsInstalledByApp.size == extensions.size) { @@ -114,8 +114,8 @@ class ExtensionUpdateJob(private val context: Context, workerParams: WorkerParam context.resources.getQuantityString( R.plurals.extension_updates_available, extensions.size, - extensions.size - ) + extensions.size, + ), ) val extNames = extensions.joinToString(", ") { it.name } setContentText(extNames) @@ -124,8 +124,8 @@ class ExtensionUpdateJob(private val context: Context, workerParams: WorkerParam color = ContextCompat.getColor(context, R.color.secondaryTachiyomi) setContentIntent( NotificationReceiver.openExtensionsPendingActivity( - context - ) + context, + ), ) if (ExtensionManager.canAutoInstallUpdates(context, true) && extensions.size == extensionsList.size @@ -137,24 +137,24 @@ class ExtensionUpdateJob(private val context: Context, workerParams: WorkerParam context, 0, intent, - PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE, ) } else { PendingIntent.getService( context, 0, intent, - PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE, ) } addAction( R.drawable.ic_file_download_24dp, context.getString(R.string.update_all), - pendingIntent + pendingIntent, ) } setAutoCancel(true) - } + }, ) } } @@ -194,7 +194,7 @@ class ExtensionUpdateJob(private val context: Context, workerParams: WorkerParam 12, TimeUnit.HOURS, 1, - TimeUnit.HOURS + TimeUnit.HOURS, ) .addTag(TAG) .setConstraints(constraints) diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/model/Extension.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/model/Extension.kt index 81e7ae8eeb..b5cb0db3e7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/model/Extension.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/model/Extension.kt @@ -22,7 +22,7 @@ sealed class Extension { val sources: List, val hasUpdate: Boolean = false, val isObsolete: Boolean = false, - val isUnofficial: Boolean = false + val isUnofficial: Boolean = false, ) : Extension() data class Available( @@ -34,14 +34,14 @@ sealed class Extension { override val isNsfw: Boolean, val apkName: String, val iconUrl: String, - val sources: List? = null + val sources: List? = null, ) : Extension() data class AvailableSource( val name: String, val id: String, val lang: String, - val baseUrl: String + val baseUrl: String, ) data class Untrusted( @@ -51,6 +51,6 @@ sealed class Extension { override val versionCode: Long, val signatureHash: String, override val lang: String? = null, - override val isNsfw: Boolean = false + override val isNsfw: Boolean = false, ) : Extension() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallBroadcast.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallBroadcast.kt index 1fcec5fce6..d5937e0b86 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallBroadcast.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallBroadcast.kt @@ -38,7 +38,7 @@ class ExtensionInstallBroadcast : BroadcastReceiver() { val data = UniFile.fromUri(context, intent.data).openInputStream() val params = SessionParams( - SessionParams.MODE_FULL_INSTALL + SessionParams.MODE_FULL_INSTALL, ) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { params.setRequireUserAction(USER_ACTION_NOT_REQUIRED) @@ -137,7 +137,7 @@ class ExtensionInstallActivity : Activity() { val data = UniFile.fromUri(this, intent.data).openInputStream() val params = SessionParams( - SessionParams.MODE_FULL_INSTALL + SessionParams.MODE_FULL_INSTALL, ) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { params.setRequireUserAction(USER_ACTION_NOT_REQUIRED) diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstaller.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstaller.kt index a3a3c86341..6a95fc1bca 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstaller.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstaller.kt @@ -130,7 +130,7 @@ internal class ExtensionInstaller(private val context: Context) { .setDestinationInExternalFilesDir( context, Environment.DIRECTORY_DOWNLOADS, - downloadUri.lastPathSegment + downloadUri.lastPathSegment, ) .setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED) @@ -140,7 +140,7 @@ internal class ExtensionInstaller(private val context: Context) { scope.launch { flowOf( pollStatus(id), - pollInstallStatus(pkgName) + pollInstallStatus(pkgName), ).flattenMerge() .transformWhile { emit(it) @@ -405,7 +405,7 @@ internal class ExtensionInstaller(private val context: Context) { downloadManager.query(query).use { cursor -> if (cursor.moveToFirst()) { val localUri = cursor.getString( - cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI) + cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI), ).removePrefix(FILE_SCHEME) installApk(id, File(localUri).getUriCompat(context)) diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt index 27820c3010..411c08e0aa 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt @@ -130,7 +130,7 @@ internal object ExtensionLoader { if (libVersion < LIB_VERSION_MIN || libVersion > LIB_VERSION_MAX) { val exception = Exception( "Lib version is $libVersion, while only versions " + - "$LIB_VERSION_MIN to $LIB_VERSION_MAX are allowed" + "$LIB_VERSION_MIN to $LIB_VERSION_MAX are allowed", ) Timber.w(exception) return LoadResult.Error(exception) @@ -195,7 +195,7 @@ internal object ExtensionLoader { isNsfw, sources = sources, pkgFactory = appInfo.metaData.getString(METADATA_SOURCE_FACTORY), - isUnofficial = signatureHash != officialSignature + isUnofficial = signatureHash != officialSignature, ) return LoadResult.Success(extension) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt index 411832979e..5dfdce12a0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt @@ -77,7 +77,7 @@ suspend fun Call.await(): Response { if (continuation.isCancelled) return continuation.resumeWithException(e) } - } + }, ) continuation.invokeOnCancellation { diff --git a/app/src/main/java/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt b/app/src/main/java/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt index 87a7162a59..8127dad1f8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt @@ -135,7 +135,7 @@ class CloudflareInterceptor(private val context: Context) : Interceptor { errorCode: Int, description: String?, failingUrl: String, - isMainFrame: Boolean + isMainFrame: Boolean, ) { if (isMainFrame) { if (errorCode in ERROR_CODES) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/smartsearch/SmartSearchEngine.kt b/app/src/main/java/eu/kanade/tachiyomi/smartsearch/SmartSearchEngine.kt index aea4d15a08..d054c05a02 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/smartsearch/SmartSearchEngine.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/smartsearch/SmartSearchEngine.kt @@ -17,7 +17,7 @@ import kotlin.coroutines.CoroutineContext class SmartSearchEngine( parentContext: CoroutineContext, - val extraSearchParams: String? = null + val extraSearchParams: String? = null, ) : CoroutineScope { override val coroutineContext: CoroutineContext = parentContext + Job() + Dispatchers.Default @@ -83,7 +83,7 @@ class SmartSearchEngine( '(' to ')', '[' to ']', '<' to '>', - '{' to '}' + '{' to '}', ) var openingBracketPairs = bracketPairs.mapIndexed { index, (opening, _) -> opening to index diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt b/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt index 7cb63697bb..82b8187764 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt @@ -99,7 +99,7 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour override fun fetchSearchManga( page: Int, query: String, - filters: FilterList + filters: FilterList, ): Observable { val baseDirs = getBaseDirectories(context) diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt b/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt index 0905ce166e..0752df8cc6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt @@ -27,23 +27,23 @@ open class SourceManager(private val context: Context) { DelegatedSource( "reader.kireicake.com", 5509224355268673176, - KireiCake() + KireiCake(), ), DelegatedSource( "mangadex.org", 2499283573021220255, - MangaDex() + MangaDex(), ), DelegatedSource( "mangaplus.shueisha.co.jp", 1998944621602463790, - MangaPlus() + MangaPlus(), ), DelegatedSource( "cubari.moe", 6338219619148105941, - Cubari() - ) + Cubari(), + ), ).associateBy { it.sourceId } init { @@ -84,7 +84,7 @@ open class SourceManager(private val context: Context) { } private fun createInternalSources(): List = listOf( - LocalSource(context) + LocalSource(context), ) inner class StubSource(override val id: Long) : Source { @@ -112,9 +112,9 @@ open class SourceManager(private val context: Context) { return SourceNotFoundException( context.getString( R.string.source_not_installed_, - extensionManager.getStubSource(id)?.name ?: id.toString() + extensionManager.getStubSource(id)?.name ?: id.toString(), ), - id + id, ) } @@ -133,7 +133,7 @@ open class SourceManager(private val context: Context) { private data class DelegatedSource( val urlName: String, val sourceId: Long, - val delegatedHttpSource: DelegatedHttpSource + val delegatedHttpSource: DelegatedHttpSource, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/model/Page.kt b/app/src/main/java/eu/kanade/tachiyomi/source/model/Page.kt index b50507ff5f..464e46c411 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/model/Page.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/model/Page.kt @@ -9,7 +9,7 @@ open class Page( val index: Int, val url: String = "", var imageUrl: String? = null, - @Transient var uri: Uri? = null // Deprecated but can't be deleted due to extensions + @Transient var uri: Uri? = null, // Deprecated but can't be deleted due to extensions ) : ProgressListener { val number: Int @@ -61,13 +61,13 @@ open class Page( fun Page.toPageUrl(): PageUrl { return PageUrl( - url = this.imageUrl ?: this.url + url = this.imageUrl ?: this.url, ) } fun PageUrl.toPage(index: Int): Page { return Page( index = index, - imageUrl = this.url + imageUrl = this.url, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/model/SChapter.kt b/app/src/main/java/eu/kanade/tachiyomi/source/model/SChapter.kt index c228c16384..8152134658 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/model/SChapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/model/SChapter.kt @@ -47,7 +47,7 @@ fun SChapter.toChapterInfo(): ChapterInfo { key = this.url, name = this.name, number = this.chapter_number, - scanlator = this.scanlator ?: "" + scanlator = this.scanlator ?: "", ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt b/app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt index b9260ea306..8d0060d03a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt @@ -89,7 +89,7 @@ fun SManga.toMangaInfo(): MangaInfo { description = this.description ?: "", genres = this.genre?.split(", ") ?: emptyList(), status = this.status, - cover = this.thumbnail_url ?: "" + cover = this.thumbnail_url ?: "", ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Cubari.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Cubari.kt index bcc3234eda..49916c69cf 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Cubari.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Cubari.kt @@ -47,7 +47,7 @@ class Cubari : DelegatedHttpSource() { val context = Injekt.get().context val trueChapter = findChapter(chapters, cubariType, chapterNumber)?.toChapter() ?: error( - context.getString(R.string.chapter_not_found) + context.getString(R.string.chapter_not_found), ) if (manga != null) { Triple(trueChapter, manga, chapters.orEmpty()) diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt index 2e124adbd2..ee79da6675 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt @@ -70,7 +70,7 @@ class MangaDex : DelegatedHttpSource() { val chapters = deferredChapters.await() val context = Injekt.get().context val trueChapter = chapters?.find { it.url == "/api$url" }?.toChapter() ?: error( - context.getString(R.string.chapter_not_found) + context.getString(R.string.chapter_not_found), ) if (manga != null) { Triple(trueChapter, manga, chapters.orEmpty()) diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/FoolSlide.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/FoolSlide.kt index 75e83f7f3d..3f7b595e68 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/FoolSlide.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/FoolSlide.kt @@ -38,7 +38,7 @@ open class FoolSlide(override val domainName: String, private val urlModifier: S lang, volume, chapterNumber, - subChapterNumber + subChapterNumber, ).joinToString("/") + "/" } @@ -71,7 +71,7 @@ open class FoolSlide(override val domainName: String, private val urlModifier: S val chapters = deferredChapters.await() val context = Injekt.get().context val trueChapter = chapters?.find { it.url == chapterUrl }?.toChapter() ?: error( - context.getString(R.string.chapter_not_found) + context.getString(R.string.chapter_not_found), ) if (manga != null) Triple(trueChapter, manga, chapters) else null } @@ -103,7 +103,7 @@ open class FoolSlide(override val domainName: String, private val urlModifier: S url, body = FormBody.Builder() .add("adult", "true") - .build() + .build(), ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/MangaPlus.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/MangaPlus.kt index e1e71fdfcd..2fd0337dff 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/MangaPlus.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/MangaPlus.kt @@ -37,7 +37,7 @@ class MangaPlus : DelegatedHttpSource() { val request = GET( chapterUrlTemplate.replace("##", uri.pathSegments[1]), delegate!!.headers, - CacheControl.FORCE_NETWORK + CacheControl.FORCE_NETWORK, ) return withContext(Dispatchers.IO) { val response = network.client.newCall(request).await() @@ -58,7 +58,7 @@ class MangaPlus : DelegatedHttpSource() { val chapters = deferredChapters.await() val context = Injekt.get().context val trueChapter = chapters?.find { it.url == url }?.toChapter() ?: error( - context.getString(R.string.chapter_not_found) + context.getString(R.string.chapter_not_found), ) if (manga != null) { Triple( @@ -66,7 +66,7 @@ class MangaPlus : DelegatedHttpSource() { manga.apply { this.title = trimmedTitle }, - chapters.orEmpty() + chapters.orEmpty(), ) } else null } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/BaseToolbar.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/BaseToolbar.kt index f273fad6e7..30c192d553 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/BaseToolbar.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/BaseToolbar.kt @@ -34,7 +34,7 @@ open class BaseToolbar @JvmOverloads constructor(context: Context, attrs: Attrib attrs, R.styleable.Toolbar, 0, - defStyleRes + defStyleRes, ) titleTextAppearance = a.getResourceId(R.styleable.Toolbar_titleTextAppearance, 0) a.recycle() @@ -70,7 +70,7 @@ open class BaseToolbar @JvmOverloads constructor(context: Context, attrs: Attrib getIncogRes(), 0, getDropdownRes(), - 0 + 0, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/ExpandedAppBarLayout.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/ExpandedAppBarLayout.kt index c5b6a63e60..ec104ddf2a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/ExpandedAppBarLayout.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/ExpandedAppBarLayout.kt @@ -104,7 +104,7 @@ class ExpandedAppBarLayout@JvmOverloads constructor(context: Context, attrs: Att get() = getEstimatedLayout( cardFrame?.isVisible == true && toolbarMode == ToolbarState.EXPANDED, useTabsInPreLayout, - toolbarMode == ToolbarState.EXPANDED + toolbarMode == ToolbarState.EXPANDED, ) private val preLayoutHeightWhileSearching: Int @@ -112,7 +112,7 @@ class ExpandedAppBarLayout@JvmOverloads constructor(context: Context, attrs: Att cardFrame?.isVisible == true && toolbarMode == ToolbarState.EXPANDED, useTabsInPreLayout, toolbarMode == ToolbarState.EXPANDED, - true + true, ) private var dontFullyHideToolbar = false @@ -206,7 +206,7 @@ class ExpandedAppBarLayout@JvmOverloads constructor(context: Context, attrs: Att MathUtils.clamp( translationY, -realHeight + (if (context.isTablet()) minTabletHeight else 0), - if (compactSearchMode && toolbarMode == ToolbarState.EXPANDED) -realHeight + top + minTabletHeight else 0f + if (compactSearchMode && toolbarMode == ToolbarState.EXPANDED) -realHeight + top + minTabletHeight else 0f, ) } super.setTranslationY(newY) @@ -288,7 +288,7 @@ class ExpandedAppBarLayout@JvmOverloads constructor(context: Context, attrs: Att MathUtils.clamp( translationY, -realHeight.toFloat() + top + if (context.isTablet()) minTabletHeight else 0, - -realHeight.toFloat() + top + minTabletHeight + -realHeight.toFloat() + top + minTabletHeight, ) } // for regular compact modes, no need to clamp, setTranslationY will take care of it @@ -307,9 +307,9 @@ class ExpandedAppBarLayout@JvmOverloads constructor(context: Context, attrs: Att smallHeight, if (offset > realHeight - shortH - tabHeight) smallHeight else min( -offset.toFloat(), - 0f - ) - ) + top.toFloat() + 0f, + ), + ) + top.toFloat(), ) } } @@ -341,15 +341,15 @@ class ExpandedAppBarLayout@JvmOverloads constructor(context: Context, attrs: Att toolbarTextView.setTextColorAlpha( ( MathUtils.clamp( - (1 - ((if (alpha.isNaN()) 1f else alpha) + 0.95f)) * 2, 0f, 1f + (1 - ((if (alpha.isNaN()) 1f else alpha) + 0.95f)) * 2, 0f, 1f, ) * 255 - ).roundToInt() + ).roundToInt(), ) val mainToolbar = mainToolbar ?: return mainToolbar.alpha = MathUtils.clamp( (mainToolbar.bottom + mainToolbar.translationY + y - paddingTop) / mainToolbar.height, 0f, - 1f + 1f, ) val mainActivity = mainActivity ?: return val useSearchToolbar = mainToolbar.alpha <= 0.025f @@ -373,7 +373,7 @@ class ExpandedAppBarLayout@JvmOverloads constructor(context: Context, attrs: Att val halfWay = compactAppBarHeight / 2 val shortAnimationDuration = resources?.getInteger( if (toolbarMode != ToolbarState.EXPANDED) android.R.integer.config_shortAnimTime - else android.R.integer.config_longAnimTime + else android.R.integer.config_longAnimTime, ) ?: 0 val realHeight = preLayoutHeightWhileSearching + paddingTop val closerToTop = abs(y) > realHeight - halfWay diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/FloatingToolbar.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/FloatingToolbar.kt index f6371b4dc0..0cdecae707 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/FloatingToolbar.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/FloatingToolbar.kt @@ -66,7 +66,7 @@ class FloatingToolbar @JvmOverloads constructor(context: Context, attrs: Attribu attrs, R.styleable.Toolbar, 0, - defStyleRes + defStyleRes, ) subtitleTextAppearance = a.getResourceId(R.styleable.Toolbar_subtitleTextAppearance, 0) a.recycle() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/MaterialFastScroll.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/MaterialFastScroll.kt index 3c59bc37fb..0cd788b9b8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/MaterialFastScroll.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/MaterialFastScroll.kt @@ -26,7 +26,7 @@ class MaterialFastScroll @JvmOverloads constructor(context: Context, attrs: Attr setViewsToUse( R.layout.material_fastscroll, R.id.fast_scroller_bubble, - R.id.fast_scroller_handle + R.id.fast_scroller_handle, ) autoHideEnabled = true ignoreTouchesOutsideHandle = false @@ -121,12 +121,12 @@ class MaterialFastScroll @JvmOverloads constructor(context: Context, attrs: Attr if (layoutManager is StaggeredGridLayoutManager) { (layoutManager as StaggeredGridLayoutManager).scrollToPositionWithOffset( targetPos, - scrollOffset + scrollOffset, ) } else { (layoutManager as LinearLayoutManager).scrollToPositionWithOffset( targetPos, - scrollOffset + scrollOffset, ) } updateBubbleText(targetPos) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/MaterialMenuSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/MaterialMenuSheet.kt index 32da57d439..35770fa5c9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/MaterialMenuSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/MaterialMenuSheet.kt @@ -33,7 +33,7 @@ class MaterialMenuSheet( selectedId: Int? = null, maxHeight: Int? = null, showDivider: Boolean = false, - onMenuItemClicked: (MaterialMenuSheet, Int) -> Boolean + onMenuItemClicked: (MaterialMenuSheet, Int) -> Boolean, ) : E2EBottomSheetDialog(activity) { override fun createBinding(inflater: LayoutInflater) = BottomMenuSheetBinding.inflate(inflater) @@ -50,7 +50,7 @@ class MaterialMenuSheet( matchConstraintMaxHeight = min( (maxHeight ?: fullHeight) + (insets?.bottom ?: 0), - fullHeight - (insets?.top ?: 0) - binding.titleLayout.height - 26.dpToPx + fullHeight - (insets?.top ?: 0) - binding.titleLayout.height - 26.dpToPx, ) } } @@ -86,7 +86,7 @@ class MaterialMenuSheet( binding.root.post { binding.menuSheetRecycler.scrollBy( 0, - pos * 48.dpToPx - binding.menuSheetRecycler.height / 2 + pos * 48.dpToPx - binding.menuSheetRecycler.height / 2, ) } } @@ -104,7 +104,7 @@ class MaterialMenuSheet( elevationAnimator = ValueAnimator.ofArgb( if (elevate) nonElevateColor else elevateColor, - if (elevate) elevateColor else nonElevateColor + if (elevate) elevateColor else nonElevateColor, ) elevationAnimator?.addUpdateListener { @@ -121,7 +121,8 @@ class MaterialMenuSheet( elevate(notAtTop) } } - }) + }, + ) } } @@ -145,6 +146,6 @@ class MaterialMenuSheet( @DrawableRes val drawable: Int = 0, @StringRes val textRes: Int = 0, val text: String? = null, - var endDrawableRes: Int = 0 + var endDrawableRes: Int = 0, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt index 4ba0b9db63..40f043efb7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt @@ -57,7 +57,7 @@ abstract class BaseController(bundle: Bundle? = null) : viewScope.cancel() Timber.d("Destroy view for ${controller.instance()}") } - } + }, ) } @@ -145,7 +145,7 @@ abstract class BaseController(bundle: Bundle? = null) : return onCollapse?.invoke(item) ?: true } - } + }, ) if (expandActionViewFromInteraction) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/DialogController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/DialogController.kt index 2a9cb7a037..cd6a3c88bc 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/DialogController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/DialogController.kt @@ -91,7 +91,7 @@ abstract class DialogController : Controller { RouterTransaction.with(this) .pushChangeHandler(SimpleSwapChangeHandler(false)) .popChangeHandler(SimpleSwapChangeHandler(false)) - .tag(tag) + .tag(tag), ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/OneWayFadeChangeHandler.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/OneWayFadeChangeHandler.kt index 17a7cd16c9..71bef32e8e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/OneWayFadeChangeHandler.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/OneWayFadeChangeHandler.kt @@ -17,7 +17,7 @@ class OneWayFadeChangeHandler : FadeChangeHandler { constructor(duration: Long) : super(duration) constructor(duration: Long, removesFromViewOnPush: Boolean) : super( duration, - removesFromViewOnPush + removesFromViewOnPush, ) var fadeOut = true @@ -26,7 +26,7 @@ class OneWayFadeChangeHandler : FadeChangeHandler { from: View?, to: View?, isPush: Boolean, - toAddedToContainer: Boolean + toAddedToContainer: Boolean, ): Animator { val animator = AnimatorSet() if (to != null) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/RxController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/RxController.kt index 2c3d7e9b3c..7ffa4282e3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/RxController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/RxController.kt @@ -53,7 +53,7 @@ abstract class RxController(bundle: Bundle? = null) : BaseCont fun Observable.subscribeUntilDetach( onNext: (T) -> Unit, - onError: (Throwable) -> Unit + onError: (Throwable) -> Unit, ): Subscription { return subscribe(onNext, onError).also { untilDetachSubscriptions.add(it) } } @@ -61,7 +61,7 @@ abstract class RxController(bundle: Bundle? = null) : BaseCont fun Observable.subscribeUntilDetach( onNext: (T) -> Unit, onError: (Throwable) -> Unit, - onCompleted: () -> Unit + onCompleted: () -> Unit, ): Subscription { return subscribe(onNext, onError, onCompleted).also { untilDetachSubscriptions.add(it) } } @@ -76,7 +76,7 @@ abstract class RxController(bundle: Bundle? = null) : BaseCont fun Observable.subscribeUntilDestroy( onNext: (T) -> Unit, - onError: (Throwable) -> Unit + onError: (Throwable) -> Unit, ): Subscription { return subscribe(onNext, onError).also { untilDestroySubscriptions.add(it) } } @@ -84,7 +84,7 @@ abstract class RxController(bundle: Bundle? = null) : BaseCont fun Observable.subscribeUntilDestroy( onNext: (T) -> Unit, onError: (Throwable) -> Unit, - onCompleted: () -> Unit + onCompleted: () -> Unit, ): Subscription { return subscribe(onNext, onError, onCompleted).also { untilDestroySubscriptions.add(it) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/holder/BaseFlexibleViewHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/holder/BaseFlexibleViewHolder.kt index 78b8503d4a..933096fa18 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/holder/BaseFlexibleViewHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/holder/BaseFlexibleViewHolder.kt @@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.util.system.isLTR abstract class BaseFlexibleViewHolder( view: View, adapter: FlexibleAdapter<*>, - stickyHeader: Boolean = false + stickyHeader: Boolean = false, ) : FlexibleViewHolder(view, adapter, stickyHeader) { override fun getRearRightView(): View? { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryController.kt index 2121ba4d3c..719e1ec889 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryController.kt @@ -152,7 +152,7 @@ class CategoryController(bundle: Bundle? = null) : super.onDismissed(transientBottomBar, event) if (!undoing) confirmDelete() } - } + }, ) } (activity as? MainActivity)?.setUndoSnackBar(snack) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryHolder.kt index 44a26bba27..23c21ecadc 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryHolder.kt @@ -56,7 +56,7 @@ class CategoryHolder(view: View, val adapter: CategoryAdapter) : BaseFlexibleVie regularDrawable = ContextCompat.getDrawable( itemView.context, R.drawable - .ic_add_24dp + .ic_add_24dp, ) binding.image.isVisible = false binding.editButton.setImageDrawable(null) @@ -67,7 +67,7 @@ class CategoryHolder(view: View, val adapter: CategoryAdapter) : BaseFlexibleVie regularDrawable = ContextCompat.getDrawable( itemView.context, R.drawable - .ic_drag_handle_24dp + .ic_drag_handle_24dp, ) binding.image.isVisible = true binding.editText.setText(binding.title.text) @@ -89,8 +89,8 @@ class CategoryHolder(view: View, val adapter: CategoryAdapter) : BaseFlexibleVie binding.reorder.setImageDrawable( ContextCompat.getDrawable( itemView.context, - R.drawable.ic_delete_24dp - ) + R.drawable.ic_delete_24dp, + ), ) binding.reorder.setOnClickListener { adapter.categoryItemListener.onItemDelete(flexibleAdapterPosition) @@ -109,8 +109,8 @@ class CategoryHolder(view: View, val adapter: CategoryAdapter) : BaseFlexibleVie ContextCompat.getColor( itemView.context, R - .color.gray_button - ) + .color.gray_button, + ), ) binding.reorder.setImageDrawable(regularDrawable) } @@ -137,7 +137,7 @@ class CategoryHolder(view: View, val adapter: CategoryAdapter) : BaseFlexibleVie inputMethodManager.showSoftInput( binding.editText, WindowManager.LayoutParams - .SOFT_INPUT_ADJUST_PAN + .SOFT_INPUT_ADJUST_PAN, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryPresenter.kt index 52564d8f5f..10270a2f7e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryPresenter.kt @@ -20,7 +20,7 @@ import uy.kohesive.injekt.api.get class CategoryPresenter( private val controller: CategoryController, private val db: DatabaseHelper = Injekt.get(), - preferences: PreferencesHelper = Injekt.get() + preferences: PreferencesHelper = Injekt.get(), ) { private val context = preferences.context diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/ManageCategoryDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/ManageCategoryDialog.kt index 8edb1f0dac..6eede1f6d9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/ManageCategoryDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/ManageCategoryDialog.kt @@ -105,7 +105,7 @@ class ManageCategoryDialog(bundle: Bundle? = null) : updatePref( preferences.downloadNewChaptersInCategories(), preferences.excludeCategoriesInDownloadNew(), - binding.downloadNew + binding.downloadNew, ) ) { true -> preferences.downloadNewChapters().set(true) @@ -116,7 +116,7 @@ class ManageCategoryDialog(bundle: Bundle? = null) : updatePref( preferences.libraryUpdateCategories(), preferences.libraryUpdateCategoriesExclude(), - binding.includeGlobal + binding.includeGlobal, ) == false ) { preferences.libraryUpdateInterval().set(0) @@ -155,7 +155,7 @@ class ManageCategoryDialog(bundle: Bundle? = null) : binding.downloadNew, preferences.downloadNewChaptersInCategories(), preferences.excludeCategoriesInDownloadNew(), - true + true, ) if (downloadNew && preferences.downloadNewChaptersInCategories().get().isEmpty()) { binding.downloadNew.isVisible = false @@ -169,7 +169,7 @@ class ManageCategoryDialog(bundle: Bundle? = null) : binding.includeGlobal, preferences.libraryUpdateCategories(), preferences.libraryUpdateCategoriesExclude(), - preferences.libraryUpdateInterval().get() > 0 + preferences.libraryUpdateInterval().get() > 0, ) } @@ -177,7 +177,7 @@ class ManageCategoryDialog(bundle: Bundle? = null) : private fun updatePref( categories: Preference>, excludeCategories: Preference>, - box: TriStateCheckBox + box: TriStateCheckBox, ): Boolean? { val categoryId = category?.id ?: return null if (!box.isVisible) return null @@ -206,7 +206,7 @@ class ManageCategoryDialog(bundle: Bundle? = null) : box: TriStateCheckBox, categories: Preference>, excludeCategories: Preference>, - shouldShow: Boolean + shouldShow: Boolean, ) { val updateCategories = categories.get() val excludeUpdateCategories = excludeCategories.get() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/addtolibrary/SetCategoriesSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/addtolibrary/SetCategoriesSheet.kt index 70a5471757..a0d6470a5b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/addtolibrary/SetCategoriesSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/addtolibrary/SetCategoriesSheet.kt @@ -38,7 +38,7 @@ class SetCategoriesSheet( var categories: MutableList, var preselected: Array, private val addingToLibrary: Boolean, - val onMangaAdded: (() -> Unit) = { } + val onMangaAdded: (() -> Unit) = { }, ) : E2EBottomSheetDialog(activity) { constructor( @@ -47,7 +47,7 @@ class SetCategoriesSheet( categories: MutableList, preselected: Array, addingToLibrary: Boolean, - onMangaAdded: () -> Unit + onMangaAdded: () -> Unit, ) : this( activity, listOf(manga), categories, categories.map { @@ -57,7 +57,7 @@ class SetCategoriesSheet( TriStateCheckBox.State.UNCHECKED } }.toTypedArray(), - addingToLibrary, onMangaAdded + addingToLibrary, onMangaAdded, ) private val fastAdapter: FastAdapter @@ -96,7 +96,7 @@ class SetCategoriesSheet( listManga.first().seriesType(context) } else { context.getString(R.string.selection).lowercase(Locale.ROOT) - } + }, ) setOnShowListener { @@ -112,7 +112,7 @@ class SetCategoriesSheet( override fun onStateChanged(bottomSheet: View, newState: Int) { updateBottomButtons() } - } + }, ) binding.titleLayout.checkHeightThen { @@ -135,7 +135,7 @@ class SetCategoriesSheet( skipInversed = preselected[index] != TriStateCheckBox.State.IGNORE state = preselected[index] } - } + }, ) setCategoriesButtons() fastAdapter.onClickListener = onClickListener@{ view, _, item, _ -> @@ -192,9 +192,9 @@ class SetCategoriesSheet( else -> context.resources.getQuantityString( R.plurals.category_plural, items.size, - items.size + items.size, ) - } + }, ) } @@ -205,7 +205,7 @@ class SetCategoriesSheet( updateBottomButtons() binding.root.post { binding.categoryRecyclerView.scrollToPosition( - max(0, itemAdapter.adapterItems.indexOf(selectedItems.firstOrNull())) + max(0, itemAdapter.adapterItems.indexOf(selectedItems.firstOrNull())), ) } } @@ -222,7 +222,7 @@ class SetCategoriesSheet( val headerHeight = (activity as? MainActivity)?.toolbarHeight ?: 0 binding.buttonLayout.updatePaddingRelative( bottom = activity.window.decorView.rootWindowInsetsCompat - ?.getInsets(systemBars())?.bottom ?: 0 + ?.getInsets(systemBars())?.bottom ?: 0, ) binding.buttonLayout.updateLayoutParams { @@ -241,7 +241,7 @@ class SetCategoriesSheet( preselected.getOrElse(index) { TriStateCheckBox.State.UNCHECKED } != TriStateCheckBox.State.IGNORE state = map[category.id] ?: TriStateCheckBox.State.CHECKED } - } + }, ) setCategoriesButtons() }.show(activity) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadAdapter.kt index 54e0e88212..3c19d14540 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadAdapter.kt @@ -12,7 +12,7 @@ import eu.davidea.flexibleadapter.items.AbstractFlexibleItem class DownloadAdapter(controller: DownloadItemListener) : FlexibleAdapter>( null, controller, - true + true, ) { /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadBottomSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadBottomSheet.kt index 875a2fa918..bbc6a338a5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadBottomSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadBottomSheet.kt @@ -33,7 +33,7 @@ import uy.kohesive.injekt.injectLazy class DownloadBottomSheet @JvmOverloads constructor( context: Context, attrs: AttributeSet? = - null + null, ) : LinearLayout(context, attrs), DownloadAdapter.DownloadItemListener, FlexibleAdapter.OnActionStateListener { @@ -123,7 +123,7 @@ class DownloadBottomSheet @JvmOverloads constructor( val extCount = presenter.downloadQueue.firstOrNull() binding.titleText.text = if (extCount != null) resources.getString( R.string.downloading_, - extCount.chapter.name + extCount.chapter.name, ) else "" } @@ -204,7 +204,7 @@ class DownloadBottomSheet @JvmOverloads constructor( if (presenter.downloadQueue.isEmpty()) { binding.emptyView.show( R.drawable.ic_download_off_24dp, - R.string.nothing_is_downloading + R.string.nothing_is_downloading, ) } else { binding.emptyView.hide() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadButton.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadButton.kt index a7196ac2ea..c587ed802c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadButton.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadButton.kt @@ -25,60 +25,60 @@ class DownloadButton @JvmOverloads constructor(context: Context, attrs: Attribut activeColor = ColorUtils.blendARGB( colorSecondary, context.getResourceColor(R.attr.background), - 0.05f + 0.05f, ) downloadedColor = ColorUtils.blendARGB( colorSecondary, context.getResourceColor(R.attr.colorOnBackground), - 0.3f + 0.3f, ) } private var activeColor = ColorUtils.blendARGB( colorSecondary, context.getResourceColor(R.attr.background), - 0.05f + 0.05f, ) private val progressBGColor = ContextCompat.getColor( context, - R.color.divider + R.color.divider, ) private val disabledColor = ContextCompat.getColor( context, - R.color.material_on_surface_disabled + R.color.material_on_surface_disabled, ) private var downloadedColor = ColorUtils.blendARGB( colorSecondary, context.getResourceColor(R.attr.colorOnBackground), - 0.3f + 0.3f, ) private val downloadedTextColor = context.getResourceColor(R.attr.background) private val errorColor = ContextCompat.getColor( context, - R.color.material_red_500 + R.color.material_red_500, ) private val filledCircle = ContextCompat.getDrawable( context, - R.drawable.filled_circle + R.drawable.filled_circle, )?.mutate() private val borderCircle = ContextCompat.getDrawable( context, - R.drawable.border_circle + R.drawable.border_circle, )?.mutate() private val downloadDrawable = ContextCompat.getDrawable( context, - R.drawable.ic_arrow_downward_24dp + R.drawable.ic_arrow_downward_24dp, )?.mutate() private val checkDrawable = ContextCompat.getDrawable( context, - R.drawable.ic_check_24dp + R.drawable.ic_check_24dp, )?.mutate() private val filledAnim = AnimatedVectorDrawableCompat.create( context, - R.drawable.anim_outline_to_filled + R.drawable.anim_outline_to_filled, ) private val checkAnim = AnimatedVectorDrawableCompat.create( context, - R.drawable.anim_dl_to_check_to_dl + R.drawable.anim_dl_to_check_to_dl, ) private var isAnimating = false private var iconAnimation: ObjectAnimator? = null @@ -99,7 +99,7 @@ class DownloadButton @JvmOverloads constructor(context: Context, attrs: Attribut binding.downloadIcon.setImageDrawable( if (state == Download.State.CHECKED) { checkDrawable - } else downloadDrawable + } else downloadDrawable, ) when (state) { Download.State.CHECKED -> { @@ -162,7 +162,7 @@ class DownloadButton @JvmOverloads constructor(context: Context, attrs: Attribut EndAnimatorListener { binding.downloadIcon.drawable.setTint(downloadedTextColor) checkAnim?.start() - } + }, ) alphaAnimation.duration = 150 alphaAnimation.start() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHolder.kt index fd8ffd69da..c383b7f227 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHolder.kt @@ -55,7 +55,7 @@ class DownloadHolder(private val view: View, val adapter: DownloadAdapter) : binding.downloadMenu.setVectorCompat( R.drawable.ic_more_vert_24dp, - R.attr.colorOnBackground + R.attr.colorOnBackground, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadItem.kt index 5106433291..66e3d9a8b4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadItem.kt @@ -34,7 +34,7 @@ class DownloadItem( override fun createViewHolder( view: View, adapter: FlexibleAdapter> + .ViewHolder,>,>, ): DownloadHolder { return DownloadHolder(view, adapter as DownloadAdapter) } @@ -51,7 +51,7 @@ class DownloadItem( adapter: FlexibleAdapter>, holder: DownloadHolder, position: Int, - payloads: MutableList + payloads: MutableList, ) { holder.bind(download) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadSwipeTutorialItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadSwipeTutorialItem.kt index 3a202947ab..4c20a07ee9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadSwipeTutorialItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadSwipeTutorialItem.kt @@ -26,7 +26,7 @@ class DownloadSwipeTutorialItem : AbstractFlexibleItem> + adapter: FlexibleAdapter>, ): Holder { return Holder(view, adapter) } @@ -43,7 +43,7 @@ class DownloadSwipeTutorialItem : AbstractFlexibleItem>, holder: Holder, position: Int, - payloads: MutableList + payloads: MutableList, ) { } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionBottomPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionBottomPresenter.kt index 10ac873aaf..4c456a899f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionBottomPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionBottomPresenter.kt @@ -41,7 +41,7 @@ typealias ExtensionIntallInfo = Pair */ class ExtensionBottomPresenter( private val extensionManager: ExtensionManager = Injekt.get(), - val preferences: PreferencesHelper = Injekt.get() + val preferences: PreferencesHelper = Injekt.get(), ) : BaseCoroutinePresenter() { private var extensions = emptyList() @@ -69,8 +69,8 @@ class ExtensionBottomPresenter( Triple( extensionManager.installedExtensions, extensionManager.untrustedExtensions, - extensionManager.availableExtensions - ) + extensionManager.availableExtensions, + ), ) withContext(Dispatchers.Main) { controller?.setExtensions(extensions, false) } } @@ -81,9 +81,9 @@ class ExtensionBottomPresenter( sourceItems.associate { it.source.id to this@ExtensionBottomPresenter.libraryToMigrationItem( favs, - it.source.id + it.source.id, ) - } + }, ) withContext(Dispatchers.Main) { if (selectedSource != null) { @@ -106,8 +106,8 @@ class ExtensionBottomPresenter( Triple( extensionManager.installedExtensions, extensionManager.untrustedExtensions, - extensionManager.availableExtensions - ) + extensionManager.availableExtensions, + ), ) withUIContext { controller?.setExtensions(extensions) } return@collect @@ -149,8 +149,8 @@ class ExtensionBottomPresenter( Triple( extensionManager.installedExtensions, extensionManager.untrustedExtensions, - extensionManager.availableExtensions - ) + extensionManager.availableExtensions, + ), ) withContext(Dispatchers.Main) { controller?.setExtensions(extensions, false) } } @@ -163,7 +163,7 @@ class ExtensionBottomPresenter( mangaItems = HashMap( sourceItems.associate { it.source.id to this@ExtensionBottomPresenter.libraryToMigrationItem(favs, it.source.id) - } + }, ) withContext(Dispatchers.Main) { if (selectedSource != null) { @@ -209,8 +209,8 @@ class ExtensionBottomPresenter( InstalledExtensionsOrder.Language -> it.lang } }, - { it.name } - ) + { it.name }, + ), ) val untrustedSorted = untrusted.sortedBy { it.name } val availableSorted = available @@ -228,10 +228,10 @@ class ExtensionBottomPresenter( context.resources.getQuantityString( R.plurals._updates_pending, updatesSorted.size, - updatesSorted.size + updatesSorted.size, ), updatesSorted.size, - items.count { it.extension.pkgName in currentDownloads.keys } != updatesSorted.size + items.count { it.extension.pkgName in currentDownloads.keys } != updatesSorted.size, ) items += updatesSorted.map { extension -> ExtensionItem(extension, header, currentDownloads[extension.pkgName]) @@ -288,7 +288,7 @@ class ExtensionBottomPresenter( private fun updateInstallStep( extension: Extension, state: InstallStep?, - session: PackageInstaller.SessionInfo? + session: PackageInstaller.SessionInfo?, ): ExtensionItem? { val extensions = extensions.toMutableList() val position = extensions.indexOfFirst { it.extension.pkgName == extension.pkgName } @@ -296,7 +296,7 @@ class ExtensionBottomPresenter( return if (position != -1) { val item = extensions[position].copy( installStep = state, - session = session + session = session, ) extensions[position] = item @@ -316,7 +316,7 @@ class ExtensionBottomPresenter( presenterScope.launch { extensionManager.installExtension( ExtensionManager.ExtensionInfo(extension), - presenterScope + presenterScope, ) .launchIn(this) } @@ -341,7 +341,7 @@ class ExtensionBottomPresenter( context, extensions.mapNotNull { extension -> extensionManager.availableExtensions.find { it.pkgName == extension.pkgName } - } + }, ) ContextCompat.startForegroundService(context, intent) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionBottomSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionBottomSheet.kt index 5b002bd7cb..211d39de07 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionBottomSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionBottomSheet.kt @@ -146,7 +146,8 @@ class ExtensionBottomSheet @JvmOverloads constructor(context: Context, attrs: At }?.binding?.recycler?.smoothScrollToTop() } } - }) + }, + ) presenter.onCreate() updateExtTitle() @@ -228,7 +229,7 @@ class ExtensionBottomSheet @JvmOverloads constructor(context: Context, attrs: At override fun onExtSortClicked(view: TextView, position: Int) { view.popupMenu( InstalledExtensionsOrder.values().map { it.value to it.nameRes }, - presenter.preferences.installedExtensionsOrder().get() + presenter.preferences.installedExtensionsOrder().get(), ) { presenter.preferences.installedExtensionsOrder().set(itemId) extAdapter?.installedSortOrder = itemId @@ -272,7 +273,7 @@ class ExtensionBottomSheet @JvmOverloads constructor(context: Context, attrs: At PreMigrationController.navigateToMigration( Injekt.get().skipPreMigration().get(), controller.router, - listOf(item.manga.id!!) + listOf(item.manga.id!!), ) } else if (item is SourceItem) { presenter.setSelectedSource(item.source) @@ -300,7 +301,7 @@ class ExtensionBottomSheet @JvmOverloads constructor(context: Context, attrs: At PreMigrationController.navigateToMigration( Injekt.get().skipPreMigration().get(), controller.router, - sourceMangas + sourceMangas, ) } @@ -345,7 +346,7 @@ class ExtensionBottomSheet @JvmOverloads constructor(context: Context, attrs: At extAdapter?.updateDataSet( extensions.filter { it.extension.name.contains(controller.extQuery, ignoreCase = true) - } + }, ) } else { extAdapter?.updateDataSet(extensions) @@ -402,7 +403,7 @@ class ExtensionBottomSheet @JvmOverloads constructor(context: Context, attrs: At when (position) { 0 -> R.string.extensions else -> R.string.migration - } + }, ) } @@ -415,7 +416,7 @@ class ExtensionBottomSheet @JvmOverloads constructor(context: Context, attrs: At val binding = RecyclerWithScrollerBinding.inflate( LayoutInflater.from(container.context), container, - false + false, ) val view: RecyclerWithScrollerView = binding.root val height = this@ExtensionBottomSheet.controller.activityBinding?.bottomNav?.height diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionDividerItemDecoration.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionDividerItemDecoration.kt index 15b3fdc142..4270cf4ebd 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionDividerItemDecoration.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionDividerItemDecoration.kt @@ -43,7 +43,7 @@ class ExtensionDividerItemDecoration(context: Context) : androidx.recyclerview.w outRect: Rect, view: View, parent: androidx.recyclerview.widget.RecyclerView, - state: androidx.recyclerview.widget.RecyclerView.State + state: androidx.recyclerview.widget.RecyclerView.State, ) { outRect.set(0, 0, 0, divider.intrinsicHeight) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionGroupItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionGroupItem.kt index 1f1c89581e..651d49868a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionGroupItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionGroupItem.kt @@ -36,7 +36,7 @@ data class ExtensionGroupItem(val name: String, val size: Int, var canUpdate: Bo adapter: FlexibleAdapter>, holder: ExtensionGroupHolder, position: Int, - payloads: MutableList? + payloads: MutableList?, ) { holder.bind(this) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionHolder.kt index 3cddc27671..1f1fee9cc7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionHolder.kt @@ -52,7 +52,7 @@ class ExtensionHolder(view: View, val adapter: ExtensionAdapter) : binding.date.isVisible = true binding.date.text = itemView.context.getString( R.string.updated_, - it.timeSpanFromNow + it.timeSpanFromNow, ) infoText.add("") } @@ -62,7 +62,7 @@ class ExtensionHolder(view: View, val adapter: ExtensionAdapter) : binding.date.isVisible = true binding.date.text = itemView.context.getString( R.string.installed_, - it.timeSpanFromNow + it.timeSpanFromNow, ) infoText.add("") } @@ -136,7 +136,7 @@ class ExtensionHolder(view: View, val adapter: ExtensionAdapter) : InstallStep.Installed -> R.string.installed InstallStep.Error -> R.string.retry else -> return@with - } + }, ) if (installStep != InstallStep.Error) { isEnabled = false diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionItem.kt index 32d102fe38..4771f0008b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionItem.kt @@ -21,14 +21,14 @@ data class ExtensionItem( val extension: Extension, val header: ExtensionGroupItem? = null, val installStep: InstallStep? = null, - val session: PackageInstaller.SessionInfo? = null + val session: PackageInstaller.SessionInfo? = null, ) : AbstractSectionableItem(header) { constructor( extension: Extension, header: ExtensionGroupItem? = null, - installInfo: ExtensionIntallInfo? + installInfo: ExtensionIntallInfo?, ) : this(extension, header, installInfo?.first, installInfo?.second) val sessionProgress: Int? @@ -55,7 +55,7 @@ data class ExtensionItem( adapter: FlexibleAdapter>, holder: ExtensionHolder, position: Int, - payloads: MutableList? + payloads: MutableList?, ) { if (payloads.isNullOrEmpty()) { holder.bind(this) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionTrustDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionTrustDialog.kt index 5917bef088..265c0df66b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionTrustDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionTrustDialog.kt @@ -14,7 +14,7 @@ class ExtensionTrustDialog(bundle: Bundle? = null) : DialogController(bundle) Bundle().apply { putString(SIGNATURE_KEY, signatureHash) putString(PKGNAME_KEY, pkgName) - } + }, ) { listener = target } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/RecyclerWithScrollerView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/RecyclerWithScrollerView.kt index c17b0899d8..ded33836bc 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/RecyclerWithScrollerView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/RecyclerWithScrollerView.kt @@ -29,7 +29,8 @@ class RecyclerWithScrollerView @JvmOverloads constructor(context: Context, attrs sheet.sheetBehavior?.isDraggable = !recyclerView.canScrollVertically(-1) } } - }) + }, + ) this.binding = binding } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/details/ExtensionDetailsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/details/ExtensionDetailsController.kt index 34d3e07e14..45e589759d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/details/ExtensionDetailsController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/details/ExtensionDetailsController.kt @@ -68,7 +68,7 @@ class ExtensionDetailsController(bundle: Bundle? = null) : constructor(pkgName: String) : this( Bundle().apply { putString(PKGNAME_KEY, pkgName) - } + }, ) override fun createBinding(inflater: LayoutInflater) = @@ -93,7 +93,7 @@ class ExtensionDetailsController(bundle: Bundle? = null) : val themedContext by lazy { getPreferenceThemeContext() } val manager = PreferenceManager(themedContext) val dataStore = SharedPreferencesDataStore( - context.getSharedPreferences(extension.getPreferenceKey(), Context.MODE_PRIVATE) + context.getSharedPreferences(extension.getPreferenceKey(), Context.MODE_PRIVATE), ) manager.preferenceDataStore = dataStore manager.onDisplayPreferenceDialogListener = this @@ -120,7 +120,7 @@ class ExtensionDetailsController(bundle: Bundle? = null) : binding.extensionPrefsRecycler.adapter = ConcatAdapter( concatAdapterConfig, extHeaderAdapter, - PreferenceGroupAdapter(screen) + PreferenceGroupAdapter(screen), ) binding.extensionPrefsRecycler.addItemDecoration(ExtensionSettingsDividerItemDecoration(context)) } @@ -190,9 +190,9 @@ class ExtensionDetailsController(bundle: Bundle? = null) : binding.coordinator.snack( context.getString( R.string._must_be_enabled_first, - title + title, ), - Snackbar.LENGTH_LONG + Snackbar.LENGTH_LONG, ) { setAction(R.string.enable) { preferences.enabledLanguages() += source.lang @@ -276,7 +276,7 @@ class ExtensionDetailsController(bundle: Bundle? = null) : .newInstance(preference.getKey()) else -> throw IllegalArgumentException( "Tried to display dialog for unknown " + - "preference type. Did you forget to override onDisplayPreferenceDialog()?" + "preference type. Did you forget to override onDisplayPreferenceDialog()?", ) } f.targetController = this diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/details/ExtensionDetailsPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/details/ExtensionDetailsPresenter.kt index c6f817ba66..3f17753219 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/details/ExtensionDetailsPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/details/ExtensionDetailsPresenter.kt @@ -9,7 +9,7 @@ import uy.kohesive.injekt.api.get class ExtensionDetailsPresenter( val pkgName: String, - private val extensionManager: ExtensionManager = Injekt.get() + private val extensionManager: ExtensionManager = Injekt.get(), ) : BasePresenter() { val extension = extensionManager.installedExtensions.find { it.pkgName == pkgName } @@ -29,7 +29,7 @@ class ExtensionDetailsPresenter( .observeOn(AndroidSchedulers.mainThread()) .subscribeFirst({ view, _ -> view.onExtensionUninstalled() - }) + },) } fun uninstallExtension() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/details/ExtensionSettingsDividerItemDecoration.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/details/ExtensionSettingsDividerItemDecoration.kt index f76fa0bd53..b32e5ef1e4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/details/ExtensionSettingsDividerItemDecoration.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/details/ExtensionSettingsDividerItemDecoration.kt @@ -47,7 +47,7 @@ class ExtensionSettingsDividerItemDecoration(context: Context) : androidx.recycl outRect: Rect, view: View, parent: androidx.recyclerview.widget.RecyclerView, - state: androidx.recyclerview.widget.RecyclerView.State + state: androidx.recyclerview.widget.RecyclerView.State, ) { outRect.set(0, 0, 0, divider.intrinsicHeight) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryBadge.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryBadge.kt index 02ccc0d9e6..00cad6eb83 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryBadge.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryBadge.kt @@ -33,7 +33,7 @@ class LibraryBadge @JvmOverloads constructor(context: Context, attrs: AttributeS downloads: Int, showTotalChapters: Boolean, lang: String?, - changeShape: Boolean + changeShape: Boolean, ) { // Update the unread count and its visibility. @@ -53,7 +53,7 @@ class LibraryBadge @JvmOverloads constructor(context: Context, attrs: AttributeS unread == -1 && !showTotalChapters -> unreadBadgeBackground showTotalChapters -> context.contextCompatColor(R.color.total_badge_text) else -> context.getResourceColor(R.attr.colorOnSecondary) - } + }, ) setBackgroundColor(unreadBadgeBackground) } @@ -80,13 +80,13 @@ class LibraryBadge @JvmOverloads constructor(context: Context, attrs: AttributeS val flagId = resources.getIdentifier( "ic_flag_${lang.replace("-", "_")}", "drawable", - context.packageName + context.packageName, ).takeIf { it != 0 } ?: ( if (lang.contains("-")) { resources.getIdentifier( "ic_flag_${lang.split("-").first()}", "drawable", - context.packageName + context.packageName, ).takeIf { it != 0 } } else null ) @@ -123,7 +123,7 @@ class LibraryBadge @JvmOverloads constructor(context: Context, attrs: AttributeS makeShapeCorners(topStart = startRadius, bottomEnd = endRadius) } else { view.background = MaterialShapeDrawable( - makeShapeCorners(topStart = startRadius, bottomEnd = endRadius) + makeShapeCorners(topStart = startRadius, bottomEnd = endRadius), ).apply { this.fillColor = ColorStateList.valueOf(bgColor) } @@ -154,7 +154,7 @@ class LibraryBadge @JvmOverloads constructor(context: Context, attrs: AttributeS 2.dpToPx } else { 5.dpToPx - } + }, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt index 361460c9e5..efd76646f2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt @@ -199,7 +199,7 @@ class LibraryCategoryAdapter(val controller: LibraryController?) : if (last != null && last > 100) { recyclerView.context.getString( R.string.fetched_, - last.timeSpanFromNow(preferences.context) + last.timeSpanFromNow(preferences.context), ) } else { "N/A" @@ -212,7 +212,7 @@ class LibraryCategoryAdapter(val controller: LibraryController?) : if (last != null && last > 100) { recyclerView.context.getString( R.string.read_, - last.timeSpanFromNow(preferences.context) + last.timeSpanFromNow(preferences.context), ) } else { "N/A" @@ -228,7 +228,7 @@ class LibraryCategoryAdapter(val controller: LibraryController?) : if (total > 0) recyclerView.resources.getQuantityString( R.plurals.chapters_plural, total, - total + total, ) else { "N/A" @@ -239,7 +239,7 @@ class LibraryCategoryAdapter(val controller: LibraryController?) : if (lastUpdate > 0) { recyclerView.context.getString( R.string.updated_, - lastUpdate.timeSpanFromNow(preferences.context) + lastUpdate.timeSpanFromNow(preferences.context), ) } else { "N/A" diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt index 5f07e20171..1c96af6ac0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt @@ -126,7 +126,7 @@ import kotlin.random.nextInt class LibraryController( bundle: Bundle? = null, - val preferences: PreferencesHelper = Injekt.get() + val preferences: PreferencesHelper = Injekt.get(), ) : BaseCoroutineController(bundle), ActionMode.Callback, FlexibleAdapter.OnItemClickListener, @@ -248,14 +248,14 @@ class LibraryController( "\"${preferences.librarySearchSuggestion().get()}\"" } else { view?.context?.getString(R.string.your_library)?.lowercase(Locale.ROOT) - } + }, ) } val cb = object : WindowInsetsAnimationCompat.Callback(DISPATCH_MODE_STOP) { override fun onStart( animation: WindowInsetsAnimationCompat, - bounds: WindowInsetsAnimationCompat.BoundsCompat + bounds: WindowInsetsAnimationCompat.BoundsCompat, ): WindowInsetsAnimationCompat.BoundsCompat { hopperOffset = 0f updateHopperY() @@ -264,7 +264,7 @@ class LibraryController( override fun onProgress( insets: WindowInsetsCompat, - runningAnimations: List + runningAnimations: List, ): WindowInsetsCompat { updateHopperY(insets) return insets @@ -333,7 +333,7 @@ class LibraryController( private fun removeStaggeredObserver() { if (staggeredObserver != null) { binding.libraryGridRecycler.recycler.viewTreeObserver.removeOnGlobalLayoutListener( - staggeredObserver + staggeredObserver, ) staggeredObserver = null } @@ -367,7 +367,7 @@ class LibraryController( fun updateHopperPosition() { val shortAnimationDuration = resources?.getInteger( - android.R.integer.config_shortAnimTime + android.R.integer.config_shortAnimTime, ) ?: 0 if (preferences.autohideHopper().get()) { // Flow same snap rules as bottom nav @@ -391,7 +391,7 @@ class LibraryController( EndAnimatorListener { hopperOffset = end updateHopperY() - } + }, ) alphaAnimation.duration = shortAnimationDuration.toLong() alphaAnimation.start() @@ -435,7 +435,7 @@ class LibraryController( fun showCategoryText(name: String) { textAnim?.cancel() textAnim = binding.jumperCategoryText.animate().alpha(0f).setDuration(250L).setStartDelay( - 2000 + 2000, ) textAnim?.start() binding.jumperCategoryText.alpha = 1f @@ -495,14 +495,14 @@ class LibraryController( MaterialMenuSheet.MenuSheetItem( id, LibraryGroup.groupTypeDrawableRes(id), - LibraryGroup.groupTypeStringRes(id, presenter.allCategories.size > 1) + LibraryGroup.groupTypeStringRes(id, presenter.allCategories.size > 1), ) } MaterialMenuSheet( activity!!, items, activity!!.getString(R.string.group_library_by), - presenter.groupType + presenter.groupType, ) { _, item -> preferences.groupLibraryBy().set(item) presenter.groupType = item @@ -587,7 +587,7 @@ class LibraryController( }, onBottomNavUpdate = { updateFilterSheetY() - } + }, ) viewScope.launchUI { @@ -624,7 +624,7 @@ class LibraryController( val bigToolbarHeight = fullAppBarHeight ?: return val value = max( 0, - bigToolbarHeight + activityBinding.appBar.y.roundToInt() + bigToolbarHeight + activityBinding.appBar.y.roundToInt(), ) + activityBinding.appBar.paddingTop if (value != binding.fastScroller.marginTop) { binding.fastScroller.updateLayoutParams { @@ -632,7 +632,7 @@ class LibraryController( } binding.emptyView.updatePadding( top = bigToolbarHeight + activityBinding.appBar.paddingTop, - bottom = binding.libraryGridRecycler.recycler.paddingBottom + bottom = binding.libraryGridRecycler.recycler.paddingBottom, ) binding.progress.updateLayoutParams { topMargin = (bigToolbarHeight + activityBinding.appBar.paddingTop) / 2 @@ -697,7 +697,7 @@ class LibraryController( " (${adapter.itemsPerCategory[category.id]})" } else { "" - } + }, ) } if (items.isEmpty()) return@setOnClickListener @@ -706,7 +706,7 @@ class LibraryController( items, it.context.getString(R.string.jump_to_category), activeCategory, - 300.dpToPx + 300.dpToPx, ) { _, item -> scrollToHeader(item) true @@ -721,7 +721,7 @@ class LibraryController( 1 -> if (canCollapseOrExpandCategory() != null) presenter.toggleAllCategoryVisibility() else -> activityBinding?.searchToolbar?.menu?.performIdentifierAction( R.id.action_search, - 0 + 0, ) } true @@ -769,7 +769,7 @@ class LibraryController( val insets = windowInsets ?: view.rootWindowInsetsCompat val listOfYs = mutableListOf( binding.filterBottomSheet.filterBottomSheet.y, - activityBinding?.bottomNav?.y ?: binding.filterBottomSheet.filterBottomSheet.y + activityBinding?.bottomNav?.y ?: binding.filterBottomSheet.filterBottomSheet.y, ) val insetBottom = insets?.getInsets(systemBars())?.bottom ?: 0 if (!preferences.autohideHopper().get() || activityBinding?.bottomNav == null) { @@ -887,7 +887,7 @@ class LibraryController( viewScope.launchUI { NotificationReceiver.dismissNotification( context, - Notifications.ID_LIBRARY_PROGRESS + Notifications.ID_LIBRARY_PROGRESS, ) } } @@ -898,7 +898,7 @@ class LibraryController( with(binding.libraryGridRecycler.recycler) { viewScope.launchUI { updatePaddingRelative( - bottom = 50.dpToPx + (activityBinding?.bottomNav?.height ?: 0) + bottom = 50.dpToPx + (activityBinding?.bottomNav?.height ?: 0), ) } useStaggered(preferences) @@ -906,13 +906,13 @@ class LibraryController( spanCount = 1 updatePaddingRelative( start = 0, - end = 0 + end = 0, ) } else { setGridSize(preferences) updatePaddingRelative( start = 5.dpToPx, - end = 5.dpToPx + end = 5.dpToPx, ) } (manager as? GridLayoutManager)?.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() { @@ -934,7 +934,7 @@ class LibraryController( preferences.libraryLayout(), preferences.uniformGrid(), preferences.gridSize(), - preferences.useStaggeredGrid() + preferences.useStaggeredGrid(), ).forEach { it.asFlow() .drop(1) @@ -1044,9 +1044,9 @@ class LibraryController( listOf( EmptyView.Action(R.string.getting_started_guide) { activity?.openInBrowser("https://tachiyomi.org/help/guides/getting-started/#installing-an-extension") - } + }, ) - } else emptyList() + } else emptyList(), ) } adapter.setItems(mangaMap) @@ -1110,7 +1110,7 @@ class LibraryController( adapter.itemsPerCategory } else { emptyMap() - } + }, ) with(binding.filterBottomSheet.root) { viewScope.launch { @@ -1148,7 +1148,7 @@ class LibraryController( slideAnimation(slide, -slide), slideAnimation(-slide, slide), slideAnimation(slide, -slide), - slideAnimation(-slide, 0f, 233) + slideAnimation(-slide, 0f, 233), ) animatorSet.playSequentially(animations) animatorSet.startDelay = 1250 @@ -1157,7 +1157,7 @@ class LibraryController( binding.categoryHopperFrame.translationX = 0f isAnimatingHopper = false this.animatorSet = null - } + }, ) animatorSet.start() } @@ -1240,7 +1240,7 @@ class LibraryController( previousHeader?.category?.isHidden == true -> (-3).dpToPx else -> (-30).dpToPx } - ) + appbarOffset + ) + appbarOffset, ) (adapter.getItem(headerPosition) as? LibraryHeaderItem)?.category?.let { saveActiveCategory(it) @@ -1289,7 +1289,7 @@ class LibraryController( } else if (this.query.isNotBlank()) { searchItem.string = this.query (binding.libraryGridRecycler.recycler.findViewHolderForAdapterPosition(0) as? SearchGlobalItem.Holder)?.bind( - this.query + this.query, ) } else if (this.query.isBlank() && adapter.scrollableHeaders.isNotEmpty()) { adapter.removeAllScrollableHeaders() @@ -1438,10 +1438,10 @@ class LibraryController( when { lastClickPosition == -1 -> setSelection(position) lastClickPosition > position -> for (i in position until lastClickPosition) setSelection( - i + i, ) lastClickPosition < position -> for (i in lastClickPosition + 1..position) setSelection( - i + i, ) else -> setSelection(position) } @@ -1497,7 +1497,7 @@ class LibraryController( ) { binding.libraryGridRecycler.recycler.scrollBy( 0, - binding.libraryGridRecycler.recycler.paddingTop + binding.libraryGridRecycler.recycler.paddingTop, ) } if (lastItemPosition == toPosition) lastItemPosition = null @@ -1512,7 +1512,7 @@ class LibraryController( return (adapter.getItem(toPosition) !is LibraryHeaderItem) && ( newHeader?.category?.id == item.manga.category || !presenter.mangaIsInCategory( item.manga, - newHeader?.category?.id + newHeader?.category?.id, ) ) } @@ -1547,7 +1547,7 @@ class LibraryController( if (newHeader?.category != null) moveMangaToCategory( item.manga, newHeader.category, - mangaIds + mangaIds, ) } lastItemPosition = null @@ -1567,14 +1567,14 @@ class LibraryController( private fun moveMangaToCategory( manga: LibraryManga, category: Category?, - mangaIds: List + mangaIds: List, ) { if (category?.id == null) return val oldCatId = manga.category presenter.moveMangaToCategory(manga, category.id, mangaIds) snack?.dismiss() snack = view?.snack( - resources!!.getString(R.string.moved_to_, category.name) + resources!!.getString(R.string.moved_to_, category.name), ) { anchorView = anchorView() view.elevation = 15f.dpToPx @@ -1596,9 +1596,9 @@ class LibraryController( LibraryUpdateService.isRunning() -> R.string.adding_category_to_queue else -> R.string.updating_ }, - category.name + category.name, ), - Snackbar.LENGTH_LONG + Snackbar.LENGTH_LONG, ) { anchorView = anchorView() view.elevation = 15f.dpToPx @@ -1607,7 +1607,7 @@ class LibraryController( viewScope.launchUI { NotificationReceiver.dismissNotification( context, - Notifications.ID_LIBRARY_PROGRESS + Notifications.ID_LIBRARY_PROGRESS, ) } } @@ -1617,7 +1617,7 @@ class LibraryController( category, mangaToUse = if (category.isDynamic) { presenter.getMangaInCategories(category.id) - } else null + } else null, ) return true } @@ -1873,7 +1873,7 @@ class LibraryController( PreMigrationController.navigateToMigration( skipPre, router, - selectedMangas.filter { it.id != LocalSource.ID }.mapNotNull { it.id } + selectedMangas.filter { it.id != LocalSource.ID }.mapNotNull { it.id }, ) destroyActionModeIfNeeded() } @@ -1898,14 +1898,14 @@ class LibraryController( object : BaseTransientBottomBar.BaseCallback() { override fun onDismissed( transientBottomBar: Snackbar?, - event: Int + event: Int, ) { super.onDismissed(transientBottomBar, event) if (!undoing) presenter.confirmMarkReadStatus( - mapMangaChapters, markRead + mapMangaChapters, markRead, ) } - } + }, ) } (activity as? MainActivity)?.setUndoSnackBar(snack) @@ -1931,7 +1931,7 @@ class LibraryController( snack?.dismiss() snack = view?.snack( activity?.getString(R.string.removed_from_library) ?: "", - Snackbar.LENGTH_INDEFINITE + Snackbar.LENGTH_INDEFINITE, ) { anchorView = anchorView() view.elevation = 15f.dpToPx @@ -1946,7 +1946,7 @@ class LibraryController( super.onDismissed(transientBottomBar, event) if (!undoing) presenter.confirmDeletion(mangas) } - } + }, ) } (activity as? MainActivity)?.setUndoSnackBar(snack) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGestureDetector.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGestureDetector.kt index 66d9fdf3f3..8693b70186 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGestureDetector.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGestureDetector.kt @@ -21,7 +21,7 @@ class LibraryGestureDetector(private val controller: LibraryController) : Gestur e1: MotionEvent?, e2: MotionEvent?, distanceX: Float, - distanceY: Float + distanceY: Float, ): Boolean { val distance = ((e1?.rawX ?: 0f) - (e2?.rawX ?: 0f)) / 50 val poa = 1.7f @@ -38,7 +38,7 @@ class LibraryGestureDetector(private val controller: LibraryController) : Gestur e1: MotionEvent, e2: MotionEvent, velocityX: Float, - velocityY: Float + velocityY: Float, ): Boolean { var result = false val diffY = e2.y - e1.y @@ -66,7 +66,7 @@ class LibraryGestureDetector(private val controller: LibraryController) : Gestur if (diffX <= 0) { animator.translationX( if (hopperGravity == Gravity.TOP or Gravity.LEFT) 0f - else (-(controller.view!!.width - controller.binding.categoryHopperFrame.width) / 2).toFloat() + else (-(controller.view!!.width - controller.binding.categoryHopperFrame.width) / 2).toFloat(), ).withEndAction { hopperFrame.updateLayoutParams { gravity = @@ -85,7 +85,7 @@ class LibraryGestureDetector(private val controller: LibraryController) : Gestur } else { animator.translationX( if (hopperGravity == Gravity.TOP or Gravity.RIGHT) 0f - else ((controller.view!!.width - hopperFrame.width) / 2).toFloat() + else ((controller.view!!.width - hopperFrame.width) / 2).toFloat(), ).withEndAction { hopperFrame.updateLayoutParams { gravity = diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt index 454f7220a0..22e9f9c34e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt @@ -37,7 +37,7 @@ class LibraryGridHolder( private val view: View, adapter: LibraryCategoryAdapter, compact: Boolean, - val fixedSize: Boolean + val fixedSize: Boolean, ) : LibraryHolder(view, adapter) { private val binding = MangaGridItemBinding.bind(view) @@ -73,14 +73,14 @@ class LibraryGridHolder( val mangaColor = item.manga.dominantCoverColors binding.coverConstraint.backgroundColor = mangaColor?.first ?: itemView.context.getResourceColor(R.attr.background) binding.behindTitle.setTextColor( - mangaColor?.second ?: itemView.context.getResourceColor(R.attr.colorOnBackground) + mangaColor?.second ?: itemView.context.getResourceColor(R.attr.colorOnBackground), ) val authorArtist = if (item.manga.author == item.manga.artist || item.manga.artist.isNullOrBlank()) { item.manga.author?.trim() ?: "" } else { listOfNotNull( item.manga.author?.trim()?.takeIf { it.isNotBlank() }, - item.manga.artist?.trim()?.takeIf { it.isNotBlank() } + item.manga.artist?.trim()?.takeIf { it.isNotBlank() }, ).joinToString(", ") } binding.subtitle.text = authorArtist.highlightText(item.filter, color) @@ -134,7 +134,7 @@ class LibraryGridHolder( if (!fixedSize && !hasRatio && MangaCoverMetadata.getRatio(manga) != null) { setFreeformCoverRatio(manga) } - } + }, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderGestureDetector.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderGestureDetector.kt index 3a25ceaadb..12e3fc9145 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderGestureDetector.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderGestureDetector.kt @@ -27,7 +27,7 @@ class LibraryHeaderGestureDetector( e1: MotionEvent?, e2: MotionEvent?, distanceX: Float, - distanceY: Float + distanceY: Float, ): Boolean { if (binding == null || header == null) return false val distance = ((e1?.rawX ?: 0f) - (e2?.rawX ?: 0f)) @@ -61,7 +61,7 @@ class LibraryHeaderGestureDetector( e1: MotionEvent, e2: MotionEvent, velocityX: Float, - velocityY: Float + velocityY: Float, ): Boolean { var result = false val diffY = e2.y - e1.y diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderHolder.kt index 5de0a61947..733151acdb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderHolder.kt @@ -181,7 +181,7 @@ class LibraryHeaderHolder(val view: View, val adapter: LibraryCategoryAdapter) : binding.categorySort.setText(category.sortRes()) binding.collapseArrow.setImageResource( if (category.isHidden) R.drawable.ic_expand_more_24dp - else R.drawable.ic_expand_less_24dp + else R.drawable.ic_expand_less_24dp, ) when { adapter.mode == SelectableAdapter.Mode.MULTI -> { @@ -249,7 +249,7 @@ class LibraryHeaderHolder(val view: View, val adapter: LibraryCategoryAdapter) : activity, items, activity.getString(R.string.sort_by), - sortingMode?.mainValue + sortingMode?.mainValue, ) { sheet, item -> onCatSortClicked(category, item) val nCategory = (adapter.getItem(flexibleAdapterPosition) as? LibraryHeaderItem)?.category @@ -268,7 +268,7 @@ class LibraryHeaderHolder(val view: View, val adapter: LibraryCategoryAdapter) : private fun getSortRes( sortMode: LibrarySort?, isAscending: Boolean, - @DrawableRes defaultDrawableRes: Int = R.drawable.ic_check_24dp + @DrawableRes defaultDrawableRes: Int = R.drawable.ic_check_24dp, ): Int { sortMode ?: return defaultDrawableRes return when (sortMode) { @@ -286,7 +286,7 @@ class LibraryHeaderHolder(val view: View, val adapter: LibraryCategoryAdapter) : private fun getSortRes( sortingMode: Int?, isAscending: Boolean, - @DrawableRes defaultDrawableRes: Int = R.drawable.ic_check_24dp + @DrawableRes defaultDrawableRes: Int = R.drawable.ic_check_24dp, ): Int { sortingMode ?: return defaultDrawableRes return when (val sortMode = LibrarySort.valueOf(sortingMode)) { @@ -328,12 +328,12 @@ class LibraryHeaderHolder(val view: View, val adapter: LibraryCategoryAdapter) : val allSelected = adapter.libraryListener?.allSelected(flexibleAdapterPosition) == true val drawable = ContextCompat.getDrawable( contentView.context, - if (allSelected) R.drawable.ic_check_circle_24dp else R.drawable.ic_radio_button_unchecked_24dp + if (allSelected) R.drawable.ic_check_circle_24dp else R.drawable.ic_radio_button_unchecked_24dp, ) val tintedDrawable = drawable?.mutate() tintedDrawable?.setTint( if (allSelected) contentView.context.getResourceColor(R.attr.colorSecondary) - else ContextCompat.getColor(contentView.context, R.color.gray_button) + else ContextCompat.getColor(contentView.context, R.color.gray_button), ) binding.checkbox.setImageDrawable(tintedDrawable) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderItem.kt index 90c6c2e93b..21f383613d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderItem.kt @@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.data.database.models.Category class LibraryHeaderItem( private val categoryF: (Int) -> Category, - val catId: Int + val catId: Int, ) : AbstractHeaderItem() { @@ -21,7 +21,7 @@ class LibraryHeaderItem( override fun createViewHolder( view: View, - adapter: FlexibleAdapter> + adapter: FlexibleAdapter>, ): LibraryHeaderHolder { return LibraryHeaderHolder(view, adapter as LibraryCategoryAdapter) } @@ -30,7 +30,7 @@ class LibraryHeaderItem( adapter: FlexibleAdapter>, holder: LibraryHeaderHolder, position: Int, - payloads: MutableList? + payloads: MutableList?, ) { holder.bind(this) val layoutParams = holder.itemView.layoutParams as? StaggeredGridLayoutManager.LayoutParams diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.kt index 9657ce1fc2..90ae2fb694 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.kt @@ -19,7 +19,7 @@ import eu.kanade.tachiyomi.util.view.setCards abstract class LibraryHolder( view: View, - val adapter: LibraryCategoryAdapter + val adapter: LibraryCategoryAdapter, ) : BaseFlexibleViewHolder(view, adapter) { protected val color = ColorUtils.setAlphaComponent(itemView.context.getResourceColor(R.attr.colorSecondary), 75) @@ -56,7 +56,7 @@ abstract class LibraryHolder( }, showTotal, item.sourceLanguage, - this is LibraryGridHolder + this is LibraryGridHolder, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt index d735b0bef8..6131e31ef7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt @@ -29,7 +29,7 @@ import uy.kohesive.injekt.injectLazy class LibraryItem( val manga: LibraryManga, header: LibraryHeaderItem, - private val preferences: PreferencesHelper = Injekt.get() + private val preferences: PreferencesHelper = Injekt.get(), ) : AbstractSectionableItem(header), IFilterable { @@ -73,14 +73,14 @@ class LibraryItem( binding.card.setCardForegroundColor( ContextCompat.getColorStateList( context, - R.color.library_comfortable_grid_foreground - ) + R.color.library_comfortable_grid_foreground, + ), ) } if (isFixedSize) { binding.constraintLayout.layoutParams = FrameLayout.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, - ViewGroup.LayoutParams.WRAP_CONTENT + ViewGroup.LayoutParams.WRAP_CONTENT, ) binding.coverThumbnail.maxHeight = Int.MAX_VALUE binding.coverThumbnail.minimumHeight = 0 @@ -103,7 +103,7 @@ class LibraryItem( view, adapter as LibraryCategoryAdapter, libraryLayout == LAYOUT_COMPACT_GRID, - isFixedSize + isFixedSize, ) if (!isFixedSize) { gridHolder.setFreeformCoverRatio(manga, parent) @@ -119,7 +119,7 @@ class LibraryItem( adapter: FlexibleAdapter>, holder: LibraryHolder, position: Int, - payloads: MutableList? + payloads: MutableList?, ) { if (holder is LibraryGridHolder && !holder.fixedSize) { holder.setFreeformCoverRatio(manga, adapter.recyclerView as? AutofitRecyclerView) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt index 5f8247a01b..ba3296ff13 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt @@ -23,7 +23,7 @@ import eu.kanade.tachiyomi.util.view.setCards class LibraryListHolder( private val view: View, - adapter: LibraryCategoryAdapter + adapter: LibraryCategoryAdapter, ) : LibraryHolder(view, adapter) { private val binding = MangaListItemBinding.bind(view) @@ -49,7 +49,7 @@ class LibraryListHolder( } else { binding.title.text = itemView.context.getString( if (adapter.hasActiveFilters) R.string.no_matches_for_filters_short - else R.string.category_is_empty + else R.string.category_is_empty, ) } binding.title.textAlignment = View.TEXT_ALIGNMENT_CENTER @@ -76,7 +76,7 @@ class LibraryListHolder( } else { listOfNotNull( item.manga.author?.trim()?.takeIf { it.isNotBlank() }, - item.manga.artist?.trim()?.takeIf { it.isNotBlank() } + item.manga.artist?.trim()?.takeIf { it.isNotBlank() }, ).joinToString(", ") } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt index a74a565ddf..7207460527 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt @@ -61,7 +61,7 @@ class LibraryPresenter( private val coverCache: CoverCache = Injekt.get(), val sourceManager: SourceManager = Injekt.get(), private val downloadManager: DownloadManager = Injekt.get(), - private val chapterFilter: ChapterFilter = Injekt.get() + private val chapterFilter: ChapterFilter = Injekt.get(), ) : BaseCoroutinePresenter() { private val context = preferences.context @@ -184,7 +184,7 @@ class LibraryPresenter( val category = categories.find { it.order == order }?.id ?: return currentCategory = category controller?.onNextLibraryUpdate( - sectionedLibraryItems[currentCategory] ?: blankItem() + sectionedLibraryItems[currentCategory] ?: blankItem(), ) } @@ -192,8 +192,8 @@ class LibraryPresenter( return listOf( LibraryItem( LibraryManga.createBlank(id), - LibraryHeaderItem({ getCategory(id) }, id) - ) + LibraryHeaderItem({ getCategory(id) }, id), + ), ) } @@ -208,7 +208,7 @@ class LibraryPresenter( if (!show) sectionedLibraryItems[currentCategory] ?: sectionedLibraryItems[categories.first().id] ?: blankItem() else libraryItems, - true + true, ) } @@ -230,7 +230,7 @@ class LibraryPresenter( if (!showAll) sectionedLibraryItems[currentCategory] ?: sectionedLibraryItems[categories.first().id] ?: blankItem() else libraryItems, - freshStart + freshStart, ) } } @@ -272,7 +272,7 @@ class LibraryPresenter( filterCompleted, filterTracked, filterMangaType, - filterTrackers + filterTrackers, ) } } @@ -291,7 +291,7 @@ class LibraryPresenter( filterCompleted, filterTracked, filterMangaType, - filterTrackers + filterTrackers, ) if (matches) { missingCategorySet.remove(item.manga.category) @@ -313,7 +313,7 @@ class LibraryPresenter( filterCompleted: Int, filterTracked: Int, filterMangaType: Int, - filterTrackers: String + filterTrackers: String, ): Boolean { if (filterUnread == STATE_INCLUDE && item.manga.unread == 0) return false if (filterUnread == STATE_EXCLUDE && item.manga.unread > 0) return false @@ -552,7 +552,7 @@ class LibraryPresenter( val categoryAll = Category.createAll( context, preferences.librarySortingMode().get(), - preferences.librarySortingAscending().get() + preferences.librarySortingAscending().get(), ) val catItemAll = LibraryHeaderItem({ categoryAll }, -1) val categorySet = mutableSetOf() @@ -588,7 +588,7 @@ class LibraryPresenter( ) { val headerItem = headerItems[catId] if (headerItem != null) items.add( - LibraryItem(LibraryManga.createBlank(catId), headerItem) + LibraryItem(LibraryManga.createBlank(catId), headerItem), ) } else if (catId in categoriesHidden && showAll && categories.size > 1) { val mangaToRemove = items.filter { it.manga.category == catId } @@ -599,7 +599,7 @@ class LibraryPresenter( items.removeAll(mangaToRemove) val headerItem = headerItems[catId] if (headerItem != null) items.add( - LibraryItem(LibraryManga.createHide(catId, mergedTitle, mangaToRemove.size), headerItem) + LibraryItem(LibraryManga.createHide(catId, mergedTitle, mangaToRemove.size), headerItem), ) } } @@ -627,7 +627,7 @@ class LibraryPresenter( } private fun getCustomMangaItems(libraryManga: List): Pair, - List> { + List,> { val tagItems: MutableMap = mutableMapOf() // internal function to make headers @@ -678,8 +678,8 @@ class LibraryPresenter( listOf( LibraryItem( manga, - makeOrGetHeader("${source.name}$sourceSplitter${source.id}") - ) + makeOrGetHeader("${source.name}$sourceSplitter${source.id}"), + ), ) } else -> listOf(LibraryItem(manga, makeOrGetHeader(mapStatus(manga.status)))) @@ -691,7 +691,7 @@ class LibraryPresenter( Category.createCustom( item.key, preferences.librarySortingMode().get(), - preferences.librarySortingAscending().get() + preferences.librarySortingAscending().get(), ).apply { id = item.value.catId if (name.contains(sourceSplitter)) { @@ -723,7 +723,7 @@ class LibraryPresenter( sectionedLibraryItems[catId] = mangaToRemove items.removeAll { it.header.catId == catId } if (headerItem != null) items.add( - LibraryItem(LibraryManga.createHide(catId, mergedTitle, mangaToRemove.size), headerItem) + LibraryItem(LibraryManga.createHide(catId, mergedTitle, mangaToRemove.size), headerItem), ) } } @@ -742,7 +742,7 @@ class LibraryPresenter( SManga.CANCELLED -> R.string.cancelled SManga.ON_HIATUS -> R.string.on_hiatus else -> R.string.unknown - } + }, ) } @@ -941,7 +941,7 @@ class LibraryPresenter( fun moveMangaToCategory( manga: LibraryManga, catId: Int?, - mangaIds: List + mangaIds: List, ) { presenterScope.launch { val categoryId = catId ?: return@launch @@ -1028,13 +1028,13 @@ class LibraryPresenter( if (allCategoriesExpanded()) { preferences.collapsedDynamicCategories() += categories.map { getDynamicCategoryName( - it + it, ) } } else { preferences.collapsedDynamicCategories() -= categories.map { getDynamicCategoryName( - it + it, ) } } @@ -1067,7 +1067,7 @@ class LibraryPresenter( fun markReadStatus( mangaList: List, - markRead: Boolean + markRead: Boolean, ): HashMap> { val mapMangaChapters = HashMap>() presenterScope.launchIO { @@ -1100,7 +1100,7 @@ class LibraryPresenter( fun confirmMarkReadStatus( mangaList: HashMap>, - markRead: Boolean + markRead: Boolean, ) { if (preferences.removeAfterMarkedAsRead() && markRead) { mangaList.forEach { (manga, oldChapters) -> @@ -1140,7 +1140,7 @@ class LibraryPresenter( suspend fun setSearchSuggestion( preferences: PreferencesHelper, db: DatabaseHelper, - sourceManager: SourceManager + sourceManager: SourceManager, ) { val random: Random = run { val cal = Calendar.getInstance() @@ -1163,7 +1163,7 @@ class LibraryPresenter( val distinctSources = libraryManga.distinctBy { it.source } val randomSource = sourceManager.get( - distinctSources.randomOrNull(random)?.source ?: 0L + distinctSources.randomOrNull(random)?.source ?: 0L, )?.name randomSource?.chopByWords(30) } @@ -1196,7 +1196,7 @@ class LibraryPresenter( } } else -> "" - } ?: "" + } ?: "", ) if (preferences.showLibrarySearchSuggestions().isNotSet()) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt index 49c5a82da9..3db9d681c9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt @@ -11,7 +11,7 @@ enum class LibrarySort( @DrawableRes private val iconRes: Int, private val catValue: Int = mainValue, @StringRes private val dynamicStringRes: Int = stringRes, - @DrawableRes private val dynamicIconRes: Int = iconRes + @DrawableRes private val dynamicIconRes: Int = iconRes, ) { Title(0, R.string.title, R.drawable.ic_sort_by_alpha_24dp), @@ -27,7 +27,7 @@ enum class LibrarySort( R.drawable.ic_swap_vert_24dp, 7, R.string.category, - R.drawable.ic_label_outline_24dp + R.drawable.ic_label_outline_24dp, ) ; @@ -50,7 +50,7 @@ enum class LibrarySort( return MaterialMenuSheet.MenuSheetItem( mainValue, iconRes(isDynamic), - stringRes(isDynamic) + stringRes(isDynamic), ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/SearchGlobalItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/SearchGlobalItem.kt index 56585cd162..13db896062 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/SearchGlobalItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/SearchGlobalItem.kt @@ -23,7 +23,7 @@ class SearchGlobalItem : AbstractFlexibleItem() { override fun createViewHolder( view: View, - adapter: FlexibleAdapter> + adapter: FlexibleAdapter>, ): Holder { view.updateLayoutParams { width = MATCH_PARENT @@ -47,7 +47,7 @@ class SearchGlobalItem : AbstractFlexibleItem() { adapter: FlexibleAdapter>, holder: Holder, position: Int, - payloads: MutableList + payloads: MutableList, ) { holder.bind(string) val layoutParams = holder.itemView.layoutParams as? StaggeredGridLayoutManager.LayoutParams diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/category/CategoryRecyclerView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/category/CategoryRecyclerView.kt index d562571650..db4328ba90 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/category/CategoryRecyclerView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/category/CategoryRecyclerView.kt @@ -14,7 +14,7 @@ import eu.kanade.tachiyomi.util.system.dpToPx class CategoryRecyclerView @JvmOverloads constructor( context: Context, - attrs: AttributeSet? = null + attrs: AttributeSet? = null, ) : RecyclerView(context, attrs) { val manager = LinearLayoutManager(context) @@ -39,7 +39,7 @@ class CategoryRecyclerView @JvmOverloads constructor( override fun onBindViewHolder( viewHolder: ViewHolder, position: Int, - payloads: List + payloads: List, ) { super.onBindViewHolder(viewHolder, position, payloads) (viewHolder as? CategoryItem.ViewHolder)?.categoryTitle?.isSelected = @@ -60,7 +60,7 @@ class CategoryRecyclerView @JvmOverloads constructor( if (index > -1) { manager.scrollToPositionWithOffset( index, - (height - 38.dpToPx) / 2 + (height - 38.dpToPx) / 2, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/display/LibraryCategoryView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/display/LibraryCategoryView.kt index de813584c6..953aadf25b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/display/LibraryCategoryView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/display/LibraryCategoryView.kt @@ -35,7 +35,7 @@ class LibraryCategoryView @JvmOverloads constructor(context: Context, attrs: Att val hideHopper = min( 2, preferences.hideHopper().get().toInt() * 2 + preferences.autohideHopper().get() - .toInt() + .toInt(), ) hideHopperSpinner.setSelection(hideHopper) hideHopperSpinner.onItemSelectedListener = { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/display/LibraryDisplayView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/display/LibraryDisplayView.kt index d1a445362c..018abd5aeb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/display/LibraryDisplayView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/display/LibraryDisplayView.kt @@ -56,7 +56,7 @@ class LibraryDisplayView @JvmOverloads constructor(context: Context, attrs: Attr else null }.filterNotNull(), this, - true + true, ) recycler.layoutManager = LinearLayoutManager(context) recycler.adapter = adapter @@ -82,7 +82,7 @@ class LibraryDisplayView @JvmOverloads constructor(context: Context, attrs: Attr R.string.landscape } else { R.string.portrait - } + }, ) val alt = ( if (view.measuredHeight >= 720.dpToPx) { @@ -99,7 +99,7 @@ class LibraryDisplayView @JvmOverloads constructor(context: Context, attrs: Attr R.string.portrait } else { R.string.landscape - } + }, ) "$mainOrientation: $mainText • $altOrientation: $altText" } @@ -116,7 +116,8 @@ class LibraryDisplayView @JvmOverloads constructor(context: Context, attrs: Attr preferences.gridSize().set((slider.value / 2f) - .5f) setGridText(slider.value) } - }) + }, + ) } override fun onFinishInflate() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/display/TabbedLibraryDisplaySheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/display/TabbedLibraryDisplaySheet.kt index 3cbc683ef1..b2a1789edc 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/display/TabbedLibraryDisplaySheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/display/TabbedLibraryDisplaySheet.kt @@ -44,12 +44,12 @@ open class TabbedLibraryDisplaySheet(val controller: Controller) : override fun getTabViews(): List = listOf( displayView, badgesView, - categoryView + categoryView, ) override fun getTabTitles(): List = listOf( R.string.display, R.string.badges, - R.string.categories + R.string.categories, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt index b6e5c405b0..1217990a32 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt @@ -112,8 +112,8 @@ class FilterBottomSheet @JvmOverloads constructor(context: Context, attrs: Attri libraryRecyler?.post { bottomBarHeight = controller.activityBinding?.bottomNav?.height - ?: controller.activityBinding?.root?.rootWindowInsetsCompat?.getInsets(systemBars())?.bottom - ?: 0 + ?: controller.activityBinding?.root?.rootWindowInsetsCompat?.getInsets(systemBars())?.bottom + ?: 0 } sheetBehavior?.addBottomSheetCallback( object : BottomSheetBehavior.BottomSheetCallback() { @@ -127,7 +127,7 @@ class FilterBottomSheet @JvmOverloads constructor(context: Context, attrs: Attri this@FilterBottomSheet.controller?.updateFilterSheetY() stateChanged(state) } - } + }, ) sheetBehavior?.hide() @@ -155,7 +155,7 @@ class FilterBottomSheet @JvmOverloads constructor(context: Context, attrs: Attri BottomSheetBehavior.STATE_HIDDEN -> -1f BottomSheetBehavior.STATE_EXPANDED -> 1f else -> 0f - } + }, ) if (binding.secondLayout.width + (binding.groupBy.width * 2) + 20.dpToPx < width) { @@ -227,7 +227,7 @@ class FilterBottomSheet @JvmOverloads constructor(context: Context, attrs: Attri R.string.expand_all_categories } else { R.string.collapse_all_categories - } + }, ) if (animated) { binding.expandCategories.icon = AnimatedVectorDrawableCompat.create( @@ -236,7 +236,7 @@ class FilterBottomSheet @JvmOverloads constructor(context: Context, attrs: Attri R.drawable.anim_expand_less_to_more } else { R.drawable.anim_expand_more_to_less - } + }, ) (binding.expandCategories.icon as? AnimatedVectorDrawableCompat)?.start() } else { @@ -245,7 +245,7 @@ class FilterBottomSheet @JvmOverloads constructor(context: Context, attrs: Attri R.drawable.ic_expand_more_24dp } else { R.drawable.ic_expand_less_24dp - } + }, ) } } @@ -304,7 +304,7 @@ class FilterBottomSheet @JvmOverloads constructor(context: Context, attrs: Attri R.string.manga, types.first(), types.getOrNull(1), - types.getOrNull(2) + types.getOrNull(2), ) this@FilterBottomSheet.mangaType = mangaType reorderFilters() @@ -319,7 +319,7 @@ class FilterBottomSheet @JvmOverloads constructor(context: Context, attrs: Attri Manga.TYPE_MANHWA -> context.getString(R.string.manhwa) Manga.TYPE_COMIC -> context.getString(R.string.comic) else -> "" - } + }, ) reorderFilters() reSortViews() @@ -335,7 +335,7 @@ class FilterBottomSheet @JvmOverloads constructor(context: Context, attrs: Attri this@FilterBottomSheet, serviceNames.first(), serviceNames.getOrNull(1), - serviceNames.getOrNull(2) + serviceNames.getOrNull(2), ) if (tracked?.isActivated == true) { binding.filterLayout.addView(trackers) @@ -410,7 +410,7 @@ class FilterBottomSheet @JvmOverloads constructor(context: Context, attrs: Attri when (index) { in 0..1 -> index + 3 else -> 0 - } + }, ) null } @@ -524,7 +524,7 @@ class FilterBottomSheet @JvmOverloads constructor(context: Context, attrs: Attri Downloaded, Completed, SeriesType, - Tracked + Tracked, ).joinToString("") { it.value.toString() } fun filterOf(char: Char) = values().find { it.value == char } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterTagGroup.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterTagGroup.kt index 6a81bf8fcf..76296a8034 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterTagGroup.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterTagGroup.kt @@ -27,7 +27,7 @@ class FilterTagGroup@JvmOverloads constructor(context: Context, attrs: Attribute binding.firstButton, binding.secondButton, binding.thirdButton, - binding.fourthButton + binding.fourthButton, ) } @@ -35,7 +35,7 @@ class FilterTagGroup@JvmOverloads constructor(context: Context, attrs: Attribute arrayOf( binding.separator1, binding.separator2, - binding.separator3 + binding.separator3, ) } @@ -110,7 +110,7 @@ class FilterTagGroup@JvmOverloads constructor(context: Context, attrs: Attribute transition.duration = 150 androidx.transition.TransitionManager.beginDelayedTransition( parent.parent as ViewGroup, - transition + transition, ) } if (itemCount == 1) { @@ -118,13 +118,13 @@ class FilterTagGroup@JvmOverloads constructor(context: Context, attrs: Attribute binding.firstButton.setTextColor( context.getResourceColor( if (binding.firstButton.isActivated) R.attr.colorOnSecondary - else R.attr.colorOnBackground - ) + else R.attr.colorOnBackground, + ), ) listener?.onFilterClicked( this, if (binding.firstButton.isActivated) index else -1, - callBack + callBack, ) return } @@ -150,8 +150,8 @@ class FilterTagGroup@JvmOverloads constructor(context: Context, attrs: Attribute mainButton.setTextColor( context.getResourceColor( if (mainButton.isActivated) R.attr.colorOnSecondary - else R.attr.colorOnBackground - ) + else R.attr.colorOnBackground, + ), ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/ManageFilterItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/ManageFilterItem.kt index cf6322fc42..6e985929f4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/ManageFilterItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/ManageFilterItem.kt @@ -30,7 +30,7 @@ class ManageFilterItem(val char: Char) : AbstractFlexibleItem> + adapter: FlexibleAdapter>, ): Holder { return Holder(view, adapter) } @@ -47,7 +47,7 @@ class ManageFilterItem(val char: Char) : AbstractFlexibleItem>, holder: Holder, position: Int, - payloads: MutableList + payloads: MutableList, ) { holder.bind(char) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 5dd4bad8ac..c65eaf7fe5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -189,7 +189,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi setExitSharedElementCallback(object : MaterialContainerTransformSharedElementCallback() { override fun onMapSharedElements( names: MutableList, - sharedElements: MutableMap + sharedElements: MutableMap, ) { val mangaController = router.backstack.lastOrNull()?.controller as? MangaDetailsController if (mangaController == null || chapterIdToExitTo == 0L) { @@ -202,7 +202,8 @@ open class MainActivity : BaseActivity(), DownloadServiceLi sharedElements[names[0]] = selectedViewHolder.itemView chapterIdToExitTo = 0L } - }) + }, + ) window.sharedElementsUseOverlay = false super.onCreate(savedInstanceState) @@ -233,7 +234,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi lifecycleScope.launchUI { NotificationReceiver.dismissNotification( context, - Notifications.ID_LIBRARY_PROGRESS + Notifications.ID_LIBRARY_PROGRESS, ) } } @@ -276,19 +277,19 @@ open class MainActivity : BaseActivity(), DownloadServiceLi // with horizontal insets v.updatePadding( left = systemInsets.left, - right = systemInsets.right + right = systemInsets.right, ) binding.appBar.updatePadding( - top = systemInsets.top + top = systemInsets.top, ) binding.bottomNav?.updatePadding( - bottom = systemInsets.bottom + bottom = systemInsets.bottom, ) binding.sideNav?.updatePadding( left = 0, right = 0, bottom = systemInsets.bottom, - top = systemInsets.top + top = systemInsets.top, ) binding.bottomView?.isVisible = systemInsets.bottom > 0 binding.bottomView?.updateLayoutParams { @@ -332,7 +333,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi R.id.nav_recents -> RecentsController() else -> BrowseController() }, - id + id, ) } else if (currentRoot.tag()?.toIntOrNull() == id) { if (router.backstackSize == 1) { @@ -392,7 +393,8 @@ open class MainActivity : BaseActivity(), DownloadServiceLi (controller as? SettingsController)?.onActionViewCollapse(item) return true } - }) + }, + ) binding.appBar.alpha = 1f @@ -417,7 +419,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi from: Controller?, isPush: Boolean, container: ViewGroup, - handler: ControllerChangeHandler + handler: ControllerChangeHandler, ) { syncActivityViewWithController(to, from, isPush) binding.appBar.isVisible = true @@ -433,7 +435,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi from: Controller?, isPush: Boolean, container: ViewGroup, - handler: ControllerChangeHandler + handler: ControllerChangeHandler, ) { nav.translationY = 0f showDLQueueTutorial() @@ -446,7 +448,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) } } - } + }, ) syncActivityViewWithController(router.backstack.lastOrNull()?.controller) @@ -551,7 +553,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi val bgColor = binding.appBar.backgroundColor ?: Color.TRANSPARENT if (changeBG && (if (solidBG) bgColor == Color.TRANSPARENT else false)) { binding.appBar.setBackgroundColor( - if (show && !solidBG) Color.TRANSPARENT else getResourceColor(R.attr.colorSurface) + if (show && !solidBG) Color.TRANSPARENT else getResourceColor(R.attr.colorSurface), ) } setupSearchTBMenu(binding.toolbar.menu) @@ -579,7 +581,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi insets.hasSideNavBar() -> Color.BLACK isInNightMode() -> ColorUtils.setAlphaComponent( getResourceColor(R.attr.colorPrimaryVariant), - 179 + 179, ) else -> Color.argb(179, 0, 0, 0) } @@ -597,7 +599,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi else -> { ColorUtils.setAlphaComponent( getResourceColor(R.attr.colorPrimaryVariant), - 179 + 179, ) } } @@ -613,14 +615,14 @@ open class MainActivity : BaseActivity(), DownloadServiceLi val scale = Settings.Global.getFloat( contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE, - 1.0f + 1.0f, ) val duration = resources.getInteger(android.R.integer.config_mediumAnimTime) * scale delay(duration.toLong()) delay(100) if (Color.alpha(window?.statusBarColor ?: Color.BLACK) >= 255) window?.statusBarColor = getResourceColor( - android.R.attr.statusBarColor + android.R.attr.statusBarColor, ) } super.onSupportActionModeFinished(mode) @@ -666,10 +668,10 @@ open class MainActivity : BaseActivity(), DownloadServiceLi TapTarget.forView( recentsItem, getString(R.string.manage_whats_downloading), - getString(R.string.visit_recents_for_download_queue) + getString(R.string.visit_recents_for_download_queue), ).outerCircleColorInt(getResourceColor(R.attr.colorSecondary)).outerCircleAlpha(0.95f) .titleTextSize( - 20 + 20, ) .titleTextColorInt(getResourceColor(R.attr.colorOnSecondary)).descriptionTextSize(16) .descriptionTextColorInt(getResourceColor(R.attr.colorOnSecondary)) @@ -681,7 +683,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi super.onTargetClick(view) nav.selectedItemId = R.id.nav_recents } - } + }, ) } } @@ -730,7 +732,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi extensionManager.findAvailableExtensionsAsync() val pendingUpdates = ExtensionGithubApi().checkForUpdates( this@MainActivity, - extensionManager.availableExtensions.takeIf { it.isNotEmpty() } + extensionManager.availableExtensions.takeIf { it.isNotEmpty() }, ) preferences.extensionUpdatesCount().set(pendingUpdates.size) preferences.lastExtCheck().set(Date().time) @@ -751,7 +753,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi if (notificationId > -1) NotificationReceiver.dismissNotification( applicationContext, notificationId, - intent.getIntExtra("groupId", 0) + intent.getIntExtra("groupId", 0), ) when (intent.action) { SHORTCUT_LIBRARY -> nav.selectedItemId = R.id.nav_library @@ -768,7 +770,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi when (intent.action) { SHORTCUT_RECENTLY_UPDATED -> RecentsPresenter.VIEW_TYPE_ONLY_UPDATES else -> RecentsPresenter.VIEW_TYPE_ONLY_HISTORY - } + }, ) } } @@ -887,7 +889,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi when (nav.selectedItemId) { R.id.nav_library -> 0 else -> 1 - } + }, ) } } @@ -983,14 +985,14 @@ open class MainActivity : BaseActivity(), DownloadServiceLi oldMenuItem.groupId, oldMenuItem.itemId, index, - oldMenuItem.title + oldMenuItem.title, ).item } else { menu.add( oldMenuItem.groupId, oldMenuItem.itemId, index, - oldMenuItem.title + oldMenuItem.title, ) } menuItem.isVisible = isVisible @@ -1039,7 +1041,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi window, onDismiss = { this.overflowDialog = null - } + }, ) overflowDialog.show() } @@ -1089,7 +1091,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi protected open fun syncActivityViewWithController( to: Controller?, from: Controller? = null, - isPush: Boolean = false + isPush: Boolean = false, ) { if (from is DialogController || to is DialogController) { return @@ -1111,7 +1113,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi animationSet = AnimatorSet() val alphaAnimation = ValueAnimator.ofFloat( nav.alpha, - if (hideBottomNav) 0f else 1f + if (hideBottomNav) 0f else 1f, ) alphaAnimation.addUpdateListener { valueAnimator -> nav.alpha = valueAnimator.animatedValue as Float @@ -1122,7 +1124,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi binding.bottomView?.visibility = if (hideBottomNav) View.GONE else binding.bottomView?.visibility ?: View.GONE - } + }, ) alphaAnimation.duration = 200 alphaAnimation.startDelay = 50 @@ -1161,7 +1163,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi } val tA = ValueAnimator.ofFloat( binding.tabsFrameLayout.alpha, - if (show) 1f else 0f + if (show) 1f else 0f, ) tA.addUpdateListener { valueAnimator -> binding.tabsFrameLayout.alpha = valueAnimator.animatedValue as Float @@ -1173,7 +1175,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi binding.mainTabs.clearOnTabSelectedListeners() binding.mainTabs.removeAllTabs() } - } + }, ) tA.duration = 100 tabAnimation = tA @@ -1201,13 +1203,13 @@ open class MainActivity : BaseActivity(), DownloadServiceLi MaterialMenuSheet.MenuSheetItem( 0, textRes = R.string.whats_new_this_release, - drawable = R.drawable.ic_new_releases_24dp + drawable = R.drawable.ic_new_releases_24dp, ), MaterialMenuSheet.MenuSheetItem( 1, textRes = R.string.close, - drawable = R.drawable.ic_close_24dp - ) + drawable = R.drawable.ic_close_24dp, + ), ), title = getString(R.string.updated_to_, BuildConfig.VERSION_NAME), showDivider = true, @@ -1217,7 +1219,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi try { val intent = Intent( Intent.ACTION_VIEW, - RELEASE_URL.toUri() + RELEASE_URL.toUri(), ) startActivity(intent) } catch (e: Throwable) { @@ -1225,7 +1227,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi } } true - } + }, ) private inner class GestureListener : GestureDetector.SimpleOnGestureListener() { @@ -1237,7 +1239,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi e1: MotionEvent, e2: MotionEvent, velocityX: Float, - velocityY: Float + velocityY: Float, ): Boolean { var result = false val diffY = e2.y - e1.y diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt index 1358636ff4..baf0c50e05 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt @@ -104,7 +104,7 @@ class SearchActivity : MainActivity() { to: Controller?, from: Controller?, isPush: - Boolean + Boolean, ) { if (from is DialogController || to is DialogController) { return @@ -118,7 +118,7 @@ class SearchActivity : MainActivity() { if (notificationId > -1) NotificationReceiver.dismissNotification( applicationContext, notificationId, - intent.getIntExtra("groupId", 0) + intent.getIntExtra("groupId", 0), ) when (intent.action) { Intent.ACTION_SEARCH, Intent.ACTION_SEND, "com.google.android.gms.actions.SEARCH_ACTION" -> { @@ -168,7 +168,7 @@ class SearchActivity : MainActivity() { router.replaceTopController( RouterTransaction.with(MangaDetailsController(extras)) .pushChangeHandler(SimpleSwapChangeHandler()) - .popChangeHandler(FadeChangeHandler()) + .popChangeHandler(FadeChangeHandler()), ) } SHORTCUT_SOURCE -> { @@ -177,14 +177,14 @@ class SearchActivity : MainActivity() { router.replaceTopController( RouterTransaction.with(BrowseSourceController(extras)) .pushChangeHandler(SimpleSwapChangeHandler()) - .popChangeHandler(FadeChangeHandler()) + .popChangeHandler(FadeChangeHandler()), ) } SHORTCUT_READER_SETTINGS -> { router.replaceTopController( RouterTransaction.with(SettingsReaderController()) .pushChangeHandler(SimpleSwapChangeHandler()) - .popChangeHandler(FadeChangeHandler()) + .popChangeHandler(FadeChangeHandler()), ) } else -> return false @@ -196,7 +196,7 @@ class SearchActivity : MainActivity() { fun openMangaIntent(context: Context, id: Long?, canReturnToMain: Boolean = false) = Intent( context, SearchActivity::class - .java + .java, ) .apply { action = if (canReturnToMain) SHORTCUT_MANGA_BACK else SHORTCUT_MANGA @@ -206,7 +206,7 @@ class SearchActivity : MainActivity() { fun openReaderSettings(context: Context) = Intent( context, SearchActivity::class - .java + .java, ) .apply { action = SHORTCUT_READER_SETTINGS diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/TabsAnimator.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/TabsAnimator.kt index 78f3f37086..303a546593 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/TabsAnimator.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/TabsAnimator.kt @@ -45,7 +45,7 @@ class TabsAnimator(val tabs: TabLayout) { } } } - } + }, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt index 7069bf41de..66f9556593 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt @@ -54,7 +54,7 @@ class EditMangaDialog : DialogController { Bundle() .apply { putLong(KEY_MANGA, manga.id!!) - } + }, ) { targetController = target this.manga = manga @@ -122,7 +122,7 @@ class EditMangaDialog : DialogController { binding.mangaDescription.hint = "${resources?.getString(R.string.description)}: ${manga.originalDescription?.replace( "\n", - " " + " ", )?.chop(20)}" } } @@ -152,7 +152,7 @@ class EditMangaDialog : DialogController { R.string.clear_tags } else { R.string.reset_tags - } + }, ) binding.addTagChip.setOnClickListener { binding.addTagChip.isVisible = false @@ -180,7 +180,7 @@ class EditMangaDialog : DialogController { manga, builder = { parameters(Parameters.Builder().set(MangaFetcher.realCover, true).build()) - } + }, ) customCoverUri = null willResetCover = true @@ -193,7 +193,7 @@ class EditMangaDialog : DialogController { inputMethodManager.showSoftInput( binding.addTagEditText, WindowManager.LayoutParams - .SOFT_INPUT_ADJUST_PAN + .SOFT_INPUT_ADJUST_PAN, ) } @@ -227,23 +227,23 @@ class EditMangaDialog : DialogController { dark -> 0.225f else -> 0.85f } - ) - ) + ), + ), ), - 199 + 199, ) val textColor = ColorUtils.HSLToColor( floatArrayOf( accentArray[0], accentArray[1], - if (dark) 0.945f else 0.175f - ) + if (dark) 0.945f else 0.175f, + ), ) genres.map { genreText -> val chip = LayoutInflater.from(binding.root.context).inflate( R.layout.genre_chip, this, - false + false, ) as Chip val id = View.generateViewId() chip.id = id @@ -257,9 +257,9 @@ class EditMangaDialog : DialogController { binding.seriesType.setSelection( manga.seriesType( customTags = tags.joinToString( - ", " - ) - ) - 1 + ", ", + ), + ) - 1, ) } this.addView(chip) @@ -302,7 +302,7 @@ class EditMangaDialog : DialogController { binding.mangaGenresTags.tags, binding.mangaStatus.selectedPosition, if (binding.resetsReadingMode.isVisible) binding.seriesType.selectedPosition + 1 else null, - willResetCover + willResetCover, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/FullCoverDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/FullCoverDialog.kt index 43715aa24c..aca9a3d376 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/FullCoverDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/FullCoverDialog.kt @@ -47,7 +47,7 @@ class FullCoverDialog(val controller: MangaDetailsController, drawable: Drawable private val fullRatio = 0f val shortAnimationDuration = ( activity?.resources?.getInteger( - android.R.integer.config_shortAnimTime + android.R.integer.config_shortAnimTime, ) ?: 0 ).toLong() @@ -59,7 +59,7 @@ class FullCoverDialog(val controller: MangaDetailsController, drawable: Drawable if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) return if (canBlur) { activity?.window?.decorView?.setRenderEffect( - RenderEffect.createBlurEffect(20f, 20f, Shader.TileMode.CLAMP) + RenderEffect.createBlurEffect(20f, 20f, Shader.TileMode.CLAMP), ) } else { activity?.window?.decorView?.setRenderEffect(null) @@ -275,7 +275,7 @@ class FullCoverDialog(val controller: MangaDetailsController, drawable: Drawable expandedImageView.post { dismiss() } - } + }, ) interpolator = DecelerateInterpolator() duration = shortAnimationDuration diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsAdapter.kt index c3f9ccfc0f..f9a928ef30 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsAdapter.kt @@ -14,7 +14,7 @@ import java.text.DecimalFormat import java.text.DecimalFormatSymbols class MangaDetailsAdapter( - val controller: MangaDetailsController + val controller: MangaDetailsController, ) : BaseChapterAdapter>(controller) { val preferences: PreferencesHelper by injectLazy() @@ -30,7 +30,7 @@ class MangaDetailsAdapter( val decimalFormat = DecimalFormat( "#.###", DecimalFormatSymbols() - .apply { decimalSeparator = '.' } + .apply { decimalSeparator = '.' }, ) fun setChapters(items: List?) { @@ -55,7 +55,7 @@ class MangaDetailsAdapter( items.filter { it.name.contains(s, true) || it.scanlator?.contains(s, true) == true - } + }, ) } } @@ -86,7 +86,7 @@ class MangaDetailsAdapter( recyclerView.context.getString( if (scrollType == MangaDetailsPresenter.MULTIPLE_SEASONS) R.string.season_ else R.string.volume_, - volume + volume, ) } else { getChapterName(chapter) @@ -94,7 +94,7 @@ class MangaDetailsAdapter( } MangaDetailsPresenter.TENS_OF_CHAPTERS -> recyclerView.context.getString( R.string.chapters_, - get10sRange(chapter.chapter_number) + get10sRange(chapter.chapter_number), ) else -> getChapterName(chapter) } @@ -104,7 +104,7 @@ class MangaDetailsAdapter( return if (item.chapter_number > 0) { recyclerView.context.getString( R.string.chapter_, - decimalFormat.format(item.chapter_number) + decimalFormat.format(item.chapter_number), ) } else { item.name diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt index 222380e56a..e33a43b15c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt @@ -142,7 +142,7 @@ class MangaDetailsController : putBoolean(FROM_CATALOGUE_EXTRA, fromCatalogue) putParcelable(SMART_SEARCH_CONFIG_EXTRA, smartSearchConfig) putBoolean(UPDATE_EXTRA, update) - } + }, ) { this.manga = manga if (manga != null) { @@ -153,7 +153,7 @@ class MangaDetailsController : } constructor(mangaId: Long) : this( - Injekt.get().getManga(mangaId).executeAsBlocking() + Injekt.get().getManga(mangaId).executeAsBlocking(), ) constructor(bundle: Bundle) : this(bundle.getLong(MANGA_EXTRA)) { @@ -162,7 +162,7 @@ class MangaDetailsController : if (notificationId > -1) NotificationReceiver.dismissNotification( context, notificationId, - bundle.getInt("groupId", 0) + bundle.getInt("groupId", 0), ) } @@ -241,7 +241,7 @@ class MangaDetailsController : it, context.contextCompatColor(R.color.colorOnDownloadBadgeDayNight), (if (!context.isInNightMode()) luminance else -(luminance - 1)) - .toFloat() * if (context.isInNightMode()) 0.33f else 0.5f + .toFloat() * if (context.isInNightMode()) 0.33f else 0.5f, ) } else { it @@ -263,7 +263,7 @@ class MangaDetailsController : ColorUtils.blendARGB( context.getResourceColor(R.attr.colorSecondary), colorBack, - 0.5f + 0.5f, ) } )?.let { @@ -275,7 +275,7 @@ class MangaDetailsController : ColorUtils.blendARGB( it, colorBack, - if (lumWrongForTheme) 0.9f else 0.7f + if (lumWrongForTheme) 0.9f else 0.7f, ) } } @@ -285,7 +285,7 @@ class MangaDetailsController : if (presenter.preferences.themeMangaDetails() && accentColor != null && headerColor != null) { val newColor = makeColorFrom( hueOf = accentColor!!, - satAndLumOf = context.getResourceColor(R.attr.actionBarTintColor) + satAndLumOf = context.getResourceColor(R.attr.actionBarTintColor), ) setColorSchemeColors(newColor) setProgressBackgroundColorSchemeColor(headerColor!!) @@ -304,7 +304,7 @@ class MangaDetailsController : if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1 || context.isInNightMode()) { activity?.window?.navigationBarColor = ColorUtils.setAlphaComponent( newColor, - Color.alpha(activity?.window?.navigationBarColor ?: Color.BLACK) + Color.alpha(activity?.window?.navigationBarColor ?: Color.BLACK), ) } newColor @@ -325,8 +325,8 @@ class MangaDetailsController : floatArrayOf( hueArray[0], satLumArray[1], - satLumArray[2] - ) + satLumArray[2], + ), ) } @@ -344,7 +344,7 @@ class MangaDetailsController : chapterHolder.notifyStatus( chapter.status, isLocked(), - chapter.progress + chapter.progress, ) } } @@ -379,7 +379,7 @@ class MangaDetailsController : adapter?.isSwipeEnabled = true binding.recycler.layoutManager = LinearLayoutManagerAccurateOffset(view.context) binding.recycler.addItemDecoration( - MangaDetailsDivider(view.context) + MangaDetailsDivider(view.context), ) binding.recycler.setHasFixedSize(true) val appbarHeight = activityBinding?.appBar?.attrToolbarHeight ?: 0 @@ -403,7 +403,7 @@ class MangaDetailsController : }, liftOnScroll = { colorToolbar(it) - } + }, ) binding.recycler.addOnScrollListener( object : RecyclerView.OnScrollListener() { @@ -423,7 +423,7 @@ class MangaDetailsController : updateToolbarTitleAlpha() if (atTop) getHeader()?.binding?.backdrop?.translationY = 0f } - } + }, ) } @@ -468,7 +468,7 @@ class MangaDetailsController : if (animate) { val cA = ValueAnimator.ofFloat( if (toolbarIsColored) 0f else 1f, - if (toolbarIsColored) 1f else 0f + if (toolbarIsColored) 1f else 0f, ) colorAnimator = cA colorAnimator?.duration = 250 // milliseconds @@ -477,14 +477,14 @@ class MangaDetailsController : ColorUtils.blendARGB( topColor, scrollingColor, - animator.animatedValue as Float - ) + animator.animatedValue as Float, + ), ) activity.window?.statusBarColor = if (toolbarIsColored) { ColorUtils.blendARGB( topColor, scrollingStatusColor, - animator.animatedValue as Float + animator.animatedValue as Float, ) } else { Color.TRANSPARENT @@ -535,7 +535,7 @@ class MangaDetailsController : file.delete() setPaletteColor() } - } + }, ).build() view.context.imageLoader.enqueue(request) } @@ -547,7 +547,7 @@ class MangaDetailsController : ColorUtils.setAlphaComponent(scrollingColor, (0.87f * 255).roundToInt()) activity?.window?.statusBarColor = if (toolbarIsColored) scrollingStatusColor else topColor activityBinding?.appBar?.setBackgroundColor( - if (toolbarIsColored) scrollingColor else topColor + if (toolbarIsColored) scrollingColor else topColor, ) } @@ -605,7 +605,7 @@ class MangaDetailsController : getHeader()?.clearDescFocus() val colorSurface = activity?.getResourceColor( - R.attr.colorSurface + R.attr.colorSurface, ) ?: Color.BLACK if (router.backstackSize > 0 && router.backstack.last().controller !is MangaDetailsController @@ -614,7 +614,7 @@ class MangaDetailsController : activityBinding?.appBar?.setBackgroundColor(colorSurface) } activity?.window?.statusBarColor = activity?.getResourceColor( - android.R.attr.statusBarColor + android.R.attr.statusBarColor, ) ?: colorSurface } } @@ -622,7 +622,7 @@ class MangaDetailsController : override fun onChangeEnded( changeHandler: ControllerChangeHandler, - type: ControllerChangeType + type: ControllerChangeType, ) { super.onChangeEnded(changeHandler, type) if (type == ControllerChangeType.PUSH_ENTER) { @@ -670,10 +670,10 @@ class MangaDetailsController : context.resources.getQuantityString( R.plurals.notification_and_n_more, (chapterNames.size - (4 - 1)), - (chapterNames.size - (4 - 1)) + (chapterNames.size - (4 - 1)), ) - } else chapterNames.joinToString(", ") - ) + } else chapterNames.joinToString(", "), + ), ) .setPositiveButton(R.string.delete) { dialog, _ -> presenter.deleteChapters(deletedChapters, false) @@ -699,7 +699,7 @@ class MangaDetailsController : download.status, presenter.isLockedFromSearch, download.progress, - true + true, ) } @@ -799,23 +799,23 @@ class MangaDetailsController : MaterialMenuSheet.MenuSheetItem( 0, if (descending) R.drawable.ic_eye_down_24dp else R.drawable.ic_eye_up_24dp, - R.string.mark_previous_as_read + R.string.mark_previous_as_read, ), MaterialMenuSheet.MenuSheetItem( 1, if (descending) R.drawable.ic_eye_off_down_24dp else R.drawable.ic_eye_off_up_24dp, - R.string.mark_previous_as_unread + R.string.mark_previous_as_unread, ), MaterialMenuSheet.MenuSheetItem( 2, R.drawable.ic_eye_range_24dp, - R.string.mark_range_as_read + R.string.mark_range_as_read, ), MaterialMenuSheet.MenuSheetItem( 3, R.drawable.ic_eye_off_range_24dp, - R.string.mark_range_as_unread - ) + R.string.mark_range_as_unread, + ), ) val menuSheet = MaterialMenuSheet(activity!!, items, item.name) { _, itemPos -> when (itemPos) { @@ -886,7 +886,7 @@ class MangaDetailsController : snack = view?.snack( if (bookmarked) R.string.removed_bookmark else R.string.bookmarked, - Snackbar.LENGTH_INDEFINITE + Snackbar.LENGTH_INDEFINITE, ) { setAction(R.string.undo) { bookmarkChapters(listOf(item), bookmarked) @@ -908,7 +908,7 @@ class MangaDetailsController : snack = view?.snack( if (read) R.string.marked_as_unread else R.string.marked_as_read, - Snackbar.LENGTH_INDEFINITE + Snackbar.LENGTH_INDEFINITE, ) { var undoing = false setAction(R.string.undo) { @@ -928,7 +928,7 @@ class MangaDetailsController : } } } - } + }, ) } (activity as? MainActivity)?.setUndoSnackBar(snack) @@ -988,7 +988,7 @@ class MangaDetailsController : manga?.source != LocalSource.ID && presenter.manga.favorite menu.findItem(R.id.action_migrate).title = view?.context?.getString( R.string.migrate_, - presenter.manga.seriesType(view!!.context) + presenter.manga.seriesType(view!!.context), ) menu.findItem(R.id.download_next).title = view?.resources?.getQuantityString(R.plurals.next_unread_chapters, 1, 1) @@ -1024,7 +1024,7 @@ class MangaDetailsController : R.id.action_edit -> { editMangaDialog = EditMangaDialog( this, - presenter.manga + presenter.manga, ) editMangaDialog?.showDialog(router) } @@ -1035,7 +1035,7 @@ class MangaDetailsController : PreMigrationController.navigateToMigration( presenter.preferences.skipPreMigration().get(), router, - listOf(manga!!.id!!) + listOf(manga!!.id!!), ) } R.id.action_mark_all_as_read -> { @@ -1058,7 +1058,7 @@ class MangaDetailsController : .show() } R.id.download_next, R.id.download_next_5, R.id.download_custom, R.id.download_unread, R.id.download_all -> downloadChapters( - item.itemId + item.itemId, ) else -> return super.onOptionsItemSelected(item) } @@ -1135,7 +1135,7 @@ class MangaDetailsController : source.id, url, presenter.manga - .title + .title, ) startActivity(intent) } @@ -1163,8 +1163,8 @@ class MangaDetailsController : else context.resources.getQuantityString( R.plurals.remove_n_chapters, chapters.size, - chapters.size - ) + chapters.size, + ), ) .setPositiveButton(R.string.remove) { _, _ -> presenter.deleteChapters(chapters, isEverything = isEverything) @@ -1255,7 +1255,7 @@ class MangaDetailsController : presenter.downloadChapters(chapters) val text = view.context.getString( R.string.add_x_to_library, - presenter.manga.seriesType(view.context).lowercase(Locale.ROOT) + presenter.manga.seriesType(view.context).lowercase(Locale.ROOT), ) if (!presenter.manga.favorite && ( snack == null || @@ -1274,7 +1274,7 @@ class MangaDetailsController : super.onDismissed(transientBottomBar, event) if (snack == transientBottomBar) snack = null } - } + }, ) } (activity as? MainActivity)?.setUndoSnackBar(snack) @@ -1311,7 +1311,7 @@ class MangaDetailsController : super.onDismissed(transientBottomBar, event) if (snack == transientBottomBar) snack = null } - } + }, ) } } @@ -1438,7 +1438,7 @@ class MangaDetailsController : updateHeader() presenter.fetchChapters(andTracking = true) }, - onMangaDeleted = { presenter.confirmDeletion() } + onMangaDeleted = { presenter.confirmDeletion() }, ) if (snack?.duration == Snackbar.LENGTH_INDEFINITE) { val favButton = getHeader()?.binding?.favoriteButton @@ -1556,7 +1556,7 @@ class MangaDetailsController : mode?.title = view?.context?.getString( if (startingRangeChapterPos == null) { R.string.select_starting_chapter - } else R.string.select_ending_chapter + } else R.string.select_ending_chapter, ) return false } @@ -1569,7 +1569,7 @@ class MangaDetailsController : (binding.recycler.findViewHolderForAdapterPosition(startingRangeChapterPos!!) as? ChapterHolder)?.notifyStatus( item?.status ?: Download.State.NOT_DOWNLOADED, false, - 0 + 0, ) } rangeMode = null @@ -1587,9 +1587,9 @@ class MangaDetailsController : startActivityForResult( Intent.createChooser( intent, - resources?.getString(R.string.select_cover_image) + resources?.getString(R.string.select_cover_image), ), - 101 + 101, ) } else { activity?.toast(R.string.must_be_in_library_to_edit) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsDivider.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsDivider.kt index 552c1ee677..bc33f24429 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsDivider.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsDivider.kt @@ -21,7 +21,7 @@ class MangaDetailsDivider(context: Context, val padding: Int = 12.dpToPx) : andr override fun onDraw( c: Canvas, parent: androidx.recyclerview.widget.RecyclerView, - state: androidx.recyclerview.widget.RecyclerView.State + state: androidx.recyclerview.widget.RecyclerView.State, ) { val childCount = parent.childCount for (i in 0 until childCount - 1) { @@ -43,7 +43,7 @@ class MangaDetailsDivider(context: Context, val padding: Int = 12.dpToPx) : andr outRect: Rect, view: View, parent: androidx.recyclerview.widget.RecyclerView, - state: androidx.recyclerview.widget.RecyclerView.State + state: androidx.recyclerview.widget.RecyclerView.State, ) { outRect.set(0, 0, 0, divider.intrinsicHeight) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt index f86085ceea..8a04d0a668 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt @@ -81,7 +81,7 @@ class MangaDetailsPresenter( val coverCache: CoverCache = Injekt.get(), val db: DatabaseHelper = Injekt.get(), private val downloadManager: DownloadManager = Injekt.get(), - chapterFilter: ChapterFilter = Injekt.get() + chapterFilter: ChapterFilter = Injekt.get(), ) : BaseCoroutinePresenter(), DownloadQueue.DownloadListener, LibraryServiceListener { private val customMangaManager: CustomMangaManager by injectLazy() @@ -356,7 +356,7 @@ class MangaDetailsPresenter( .memoryCachePolicy(CachePolicy.DISABLED) .parameters( Parameters.Builder().set(MangaFetcher.onlyFetchRemotely, true) - .build() + .build(), ) .build() @@ -375,7 +375,7 @@ class MangaDetailsPresenter( if (manga.shouldDownloadNewChapters(db, preferences)) { downloadChapters( newChapters.first.sortedBy { it.chapter_number } - .map { it.toModel() } + .map { it.toModel() }, ) } mangaShortcutManager.updateShortcuts() @@ -388,7 +388,7 @@ class MangaDetailsPresenter( if (removedChapters.isNotEmpty()) { withContext(Dispatchers.Main) { controller?.showChaptersRemovedPopup( - removedChapters + removedChapters, ) } } @@ -402,13 +402,13 @@ class MangaDetailsPresenter( if (chapterError != null) { withContext(Dispatchers.Main) { controller?.showError( - trimException(chapterError!!) + trimException(chapterError!!), ) } return@launch } else if (mangaError != null) withContext(Dispatchers.Main) { controller?.showError( - trimException(mangaError!!) + trimException(mangaError!!), ) } } @@ -479,7 +479,7 @@ class MangaDetailsPresenter( read: Boolean, deleteNow: Boolean = true, lastRead: Int? = null, - pagesLeft: Int? = null + pagesLeft: Int? = null, ) { presenterScope.launch(Dispatchers.IO) { selectedChapters.forEach { @@ -549,7 +549,7 @@ class MangaDetailsPresenter( fun setFilters( unread: TriStateCheckBox.State, downloaded: TriStateCheckBox.State, - bookmarked: TriStateCheckBox.State + bookmarked: TriStateCheckBox.State, ) { manga.readFilter = when (unread) { TriStateCheckBox.State.CHECKED -> Manga.CHAPTER_SHOW_UNREAD @@ -595,28 +595,28 @@ class MangaDetailsPresenter( fun setGlobalChapterFilters( unread: TriStateCheckBox.State, downloaded: TriStateCheckBox.State, - bookmarked: TriStateCheckBox.State + bookmarked: TriStateCheckBox.State, ) { preferences.filterChapterByRead().set( when (unread) { TriStateCheckBox.State.CHECKED -> Manga.CHAPTER_SHOW_UNREAD TriStateCheckBox.State.IGNORE -> Manga.CHAPTER_SHOW_READ else -> Manga.SHOW_ALL - } + }, ) preferences.filterChapterByDownloaded().set( when (downloaded) { TriStateCheckBox.State.CHECKED -> Manga.CHAPTER_SHOW_DOWNLOADED TriStateCheckBox.State.IGNORE -> Manga.CHAPTER_SHOW_NOT_DOWNLOADED else -> Manga.SHOW_ALL - } + }, ) preferences.filterChapterByBookmarked().set( when (bookmarked) { TriStateCheckBox.State.CHECKED -> Manga.CHAPTER_SHOW_BOOKMARKED TriStateCheckBox.State.IGNORE -> Manga.CHAPTER_SHOW_NOT_BOOKMARKED else -> Manga.SHOW_ALL - } + }, ) preferences.hideChapterTitlesByDefault().set(manga.hideChapterTitles) manga.setFilterToGlobal() @@ -736,7 +736,7 @@ class MangaDetailsPresenter( tags: Array?, status: Int?, seriesType: Int?, - resetCover: Boolean = false + resetCover: Boolean = false, ) { if (manga.source == LocalSource.ID) { manga.title = if (title.isNullOrBlank()) manga.url else title.trim() @@ -780,7 +780,7 @@ class MangaDetailsPresenter( artist?.trimOrNull(), description?.trimOrNull(), genre, - if (status != this.manga.originalStatus) status else null + if (status != this.manga.originalStatus) status else null, ) customMangaManager.saveMangaInfo(manga) } @@ -838,7 +838,7 @@ class MangaDetailsPresenter( val directory = File( Environment.getExternalStorageDirectory().absolutePath + File.separator + Environment.DIRECTORY_PICTURES + - File.separator + preferences.context.getString(R.string.app_name) + File.separator + preferences.context.getString(R.string.app_name), ) saveCover(directory) true diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderHolder.kt index fd3ee41b42..7bebb26fd1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderHolder.kt @@ -47,7 +47,7 @@ class MangaHeaderHolder( view: View, private val adapter: MangaDetailsAdapter, startExpanded: Boolean, - private val isTablet: Boolean = false + private val isTablet: Boolean = false, ) : BaseFlexibleViewHolder(view, adapter) { val binding: MangaHeaderItemBinding? = try { @@ -96,7 +96,7 @@ class MangaHeaderHolder( } mangaSummary.setOnLongClickListener { if (mangaSummary.isTextSelectable && !adapter.recyclerView.canScrollVertically( - -1 + -1, ) ) { (adapter.delegate as MangaDetailsController).binding.swipeRefresh.isEnabled = @@ -140,7 +140,7 @@ class MangaHeaderHolder( mangaAuthor.setOnLongClickListener { adapter.delegate.copyToClipboard( mangaAuthor.text.toString(), - R.string.author + R.string.author, ) true } @@ -163,8 +163,8 @@ class MangaHeaderHolder( RenderEffect.createBlurEffect( 20f, 20f, - Shader.TileMode.MIRROR - ) + Shader.TileMode.MIRROR, + ), ) } } @@ -193,11 +193,11 @@ class MangaHeaderHolder( .addTransition(androidx.transition.Fade()) .addTransition(androidx.transition.Slide()) transition.duration = binding.root.resources.getInteger( - android.R.integer.config_shortAnimTime + android.R.integer.config_shortAnimTime, ).toLong() androidx.transition.TransitionManager.beginDelayedTransition( adapter.controller.binding.recycler, - transition + transition, ) } } @@ -211,24 +211,24 @@ class MangaHeaderHolder( androidx.transition.TransitionManager.endTransitions(adapter.controller.binding.recycler) val animVector = AnimatedVectorDrawableCompat.create( binding.root.context, - R.drawable.anim_expand_less_to_more + R.drawable.anim_expand_less_to_more, ) binding.moreButton.setCompoundDrawablesRelativeWithIntrinsicBounds( null, null, animVector, - null + null, ) animVector?.start() val transition = TransitionSet() .addTransition(androidx.transition.ChangeBounds()) .addTransition(androidx.transition.Fade()) transition.duration = binding.root.resources.getInteger( - android.R.integer.config_shortAnimTime + android.R.integer.config_shortAnimTime, ).toLong() androidx.transition.TransitionManager.beginDelayedTransition( adapter.controller.binding.recycler, - transition + transition, ) } binding.mangaSummary.setTextIsSelectable(false) @@ -252,9 +252,9 @@ class MangaHeaderHolder( binding.mangaSummary.maxLines != Int.MAX_VALUE -> desc.replace( Regex( "[\\r\\n\\s*]{2,}", - setOf(RegexOption.MULTILINE) + setOf(RegexOption.MULTILINE), ), - "\n" + "\n", ) else -> desc.trim() } @@ -318,7 +318,7 @@ class MangaHeaderHolder( } binding.mangaSummaryLabel.text = itemView.context.getString( R.string.about_this_, - manga.seriesType(itemView.context) + manga.seriesType(itemView.context), ) with(binding.favoriteButton) { icon = ContextCompat.getDrawable( @@ -327,21 +327,21 @@ class MangaHeaderHolder( item.isLocked -> R.drawable.ic_lock_24dp manga.favorite -> R.drawable.ic_heart_24dp else -> R.drawable.ic_heart_outline_24dp - } + }, ) text = itemView.resources.getString( when { item.isLocked -> R.string.unlock manga.favorite -> R.string.in_library else -> R.string.add_to_library - } + }, ) checked(!item.isLocked && manga.favorite) adapter.delegate.setFavButtonPopup(this) } binding.trueBackdrop.setBackgroundColor( adapter.delegate.coverColor() - ?: itemView.context.getResourceColor(R.attr.background) + ?: itemView.context.getResourceColor(R.attr.background), ) val tracked = presenter.isTracked() && !item.isLocked @@ -350,12 +350,12 @@ class MangaHeaderHolder( isVisible = presenter.hasTrackers() text = itemView.context.getString( if (tracked) R.string.tracked - else R.string.tracking + else R.string.tracking, ) icon = ContextCompat.getDrawable( itemView.context, - if (tracked) R.drawable.ic_check_24dp else R.drawable.ic_sync_24dp + if (tracked) R.drawable.ic_check_24dp else R.drawable.ic_sync_24dp, ) checked(tracked) } @@ -370,12 +370,12 @@ class MangaHeaderHolder( if (nextChapter.chapter_number > 0) resources.getString( if (nextChapter.last_page_read > 0) R.string.continue_reading_chapter_ else R.string.start_reading_chapter_, - number + number, ) else { resources.getString( if (nextChapter.last_page_read > 0) R.string.continue_reading - else R.string.start_reading + else R.string.start_reading, ) } } else { @@ -401,7 +401,7 @@ class MangaHeaderHolder( SManga.CANCELLED -> R.string.cancelled SManga.ON_HIATUS -> R.string.on_hiatus else -> R.string.unknown_status - } + }, ) ) with(binding.mangaSource) { @@ -414,7 +414,7 @@ class MangaHeaderHolder( presenter.source.toString() } else { presenter.source.name - } + }, ) if (presenter.source is SourceManager.StubSource && presenter.source.name != presenter.source.id.toString() @@ -462,24 +462,24 @@ class MangaHeaderHolder( dark -> 0.225f else -> 0.85f } - ) - ) + ), + ), ), - 199 + 199, ) val textColor = ColorUtils.HSLToColor( floatArrayOf( accentArray[0], accentArray[1], - if (dark) 0.945f else 0.175f - ) + if (dark) 0.945f else 0.175f, + ), ) if (manga.genre.isNullOrBlank().not()) { (manga.getGenres() ?: emptyList()).map { genreText -> val chip = LayoutInflater.from(binding.root.context).inflate( R.layout.genre_chip, this, - false + false, ) as Chip val id = View.generateViewId() chip.id = id @@ -512,8 +512,8 @@ class MangaHeaderHolder( ColorUtils.blendARGB( adapter.delegate.accentColor() ?: context.getResourceColor(R.attr.colorSecondary), context.getResourceColor(R.attr.background), - 0.706f - ) + 0.706f, + ), ) strokeColor = ColorStateList.valueOf(Color.TRANSPARENT) } else { @@ -549,7 +549,7 @@ class MangaHeaderHolder( with(binding) { trueBackdrop.setBackgroundColor( adapter.delegate.coverColor() - ?: trueBackdrop.context.getResourceColor(R.attr.background) + ?: trueBackdrop.context.getResourceColor(R.attr.background), ) TextViewCompat.setCompoundDrawableTintList(moreButton, ColorStateList.valueOf(accentColor)) moreButton.setTextColor(accentColor) @@ -561,19 +561,19 @@ class MangaHeaderHolder( val states = arrayOf( intArrayOf(-android.R.attr.state_enabled), - intArrayOf() + intArrayOf(), ) val colors = intArrayOf( ColorUtils.setAlphaComponent(root.context.getResourceColor(R.attr.tabBarIconInactive), 43), - accentColor + accentColor, ) startReadingButton.backgroundTintList = ColorStateList(states, colors) val textColors = intArrayOf( ColorUtils.setAlphaComponent(root.context.getResourceColor(R.attr.colorOnSurface), 97), - root.context.getResourceColor(android.R.attr.textColorPrimaryInverse) + root.context.getResourceColor(android.R.attr.textColorPrimaryInverse), ) startReadingButton.setTextColor(ColorStateList(states, textColors)) trackButton.iconTint = ColorStateList.valueOf(accentColor) @@ -593,13 +593,13 @@ class MangaHeaderHolder( with(binding.trackButton) { text = itemView.context.getString( if (tracked) R.string.tracked - else R.string.tracking + else R.string.tracking, ) icon = ContextCompat.getDrawable( itemView.context, if (tracked) R.drawable - .ic_check_24dp else R.drawable.ic_sync_24dp + .ic_check_24dp else R.drawable.ic_sync_24dp, ) checked(tracked) } @@ -629,7 +629,7 @@ class MangaHeaderHolder( error(drawable) if (manga.favorite) networkCachePolicy(CachePolicy.READ_ONLY) diskCachePolicy(CachePolicy.READ_ONLY) - } + }, ) binding.backdrop.loadManga( manga, @@ -649,12 +649,12 @@ class MangaHeaderHolder( binding.backdrop.setImageDrawable( Bitmap.createBitmap(bitmap, 0, 0, bitmap.width, bitmap.height - yOffset) - .toDrawable(itemView.resources) + .toDrawable(itemView.resources), ) applyBlur() - } + }, ) - } + }, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderItem.kt index 336f6674da..90569e389e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderItem.kt @@ -35,7 +35,7 @@ class MangaHeaderItem(val manga: Manga, var startExpanded: Boolean) : adapter: FlexibleAdapter>, holder: MangaHeaderHolder, position: Int, - payloads: MutableList? + payloads: MutableList?, ) { if (isChapterHeader) holder.bindChapters() else holder.bind(this, manga) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/BaseChapterAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/BaseChapterAdapter.kt index 7de4583a37..a41d336455 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/BaseChapterAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/BaseChapterAdapter.kt @@ -4,7 +4,7 @@ import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.items.IFlexible open class BaseChapterAdapter>( - obj: DownloadInterface + obj: DownloadInterface, ) : FlexibleAdapter(null, obj, true) { val baseDelegate = obj diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/BaseChapterHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/BaseChapterHolder.kt index 20bd852cb2..aed9489b84 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/BaseChapterHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/BaseChapterHolder.kt @@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder open class BaseChapterHolder( view: View, - private val adapter: BaseChapterAdapter<*> + private val adapter: BaseChapterAdapter<*>, ) : BaseFlexibleViewHolder(view, adapter) { init { @@ -33,7 +33,7 @@ open class BaseChapterHolder( // Hide download and show delete if the chapter is downloaded if (chapter.status != Download.State.DOWNLOADED) popup.menu.findItem(R.id.action_delete).title = downloadButton.context.getString( - R.string.cancel + R.string.cancel, ) // Set a listener so we are notified if a menu item is clicked diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/BaseChapterItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/BaseChapterItem.kt index 29e6e9e766..d13bde4211 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/BaseChapterItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/BaseChapterItem.kt @@ -9,7 +9,7 @@ import eu.kanade.tachiyomi.source.model.Page abstract class BaseChapterItem>( val chapter: Chapter, - header: H? = null + header: H? = null, ) : AbstractSectionableItem(header), Chapter by chapter { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterHolder.kt index 6f9d6ccf39..de489d6f56 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterHolder.kt @@ -20,7 +20,7 @@ import eu.kanade.tachiyomi.widget.StartAnimatorListener class ChapterHolder( view: View, - private val adapter: MangaDetailsAdapter + private val adapter: MangaDetailsAdapter, ) : BaseChapterHolder(view, adapter) { private val binding = ChaptersItemBinding.bind(view) @@ -58,15 +58,15 @@ class ChapterHolder( itemView.resources.getQuantityString( R.plurals.pages_left, chapter.pages_left, - chapter.pages_left - ) + chapter.pages_left, + ), ) } else if (showPagesLeft) { statuses.add( itemView.context.getString( R.string.page_, - chapter.last_page_read + 1 - ) + chapter.last_page_read + 1, + ), ) } @@ -76,10 +76,10 @@ class ChapterHolder( if (binding.frontView.translationX == 0f) { binding.read.setImageResource( - if (item.read) R.drawable.ic_eye_off_24dp else R.drawable.ic_eye_24dp + if (item.read) R.drawable.ic_eye_off_24dp else R.drawable.ic_eye_24dp, ) binding.bookmark.setImageResource( - if (item.bookmark) R.drawable.ic_bookmark_off_24dp else R.drawable.ic_bookmark_24dp + if (item.bookmark) R.drawable.ic_bookmark_off_24dp else R.drawable.ic_bookmark_24dp, ) } // this will color the scanlator the same bookmarks @@ -87,7 +87,7 @@ class ChapterHolder( binding.chapterScanlator, item, showBookmark = false, - hideStatus = isLocked + hideStatus = isLocked, ) binding.chapterScanlator.text = statuses.joinToString(" • ") @@ -124,7 +124,7 @@ class ChapterHolder( animatorSet.addListener( EndAnimatorListener { adapter.hasShownSwipeTut.set(true) - } + }, ) animatorSet.start() } @@ -157,11 +157,11 @@ class ChapterHolder( adapter.delegate.accentColor()?.let { binding.startView.backgroundTintList = ColorStateList.valueOf(it) binding.bookmark.imageTintList = ColorStateList.valueOf( - context.getResourceColor(android.R.attr.textColorPrimaryInverse) + context.getResourceColor(android.R.attr.textColorPrimaryInverse), ) TextViewCompat.setCompoundDrawableTintList( binding.chapterTitle, - ColorStateList.valueOf(it) + ColorStateList.valueOf(it), ) colorSecondary = it } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterItem.kt index a9667588cf..6404f2cb87 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterItem.kt @@ -36,7 +36,7 @@ class ChapterItem(chapter: Chapter, val manga: Manga) : adapter: FlexibleAdapter>, holder: ChapterHolder, position: Int, - payloads: MutableList? + payloads: MutableList?, ) { holder.bind(this, manga) } @@ -44,7 +44,7 @@ class ChapterItem(chapter: Chapter, val manga: Manga) : override fun unbindViewHolder( adapter: FlexibleAdapter>?, holder: ChapterHolder?, - position: Int + position: Int, ) { super.unbindViewHolder(adapter, holder, position) (adapter as MangaDetailsAdapter).controller.dismissPopup(position) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSortBottomSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSortBottomSheet.kt index 7d603a9efb..072e36c5d6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSortBottomSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSortBottomSheet.kt @@ -51,7 +51,7 @@ class ChaptersSortBottomSheet(controller: MangaDetailsController) : sheetBehavior.skipCollapsed = true } } - } + }, ) } @@ -107,7 +107,7 @@ class ChaptersSortBottomSheet(controller: MangaDetailsController) : binding.setAsDefaultSort.setOnClickListener { presenter.setGlobalChapterSort( presenter.manga.sorting, - presenter.manga.sortDescending + presenter.manga.sortDescending, ) binding.setAsDefaultSort.isInvisible = true binding.resetAsDefaultSort.isInvisible = true @@ -144,7 +144,7 @@ class ChaptersSortBottomSheet(controller: MangaDetailsController) : presenter.setGlobalChapterFilters( binding.chapterFilterLayout.showUnread.state, binding.chapterFilterLayout.showDownload.state, - binding.chapterFilterLayout.showBookmark.state + binding.chapterFilterLayout.showBookmark.state, ) binding.chapterFilterLayout.setAsDefaultFilter.isInvisible = true binding.chapterFilterLayout.resetAsDefaultFilter.isInvisible = true @@ -185,7 +185,7 @@ class ChaptersSortBottomSheet(controller: MangaDetailsController) : .setPositiveButton(R.string.filter) { _, _ -> presenter.setScanlatorFilter(filteredScanlators) } - .setNeutralButton(R.string.reset) { _, _, -> + .setNeutralButton(R.string.reset) { _, _ -> presenter.setScanlatorFilter(emptySet()) } .show().apply { @@ -200,7 +200,7 @@ class ChaptersSortBottomSheet(controller: MangaDetailsController) : presenter.setFilters( binding.chapterFilterLayout.showUnread.state, binding.chapterFilterLayout.showDownload.state, - binding.chapterFilterLayout.showBookmark.state + binding.chapterFilterLayout.showBookmark.state, ) checkIfFilterMatchesDefault(filterLayout) } @@ -233,7 +233,7 @@ class ChaptersSortBottomSheet(controller: MangaDetailsController) : binding.byUploadDate -> Manga.CHAPTER_SORTING_UPLOAD_DATE else -> Manga.CHAPTER_SORTING_SOURCE }, - state == SortTextView.State.DESCENDING + state == SortTextView.State.DESCENDING, ) checkIfSortMatchesDefault() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackHolder.kt index b0f9fc77d0..747212cd40 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackHolder.kt @@ -58,16 +58,16 @@ class TrackHolder(view: View, adapter: TrackAdapter) : BaseViewHolder(view) { with(binding.trackChapters) { text = when { track.total_chapters > 0 && track.last_chapter_read.toInt() == track.total_chapters -> context.getString( - R.string.all_chapters_read + R.string.all_chapters_read, ) track.total_chapters > 0 -> context.getString( R.string.chapter_x_of_y, track.last_chapter_read.toInt(), - track.total_chapters + track.total_chapters, ) track.last_chapter_read > 0 -> context.getString( R.string.chapter_, - track.last_chapter_read.toInt().toString() + track.last_chapter_read.toInt().toString(), ) else -> context.getString(R.string.not_started) } @@ -95,7 +95,7 @@ class TrackHolder(view: View, adapter: TrackAdapter) : BaseViewHolder(view) { 0, 0, starIcon(track), - 0 + 0, ) setTextColor(enabledTextColor(track.score != 0f)) TextViewCompat.setCompoundDrawableTintList(this, ColorStateList.valueOf(enabledTextColor(track.score != 0f))) @@ -134,7 +134,7 @@ class TrackHolder(view: View, adapter: TrackAdapter) : BaseViewHolder(view) { android.R.attr.textColorPrimary } else { android.R.attr.textColorHint - } + }, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackingBottomSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackingBottomSheet.kt index 2743ff0f23..fc99d5bef6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackingBottomSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackingBottomSheet.kt @@ -292,13 +292,13 @@ class TrackingBottomSheet(private val controller: MangaDetailsController) : TrackSearchItem(it).apply { isSelected = it.tracking_url == searchingItem?.track?.tracking_url } - } + }, ) if (results.isEmpty()) { setMiddleTrackView(binding.searchEmptyView.id) binding.searchEmptyView.show( R.drawable.ic_search_off_24dp, - R.string.no_results_found + R.string.no_results_found, ) } else { setMiddleTrackView(binding.trackSearchRecycler.id) @@ -319,7 +319,7 @@ class TrackingBottomSheet(private val controller: MangaDetailsController) : searchItemAdapter.clear() binding.searchEmptyView.show( R.drawable.ic_search_off_24dp, - error.message ?: "" + error.message ?: "", ) } @@ -337,9 +337,9 @@ class TrackingBottomSheet(private val controller: MangaDetailsController) : R.string.remove_x_from_service_and_add_y, ogTitle, activity.getString( - searchingItem.service.nameRes() + searchingItem.service.nameRes(), ), - newTitle + newTitle, ) val wordToSpan: Spannable = SpannableString(text) @@ -353,8 +353,8 @@ class TrackingBottomSheet(private val controller: MangaDetailsController) : val text2 = activity.getString( R.string.keep_both_on_service, activity.getString( - searchingItem.service.nameRes() - ) + searchingItem.service.nameRes(), + ), ) activity.materialAlertDialog() .setTitle(R.string.remove_previous_tracker) @@ -402,7 +402,7 @@ class TrackingBottomSheet(private val controller: MangaDetailsController) : .setNegativeButton(android.R.string.cancel, null) .setSingleChoiceItems( statusString.toTypedArray(), - selectedIndex + selectedIndex, ) { dialog, itemPosition -> setStatus(item, itemPosition) dialog.dismiss() @@ -424,8 +424,8 @@ class TrackingBottomSheet(private val controller: MangaDetailsController) : dialog.setMessage( activity.getString( R.string.cannot_remove_tracking_while_offline, - serviceName - ) + serviceName, + ), ) .setPositiveButton(R.string.remove) { _, _ -> removeTracker(item, false) @@ -433,7 +433,7 @@ class TrackingBottomSheet(private val controller: MangaDetailsController) : } else { dialog.addCheckBoxPrompt( activity.getString(R.string.remove_tracking_from_, serviceName), - true + true, ) .setPositiveButton(R.string.remove) { dialogI, _ -> removeTracker(item, dialogI.isPromptChecked) @@ -570,7 +570,7 @@ class TrackingBottomSheet(private val controller: MangaDetailsController) : when (readingDate) { ReadingDate.Start -> R.string.started_reading_date ReadingDate.Finish -> R.string.finished_reading_date - } + }, ) .setSelection(getCurrentDate(trackItem, readingDate, suggestedDate)?.timeInMillis).apply { } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MangaHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MangaHolder.kt index a153c0941a..b672ea2983 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MangaHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MangaHolder.kt @@ -13,7 +13,7 @@ import eu.kanade.tachiyomi.util.view.setCards class MangaHolder( view: View, adapter: FlexibleAdapter>, - showOutline: Boolean + showOutline: Boolean, ) : BaseFlexibleViewHolder(view, adapter) { private val binding = MangaListItemBinding.bind(view) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MangaItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MangaItem.kt index 4a891763ad..8f02ad9a71 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MangaItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MangaItem.kt @@ -22,7 +22,7 @@ class MangaItem(val manga: Manga) : AbstractFlexibleItem() { adapter: FlexibleAdapter>, holder: MangaHolder, position: Int, - payloads: MutableList? + payloads: MutableList?, ) { holder.bind(this) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationController.kt index d74ead2a4a..4f3d818d50 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationController.kt @@ -96,7 +96,7 @@ class MigrationController : PreMigrationController.navigateToMigration( Injekt.get().skipPreMigration().get(), router, - listOf(item.manga.id!!) + listOf(item.manga.id!!), ) } else if (item is SourceItem) { presenter.setSelectedSource(item.source) @@ -109,7 +109,7 @@ class MigrationController : launchUI { val manga = Injekt.get().getFavoriteMangas().asRxSingle().await( - Schedulers.io() + Schedulers.io(), ) val sourceMangas = manga.asSequence().filter { it.source == item.source.id }.map { it.id!! }.toList() @@ -117,7 +117,7 @@ class MigrationController : PreMigrationController.navigateToMigration( Injekt.get().skipPreMigration().get(), router, - sourceMangas + sourceMangas, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationMangaDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationMangaDialog.kt index 030dca3d7d..a28ec8d8df 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationMangaDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationMangaDialog.kt @@ -31,10 +31,10 @@ class MigrationMangaDialog(bundle: Bundle? = null) : DialogController(bundle) ( if (mangaSkipped > 0) " " + view?.context?.getString( R.string.skipping_, - mangaSkipped + mangaSkipped, ) else "" - ) + ), ) ?: "" return activity!!.materialAlertDialog() .setMessage(confirmString) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationPresenter.kt index c71d17656a..97aad95639 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationPresenter.kt @@ -18,7 +18,7 @@ import uy.kohesive.injekt.api.get class MigrationPresenter( private val sourceManager: SourceManager = Injekt.get(), private val db: DatabaseHelper = Injekt.get(), - val preferences: PreferencesHelper = Injekt.get() + val preferences: PreferencesHelper = Injekt.get(), ) : BasePresenter() { var state = ViewState() @@ -36,7 +36,7 @@ class MigrationPresenter( .doOnNext { state = state.copy(sourcesWithManga = findSourcesWithManga(it)) } .combineLatest( stateRelay.map { it.selectedSource } - .distinctUntilChanged() + .distinctUntilChanged(), ) { library, source -> library to source } .filter { (_, source) -> source != null }.observeOn(Schedulers.io()) .map { (library, source) -> libraryToMigrationItem(library, source!!.id) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SearchController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SearchController.kt index afacce0760..2a2f03629f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SearchController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SearchController.kt @@ -22,13 +22,13 @@ import uy.kohesive.injekt.injectLazy class SearchController( private var manga: Manga? = null, - private var sources: List? = null + private var sources: List? = null, ) : GlobalSearchController( manga?.originalTitle, bundle = bundleOf( OLD_MANGA to manga?.id, - SOURCES to sources?.map { it.id }?.toLongArray() - ) + SOURCES to sources?.map { it.id }?.toLongArray(), + ), ), BottomNavBarInterface { @@ -42,13 +42,13 @@ class SearchController( constructor(mangaId: Long, sources: LongArray) : this( Injekt.get().getManga(mangaId).executeAsBlocking(), - sources.map { Injekt.get().getOrStub(it) }.filterIsInstance() + sources.map { Injekt.get().getOrStub(it) }.filterIsInstance(), ) @Suppress("unused") constructor(bundle: Bundle) : this( bundle.getLong(OLD_MANGA), - bundle.getLongArray(SOURCES) ?: LongArray(0) + bundle.getLongArray(SOURCES) ?: LongArray(0), ) override fun createPresenter(): GlobalSearchPresenter { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SearchPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SearchPresenter.kt index bc6b3df80a..5f9a3bdd86 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SearchPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SearchPresenter.kt @@ -9,7 +9,7 @@ import eu.kanade.tachiyomi.ui.source.globalsearch.GlobalSearchPresenter class SearchPresenter( initialQuery: String? = "", private val manga: Manga, - sources: List? = null + sources: List? = null, ) : GlobalSearchPresenter(initialQuery, sourcesToUse = sources) { override fun getEnabledSources(): List { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SelectionHeader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SelectionHeader.kt index e26a2a4b09..f0e26d74b8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SelectionHeader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SelectionHeader.kt @@ -35,7 +35,7 @@ class SelectionHeader : AbstractHeaderItem() { adapter: FlexibleAdapter>, holder: Holder, position: Int, - payloads: MutableList? + payloads: MutableList?, ) { // Intentionally empty } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceItem.kt index 61a1e38e89..8a934afb57 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceItem.kt @@ -38,7 +38,7 @@ data class SourceItem(val source: Source, val header: SelectionHeader? = null) : adapter: FlexibleAdapter>, holder: SourceHolder, position: Int, - payloads: MutableList? + payloads: MutableList?, ) { holder.bind(this) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/ViewState.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/ViewState.kt index 0481ed6037..8f0dd4e1d0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/ViewState.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/ViewState.kt @@ -6,5 +6,5 @@ data class ViewState( val selectedSource: Source? = null, val mangaForSource: List = emptyList(), val sourcesWithManga: List = emptyList(), - val isReplacingManga: Boolean = false + val isReplacingManga: Boolean = false, ) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationBottomSheetDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationBottomSheetDialog.kt index 48f5130946..f778a88de1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationBottomSheetDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationBottomSheetDialog.kt @@ -26,7 +26,7 @@ import uy.kohesive.injekt.injectLazy class MigrationBottomSheetDialog( activity: Activity, - private val listener: StartMigrationListener + private val listener: StartMigrationListener, ) : E2EBottomSheetDialog(activity) { /** @@ -61,7 +61,7 @@ class MigrationBottomSheetDialog( setBottomEdge( if (activity.resources.configuration?.orientation == Configuration.ORIENTATION_LANDSCAPE) binding.extraSearchParamText else binding.skipStep, - activity + activity, ) } @@ -80,7 +80,7 @@ class MigrationBottomSheetDialog( listener.startMigration( binding.extraSearchParamText.text?.toString()?.takeIf { it.isNotBlank() && binding.extraSearchParam.isChecked - } + }, ) dismiss() } @@ -114,7 +114,7 @@ class MigrationBottomSheetDialog( binding.skipStep.setOnCheckedChangeListener { _, isChecked -> if (isChecked) (listener as? Controller)?.activity?.toast( R.string.to_show_again_setting_sources, - Toast.LENGTH_LONG + Toast.LENGTH_LONG, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceAdapter.kt index f2c990e7ac..ee1a4ff6b1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceAdapter.kt @@ -10,11 +10,11 @@ import uy.kohesive.injekt.injectLazy class MigrationSourceAdapter( var items: List, - controllerPre: PreMigrationController + controllerPre: PreMigrationController, ) : FlexibleAdapter( items, controllerPre, - true + true, ) { val isMultiLanguage = @@ -28,15 +28,15 @@ class MigrationSourceAdapter( ArrayList( currentItems.map { it.asParcelable() - } - ) + }, + ), ) } override fun onRestoreInstanceState(savedInstanceState: Bundle) { val sourceManager: SourceManager by injectLazy() savedInstanceState.getParcelableArrayList( - SELECTED_SOURCES_KEY + SELECTED_SOURCES_KEY, )?.let { updateDataSet(it.map { MigrationSourceItem.fromParcelable(sourceManager, it) }) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceItem.kt index 5b74c9ed2f..5bf50f3eb7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceItem.kt @@ -30,7 +30,7 @@ class MigrationSourceItem(val source: HttpSource, var sourceEnabled: Boolean) : adapter: FlexibleAdapter>, holder: MigrationSourceHolder, position: Int, - payloads: List? + payloads: List?, ) { holder.bind(source, sourceEnabled) } @@ -67,7 +67,7 @@ class MigrationSourceItem(val source: HttpSource, var sourceEnabled: Boolean) : return MigrationSourceItem( source, - si.sourceEnabled + si.sourceEnabled, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/PreMigrationController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/PreMigrationController.kt index df0515fc87..d551ddb8c3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/PreMigrationController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/PreMigrationController.kt @@ -57,7 +57,7 @@ class PreMigrationController(bundle: Bundle? = null) : val ourAdapter = adapter ?: MigrationSourceAdapter( getEnabledSources().map { MigrationSourceItem(it, isEnabled(it.id.toString())) }, - this + this, ) adapter = ourAdapter binding.recycler.layoutManager = LinearLayoutManager(view.context) @@ -76,7 +76,7 @@ class PreMigrationController(bundle: Bundle? = null) : // offset the binding.recycler by the binding.fab's inset + some inset on top v.updatePaddingRelative( bottom = insets.getInsets(systemBars()).bottom + binding.fab.marginBottom + - (binding.fab.height) + (binding.fab.height), ) } } @@ -86,7 +86,7 @@ class PreMigrationController(bundle: Bundle? = null) : dialog = MigrationBottomSheetDialog(activity!!, this) dialog?.show() val bottomSheet = dialog?.findViewById( - com.google.android.material.R.id.design_bottom_sheet + com.google.android.material.R.id.design_bottom_sheet, ) if (bottomSheet != null) { val behavior: BottomSheetBehavior<*> = BottomSheetBehavior.from(bottomSheet) @@ -107,9 +107,9 @@ class PreMigrationController(bundle: Bundle? = null) : MigrationListController.create( MigrationProcedureConfig( config.toList(), - extraSearchParams = extraParam - ) - ).withFadeTransaction().tag(MigrationListController.TAG) + extraSearchParams = extraParam, + ), + ).withFadeTransaction().tag(MigrationListController.TAG), ) } @@ -148,7 +148,7 @@ class PreMigrationController(bundle: Bundle? = null) : sources.filter { isEnabled(it.id.toString()) }.sortedBy { sourcesSaved.indexOf( it.id - .toString() + .toString(), ) } + sources.filterNot { isEnabled(it.id.toString()) } @@ -204,11 +204,11 @@ class PreMigrationController(bundle: Bundle? = null) : router.pushController( if (skipPre) { MigrationListController.create( - MigrationProcedureConfig(mangaIds, null) + MigrationProcedureConfig(mangaIds, null), ) } else { create(mangaIds) - }.withFadeTransaction().tag(if (skipPre) MigrationListController.TAG else null) + }.withFadeTransaction().tag(if (skipPre) MigrationListController.TAG else null), ) } @@ -216,7 +216,7 @@ class PreMigrationController(bundle: Bundle? = null) : return PreMigrationController( Bundle().apply { putLongArray(MANGA_IDS_EXTRA, mangaIds.toLongArray()) - } + }, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigratingManga.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigratingManga.kt index cd0fa70336..8eefca520c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigratingManga.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigratingManga.kt @@ -14,7 +14,7 @@ class MigratingManga( private val db: DatabaseHelper, private val sourceManager: SourceManager, val mangaId: Long, - parentContext: CoroutineContext + parentContext: CoroutineContext, ) { val searchResult = DeferredField() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt index 41409f855f..d8da325503 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt @@ -165,7 +165,7 @@ class MigrationListController(bundle: Bundle? = null) : try { val searchResult = smartSearchEngine.normalSearch( source, - mangaObj.title + mangaObj.title, ) if (searchResult != null && @@ -177,7 +177,7 @@ class MigrationListController(bundle: Bundle? = null) : val localManga = smartSearchEngine.networkToLocalManga( searchResult, - source.id + source.id, ) val chapters = source.getChapterList(localManga.toMangaInfo()).map { it.toSChapter() } @@ -186,7 +186,7 @@ class MigrationListController(bundle: Bundle? = null) : db, chapters, localManga, - source + source, ) } catch (e: Exception) { return@source null @@ -210,13 +210,13 @@ class MigrationListController(bundle: Bundle? = null) : val searchResult = try { val searchResult = smartSearchEngine.normalSearch( source, - mangaObj.title + mangaObj.title, ) if (searchResult != null) { val localManga = smartSearchEngine.networkToLocalManga( searchResult, - source.id + source.id, ) val chapters = try { source.getChapterList(localManga.toMangaInfo()).map { it.toSChapter() } @@ -308,8 +308,8 @@ class MigrationListController(bundle: Bundle? = null) : res.getQuantityString( R.plurals.manga_migrated, manaulMigrations, - manaulMigrations - ) + manaulMigrations, + ), ) } router.popCurrentController() @@ -455,7 +455,7 @@ class MigrationListController(bundle: Bundle? = null) : menuMigrate.icon = VectorDrawableCompat.create( resources!!, R.drawable.ic_done_24dp, - null + null, ) } @@ -477,13 +477,13 @@ class MigrationListController(bundle: Bundle? = null) : this, true, totalManga, - mangaSkipped + mangaSkipped, ).showDialog(router) R.id.action_migrate_manga -> MigrationMangaDialog( this, false, totalManga, - mangaSkipped + mangaSkipped, ).showDialog(router) else -> return super.onOptionsItemSelected(item) } @@ -512,7 +512,7 @@ class MigrationListController(bundle: Bundle? = null) : return MigrationListController( Bundle().apply { putParcelable(CONFIG_EXTRA, config) - } + }, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcedureConfig.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcedureConfig.kt index 1c26143d25..a170a17eda 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcedureConfig.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcedureConfig.kt @@ -6,5 +6,5 @@ import kotlinx.android.parcel.Parcelize @Parcelize data class MigrationProcedureConfig( var mangaIds: List, - val extraSearchParams: String? + val extraSearchParams: String?, ) : Parcelable diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessAdapter.kt index f24075fc32..50c833d495 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessAdapter.kt @@ -22,7 +22,7 @@ import uy.kohesive.injekt.injectLazy import java.util.Date class MigrationProcessAdapter( - val controller: MigrationListController + val controller: MigrationListController, ) : FlexibleAdapter(null, controller, true) { private val db: DatabaseHelper by injectLazy() @@ -82,7 +82,7 @@ class MigrationProcessAdapter( source, prevManga, toMangaObj, - !copy + !copy, ) } } @@ -105,7 +105,7 @@ class MigrationProcessAdapter( source, prevManga, toMangaObj, - !copy + !copy, ) } removeManga(position) @@ -126,7 +126,7 @@ class MigrationProcessAdapter( source: Source, prevManga: Manga, manga: Manga, - replace: Boolean + replace: Boolean, ) { if (controller.config == null) return val flags = preferences.migrateFlags().get() @@ -143,7 +143,7 @@ class MigrationProcessAdapter( source: Source, prevManga: Manga, manga: Manga, - replace: Boolean + replace: Boolean, ) { // Update chapters read if (MigrationFlags.hasChapters(flags)) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessHolder.kt index f96af84617..bfa7d31786 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessHolder.kt @@ -29,7 +29,7 @@ import java.text.DecimalFormat class MigrationProcessHolder( private val view: View, - private val adapter: MigrationProcessAdapter + private val adapter: MigrationProcessAdapter, ) : BaseFlexibleViewHolder(view, adapter) { private val db: DatabaseHelper by injectLazy() @@ -59,11 +59,11 @@ class MigrationProcessHolder( binding.migrationMenu.setVectorCompat( R.drawable.ic_more_vert_24dp, - R.attr.colorOnBackground + R.attr.colorOnBackground, ) binding.skipManga.setVectorCompat( R.drawable.ic_close_24dp, - R.attr.colorOnBackground + R.attr.colorOnBackground, ) binding.migrationMenu.isInvisible = true binding.skipManga.isVisible = true @@ -75,8 +75,8 @@ class MigrationProcessHolder( adapter.controller.router.pushController( MangaDetailsController( manga, - true - ).withFadeTransaction() + true, + ).withFadeTransaction(), ) } } @@ -108,8 +108,8 @@ class MigrationProcessHolder( adapter.controller.router.pushController( MangaDetailsController( searchResult, - true - ).withFadeTransaction() + true, + ).withFadeTransaction(), ) } } else { @@ -164,12 +164,12 @@ class MigrationProcessHolder( if (latestChapter > 0f) { subtitle.text = root.context.getString( R.string.latest_, - DecimalFormat("#.#").format(latestChapter) + DecimalFormat("#.#").format(latestChapter), ) } else { subtitle.text = root.context.getString( R.string.latest_, - root.context.getString(R.string.unknown) + root.context.getString(R.string.unknown), ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessItem.kt index df77a57cc5..2ada43d23b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessItem.kt @@ -22,7 +22,7 @@ class MigrationProcessItem(val manga: MigratingManga) : adapter: FlexibleAdapter>, holder: MigrationProcessHolder, position: Int, - payloads: MutableList? + payloads: MutableList?, ) { holder.bind(this) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt index 565333d399..e94c1d00fd 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt @@ -71,7 +71,7 @@ class AboutController : SettingsController() { "https://github.com/Jays2Kings/tachiyomiJ2K/commits/master" } else { RELEASE_URL - }.toUri() + }.toUri(), ) startActivity(intent) } @@ -186,7 +186,7 @@ class AboutController : SettingsController() { putString(BODY_KEY, body) putString(URL_KEY, url) putBoolean(IS_BETA, isBeta == true) - } + }, ) override fun onCreateDialog(savedViewState: Bundle?): Dialog { @@ -202,7 +202,7 @@ class AboutController : SettingsController() { R.string.new_beta_version_available } else { R.string.new_version_available - } + }, ) .setMessage(info) .setPositiveButton(if (isOnA12) R.string.update else R.string.download) { _, _ -> diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/OverflowDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/OverflowDialog.kt index 2c49e81273..e79e09ea2a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/OverflowDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/OverflowDialog.kt @@ -32,8 +32,8 @@ class OverflowDialog(activity: MainActivity) : Dialog(activity, R.style.Overflow ColorUtils.blendARGB( activity.getResourceColor(R.attr.background), activity.getResourceColor(R.attr.colorSecondary), - 0.075f - ) + 0.075f, + ), ) binding.touchOutside.setOnClickListener { cancel() @@ -43,13 +43,13 @@ class OverflowDialog(activity: MainActivity) : Dialog(activity, R.style.Overflow val titleText = context.getString( if (preferences.incognitoMode().get()) R.string.turn_off_ else R.string.turn_on_, - incogText + incogText, ) val subtitleText = context.getString(R.string.pauses_reading_history) text = titleText.withSubtitle(context, subtitleText) setIcon( if (preferences.incognitoMode().get()) R.drawable.ic_incognito_24dp - else R.drawable.ic_glasses_24dp + else R.drawable.ic_glasses_24dp, ) setOnClickListener { preferences.incognitoMode().toggle() @@ -57,13 +57,13 @@ class OverflowDialog(activity: MainActivity) : Dialog(activity, R.style.Overflow val newTitle = context.getString( if (incog) R.string.turn_off_ else R.string.turn_on_, - incogText + incogText, ) text = newTitle.withSubtitle(context, subtitleText) val drawable = AnimatedVectorDrawableCompat.create( context, if (incog) R.drawable.anim_read_to_incog - else R.drawable.anim_incog_to_read + else R.drawable.anim_incog_to_read, ) setIcon(drawable) (getIcon() as? AnimatedVectorDrawableCompat)?.start() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/PageIndicatorTextView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/PageIndicatorTextView.kt index d3f4db747c..10fc8603ff 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/PageIndicatorTextView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/PageIndicatorTextView.kt @@ -15,7 +15,7 @@ import eu.kanade.tachiyomi.widget.OutlineSpan */ class PageIndicatorTextView( context: Context, - attrs: AttributeSet? = null + attrs: AttributeSet? = null, ) : AppCompatTextView(context, attrs) { init { @@ -48,7 +48,7 @@ class PageIndicatorTextView( // A span object with text outlining properties val spanOutline = OutlineSpan( strokeColor = strokeColor, - strokeWidth = 4f + strokeWidth = 4f, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt index daa5e55e52..66db573de2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt @@ -223,7 +223,7 @@ class ReaderActivity : BaseRxActivity() { val intent = newIntent(activity, manga, chapter) intent.putExtra(TRANSITION_NAME, sharedElement.transitionName) val activityOptions = ActivityOptionsCompat.makeSceneTransitionAnimation( - activity, sharedElement, sharedElement.transitionName + activity, sharedElement, sharedElement.transitionName, ) return intent to activityOptions.toBundle() } @@ -263,7 +263,7 @@ class ReaderActivity : BaseRxActivity() { binding.appBar.setBackgroundColor(contextCompatColor(R.color.surface_alpha)) ViewCompat.setBackgroundTintList( binding.readerNav.root, - ColorStateList.valueOf(contextCompatColor(R.color.surface_alpha)) + ColorStateList.valueOf(contextCompatColor(R.color.surface_alpha)), ) if (presenter.needsInit()) { @@ -348,7 +348,7 @@ class ReaderActivity : BaseRxActivity() { (viewer as? PagerViewer)?.config?.let { config -> val icon = ContextCompat.getDrawable( this, - if ((!config.shiftDoublePage).xor(viewer is R2LPagerViewer)) R.drawable.ic_page_previous_outline_24dp else R.drawable.ic_page_next_outline_24dp + if ((!config.shiftDoublePage).xor(viewer is R2LPagerViewer)) R.drawable.ic_page_previous_outline_24dp else R.drawable.ic_page_next_outline_24dp, ) splitItem?.icon = icon binding.chaptersSheet.shiftPageButton.setImageDrawable(icon) @@ -381,8 +381,8 @@ class ReaderActivity : BaseRxActivity() { isDoublePage -> R.drawable.ic_book_open_variant_24dp (viewer as? PagerViewer)?.config?.splitPages == true -> R.drawable.ic_book_open_split_24dp else -> R.drawable.ic_single_page_24dp - } - ) + }, + ), ) with(binding.readerNav) { listOf(leftPageText, rightPageText).forEach { @@ -422,7 +422,7 @@ class ReaderActivity : BaseRxActivity() { compatToolTipText = getString( if (enabled) R.string.remove_crop - else R.string.crop_borders + else R.string.crop_borders, ) } } @@ -567,7 +567,7 @@ class ReaderActivity : BaseRxActivity() { duration = ( resources?.getInteger( if (entering) android.R.integer.config_longAnimTime - else android.R.integer.config_mediumAnimTime + else android.R.integer.config_mediumAnimTime, ) ?: 500 ).toLong() addTarget(android.R.id.content) @@ -583,7 +583,7 @@ class ReaderActivity : BaseRxActivity() { setSupportActionBar(binding.toolbar) val primaryColor = ColorUtils.setAlphaComponent( getResourceColor(R.attr.colorSurface), - 200 + 200, ) binding.appBar.setBackgroundColor(primaryColor) window.statusBarColor = Color.TRANSPARENT @@ -695,7 +695,7 @@ class ReaderActivity : BaseRxActivity() { R.string.theres_no_next_chapter } else { R.string.theres_no_previous_chapter - } + }, ) } } @@ -718,7 +718,7 @@ class ReaderActivity : BaseRxActivity() { R.string.theres_no_next_chapter } else { R.string.theres_no_previous_chapter - } + }, ) } } @@ -742,7 +742,8 @@ class ReaderActivity : BaseRxActivity() { override fun onStopTrackingTouch(slider: Slider) { } - }) + }, + ) listOf(root, leftChapter, rightChapter, pageSeekbar).forEach { it.setOnTouchListener { _, event -> val result = gestureDetector.onTouchEvent(event) @@ -849,7 +850,7 @@ class ReaderActivity : BaseRxActivity() { max( 0, (rootInsets.getBottomGestureInsets()) - - rootInsets.getInsetsIgnoringVisibility(systemBars()).bottom + rootInsets.getInsetsIgnoringVisibility(systemBars()).bottom, ) } binding.chaptersSheet.chapterRecycler.updatePaddingRelative(bottom = systemInsets.bottom) @@ -880,7 +881,7 @@ class ReaderActivity : BaseRxActivity() { isInNightMode() -> { ColorUtils.setAlphaComponent( getResourceColor(R.attr.colorPrimaryVariant), - 179 + 179, ) } else -> Color.argb(179, 0, 0, 0) @@ -965,7 +966,7 @@ class ReaderActivity : BaseRxActivity() { override fun onAnimationStart(animation: Animation) { window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) } - } + }, ) binding.appBar.startAnimation(toolbarAnimation) } @@ -984,7 +985,7 @@ class ReaderActivity : BaseRxActivity() { override fun onAnimationEnd(animation: Animation) { binding.readerMenu.isVisible = false } - } + }, ) binding.appBar.startAnimation(toolbarAnimation) BottomSheetBehavior.from(binding.chaptersSheet.chaptersBottomSheet).isHideable = true @@ -1024,10 +1025,10 @@ class ReaderActivity : BaseRxActivity() { ReadingModeType.VERTICAL.flagValue -> R.string.vertical_viewer ReadingModeType.WEBTOON.flagValue -> R.string.webtoon_style else -> R.string.left_to_right_viewer - } - ).lowercase(Locale.getDefault()) + }, + ).lowercase(Locale.getDefault()), ), - 4000 + 4000, ) { setAction(R.string.use_default) { presenter.setMangaReadingMode(0) @@ -1075,7 +1076,7 @@ class ReaderActivity : BaseRxActivity() { Color.BLACK } else { getResourceColor(R.attr.background) - } + }, ) binding.toolbar.title = manga.title @@ -1273,61 +1274,61 @@ class ReaderActivity : BaseRxActivity() { MaterialMenuSheet.MenuSheetItem( 3, R.drawable.ic_outline_share_24dp, - R.string.share_second_page + R.string.share_second_page, ), MaterialMenuSheet.MenuSheetItem( 4, R.drawable.ic_outline_save_24dp, - R.string.save_second_page + R.string.save_second_page, ), MaterialMenuSheet.MenuSheetItem( 5, R.drawable.ic_outline_photo_24dp, - R.string.set_second_page_as_cover + R.string.set_second_page_as_cover, ), MaterialMenuSheet.MenuSheetItem( 0, R.drawable.ic_share_24dp, - R.string.share_first_page + R.string.share_first_page, ), MaterialMenuSheet.MenuSheetItem( 1, R.drawable.ic_save_24dp, - R.string.save_first_page + R.string.save_first_page, ), MaterialMenuSheet.MenuSheetItem( 2, R.drawable.ic_photo_24dp, - R.string.set_first_page_as_cover + R.string.set_first_page_as_cover, ), MaterialMenuSheet.MenuSheetItem( 6, R.drawable.ic_share_all_outline_24dp, - R.string.share_combined_pages + R.string.share_combined_pages, ), MaterialMenuSheet.MenuSheetItem( 7, R.drawable.ic_save_all_outline_24dp, - R.string.save_combined_pages - ) + R.string.save_combined_pages, + ), ) } else { listOf( MaterialMenuSheet.MenuSheetItem( 0, R.drawable.ic_share_24dp, - R.string.share + R.string.share, ), MaterialMenuSheet.MenuSheetItem( 1, R.drawable.ic_save_24dp, - R.string.save + R.string.save, ), MaterialMenuSheet.MenuSheetItem( 2, R.drawable.ic_photo_24dp, - R.string.set_as_cover - ) + R.string.set_as_cover, + ), ) } MaterialMenuSheet(this, items) { _, item -> @@ -1425,7 +1426,7 @@ class ReaderActivity : BaseRxActivity() { } val text = "${manga.title}: ${getString( R.string.chapter_, - decimalFormat.format(chapter.chapter_number) + decimalFormat.format(chapter.chapter_number), )}, $pageNumber" val stream = file.getUriCompat(this) @@ -1486,7 +1487,7 @@ class ReaderActivity : BaseRxActivity() { Success -> R.string.cover_updated AddToLibraryFirst -> R.string.must_be_in_library_to_edit Error -> R.string.failed_to_update_cover - } + }, ) } @@ -1511,7 +1512,7 @@ class ReaderActivity : BaseRxActivity() { 255 } else { 179 - } + }, ) } binding.readerMenu.isVisible = true @@ -1521,7 +1522,7 @@ class ReaderActivity : BaseRxActivity() { override fun onAnimationStart(animation: Animation) { window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) } - } + }, ) binding.appBar.startAnimation(toolbarAnimation) } @@ -1588,7 +1589,7 @@ class ReaderActivity : BaseRxActivity() { applicationContext, source.id, chapterUrl, - presenter.manga!!.title + presenter.manga!!.title, ) startActivity(intent) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderColorFilterView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderColorFilterView.kt index 4468ed32d3..24ddc3490a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderColorFilterView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderColorFilterView.kt @@ -10,7 +10,7 @@ import android.view.View class ReaderColorFilterView( context: Context, - attrs: AttributeSet? = null + attrs: AttributeSet? = null, ) : View(context, attrs) { private val colorFilterPaint: Paint = Paint() @@ -25,7 +25,7 @@ class ReaderColorFilterView( 4 -> PorterDuff.Mode.LIGHTEN 5 -> PorterDuff.Mode.DARKEN else -> PorterDuff.Mode.SRC_OVER - } + }, ) invalidate() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderNavGestureDetector.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderNavGestureDetector.kt index 155bbb2c31..5ad2b7b2af 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderNavGestureDetector.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderNavGestureDetector.kt @@ -22,7 +22,7 @@ class ReaderNavGestureDetector(private val activity: ReaderActivity) : GestureDe e1: MotionEvent?, e2: MotionEvent?, distanceX: Float, - distanceY: Float + distanceY: Float, ): Boolean { val newDistanceX = (e1?.rawX ?: 0f) - (e2?.rawX ?: 0f) val newDistanceY = (e1?.rawY ?: 0f) - (e2?.rawY ?: 0f) @@ -39,7 +39,7 @@ class ReaderNavGestureDetector(private val activity: ReaderActivity) : GestureDe e1: MotionEvent, e2: MotionEvent, velocityX: Float, - velocityY: Float + velocityY: Float, ): Boolean { var result = false val diffY = e2.y - e1.y diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt index 23dd0d9c77..750d250d8f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt @@ -69,7 +69,7 @@ class ReaderPresenter( private val downloadManager: DownloadManager = Injekt.get(), private val coverCache: CoverCache = Injekt.get(), private val preferences: PreferencesHelper = Injekt.get(), - private val chapterFilter: ChapterFilter = Injekt.get() + private val chapterFilter: ChapterFilter = Injekt.get(), ) : BasePresenter() { /** @@ -219,7 +219,7 @@ class ReaderPresenter( { _, _ -> // Ignore onNext event }, - ReaderActivity::setInitialChapterError + ReaderActivity::setInitialChapterError, ) } @@ -231,12 +231,12 @@ class ReaderPresenter( chapterSort.getChaptersSorted( dbChapters, filterForReader = true, - currentChapter = getCurrentChapter()?.chapter + currentChapter = getCurrentChapter()?.chapter, ).map { ReaderChapterItem( it, manga, - it.id == getCurrentChapter()?.chapter?.id ?: chapterId + it.id == getCurrentChapter()?.chapter?.id ?: chapterId, ) } } @@ -259,7 +259,7 @@ class ReaderPresenter( NotificationReceiver.dismissNotification( preferences.context, manga.id!!.hashCode(), - Notifications.ID_NEW_CHAPTERS + Notifications.ID_NEW_CHAPTERS, ) val source = sourceManager.getOrStub(manga.source) @@ -280,7 +280,7 @@ class ReaderPresenter( { _, _ -> // Ignore onNext event }, - ReaderActivity::setInitialChapterError + ReaderActivity::setInitialChapterError, ) } @@ -293,7 +293,7 @@ class ReaderPresenter( */ private fun getLoadObservable( loader: ChapterLoader, - chapter: ReaderChapter + chapter: ReaderChapter, ): Observable { return loader.loadChapter(chapter) .andThen( @@ -303,9 +303,9 @@ class ReaderPresenter( ViewerChapters( chapter, chapterList.getOrNull(chapterPos - 1), - chapterList.getOrNull(chapterPos + 1) + chapterList.getOrNull(chapterPos + 1), ) - } + }, ) .observeOn(AndroidSchedulers.mainThread()) .doOnNext { newChapters -> @@ -328,7 +328,7 @@ class ReaderPresenter( fun intentPageNumber(url: Uri): Int? { val host = url.host ?: return null val delegatedSource = sourceManager.getDelegatedSource(host) ?: error( - preferences.context.getString(R.string.source_not_installed) + preferences.context.getString(R.string.source_not_installed), ) return delegatedSource.pageNumber(url)?.minus(1) } @@ -336,11 +336,11 @@ class ReaderPresenter( suspend fun loadChapterURL(url: Uri) { val host = url.host ?: return val delegatedSource = sourceManager.getDelegatedSource(host) ?: error( - preferences.context.getString(R.string.source_not_installed) + preferences.context.getString(R.string.source_not_installed), ) val chapterUrl = delegatedSource.chapterUrl(url) val sourceId = delegatedSource.delegate?.id ?: error( - preferences.context.getString(R.string.source_not_installed) + preferences.context.getString(R.string.source_not_installed), ) if (chapterUrl != null) { val dbChapter = db.getChapters(chapterUrl).executeOnIO().find { @@ -382,14 +382,14 @@ class ReaderPresenter( db, chapters, manga, - delegatedSource.delegate!! + delegatedSource.delegate!!, ).first chapterId = newChapters.find { it.url == chapter.url }?.id ?: error(preferences.context.getString(R.string.chapter_not_found)) } else { chapter.date_fetch = Date().time chapterId = db.insertChapter(chapter).executeOnIO().insertedId() ?: error( - preferences.context.getString(R.string.unknown_error) + preferences.context.getString(R.string.unknown_error), ) } withContext(Dispatchers.Main) { @@ -437,7 +437,7 @@ class ReaderPresenter( }, { _, _ -> // Ignore onError event, viewers handle that state - } + }, ) } @@ -709,7 +709,7 @@ class ReaderPresenter( view.setManga(manga) view.setChapters(currChapters) } - }) + },) } /** @@ -739,7 +739,7 @@ class ReaderPresenter( if (currChapters != null) { view.setOrientation(getMangaOrientationType()) } - }) + },) } /** @@ -755,7 +755,7 @@ class ReaderPresenter( // Build destination file. val filename = DiskUtil.buildValidFilename( - "${manga.title} - ${chapter.name}".take(225) + "${manga.title} - ${chapter.name}".take(225), ) + " - ${page.number}.${type.extension}" val destFile = File(directory, filename) @@ -788,7 +788,7 @@ class ReaderPresenter( // Build destination file. val filename = DiskUtil.buildValidFilename( - "${manga.title} - ${chapter.name}".take(225) + "${manga.title} - ${chapter.name}".take(225), ) + " - ${page1.number}-${page2.number}.jpg" val destFile = File(directory, filename) @@ -834,7 +834,7 @@ class ReaderPresenter( .observeOn(AndroidSchedulers.mainThread()) .subscribeFirst( { view, file -> view.onSaveImageResult(SaveImageResult.Success(file)) }, - { view, error -> view.onSaveImageResult(SaveImageResult.Error(error)) } + { view, error -> view.onSaveImageResult(SaveImageResult.Error(error)) }, ) } @@ -889,7 +889,7 @@ class ReaderPresenter( .observeOn(AndroidSchedulers.mainThread()) .subscribeFirst( { view, file -> view.onShareImageResult(file, page) }, - { _, _ -> /* Empty */ } + { _, _ -> /* Empty */ }, ) } @@ -941,7 +941,7 @@ class ReaderPresenter( .observeOn(AndroidSchedulers.mainThread()) .subscribeFirst( { view, result -> view.onSetAsCoverResult(result) }, - { view, _ -> view.onSetAsCoverResult(SetAsCoverResult.Error) } + { view, _ -> view.onSetAsCoverResult(SetAsCoverResult.Error) }, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSlider.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSlider.kt index 2e8c0526ea..ac9badf9e8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSlider.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSlider.kt @@ -11,7 +11,7 @@ import com.google.android.material.slider.Slider */ class ReaderSlider @JvmOverloads constructor( context: Context, - attrs: AttributeSet? = null + attrs: AttributeSet? = null, ) : Slider(context, attrs) { /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt index 163f742b86..416a649d51 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt @@ -49,7 +49,7 @@ class SaveImageNotifier(private val context: Context) { } else { onError(null) } - } + }, ).build() Coil.imageLoader(context).enqueue(request) } @@ -70,13 +70,13 @@ class SaveImageNotifier(private val context: Context) { addAction( R.drawable.ic_share_24dp, context.getString(R.string.share), - NotificationReceiver.shareImagePendingBroadcast(context, file.absolutePath, notificationId) + NotificationReceiver.shareImagePendingBroadcast(context, file.absolutePath, notificationId), ) // Delete action addAction( R.drawable.ic_delete_24dp, context.getString(R.string.delete), - NotificationReceiver.deleteImagePendingBroadcast(context, file.absolutePath, notificationId) + NotificationReceiver.deleteImagePendingBroadcast(context, file.absolutePath, notificationId), ) updateNotification() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterItem.kt index 4360fc849e..8cc4b67386 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterItem.kt @@ -67,7 +67,7 @@ class ReaderChapterItem(val chapter: Chapter, val manga: Manga, val isCurrent: B binding.bookmarkImage.setImageResource( if (item.bookmark) R.drawable.ic_bookmark_24dp - else R.drawable.ic_bookmark_border_24dp + else R.drawable.ic_bookmark_border_24dp, ) val drawableColor = ChapterUtil.bookmarkColor(itemView.context, item) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterSheet.kt index a77ab91fb3..091a4081d7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterSheet.kt @@ -61,7 +61,7 @@ class ReaderChapterSheet @JvmOverloads constructor(context: Context, attrs: Attr if (hasLightNav) { fullPrimary } else Color.BLACK, - 200 + 200, ) sheetBehavior = BottomSheetBehavior.from(this) binding.chaptersButton.setOnClickListener { @@ -103,7 +103,7 @@ class ReaderChapterSheet @JvmOverloads constructor(context: Context, attrs: Attr sheetBehavior?.isHideable = false (binding.chapterRecycler.layoutManager as LinearLayoutManager).scrollToPositionWithOffset( adapter?.getPosition(presenter.getCurrentChapter()?.chapter?.id ?: 0L) ?: 0, - binding.chapterRecycler.height / 2 - 30.dpToPx + binding.chapterRecycler.height / 2 - 30.dpToPx, ) if (canShowNav) { activity.binding.readerNav.root.isVisible = true @@ -132,7 +132,7 @@ class ReaderChapterSheet @JvmOverloads constructor(context: Context, attrs: Attr binding.chapterRecycler.isClickable = state == BottomSheetBehavior.STATE_EXPANDED binding.chapterRecycler.isFocusable = state == BottomSheetBehavior.STATE_EXPANDED } - } + }, ) adapter = FastAdapter.with(itemAdapter) @@ -168,19 +168,19 @@ class ReaderChapterSheet @JvmOverloads constructor(context: Context, attrs: Attr v: View, position: Int, fastAdapter: FastAdapter, - item: ReaderChapterItem + item: ReaderChapterItem, ) { if (!activity.isLoading && sheetBehavior.isExpanded()) { presenter.toggleBookmark(item.chapter) refreshList() } } - } + }, ) backgroundTintList = ColorStateList.valueOf( if (!sheetBehavior.isExpanded()) primary - else fullPrimary + else fullPrimary, ) binding.chapterRecycler.addOnScrollListener(object : RecyclerView.OnScrollListener() { @@ -194,7 +194,8 @@ class ReaderChapterSheet @JvmOverloads constructor(context: Context, attrs: Attr sheetBehavior?.isDraggable = !recyclerView.canScrollVertically(-1) } } - }) + }, + ) binding.chapterRecycler.layoutManager = LinearLayoutManager(context) refreshList() @@ -216,7 +217,7 @@ class ReaderChapterSheet @JvmOverloads constructor(context: Context, attrs: Attr (binding.chapterRecycler.layoutManager as LinearLayoutManager).scrollToPositionWithOffset( adapter?.getPosition(presenter.getCurrentChapter()?.chapter?.id ?: 0L) ?: 0, - binding.chapterRecycler.height / 2 - 30.dpToPx + binding.chapterRecycler.height / 2 - 30.dpToPx, ) } } @@ -227,7 +228,7 @@ class ReaderChapterSheet @JvmOverloads constructor(context: Context, attrs: Attr lerpColorCalc(Color.alpha(colorStart), Color.alpha(colorEnd), perc), lerpColorCalc(Color.red(colorStart), Color.red(colorEnd), perc), lerpColorCalc(Color.green(colorStart), Color.green(colorEnd), perc), - lerpColorCalc(Color.blue(colorStart), Color.blue(colorEnd), perc) + lerpColorCalc(Color.blue(colorStart), Color.blue(colorEnd), perc), ) } @@ -235,7 +236,7 @@ class ReaderChapterSheet @JvmOverloads constructor(context: Context, attrs: Attr return ( min(colorStart, colorEnd) * (100 - percent) + max( colorStart, - colorEnd + colorEnd, ) * percent ) / 100 } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt index 1b8c7a0080..264f136954 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt @@ -19,7 +19,7 @@ import timber.log.Timber class ChapterLoader( private val downloadManager: DownloadManager, private val manga: Manga, - private val source: Source + private val source: Source, ) { /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/DownloadPageLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/DownloadPageLoader.kt index dacbea150e..e86728dbcd 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/DownloadPageLoader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/DownloadPageLoader.kt @@ -23,7 +23,7 @@ class DownloadPageLoader( private val chapter: ReaderChapter, private val manga: Manga, private val source: Source, - private val downloadManager: DownloadManager + private val downloadManager: DownloadManager, ) : PageLoader() { /** @@ -75,7 +75,7 @@ class DownloadPageLoader( { context.contentResolver.openInputStream(page.uri ?: Uri.EMPTY)!! - } + }, ).apply { status = Page.READY } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/EpubPageLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/EpubPageLoader.kt index 99764ac7b1..611d21882c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/EpubPageLoader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/EpubPageLoader.kt @@ -49,7 +49,7 @@ class EpubPageLoader(file: File) : PageLoader() { Page.ERROR } else { Page.READY - } + }, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt index 951c7d329b..f4421deaea 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt @@ -33,7 +33,7 @@ import kotlin.math.min class HttpPageLoader( private val chapter: ReaderChapter, private val source: HttpSource, - private val chapterCache: ChapterCache = Injekt.get() + private val chapterCache: ChapterCache = Injekt.get(), ) : PageLoader() { /** @@ -66,7 +66,7 @@ class HttpPageLoader( if (error !is InterruptedException) { Timber.e(error) } - } + }, ) } @@ -182,7 +182,7 @@ class HttpPageLoader( */ private class PriorityPage( val page: ReaderPage, - val priority: Int + val priority: Int, ) : Comparable { companion object { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/RarPageLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/RarPageLoader.kt index 01c7a632e0..d6fdbb7cb6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/RarPageLoader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/RarPageLoader.kt @@ -65,7 +65,7 @@ class RarPageLoader(file: File) : PageLoader() { Page.ERROR } else { Page.READY - } + }, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ZipPageLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ZipPageLoader.kt index 46cf79c86a..379fe2a776 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ZipPageLoader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ZipPageLoader.kt @@ -54,7 +54,7 @@ class ZipPageLoader(file: File) : PageLoader() { Page.ERROR } else { Page.READY - } + }, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/ChapterTransition.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/ChapterTransition.kt index 47da72bf52..63d26137b3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/ChapterTransition.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/ChapterTransition.kt @@ -7,11 +7,11 @@ sealed class ChapterTransition { class Prev( override val from: ReaderChapter, - override val to: ReaderChapter? + override val to: ReaderChapter?, ) : ChapterTransition() class Next( override val from: ReaderChapter, - override val to: ReaderChapter? + override val to: ReaderChapter?, ) : ChapterTransition() override fun equals(other: Any?): Boolean { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/InsertPage.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/InsertPage.kt index 50da2d4480..970dec5238 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/InsertPage.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/InsertPage.kt @@ -3,7 +3,7 @@ package eu.kanade.tachiyomi.ui.reader.model class InsertPage(parent: ReaderPage) : ReaderPage( parent.index, parent.url, - parent.imageUrl + parent.imageUrl, ) { override var chapter: ReaderChapter = parent.chapter diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/ReaderPage.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/ReaderPage.kt index 33b89dba8a..01925ef38b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/ReaderPage.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/ReaderPage.kt @@ -16,7 +16,7 @@ open class ReaderPage( /** Value to check if a page is can be doubled up, but can't because the next page is too wide */ var isolatedPage: Boolean = false, var firstHalf: Boolean? = null, - var longPage: Boolean? = null + var longPage: Boolean? = null, ) : Page(index, url, imageUrl, null) { open lateinit var chapter: ReaderChapter diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/ViewerChapters.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/ViewerChapters.kt index 9d43048409..6fb5905c33 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/ViewerChapters.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/ViewerChapters.kt @@ -3,7 +3,7 @@ package eu.kanade.tachiyomi.ui.reader.model data class ViewerChapters( val currChapter: ReaderChapter, val prevChapter: ReaderChapter?, - val nextChapter: ReaderChapter? + val nextChapter: ReaderChapter?, ) { fun ref() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/PageLayout.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/PageLayout.kt index 8622a4a0d6..af5a5a62b5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/PageLayout.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/PageLayout.kt @@ -7,7 +7,7 @@ enum class PageLayout( val value: Int, val webtoonValue: Int, @StringRes val stringRes: Int, - @StringRes private val _fullStringRes: Int? = null + @StringRes private val _fullStringRes: Int? = null, ) { SINGLE_PAGE(0, 0, R.string.single_page), DOUBLE_PAGES(1, 2, R.string.double_pages), diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/ReaderBottomButton.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/ReaderBottomButton.kt index 4b31266e13..f716da6410 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/ReaderBottomButton.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/ReaderBottomButton.kt @@ -21,7 +21,7 @@ enum class ReaderBottomButton(val value: String, @StringRes val stringRes: Int) ViewChapters, WebView, PageLayout, - CropBordersWebtoon + CropBordersWebtoon, ).map { it.value }.toSet() } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/ReaderGeneralView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/ReaderGeneralView.kt index a0498b27df..08946cda7d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/ReaderGeneralView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/ReaderGeneralView.kt @@ -27,7 +27,7 @@ class ReaderGeneralView @JvmOverloads constructor(context: Context, attrs: Attri binding.viewerSeries.setSelection( (context as? ReaderActivity)?.presenter?.manga?.readingModeType?.let { ReadingModeType.fromPreference(it).prefValue - } ?: 0 + } ?: 0, ) binding.rotationMode.onItemSelectedListener = { position -> val rotationType = OrientationType.fromSpinner(position) @@ -36,7 +36,7 @@ class ReaderGeneralView @JvmOverloads constructor(context: Context, attrs: Attri binding.rotationMode.setSelection( (context as ReaderActivity).presenter.manga?.orientationType?.let { OrientationType.fromPreference(it).prefValue - } ?: 0 + } ?: 0, ) binding.backgroundColor.bindToPreference(preferences.readerTheme(), 0) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/ReaderPagedView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/ReaderPagedView.kt index 67f15da257..4b4d105369 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/ReaderPagedView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/ReaderPagedView.kt @@ -48,7 +48,7 @@ class ReaderPagedView @JvmOverloads constructor(context: Context, attrs: Attribu cropBordersWebtoon.bindToPreference(if (hasMargins) preferences.cropBorders() else preferences.cropBordersWebtoon()) webtoonSidePadding.bindToIntPreference( preferences.webtoonSidePadding(), - R.array.webtoon_side_padding_values + R.array.webtoon_side_padding_values, ) webtoonEnableZoomOut.bindToPreference(preferences.webtoonEnableZoomOut()) webtoonNav.bindToPreference(preferences.navigationModeWebtoon()) @@ -87,12 +87,13 @@ class ReaderPagedView @JvmOverloads constructor(context: Context, attrs: Attribu binding.webtoonNav, binding.webtoonInvert, binding.webtoonPageLayout, - binding.webtoonInvertDoublePages + binding.webtoonInvertDoublePages, ).forEach { it.isVisible = !show } val isFullFit = when (preferences.imageScaleType().get()) { SubsamplingScaleImageView.SCALE_TYPE_FIT_HEIGHT, SubsamplingScaleImageView.SCALE_TYPE_SMART_FIT, - SubsamplingScaleImageView.SCALE_TYPE_CENTER_CROP -> true + SubsamplingScaleImageView.SCALE_TYPE_CENTER_CROP, + -> true else -> false } val ogView = (context as? Activity)?.window?.decorView diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/TabbedReaderSettingsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/TabbedReaderSettingsSheet.kt index 6c7a5ddf90..fe401d3d0f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/TabbedReaderSettingsSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/TabbedReaderSettingsSheet.kt @@ -19,22 +19,22 @@ import eu.kanade.tachiyomi.widget.TabbedBottomSheetDialog class TabbedReaderSettingsSheet( val readerActivity: ReaderActivity, - showColorFilterSettings: Boolean = false + showColorFilterSettings: Boolean = false, ) : TabbedBottomSheetDialog(readerActivity) { private val generalView: ReaderGeneralView = View.inflate( readerActivity, R.layout.reader_general_layout, - null + null, ) as ReaderGeneralView private val pagedView: ReaderPagedView = View.inflate( readerActivity, R.layout.reader_paged_layout, - null + null, ) as ReaderPagedView private val filterView: ReaderFilterView = View.inflate( readerActivity, R.layout.reader_color_filter, - null + null, ) as ReaderFilterView var showWebtoonView: Boolean = run { @@ -57,13 +57,13 @@ class TabbedReaderSettingsSheet( override fun getTabViews(): List = listOf( generalView, pagedView, - filterView + filterView, ) override fun getTabTitles(): List = listOf( R.string.general, if (showWebtoonView) R.string.webtoon else R.string.paged, - R.string.filter + R.string.filter, ) init { @@ -88,8 +88,8 @@ class TabbedReaderSettingsSheet( binding.menu.setImageDrawable( ContextCompat.getDrawable( context, - R.drawable.ic_outline_settings_24dp - ) + R.drawable.ic_outline_settings_24dp, + ), ) binding.menu.setOnClickListener { val intent = SearchActivity.openReaderSettings(readerActivity) @@ -131,7 +131,8 @@ class TabbedReaderSettingsSheet( override fun onTabReselected(tab: TabLayout.Tab?) { } - }) + }, + ) if (showColorFilterSettings) { binding.tabs.getTabAt(filterTabIndex)?.select() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/GestureDetectorWithLongTap.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/GestureDetectorWithLongTap.kt index d3ecfbd330..f0304205b1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/GestureDetectorWithLongTap.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/GestureDetectorWithLongTap.kt @@ -14,7 +14,7 @@ import kotlin.math.abs */ open class GestureDetectorWithLongTap( context: Context, - listener: Listener + listener: Listener, ) : GestureDetector(context, listener) { private val handler = Handler(Looper.getMainLooper()) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt index a73f087e8b..a92d63b5d6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt @@ -42,7 +42,7 @@ open class ReaderPageImageView @JvmOverloads constructor( attrs: AttributeSet? = null, @AttrRes defStyleAttrs: Int = 0, @StyleRes defStyleRes: Int = 0, - private val isWebtoon: Boolean = false + private val isWebtoon: Boolean = false, ) : FrameLayout(context, attrs, defStyleAttrs, defStyleRes) { private var pageView: View? = null @@ -125,7 +125,7 @@ open class ReaderPageImageView @JvmOverloads constructor( override fun onCenterChanged(newCenter: PointF?, origin: Int) { // Not used } - } + }, ) setOnClickListener { this@ReaderPageImageView.onViewClicked() } } @@ -147,7 +147,7 @@ open class ReaderPageImageView @JvmOverloads constructor( private fun setNonAnimatedImage( image: Any, - config: Config + config: Config, ) = (pageView as? SubsamplingScaleImageView)?.apply { setDoubleTapZoomDuration(config.zoomDuration.getSystemScaledDuration()) setMinimumScaleType(config.minimumScaleType) @@ -164,7 +164,7 @@ open class ReaderPageImageView @JvmOverloads constructor( override fun onImageLoadError(e: Exception) { this@ReaderPageImageView.onImageLoadError() } - } + }, ) when (image) { @@ -207,7 +207,7 @@ open class ReaderPageImageView @JvmOverloads constructor( this@ReaderPageImageView.onViewClicked() return super.onSingleTapConfirmed(e) } - } + }, ) setOnScaleChangeListener { _, _, _ -> this@ReaderPageImageView.onScaleChanged(scale) @@ -219,7 +219,7 @@ open class ReaderPageImageView @JvmOverloads constructor( private fun setAnimatedImage( image: Any, - config: Config + config: Config, ) = (pageView as? AppCompatImageView)?.apply { if (this is PhotoView) { setZoomTransitionDuration(config.zoomDuration.getSystemScaledDuration()) @@ -243,7 +243,7 @@ open class ReaderPageImageView @JvmOverloads constructor( }, onError = { this@ReaderPageImageView.onImageLoadError() - } + }, ) .crossfade(false) .build() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressBar.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressBar.kt index 8af322dded..3a9a33f3ad 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressBar.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressBar.kt @@ -27,7 +27,7 @@ import kotlin.math.min class ReaderProgressBar @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, - defStyleAttr: Int = 0 + defStyleAttr: Int = 0, ) : View(context, attrs, defStyleAttr) { /** @@ -76,7 +76,7 @@ class ReaderProgressBar @JvmOverloads constructor( Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, - 0.5f + 0.5f, ).apply { interpolator = LinearInterpolator() repeatCount = Animation.INFINITE @@ -184,7 +184,7 @@ class ReaderProgressBar @JvmOverloads constructor( override fun onAnimationCancel(animation: Animator?) { alpha = 1f } - } + }, ) start() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderTransitionView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderTransitionView.kt index b4fed13a17..4dcdd9d518 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderTransitionView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderTransitionView.kt @@ -102,7 +102,7 @@ class ReaderTransitionView @JvmOverloads constructor(context: Context, attrs: At private fun SpannableStringBuilder.addDLImageSpan(isDownloaded: Boolean) { val icon = context.contextCompatDrawable( - if (isDownloaded) R.drawable.ic_file_download_24dp else R.drawable.ic_cloud_24dp + if (isDownloaded) R.drawable.ic_file_download_24dp else R.drawable.ic_cloud_24dp, ) ?.mutate() ?.apply { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerConfig.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerConfig.kt index aaba9a9c33..60b5e8d1ad 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerConfig.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerConfig.kt @@ -50,7 +50,7 @@ abstract class ViewerConfig(preferences: PreferencesHelper, protected val scope: fun Preference.register( valueAssignment: (T) -> Unit, - onChanged: (T) -> Unit = {} + onChanged: (T) -> Unit = {}, ) { asFlow() .onEach { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerNavigation.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerNavigation.kt index 474a8ccb12..0a705a098e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerNavigation.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerNavigation.kt @@ -23,12 +23,12 @@ abstract class ViewerNavigation { data class Region( val rectF: RectF, - val type: NavigationRegion + val type: NavigationRegion, ) { fun invert(invertMode: TappingInvertMode): Region { if (invertMode == TappingInvertMode.NONE) return this return this.copy( - rectF = this.rectF.invert(invertMode) + rectF = this.rectF.invert(invertMode), ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/navigation/EdgeNavigation.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/navigation/EdgeNavigation.kt index c06c703a34..7440b1e353 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/navigation/EdgeNavigation.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/navigation/EdgeNavigation.kt @@ -18,15 +18,15 @@ class EdgeNavigation : ViewerNavigation() { override var regions: List = listOf( Region( rectF = RectF(0f, 0f, 0.33f, 1f), - type = NavigationRegion.NEXT + type = NavigationRegion.NEXT, ), Region( rectF = RectF(0.33f, 0.66f, 0.66f, 1f), - type = NavigationRegion.PREV + type = NavigationRegion.PREV, ), Region( rectF = RectF(0.66f, 0f, 1f, 1f), - type = NavigationRegion.NEXT + type = NavigationRegion.NEXT, ), ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/navigation/KindlishNavigation.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/navigation/KindlishNavigation.kt index 43c081f870..21bf053ebb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/navigation/KindlishNavigation.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/navigation/KindlishNavigation.kt @@ -18,11 +18,11 @@ class KindlishNavigation : ViewerNavigation() { override var regions: List = listOf( Region( rectF = RectF(0.33f, 0.33f, 1f, 1f), - type = NavigationRegion.NEXT + type = NavigationRegion.NEXT, ), Region( rectF = RectF(0f, 0.33f, 0.33f, 1f), - type = NavigationRegion.PREV - ) + type = NavigationRegion.PREV, + ), ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/navigation/LNavigation.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/navigation/LNavigation.kt index 6d3390818a..8f94a61006 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/navigation/LNavigation.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/navigation/LNavigation.kt @@ -18,19 +18,19 @@ open class LNavigation : ViewerNavigation() { override var regions: List = listOf( Region( rectF = RectF(0f, 0.33f, 0.33f, 0.66f), - type = NavigationRegion.PREV + type = NavigationRegion.PREV, ), Region( rectF = RectF(0f, 0f, 1f, 0.33f), - type = NavigationRegion.PREV + type = NavigationRegion.PREV, ), Region( rectF = RectF(0.66f, 0.33f, 1f, 0.66f), - type = NavigationRegion.NEXT + type = NavigationRegion.NEXT, ), Region( rectF = RectF(0f, 0.66f, 1f, 1f), - type = NavigationRegion.NEXT - ) + type = NavigationRegion.NEXT, + ), ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/navigation/RightAndLeftNavigation.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/navigation/RightAndLeftNavigation.kt index f0df1afa2d..b660000f2d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/navigation/RightAndLeftNavigation.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/navigation/RightAndLeftNavigation.kt @@ -18,11 +18,11 @@ class RightAndLeftNavigation : ViewerNavigation() { override var regions: List = listOf( Region( rectF = RectF(0f, 0f, 0.33f, 1f), - type = NavigationRegion.LEFT + type = NavigationRegion.LEFT, ), Region( rectF = RectF(0.66f, 0f, 1f, 1f), - type = NavigationRegion.RIGHT + type = NavigationRegion.RIGHT, ), ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/Pager.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/Pager.kt index b89bc9ee0c..9690f25f12 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/Pager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/Pager.kt @@ -14,7 +14,7 @@ import eu.kanade.tachiyomi.ui.reader.viewer.GestureDetectorWithLongTap */ open class Pager( context: Context, - isHorizontal: Boolean = true + isHorizontal: Boolean = true, ) : DirectionalViewPager(context, isHorizontal) { /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt index a846b312d3..ae8e83b1b4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt @@ -23,7 +23,7 @@ import uy.kohesive.injekt.api.get class PagerConfig( scope: CoroutineScope, private val viewer: PagerViewer, - preferences: PreferencesHelper = Injekt.get() + preferences: PreferencesHelper = Injekt.get(), ) : ViewerConfig(preferences, scope) { @@ -87,7 +87,7 @@ class PagerConfig( { tappingInverted = it }, { navigator.invertMode = it - } + }, ) preferences.pagerNavInverted().asFlow() @@ -137,7 +137,7 @@ class PagerConfig( doublePages = it == PageLayout.DOUBLE_PAGES.value splitPages = it == PageLayout.SPLIT_PAGES.value } - }) + },) preferences.automaticSplitsPage() .register({ autoSplitPages = it }) @@ -180,7 +180,8 @@ class PagerConfig( return when (imageScaleType) { SubsamplingScaleImageView.SCALE_TYPE_FIT_HEIGHT, SubsamplingScaleImageView.SCALE_TYPE_SMART_FIT, - SubsamplingScaleImageView.SCALE_TYPE_CENTER_CROP -> true + SubsamplingScaleImageView.SCALE_TYPE_CENTER_CROP, + -> true else -> false } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt index 0676c7f21a..f33a03b1fa 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt @@ -73,7 +73,7 @@ import kotlin.math.roundToInt class PagerPageHolder( val viewer: PagerViewer, val page: ReaderPage, - private var extraPage: ReaderPage? = null + private var extraPage: ReaderPage? = null, ) : FrameLayout(viewer.activity), ViewPagerAdapter.PositionableView { /** @@ -148,13 +148,13 @@ class PagerPageHolder( when (val theme = viewer.config.readerTheme) { 3 -> Color.TRANSPARENT else -> ThemeUtil.readerBackgroundColor(theme) - } + }, ) progressBar.foregroundTintList = ColorStateList.valueOf( context.getResourceColor( if (isInvertedFromTheme()) R.attr.colorPrimaryInverse - else R.attr.colorPrimary - ) + else R.attr.colorPrimary, + ), ) } @@ -200,7 +200,7 @@ class PagerPageHolder( override fun onImageLoadError(e: Exception) { onImageDecodeError() } - } + }, ) } } @@ -283,7 +283,7 @@ class PagerPageHolder( .withInterruptible(true) .start() }, - 500 + 500, ) } } @@ -316,7 +316,7 @@ class PagerPageHolder( ) { setScaleAndCenter( scale, - PointF(centerV, (center?.y?.plus(topInsets)?.minus(bottomInsets) ?: 0f)) + PointF(centerV, (center?.y?.plus(topInsets)?.minus(bottomInsets) ?: 0f)), ) } } @@ -543,7 +543,7 @@ class PagerPageHolder( page.bg = imageView.background page.bgType = getBGType( viewer.config.readerTheme, - context + context, ) + item.hashCode() } } @@ -582,10 +582,10 @@ class PagerPageHolder( BitmapFactory.decodeByteArray( bytesArray, 0, - bytesArray.size + bytesArray.size, ), preferences.readerTheme().get() == 2, - context + context, ) } } @@ -663,7 +663,7 @@ class PagerPageHolder( 0f, insets?.displayCutout?.boundingRectTop?.height()?.toFloat() ?: 0f, 0f, - insets?.displayCutout?.boundingRectBottom?.height()?.toFloat() ?: 0f + insets?.displayCutout?.boundingRectBottom?.height()?.toFloat() ?: 0f, ) } setOnImageEventListener( @@ -691,7 +691,7 @@ class PagerPageHolder( override fun onImageLoadError(e: Exception) { onImageDecodeError() } - } + }, ) } addView(subsamplingImageView, MATCH_PARENT, MATCH_PARENT) @@ -720,7 +720,7 @@ class PagerPageHolder( } return true } - } + }, ) } addView(imageView) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerTransitionHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerTransitionHolder.kt index 8f4505df56..a580cd4d65 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerTransitionHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerTransitionHolder.kt @@ -24,7 +24,7 @@ import rx.android.schedulers.AndroidSchedulers @SuppressLint("ViewConstructor") class PagerTransitionHolder( val viewer: PagerViewer, - val transition: ChapterTransition + val transition: ChapterTransition, ) : LinearLayout(viewer.activity), ViewPagerAdapter.PositionableView { /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt index 06b01961a1..5968dd435a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt @@ -311,7 +311,7 @@ abstract class PagerViewer(val activity: ReaderActivity) : BaseViewer { Timber.d("setChaptersInternal") val forceTransition = config.alwaysShowChapterTransition || adapter.joinedItems.getOrNull( pager - .currentItem + .currentItem, )?.first is ChapterTransition adapter.setChapters(chapters, forceTransition) @@ -350,7 +350,7 @@ abstract class PagerViewer(val activity: ReaderActivity) : BaseViewer { val joinedItem = adapter.joinedItems.firstOrNull { it.first == page || it.second == page } activity.onPageSelected( joinedItem?.first as? ReaderPage ?: page, - joinedItem?.second is ReaderPage + joinedItem?.second is ReaderPage, ) } } else { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt index a369b40546..ca510feb31 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt @@ -173,7 +173,7 @@ class PagerViewerAdapter(private val viewer: PagerViewer) : ViewPagerAdapter() { ?: oldCurrent?.first ) as? ReaderPage )?.index ?: 0 - } + }, ) // The listener may be removed when we split a page, so the ui may not have updated properly @@ -214,7 +214,7 @@ class PagerViewerAdapter(private val viewer: PagerViewer) : ViewPagerAdapter() { this.joinedItems = pagedItems.map { Pair( it, - if ((it as? ReaderPage)?.fullPage == true) (it as? ReaderPage)?.firstHalf else null + if ((it as? ReaderPage)?.fullPage == true) (it as? ReaderPage)?.firstHalf else null, ) }.toMutableList() } else { @@ -266,7 +266,7 @@ class PagerViewerAdapter(private val viewer: PagerViewer) : ViewPagerAdapter() { if (index > -1) ( items.take(index).indexOfLast { it?.fullPage == true } ) else -1 - ) + ), ) // Add a shifted page to the first place there isnt a full page (fullPageBeforeIndex until items.size).forEach { @@ -305,7 +305,7 @@ class PagerViewerAdapter(private val viewer: PagerViewer) : ViewPagerAdapter() { // Step 5: chunk em if (items.isNotEmpty()) { subJoinedItems.addAll( - items.chunked(2).map { Pair(it.first()!!, it.getOrNull(1)) } + items.chunked(2).map { Pair(it.first()!!, it.getOrNull(1)) }, ) } otherItems.getOrNull(pagedIndex)?.let { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonAdapter.kt index 8db030a7f3..035aefe249 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonAdapter.kt @@ -138,7 +138,7 @@ class WebtoonAdapter(val viewer: WebtoonViewer) : RecyclerView.Adapter, - private val newItems: List + private val newItems: List, ) : DiffUtil.Callback() { /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonBaseHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonBaseHolder.kt index eff894517c..394f44d484 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonBaseHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonBaseHolder.kt @@ -8,7 +8,7 @@ import rx.Subscription abstract class WebtoonBaseHolder( view: View, - protected val viewer: WebtoonViewer + protected val viewer: WebtoonViewer, ) : RecyclerView.ViewHolder(view) { /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt index b91b9e5489..ed7639fa29 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt @@ -21,7 +21,7 @@ import uy.kohesive.injekt.api.get */ class WebtoonConfig( scope: CoroutineScope, - preferences: PreferencesHelper = Injekt.get() + preferences: PreferencesHelper = Injekt.get(), ) : ViewerConfig(preferences, scope) { var webtoonCropBorders = false @@ -51,7 +51,7 @@ class WebtoonConfig( { tappingInverted = it }, { navigator.invertMode = it - } + }, ) preferences.webtoonNavInverted().asFlow() @@ -76,7 +76,7 @@ class WebtoonConfig( preferences.webtoonPageLayout() .register( { splitPages = it == PageLayout.SPLIT_PAGES.webtoonValue }, - { imagePropertyChangedListener?.invoke() } + { imagePropertyChangedListener?.invoke() }, ) preferences.webtoonInvertDoublePages() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonFrame.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonFrame.kt index 3e6080f497..2fc2c42349 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonFrame.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonFrame.kt @@ -77,7 +77,7 @@ class WebtoonFrame(context: Context) : FrameLayout(context) { e1: MotionEvent?, e2: MotionEvent?, velocityX: Float, - velocityY: Float + velocityY: Float, ): Boolean { return recycler?.zoomFling(velocityX.toInt(), velocityY.toInt()) ?: false } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt index c3686c6591..d55d881eb1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt @@ -41,7 +41,7 @@ import java.util.concurrent.TimeUnit */ class WebtoonPageHolder( private val frame: ReaderPageImageView, - viewer: WebtoonViewer + viewer: WebtoonViewer, ) : WebtoonBaseHolder(frame, viewer) { /** @@ -283,8 +283,8 @@ class WebtoonPageHolder( minimumScaleType = SubsamplingScaleImageView.SCALE_TYPE_FIT_WIDTH, cropBorders = if (viewer.hasMargins) viewer.config.verticalCropBorders - else viewer.config.webtoonCropBorders - ) + else viewer.config.webtoonCropBorders, + ), ) } // Keep the Rx stream alive to close the input stream only when unsubscribed diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonRecyclerView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonRecyclerView.kt index 197142922c..f6caa70ee8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonRecyclerView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonRecyclerView.kt @@ -19,7 +19,7 @@ import kotlin.math.abs open class WebtoonRecyclerView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, - defStyle: Int = 0 + defStyle: Int = 0, ) : androidx.recyclerview.widget.RecyclerView(context, attrs, defStyle) { private var isZooming = false @@ -103,7 +103,7 @@ open class WebtoonRecyclerView @JvmOverloads constructor( fromX: Float, toX: Float, fromY: Float, - toY: Float + toY: Float, ) { isZooming = true val animatorSet = AnimatorSet() @@ -136,7 +136,7 @@ open class WebtoonRecyclerView @JvmOverloads constructor( override fun onAnimationRepeat(animation: Animator) { } - } + }, ) } @@ -186,7 +186,7 @@ open class WebtoonRecyclerView @JvmOverloads constructor( currentScale *= scaleFactor currentScale = currentScale.coerceIn( minRate, - MAX_SCALE_RATE + MAX_SCALE_RATE, ) setScaleRate(currentScale) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonSubsamplingImageView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonSubsamplingImageView.kt index 88f916161d..328d6725a5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonSubsamplingImageView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonSubsamplingImageView.kt @@ -11,7 +11,7 @@ import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView */ class WebtoonSubsamplingImageView @JvmOverloads constructor( context: Context, - attrs: AttributeSet? = null + attrs: AttributeSet? = null, ) : SubsamplingScaleImageView(context, attrs) { override fun onTouchEvent(event: MotionEvent): Boolean { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonTransitionHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonTransitionHolder.kt index 175dad75b2..6070509361 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonTransitionHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonTransitionHolder.kt @@ -22,7 +22,7 @@ import rx.android.schedulers.AndroidSchedulers */ class WebtoonTransitionHolder( val layout: LinearLayout, - viewer: WebtoonViewer + viewer: WebtoonViewer, ) : WebtoonBaseHolder(layout, viewer) { /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt index 1f1065155a..f5cac46f0d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt @@ -95,7 +95,7 @@ class WebtoonViewer(val activity: ReaderActivity, val hasMargins: Boolean = fals } } } - } + }, ) recycler.tapListener = f@{ event -> val pos = PointF(event.rawX / recycler.width, event.rawY / recycler.height) @@ -298,11 +298,13 @@ class WebtoonViewer(val activity: ReaderActivity, val hasMargins: Boolean = fals KeyEvent.KEYCODE_DPAD_RIGHT, KeyEvent.KEYCODE_DPAD_UP, - KeyEvent.KEYCODE_PAGE_UP -> if (isUp) moveToPrevious() + KeyEvent.KEYCODE_PAGE_UP, + -> if (isUp) moveToPrevious() KeyEvent.KEYCODE_DPAD_LEFT, KeyEvent.KEYCODE_DPAD_DOWN, - KeyEvent.KEYCODE_PAGE_DOWN -> if (isUp) moveToNext() + KeyEvent.KEYCODE_PAGE_DOWN, + -> if (isUp) moveToNext() else -> return false } return true @@ -324,7 +326,7 @@ class WebtoonViewer(val activity: ReaderActivity, val hasMargins: Boolean = fals val position = layoutManager.findLastEndVisibleItemPosition() adapter.notifyItemRangeChanged( max(0, position - 3), - min(position + 3, adapter.itemCount - 1) + min(position + 3, adapter.itemCount - 1), ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaAdapter.kt index 0a57fc04ad..7659810a68 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaAdapter.kt @@ -35,7 +35,7 @@ class RecentMangaAdapter(val delegate: RecentsInterface) : val decimalFormat = DecimalFormat( "#.###", DecimalFormatSymbols() - .apply { decimalSeparator = '.' } + .apply { decimalSeparator = '.' }, ) init { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaDivider.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaDivider.kt index 491b76aeb7..2a90fe65bf 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaDivider.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaDivider.kt @@ -44,7 +44,7 @@ class RecentMangaDivider(context: Context) : androidx.recyclerview.widget.Recycl outRect: Rect, view: View, parent: androidx.recyclerview.widget.RecyclerView, - state: androidx.recyclerview.widget.RecyclerView.State + state: androidx.recyclerview.widget.RecyclerView.State, ) { outRect.set(0, 0, 0, divider.intrinsicHeight) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaFooterHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaFooterHolder.kt index 270abbdccf..049e546624 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaFooterHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaFooterHolder.kt @@ -7,7 +7,7 @@ import eu.kanade.tachiyomi.ui.manga.chapter.BaseChapterHolder class RecentMangaFooterHolder( view: View, - val adapter: RecentMangaAdapter + val adapter: RecentMangaAdapter, ) : BaseChapterHolder(view, adapter) { private val binding = RecentsFooterItemBinding.bind(view) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaHeaderItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaHeaderItem.kt index 687e2a47ac..02b0ab84ed 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaHeaderItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaHeaderItem.kt @@ -19,7 +19,7 @@ class RecentMangaHeaderItem(val recentsType: Int) : override fun createViewHolder( view: View, - adapter: FlexibleAdapter> + adapter: FlexibleAdapter>, ): Holder { return Holder(view, adapter as RecentMangaAdapter) } @@ -28,7 +28,7 @@ class RecentMangaHeaderItem(val recentsType: Int) : adapter: FlexibleAdapter>, holder: Holder, position: Int, - payloads: MutableList? + payloads: MutableList?, ) { holder.bind(recentsType) } @@ -56,7 +56,7 @@ class RecentMangaHeaderItem(val recentsType: Int) : class Holder(val view: View, adapter: RecentMangaAdapter) : BaseFlexibleViewHolder( view, adapter, - true + true, ) { private val binding = RecentsHeaderItemBinding.bind(view) @@ -68,7 +68,7 @@ class RecentMangaHeaderItem(val recentsType: Int) : NEW_CHAPTERS -> R.string.new_chapters NEWLY_ADDED -> R.string.newly_added else -> R.string.continue_reading - } + }, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaHolder.kt index 90abc5a267..27cc1b1ad9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaHolder.kt @@ -20,7 +20,7 @@ import eu.kanade.tachiyomi.util.view.setCards class RecentMangaHolder( view: View, - val adapter: RecentMangaAdapter + val adapter: RecentMangaAdapter, ) : BaseChapterHolder(view, adapter) { private val binding = RecentMangaItemBinding.bind(view) @@ -113,7 +113,7 @@ class RecentMangaHolder( } if (binding.frontView.translationX == 0f) { binding.read.setImageResource( - if (item.read) R.drawable.ic_eye_off_24dp else R.drawable.ic_eye_24dp + if (item.read) R.drawable.ic_eye_off_24dp else R.drawable.ic_eye_24dp, ) } val notValidNum = item.mch.chapter.chapter_number <= 0 @@ -121,33 +121,33 @@ class RecentMangaHolder( binding.body.text = when { item.mch.chapter.id == null -> binding.body.context.getString( R.string.added_, - item.mch.manga.date_added.timeSpanFromNow(itemView.context) + item.mch.manga.date_added.timeSpanFromNow(itemView.context), ) isSmallUpdates -> "" item.mch.history.id == null -> binding.body.context.getString( R.string.updated_, - item.chapter.date_upload.timeSpanFromNow(itemView.context) + item.chapter.date_upload.timeSpanFromNow(itemView.context), ) item.chapter.id != item.mch.chapter.id -> binding.body.context.getString( R.string.read_, - item.mch.history.last_read.timeSpanFromNow + item.mch.history.last_read.timeSpanFromNow, ) + "\n" + binding.body.context.getString( if (notValidNum) R.string.last_read_ else R.string.last_read_chapter_, - if (notValidNum) item.mch.chapter.name else adapter.decimalFormat.format(item.mch.chapter.chapter_number) + if (notValidNum) item.mch.chapter.name else adapter.decimalFormat.format(item.mch.chapter.chapter_number), ) item.chapter.pages_left > 0 && !item.chapter.read -> binding.body.context.getString( R.string.read_, - item.mch.history.last_read.timeSpanFromNow(itemView.context) + item.mch.history.last_read.timeSpanFromNow(itemView.context), ) + "\n" + itemView.resources.getQuantityString( R.plurals.pages_left, item.chapter.pages_left, - item.chapter.pages_left + item.chapter.pages_left, ) else -> binding.body.context.getString( R.string.read_, - item.mch.history.last_read.timeSpanFromNow(itemView.context) + item.mch.history.last_read.timeSpanFromNow(itemView.context), ) } if ((itemView.context as? Activity)?.isDestroyed != true) { @@ -157,7 +157,7 @@ class RecentMangaHolder( notifyStatus( if (adapter.isSelected(flexibleAdapterPosition)) Download.State.CHECKED else item.status, item.progress, - item.chapter.read + item.chapter.read, ) } resetFrontView() @@ -183,7 +183,8 @@ class RecentMangaHolder( binding.downloadButton.downloadButton.isVisible = when (adapter.showDownloads) { RecentMangaAdapter.ShowRecentsDLs.UnreadOrDownloaded, - RecentMangaAdapter.ShowRecentsDLs.OnlyDownloaded -> + RecentMangaAdapter.ShowRecentsDLs.OnlyDownloaded, + -> status !in Download.State.CHECKED..Download.State.NOT_DOWNLOADED || !isChapterRead else -> binding.downloadButton.downloadButton.isVisible } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaItem.kt index 5879951064..0c4063d4d3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaItem.kt @@ -15,7 +15,7 @@ import eu.kanade.tachiyomi.ui.manga.chapter.BaseChapterItem class RecentMangaItem( val mch: MangaChapterHistory = MangaChapterHistory.createBlank(), chapter: Chapter = ChapterImpl(), - header: AbstractHeaderItem<*>? + header: AbstractHeaderItem<*>?, ) : BaseChapterItem>(chapter, header) { @@ -26,7 +26,7 @@ class RecentMangaItem( override fun createViewHolder( view: View, - adapter: FlexibleAdapter> + adapter: FlexibleAdapter>, ): BaseChapterHolder { return if (mch.manga.id == null) RecentMangaFooterHolder(view, adapter as RecentMangaAdapter) else RecentMangaHolder(view, adapter as RecentMangaAdapter) @@ -55,7 +55,7 @@ class RecentMangaItem( adapter: FlexibleAdapter>, holder: BaseChapterHolder, position: Int, - payloads: MutableList? + payloads: MutableList?, ) { if (mch.manga.id == null) (holder as? RecentMangaFooterHolder)?.bind((header as? RecentMangaHeaderItem)?.recentsType ?: 0) else if (chapter.id != null) (holder as? RecentMangaHolder)?.bind(this) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt index b6765f1070..a3a5870111 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt @@ -142,8 +142,8 @@ class RecentsController(bundle: Bundle? = null) : RecentsPresenter.VIEW_TYPE_ONLY_HISTORY -> R.string.history RecentsPresenter.VIEW_TYPE_ONLY_UPDATES -> R.string.updates else -> R.string.updates_and_history - } - )?.lowercase(Locale.ROOT) + }, + )?.lowercase(Locale.ROOT), ) } @@ -166,11 +166,11 @@ class RecentsController(bundle: Bundle? = null) : binding.recycler.setHasFixedSize(true) binding.recycler.recycledViewPool.setMaxRecycledViews(0, 0) binding.recycler.addItemDecoration( - RecentMangaDivider(view.context) + RecentMangaDivider(view.context), ) adapter.isSwipeEnabled = true adapter.itemTouchHelperCallback.setSwipeFlags( - if (view.resources.isLTR) ItemTouchHelper.LEFT else ItemTouchHelper.RIGHT + if (view.resources.isLTR) ItemTouchHelper.LEFT else ItemTouchHelper.RIGHT, ) binding.swipeRefresh.setStyle() scrollViewWith( @@ -182,7 +182,7 @@ class RecentsController(bundle: Bundle? = null) : val systemInsets = it.ignoredSystemInsets headerHeight = systemInsets.top + appBarHeight + 48.dpToPx binding.recycler.updatePaddingRelative( - bottom = activityBinding?.bottomNav?.height ?: systemInsets.bottom + bottom = activityBinding?.bottomNav?.height ?: systemInsets.bottom, ) binding.downloadBottomSheet.sheetLayout.updateLayoutParams { height = appBarHeight + systemInsets.top @@ -191,7 +191,7 @@ class RecentsController(bundle: Bundle? = null) : binding.recentsEmptyView.updatePadding( top = bigToolbarHeight + systemInsets.top, - bottom = activityBinding?.bottomNav?.height ?: systemInsets.bottom + bottom = activityBinding?.bottomNav?.height ?: systemInsets.bottom, ) binding.progress.updateLayoutParams { topMargin = (bigToolbarHeight + systemInsets.top) / 2 @@ -207,7 +207,7 @@ class RecentsController(bundle: Bundle? = null) : }, onBottomNavUpdate = { setBottomPadding() - } + }, ) if (!isReturning && adapter.itemCount == 0) { @@ -218,11 +218,11 @@ class RecentsController(bundle: Bundle? = null) : viewScope.launchUI { val height = activityBinding?.bottomNav?.height ?: view.rootWindowInsetsCompat?.getInsets( - systemBars() + systemBars(), )?.bottom ?: 0 binding.recycler.updatePaddingRelative(bottom = height) binding.downloadBottomSheet.dlRecycler.updatePaddingRelative( - bottom = height + bottom = height, ) val isExpanded = binding.downloadBottomSheet.root.sheetBehavior.isExpanded() binding.downloadBottomSheet.dlRecycler.alpha = isExpanded.toInt().toFloat() @@ -285,7 +285,7 @@ class RecentsController(bundle: Bundle? = null) : ogRadius, deviceRadius, progress, - binding.downloadBottomSheet.sheetLayout + binding.downloadBottomSheet.sheetLayout, ) if (oldShow != showingDownloads) { updateTitleAndMenu() @@ -340,7 +340,7 @@ class RecentsController(bundle: Bundle? = null) : state == BottomSheetBehavior.STATE_COLLAPSED setPadding(binding.downloadBottomSheet.dlBottomSheet.sheetBehavior?.isHideable == true) } - } + }, ) binding.swipeRefresh.isRefreshing = LibraryUpdateService.isRunning() binding.swipeRefresh.setOnRefreshListener { @@ -358,7 +358,7 @@ class RecentsController(bundle: Bundle? = null) : viewScope.launchUI { NotificationReceiver.dismissNotification( context, - Notifications.ID_LIBRARY_PROGRESS + Notifications.ID_LIBRARY_PROGRESS, ) } } @@ -368,7 +368,7 @@ class RecentsController(bundle: Bundle? = null) : super.onDismissed(transientBottomBar, event) binding.swipeRefresh.isRefreshing = LibraryUpdateService.isRunning() } - } + }, ) } LibraryUpdateService.start(view.context) @@ -414,7 +414,7 @@ class RecentsController(bundle: Bundle? = null) : val pad = bottomBar?.translationY?.minus(bottomBar.height) ?: 0f val padding = max( (-pad).toInt(), - view?.rootWindowInsetsCompat?.getBottomGestureInsets() ?: 0 + view?.rootWindowInsetsCompat?.getBottomGestureInsets() ?: 0, ) binding.downloadBottomSheet.dlBottomSheet.sheetBehavior?.peekHeight = 48.spToPx + padding binding.downloadBottomSheet.fastScroller.updateLayoutParams { @@ -423,13 +423,13 @@ class RecentsController(bundle: Bundle? = null) : binding.downloadBottomSheet.dlRecycler.updatePaddingRelative( bottom = max( -pad.toInt(), - view?.rootWindowInsetsCompat?.getInsets(systemBars())?.bottom ?: 0 - ) + binding.downloadBottomSheet.downloadFab.height + 20.dpToPx + view?.rootWindowInsetsCompat?.getInsets(systemBars())?.bottom ?: 0, + ) + binding.downloadBottomSheet.downloadFab.height + 20.dpToPx, ) binding.downloadBottomSheet.downloadFab.updateLayoutParams { bottomMargin = max( -pad.toInt(), - view?.rootWindowInsetsCompat?.getInsets(systemBars())?.bottom ?: 0 + view?.rootWindowInsetsCompat?.getInsets(systemBars())?.bottom ?: 0, ) + 16.dpToPx } setPadding(binding.downloadBottomSheet.dlBottomSheet.sheetBehavior?.isHideable == true) @@ -468,7 +468,7 @@ class RecentsController(bundle: Bundle? = null) : activityBinding?.bottomNav?.height ?: cInsets.getInsets(systemBars()).bottom } else { peekHeight - } + }, ) } @@ -515,7 +515,7 @@ class RecentsController(bundle: Bundle? = null) : fun showLists( recents: List, hasNewItems: Boolean, - shouldMoveToTop: Boolean = false + shouldMoveToTop: Boolean = false, ) { if (view == null) return binding.progress.isVisible = false @@ -543,7 +543,7 @@ class RecentsController(bundle: Bundle? = null) : RecentsPresenter.VIEW_TYPE_ONLY_UPDATES -> R.string.no_recent_chapters RecentsPresenter.VIEW_TYPE_ONLY_HISTORY -> R.string.no_recently_read_manga else -> R.string.no_recent_read_updated_manga - } + }, ) } else { binding.recentsEmptyView.hide() @@ -641,7 +641,7 @@ class RecentsController(bundle: Bundle? = null) : RecentMangaHeaderItem.NEW_CHAPTERS -> RecentsPresenter.VIEW_TYPE_ONLY_UPDATES RecentMangaHeaderItem.CONTINUE_READING -> RecentsPresenter.VIEW_TYPE_ONLY_HISTORY else -> return false - } + }, ) } else { val activity = activity ?: return false @@ -695,7 +695,7 @@ class RecentsController(bundle: Bundle? = null) : snack = view?.snack( if (wasRead) R.string.marked_as_unread else R.string.marked_as_read, - Snackbar.LENGTH_INDEFINITE + Snackbar.LENGTH_INDEFINITE, ) { anchorView = activityBinding?.bottomNav var undoing = false @@ -717,7 +717,7 @@ class RecentsController(bundle: Bundle? = null) : } } } - } + }, ) } (activity as? MainActivity)?.setUndoSnackBar(snack) @@ -760,13 +760,13 @@ class RecentsController(bundle: Bundle? = null) : R.string.grouped, R.string.all, R.string.history, - R.string.updates + R.string.updates, ).forEachIndexed { index, resId -> tabs.addTab( tabs.newTab().setText(resId).also { tab -> tab.view.compatToolTipText = null }, - index == selectedTab + index == selectedTab, ) } tabs.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener { @@ -778,7 +778,8 @@ class RecentsController(bundle: Bundle? = null) : override fun onTabReselected(tab: TabLayout.Tab?) { binding.recycler.smoothScrollToTop() } - }) + }, + ) (activity as? MainActivity)?.showTabBar(true) } } else { @@ -838,7 +839,7 @@ class RecentsController(bundle: Bundle? = null) : R.id.display_options -> { displaySheet = TabbedRecentsOptionsSheet( this, - (presenter.viewType - 1).coerceIn(0, 2) + (presenter.viewType - 1).coerceIn(0, 2), ) displaySheet?.show() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsPresenter.kt index 2ba1b3435b..90cf931db4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsPresenter.kt @@ -44,7 +44,7 @@ class RecentsPresenter( val preferences: PreferencesHelper = Injekt.get(), val downloadManager: DownloadManager = Injekt.get(), val db: DatabaseHelper = Injekt.get(), - private val chapterFilter: ChapterFilter = Injekt.get() + private val chapterFilter: ChapterFilter = Injekt.get(), ) : BaseCoroutinePresenter(), DownloadQueue.DownloadListener, LibraryServiceListener, DownloadServiceListener { private var recentsJob: Job? = null @@ -59,7 +59,7 @@ class RecentsPresenter( private val newChaptersHeader = RecentMangaHeaderItem(RecentMangaHeaderItem.NEW_CHAPTERS) private val continueReadingHeader = RecentMangaHeaderItem( RecentMangaHeaderItem - .CONTINUE_READING + .CONTINUE_READING, ) var finished = false var heldItems: HashMap> = hashMapOf() @@ -95,7 +95,7 @@ class RecentsPresenter( listOf( preferences.groupChaptersHistory(), preferences.showReadInAllRecents(), - preferences.groupChaptersUpdates() + preferences.groupChaptersUpdates(), ).forEach { it.asFlow() .drop(1) @@ -122,7 +122,7 @@ class RecentsPresenter( itemCount: Int = 0, limit: Boolean = false, customViewType: Int? = null, - includeReadAnyway: Boolean = false + includeReadAnyway: Boolean = false, ) { if (retryCount > 5) { finished = true @@ -151,7 +151,7 @@ class RecentsPresenter( showRead, isEndless, if (isCustom) ENDLESS_LIMIT else pageOffset, - !updatePageCount && !isOnFirstPage + !updatePageCount && !isOnFirstPage, ).executeOnIO() } viewType == VIEW_TYPE_ONLY_HISTORY -> { @@ -159,13 +159,13 @@ class RecentsPresenter( db.getRecentMangaLimit( query, if (isCustom) ENDLESS_LIMIT else pageOffset, - !updatePageCount && !isOnFirstPage + !updatePageCount && !isOnFirstPage, ) } else { db.getHistoryUngrouped( query, if (isCustom) ENDLESS_LIMIT else pageOffset, - !updatePageCount && !isOnFirstPage + !updatePageCount && !isOnFirstPage, ) }.executeOnIO() } @@ -174,13 +174,13 @@ class RecentsPresenter( db.getUpdatedChaptersDistinct( query, if (isCustom) ENDLESS_LIMIT else pageOffset, - !updatePageCount && !isOnFirstPage + !updatePageCount && !isOnFirstPage, ) } else { db.getRecentChapters( query, if (isCustom) ENDLESS_LIMIT else pageOffset, - !updatePageCount && !isOnFirstPage + !updatePageCount && !isOnFirstPage, ) }.executeOnIO() .map { @@ -189,7 +189,7 @@ class RecentsPresenter( it.chapter, HistoryImpl().apply { last_read = it.chapter.date_fetch - } + }, ) } } @@ -259,7 +259,7 @@ class RecentsPresenter( RecentMangaItem( it.first, it.second, - newChaptersHeader + newChaptersHeader, ) }.toMutableList() val cReadingItems = @@ -267,7 +267,7 @@ class RecentsPresenter( RecentMangaItem( it.first, it.second, - continueReadingHeader + continueReadingHeader, ) }.toMutableList() if (nChaptersItems.isNotEmpty()) { @@ -464,7 +464,7 @@ class RecentsPresenter( chapter: Chapter, read: Boolean, lastRead: Int? = null, - pagesLeft: Int? = null + pagesLeft: Int? = null, ) { presenterScope.launch(Dispatchers.IO) { chapter.apply { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RemoveHistoryDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RemoveHistoryDialog.kt index 5564b6d755..b175f96e28 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RemoveHistoryDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RemoveHistoryDialog.kt @@ -37,15 +37,15 @@ class RemoveHistoryDialog(bundle: Bundle? = null) : DialogController(bundle) R.string.reset_chapter_question, if (chapter?.name != null) activity.getString( R.string.this_will_remove_the_read_date_for_x_question, - chapter?.name ?: "" + chapter?.name ?: "", ) - else activity.getString(R.string.this_will_remove_the_read_date_question) + else activity.getString(R.string.this_will_remove_the_read_date_question), ) .addCheckBoxPrompt( activity.getString( R.string.reset_all_chapters_for_this_, - manga!!.seriesType(activity) - ) + manga!!.seriesType(activity), + ), ) .setNegativeButton(android.R.string.cancel, null) .setPositiveButton(R.string.reset) { dialog, _ -> diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/options/TabbedRecentsOptionsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/options/TabbedRecentsOptionsSheet.kt index 72a94c241b..d7a9cf0f2c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/options/TabbedRecentsOptionsSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/options/TabbedRecentsOptionsSheet.kt @@ -32,12 +32,12 @@ class TabbedRecentsOptionsSheet(val controller: RecentsController, @IntRange(fro override fun getTabViews(): List = listOf( generalView, historyView, - updatesView + updatesView, ) override fun getTabTitles(): List = listOf( R.string.general, R.string.history, - R.string.updates + R.string.updates, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/security/BiometricActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/security/BiometricActivity.kt index 8f20fd051e..a03608649f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/security/BiometricActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/security/BiometricActivity.kt @@ -37,7 +37,7 @@ class BiometricActivity : BaseThemedActivity() { preferences.lastUnlock().set(Date().time) finish() } - } + }, ) val promptInfo = BiometricPrompt.PromptInfo.Builder() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt index 1d034bef58..fd08c6d31f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt @@ -21,7 +21,7 @@ object SecureActivityDelegate { if (enabled) { activity?.window?.setFlags( WindowManager.LayoutParams.FLAG_SECURE, - WindowManager.LayoutParams.FLAG_SECURE + WindowManager.LayoutParams.FLAG_SECURE, ) } else { activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/PreferenceDSL.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/PreferenceDSL.kt index 0becc6aa6a..df2983a8cc 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/PreferenceDSL.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/PreferenceDSL.kt @@ -64,7 +64,7 @@ inline fun PreferenceGroup.dropDownPreference(block: (@DSL DropDownPreference).( inline fun PreferenceGroup.listPreference( activity: Activity?, block: (@DSL ListMatPreference).() - -> Unit + -> Unit, ): ListMatPreference { return initThenAdd(ListMatPreference(activity, context), block) @@ -75,7 +75,7 @@ inline fun PreferenceGroup.intListPreference( block: ( @DSL IntListMatPreference - ).() -> Unit + ).() -> Unit, ): IntListMatPreference { return initThenAdd(IntListMatPreference(activity, context), block) @@ -87,7 +87,7 @@ inline fun PreferenceGroup.multiSelectListPreferenceMat( @DSL MultiListMatPreference ).() - -> Unit + -> Unit, ): MultiListMatPreference { return initThenAdd(MultiListMatPreference(activity, context), block) } @@ -98,7 +98,7 @@ inline fun PreferenceGroup.triStateListPreference( @DSL TriStateListPreference ).() - -> Unit + -> Unit, ): TriStateListPreference { return initThenAdd(TriStateListPreference(activity, context), block) } @@ -113,7 +113,7 @@ inline fun PreferenceScreen.switchPreference(block: (@DSL SwitchPreferenceCompat fun PreferenceGroup.infoPreference(@StringRes infoRes: Int): Preference { return initThenAdd( - Preference(context) + Preference(context), ) { iconRes = R.drawable.ic_info_outline_24dp iconTint = context.getResourceColor(android.R.attr.textColorSecondary) @@ -186,7 +186,7 @@ inline fun IntListMatPreference.bindTo(preference: com.fredporciuncula.flow. fun SwitchPreferenceCompat.requireAuthentication( activity: FragmentActivity?, title: String, - subtitle: String? = null + subtitle: String? = null, ) { onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue -> newValue as Boolean @@ -204,7 +204,7 @@ fun SwitchPreferenceCompat.requireAuthentication( super.onAuthenticationError(errorCode, errString) activity.toast(errString.toString()) } - } + }, ) false } else { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt index 24ec610b99..f2b2760809 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt @@ -180,7 +180,7 @@ class SettingsAdvancedController : SettingsController() { titleRes = R.string.clean_up_cached_covers summary = context.getString( R.string.delete_old_covers_in_library_used_, - coverCache.getChapterCacheSize() + coverCache.getChapterCacheSize(), ) onClick { @@ -195,7 +195,7 @@ class SettingsAdvancedController : SettingsController() { titleRes = R.string.clear_cached_covers_non_library summary = context.getString( R.string.delete_all_covers__not_in_library_used_, - coverCache.getOnlineCoverCacheSize() + coverCache.getOnlineCoverCacheSize(), ) onClick { @@ -319,7 +319,7 @@ class SettingsAdvancedController : SettingsController() { .setTitle(R.string.clean_up_downloaded_chapters) .setMultiChoiceItems( R.array.clean_up_downloads, - booleanArrayOf(true, true, true) + booleanArrayOf(true, true, true), ) { dialog, position, _ -> if (position == 0) { val listView = (dialog as AlertDialog).listView @@ -332,7 +332,7 @@ class SettingsAdvancedController : SettingsController() { val deleteNonFavorite = listView.isItemChecked(2) (targetController as? SettingsAdvancedController)?.cleanupDownloads( deleteRead, - deleteNonFavorite + deleteNonFavorite, ) } .setNegativeButton(android.R.string.cancel, null) @@ -377,7 +377,7 @@ class SettingsAdvancedController : SettingsController() { else resources!!.getQuantityString( R.plurals.cleanup_done, foldersCleared, - foldersCleared + foldersCleared, ) activity.toast(cleanupString, Toast.LENGTH_LONG) } @@ -409,12 +409,12 @@ class SettingsAdvancedController : SettingsController() { resources?.getQuantityString( R.plurals.cache_cleared, deletedFiles, - deletedFiles - ) + deletedFiles, + ), ) findPreference(CLEAR_CACHE_KEY)?.summary = resources?.getString(R.string.used_, chapterCache.readableSize) - } + }, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAppearanceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAppearanceController.kt index 2373f8096a..147844139c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAppearanceController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAppearanceController.kt @@ -146,7 +146,7 @@ class SettingsAppearanceController : SettingsController() { defaultValue = 1 isVisible = max( context.resources.displayMetrics.widthPixels, - context.resources.displayMetrics.heightPixels + context.resources.displayMetrics.heightPixels, ) >= 720.dpToPx } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt index 55d7da3d33..d5cdf6e442 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt @@ -105,7 +105,7 @@ class SettingsBackupController : SettingsController() { R.string.every_12_hours, R.string.daily, R.string.every_2_days, - R.string.weekly + R.string.weekly, ) entryValues = listOf(0, 6, 12, 24, 48, 168) @@ -219,7 +219,7 @@ class SettingsBackupController : SettingsController() { R.string.chapters, R.string.tracking, R.string.history, - R.string.custom_manga_info + R.string.custom_manga_info, ) .map { activity.getString(it) } @@ -227,7 +227,7 @@ class SettingsBackupController : SettingsController() { .setTitle(R.string.what_should_backup) .setMultiChoiceItems( options.toTypedArray(), - booleanArrayOf(true, true, true, true, true, true) + booleanArrayOf(true, true, true, true, true, true), ) { dialog, position, _ -> if (position == 0) { val listView = (dialog as AlertDialog).listView diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt index 893d0f7749..8fc43c48b0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt @@ -50,7 +50,7 @@ class SettingsBrowseController : SettingsController() { entriesRes = arrayOf( R.string.over_any_network, R.string.over_wifi_only, - R.string.dont_auto_update + R.string.dont_auto_update, ) defaultValue = AutoAppUpdaterJob.ONLY_ON_UNMETERED } @@ -66,7 +66,7 @@ class SettingsBrowseController : SettingsController() { titleRes = R.string.notify_extension_updated isChecked = Notifications.isNotificationChannelEnabled( context, - Notifications.CHANNEL_EXT_UPDATED + Notifications.CHANNEL_EXT_UPDATED, ) updatedExtNotifPref = this onChange { @@ -78,7 +78,7 @@ class SettingsBrowseController : SettingsController() { putExtra(Settings.EXTRA_APP_PACKAGE, BuildConfig.APPLICATION_ID) putExtra( Settings.EXTRA_CHANNEL_ID, - Notifications.CHANNEL_EXT_UPDATED + Notifications.CHANNEL_EXT_UPDATED, ) } startActivity(intent) @@ -130,12 +130,12 @@ class SettingsBrowseController : SettingsController() { preferences.migrationSources().set(pinnedSources) (activity as? MainActivity)?.setUndoSnackBar( view?.snack( - R.string.migration_sources_changed + R.string.migration_sources_changed, ) { setAction(R.string.undo) { preferences.migrationSources().set(ogSources) } - } + }, ) } } @@ -156,12 +156,12 @@ class SettingsBrowseController : SettingsController() { preferences.migrationSources().set(enabledSources) (activity as? MainActivity)?.setUndoSnackBar( view?.snack( - R.string.migration_sources_changed + R.string.migration_sources_changed, ) { setAction(R.string.undo) { preferences.migrationSources().set(ogSources) } - } + }, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt index 516efb3ab1..9f95c2f55e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt @@ -68,7 +68,7 @@ class SettingsDownloadController : SettingsController() { R.string.second_to_last, R.string.third_to_last, R.string.fourth_to_last, - R.string.fifth_to_last + R.string.fifth_to_last, ) entryRange = -1..4 defaultValue = -1 @@ -125,7 +125,7 @@ class SettingsDownloadController : SettingsController() { entriesRes = arrayOf( R.string.ask_on_chapters_page, R.string.always_keep, - R.string.always_delete + R.string.always_delete, ) entryRange = 0..2 } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt index 34bb7197d7..62b6726771 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt @@ -34,7 +34,7 @@ class SettingsGeneralController : SettingsController() { R.string.last_used_library_recents, R.string.library, R.string.recents, - R.string.browse + R.string.browse, ) entryValues = (0 downTo -3).toList() defaultValue = 0 diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt index db3b5adae1..8114c65f54 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt @@ -114,7 +114,7 @@ class SettingsLibraryController : SettingsController() { R.string.daily, R.string.every_2_days, R.string.every_3_days, - R.string.weekly + R.string.weekly, ) entryValues = listOf(0, 12, 24, 48, 72, 168) defaultValue = 24 @@ -155,7 +155,7 @@ class SettingsLibraryController : SettingsController() { entriesRes = arrayOf( R.string.pref_update_only_completely_read, R.string.pref_update_only_started, - R.string.pref_update_only_non_completed + R.string.pref_update_only_non_completed, ) entryValues = listOf(MANGA_HAS_UNREAD, MANGA_NON_READ, MANGA_NON_COMPLETED) noSelectionRes = R.string.none diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt index d373b422bc..5aa03ab052 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt @@ -95,7 +95,7 @@ class SettingsMainController : SettingsController(), FloatingSearchInterface { override fun onActionViewExpand(item: MenuItem?) { SettingsSearchController.lastSearch = "" // reset saved search query router.pushController( - RouterTransaction.with(SettingsSearchController()) + RouterTransaction.with(SettingsSearchController()), ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt index 62023668ef..dab08fdf85 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt @@ -38,9 +38,9 @@ class SettingsReaderController : SettingsController() { entries = listOf( context.getString(R.string.no_animation), context.getString( - R.string.fast + R.string.fast, ), - context.getString(R.string.normal) + context.getString(R.string.normal), ) entryValues = listOf(1, 250, 500) // using a value of 0 breaks the image viewer, so // min is 1 @@ -104,7 +104,7 @@ class SettingsReaderController : SettingsController() { R.string.white, R.string.black, R.string.smart_based_on_page, - R.string.smart_based_on_page_and_theme + R.string.smart_based_on_page_and_theme, ) entryRange = 0..3 defaultValue = 2 @@ -165,13 +165,13 @@ class SettingsReaderController : SettingsController() { R.string.none, R.string.horizontally, R.string.vertically, - R.string.both_axes + R.string.both_axes, ) entryValues = listOf( ViewerNavigation.TappingInvertMode.NONE.name, ViewerNavigation.TappingInvertMode.HORIZONTAL.name, ViewerNavigation.TappingInvertMode.VERTICAL.name, - ViewerNavigation.TappingInvertMode.BOTH.name + ViewerNavigation.TappingInvertMode.BOTH.name, ) defaultValue = ViewerNavigation.TappingInvertMode.NONE.name } @@ -185,7 +185,7 @@ class SettingsReaderController : SettingsController() { R.string.fit_width, R.string.fit_height, R.string.original_size, - R.string.smart_fit + R.string.smart_fit, ) entryRange = 1..6 defaultValue = 1 @@ -233,7 +233,7 @@ class SettingsReaderController : SettingsController() { R.string.automatic, R.string.left, R.string.right, - R.string.center + R.string.center, ) entryRange = 1..4 defaultValue = 1 @@ -290,13 +290,13 @@ class SettingsReaderController : SettingsController() { R.string.none, R.string.horizontally, R.string.vertically, - R.string.both_axes + R.string.both_axes, ) entryValues = listOf( ViewerNavigation.TappingInvertMode.NONE.name, ViewerNavigation.TappingInvertMode.HORIZONTAL.name, ViewerNavigation.TappingInvertMode.VERTICAL.name, - ViewerNavigation.TappingInvertMode.BOTH.name + ViewerNavigation.TappingInvertMode.BOTH.name, ) defaultValue = ViewerNavigation.TappingInvertMode.NONE.name } @@ -315,7 +315,7 @@ class SettingsReaderController : SettingsController() { R.string.webtoon_side_padding_10, R.string.webtoon_side_padding_15, R.string.webtoon_side_padding_20, - R.string.webtoon_side_padding_25 + R.string.webtoon_side_padding_25, ) entryValues = listOf(0, 10, 15, 20, 25) defaultValue = "0" diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt index ee44de0808..4da8604167 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt @@ -20,7 +20,7 @@ class SettingsSecurityController : SettingsController() { requireAuthentication( activity as? FragmentActivity, - context.getString(R.string.lock_with_biometrics) + context.getString(R.string.lock_with_biometrics), ) } intListPreference(activity) { @@ -34,7 +34,7 @@ class SettingsSecurityController : SettingsController() { else -> resources?.getQuantityString( R.plurals.after_minutes, it, - it + it, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSourcesController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSourcesController.kt index 8ca439c5cc..4be561fae5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSourcesController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSourcesController.kt @@ -81,8 +81,8 @@ class SettingsSourcesController : SettingsController(), FloatingSearchInterface } true } - } - ) + }, + ), ) } } @@ -142,7 +142,7 @@ class SettingsSourcesController : SettingsController(), FloatingSearchInterface preferences.hiddenSources().set( if (checked) current - id - else current + id + else current + id, ) group.removeAll() @@ -220,7 +220,7 @@ class SettingsSourcesController : SettingsController(), FloatingSearchInterface return onCollapse?.invoke(item) ?: true } - } + }, ) if (expandActionViewFromInteraction) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt index 334795bbdc..f8b3f74d29 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt @@ -70,8 +70,8 @@ class SettingsTrackingController : view?.snack( context.getString( R.string.could_not_update_scoring_, - error?.localizedMessage.orEmpty() - ) + error?.localizedMessage.orEmpty(), + ), ) } } @@ -102,7 +102,7 @@ class SettingsTrackingController : private inline fun PreferenceGroup.trackPreference( service: TrackService, - crossinline login: () -> Unit + crossinline login: () -> Unit, ): TrackerPreference { return add( TrackerPreference(context).apply { @@ -124,7 +124,7 @@ class SettingsTrackingController : login() } } - } + }, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/ThemePreference.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/ThemePreference.kt index 82292ec5f0..c1832fbc03 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/ThemePreference.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/ThemePreference.kt @@ -65,12 +65,12 @@ class ThemePreference @JvmOverloads constructor(context: Context, attrs: Attribu itemAdapterLight.set( enumConstants .filter { (!it.isDarkTheme || it.followsSystem) && (it.styleRes != R.style.Theme_Tachiyomi_Monet || supportsDynamic) } - .map { ThemeItem(it, false) } + .map { ThemeItem(it, false) }, ) itemAdapterDark.set( enumConstants .filter { (it.isDarkTheme || it.followsSystem) && (it.styleRes != R.style.Theme_Tachiyomi_Monet || supportsDynamic) } - .map { ThemeItem(it, true) } + .map { ThemeItem(it, true) }, ) isSelectable = false } @@ -124,7 +124,8 @@ class ThemePreference @JvmOverloads constructor(context: Context, attrs: Attribu lastScrollPostionLight = recyclerView.computeHorizontalScrollOffset() } - }) + }, + ) binding.themeRecyclerDark.setHasFixedSize(true) binding.themeRecyclerDark.layoutManager = managerDark @@ -137,20 +138,21 @@ class ThemePreference @JvmOverloads constructor(context: Context, attrs: Attribu lastScrollPostionDark = recyclerView.computeHorizontalScrollOffset() } - }) + }, + ) if (lastScrollPostionLight != null) { val lX = lastScrollPostionLight!! (binding.themeRecycler.layoutManager as LinearLayoutManager).apply { scrollToPositionWithOffset( lX / 110.dpToPx, - -lX % 110.dpToPx + -lX % 110.dpToPx, ) } lastScrollPostionLight = binding.themeRecycler.computeHorizontalScrollOffset() } else { binding.themeRecycler.scrollToPosition( - max((selectExtensionLight.selections.firstOrNull() ?: 0) - 1, 0) + max((selectExtensionLight.selections.firstOrNull() ?: 0) - 1, 0), ) } @@ -159,13 +161,13 @@ class ThemePreference @JvmOverloads constructor(context: Context, attrs: Attribu (binding.themeRecyclerDark.layoutManager as LinearLayoutManager).apply { scrollToPositionWithOffset( lX / 110.dpToPx, - -lX % 110.dpToPx + -lX % 110.dpToPx, ) } lastScrollPostionDark = binding.themeRecyclerDark.computeHorizontalScrollOffset() } else { binding.themeRecyclerDark.scrollToPosition( - max((selectExtensionDark.selections.firstOrNull() ?: 0) - 1, 0) + max((selectExtensionDark.selections.firstOrNull() ?: 0) - 1, 0), ) } } @@ -216,7 +218,7 @@ class ThemePreference @JvmOverloads constructor(context: Context, attrs: Attribu item.theme.darkNameRes } else { item.theme.nameRes - } + }, ) binding.checkbox.isVisible = item.isSelected diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabaseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabaseController.kt index 4114404dd0..2ff46bbd34 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabaseController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabaseController.kt @@ -76,16 +76,16 @@ class ClearDatabaseController : binding.fab.height + binding.fab.marginBottom } else { insets.getInsets(systemBars()).bottom - } + }, ) binding.fastScroller.updateLayoutParams { bottomMargin = insets.getInsets(systemBars()).bottom } binding.emptyView.updatePadding( top = (fullAppBarHeight ?: 0) + (activityBinding?.appBar?.paddingTop ?: 0), - bottom = insets.getInsets(systemBars()).bottom + bottom = insets.getInsets(systemBars()).bottom, ) - } + }, ) binding.recycler.addOnScrollListener(object : RecyclerView.OnScrollListener() { fun updateFastScrollMargins() { @@ -94,7 +94,7 @@ class ClearDatabaseController : val bigToolbarHeight = fullAppBarHeight ?: return val value = max( 0, - bigToolbarHeight + activityBinding.appBar.y.roundToInt() + bigToolbarHeight + activityBinding.appBar.y.roundToInt(), ) + activityBinding.appBar.paddingTop if (value != binding.fastScroller.marginTop) { binding.fastScroller.updateLayoutParams { @@ -111,7 +111,8 @@ class ClearDatabaseController : super.onScrollStateChanged(recyclerView, newState) updateFastScrollMargins() } - }) + }, + ) binding.fab.isInvisible = true binding.fab.setOnClickListener { if (adapter!!.selectedItemCount > 0) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabasePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabasePresenter.kt index 8d0108321b..72ff13a88f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabasePresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabasePresenter.kt @@ -57,8 +57,8 @@ class ClearDatabasePresenter : BaseCoroutinePresenter() SortSources.MOST_ENTRIES -> Int.MAX_VALUE - it.mangaCount } }, - { it.source.name } - ) + { it.source.name }, + ), ) withUIContext { controller?.setItems(sources) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchAdapter.kt index 93dd4820e6..f327c3a46d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchAdapter.kt @@ -25,7 +25,7 @@ class SettingsSearchAdapter(val controller: SettingsSearchController) : override fun onBindViewHolder( holder: RecyclerView.ViewHolder, position: Int, - payloads: List + payloads: List, ) { super.onBindViewHolder(holder, position, payloads) restoreHolderState(holder) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchController.kt index f08de70457..b2762383ea 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchController.kt @@ -85,7 +85,7 @@ class SettingsSearchController : setItems(getResultSet(newText)) return false } - } + }, ) searchView?.setQuery(lastSearch, true) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt index bd6e1aa8c2..1c512f0cdf 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt @@ -39,7 +39,7 @@ object SettingsSearchHelper { SettingsSecurityController::class, SettingsLibraryController::class, SettingsReaderController::class, - SettingsTrackingController::class + SettingsTrackingController::class, ) /** @@ -81,7 +81,7 @@ object SettingsSearchHelper { private fun getSettingSearchResult( ctrl: SettingsController, pref: Preference, - breadcrumbs: String = "" + breadcrumbs: String = "", ) { when { pref is PreferenceGroup -> { @@ -112,8 +112,8 @@ object SettingsSearchHelper { title = title, summary = summary, breadcrumb = breadcrumbs, - searchController = ctrl - ) + searchController = ctrl, + ), ) } } @@ -134,6 +134,6 @@ object SettingsSearchHelper { val title: String, val summary: String, val breadcrumb: String, - val searchController: SettingsController + val searchController: SettingsController, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchItem.kt index 3d0dc860a9..f48e6b6fd0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchItem.kt @@ -16,7 +16,7 @@ import eu.kanade.tachiyomi.R class SettingsSearchItem( val settingsSearchResult: SettingsSearchHelper.SettingsSearchResult, val results: List?, - val searchResult: String + val searchResult: String, ) : AbstractFlexibleItem() { @@ -31,7 +31,7 @@ class SettingsSearchItem( */ override fun createViewHolder( view: View, - adapter: FlexibleAdapter> + adapter: FlexibleAdapter>, ): SettingsSearchHolder { return SettingsSearchHolder(view, adapter as SettingsSearchAdapter) } @@ -40,7 +40,7 @@ class SettingsSearchItem( adapter: FlexibleAdapter>, holder: SettingsSearchHolder, position: Int, - payloads: List? + payloads: List?, ) { holder.bind(this) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/BaseOAuthLoginActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/BaseOAuthLoginActivity.kt index 3ae2b6105f..00e1df3b32 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/BaseOAuthLoginActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/BaseOAuthLoginActivity.kt @@ -27,8 +27,8 @@ abstract class BaseOAuthLoginActivity : BaseThemedActivity() { FrameLayout.LayoutParams( ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, - Gravity.CENTER - ) + Gravity.CENTER, + ), ) handleResult(intent.data) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt index a52f93693b..1202108287 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt @@ -141,7 +141,7 @@ class BrowseController : afterInsets = { headerHeight = binding.sourceRecycler.paddingTop binding.sourceRecycler.updatePaddingRelative( - bottom = (activityBinding?.bottomNav?.height ?: it.getBottomGestureInsets()) + 58.spToPx + bottom = (activityBinding?.bottomNav?.height ?: it.getBottomGestureInsets()) + 58.spToPx, ) if (activityBinding?.bottomNav == null) { setBottomPadding() @@ -154,7 +154,7 @@ class BrowseController : }, onBottomNavUpdate = { setBottomPadding() - } + }, ) if (!isReturning) { activityBinding?.appBar?.lockYPos = true @@ -162,7 +162,7 @@ class BrowseController : binding.sourceRecycler.post { setBottomSheetTabs(if (binding.bottomSheet.root.sheetBehavior.isCollapsed()) 0f else 1f) binding.sourceRecycler.updatePaddingRelative( - bottom = (activityBinding?.bottomNav?.height ?: 0) + 58.spToPx + bottom = (activityBinding?.bottomNav?.height ?: 0) + 58.spToPx, ) updateTitleAndMenu() } @@ -214,7 +214,7 @@ class BrowseController : setBottomSheetTabs(if (state == BottomSheetBehavior.STATE_COLLAPSED) 0f else 1f) } } - } + }, ) if (showingExtensions) { @@ -237,7 +237,7 @@ class BrowseController : binding.bottomSheet.sheetToolbar.title = view?.context?.getString( if (binding.bottomSheet.tabs.selectedTabPosition == 0) R.string.extensions - else R.string.source_migration + else R.string.source_migration, ) val onExtensionTab = binding.bottomSheet.tabs.selectedTabPosition == 0 if (binding.bottomSheet.sheetToolbar.menu.findItem(if (onExtensionTab) R.id.action_search else R.id.action_migration_guide) != null) { @@ -248,7 +248,7 @@ class BrowseController : binding.bottomSheet.sheetToolbar.menu.clear() binding.bottomSheet.sheetToolbar.inflateMenu( if (binding.bottomSheet.tabs.selectedTabPosition == 0) R.menu.extension_main - else R.menu.migration_main + else R.menu.migration_main, ) // Initialize search option. @@ -283,7 +283,7 @@ class BrowseController : router.pushController( RouterTransaction.with(controller) .popChangeHandler(SettingsSourcesFadeChangeHandler()) - .pushChangeHandler(FadeChangeHandler()) + .pushChangeHandler(FadeChangeHandler()), ) } R.id.action_migration_guide -> { @@ -332,16 +332,16 @@ class BrowseController : ogRadius, deviceRadius, progress, - binding.bottomSheet.sheetLayout + binding.bottomSheet.sheetLayout, ) val selectedColor = ColorUtils.setAlphaComponent( bottomSheet.context.getResourceColor(R.attr.tabBarIconColor), - (progress * 255).toInt() + (progress * 255).toInt(), ) val unselectedColor = ColorUtils.setAlphaComponent( bottomSheet.context.getResourceColor(R.attr.actionBarTintColor), - 153 + 153, ) binding.bottomSheet.pager.alpha = progress * 10 binding.bottomSheet.tabs.setSelectedTabIndicatorColor(selectedColor) @@ -349,13 +349,13 @@ class BrowseController : ColorUtils.blendARGB( bottomSheet.context.getResourceColor(R.attr.actionBarTintColor), unselectedColor, - progress + progress, ), ColorUtils.blendARGB( bottomSheet.context.getResourceColor(R.attr.actionBarTintColor), selectedColor, - progress - ) + progress, + ), ) /*binding.bottomSheet.sheetLayout.backgroundTintList = ColorStateList.valueOf( @@ -372,7 +372,7 @@ class BrowseController : val pad = bottomBar?.translationY?.minus(bottomBar.height) ?: 0f val padding = max( (-pad).toInt(), - view?.rootWindowInsetsCompat?.getBottomGestureInsets() ?: 0 + view?.rootWindowInsetsCompat?.getBottomGestureInsets() ?: 0, ) binding.bottomSheet.root.sheetBehavior?.peekHeight = 56.spToPx + padding binding.bottomSheet.root.extensionFrameLayout?.binding?.fastScroller?.updateLayoutParams { @@ -385,7 +385,7 @@ class BrowseController : bottom = ( activityBinding?.bottomNav?.height ?: view?.rootWindowInsetsCompat?.getBottomGestureInsets() ?: 0 - ) + 58.spToPx + ) + 58.spToPx, ) } @@ -605,7 +605,7 @@ class BrowseController : router.pushController( RouterTransaction.with(controller) .popChangeHandler(SettingsSourcesFadeChangeHandler()) - .pushChangeHandler(FadeChangeHandler()) + .pushChangeHandler(FadeChangeHandler()), ) } R.id.action_migration_guide -> { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourceDividerItemDecoration.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourceDividerItemDecoration.kt index 6531a5e8a1..7befee580f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourceDividerItemDecoration.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourceDividerItemDecoration.kt @@ -40,7 +40,7 @@ class SourceDividerItemDecoration(context: Context) : androidx.recyclerview.widg outRect: Rect, view: View, parent: androidx.recyclerview.widget.RecyclerView, - state: androidx.recyclerview.widget.RecyclerView.State + state: androidx.recyclerview.widget.RecyclerView.State, ) { outRect.set(0, 0, 0, divider.intrinsicHeight) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourceHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourceHolder.kt index 1dea2fdfe6..11dce4c0f5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourceHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourceHolder.kt @@ -40,13 +40,13 @@ class SourceHolder(view: View, val adapter: SourceAdapter) : imageTintList = ColorStateList.valueOf( context.getResourceColor( if (isPinned) R.attr.colorSecondary - else android.R.attr.textColorSecondary - ) + else android.R.attr.textColorSecondary, + ), ) compatToolTipText = context.getString(if (isPinned) R.string.unpin else R.string.pin) setImageResource( if (isPinned) R.drawable.ic_pin_24dp - else R.drawable.ic_pin_outline_24dp + else R.drawable.ic_pin_outline_24dp, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourceItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourceItem.kt index e0f24f8117..19f35886a5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourceItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourceItem.kt @@ -34,7 +34,7 @@ class SourceItem(val source: CatalogueSource, header: LangItem? = null, val isPi */ override fun createViewHolder( view: View, - adapter: FlexibleAdapter> + adapter: FlexibleAdapter>, ): SourceHolder { return SourceHolder(view, adapter as SourceAdapter) } @@ -46,7 +46,7 @@ class SourceItem(val source: CatalogueSource, header: LangItem? = null, val isPi adapter: FlexibleAdapter>, holder: SourceHolder, position: Int, - payloads: MutableList + payloads: MutableList, ) { holder.bind(this) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourcePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourcePresenter.kt index 261fb03de9..d9f88d096d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourcePresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourcePresenter.kt @@ -26,7 +26,7 @@ import java.util.TreeMap class SourcePresenter( val controller: BrowseController, val sourceManager: SourceManager = Injekt.get(), - private val preferences: PreferencesHelper = Injekt.get() + private val preferences: PreferencesHelper = Injekt.get(), ) { private var scope = CoroutineScope(Job() + Dispatchers.Default) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceController.kt index fff004cdf9..d0a03da99f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceController.kt @@ -72,7 +72,7 @@ open class BrowseSourceController(bundle: Bundle) : constructor( source: CatalogueSource, searchQuery: String? = null, - smartSearchConfig: BrowseController.SmartSearchConfig? = null + smartSearchConfig: BrowseController.SmartSearchConfig? = null, ) : this( Bundle().apply { putLong(SOURCE_ID_KEY, source.id) @@ -84,13 +84,13 @@ open class BrowseSourceController(bundle: Bundle) : if (smartSearchConfig != null) { putParcelable(SMART_SEARCH_CONFIG_KEY, smartSearchConfig) } - } + }, ) constructor(source: CatalogueSource) : this( Bundle().apply { putLong(SOURCE_ID_KEY, source.id) - } + }, ) /** @@ -228,9 +228,9 @@ open class BrowseSourceController(bundle: Bundle) : } binding.emptyView.updatePadding( top = (bigToolbarHeight + insets.getInsets(systemBars()).top), - bottom = insets.getInsets(systemBars()).bottom + bottom = insets.getInsets(systemBars()).bottom, ) - } + }, ) binding.fab.applyBottomAnimatedInsets(16.dpToPx) @@ -243,7 +243,7 @@ open class BrowseSourceController(bundle: Bundle) : binding.fab.shrink() } } - } + }, ) if (oldPosition != RecyclerView.NO_POSITION) { @@ -450,7 +450,7 @@ open class BrowseSourceController(bundle: Bundle) : source.id, source.baseUrl, presenter - .source.name + .source.name, ) startActivity(intent) } @@ -536,7 +536,7 @@ open class BrowseSourceController(bundle: Bundle) : actions += if (presenter.source is LocalSource) { EmptyView.Action( - R.string.local_source_help_guide + R.string.local_source_help_guide, ) { openLocalSourceHelpGuide() } } else { EmptyView.Action(R.string.retry, retryAction) @@ -544,7 +544,7 @@ open class BrowseSourceController(bundle: Bundle) : if (presenter.source is HttpSource) { actions += EmptyView.Action( - R.string.open_in_webview + R.string.open_in_webview, ) { openInWebView() } } @@ -552,7 +552,7 @@ open class BrowseSourceController(bundle: Bundle) : if (presenter.source is HttpSource) R.drawable.ic_browse_off_24dp else R.drawable.ic_local_library_24dp, message, - actions + actions, ) } else { snack = binding.sourceLayout.snack(message, Snackbar.LENGTH_INDEFINITE) { @@ -707,7 +707,7 @@ open class BrowseSourceController(bundle: Bundle) : snack = view.snack(R.string.added_to_library) }, onMangaMoved = { adapter?.notifyItemChanged(position) }, - onMangaDeleted = { presenter.confirmDeletion(manga) } + onMangaDeleted = { presenter.confirmDeletion(manga) }, ) if (snack?.duration == Snackbar.LENGTH_INDEFINITE) { (activity as? MainActivity)?.setUndoSnackBar(snack) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceGridHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceGridHolder.kt index 5705d04efc..b534bff679 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceGridHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceGridHolder.kt @@ -28,7 +28,7 @@ class BrowseSourceGridHolder( private val view: View, private val adapter: FlexibleAdapter>, compact: Boolean, - showOutline: Boolean + showOutline: Boolean, ) : BrowseSourceHolder(view, adapter) { private val binding = MangaGridItemBinding.bind(view) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceItem.kt index 266e69e819..ded29b777b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceItem.kt @@ -23,7 +23,7 @@ class BrowseSourceItem( val manga: Manga, private val catalogueAsList: Preference, private val catalogueListType: Preference, - private val outlineOnCovers: Preference + private val outlineOnCovers: Preference, ) : AbstractFlexibleItem() { @@ -45,14 +45,14 @@ class BrowseSourceItem( binding.card.setCardForegroundColor( ContextCompat.getColorStateList( context, - R.color.library_comfortable_grid_foreground - ) + R.color.library_comfortable_grid_foreground, + ), ) } binding.setBGAndFG(listType) binding.constraintLayout.layoutParams = FrameLayout.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, - ViewGroup.LayoutParams.WRAP_CONTENT + ViewGroup.LayoutParams.WRAP_CONTENT, ) binding.coverThumbnail.maxHeight = Int.MAX_VALUE binding.coverThumbnail.minimumHeight = 0 @@ -74,7 +74,7 @@ class BrowseSourceItem( adapter: FlexibleAdapter>, holder: BrowseSourceHolder, position: Int, - payloads: MutableList? + payloads: MutableList?, ) { holder.onSetValues(manga) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceListHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceListHolder.kt index e9ec9e4059..a5848cbeaf 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceListHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceListHolder.kt @@ -24,7 +24,7 @@ import eu.kanade.tachiyomi.util.view.setCards class BrowseSourceListHolder( private val view: View, adapter: FlexibleAdapter>, - showOutline: Boolean + showOutline: Boolean, ) : BrowseSourceHolder(view, adapter) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourcePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourcePresenter.kt index 4945908d89..ff5daa9791 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourcePresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourcePresenter.kt @@ -156,7 +156,7 @@ open class BrowseSourcePresenter( }, { _, error -> Timber.e(error) - } + }, ) // Request first page. diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/SourceFilterSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/SourceFilterSheet.kt index 3ffe16e636..03115f0c5b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/SourceFilterSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/SourceFilterSheet.kt @@ -63,7 +63,7 @@ class SourceFilterSheet(val activity: Activity) : array.recycle() binding.root.doOnApplyWindowInsetsCompat { _, insets, _ -> binding.titleLayout.updatePaddingRelative( - bottom = insets.getInsets(systemBars()).bottom + bottom = insets.getInsets(systemBars()).bottom, ) binding.titleLayout.updateLayoutParams { height = headerHeight + binding.titleLayout.paddingBottom @@ -78,7 +78,8 @@ class SourceFilterSheet(val activity: Activity) : (binding.root.parent.parent as? View)?.viewTreeObserver?.removeOnGlobalLayoutListener(this) } } - }) + }, + ) binding.filtersRecycler.viewTreeObserver.addOnScrollChangedListener { updateBottomButtons() @@ -102,7 +103,7 @@ class SourceFilterSheet(val activity: Activity) : override fun onStateChanged(p0: View, state: Int) { updateBottomButtons() } - } + }, ) } @@ -133,7 +134,7 @@ class SourceFilterSheet(val activity: Activity) : val headerHeight = array.getDimensionPixelSize(0, 0) binding.titleLayout.updatePaddingRelative( bottom = activity.window.decorView.rootWindowInsetsCompat - ?.getInsets(systemBars())?.bottom ?: 0 + ?.getInsets(systemBars())?.bottom ?: 0, ) binding.titleLayout.updateLayoutParams { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/filter/GroupItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/filter/GroupItem.kt index 016ea6214a..089dce1df3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/filter/GroupItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/filter/GroupItem.kt @@ -39,7 +39,7 @@ class GroupItem(val filter: Filter.Group<*>) : AbstractExpandableHeaderItem>, holder: Holder, position: Int, - payloads: MutableList? + payloads: MutableList?, ) { } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/filter/SortGroup.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/filter/SortGroup.kt index e7385044aa..54babb37e3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/filter/SortGroup.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/filter/SortGroup.kt @@ -36,7 +36,7 @@ class SortGroup(val filter: Filter.Sort) : AbstractExpandableHeaderItem(bundle), FloatingSearchInterface, SmallToolbarInterface, @@ -106,7 +106,7 @@ open class GlobalSearchController( // Open MangaController. router.pushController( MangaDetailsController(manga, true, shouldLockIfNeeded = activity is SearchActivity) - .withFadeTransaction() + .withFadeTransaction(), ) } @@ -145,7 +145,7 @@ open class GlobalSearchController( snack = view.snack(R.string.added_to_library) }, onMangaMoved = { adapter.notifyItemChanged(position) }, - onMangaDeleted = { presenter.confirmDeletion(manga) } + onMangaDeleted = { presenter.confirmDeletion(manga) }, ) if (snack?.duration == Snackbar.LENGTH_INDEFINITE) { (activity as? MainActivity)?.setUndoSnackBar(snack) @@ -214,7 +214,7 @@ open class GlobalSearchController( binding.recycler.updatePaddingRelative( top = (toolbarHeight ?: 0) + - (activityBinding?.root?.rootWindowInsetsCompat?.getInsets(systemBars())?.top ?: 0) + (activityBinding?.root?.rootWindowInsetsCompat?.getInsets(systemBars())?.top ?: 0), ) // Create recycler and set adapter. @@ -273,7 +273,7 @@ open class GlobalSearchController( val manga = results.first().manga router.replaceTopController( MangaDetailsController(manga, true, shouldLockIfNeeded = true) - .withFadeTransaction() + .withFadeTransaction(), ) return } else if (results != null) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/globalsearch/GlobalSearchItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/globalsearch/GlobalSearchItem.kt index b721b42dd9..4d8d261049 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/globalsearch/GlobalSearchItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/globalsearch/GlobalSearchItem.kt @@ -43,7 +43,7 @@ class GlobalSearchItem(val source: CatalogueSource, val results: List>, holder: GlobalSearchHolder, position: Int, - payloads: MutableList? + payloads: MutableList?, ) { holder.bind(this) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/globalsearch/GlobalSearchMangaItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/globalsearch/GlobalSearchMangaItem.kt index 68861281e5..090f5808e0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/globalsearch/GlobalSearchMangaItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/globalsearch/GlobalSearchMangaItem.kt @@ -22,7 +22,7 @@ class GlobalSearchMangaItem(val manga: Manga) : AbstractFlexibleItem>, holder: GlobalSearchMangaHolder, position: Int, - payloads: MutableList? + payloads: MutableList?, ) { holder.bind(manga) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/globalsearch/GlobalSearchPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/globalsearch/GlobalSearchPresenter.kt index 11a0230b8f..5db67c3ac8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/globalsearch/GlobalSearchPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/globalsearch/GlobalSearchPresenter.kt @@ -44,7 +44,7 @@ open class GlobalSearchPresenter( val sourceManager: SourceManager = Injekt.get(), val db: DatabaseHelper = Injekt.get(), private val preferences: PreferencesHelper = Injekt.get(), - private val coverCache: CoverCache = Injekt.get() + private val coverCache: CoverCache = Injekt.get(), ) : BasePresenter() { /** @@ -81,7 +81,7 @@ open class GlobalSearchPresenter( // Perform a search with previous or initial state search( - savedState?.getString(BrowseSourcePresenter::query.name) ?: initialQuery.orEmpty() + savedState?.getString(BrowseSourcePresenter::query.name) ?: initialQuery.orEmpty(), ) } @@ -146,7 +146,7 @@ open class GlobalSearchPresenter( */ protected open fun createCatalogueSearchItem( source: CatalogueSource, - results: List? + results: List?, ): GlobalSearchItem { return GlobalSearchItem(source, results) } @@ -187,7 +187,7 @@ open class GlobalSearchPresenter( .subscribeOn(Schedulers.io()).onErrorReturn { MangasPage( emptyList(), - false + false, ) } // Ignore timeouts or other exceptions .map { it.mangas.take(10) } // Get at most 10 manga from search result. @@ -195,7 +195,7 @@ open class GlobalSearchPresenter( it.map { networkToLocalManga( it, - source.id + source.id, ) } } // Convert to local manga. @@ -206,11 +206,11 @@ open class GlobalSearchPresenter( } createCatalogueSearchItem( source, - it.map { GlobalSearchMangaItem(it) } + it.map { GlobalSearchMangaItem(it) }, ) } }, - 5 + 5, ) .observeOn(AndroidSchedulers.mainThread()) // Update matching source with the obtained results @@ -224,8 +224,8 @@ open class GlobalSearchPresenter( // Same as initial sort, i.e. pinned first then alphabetically { it.source.id.toString() !in pinnedSourceIds }, { loadTime[it.source.id] ?: 0L }, - { "${it.source.name.lowercase(Locale.getDefault())} (${it.source.lang})" } - ) + { "${it.source.name.lowercase(Locale.getDefault())} (${it.source.lang})" }, + ), ) } // Update current state @@ -238,7 +238,7 @@ open class GlobalSearchPresenter( }, { _, error -> Timber.e(error) - } + }, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/latest/LatestUpdatesController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/latest/LatestUpdatesController.kt index a74f2fd819..1d8a82f860 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/latest/LatestUpdatesController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/latest/LatestUpdatesController.kt @@ -17,7 +17,7 @@ class LatestUpdatesController(bundle: Bundle) : BrowseSourceController(bundle) { constructor(source: CatalogueSource) : this( Bundle().apply { putLong(SOURCE_ID_KEY, source.id) - } + }, ) override fun getTitle(): String { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/webview/BaseWebViewActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/BaseWebViewActivity.kt index 6e1ddd076e..ff1649a397 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/webview/BaseWebViewActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/BaseWebViewActivity.kt @@ -75,7 +75,7 @@ open class BaseWebViewActivity : BaseActivity() { // with horizontal insets v.updatePadding( left = insets.getInsets(systemBars()).left, - right = insets.getInsets(systemBars()).right + right = insets.getInsets(systemBars()).right, ) WindowInsetsCompat.Builder(insets).setInsets( systemBars(), @@ -83,8 +83,8 @@ open class BaseWebViewActivity : BaseActivity() { 0, insets.getInsets(systemBars()).top, 0, - insets.getInsets(systemBars()).bottom - ) + insets.getInsets(systemBars()).bottom, + ), ).build() } binding.swipeRefresh.setStyle() @@ -94,7 +94,7 @@ open class BaseWebViewActivity : BaseActivity() { window.statusBarColor = ColorUtils.setAlphaComponent( getResourceColor(R.attr.colorSurface), - 255 + 255, ) ViewCompat.setOnApplyWindowInsetsListener(content) { v, insets -> @@ -111,7 +111,7 @@ open class BaseWebViewActivity : BaseActivity() { insets.getInsets(systemBars()).left, insets.getInsets(systemBars()).top, insets.getInsets(systemBars()).right, - 0 + 0, ) if (!isInNightMode()) { WindowInsetsControllerCompat(window, content).isAppearanceLightNavigationBars = true @@ -155,12 +155,12 @@ open class BaseWebViewActivity : BaseActivity() { if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK_STRATEGY)) { setForceDarkStrategy( binding.webview.settings, - DARK_STRATEGY_WEB_THEME_DARKENING_ONLY + DARK_STRATEGY_WEB_THEME_DARKENING_ONLY, ) if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) { setForceDark( binding.webview.settings, - if (isInNightMode()) FORCE_DARK_ON else FORCE_DARK_OFF + if (isInNightMode()) FORCE_DARK_ON else FORCE_DARK_OFF, ) } } @@ -200,7 +200,7 @@ open class BaseWebViewActivity : BaseActivity() { R.attr.colorSurface, R.attr.actionBarTintColor, R.attr.colorPrimaryVariant, - ) + ), ) setWebDarkMode() val colorSurface = attrs.getColor(0, 0) diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/CrashLogUtil.kt b/app/src/main/java/eu/kanade/tachiyomi/util/CrashLogUtil.kt index 7d3be800b7..9ffc8f3aaf 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/CrashLogUtil.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/CrashLogUtil.kt @@ -55,13 +55,13 @@ class CrashLogUtil(private val context: Context) { addAction( R.drawable.ic_bug_report_24dp, context.getString(R.string.open_log), - NotificationReceiver.openErrorOrSkippedLogPendingActivity(context, uri) + NotificationReceiver.openErrorOrSkippedLogPendingActivity(context, uri), ) addAction( R.drawable.ic_share_24dp, context.getString(R.string.share), - NotificationReceiver.shareCrashLogPendingBroadcast(context, uri, Notifications.ID_CRASH_LOGS) + NotificationReceiver.shareCrashLogPendingBroadcast(context, uri, Notifications.ID_CRASH_LOGS), ) context.notificationManager.notify(Notifications.ID_CRASH_LOGS, build()) diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/MangaExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/MangaExtensions.kt index f3b61f2ca6..20033d658a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/MangaExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/MangaExtensions.kt @@ -68,7 +68,7 @@ fun Manga.shouldDownloadNewChapters(db: DatabaseHelper, prefs: PreferencesHelper fun Manga.moveCategories( db: DatabaseHelper, activity: Activity, - onMangaMoved: () -> Unit + onMangaMoved: () -> Unit, ) { val categories = db.getCategories().executeAsBlocking() val categoriesForManga = db.getCategoriesForManga(this).executeAsBlocking() @@ -78,7 +78,7 @@ fun Manga.moveCategories( this, categories.toMutableList(), ids, - false + false, ) { onMangaMoved() }.show() @@ -87,7 +87,7 @@ fun Manga.moveCategories( fun List.moveCategories( db: DatabaseHelper, activity: Activity, - onMangaMoved: () -> Unit + onMangaMoved: () -> Unit, ) { if (this.isEmpty()) return val categories = db.getCategories().executeAsBlocking() @@ -108,7 +108,7 @@ fun List.moveCategories( else -> TriStateCheckBox.State.UNCHECKED } }.toTypedArray(), - false + false, ) { onMangaMoved() }.show() @@ -148,12 +148,12 @@ fun Manga.addOrRemoveToFavorites( false, onMangaAdded, onMangaMoved, - onMangaDeleted + onMangaDeleted, ) }, migrateManga = { source, faved -> onMangaAdded(source to faved) - } + }, ) return null } @@ -203,7 +203,7 @@ fun Manga.addOrRemoveToFavorites( this, categories.toMutableList(), ids, - true + true, ) { onMangaAdded(null) autoAddTrack(db, onMangaMoved) @@ -231,7 +231,7 @@ fun Manga.addOrRemoveToFavorites( onMangaDeleted() } } - } + }, ) } } @@ -265,7 +265,7 @@ private fun showAddDuplicateDialog( sourceManager.getOrStub(newManga.source), libraryManga, newManga, - replace + replace, ) migrateManga(libraryManga.source, !replace) } @@ -277,12 +277,12 @@ private fun showAddDuplicateDialog( activity.getString(R.string.show_, libraryManga.seriesType(activity, sourceManager)).asButton(activity), activity.getString(R.string.add_to_library).asButton(activity), activity.getString(R.string.migrate).asButton(activity, !newManga.initialized), - ) + ), ) { dialog, i -> when (i) { 0 -> controller.router.pushController( MangaDetailsController(libraryManga) - .withFadeTransaction() + .withFadeTransaction(), ) 1 -> addManga() 2 -> { @@ -298,7 +298,7 @@ private fun showAddDuplicateDialog( activity.getString(R.string.categories), activity.getString(R.string.tracking), ), - booleanArrayOf(true, true, true), null + booleanArrayOf(true, true, true), null, ) setPositiveButton(R.string.migrate) { mDialog, _ -> migrateManga(mDialog, true) @@ -325,7 +325,7 @@ private fun showAddDuplicateDialog( if (!newManga.initialized) { activity.toast( R.string.must_view_details_before_migration, - Toast.LENGTH_LONG + Toast.LENGTH_LONG, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/PreferenceExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/PreferenceExtensions.kt index 933938f53c..aa23609952 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/PreferenceExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/PreferenceExtensions.kt @@ -50,7 +50,7 @@ fun RadioGroup.bindToPreference(pref: Preference, block: (() -> Unit)? = nu */ fun Spinner.bindToPreference( pref: Preference, - offset: Int = 0 + offset: Int = 0, ) { onItemSelectedListener = IgnoreFirstSpinnerListener { position -> pref.set(position + offset) diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSort.kt b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSort.kt index 4bb40b4260..1056d58a13 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSort.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSort.kt @@ -13,13 +13,13 @@ class ChapterSort(val manga: Manga, val chapterFilter: ChapterFilter = Injekt.ge rawChapters: List, andFiltered: Boolean = true, filterForReader: Boolean = false, - currentChapter: T? = null + currentChapter: T? = null, ): List { val chapters = when { filterForReader -> chapterFilter.filterChaptersForReader( rawChapters, manga, - currentChapter + currentChapter, ) andFiltered -> chapterFilter.filterChapters(rawChapters, manga) else -> rawChapters @@ -28,7 +28,7 @@ class ChapterSort(val manga: Manga, val chapterFilter: ChapterFilter = Injekt.ge return chapters.sortedWith(sortComparator()) } - fun getNextUnreadChapter(rawChapters: List, andFiltered: Boolean = true,): T? { + fun getNextUnreadChapter(rawChapters: List, andFiltered: Boolean = true): T? { val chapters = when { andFiltered -> chapterFilter.filterChapters(rawChapters, manga) else -> chapterFilter.filterChaptersByScanlators(rawChapters, manga) diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt index a0df17c7c8..04a7084fd2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt @@ -25,7 +25,7 @@ fun syncChaptersWithSource( db: DatabaseHelper, rawSourceChapters: List, manga: Manga, - source: Source + source: Source, ): Pair, List> { if (rawSourceChapters.isEmpty()) { throw Exception("No chapters found") @@ -169,7 +169,7 @@ fun syncChaptersWithSource( } return Pair( chapterFilter.filterChaptersByScanlators(toAdd.subtract(readded).toList(), manga), - toDelete - readded + toDelete - readded, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterTrackSync.kt b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterTrackSync.kt index 1aa0228e6a..3c1850109e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterTrackSync.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterTrackSync.kt @@ -58,7 +58,7 @@ fun updateTrackChapterMarkedAsRead( newLastChapter: Chapter?, mangaId: Long?, delay: Long = 3000, - fetchTracks: (suspend () -> Unit)? = null + fetchTracks: (suspend () -> Unit)? = null, ) { if (!preferences.trackMarkedAsRead()) return mangaId ?: return @@ -84,7 +84,7 @@ suspend fun updateTrackChapterRead( preferences: PreferencesHelper, mangaId: Long?, newChapterRead: Float, - retryWhenOnline: Boolean = false + retryWhenOnline: Boolean = false, ) { val trackManager = Injekt.get() val trackList = db.getTracks(mangaId).executeAsBlocking() diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterUtil.kt b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterUtil.kt index 02c24f31c8..9f650e2543 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterUtil.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterUtil.kt @@ -28,7 +28,7 @@ class ChapterUtil { textView: TextView, chapter: Chapter, showBookmark: Boolean = true, - hideStatus: Boolean = false + hideStatus: Boolean = false, ) { val context = textView.context textView.setTextColor(chapterColor(context, chapter, hideStatus)) @@ -43,18 +43,18 @@ class ChapterUtil { val drawable = VectorDrawableCompat.create( textView.resources, R.drawable.ic_bookmark_24dp, - context.theme + context.theme, ) drawable?.setBounds(0, 0, textView.textSize.toInt(), textView.textSize.toInt()) textView.setCompoundDrawablesRelative( drawable, null, null, - null + null, ) TextViewCompat.setCompoundDrawableTintList( textView, - ColorStateList.valueOf(bookmarkedColor(context)) + ColorStateList.valueOf(bookmarkedColor(context)), ) textView.compoundDrawablePadding = 3.dpToPx textView.translationX = (-2f).dpToPxEnd diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/lang/Hash.kt b/app/src/main/java/eu/kanade/tachiyomi/util/lang/Hash.kt index a890632080..32d2a2d2e6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/lang/Hash.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/lang/Hash.kt @@ -6,7 +6,7 @@ object Hash { private val chars = charArrayOf( '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', - 'a', 'b', 'c', 'd', 'e', 'f' + 'a', 'b', 'c', 'd', 'e', 'f', ) private val MD5 get() = MessageDigest.getInstance("MD5") diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/lang/RetryWithDelay.kt b/app/src/main/java/eu/kanade/tachiyomi/util/lang/RetryWithDelay.kt index bc1d9a801a..8d368cbc6b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/lang/RetryWithDelay.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/lang/RetryWithDelay.kt @@ -9,7 +9,7 @@ import java.util.concurrent.TimeUnit.MILLISECONDS class RetryWithDelay( private val maxRetries: Int = 1, private val retryStrategy: (Int) -> Int = { 1000 }, - private val scheduler: Scheduler = Schedulers.computation() + private val scheduler: Scheduler = Schedulers.computation(), ) : Func1, Observable<*>> { private var retryCount = 0 diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/lang/StringExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/lang/StringExtensions.kt index da99995dd2..a9ff53285f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/lang/StringExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/lang/StringExtensions.kt @@ -129,7 +129,7 @@ fun String.asButton(context: Context, disabled: Boolean = false): SpannedString return buildSpannedString { val buttonSpan: SpannableStringBuilder.() -> Unit = { inSpans( - TextAppearanceSpan(context, R.style.TextAppearance_Tachiyomi_Button) + TextAppearanceSpan(context, R.style.TextAppearance_Tachiyomi_Button), ) { append(this@asButton) } } if (disabled) { @@ -161,7 +161,7 @@ fun String.withSubtitle(context: Context, subtitle: String): Spanned { ForegroundColorSpan(context.getResourceColor(android.R.attr.textColorSecondary)), this.length + 1, spannable.length, - Spannable.SPAN_EXCLUSIVE_EXCLUSIVE + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE, ) return spannable } diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/manga/MangaCoverMetadata.kt b/app/src/main/java/eu/kanade/tachiyomi/util/manga/MangaCoverMetadata.kt index ae6f840d35..86cc604d64 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/manga/MangaCoverMetadata.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/manga/MangaCoverMetadata.kt @@ -24,7 +24,7 @@ object MangaCoverMetadata { } else { null } - }.toMap() + }.toMap(), ) val colors = preferences.coverColors().get() coverColorMap = ConcurrentHashMap( @@ -38,7 +38,7 @@ object MangaCoverMetadata { } else { null } - }.toMap() + }.toMap(), ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/manga/MangaShortcutManager.kt b/app/src/main/java/eu/kanade/tachiyomi/util/manga/MangaShortcutManager.kt index b8c5cead51..df492b76f4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/manga/MangaShortcutManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/manga/MangaShortcutManager.kt @@ -32,7 +32,7 @@ class MangaShortcutManager( val preferences: PreferencesHelper = Injekt.get(), val db: DatabaseHelper = Injekt.get(), val coverCache: CoverCache = Injekt.get(), - val sourceManager: SourceManager = Injekt.get() + val sourceManager: SourceManager = Injekt.get(), ) { val context: Context = preferences.context @@ -78,7 +78,7 @@ class MangaShortcutManager( ShortcutInfo.Builder( context, - "Manga-${item.id?.toString() ?: item.title}" + "Manga-${item.id?.toString() ?: item.title}", ) .setShortLabel(item.title.takeUnless { it.isBlank() } ?: context.getString(R.string.manga)) .setLongLabel(item.title.takeUnless { it.isBlank() } ?: context.getString(R.string.manga)) @@ -88,11 +88,11 @@ class MangaShortcutManager( } else { Icon.createWithBitmap(bitmap) } - else Icon.createWithResource(context, R.drawable.ic_book_24dp) + else Icon.createWithResource(context, R.drawable.ic_book_24dp), ) .setIntent( SearchActivity.openMangaIntent(context, item.id, true) - .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) + .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP), ) .build() } @@ -111,17 +111,17 @@ class MangaShortcutManager( else { Icon.createWithResource( context, - R.drawable.sc_extensions_48dp + R.drawable.sc_extensions_48dp, ) - } + }, ) .setIntent( Intent( context, - SearchActivity::class.java + SearchActivity::class.java, ).setAction(MainActivity.SHORTCUT_SOURCE) .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) - .putExtra(BrowseSourceController.SOURCE_ID_KEY, item.id) + .putExtra(BrowseSourceController.SOURCE_ID_KEY, item.id), ) .build() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/AuthenticatorUtil.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/AuthenticatorUtil.kt index d0ed23838d..1f69307067 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/AuthenticatorUtil.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/AuthenticatorUtil.kt @@ -28,14 +28,14 @@ object AuthenticatorUtil { title: String, subtitle: String? = null, confirmationRequired: Boolean = true, - callback: AuthenticationCallback + callback: AuthenticationCallback, ) { isAuthenticating = true val executor: Executor = ContextCompat.getMainExecutor(this) val biometricPrompt = BiometricPrompt( this, executor, - callback + callback, ) val promptInfo = BiometricPrompt.PromptInfo.Builder() diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt index 4b5560d724..3f64a222bd 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt @@ -180,7 +180,7 @@ val Context.animatorDurationScale: Float */ fun Context.notificationBuilder( channelId: String, - block: (NotificationCompat.Builder.() -> Unit)? = null + block: (NotificationCompat.Builder.() -> Unit)? = null, ): NotificationCompat.Builder { val builder = NotificationCompat.Builder(this, channelId) .setColor(ContextCompat.getColor(this, R.color.secondaryTachiyomi)) @@ -286,7 +286,7 @@ val Context.powerManager: PowerManager */ fun Context.sendLocalBroadcast(intent: Intent) { androidx.localbroadcastmanager.content.LocalBroadcastManager.getInstance(this).sendBroadcast( - intent + intent, ) } @@ -297,7 +297,7 @@ fun Context.sendLocalBroadcast(intent: Intent) { */ fun Context.sendLocalBroadcastSync(intent: Intent) { androidx.localbroadcastmanager.content.LocalBroadcastManager.getInstance(this).sendBroadcastSync( - intent + intent, ) } @@ -309,7 +309,7 @@ fun Context.sendLocalBroadcastSync(intent: Intent) { fun Context.registerLocalReceiver(receiver: BroadcastReceiver, filter: IntentFilter) { androidx.localbroadcastmanager.content.LocalBroadcastManager.getInstance(this).registerReceiver( receiver, - filter + filter, ) } @@ -320,7 +320,7 @@ fun Context.registerLocalReceiver(receiver: BroadcastReceiver, filter: IntentFil */ fun Context.unregisterLocalReceiver(receiver: BroadcastReceiver) { androidx.localbroadcastmanager.content.LocalBroadcastManager.getInstance(this).unregisterReceiver( - receiver + receiver, ) } @@ -363,7 +363,7 @@ fun Context.openInBrowser(uri: Uri, @ColorInt toolbarColor: Int? = null) { .setDefaultColorSchemeParams( CustomTabColorSchemeParams.Builder() .setToolbarColor(toolbarColor ?: getResourceColor(R.attr.colorPrimaryVariant)) - .build() + .build(), ) .build() intent.launchUrl(this, uri) @@ -382,7 +382,7 @@ fun Context.openInBrowser(url: String, forceBrowser: Boolean): Boolean { .setDefaultColorSchemeParams( CustomTabColorSchemeParams.Builder() .setToolbarColor(getResourceColor(R.attr.colorPrimaryVariant)) - .build() + .build(), ) .build() if (forceBrowser) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/DateExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/DateExtensions.kt index 7532d3a312..5e1abea5d3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/DateExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/DateExtensions.kt @@ -38,7 +38,7 @@ fun Long.toUtcCalendar(): Calendar? { rawCalendar.get(Calendar.DAY_OF_MONTH), rawCalendar.get(Calendar.HOUR_OF_DAY), rawCalendar.get(Calendar.MINUTE), - rawCalendar.get(Calendar.SECOND) + rawCalendar.get(Calendar.SECOND), ) } } @@ -63,7 +63,7 @@ fun Long.toLocalCalendar(): Calendar? { rawCalendar.get(Calendar.DAY_OF_MONTH), rawCalendar.get(Calendar.HOUR_OF_DAY), rawCalendar.get(Calendar.MINUTE), - rawCalendar.get(Calendar.SECOND) + rawCalendar.get(Calendar.SECOND), ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt index e20c52d56c..9bb54607af 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt @@ -255,11 +255,11 @@ object ImageUtil { if (darkBG) { return if (!isLandscape && isWhite(image.getPixel(left, bot)) && isWhite(image.getPixel(right, bot))) GradientDrawable( GradientDrawable.Orientation.TOP_BOTTOM, - intArrayOf(blackPixel, blackPixel, backgroundColor, backgroundColor) + intArrayOf(blackPixel, blackPixel, backgroundColor, backgroundColor), ) else if (!isLandscape && isWhite(image.getPixel(left, top)) && isWhite(image.getPixel(right, top))) GradientDrawable( GradientDrawable.Orientation.TOP_BOTTOM, - intArrayOf(backgroundColor, backgroundColor, blackPixel, blackPixel) + intArrayOf(backgroundColor, backgroundColor, blackPixel, blackPixel), ) else ColorDrawable(blackPixel) } @@ -273,7 +273,7 @@ object ImageUtil { ) { return GradientDrawable( GradientDrawable.Orientation.TOP_BOTTOM, - intArrayOf(blackPixel, blackPixel, backgroundColor, backgroundColor) + intArrayOf(blackPixel, blackPixel, backgroundColor, backgroundColor), ) } else if (!isLandscape && ( bottomIsBlackStreak || ( @@ -285,7 +285,7 @@ object ImageUtil { ) { return GradientDrawable( GradientDrawable.Orientation.TOP_BOTTOM, - intArrayOf(backgroundColor, backgroundColor, blackPixel, blackPixel) + intArrayOf(backgroundColor, backgroundColor, blackPixel, blackPixel), ) } return ColorDrawable(backgroundColor) @@ -311,7 +311,7 @@ object ImageUtil { fun splitBitmap( imageBitmap: Bitmap, secondHalf: Boolean, - progressCallback: ((Int) -> Unit)? = null + progressCallback: ((Int) -> Unit)? = null, ): ByteArrayInputStream { val height = imageBitmap.height val width = imageBitmap.width @@ -330,7 +330,7 @@ object ImageUtil { imageBitmap: Bitmap, rightSideOnTop: Boolean, hasMargins: Boolean, - progressCallback: ((Int) -> Unit)? = null + progressCallback: ((Int) -> Unit)? = null, ): ByteArrayInputStream { val height = imageBitmap.height val width = imageBitmap.width @@ -343,13 +343,13 @@ object ImageUtil { 0, 0, result.width, - result.height / 2 + result.height / 2, ) val lowerPart = Rect( 0, result.height / 2 + gap, result.width, - result.height + result.height, ) canvas.drawBitmap( imageBitmap, @@ -357,10 +357,10 @@ object ImageUtil { if (!rightSideOnTop) 0 else width / 2, 0, if (!rightSideOnTop) width / 2 else width, - height + height, ), upperPart, - null + null, ) canvas.drawBitmap( imageBitmap, @@ -368,10 +368,10 @@ object ImageUtil { if (rightSideOnTop) 0 else width / 2, 0, if (rightSideOnTop) width / 2 else width, - height + height, ), lowerPart, - null + null, ) progressCallback?.invoke(99) val output = ByteArrayOutputStream() @@ -385,7 +385,7 @@ object ImageUtil { imageBitmap2: Bitmap, isLTR: Boolean, @ColorInt background: Int = Color.WHITE, - progressCallback: ((Int) -> Unit)? = null + progressCallback: ((Int) -> Unit)? = null, ): ByteArrayInputStream { val height = imageBitmap.height val width = imageBitmap.width @@ -399,7 +399,7 @@ object ImageUtil { if (isLTR) 0 else width2, (maxHeight - imageBitmap.height) / 2, (if (isLTR) 0 else width2) + imageBitmap.width, - imageBitmap.height + (maxHeight - imageBitmap.height) / 2 + imageBitmap.height + (maxHeight - imageBitmap.height) / 2, ) canvas.drawBitmap(imageBitmap, imageBitmap.rect, upperPart, null) progressCallback?.invoke(98) @@ -407,7 +407,7 @@ object ImageUtil { if (!isLTR) 0 else width, (maxHeight - imageBitmap2.height) / 2, (if (!isLTR) 0 else width) + imageBitmap2.width, - imageBitmap2.height + (maxHeight - imageBitmap2.height) / 2 + imageBitmap2.height + (maxHeight - imageBitmap2.height) / 2, ) canvas.drawBitmap(imageBitmap2, imageBitmap2.rect, bottomPart, null) progressCallback?.invoke(99) @@ -459,7 +459,7 @@ object ImageUtil { fun getPercentOfColor( @ColorInt color: Int, @ColorInt colorFrom: Int, - @ColorInt colorTo: Int + @ColorInt colorTo: Int, ): Float { val reds = arrayOf(Color.red(color), Color.red(colorFrom), Color.red(colorTo)) val blues = arrayOf(Color.blue(color), Color.blue(colorFrom), Color.blue(colorTo)) @@ -473,7 +473,7 @@ object ImageUtil { rPercent.takeIf { reds[2] != reds[1] }, bPercent.takeIf { blues[2] != blues[1] }, gPercent.takeIf { greens[2] != greens[1] }, - aPercent.takeIf { alphas[2] != alphas[1] } + aPercent.takeIf { alphas[2] != alphas[1] }, ).filterNotNull().average().toFloat().takeIf { it in 0f..1f } ?: 0f } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/MaterialAlertDialogExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/MaterialAlertDialogExtensions.kt index ba2393e389..ba64e81ac4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/MaterialAlertDialogExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/MaterialAlertDialogExtensions.kt @@ -23,7 +23,7 @@ fun Context.materialAlertDialog() = MaterialAlertDialogBuilder(withOriginalWidth fun MaterialAlertDialogBuilder.addCheckBoxPrompt( @StringRes stringRes: Int, isChecked: Boolean = false, - listener: MaterialAlertDialogBuilderOnCheckClickListener? = null + listener: MaterialAlertDialogBuilderOnCheckClickListener? = null, ): MaterialAlertDialogBuilder { return addCheckBoxPrompt(context.getString(stringRes), isChecked, listener) } @@ -31,11 +31,11 @@ fun MaterialAlertDialogBuilder.addCheckBoxPrompt( fun MaterialAlertDialogBuilder.addCheckBoxPrompt( text: CharSequence, isChecked: Boolean = false, - listener: MaterialAlertDialogBuilderOnCheckClickListener? = null + listener: MaterialAlertDialogBuilderOnCheckClickListener? = null, ): MaterialAlertDialogBuilder { return setMultiChoiceItems( arrayOf(text), - booleanArrayOf(isChecked) + booleanArrayOf(isChecked), ) { dialog, _, checked -> listener?.onClick(dialog, checked) } @@ -56,7 +56,7 @@ fun AlertDialog.disableItems(items: Array) { } override fun onChildViewRemoved(view: View?, view1: View?) {} - } + }, ) } @@ -69,7 +69,7 @@ fun MaterialAlertDialogBuilder.setCustomTitleAndMessage(title: Int, message: Str alertTitle.isVisible = false } this.message.text = message - }.root + }.root, ) } @@ -93,7 +93,7 @@ internal fun MaterialAlertDialogBuilder.setTriStateItems( disabledItems = disabledIndices, initialSelection = initialSelection, skipChecked = skipChecked, - listener = selection + listener = selection, ) val updateScrollIndicators = { binding.scrollIndicatorUp.isVisible = binding.list.canScrollVertically(-1) @@ -116,7 +116,7 @@ internal fun MaterialAlertDialogBuilder.setTriStateItems( internal fun MaterialAlertDialogBuilder.setNegativeStateItems( items: List, initialSelection: BooleanArray = BooleanArray(items.size), - listener: DialogInterface.OnMultiChoiceClickListener + listener: DialogInterface.OnMultiChoiceClickListener, ): MaterialAlertDialogBuilder { return setTriStateItems( items = items, @@ -128,7 +128,7 @@ internal fun MaterialAlertDialogBuilder.setNegativeStateItems( } } .toIntArray(), - skipChecked = true + skipChecked = true, ) { _, _, _, index, state -> listener.onClick(null, index, state == TriStateCheckBox.State.IGNORE.ordinal) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/RxCoroutineBridge.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/RxCoroutineBridge.kt index 740f943497..231cb33459 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/RxCoroutineBridge.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/RxCoroutineBridge.kt @@ -35,8 +35,8 @@ private suspend fun Observable.awaitOne(): T = suspendCancellableCoroutin override fun onCompleted() { if (cont.isActive) cont.resumeWithException( IllegalStateException( - "Should have invoked onNext" - ) + "Should have invoked onNext", + ), ) } @@ -49,8 +49,8 @@ private suspend fun Observable.awaitOne(): T = suspendCancellableCoroutin cont.completeResume(token) } } - } - ) + }, + ), ) } @@ -78,6 +78,6 @@ fun runAsObservable( } emitter.setCancellation { job.cancel() } }, - backpressureMode + backpressureMode, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/RxUtil.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/RxUtil.kt index bf8651af8d..94c11a0414 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/RxUtil.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/RxUtil.kt @@ -20,7 +20,7 @@ suspend fun Single.await(subscribeOn: Scheduler? = null): T { if (!continuation.isCancelled) { continuation.resumeWithException(it) } - } + }, ) continuation.invokeOnCancellation { diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/ThemeUtil.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/ThemeUtil.kt index 3e730cb7ef..96843c5ec9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/ThemeUtil.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/ThemeUtil.kt @@ -21,19 +21,19 @@ object ThemeUtil { 0, 1 -> AppCompatDelegate.MODE_NIGHT_NO 2, 3, 4 -> AppCompatDelegate.MODE_NIGHT_YES else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM - } + }, ) preferences.lightTheme().set( when (theme) { 1 -> Themes.CLASSIC_BLUE else -> Themes.DEFAULT - } + }, ) preferences.darkTheme().set( when (theme) { 4 -> Themes.CLASSIC_BLUE else -> Themes.DEFAULT - } + }, ) } @@ -50,7 +50,7 @@ object ThemeUtil { "SPRING" -> Themes.SPRING_AND_DUSK "STRAWBERRY_DAIQUIRI" -> Themes.STRAWBERRIES else -> Themes.DEFAULT - }.name + }.name, ) putString( PreferenceKeys.darkTheme, @@ -59,7 +59,7 @@ object ThemeUtil { "CHOCOLATE_STRAWBERRIES" -> Themes.STRAWBERRIES "DARK_BLUE" -> Themes.CLASSIC_BLUE else -> Themes.DEFAULT - }.name + }.name, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/Themes.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/Themes.kt index a66c117da5..280f84ae7f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/Themes.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/Themes.kt @@ -11,58 +11,58 @@ enum class Themes(@StyleRes val styleRes: Int, val nightMode: Int, @StringRes va R.style.Theme_Tachiyomi_Monet, AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM, R.string.a_brighter_you, - R.string.a_calmer_you + R.string.a_calmer_you, ), DEFAULT( R.style.Theme_Tachiyomi, AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM, R.string.white_theme, - R.string.dark + R.string.dark, ), SPRING_AND_DUSK( R.style.Theme_Tachiyomi_MidnightDusk, AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM, R.string.spring_blossom, - R.string.midnight_dusk + R.string.midnight_dusk, ), STRAWBERRIES( R.style.Theme_Tachiyomi_Strawberries, AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM, R.string.strawberry_daiquiri, - R.string.chocolate_strawberries + R.string.chocolate_strawberries, ), TEAL_AND_SAPPHIRE( R.style.Theme_Tachiyomi_SapphireDusk, AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM, R.string.teal_ocean, - R.string.sapphire_dusk + R.string.sapphire_dusk, ), TAKO( R.style.Theme_Tachiyomi_Tako, AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM, - R.string.tako + R.string.tako, ), YIN_AND_YANG( R.style.Theme_Tachiyomi_YinYang, AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM, R.string.yang, - R.string.yin + R.string.yin, ), LIME( R.style.Theme_Tachiyomi_FlatLime, AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM, R.string.lime_time, - R.string.flat_lime + R.string.flat_lime, ), YOTSUBA( R.style.Theme_Tachiyomi_Yotsuba, AppCompatDelegate.MODE_NIGHT_NO, - R.string.yotsuba + R.string.yotsuba, ), CLASSIC_BLUE( R.style.Theme_Tachiyomi_AllBlue, AppCompatDelegate.MODE_NIGHT_YES, - R.string.classic_blue + R.string.classic_blue, ), ; diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/WebViewClientCompat.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/WebViewClientCompat.kt index 5ccbb4f7e5..6c6fba4ff6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/WebViewClientCompat.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/WebViewClientCompat.kt @@ -24,14 +24,14 @@ abstract class WebViewClientCompat : WebViewClient() { errorCode: Int, description: String?, failingUrl: String, - isMainFrame: Boolean + isMainFrame: Boolean, ) { } @TargetApi(Build.VERSION_CODES.N) final override fun shouldOverrideUrlLoading( view: WebView, - request: WebResourceRequest + request: WebResourceRequest, ): Boolean { return shouldOverrideUrlCompat(view, request.url.toString()) } @@ -42,14 +42,14 @@ abstract class WebViewClientCompat : WebViewClient() { final override fun shouldInterceptRequest( view: WebView, - request: WebResourceRequest + request: WebResourceRequest, ): WebResourceResponse? { return shouldInterceptRequestCompat(view, request.url.toString()) } final override fun shouldInterceptRequest( view: WebView, - url: String + url: String, ): WebResourceResponse? { return shouldInterceptRequestCompat(view, url) } @@ -57,14 +57,14 @@ abstract class WebViewClientCompat : WebViewClient() { final override fun onReceivedError( view: WebView, request: WebResourceRequest, - error: WebResourceError + error: WebResourceError, ) { onReceivedErrorCompat( view, error.errorCode, error.description?.toString(), request.url.toString(), - request.isForMainFrame + request.isForMainFrame, ) } @@ -72,7 +72,7 @@ abstract class WebViewClientCompat : WebViewClient() { view: WebView, errorCode: Int, description: String?, - failingUrl: String + failingUrl: String, ) { onReceivedErrorCompat(view, errorCode, description, failingUrl, failingUrl == view.url) } @@ -80,7 +80,7 @@ abstract class WebViewClientCompat : WebViewClient() { final override fun onReceivedHttpError( view: WebView, request: WebResourceRequest, - error: WebResourceResponse + error: WebResourceResponse, ) { onReceivedErrorCompat( view, @@ -88,7 +88,7 @@ abstract class WebViewClientCompat : WebViewClient() { error.reasonPhrase, request.url .toString(), - request.isForMainFrame + request.isForMainFrame, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/view/ControllerExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/view/ControllerExtensions.kt index 3038766780..38975c8bc9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/view/ControllerExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/view/ControllerExtensions.kt @@ -70,7 +70,7 @@ fun Controller.setOnQueryTextChangeListener( searchView: SearchView?, onlyOnSubmit: Boolean = false, hideKbOnSubmit: Boolean = true, - f: (text: String?) -> Boolean + f: (text: String?) -> Boolean, ) { searchView?.setOnQueryTextListener( object : SearchView.OnQueryTextListener { @@ -95,7 +95,7 @@ fun Controller.setOnQueryTextChangeListener( } return true } - } + }, ) } @@ -105,11 +105,13 @@ fun Controller.removeQueryListener() { searchView?.setOnQueryTextListener(object : SearchView.OnQueryTextListener { override fun onQueryTextSubmit(query: String?) = true override fun onQueryTextChange(newText: String?) = true - }) + }, + ) searchView2?.setOnQueryTextListener(object : SearchView.OnQueryTextListener { override fun onQueryTextSubmit(query: String?) = true override fun onQueryTextChange(newText: String?) = true - }) + }, + ) } fun Controller.liftAppbarWith(recycler: RecyclerView, padView: Boolean = false) { @@ -126,7 +128,7 @@ fun Controller.liftAppbarWith(recycler: RecyclerView, padView: Boolean = false) } recycler.updatePaddingRelative( top = activityBinding!!.toolbar.y.toInt() + appBarHeight, - bottom = recycler.rootWindowInsetsCompat?.getInsets(systemBars())?.bottom ?: 0 + bottom = recycler.rootWindowInsetsCompat?.getInsets(systemBars())?.bottom ?: 0, ) recycler.applyBottomAnimatedInsets(setPadding = true) { view, insets -> val headerHeight = insets.getInsets(systemBars()).top + appBarHeight @@ -137,7 +139,7 @@ fun Controller.liftAppbarWith(recycler: RecyclerView, padView: Boolean = false) val headerHeight = insets.getInsets(systemBars()).top + appBarHeight view.updatePaddingRelative( top = headerHeight, - bottom = insets.getInsets(ime() or systemBars()).bottom + bottom = insets.getInsets(ime() or systemBars()).bottom, ) } } @@ -157,7 +159,7 @@ fun Controller.liftAppbarWith(recycler: RecyclerView, padView: Boolean = false) val percent = ImageUtil.getPercentOfColor( activityBinding!!.appBar.backgroundColor ?: Color.TRANSPARENT, activity!!.getResourceColor(R.attr.colorSurface), - activity!!.getResourceColor(R.attr.colorPrimaryVariant) + activity!!.getResourceColor(R.attr.colorPrimaryVariant), ) if (floatingBar) { setAppBarBG(0f) @@ -193,7 +195,7 @@ fun Controller.liftAppbarWith(recycler: RecyclerView, padView: Boolean = false) if (notAtTop != isToolbarColored) colorToolbar(notAtTop) } } - } + }, ) } @@ -247,7 +249,7 @@ fun Controller.scrollViewWith( top = ( activity?.window?.decorView?.rootWindowInsetsCompat?.getInsets(systemBars())?.top ?: 0 - ) + appBarHeight + ) + appBarHeight, ) } val atTopOfRecyclerView: () -> Boolean = f@{ @@ -265,12 +267,12 @@ fun Controller.scrollViewWith( val headerHeight = systemInsets.top + appBarHeight if (!customPadding) view.updatePaddingRelative( top = headerHeight, - bottom = if (padBottom) systemInsets.bottom else view.paddingBottom + bottom = if (padBottom) systemInsets.bottom else view.paddingBottom, ) swipeRefreshLayout?.setProgressViewOffset( true, headerHeight + (-60).dpToPx, - headerHeight + 10.dpToPx + headerHeight + 10.dpToPx, ) statusBarHeight = systemInsets.top afterInsets?.invoke(insets) @@ -294,7 +296,7 @@ fun Controller.scrollViewWith( val percent = ImageUtil.getPercentOfColor( activityBinding!!.appBar.backgroundColor ?: Color.TRANSPARENT, activity!!.getResourceColor(R.attr.colorSurface), - activity!!.getResourceColor(R.attr.colorPrimaryVariant) + activity!!.getResourceColor(R.attr.colorPrimaryVariant), ) toolbarColorAnim = ValueAnimator.ofFloat(percent, isColored.toInt().toFloat()) toolbarColorAnim?.addUpdateListener { valueAnimator -> @@ -311,14 +313,14 @@ fun Controller.scrollViewWith( override fun onChangeStart( controller: Controller, changeHandler: ControllerChangeHandler, - changeType: ControllerChangeType + changeType: ControllerChangeType, ) { super.onChangeStart(controller, changeHandler, changeType) isInView = changeType.isEnter if (changeType.isEnter) { activityBinding?.appBar?.hideBigView( this@scrollViewWith is SmallToolbarInterface, - setTitleAlpha = this@scrollViewWith !is MangaDetailsController + setTitleAlpha = this@scrollViewWith !is MangaDetailsController, ) activityBinding?.appBar?.setToolbarModeBy(this@scrollViewWith) activityBinding?.appBar?.useTabsInPreLayout = includeTabView @@ -378,7 +380,7 @@ fun Controller.scrollViewWith( if (activityBinding!!.toolbar.tag == randomTag) activityBinding!!.toolbar.setOnClickListener(null) } } - } + }, ) colorToolbar(!atTopOfRecyclerView()) @@ -399,7 +401,7 @@ fun Controller.scrollViewWith( ) { if (!recycler.canScrollVertically(-1)) { val shortAnimationDuration = resources?.getInteger( - android.R.integer.config_shortAnimTime + android.R.integer.config_shortAnimTime, ) ?: 0 activityBinding!!.appBar.y = 0f activityBinding!!.appBar.updateAppBarAfterY(recycler) @@ -425,7 +427,7 @@ fun Controller.scrollViewWith( bottomNav.translationY = MathUtils.clamp( bottomNav.translationY, 0f, - bottomNav.height.toFloat() + bottomNav.height.toFloat(), ) updateViewsNearBottom() } else if (bottomNav.translationY != 0f) { @@ -451,7 +453,7 @@ fun Controller.scrollViewWith( } swipeCircle?.translationY = max( activityBinding!!.appBar.y, - -activityBinding!!.appBar.height + activityBinding!!.appBar.paddingTop.toFloat() + -activityBinding!!.appBar.height + activityBinding!!.appBar.paddingTop.toFloat(), ) } } @@ -467,7 +469,7 @@ fun Controller.scrollViewWith( ) { val halfWay = activityBinding!!.appBar.height.toFloat() / 2 val shortAnimationDuration = resources?.getInteger( - android.R.integer.config_shortAnimTime + android.R.integer.config_shortAnimTime, ) ?: 0 val closerToTop = abs(activityBinding!!.appBar.y) > halfWay val halfWayBottom = (activityBinding!!.bottomNav?.height?.toFloat() ?: 0f) / 2 @@ -481,7 +483,7 @@ fun Controller.scrollViewWith( val activityBinding = activityBinding ?: return@snapAppBarY swipeCircle?.translationY = max( activityBinding.appBar.y, - -activityBinding.appBar.height + activityBinding.appBar.paddingTop.toFloat() + -activityBinding.appBar.height + activityBinding.appBar.paddingTop.toFloat(), ) } if (activityBinding!!.bottomNav?.isVisible == true && @@ -509,7 +511,7 @@ fun Controller.scrollViewWith( imm.hideSoftInputFromWindow(view.windowToken, 0) } } - } + }, ) return colorToolbar } @@ -537,7 +539,7 @@ fun Controller.setItemAnimatorForAppBar(recycler: RecyclerView) { fromX: Int, fromY: Int, toX: Int, - toY: Int + toY: Int, ): Boolean { animateAppBar() return super.animateMove(holder, fromX, fromY, toX, toY) @@ -554,7 +556,7 @@ fun Controller.setItemAnimatorForAppBar(recycler: RecyclerView) { oldHolder: RecyclerView.ViewHolder, newHolder: RecyclerView.ViewHolder, preInfo: ItemHolderInfo, - postInfo: ItemHolderInfo + postInfo: ItemHolderInfo, ): Boolean { animateAppBar() return super.animateChange(oldHolder, newHolder, preInfo, postInfo) @@ -566,7 +568,7 @@ fun Controller.setItemAnimatorForAppBar(recycler: RecyclerView) { fromX: Int, fromY: Int, toX: Int, - toY: Int + toY: Int, ): Boolean { animateAppBar() return super.animateChange(oldHolder, newHolder, fromX, fromY, toX, toY) @@ -617,7 +619,7 @@ fun Controller.setAppBarBG(value: Float, includeTabView: Boolean = false) { val color = ColorUtils.blendARGB( colorSurface, ColorUtils.setAlphaComponent(colorSurface, 0), - value + value, ) activityBinding?.appBar?.backgroundColor = color } else { @@ -631,7 +633,7 @@ fun Controller.setAppBarBG(value: Float, includeTabView: Boolean = false) { val color = ColorUtils.blendARGB( context.getResourceColor(R.attr.colorSurface), context.getResourceColor(R.attr.colorPrimaryVariant), - value + value, ) activityBinding?.appBar?.setBackgroundColor(color) if (activityBinding?.appBar?.isInvisible != true) { @@ -642,12 +644,12 @@ fun Controller.setAppBarBG(value: Float, includeTabView: Boolean = false) { val invColor = ColorUtils.blendARGB( context.getResourceColor(R.attr.colorSurface), context.getResourceColor(R.attr.colorPrimaryVariant), - 1 - value + 1 - value, ) (activityBinding?.cardView as? CardView)?.setCardBackgroundColor( ColorStateList.valueOf( - invColor - ) + invColor, + ), ) } } @@ -656,14 +658,14 @@ fun Controller.setAppBarBG(value: Float, includeTabView: Boolean = false) { fun Controller.requestFilePermissionsSafe( requestCode: Int, preferences: PreferencesHelper, - showA11PermissionAnyway: Boolean = false + showA11PermissionAnyway: Boolean = false, ) { val activity = activity ?: return val permissions = mutableListOf(Manifest.permission.WRITE_EXTERNAL_STORAGE) permissions.forEach { permission -> if (ContextCompat.checkSelfPermission( activity, - permission + permission, ) != PackageManager.PERMISSION_GRANTED ) { requestPermissions(arrayOf(permission), requestCode) @@ -682,7 +684,7 @@ fun Controller.requestFilePermissionsSafe( .setPositiveButton(android.R.string.ok) { _, _ -> val intent = Intent( Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION, - "package:${activity.packageName}".toUri() + "package:${activity.packageName}".toUri(), ) try { activity.startActivity(intent) @@ -728,7 +730,7 @@ val Controller.fullAppBarHeight: Int? get() = (activity as? MainActivity)?.bigToolbarHeight( (this as? FloatingSearchInterface)?.showFloatingBar() == true, this is TabbedInterface, - this !is SmallToolbarInterface + this !is SmallToolbarInterface, ) val Controller.isControllerVisible: Boolean diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt index 0f94becbfa..17b8b7016b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt @@ -101,7 +101,7 @@ fun View.getCoordinates() = Point((left + right) / 2, (top + bottom) / 2) fun View.snack( message: String, length: Int = Snackbar.LENGTH_SHORT, - f: (Snackbar.() -> Unit)? = null + f: (Snackbar.() -> Unit)? = null, ): Snackbar { val snack = Snackbar.make(this, message, length) if (f != null) { @@ -123,7 +123,7 @@ fun View.snack( fun View.snack( resource: Int, length: Int = Snackbar.LENGTH_SHORT, - f: (Snackbar.() -> Unit)? = null + f: (Snackbar.() -> Unit)? = null, ): Snackbar { return snack(context.getString(resource), length, f) } @@ -137,7 +137,7 @@ object RecyclerWindowInsetsListener : View.OnApplyWindowInsetsListener { override fun onApplyWindowInsets(v: View, insets: WindowInsets): WindowInsets { v.updatePaddingRelative( bottom = WindowInsetsCompat.toWindowInsetsCompat(insets) - .getInsets(systemBars()).bottom + .getInsets(systemBars()).bottom, ) return insets } @@ -146,7 +146,7 @@ object RecyclerWindowInsetsListener : View.OnApplyWindowInsetsListener { fun View.applyBottomAnimatedInsets( bottomMargin: Int = 0, setPadding: Boolean = false, - onApplyInsets: ((View, WindowInsetsCompat) -> Unit)? = null + onApplyInsets: ((View, WindowInsetsCompat) -> Unit)? = null, ) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) return val setInsets: ((WindowInsetsCompat) -> Unit) = { insets -> @@ -178,7 +178,7 @@ fun View.applyBottomAnimatedInsets( override fun onStart( animation: WindowInsetsAnimationCompat, - bounds: WindowInsetsAnimationCompat.BoundsCompat + bounds: WindowInsetsAnimationCompat.BoundsCompat, ): WindowInsetsAnimationCompat.BoundsCompat { handleInsets = false rootWindowInsetsCompat?.let { insets -> setInsets(insets) } @@ -186,7 +186,7 @@ fun View.applyBottomAnimatedInsets( } override fun onProgress( insets: WindowInsetsCompat, - runningAnimations: List + runningAnimations: List, ): WindowInsetsCompat { setInsets(insets) return insets @@ -196,7 +196,7 @@ fun View.applyBottomAnimatedInsets( handleInsets = true rootWindowInsetsCompat?.let { insets -> setInsets(insets) } } - } + }, ) } @@ -243,7 +243,7 @@ fun View.checkHeightThen(f: () -> Unit) { f() } } - } + }, ) } @@ -258,7 +258,7 @@ fun View.requestApplyInsetsWhenAttached() { } override fun onViewDetachedFromWindow(v: View) = Unit - } + }, ) } } @@ -269,7 +269,7 @@ private fun createStateForView(view: View) = ViewPaddingState( view.paddingRight, view.paddingBottom, view.paddingStart, - view.paddingEnd + view.paddingEnd, ) data class ViewPaddingState( @@ -278,7 +278,7 @@ data class ViewPaddingState( val right: Int, val bottom: Int, val start: Int, - val end: Int + val end: Int, ) fun setBottomEdge(view: View, activity: Activity) { @@ -299,7 +299,7 @@ fun SwipeRefreshLayout.setStyle() { fun MaterialButton.resetStrokeColor() { strokeColor = ColorStateList.valueOf( - ColorUtils.setAlphaComponent(context.getResourceColor(R.attr.colorOnSurface), 31) + ColorUtils.setAlphaComponent(context.getResourceColor(R.attr.colorOnSurface), 31), ) } @@ -361,7 +361,7 @@ var View.compatToolTipText: CharSequence? inline fun View.popupMenu( items: List>, selectedItemId: Int? = null, - noinline onMenuItemClick: MenuItem.() -> Unit + noinline onMenuItemClick: MenuItem.() -> Unit, ): PopupMenu { val popup = PopupMenu(context, this, Gravity.NO_GRAVITY) items.forEach { (id, stringRes) -> @@ -372,7 +372,7 @@ inline fun View.popupMenu( val blendedAccent = ColorUtils.blendARGB( context.getResourceColor(R.attr.colorSecondary), context.getResourceColor(R.attr.colorOnBackground), - 0.5f + 0.5f, ) (popup.menu as? MenuBuilder)?.setOptionalIconsVisible(true) val emptyIcon = ContextCompat.getDrawable(context, R.drawable.ic_blank_24dp) @@ -400,7 +400,7 @@ inline fun View.popupMenu( fun MaterialCardView.makeShapeCorners( @Dimension topStart: Float = 0f, - @Dimension bottomEnd: Float = 0f + @Dimension bottomEnd: Float = 0f, ): ShapeAppearanceModel { return shapeAppearanceModel.toBuilder() .apply { @@ -422,7 +422,7 @@ fun MaterialCardView.makeShapeCorners( fun setCards( showOutline: Boolean, mainCard: MaterialCardView, - badgeView: MaterialCardView? + badgeView: MaterialCardView?, ) { badgeView?.strokeWidth = if (showOutline) 0.75f.dpToPx.toInt() else 0 badgeView?.cardElevation = if (showOutline) 0f else 3f.dpToPx @@ -454,7 +454,7 @@ fun Dialog.blurBehindWindow( blurAmount: Float = 20f, onShow: DialogInterface.OnShowListener? = null, onDismiss: DialogInterface.OnDismissListener? = null, - onCancel: DialogInterface.OnCancelListener? = null + onCancel: DialogInterface.OnCancelListener? = null, ) { var supportsBlur = false if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && window?.windowManager?.isCrossWindowBlurEnabled == true) { @@ -472,7 +472,7 @@ fun Dialog.blurBehindWindow( if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) return if (canBlur) { window?.decorView?.setRenderEffect( - RenderEffect.createBlurEffect(20f, 20f, Shader.TileMode.CLAMP) + RenderEffect.createBlurEffect(20f, 20f, Shader.TileMode.CLAMP), ) } else { window?.decorView?.setRenderEffect(null) @@ -532,7 +532,7 @@ fun View.animateBlur( @FloatRange(from = 0.1) from: Float, @FloatRange(from = 0.1) to: Float, duration: Long, - removeBlurAtEnd: Boolean = false + removeBlurAtEnd: Boolean = false, ): ValueAnimator? { if (context.powerManager.isPowerSaveMode) { if (to <= 0.1f) { @@ -547,7 +547,7 @@ fun View.animateBlur( val amount = animator.animatedValue as Float try { setRenderEffect( - RenderEffect.createBlurEffect(amount, amount, Shader.TileMode.CLAMP) + RenderEffect.createBlurEffect(amount, amount, Shader.TileMode.CLAMP), ) } catch (_: Exception) {} } @@ -555,7 +555,7 @@ fun View.animateBlur( addListener( onEnd = { setRenderEffect(null) - } + }, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/AutofitRecyclerView.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/AutofitRecyclerView.kt index 68c9c25d14..c745abccc3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/AutofitRecyclerView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/AutofitRecyclerView.kt @@ -86,7 +86,7 @@ class AutofitRecyclerView @JvmOverloads constructor(context: Context, attrs: Att useStaggered( preferences.useStaggeredGrid().get() && !preferences.uniformGrid().get() && - preferences.libraryLayout().get() != LibraryItem.LAYOUT_LIST + preferences.libraryLayout().get() != LibraryItem.LAYOUT_LIST, ) } @@ -96,7 +96,7 @@ class AutofitRecyclerView @JvmOverloads constructor(context: Context, attrs: Att context, null, 1, - StaggeredGridLayoutManager.VERTICAL + StaggeredGridLayoutManager.VERTICAL, ) setNewManager() } else if (!use && manager !is GridLayoutManagerAccurateOffset) { @@ -148,7 +148,7 @@ class AutofitRecyclerView @JvmOverloads constructor(context: Context, attrs: Att 1 -> 0f 0 -> -.5f else -> .5f - } + }, ) prefs.edit { remove("grid_size") diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/DrawerSwipeCloseListener.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/DrawerSwipeCloseListener.kt index dad74a771a..70c37f46b7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/DrawerSwipeCloseListener.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/DrawerSwipeCloseListener.kt @@ -6,7 +6,7 @@ import androidx.drawerlayout.widget.DrawerLayout class DrawerSwipeCloseListener( private val drawer: androidx.drawerlayout.widget.DrawerLayout, - private val navigationView: ViewGroup + private val navigationView: ViewGroup, ) : androidx.drawerlayout.widget.DrawerLayout.SimpleDrawerListener() { override fun onDrawerOpened(drawerView: View) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/E2EBottomSheetDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/E2EBottomSheetDialog.kt index 0b1b8ba6b1..2bcbd767ad 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/E2EBottomSheetDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/E2EBottomSheetDialog.kt @@ -58,7 +58,8 @@ abstract class E2EBottomSheetDialog(activity: Activity) : sheetBehavior.isDraggable = !recyclerView.canScrollVertically(-1) } } - }) + }, + ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt index 5a141c2b13..92aa0e1ff2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt @@ -71,6 +71,6 @@ class EmptyView @JvmOverloads constructor(context: Context, attrs: AttributeSet? data class Action( @StringRes val resId: Int, - val listener: OnClickListener + val listener: OnClickListener, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/EstimatedItemHeight.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/EstimatedItemHeight.kt index b321d23f12..b949f70ce7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/EstimatedItemHeight.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/EstimatedItemHeight.kt @@ -14,7 +14,7 @@ object EstimatedItemHeight { childTypeMap: HashMap, childTypeHeightMap: HashMap>, childTypeEstimateMap: HashMap, - childAvgHeightMap: HashMap + childAvgHeightMap: HashMap, ): Int { return if (childSizesMap[pos] != null) { childSizesMap[pos] ?: 0 diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/GridLayoutManagerAccurateOffset.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/GridLayoutManagerAccurateOffset.kt index a0b0c1b6b5..e1da74a778 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/GridLayoutManagerAccurateOffset.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/GridLayoutManagerAccurateOffset.kt @@ -129,7 +129,7 @@ class GridLayoutManagerAccurateOffset(context: Context?, spanCount: Int) : GridL childTypeMap, childTypeHeightMap, childTypeEstimateMap, - childAvgHeightMap + childAvgHeightMap, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/LinearLayoutManagerAccurateOffset.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/LinearLayoutManagerAccurateOffset.kt index d6a4af1dc1..7742900803 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/LinearLayoutManagerAccurateOffset.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/LinearLayoutManagerAccurateOffset.kt @@ -85,7 +85,7 @@ class LinearLayoutManagerAccurateOffset(context: Context?) : LinearLayoutManager childTypeMap, childTypeHeightMap, childTypeEstimateMap, - childAvgHeightMap + childAvgHeightMap, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/MaterialSpinnerView.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/MaterialSpinnerView.kt index ca61bfb66f..eaf9d2f0d6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/MaterialSpinnerView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/MaterialSpinnerView.kt @@ -46,14 +46,14 @@ class MaterialSpinnerView constructor(context: Context, attrs: AttributeSet?) : private val blendedAccent = ColorUtils.blendARGB( context.getResourceColor(R.attr.colorSecondary), context.getResourceColor(R.attr.colorOnBackground), - 0.5f + 0.5f, ) private val slightAccent by lazy { ColorUtils.blendARGB( context.getResourceColor(R.attr.colorSecondary), context.getResourceColor(R.attr.colorOnBackground), - 0.9f + 0.9f, ) } @@ -72,7 +72,7 @@ class MaterialSpinnerView constructor(context: Context, attrs: AttributeSet?) : private val binding = MaterialSpinnerViewBinding.inflate( LayoutInflater.from(context), this, - false + false, ) init { @@ -164,7 +164,7 @@ class MaterialSpinnerView constructor(context: Context, attrs: AttributeSet?) : fun bindToIntPreference( pref: Preference, @ArrayRes intValuesResource: Int, - block: ((Int) -> Unit)? = null + block: ((Int) -> Unit)? = null, ) { this.pref = pref prefOffset = 0 @@ -199,7 +199,7 @@ class MaterialSpinnerView constructor(context: Context, attrs: AttributeSet?) : private fun makeSettingsPopup( preference: Preference, intValues: List, - block: ((Int) -> Unit)? = null + block: ((Int) -> Unit)? = null, ): PopupMenu { val popup = popup() // Set a listener so we are notified if a menu item is clicked @@ -215,7 +215,7 @@ class MaterialSpinnerView constructor(context: Context, attrs: AttributeSet?) : private fun makeSettingsPopup( preference: Preference, offset: Int = 0, - block: ((Int) -> Unit)? = null + block: ((Int) -> Unit)? = null, ): PopupMenu { val popup = popup() // Set a listener so we are notified if a menu item is clicked diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/MenuSheetItemView.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/MenuSheetItemView.kt index bc8d03f57f..313579a8bf 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/MenuSheetItemView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/MenuSheetItemView.kt @@ -95,7 +95,7 @@ class MenuSheetItemView constructor(context: Context, attrs: AttributeSet?) : fun setIconColor(@ColorInt color: Int) = binding?.itemTextView?.let { TextViewCompat.setCompoundDrawableTintList( it, - ColorStateList.valueOf(color) + ColorStateList.valueOf(color), ) } @@ -104,7 +104,7 @@ class MenuSheetItemView constructor(context: Context, attrs: AttributeSet?) : res, 0, 0, - 0 + 0, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/OutlineSpan.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/OutlineSpan.kt index b7ab3a82fb..e5125a28c1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/OutlineSpan.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/OutlineSpan.kt @@ -13,7 +13,7 @@ import androidx.annotation.Dimension */ class OutlineSpan( @ColorInt private val strokeColor: Int, - @Dimension private val strokeWidth: Float + @Dimension private val strokeWidth: Float, ) : ReplacementSpan() { override fun getSize( @@ -21,7 +21,7 @@ class OutlineSpan( text: CharSequence, start: Int, end: Int, - fm: Paint.FontMetricsInt? + fm: Paint.FontMetricsInt?, ): Int { return paint.measureText(text.toString().substring(start until end)).toInt() } @@ -35,7 +35,7 @@ class OutlineSpan( top: Int, y: Int, bottom: Int, - paint: Paint + paint: Paint, ) { val originTextColor = paint.color diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/RevealAnimationView.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/RevealAnimationView.kt index d9c3795776..a5fd06d03d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/RevealAnimationView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/RevealAnimationView.kt @@ -27,7 +27,7 @@ class RevealAnimationView @JvmOverloads constructor(context: Context, attrs: Att centerX, centerY, initialRadius.toFloat(), - 0f + 0f, ) // Set duration of animation. @@ -40,7 +40,7 @@ class RevealAnimationView @JvmOverloads constructor(context: Context, attrs: Att super.onAnimationEnd(animation) this@RevealAnimationView.visibility = View.INVISIBLE } - } + }, ) anim.start() @@ -66,7 +66,7 @@ class RevealAnimationView @JvmOverloads constructor(context: Context, attrs: Att centerX, centerY, 0f, - height.toFloat() + height.toFloat(), ) // Set duration of animation diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/SimpleNavigationView.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/SimpleNavigationView.kt index 116796996b..ed515804db 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/SimpleNavigationView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/SimpleNavigationView.kt @@ -23,7 +23,7 @@ import eu.kanade.tachiyomi.R as TR open class SimpleNavigationView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, - defStyleAttr: Int = 0 + defStyleAttr: Int = 0, ) : ScrimInsetsFrameLayout(context, attrs, defStyleAttr) { @@ -44,12 +44,12 @@ open class SimpleNavigationView @JvmOverloads constructor( attrs, R.styleable.NavigationView, defStyleAttr, - R.style.Widget_Design_NavigationView + R.style.Widget_Design_NavigationView, ) ViewCompat.setBackground( this, - a.getDrawable(R.styleable.NavigationView_android_background) + a.getDrawable(R.styleable.NavigationView_android_background), ) if (a.hasValue(R.styleable.NavigationView_elevation)) { @@ -57,15 +57,15 @@ open class SimpleNavigationView @JvmOverloads constructor( this, a.getDimensionPixelSize( R.styleable.NavigationView_elevation, - 0 - ).toFloat() + 0, + ).toFloat(), ) } @Suppress("DEPRECATION") ViewCompat.setFitsSystemWindows( this, - a.getBoolean(R.styleable.NavigationView_android_fitsSystemWindows, false) + a.getBoolean(R.styleable.NavigationView_android_fitsSystemWindows, false), ) maxWidth = a.getDimensionPixelSize(R.styleable.NavigationView_android_maxWidth, 0) @@ -84,7 +84,7 @@ open class SimpleNavigationView @JvmOverloads constructor( val width = when (MeasureSpec.getMode(widthSpec)) { MeasureSpec.AT_MOST -> MeasureSpec.makeMeasureSpec( min(MeasureSpec.getSize(widthSpec), maxWidth), - MeasureSpec.EXACTLY + MeasureSpec.EXACTLY, ) MeasureSpec.UNSPECIFIED -> MeasureSpec.makeMeasureSpec(maxWidth, MeasureSpec.EXACTLY) else -> widthSpec diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/SortTextView.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/SortTextView.kt index 6d12f653c4..5994ce9862 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/SortTextView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/SortTextView.kt @@ -32,7 +32,7 @@ class SortTextView constructor(context: Context, attrs: AttributeSet?) : private val binding = SortTextViewBinding.inflate( LayoutInflater.from(context), this, - false + false, ) private var mOnSortChangeListener: OnSortChangeListener? = null diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/TabbedBottomSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/TabbedBottomSheet.kt index df2081b7a2..ea2e63cf2e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/TabbedBottomSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/TabbedBottomSheet.kt @@ -59,7 +59,8 @@ abstract class TabbedBottomSheetDialog(private val activity: Activity) : view?.isNestedScrollingEnabled = true view?.requestLayout() } - }) + }, + ) } abstract fun getTabViews(): List @@ -96,7 +97,7 @@ class MeasuredViewPager @JvmOverloads constructor(context: Context, attrs: Attri var height = 0 val childWidthSpec = MeasureSpec.makeMeasureSpec( max(0, MeasureSpec.getSize(widthMeasureSpec) - paddingLeft - paddingRight), - MeasureSpec.getMode(widthMeasureSpec) + MeasureSpec.getMode(widthMeasureSpec), ) for (i in 0 until childCount) { val child = getChildAt(i) diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiTextInputEditText.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiTextInputEditText.kt index df39f48310..054d5982eb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiTextInputEditText.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiTextInputEditText.kt @@ -25,7 +25,7 @@ import uy.kohesive.injekt.api.get class TachiyomiTextInputEditText @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, - defStyleAttr: Int = R.attr.editTextStyle + defStyleAttr: Int = R.attr.editTextStyle, ) : TextInputEditText(context, attrs, defStyleAttr) { private var scope: CoroutineScope? = null diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/TriStateCheckBox.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/TriStateCheckBox.kt index 8e8a9d294c..2a10cb7f4a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/TriStateCheckBox.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/TriStateCheckBox.kt @@ -63,7 +63,7 @@ class TriStateCheckBox constructor(context: Context, attrs: AttributeSet?) : private val binding = TriStateCheckBoxBinding.inflate( LayoutInflater.from(context), this, - false + false, ) private val disabledAlpha = run { @@ -80,7 +80,7 @@ class TriStateCheckBox constructor(context: Context, attrs: AttributeSet?) : private val ignoreColor get() = if (useIndeterminateForIgnore) indeterColor else inverseColor private val disabledColor = ColorStateList.valueOf( - ColorUtils.setAlphaComponent(context.getResourceColor(R.attr.colorControlNormal), (disabledAlpha * 255).roundToInt()) + ColorUtils.setAlphaComponent(context.getResourceColor(R.attr.colorControlNormal), (disabledAlpha * 255).roundToInt()), ) init { @@ -127,7 +127,7 @@ class TriStateCheckBox constructor(context: Context, attrs: AttributeSet?) : State.UNCHECKED -> State.CHECKED else -> State.UNCHECKED }, - true + true, ) } @@ -176,7 +176,7 @@ class TriStateCheckBox constructor(context: Context, attrs: AttributeSet?) : R.drawable.anim_check_box_x_to_blank_24dp } else -> R.drawable.anim_check_box_checked_to_blank_24dp - } + }, ) backgroundTintList = uncheckedColor } @@ -190,7 +190,7 @@ class TriStateCheckBox constructor(context: Context, attrs: AttributeSet?) : useIndeterminateForIgnore -> R.drawable.anim_check_box_checked_to_indeterminate_24dp oldState == State.CHECKED -> R.drawable.anim_check_box_checked_to_x_24dp else -> R.drawable.anim_checkbox_blank_to_x_24dp - } + }, ) backgroundTintList = ignoreColor } @@ -220,7 +220,7 @@ class TriStateCheckBox constructor(context: Context, attrs: AttributeSet?) : R.drawable.ic_check_box_indeterminate_24dp } else { R.drawable.ic_check_box_x_24dp - } + }, ) ignoreColor } diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/CustomDialogTitle.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/CustomDialogTitle.kt index 5b014aeb1a..a1ae906f88 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/CustomDialogTitle.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/CustomDialogTitle.kt @@ -24,11 +24,11 @@ class CustomDialogTitle constructor(context: Context, attrs: AttributeSet? = nul null, R.styleable.TextAppearance, android.R.attr.textAppearanceMedium, - android.R.style.TextAppearance_Medium + android.R.style.TextAppearance_Medium, ) a.getDimensionPixelSize( R.styleable.TextAppearance_android_textSize, - 0 + 0, ).takeIf { it != 0 }?.let { textSize -> // textSize is already expressed in pixels setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize.toFloat()) diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/TriStateMultiChoiceDialogAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/TriStateMultiChoiceDialogAdapter.kt index a46abf0366..239d32636c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/TriStateMultiChoiceDialogAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/TriStateMultiChoiceDialogAdapter.kt @@ -17,7 +17,7 @@ internal typealias TriStateMultiChoiceListener = ( indices: IntArray, items: List, selectedIndex: Int, - selectedState: Int + selectedState: Int, ) -> Unit internal class TriStateMultiChoiceDialogAdapter( @@ -78,13 +78,13 @@ internal class TriStateMultiChoiceDialogAdapter( override fun onCreateViewHolder( parent: ViewGroup, - viewType: Int + viewType: Int, ): TriStateMultiChoiceViewHolder { val listItemView: View = ListitemTristatechoiceBinding .inflate(LayoutInflater.from(dialog.context), parent, false).root return TriStateMultiChoiceViewHolder( itemView = listItemView, - adapter = this + adapter = this, ) } @@ -92,7 +92,7 @@ internal class TriStateMultiChoiceDialogAdapter( override fun onBindViewHolder( holder: TriStateMultiChoiceViewHolder, - position: Int + position: Int, ) { holder.isEnabled = !disabledIndices.contains(position) @@ -108,7 +108,7 @@ internal class TriStateMultiChoiceDialogAdapter( override fun onBindViewHolder( holder: TriStateMultiChoiceViewHolder, position: Int, - payloads: MutableList + payloads: MutableList, ) { when (payloads.firstOrNull()) { CheckPayload -> { diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/TriStateMultiChoiceViewHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/TriStateMultiChoiceViewHolder.kt index 26e370499d..6be777ee37 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/TriStateMultiChoiceViewHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/TriStateMultiChoiceViewHolder.kt @@ -7,7 +7,7 @@ import eu.kanade.tachiyomi.widget.TriStateCheckBox internal class TriStateMultiChoiceViewHolder( itemView: View, - private val adapter: TriStateMultiChoiceDialogAdapter + private val adapter: TriStateMultiChoiceDialogAdapter, ) : RecyclerView.ViewHolder(itemView), View.OnClickListener { val controlView: TriStateCheckBox = itemView.findViewById(R.id.md_tri_state_checkbox) diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/IntListMatPreference.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/IntListMatPreference.kt index cf8196a528..93d631a940 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/IntListMatPreference.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/IntListMatPreference.kt @@ -10,7 +10,7 @@ class IntListMatPreference @JvmOverloads constructor( context: Context, attrs: AttributeSet? = - null + null, ) : MatPreference(activity, context, attrs) { var entryValues: List = emptyList() diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/ListMatPreference.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/ListMatPreference.kt index ad8e0b8f36..57f472c7f5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/ListMatPreference.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/ListMatPreference.kt @@ -11,7 +11,7 @@ open class ListMatPreference @JvmOverloads constructor( activity: Activity?, context: Context, attrs: AttributeSet? = - null + null, ) : MatPreference(activity, context, attrs) { @@ -47,7 +47,7 @@ open class ListMatPreference @JvmOverloads constructor( if (sharedPref != null) { val settings = context.getSharedPreferences(sharedPref, Context.MODE_PRIVATE) settings.getString(key, "") - } else prefs.getStringPref(key, defValue).get() + } else prefs.getStringPref(key, defValue).get(), ) setSingleChoiceItems(entries.toTypedArray(), default) { dialog, pos -> val value = entryValues[pos] @@ -62,7 +62,7 @@ open class ListMatPreference @JvmOverloads constructor( entries[pos] else otherPref?.summary = otherPref?.summary?.toString()?.replace( oldDef, - entries[pos] + entries[pos], ) ?: entries[pos] } else { prefs.getStringPref(key, defValue).set(value) diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginDialogPreference.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginDialogPreference.kt index a7f2154057..d20fb6e2f2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginDialogPreference.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginDialogPreference.kt @@ -19,7 +19,7 @@ import uy.kohesive.injekt.injectLazy abstract class LoginDialogPreference( @StringRes private val usernameLabelRes: Int? = null, - bundle: Bundle? = null + bundle: Bundle? = null, ) : DialogController(bundle) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/MatPreference.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/MatPreference.kt index 28b0410111..61835dceee 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/MatPreference.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/MatPreference.kt @@ -17,7 +17,7 @@ open class MatPreference @JvmOverloads constructor( context: Context, attrs: AttributeSet? = - null + null, ) : Preference(context, attrs) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/MultiListMatPreference.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/MultiListMatPreference.kt index 9cd989a8ba..eb4c754b75 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/MultiListMatPreference.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/MultiListMatPreference.kt @@ -14,7 +14,7 @@ class MultiListMatPreference @JvmOverloads constructor( activity: Activity?, context: Context, attrs: AttributeSet? = - null + null, ) : ListMatPreference(activity, context, attrs) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/SwitchPreferenceCategory.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/SwitchPreferenceCategory.kt index 9412abcd67..72948ca07a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/SwitchPreferenceCategory.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/SwitchPreferenceCategory.kt @@ -15,12 +15,12 @@ import eu.kanade.tachiyomi.util.system.getResourceColor class SwitchPreferenceCategory @JvmOverloads constructor( context: Context, - attrs: AttributeSet? = null + attrs: AttributeSet? = null, ) : PreferenceCategory( context, attrs, - R.attr.switchPreferenceCompatStyle + R.attr.switchPreferenceCompatStyle, ), CompoundButton.OnCheckedChangeListener { @@ -120,7 +120,7 @@ class SwitchPreferenceCategory @JvmOverloads constructor( getPersistedBoolean(mChecked) } else { defaultValue as Boolean - } + }, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/TriStateListPreference.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/TriStateListPreference.kt index 348e3bf63a..1d89fb82ba 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/TriStateListPreference.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/TriStateListPreference.kt @@ -14,7 +14,7 @@ class TriStateListPreference @JvmOverloads constructor( activity: Activity?, context: Context, attrs: AttributeSet? = - null + null, ) : ListMatPreference(activity, context, attrs) { @@ -83,7 +83,7 @@ class TriStateListPreference @JvmOverloads constructor( }.orEmpty() val allValue = intArrayOf( if (set.isEmpty()) TriStateCheckBox.State.CHECKED.ordinal - else TriStateCheckBox.State.UNCHECKED.ordinal + else TriStateCheckBox.State.UNCHECKED.ordinal, ) val preselected = if (allSelectionRes != null && !showAllLast) { allValue } else { intArrayOf() } + entryValues @@ -107,7 +107,7 @@ class TriStateListPreference @JvmOverloads constructor( setTriStateItems( items = items, disabledIndices = if (allSelectionRes != null) intArrayOf(allPos) else null, - initialSelection = preselected + initialSelection = preselected, ) { adapter, sels, _, _, _ -> val selections = sels.filterIndexed { index, _ -> allSelectionRes == null || index != allPos } includedItems = selections diff --git a/app/src/test/java/eu/kanade/tachiyomi/data/backup/BackupTest.kt b/app/src/test/java/eu/kanade/tachiyomi/data/backup/BackupTest.kt index 6af2fdccd1..0f3ca02c10 100644 --- a/app/src/test/java/eu/kanade/tachiyomi/data/backup/BackupTest.kt +++ b/app/src/test/java/eu/kanade/tachiyomi/data/backup/BackupTest.kt @@ -29,9 +29,9 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mockito.RETURNS_DEEP_STUBS -import org.mockito.Mockito.`when` import org.mockito.Mockito.anyLong import org.mockito.Mockito.mock +import org.mockito.Mockito.`when` import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import rx.Observable diff --git a/app/src/test/java/eu/kanade/tachiyomi/data/library/LibraryUpdateServiceTest.kt b/app/src/test/java/eu/kanade/tachiyomi/data/library/LibraryUpdateServiceTest.kt index 2acdedcc9a..f3054fdb2e 100644 --- a/app/src/test/java/eu/kanade/tachiyomi/data/library/LibraryUpdateServiceTest.kt +++ b/app/src/test/java/eu/kanade/tachiyomi/data/library/LibraryUpdateServiceTest.kt @@ -18,8 +18,8 @@ import org.junit.runner.RunWith import org.mockito.Matchers.anyLong import org.mockito.Mockito import org.mockito.Mockito.RETURNS_DEEP_STUBS -import org.mockito.Mockito.`when` import org.mockito.Mockito.mock +import org.mockito.Mockito.`when` import org.robolectric.Robolectric import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config