diff --git a/.editorconfig b/.editorconfig index 1b1fadfbc..21aff0e67 100644 --- a/.editorconfig +++ b/.editorconfig @@ -26,3 +26,10 @@ ktlint_standard_class-signature = disabled ktlint_standard_discouraged-comment-location = disabled ktlint_standard_function-expression-body = disabled ktlint_standard_function-signature = disabled + +# Avoid ktlint format messy code from SY +ktlint_standard_max-line-length = disabled +ktlint_standard_comment-wrapping = disabled +ktlint_standard_type-argument-comment = disabled +ktlint_standard_value-argument-comment = disabled +ktlint_standard_value-parameter-comment = disabled diff --git a/app/src/main/java/eu/kanade/domain/chapter/model/ChapterFilter.kt b/app/src/main/java/eu/kanade/domain/chapter/model/ChapterFilter.kt index 5cdb82673..37da52363 100644 --- a/app/src/main/java/eu/kanade/domain/chapter/model/ChapterFilter.kt +++ b/app/src/main/java/eu/kanade/domain/chapter/model/ChapterFilter.kt @@ -15,8 +15,10 @@ import tachiyomi.source.local.isLocal */ fun List.applyFilters( manga: Manga, - downloadManager: DownloadManager, /* SY --> */ - mergedManga: Map, /* SY <-- */ + downloadManager: DownloadManager, + // SY --> + mergedManga: Map, + // SY <-- ): List { val isLocalManga = manga.isLocal() val unreadFilter = manga.unreadFilter @@ -34,7 +36,9 @@ fun List.applyFilters( val downloaded = downloadManager.isChapterDownloaded( chapter.name, chapter.scanlator, - /* SY --> */ manga.ogTitle /* SY <-- */, + // SY --> + manga.ogTitle, + // SY <-- manga.source, ) downloaded || isLocalManga diff --git a/app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesProgressDialog.kt b/app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesProgressDialog.kt index 747d706d5..1f62ac4a3 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesProgressDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesProgressDialog.kt @@ -42,7 +42,8 @@ fun SyncFavoritesProgressDialog( text = context.stringResource( SYMR.strings.favorites_sync_bad_library_state, context.stringResource( - SYMR.strings.favorites_sync_gallery_in_multiple_categories, status.mangaTitle, + SYMR.strings.favorites_sync_gallery_in_multiple_categories, + status.mangaTitle, status.categories.joinToString(), ), ), @@ -62,14 +63,10 @@ fun SyncFavoritesProgressDialog( when (it) { is FavoritesSyncStatus.SyncError.GallerySyncError.GalleryAddFail -> context.stringResource(SYMR.strings.favorites_sync_failed_to_add_to_local) + - context.stringResource( - SYMR.strings.favorites_sync_failed_to_add_to_local_error, it.title, it.reason, - ) + context.stringResource(SYMR.strings.favorites_sync_failed_to_add_to_local_error, it.title, it.reason) is FavoritesSyncStatus.SyncError.GallerySyncError.InvalidGalleryFail -> context.stringResource(SYMR.strings.favorites_sync_failed_to_add_to_local) + - context.stringResource( - SYMR.strings.favorites_sync_failed_to_add_to_local_unknown_type, it.title, it.url, - ) + context.stringResource(SYMR.strings.favorites_sync_failed_to_add_to_local_unknown_type, it.title, it.url) is FavoritesSyncStatus.SyncError.GallerySyncError.UnableToAddGalleryToRemote -> context.stringResource(SYMR.strings.favorites_sync_unable_to_add_to_remote, it.title, it.gid) FavoritesSyncStatus.SyncError.GallerySyncError.UnableToDeleteFromRemote -> @@ -100,14 +97,10 @@ fun SyncFavoritesProgressDialog( context.stringResource(SYMR.strings.favorites_sync_unknown_error, status.message) is FavoritesSyncStatus.SyncError.GallerySyncError.GalleryAddFail -> context.stringResource(SYMR.strings.favorites_sync_failed_to_add_to_local) + - context.stringResource( - SYMR.strings.favorites_sync_failed_to_add_to_local_error, status.title, status.reason, - ) + context.stringResource(SYMR.strings.favorites_sync_failed_to_add_to_local_error, status.title, status.reason) is FavoritesSyncStatus.SyncError.GallerySyncError.InvalidGalleryFail -> context.stringResource(SYMR.strings.favorites_sync_failed_to_add_to_local) + - context.stringResource( - SYMR.strings.favorites_sync_failed_to_add_to_local_unknown_type, status.title, status.url, - ) + context.stringResource(SYMR.strings.favorites_sync_failed_to_add_to_local_unknown_type, status.title, status.url) is FavoritesSyncStatus.SyncError.GallerySyncError.UnableToAddGalleryToRemote -> context.stringResource(SYMR.strings.favorites_sync_unable_to_add_to_remote, status.title, status.gid) FavoritesSyncStatus.SyncError.GallerySyncError.UnableToDeleteFromRemote -> diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaCover.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaCover.kt index 74d760587..8ac2e16fe 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaCover.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaCover.kt @@ -1,3 +1,5 @@ +@file:Suppress("PropertyName") + package eu.kanade.presentation.manga.components import androidx.annotation.ColorInt diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/PagePreviews.kt b/app/src/main/java/eu/kanade/presentation/manga/components/PagePreviews.kt index 59eda4c97..95e45ede4 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/PagePreviews.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/PagePreviews.kt @@ -1,3 +1,5 @@ +@file:Suppress("FunctionName") + package eu.kanade.presentation.manga.components import androidx.compose.foundation.clickable diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/about/WhatsNewDialog.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/about/WhatsNewDialog.kt index 63173257e..0f09ca09a 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/about/WhatsNewDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/about/WhatsNewDialog.kt @@ -1,3 +1,5 @@ +@file:Suppress("PropertyName") + package eu.kanade.presentation.more.settings.screen.about import androidx.compose.foundation.layout.Arrangement diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/MangaBackupCreator.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/MangaBackupCreator.kt index 1f02dc29d..51dc688f4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/MangaBackupCreator.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/MangaBackupCreator.kt @@ -48,7 +48,8 @@ class MangaBackupCreator( getCustomMangaInfo.get(manga.id) } else { null - }, /* SY <-- */ + }, + // SY <-- ) // SY --> diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/CategoriesRestorer.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/CategoriesRestorer.kt index 2c0eda9cf..407baf9a8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/CategoriesRestorer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/CategoriesRestorer.kt @@ -27,7 +27,9 @@ class CategoriesRestorer( val order = nextOrder++ handler.awaitOneExecutable { categoriesQueries.insert( - it.name, order, it.flags, + it.name, + order, + it.flags, // KMK --> hidden = if (it.hidden) 1L else 0L, // KMK <-- diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/coil/PagePreviewFetcher.kt b/app/src/main/java/eu/kanade/tachiyomi/data/coil/PagePreviewFetcher.kt index 103475da4..ad9bfecde 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/coil/PagePreviewFetcher.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/coil/PagePreviewFetcher.kt @@ -124,7 +124,8 @@ class PagePreviewFetcher( private suspend fun executeNetworkRequest(): Response { val response = sourceLazy.value?.fetchPreviewImage( - page.getPagePreviewInfo(), getCacheControl(), + page.getPagePreviewInfo(), + getCacheControl(), ) ?: callFactoryLazy.value.newCall(newRequest()).await() if (!response.isSuccessful && response.code != HTTP_NOT_MODIFIED) { response.close() 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 8b8a6f20a..e11d6732f 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 @@ -247,7 +247,9 @@ class DownloadCache( val sourceDir = rootDownloadsDir.sourceDirs[manga.source] ?: return val mangaDir = sourceDir.mangaDirs[ provider.getMangaDirName( - /* SY --> */ manga.ogTitle, /* SY <-- */ + // SY --> + manga.ogTitle, + // SY <-- ), ] ?: return provider.getValidChapterDirNames(chapter.name, chapter.scanlator).forEach { @@ -286,7 +288,9 @@ class DownloadCache( val sourceDir = rootDownloadsDir.sourceDirs[manga.source] ?: return val mangaDir = sourceDir.mangaDirs[ provider.getMangaDirName( - /* SY --> */ manga.ogTitle, /* SY <-- */ + // SY --> + manga.ogTitle, + // SY <-- ), ] ?: return chapters.forEach { chapter -> 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 bd12418f8..514b9f09c 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 @@ -167,7 +167,9 @@ class DownloadManager( val chapterDir = provider.findChapterDir( chapter.name, chapter.scanlator, - /* SY --> */ manga.ogTitle /* SY <-- */, + // SY --> + manga.ogTitle, + // SY <-- source, ) val files = chapterDir?.listFiles().orEmpty() 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 1374e2ae8..3506f5dbd 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 @@ -628,7 +628,9 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet count++ notifier.showProgressNotification( - listOf(Manga.create().copy(ogTitle = networkManga.title)), count, size, + listOf(Manga.create().copy(ogTitle = networkManga.title)), + count, + size, ) var dbManga = getManga.await(networkManga.url, mangaDex.id) diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/AndroidSourceManager.kt b/app/src/main/java/eu/kanade/tachiyomi/source/AndroidSourceManager.kt index 4b57f553e..6d915b3a1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/AndroidSourceManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/AndroidSourceManager.kt @@ -1,3 +1,5 @@ +@file:Suppress("PropertyName") + package eu.kanade.tachiyomi.source import android.content.Context 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 fdfe640cc..87c6c8532 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 @@ -1,3 +1,5 @@ +@file:Suppress("PropertyName") + package eu.kanade.tachiyomi.source.online.all import android.content.Context diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedScreenModel.kt index 635c4bec0..736b85192 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedScreenModel.kt @@ -1,3 +1,5 @@ +@file:Suppress("PropertyName") + package eu.kanade.tachiyomi.ui.browse.feed import androidx.compose.runtime.Composable 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 b14f65df0..66d976c05 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 @@ -1240,7 +1240,9 @@ class ReaderActivity : BaseActivity() { // SY --> val text = if (secondPage != null) { stringResource( - SYMR.strings.share_pages_info, manga.title, chapter.name, + SYMR.strings.share_pages_info, + manga.title, + chapter.name, if (resources.configuration.layoutDirection == View.LAYOUT_DIRECTION_LTR ) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt index c155315b5..1eda22a83 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt @@ -370,7 +370,7 @@ class ReaderViewModel @JvmOverloads constructor( mutableState.update { it.copy( manga = manga, - /* SY --> */ + // SY --> meta = metadata, mergedManga = mergedManga, dateRelativeTime = relativeTime, @@ -380,7 +380,7 @@ class ReaderViewModel @JvmOverloads constructor( autoScrollFreq.toString() }, isAutoScrollEnabled = autoScrollFreq != -1f, - /* SY <-- */ + // SY <-- ) } if (chapterId == -1L) chapterId = initialChapterId @@ -392,17 +392,21 @@ class ReaderViewModel @JvmOverloads constructor( downloadManager = downloadManager, downloadProvider = downloadProvider, manga = manga, - source = source, /* SY --> */ + source = source, + // SY --> sourceManager = sourceManager, readerPrefs = readerPreferences, mergedReferences = mergedReferences, - mergedManga = mergedManga, /* SY <-- */ + mergedManga = mergedManga, + // SY <-- ) loadChapter( loader!!, chapterList.first { chapterId == it.chapter.id }, - /* SY --> */page, /* SY <-- */ + // SY --> + page, + // SY <-- ) Result.success(true) } else { @@ -538,7 +542,9 @@ class ReaderViewModel @JvmOverloads constructor( val isDownloaded = downloadManager.isChapterDownloaded( dbChapter.name, dbChapter.scanlator, - /* SY --> */ manga.ogTitle /* SY <-- */, + // SY --> + manga.ogTitle, + // SY <-- manga.source, skipCache = true, ) @@ -677,8 +683,10 @@ class ReaderViewModel @JvmOverloads constructor( */ private suspend fun updateChapterProgress( readerChapter: ReaderChapter, - page: Page/* SY --> */, - hasExtraPage: Boolean, /* SY <-- */ + page: Page, + // SY --> + hasExtraPage: Boolean, + // SY <-- ) { val pageIndex = page.index val syncTriggerOpt = syncPreferences.getSyncTriggerOptions() @@ -1378,8 +1386,10 @@ class ReaderViewModel @JvmOverloads constructor( // SY <-- data class PageActions( - val page: ReaderPage/* SY --> */, - val extraPage: ReaderPage? = null, /* SY <-- */ + val page: ReaderPage, + // SY --> + val extraPage: ReaderPage? = null, + // SY <-- ) : Dialog // SY --> @@ -1398,8 +1408,10 @@ class ReaderViewModel @JvmOverloads constructor( data class SavedImage(val result: SaveImageResult) : Event data class ShareImage( val uri: Uri, - val page: ReaderPage/* SY --> */, - val secondPage: ReaderPage? = null, /* SY <-- */ + val page: ReaderPage, + // SY --> + val secondPage: ReaderPage? = null, + // SY <-- ) : Event data class CopyImage(val uri: Uri) : Event } 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 75d945d0c..fbfdf9c48 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 @@ -94,8 +94,10 @@ class ChapterLoader( val dbChapter = chapter.chapter val isDownloaded = downloadManager.isChapterDownloaded( chapterName = dbChapter.name, - chapterScanlator = dbChapter.scanlator, /* SY --> */ - mangaTitle = manga.ogTitle /* SY <-- */, + chapterScanlator = dbChapter.scanlator, + // SY --> + mangaTitle = manga.ogTitle, + // SY <-- sourceId = manga.source, skipCache = true, ) diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterGetNextUnread.kt b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterGetNextUnread.kt index f4adeaac0..1a04acf1f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterGetNextUnread.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterGetNextUnread.kt @@ -12,8 +12,10 @@ import tachiyomi.domain.manga.model.Manga */ fun List.getNextUnread( manga: Manga, - downloadManager: DownloadManager /* SY --> */, - mergedManga: Map, /* SY <-- */ + downloadManager: DownloadManager, + // SY --> + mergedManga: Map, + // SY <-- ): Chapter? { return applyFilters(manga, downloadManager/* SY --> */, mergedManga/* SY <-- */).let { chapters -> // SY --> diff --git a/app/src/main/java/eu/kanade/test/DummyTracker.kt b/app/src/main/java/eu/kanade/test/DummyTracker.kt index a83a0be44..206c8db09 100644 --- a/app/src/main/java/eu/kanade/test/DummyTracker.kt +++ b/app/src/main/java/eu/kanade/test/DummyTracker.kt @@ -4,6 +4,7 @@ import android.graphics.Color import dev.icerock.moko.resources.StringResource import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.track.Tracker +import eu.kanade.tachiyomi.data.track.model.TrackMangaMetadata import eu.kanade.tachiyomi.data.track.model.TrackSearch import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.toImmutableList @@ -121,10 +122,8 @@ data class DummyTracker( ) = Unit override suspend fun getMangaMetadata( - track: tachiyomi.domain.track.model.Track, - ): eu.kanade.tachiyomi.data.track.model.TrackMangaMetadata = eu.kanade.tachiyomi.data.track.model.TrackMangaMetadata( - 0, "test", "test", "test", "test", "test", - ) + track: Track, + ): TrackMangaMetadata = TrackMangaMetadata(0, "test", "test", "test", "test", "test") // KMK --> override fun hasNotStartedReading(status: Long): Boolean = status == 2L diff --git a/app/src/main/java/exh/assets/__EhAssets.kt b/app/src/main/java/exh/assets/EhAssets.kt similarity index 100% rename from app/src/main/java/exh/assets/__EhAssets.kt rename to app/src/main/java/exh/assets/EhAssets.kt diff --git a/app/src/main/java/exh/assets/ehassets/__Exh.kt b/app/src/main/java/exh/assets/ehassets/Exh.kt similarity index 100% rename from app/src/main/java/exh/assets/ehassets/__Exh.kt rename to app/src/main/java/exh/assets/ehassets/Exh.kt diff --git a/app/src/main/java/exh/assets/ehassets/exh/__Assets.kt b/app/src/main/java/exh/assets/ehassets/exh/Assets.kt similarity index 100% rename from app/src/main/java/exh/assets/ehassets/exh/__Assets.kt rename to app/src/main/java/exh/assets/ehassets/exh/Assets.kt diff --git a/app/src/main/java/exh/assets/ehassets/exh/assets/__Ehassets.kt b/app/src/main/java/exh/assets/ehassets/exh/assets/Ehassets.kt similarity index 100% rename from app/src/main/java/exh/assets/ehassets/exh/assets/__Ehassets.kt rename to app/src/main/java/exh/assets/ehassets/exh/assets/Ehassets.kt diff --git a/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt b/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt index 39238d2b5..36fea0034 100644 --- a/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt +++ b/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt @@ -400,15 +400,9 @@ class FavoritesSyncHelper(val context: Context) { } val error = when (result) { - is GalleryAddEvent.Fail.Error -> FavoritesSyncStatus.SyncError.GallerySyncError.GalleryAddFail( - it.title, result.logMessage, - ) - is GalleryAddEvent.Fail.UnknownType -> FavoritesSyncStatus.SyncError.GallerySyncError.InvalidGalleryFail( - it.title, result.galleryUrl, - ) - is GalleryAddEvent.Fail.UnknownSource -> FavoritesSyncStatus.SyncError.GallerySyncError.InvalidGalleryFail( - it.title, result.galleryUrl, - ) + is GalleryAddEvent.Fail.Error -> FavoritesSyncStatus.SyncError.GallerySyncError.GalleryAddFail(it.title, result.logMessage) + is GalleryAddEvent.Fail.UnknownType -> FavoritesSyncStatus.SyncError.GallerySyncError.InvalidGalleryFail(it.title, result.galleryUrl) + is GalleryAddEvent.Fail.UnknownSource -> FavoritesSyncStatus.SyncError.GallerySyncError.InvalidGalleryFail(it.title, result.galleryUrl) } if (prefs.exhLenientSync().get()) { diff --git a/app/src/main/java/exh/md/handlers/SimilarHandler.kt b/app/src/main/java/exh/md/handlers/SimilarHandler.kt index eff5b9c03..d0c86dfc9 100644 --- a/app/src/main/java/exh/md/handlers/SimilarHandler.kt +++ b/app/src/main/java/exh/md/handlers/SimilarHandler.kt @@ -34,7 +34,8 @@ class SimilarHandler( } return MetadataMangasPage( - mangaList, false, + mangaList, + false, List(mangaList.size) { MangaDexSearchMetadata().also { it.relation = MangaDexRelation.SIMILAR } }, diff --git a/app/src/main/java/exh/md/utils/MdApi.kt b/app/src/main/java/exh/md/utils/MdApi.kt index 58b6f2720..9fd713d93 100644 --- a/app/src/main/java/exh/md/utils/MdApi.kt +++ b/app/src/main/java/exh/md/utils/MdApi.kt @@ -1,3 +1,5 @@ +@file:Suppress("PropertyName") + package exh.md.utils object MdApi { diff --git a/app/src/main/java/exh/md/utils/MdConstants.kt b/app/src/main/java/exh/md/utils/MdConstants.kt index 8a84284dd..104882761 100644 --- a/app/src/main/java/exh/md/utils/MdConstants.kt +++ b/app/src/main/java/exh/md/utils/MdConstants.kt @@ -1,3 +1,5 @@ +@file:Suppress("PropertyName") + package exh.md.utils import android.util.Base64 diff --git a/app/src/main/java/exh/md/utils/MdUtil.kt b/app/src/main/java/exh/md/utils/MdUtil.kt index a3ce3021c..fddd7a198 100644 --- a/app/src/main/java/exh/md/utils/MdUtil.kt +++ b/app/src/main/java/exh/md/utils/MdUtil.kt @@ -1,3 +1,5 @@ +@file:Suppress("PropertyName") + package exh.md.utils import android.app.Application diff --git a/app/src/main/java/exh/recs/sources/AniListPagingSource.kt b/app/src/main/java/exh/recs/sources/AniListPagingSource.kt index b15070c53..63d53c204 100644 --- a/app/src/main/java/exh/recs/sources/AniListPagingSource.kt +++ b/app/src/main/java/exh/recs/sources/AniListPagingSource.kt @@ -22,7 +22,9 @@ import tachiyomi.domain.manga.model.Manga import tachiyomi.i18n.sy.SYMR class AniListPagingSource(manga: Manga, source: CatalogueSource?) : TrackerRecommendationPagingSource( - "https://graphql.anilist.co/", source, manga, + "https://graphql.anilist.co/", + source, + manga, ) { override val name: String get() = "AniList" diff --git a/app/src/main/java/exh/recs/sources/MangaUpdatesPagingSource.kt b/app/src/main/java/exh/recs/sources/MangaUpdatesPagingSource.kt index a7ebda95a..ec5e697b9 100644 --- a/app/src/main/java/exh/recs/sources/MangaUpdatesPagingSource.kt +++ b/app/src/main/java/exh/recs/sources/MangaUpdatesPagingSource.kt @@ -24,7 +24,9 @@ import tachiyomi.domain.manga.model.Manga import tachiyomi.i18n.sy.SYMR abstract class MangaUpdatesPagingSource(manga: Manga, source: CatalogueSource?) : TrackerRecommendationPagingSource( - "https://api.mangaupdates.com/v1/", source, manga, + "https://api.mangaupdates.com/v1/", + source, + manga, ) { override val name: String get() = "MangaUpdates" diff --git a/app/src/main/java/exh/recs/sources/MyAnimeListPagingSource.kt b/app/src/main/java/exh/recs/sources/MyAnimeListPagingSource.kt index 6c14d17cf..f82de93d7 100644 --- a/app/src/main/java/exh/recs/sources/MyAnimeListPagingSource.kt +++ b/app/src/main/java/exh/recs/sources/MyAnimeListPagingSource.kt @@ -18,7 +18,9 @@ import tachiyomi.domain.manga.model.Manga import tachiyomi.i18n.sy.SYMR class MyAnimeListPagingSource(manga: Manga, source: CatalogueSource?) : TrackerRecommendationPagingSource( - "https://api.jikan.moe/v4/", source, manga, + "https://api.jikan.moe/v4/", + source, + manga, ) { override val name: String get() = "MyAnimeList" diff --git a/app/src/main/java/exh/source/BlacklistedSources.kt b/app/src/main/java/exh/source/BlacklistedSources.kt index 92393d3b0..524b5e32a 100644 --- a/app/src/main/java/exh/source/BlacklistedSources.kt +++ b/app/src/main/java/exh/source/BlacklistedSources.kt @@ -1,3 +1,5 @@ +@file:Suppress("PropertyName") + package exh.source object BlacklistedSources { diff --git a/core/archive/src/main/kotlin/mihon/core/archive/CbzCrypto.kt b/core/archive/src/main/kotlin/mihon/core/archive/CbzCrypto.kt index 66e001d67..25a116012 100644 --- a/core/archive/src/main/kotlin/mihon/core/archive/CbzCrypto.kt +++ b/core/archive/src/main/kotlin/mihon/core/archive/CbzCrypto.kt @@ -1,3 +1,5 @@ +@file:Suppress("PropertyName") + package mihon.core.archive import android.security.keystore.KeyGenParameterSpec diff --git a/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt b/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt index 7c5d5886c..ae3102092 100644 --- a/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt +++ b/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt @@ -20,8 +20,7 @@ import java.util.concurrent.TimeUnit import kotlin.math.pow import kotlin.random.Random -/* SY --> */ -open /* SY <-- */ class NetworkHelper( +/* SY --> */ open /* SY <-- */ class NetworkHelper( private val context: Context, private val preferences: NetworkPreferences, // SY --> @@ -29,11 +28,9 @@ open /* SY <-- */ class NetworkHelper( // SY <-- ) { - /* SY --> */ - open /* SY <-- */val cookieJar = AndroidCookieJar() + /* SY --> */ open /* SY <-- */val cookieJar = AndroidCookieJar() - /* SY --> */ - open /* SY <-- */val client: OkHttpClient = + /* SY --> */ open /* SY <-- */val client: OkHttpClient = // KMK --> clientWithTimeOut() diff --git a/domain/src/main/java/exh/source/DomainSourceHelpers.kt b/domain/src/main/java/exh/source/DomainSourceHelpers.kt index a7d06e830..8632000e8 100644 --- a/domain/src/main/java/exh/source/DomainSourceHelpers.kt +++ b/domain/src/main/java/exh/source/DomainSourceHelpers.kt @@ -1,3 +1,5 @@ +@file:Suppress("PropertyName") + package exh.source import eu.kanade.tachiyomi.source.Source diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/MangasPage.kt b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/MangasPage.kt index bd7295c7a..b6afd2d46 100644 --- a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/MangasPage.kt +++ b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/MangasPage.kt @@ -2,8 +2,7 @@ package eu.kanade.tachiyomi.source.model import exh.metadata.metadata.RaisedSearchMetadata -/* SY --> */ -open /* SY <-- */ class MangasPage(open val mangas: List, open val hasNextPage: Boolean) { +/* SY --> */ open /* SY <-- */ class MangasPage(open val mangas: List, open val hasNextPage: Boolean) { // SY --> override fun equals(other: Any?): Boolean { if (this === other) return true diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt index 119804f7b..d4e5a94ca 100644 --- a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt +++ b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt @@ -95,8 +95,7 @@ abstract class HttpSource : CatalogueSource { /** * Headers used for requests. */ - /* SY --> */ - open /* SY <-- */ val headers: Headers by lazy { headersBuilder().build() } + /* SY --> */ open /* SY <-- */ val headers: Headers by lazy { headersBuilder().build() } /** * Default network client for doing requests. diff --git a/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt b/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt index 13515defd..664c57e32 100644 --- a/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt +++ b/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt @@ -95,10 +95,12 @@ actual class LocalSource( // Filter out files that are hidden and is not a folder .filter { it.isDirectory && - /* SY --> */ ( + // SY --> + ( !it.name.orEmpty().startsWith('.') || allowLocalSourceHiddenFolders - ) /* SY <-- */ + ) + // SY <-- } .distinctBy { it.name } .filter {