From e98567a86b8fdca7f9835c91e76a9c0b73ad11f8 Mon Sep 17 00:00:00 2001 From: arkon Date: Fri, 8 Apr 2022 15:30:30 -0400 Subject: [PATCH] Update linter (cherry picked from commit f0eb42e72d1e267049777a303bd97d96517a9a1f) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt # app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/Backup.kt # app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupManga.kt # app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/models/Backup.kt # app/src/main/java/eu/kanade/tachiyomi/extension/model/Extension.kt # app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt # app/src/main/java/eu/kanade/tachiyomi/ui/base/changehandler/OneWayFadeChangeHandler.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SelectionHeader.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceItem.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcePresenter.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/ReaderPage.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt # app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt --- .editorconfig | 5 + app/src/main/java/eu/kanade/tachiyomi/App.kt | 12 +- .../data/backup/AbstractBackupRestore.kt | 2 +- .../tachiyomi/data/backup/BackupCreatorJob.kt | 4 +- .../tachiyomi/data/backup/BackupNotifier.kt | 8 +- .../data/backup/full/FullBackupManager.kt | 8 +- .../data/backup/full/models/Backup.kt | 2 +- .../data/backup/full/models/BackupCategory.kt | 4 +- .../data/backup/full/models/BackupChapter.kt | 2 +- .../backup/full/models/BackupFlatMetadata.kt | 6 +- .../data/backup/full/models/BackupHistory.kt | 4 +- .../data/backup/full/models/BackupManga.kt | 4 +- .../full/models/BackupMergedMangaReference.kt | 6 +- .../backup/full/models/BackupSavedSearch.kt | 2 +- .../data/backup/full/models/BackupSource.kt | 6 +- .../data/backup/full/models/BackupTracking.kt | 2 +- .../models/metadata/BackupSearchMetadata.kt | 6 +- .../full/models/metadata/BackupSearchTag.kt | 6 +- .../full/models/metadata/BackupSearchTitle.kt | 6 +- .../data/backup/legacy/LegacyBackupManager.kt | 2 +- .../data/backup/legacy/LegacyBackupRestore.kt | 8 +- .../legacy/LegacyBackupRestoreValidator.kt | 2 +- .../data/backup/legacy/models/Backup.kt | 4 +- .../serializer/CategoryTypeSerializer.kt | 2 +- .../serializer/ChapterTypeSerializer.kt | 2 +- .../serializer/HistoryTypeSerializer.kt | 4 +- .../legacy/serializer/MangaTypeSerializer.kt | 2 +- .../MergedMangaReferenceTypeSerializer.kt | 4 +- .../legacy/serializer/TrackTypeSerializer.kt | 2 +- .../tachiyomi/data/cache/ChapterCache.kt | 2 +- .../tachiyomi/data/coil/MangaCoverFetcher.kt | 12 +- .../data/coil/TachiyomiImageDecoder.kt | 2 +- .../tachiyomi/data/database/DatabaseHelper.kt | 6 +- .../tachiyomi/data/database/DbOpenCallback.kt | 2 +- .../database/mappers/CategoryTypeMapping.kt | 4 +- .../database/mappers/ChapterTypeMapping.kt | 4 +- .../database/mappers/HistoryTypeMapping.kt | 4 +- .../mappers/MangaCategoryTypeMapping.kt | 4 +- .../data/database/mappers/MangaTypeMapping.kt | 4 +- .../data/database/mappers/TrackTypeMapping.kt | 4 +- .../tachiyomi/data/database/models/Manga.kt | 2 +- .../data/database/queries/CategoryQueries.kt | 4 +- .../data/database/queries/ChapterQueries.kt | 14 +- .../data/database/queries/HistoryQueries.kt | 12 +- .../database/queries/MangaCategoryQueries.kt | 2 +- .../data/database/queries/MangaQueries.kt | 44 +++--- .../data/database/queries/TrackQueries.kt | 6 +- .../resolvers/ChapterBackupPutResolver.kt | 2 +- .../ChapterKnownBackupPutResolver.kt | 2 +- .../resolvers/ChapterProgressPutResolver.kt | 2 +- .../ChapterSourceOrderPutResolver.kt | 2 +- .../resolvers/HistoryChapterIdPutResolver.kt | 2 +- .../resolvers/HistoryLastReadPutResolver.kt | 4 +- .../MangaCoverLastModifiedPutResolver.kt | 2 +- .../resolvers/MangaFavoritePutResolver.kt | 2 +- .../MangaFilteredScanlatorsPutResolver.kt | 2 +- .../resolvers/MangaFlagsPutResolver.kt | 2 +- .../resolvers/MangaInfoPutResolver.kt | 4 +- .../resolvers/MangaLastUpdatedPutResolver.kt | 2 +- .../resolvers/MangaMigrationPutResolver.kt | 2 +- .../resolvers/MangaThumbnailPutResolver.kt | 2 +- .../resolvers/MangaTitlePutResolver.kt | 2 +- .../database/resolvers/MangaUrlPutResolver.kt | 2 +- .../data/database/tables/TrackTable.kt | 2 +- .../tachiyomi/data/download/DownloadCache.kt | 8 +- .../data/download/DownloadManager.kt | 2 +- .../data/download/DownloadNotifier.kt | 10 +- .../data/download/DownloadPendingDeleter.kt | 6 +- .../data/download/DownloadProvider.kt | 6 +- .../data/download/DownloadService.kt | 4 +- .../tachiyomi/data/download/DownloadStore.kt | 2 +- .../tachiyomi/data/download/Downloader.kt | 8 +- .../data/download/model/DownloadQueue.kt | 2 +- .../data/library/CustomMangaManager.kt | 8 +- .../data/library/LibraryUpdateJob.kt | 2 +- .../data/library/LibraryUpdateNotifier.kt | 26 ++-- .../data/library/LibraryUpdateService.kt | 10 +- .../data/notification/NotificationReceiver.kt | 16 +-- .../data/notification/Notifications.kt | 4 +- .../data/preference/PreferencesHelper.kt | 14 +- .../kanade/tachiyomi/data/saver/ImageSaver.kt | 16 +-- .../tachiyomi/data/track/TrackManager.kt | 2 +- .../data/track/anilist/AnilistApi.kt | 39 ++--- .../data/track/anilist/AnilistModels.kt | 4 +- .../tachiyomi/data/track/anilist/OAuth.kt | 2 +- .../tachiyomi/data/track/bangumi/Avatar.kt | 2 +- .../data/track/bangumi/BangumiApi.kt | 8 +- .../data/track/bangumi/BangumiInterceptor.kt | 4 +- .../data/track/bangumi/Collection.kt | 2 +- .../tachiyomi/data/track/bangumi/OAuth.kt | 2 +- .../tachiyomi/data/track/bangumi/Status.kt | 2 +- .../tachiyomi/data/track/bangumi/User.kt | 2 +- .../tachiyomi/data/track/kitsu/KitsuApi.kt | 18 +-- .../tachiyomi/data/track/kitsu/OAuth.kt | 2 +- .../tachiyomi/data/track/komga/KomgaApi.kt | 2 +- .../tachiyomi/data/track/komga/KomgaModels.kt | 10 +- .../tachiyomi/data/track/mdlist/MdList.kt | 2 +- .../data/track/myanimelist/MyAnimeListApi.kt | 2 +- .../tachiyomi/data/track/myanimelist/OAuth.kt | 2 +- .../tachiyomi/data/track/shikimori/OAuth.kt | 2 +- .../data/track/shikimori/ShikimoriApi.kt | 8 +- .../tachiyomi/data/updater/AppUpdateJob.kt | 2 +- .../data/updater/AppUpdateNotifier.kt | 8 +- .../tachiyomi/data/updater/GithubRelease.kt | 2 +- .../tachiyomi/extension/ExtensionManager.kt | 2 +- .../tachiyomi/extension/ExtensionUpdateJob.kt | 8 +- .../extension/api/ExtensionGithubApi.kt | 10 +- .../installer/PackageInstallerInstaller.kt | 2 +- .../tachiyomi/extension/model/Extension.kt | 6 +- .../extension/util/ExtensionInstallService.kt | 2 +- .../extension/util/ExtensionInstaller.kt | 2 +- .../extension/util/ExtensionLoader.kt | 4 +- .../kanade/tachiyomi/network/DohProviders.kt | 8 +- .../kanade/tachiyomi/network/NetworkHelper.kt | 12 +- .../tachiyomi/network/OkHttpExtensions.kt | 2 +- .../eu/kanade/tachiyomi/network/Requests.kt | 4 +- .../interceptor/CloudflareInterceptor.kt | 2 +- .../eu/kanade/tachiyomi/source/LocalSource.kt | 4 +- .../java/eu/kanade/tachiyomi/source/Source.kt | 6 +- .../kanade/tachiyomi/source/SourceManager.kt | 30 ++-- .../kanade/tachiyomi/source/model/Filter.kt | 2 +- .../tachiyomi/source/model/MangasPage.kt | 3 +- .../eu/kanade/tachiyomi/source/model/Page.kt | 6 +- .../kanade/tachiyomi/source/model/SChapter.kt | 2 +- .../kanade/tachiyomi/source/model/SManga.kt | 10 +- .../tachiyomi/source/online/HttpSource.kt | 12 +- .../tachiyomi/source/online/all/EHentai.kt | 80 +++++------ .../tachiyomi/source/online/all/Hitomi.kt | 8 +- .../tachiyomi/source/online/all/MangaDex.kt | 6 +- .../source/online/all/MergedSource.kt | 4 +- .../tachiyomi/source/online/all/NHentai.kt | 16 +-- .../tachiyomi/source/online/all/PervEden.kt | 4 +- .../source/online/english/EightMuses.kt | 6 +- .../source/online/english/HBrowse.kt | 4 +- .../source/online/english/Pururin.kt | 4 +- .../source/online/english/Tsumino.kt | 4 +- .../changehandler/OneWayFadeChangeHandler.kt | 2 +- .../ui/base/controller/BaseController.kt | 4 +- .../ui/base/controller/DialogController.kt | 2 +- .../controller/SearchableNucleusController.kt | 11 +- .../tachiyomi/ui/browse/BrowseController.kt | 6 +- .../browse/extension/ExtensionController.kt | 4 +- .../ui/browse/extension/ExtensionGroupItem.kt | 4 +- .../ui/browse/extension/ExtensionHolder.kt | 2 +- .../ui/browse/extension/ExtensionItem.kt | 4 +- .../ui/browse/extension/ExtensionPresenter.kt | 12 +- .../browse/extension/ExtensionTrustDialog.kt | 4 +- .../details/ExtensionDetailsController.kt | 6 +- .../details/ExtensionDetailsPresenter.kt | 2 +- .../details/SourcePreferencesController.kt | 6 +- .../details/SourcePreferencesPresenter.kt | 2 +- .../tachiyomi/ui/browse/feed/FeedCardItem.kt | 2 +- .../tachiyomi/ui/browse/feed/FeedItem.kt | 4 +- .../tachiyomi/ui/browse/feed/FeedPresenter.kt | 18 +-- .../browse/migration/MigrationMangaDialog.kt | 2 +- .../design/MigrationBottomSheetDialog.kt | 4 +- .../advanced/design/MigrationSourceAdapter.kt | 8 +- .../advanced/design/MigrationSourceItem.kt | 4 +- .../advanced/design/PreMigrationController.kt | 16 +-- .../advanced/process/MigratingManga.kt | 2 +- .../process/MigrationListController.kt | 16 +-- .../process/MigrationProcedureConfig.kt | 2 +- .../process/MigrationProcessAdapter.kt | 8 +- .../process/MigrationProcessHolder.kt | 18 +-- .../advanced/process/MigrationProcessItem.kt | 2 +- .../manga/MigrationMangaController.kt | 8 +- .../migration/manga/MigrationMangaHolder.kt | 2 +- .../migration/manga/MigrationMangaItem.kt | 2 +- .../manga/MigrationMangaPresenter.kt | 4 +- .../migration/search/SearchController.kt | 18 +-- .../migration/search/SearchPresenter.kt | 2 +- .../search/SourceSearchController.kt | 6 +- .../sources/MigrationSourcesController.kt | 2 +- .../sources/MigrationSourcesPresenter.kt | 2 +- .../migration/sources/SelectionHeader.kt | 4 +- .../ui/browse/migration/sources/SourceItem.kt | 4 +- .../tachiyomi/ui/browse/source/LangItem.kt | 2 +- .../ui/browse/source/SourceController.kt | 25 ++-- .../browse/source/SourceFilterController.kt | 6 +- .../ui/browse/source/SourceHolder.kt | 2 +- .../tachiyomi/ui/browse/source/SourceItem.kt | 4 +- .../ui/browse/source/SourcePresenter.kt | 6 +- .../source/browse/BrowseSourceController.kt | 28 ++-- .../source/browse/BrowseSourcePresenter.kt | 20 +-- .../ui/browse/source/browse/EHentaiPager.kt | 6 +- .../browse/SourceComfortableGridHolder.kt | 2 +- .../source/browse/SourceCompactGridHolder.kt | 2 +- .../browse/SourceEnhancedEHentaiListHolder.kt | 2 +- .../browse/source/browse/SourceFilterSheet.kt | 12 +- .../ui/browse/source/browse/SourceItem.kt | 4 +- .../browse/source/feed/SourceFeedCardItem.kt | 2 +- .../source/feed/SourceFeedController.kt | 14 +- .../ui/browse/source/feed/SourceFeedItem.kt | 4 +- .../browse/source/feed/SourceFeedPresenter.kt | 34 ++--- .../ui/browse/source/filter/AutoComplete.kt | 4 +- .../ui/browse/source/filter/GroupItem.kt | 2 +- .../ui/browse/source/filter/SelectItem.kt | 2 +- .../ui/browse/source/filter/SortGroup.kt | 2 +- .../ui/browse/source/filter/TriStateItem.kt | 2 +- .../globalsearch/GlobalSearchCardItem.kt | 2 +- .../globalsearch/GlobalSearchController.kt | 4 +- .../source/globalsearch/GlobalSearchItem.kt | 2 +- .../globalsearch/GlobalSearchPresenter.kt | 14 +- .../source/latest/LatestUpdatesController.kt | 2 +- .../ui/category/CategoryController.kt | 2 +- .../tachiyomi/ui/category/CategoryItem.kt | 2 +- .../ui/category/CategoryPresenter.kt | 2 +- .../biometric/BiometricTimesController.kt | 2 +- .../category/biometric/BiometricTimesItem.kt | 2 +- .../biometric/BiometricTimesPresenter.kt | 2 +- .../ui/category/genre/SortTagController.kt | 2 +- .../ui/category/genre/SortTagCreateDialog.kt | 2 +- .../ui/category/genre/SortTagItem.kt | 2 +- .../ui/category/repos/RepoController.kt | 2 +- .../ui/category/repos/RepoCreateDialog.kt | 2 +- .../tachiyomi/ui/category/repos/RepoItem.kt | 2 +- .../ui/category/repos/RepoPresenter.kt | 4 +- .../sources/ChangeSourceCategoriesDialog.kt | 4 +- .../sources/SourceCategoryController.kt | 2 +- .../sources/SourceCategoryCreateDialog.kt | 2 +- .../ui/category/sources/SourceCategoryItem.kt | 2 +- .../sources/SourceCategoryPresenter.kt | 4 +- .../sources/SourceCategoryRenameDialog.kt | 2 +- .../tachiyomi/ui/download/DownloadAdapter.kt | 2 +- .../ui/download/DownloadController.kt | 8 +- .../ui/download/DownloadHeaderItem.kt | 6 +- .../tachiyomi/ui/download/DownloadHolder.kt | 2 +- .../tachiyomi/ui/download/DownloadItem.kt | 6 +- .../ui/library/ChangeMangaCategoriesDialog.kt | 4 +- .../tachiyomi/ui/library/LibraryAdapter.kt | 2 +- .../ui/library/LibraryCategoryAdapter.kt | 2 +- .../ui/library/LibraryCategoryView.kt | 2 +- .../library/LibraryComfortableGridHolder.kt | 2 +- .../ui/library/LibraryCompactGridHolder.kt | 2 +- .../tachiyomi/ui/library/LibraryController.kt | 9 +- .../tachiyomi/ui/library/LibraryHolder.kt | 2 +- .../tachiyomi/ui/library/LibraryItem.kt | 4 +- .../tachiyomi/ui/library/LibraryListHolder.kt | 2 +- .../tachiyomi/ui/library/LibraryPresenter.kt | 23 +-- .../ui/library/LibrarySettingsSheet.kt | 12 +- .../kanade/tachiyomi/ui/main/MainActivity.kt | 8 +- .../tachiyomi/ui/manga/EditMangaDialog.kt | 12 +- .../tachiyomi/ui/manga/MangaController.kt | 78 +++++----- .../tachiyomi/ui/manga/MangaPresenter.kt | 38 ++--- .../ui/manga/chapter/ChapterHolder.kt | 2 +- .../tachiyomi/ui/manga/chapter/ChapterItem.kt | 2 +- .../ui/manga/chapter/ChaptersAdapter.kt | 4 +- .../ui/manga/chapter/ChaptersSettingsSheet.kt | 8 +- .../chapter/DownloadCustomChaptersDialog.kt | 2 +- .../chapter/MangaChaptersHeaderAdapter.kt | 2 +- .../manga/chapter/SetChapterSettingsDialog.kt | 2 +- .../manga/chapter/base/BaseChapterHolder.kt | 4 +- .../ui/manga/chapter/base/BaseChapterItem.kt | 2 +- .../ui/manga/info/MangaFullCoverDialog.kt | 6 +- .../ui/manga/info/MangaInfoButtonsAdapter.kt | 2 +- .../ui/manga/info/MangaInfoHeaderAdapter.kt | 16 +-- .../ui/manga/info/NamespaceTagsHolder.kt | 6 +- .../ui/manga/info/NamespaceTagsItem.kt | 4 +- .../ui/manga/merged/EditMergedMangaItem.kt | 2 +- .../manga/merged/EditMergedSettingsDialog.kt | 2 +- .../merged/EditMergedSettingsHeaderAdapter.kt | 14 +- .../ui/manga/track/SetTrackChaptersDialog.kt | 2 +- .../ui/manga/track/SetTrackScoreDialog.kt | 2 +- .../ui/manga/track/SetTrackStatusDialog.kt | 2 +- .../ui/manga/track/TrackSearchAdapter.kt | 2 +- .../ui/manga/track/TrackSearchDialog.kt | 2 +- .../ui/manga/track/TrackSearchHolder.kt | 2 +- .../tachiyomi/ui/manga/track/TrackSheet.kt | 2 +- .../tachiyomi/ui/more/AboutController.kt | 2 +- .../ui/more/NewUpdateDialogController.kt | 2 +- .../ui/more/licenses/LicensesItem.kt | 2 +- .../ui/reader/PageIndicatorTextView.kt | 4 +- .../tachiyomi/ui/reader/ReaderActivity.kt | 40 +++--- .../ui/reader/ReaderColorFilterView.kt | 2 +- .../tachiyomi/ui/reader/ReaderPageSheet.kt | 2 +- .../tachiyomi/ui/reader/ReaderPresenter.kt | 47 +++--- .../tachiyomi/ui/reader/ReaderSlider.kt | 2 +- .../tachiyomi/ui/reader/SaveImageNotifier.kt | 6 +- .../ui/reader/chapter/ReaderChapterAdapter.kt | 2 +- .../ui/reader/chapter/ReaderChapterDialog.kt | 2 +- .../ui/reader/chapter/ReaderChapterItem.kt | 2 +- .../ui/reader/loader/ChapterLoader.kt | 4 +- .../ui/reader/loader/DownloadPageLoader.kt | 2 +- .../ui/reader/loader/EpubPageLoader.kt | 2 +- .../ui/reader/loader/HttpPageLoader.kt | 10 +- .../ui/reader/loader/RarPageLoader.kt | 2 +- .../ui/reader/loader/ZipPageLoader.kt | 2 +- .../ui/reader/model/ChapterTransition.kt | 4 +- .../tachiyomi/ui/reader/model/ReaderPage.kt | 2 +- .../ui/reader/model/ViewerChapters.kt | 2 +- .../ui/reader/setting/ReaderBottomButton.kt | 2 +- .../ui/reader/setting/ReaderSettingsSheet.kt | 2 +- .../viewer/GestureDetectorWithLongTap.kt | 2 +- .../ui/reader/viewer/ReaderButton.kt | 2 +- .../ui/reader/viewer/ReaderPageImageView.kt | 18 +-- .../reader/viewer/ReaderProgressIndicator.kt | 4 +- .../ui/reader/viewer/ViewerConfig.kt | 2 +- .../ui/reader/viewer/ViewerNavigation.kt | 4 +- .../viewer/navigation/EdgeNavigation.kt | 6 +- .../viewer/navigation/KindlishNavigation.kt | 6 +- .../reader/viewer/navigation/LNavigation.kt | 10 +- .../navigation/RightAndLeftNavigation.kt | 4 +- .../tachiyomi/ui/reader/viewer/pager/Pager.kt | 2 +- .../ui/reader/viewer/pager/PagerConfig.kt | 10 +- .../ui/reader/viewer/pager/PagerPageHolder.kt | 4 +- .../viewer/pager/PagerTransitionHolder.kt | 2 +- .../ui/reader/viewer/pager/PagerViewer.kt | 7 +- .../reader/viewer/pager/PagerViewerAdapter.kt | 8 +- .../reader/viewer/webtoon/WebtoonAdapter.kt | 2 +- .../viewer/webtoon/WebtoonBaseHolder.kt | 2 +- .../ui/reader/viewer/webtoon/WebtoonConfig.kt | 2 +- .../ui/reader/viewer/webtoon/WebtoonFrame.kt | 2 +- .../viewer/webtoon/WebtoonPageHolder.kt | 6 +- .../viewer/webtoon/WebtoonRecyclerView.kt | 6 +- .../webtoon/WebtoonSubsamplingImageView.kt | 2 +- .../viewer/webtoon/WebtoonTransitionHolder.kt | 2 +- .../ui/reader/viewer/webtoon/WebtoonViewer.kt | 16 ++- .../ui/recent/history/HistoryAdapter.kt | 2 +- .../ui/recent/history/HistoryController.kt | 2 +- .../ui/recent/history/HistoryHolder.kt | 4 +- .../ui/recent/history/HistoryItem.kt | 2 +- .../ui/recent/history/HistoryPresenter.kt | 4 +- .../ui/recent/updates/UpdatesAdapter.kt | 2 +- .../ui/recent/updates/UpdatesHolder.kt | 2 +- .../ui/recent/updates/UpdatesItem.kt | 2 +- .../ui/recent/updates/UpdatesPresenter.kt | 4 +- .../tachiyomi/ui/security/UnlockActivity.kt | 6 +- .../ui/setting/SettingsAdvancedController.kt | 4 +- .../setting/SettingsAppearanceController.kt | 8 +- .../ui/setting/SettingsBackupController.kt | 6 +- .../ui/setting/SettingsDownloadController.kt | 4 +- .../ui/setting/SettingsEhController.kt | 12 +- .../ui/setting/SettingsGeneralController.kt | 2 +- .../ui/setting/SettingsLibraryController.kt | 14 +- .../ui/setting/SettingsMainController.kt | 2 +- .../ui/setting/SettingsMangaDexController.kt | 8 +- .../ui/setting/SettingsReaderController.kt | 28 ++-- .../ui/setting/SettingsSecurityController.kt | 10 +- .../ui/setting/SettingsTrackingController.kt | 4 +- .../database/ClearDatabaseController.kt | 2 +- .../setting/eh/FrontPageCategoriesDialog.kt | 6 +- .../ui/setting/eh/LanguagesDialog.kt | 4 +- .../setting/search/SettingsSearchAdapter.kt | 2 +- .../search/SettingsSearchController.kt | 4 +- .../ui/setting/search/SettingsSearchHelper.kt | 10 +- .../ui/setting/search/SettingsSearchItem.kt | 6 +- .../setting/track/BaseOAuthLoginActivity.kt | 4 +- .../ui/setting/track/TrackLoginDialog.kt | 2 +- .../eu/kanade/tachiyomi/util/CrashLogUtil.kt | 4 +- .../util/chapter/ChapterSourceSync.kt | 2 +- .../tachiyomi/util/lang/DateExtensions.kt | 8 +- .../eu/kanade/tachiyomi/util/lang/Hash.kt | 2 +- .../tachiyomi/util/lang/RetryWithDelay.kt | 2 +- .../tachiyomi/util/lang/RxCoroutineBridge.kt | 20 +-- .../util/preference/PreferenceDSL.kt | 8 +- .../util/system/AuthenticatorUtil.kt | 8 +- .../kanade/tachiyomi/util/system/ImageUtil.kt | 8 +- .../tachiyomi/util/system/LogcatExtensions.kt | 2 +- .../util/system/NotificationExtensions.kt | 4 +- .../util/system/WebViewClientCompat.kt | 18 +-- .../util/view/ImageViewExtensions.kt | 4 +- .../tachiyomi/util/view/ViewExtensions.kt | 10 +- .../tachiyomi/util/view/WindowExtensions.kt | 2 +- .../tachiyomi/widget/ActionModeWithToolbar.kt | 2 +- .../eu/kanade/tachiyomi/widget/EmptyView.kt | 8 +- .../widget/ExtendedNavigationView.kt | 2 +- .../HideBottomNavigationOnScrollBehavior.kt | 12 +- .../tachiyomi/widget/MangaSummaryView.kt | 24 ++-- .../eu/kanade/tachiyomi/widget/OutlineSpan.kt | 6 +- .../tachiyomi/widget/SimpleNavigationView.kt | 4 +- .../tachiyomi/widget/TachiyomiAppBarLayout.kt | 2 +- .../widget/TachiyomiBottomNavigationView.kt | 8 +- .../TachiyomiChangeHandlerFrameLayout.kt | 2 +- .../widget/TachiyomiCoordinatorLayout.kt | 4 +- .../tachiyomi/widget/TachiyomiSearchView.kt | 2 +- .../widget/TachiyomiTextInputEditText.kt | 2 +- .../widget/ThemedSwipeRefreshLayout.kt | 2 +- .../MaterialAlertDialogBuilderExtensions.kt | 6 +- .../QuadStateMultiChoiceDialogAdapter.kt | 10 +- .../QuadStateMultiChoiceViewHolder.kt | 2 +- .../preference/LoginDialogPreference.kt | 5 +- .../preference/SwitchPreferenceCategory.kt | 6 +- .../widget/preference/ThemesPreference.kt | 4 +- .../preference/ThemesPreferenceAdapter.kt | 2 +- .../widget/sheet/BottomSheetViewPager.kt | 4 +- app/src/main/java/exh/EXHMigrations.kt | 30 ++-- app/src/main/java/exh/GalleryAdder.kt | 8 +- app/src/main/java/exh/debug/DebugFunctions.kt | 20 +-- .../java/exh/eh/EHentaiThrottleManager.kt | 2 +- .../main/java/exh/eh/EHentaiUpdateHelper.kt | 14 +- .../main/java/exh/eh/EHentaiUpdateWorker.kt | 14 +- .../main/java/exh/eh/EHentaiUpdaterStats.kt | 2 +- .../java/exh/eh/MemAutoFlushingLookupTable.kt | 2 +- .../java/exh/favorites/FavoritesSyncHelper.kt | 22 +-- .../exh/favorites/LocalFavoritesStorage.kt | 6 +- .../sql/mappers/FavoriteEntryTypeMapping.kt | 6 +- .../sql/queries/FavoriteEntryQueries.kt | 4 +- .../sql/tables/FavoriteEntryTable.kt | 2 +- .../main/java/exh/log/EHDebugModeOverlay.kt | 4 +- .../main/java/exh/log/EnhancedFilePrinter.kt | 4 +- app/src/main/java/exh/log/Logging.kt | 2 +- .../java/exh/md/MangaDexFabHeaderAdapter.kt | 4 +- app/src/main/java/exh/md/dto/MangaDto.kt | 6 +- app/src/main/java/exh/md/dto/MangaPlusDto.kt | 4 +- app/src/main/java/exh/md/dto/RatingDto.kt | 4 +- app/src/main/java/exh/md/dto/SimilarDto.kt | 2 +- app/src/main/java/exh/md/dto/StatisticsDto.kt | 6 +- .../md/follows/MangaDexFollowsController.kt | 4 +- .../java/exh/md/handlers/ApiMangaParser.kt | 12 +- .../java/exh/md/handlers/BilibiliHandler.kt | 18 +-- .../java/exh/md/handlers/FilterHandler.kt | 8 +- .../java/exh/md/handlers/FollowsHandler.kt | 6 +- .../main/java/exh/md/handlers/MangaHandler.kt | 6 +- .../java/exh/md/handlers/MangaPlusHandler.kt | 2 +- .../main/java/exh/md/handlers/PageHandler.kt | 8 +- .../java/exh/md/handlers/SimilarHandler.kt | 4 +- .../exh/md/network/MangaDexLoginHelper.kt | 2 +- .../exh/md/service/MangaDexAuthService.kt | 66 ++++----- .../java/exh/md/service/MangaDexService.kt | 42 +++--- .../java/exh/md/service/SimilarService.kt | 6 +- .../md/similar/MangaDexSimilarController.kt | 4 +- .../exh/md/similar/MangaDexSimilarPager.kt | 2 +- app/src/main/java/exh/md/utils/MdUtil.kt | 8 +- .../sql/mappers/MergedMangaTypeMapping.kt | 6 +- .../merged/sql/models/MergedMangaReference.kt | 2 +- .../exh/merged/sql/queries/MergedQueries.kt | 20 +-- .../sql/resolvers/MergedMangaIdPutResolver.kt | 2 +- .../main/java/exh/metadata/MetadataUtil.kt | 2 +- .../metadata/EHentaiSearchMetadata.kt | 2 +- .../metadata/EightMusesSearchMetadata.kt | 4 +- .../metadata/HBrowseSearchMetadata.kt | 4 +- .../metadata/metadata/HitomiSearchMetadata.kt | 4 +- .../metadata/MangaDexSearchMetadata.kt | 2 +- .../metadata/NHentaiSearchMetadata.kt | 2 +- .../metadata/PervEdenSearchMetadata.kt | 2 +- .../metadata/PururinSearchMetadata.kt | 2 +- .../metadata/TsuminoSearchMetadata.kt | 2 +- .../metadata/metadata/base/FlatMetadata.kt | 2 +- .../metadata/base/RaisedSearchMetadata.kt | 8 +- .../exh/metadata/metadata/base/RaisedTag.kt | 2 +- .../exh/metadata/metadata/base/RaisedTitle.kt | 2 +- .../sql/mappers/SearchMetadataTypeMapping.kt | 4 +- .../sql/mappers/SearchTagTypeMapping.kt | 4 +- .../sql/mappers/SearchTitleTypeMapping.kt | 4 +- .../exh/metadata/sql/models/SearchMetadata.kt | 2 +- .../java/exh/metadata/sql/models/SearchTag.kt | 2 +- .../exh/metadata/sql/models/SearchTitle.kt | 2 +- .../sql/queries/SearchMetadataQueries.kt | 8 +- .../metadata/sql/queries/SearchTagQueries.kt | 6 +- .../sql/queries/SearchTitleQueries.kt | 6 +- app/src/main/java/exh/patch/MangaDexLogin.kt | 4 +- app/src/main/java/exh/patch/NetworkPatches.kt | 4 +- .../exh/patch/UniversalCaptchaDetection.kt | 2 +- .../java/exh/recs/RecommendsController.kt | 10 +- app/src/main/java/exh/recs/RecommendsPager.kt | 11 +- .../java/exh/savedsearches/EXHSavedSearch.kt | 2 +- .../mappers/FeedSavedSearchTypeMapping.kt | 6 +- .../mappers/SavedSearchTypeMapping.kt | 6 +- .../savedsearches/models/FeedSavedSearch.kt | 2 +- .../queries/FeedSavedSearchQueries.kt | 12 +- .../queries/SavedSearchQueries.kt | 14 +- app/src/main/java/exh/search/Namespace.kt | 2 +- app/src/main/java/exh/search/SearchEngine.kt | 2 +- app/src/main/java/exh/search/Text.kt | 2 +- .../java/exh/smartsearch/SmartSearchEngine.kt | 6 +- .../java/exh/source/BlacklistedSources.kt | 6 +- .../java/exh/source/EnhancedHttpSource.kt | 2 +- app/src/main/java/exh/source/SourceHelper.kt | 6 +- .../main/java/exh/uconfig/EHConfigurator.kt | 12 +- .../main/java/exh/uconfig/EhUConfigBuilder.kt | 6 +- .../java/exh/ui/base/CoroutinePresenter.kt | 2 +- .../exh/ui/batchadd/BatchAddController.kt | 2 +- .../java/exh/ui/batchadd/BatchAddPresenter.kt | 2 +- .../ui/captcha/AutoSolvingWebViewClient.kt | 4 +- .../java/exh/ui/captcha/BasicWebViewClient.kt | 2 +- .../exh/ui/captcha/BrowserActionActivity.kt | 48 +++---- .../captcha/HeadersInjectingWebViewClient.kt | 4 +- .../exh/ui/intercept/InterceptActivity.kt | 2 +- .../main/java/exh/ui/login/EhLoginActivity.kt | 6 +- .../exh/ui/metadata/MetadataViewController.kt | 8 +- .../exh/ui/metadata/MetadataViewPresenter.kt | 2 +- .../adapters/EHentaiDescriptionAdapter.kt | 10 +- .../adapters/EightMusesDescriptionAdapter.kt | 8 +- .../adapters/HBrowseDescriptionAdapter.kt | 8 +- .../adapters/HitomiDescriptionAdapter.kt | 10 +- .../adapters/MangaDexDescriptionAdapter.kt | 8 +- .../adapters/NHentaiDescriptionAdapter.kt | 10 +- .../adapters/PervEdenDescriptionAdapter.kt | 10 +- .../adapters/PururinDescriptionAdapter.kt | 10 +- .../adapters/TsuminoDescriptionAdapter.kt | 10 +- .../ui/smartsearch/SmartSearchController.kt | 4 +- app/src/main/java/exh/util/MangaType.kt | 2 +- .../main/java/exh/util/OkHttpExtensions.kt | 2 +- app/src/main/java/exh/util/SearchOverride.kt | 2 +- app/src/main/java/exh/util/SourceTagsUtil.kt | 4 +- app/src/main/java/exh/util/ViewExtensions.kt | 2 +- .../preference/MangaDexLoginPreference.kt | 2 +- .../widget/preference/MangadexLoginDialog.kt | 6 +- .../widget/preference/MangadexLogoutDialog.kt | 4 +- .../api/http/serializer/FilterSerializer.kt | 2 +- .../http/serializer/FilterSerializerModels.kt | 24 ++-- gradle/libs.versions.toml | 2 +- ktlintCodeStyle.xml | 136 ------------------ 503 files changed, 1589 insertions(+), 1684 deletions(-) create mode 100644 .editorconfig delete mode 100644 ktlintCodeStyle.xml diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..b0aa6f2c2 --- /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 c6bef7319..734e232fb 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/App.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/App.kt @@ -122,7 +122,7 @@ open class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory { this@App, 0, Intent(ACTION_DISABLE_INCOGNITO_MODE), - PendingIntent.FLAG_ONE_SHOT + PendingIntent.FLAG_ONE_SHOT, ) setContentIntent(pendingIntent) } @@ -141,7 +141,7 @@ open class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory { PreferenceValues.ThemeMode.light -> AppCompatDelegate.MODE_NIGHT_NO PreferenceValues.ThemeMode.dark -> AppCompatDelegate.MODE_NIGHT_YES PreferenceValues.ThemeMode.system -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM - } + }, ) }.launchIn(ProcessLifecycleOwner.get().lifecycleScope) @@ -230,7 +230,7 @@ open class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory { val logFolder = File( Environment.getExternalStorageDirectory().absolutePath + File.separator + getString(R.string.app_name), - "logs" + "logs", ) val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", Locale.getDefault()) @@ -241,7 +241,7 @@ open class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory { override fun generateFileName(logLevel: Int, timestamp: Long): String { return super.generateFileName( logLevel, - timestamp + timestamp, ) + "-${BuildConfig.BUILD_TYPE}.log" } } @@ -259,7 +259,7 @@ open class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory { XLog.init( logConfig, - *printers.toTypedArray() + *printers.toTypedArray(), ) xLogD("Application booting...") @@ -274,7 +274,7 @@ open class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory { Device name: ${Build.DEVICE} Device model: ${Build.MODEL} Device product name: ${Build.PRODUCT} - """.trimIndent() + """.trimIndent(), ) } 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 c13b81bb0..9bdbdc184 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 @@ -122,7 +122,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/BackupCreatorJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreatorJob.kt index 489bc0ded..cff2ebde7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreatorJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreatorJob.kt @@ -63,7 +63,7 @@ class BackupCreatorJob(private val context: Context, workerParams: WorkerParamet interval.toLong(), TimeUnit.HOURS, 10, - TimeUnit.MINUTES + TimeUnit.MINUTES, ) .addTag(TAG_AUTO) .setInputData(workDataOf(IS_AUTO_BACKUP_KEY to true)) @@ -79,7 +79,7 @@ class BackupCreatorJob(private val context: Context, workerParams: WorkerParamet val inputData = workDataOf( IS_AUTO_BACKUP_KEY to false, LOCATION_URI_KEY to uri.toString(), - BACKUP_FLAGS_KEY to flags + BACKUP_FLAGS_KEY to flags, ) val request = OneTimeWorkRequestBuilder() .addTag(TAG_MANUAL) 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 f0c9873a3..3ab6366df 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.action_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.action_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) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt index 110bdbf7e..4e308f10c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt @@ -70,14 +70,14 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) { getReadManga() } else { emptyList() - } + getMergedManga() /* SY <-- */ + } + getMergedManga() // SY <-- backup = Backup( backupManga(databaseManga, flags), backupCategories(), emptyList(), backupExtensionInfo(databaseManga), - backupSavedSearches() + backupSavedSearches(), ) } @@ -167,7 +167,7 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) { it.name, it.query.orEmpty(), it.filtersJson ?: "[]", - it.source + it.source, ) } } @@ -439,7 +439,7 @@ class FullBackupManager(context: Context) : AbstractBackupManager(context) { it.name, it.query.nullIfBlank(), filtersJson = it.filterList.nullIfBlank() - ?.takeUnless { it == "[]" } + ?.takeUnless { it == "[]" }, ) }.ifEmpty { null } 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 d8514a594..f783120af 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 @@ -11,5 +11,5 @@ data class Backup( @ProtoNumber(100) var backupBrokenSources: List = emptyList(), @ProtoNumber(101) var backupSources: List = emptyList(), // SY specific values - @ProtoNumber(600) var backupSavedSearches: List = emptyList() + @ProtoNumber(600) var backupSavedSearches: 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 0596d969f..1b46d539a 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 @@ -13,7 +13,7 @@ class BackupCategory( // Bump by 100 to specify this is a 0.x value @ProtoNumber(100) var flags: Int = 0, // SY specific values - @ProtoNumber(600) var mangaOrder: List = emptyList() + @ProtoNumber(600) var mangaOrder: List = emptyList(), ) { fun getCategoryImpl(): CategoryImpl { return CategoryImpl().apply { @@ -30,7 +30,7 @@ class BackupCategory( name = category.name, order = category.order, flags = category.flags, - mangaOrder = category.mangaOrder + mangaOrder = category.mangaOrder, ) } } 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 05111123b..ca5214533 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 @@ -49,7 +49,7 @@ data class BackupChapter( lastPageRead = chapter.last_page_read, dateFetch = chapter.date_fetch, dateUpload = chapter.date_upload, - sourceOrder = chapter.source_order + sourceOrder = chapter.source_order, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupFlatMetadata.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupFlatMetadata.kt index 78e0415fe..82d3e1e6c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupFlatMetadata.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupFlatMetadata.kt @@ -11,13 +11,13 @@ import kotlinx.serialization.protobuf.ProtoNumber data class BackupFlatMetadata( @ProtoNumber(1) var searchMetadata: BackupSearchMetadata, @ProtoNumber(2) var searchTags: List = emptyList(), - @ProtoNumber(3) var searchTitles: List = emptyList() + @ProtoNumber(3) var searchTitles: List = emptyList(), ) { fun getFlatMetadata(mangaId: Long): FlatMetadata { return FlatMetadata( metadata = searchMetadata.getSearchMetadata(mangaId), tags = searchTags.map { it.getSearchTag(mangaId) }, - titles = searchTitles.map { it.getSearchTitle(mangaId) } + titles = searchTitles.map { it.getSearchTitle(mangaId) }, ) } @@ -26,7 +26,7 @@ data class BackupFlatMetadata( return BackupFlatMetadata( searchMetadata = BackupSearchMetadata.copyFrom(flatMetadata.metadata), searchTags = flatMetadata.tags.map { BackupSearchTag.copyFrom(it) }, - searchTitles = flatMetadata.titles.map { BackupSearchTitle.copyFrom(it) } + searchTitles = flatMetadata.titles.map { BackupSearchTitle.copyFrom(it) }, ) } } 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 98b415e60..790e433c9 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 3ddfa93c3..8a2dafd63 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 @@ -95,7 +95,7 @@ data class BackupManga( artist = customArtist, description = customDescription, genre = customGenre, - status = customStatus.takeUnless { it == 0 } + status = customStatus.takeUnless { it == 0 }, ) } return null @@ -127,7 +127,7 @@ data class BackupManga( viewer = manga.readingModeType, viewer_flags = manga.viewer_flags, chapterFlags = manga.chapter_flags, - filtered_scanlators = manga.filtered_scanlators + filtered_scanlators = manga.filtered_scanlators, // SY --> ).also { backupManga -> customMangaManager?.getManga(manga)?.let { diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupMergedMangaReference.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupMergedMangaReference.kt index 1508cabd8..38e753ba1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupMergedMangaReference.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupMergedMangaReference.kt @@ -16,7 +16,7 @@ data class BackupMergedMangaReference( @ProtoNumber(5) var downloadChapters: Boolean, @ProtoNumber(6) var mergeUrl: String, @ProtoNumber(7) var mangaUrl: String, - @ProtoNumber(8) var mangaSourceId: Long + @ProtoNumber(8) var mangaSourceId: Long, ) { fun getMergedMangaReference(): MergedMangaReference { return MergedMangaReference( @@ -30,7 +30,7 @@ data class BackupMergedMangaReference( mangaSourceId = mangaSourceId, mergeId = null, mangaId = null, - id = null + id = null, ) } @@ -44,7 +44,7 @@ data class BackupMergedMangaReference( downloadChapters = mergedMangaReference.downloadChapters, mergeUrl = mergedMangaReference.mergeUrl, mangaUrl = mergedMangaReference.mangaUrl, - mangaSourceId = mergedMangaReference.mangaSourceId + mangaSourceId = mergedMangaReference.mangaSourceId, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupSavedSearch.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupSavedSearch.kt index 20ed2e7f2..b92a4d59c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupSavedSearch.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupSavedSearch.kt @@ -11,5 +11,5 @@ data class BackupSavedSearch( @ProtoNumber(1) val name: String, @ProtoNumber(2) val query: String = "", @ProtoNumber(3) val filterList: String = "", - @ProtoNumber(4) val source: Long = 0 + @ProtoNumber(4) val source: Long = 0, ) 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 a8c12f584..8c823f71c 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 9a8c2ea45..2ef022d5d 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 @@ -56,7 +56,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/backup/full/models/metadata/BackupSearchMetadata.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/metadata/BackupSearchMetadata.kt index 8c23397f7..0de8e9c10 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/metadata/BackupSearchMetadata.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/metadata/BackupSearchMetadata.kt @@ -9,7 +9,7 @@ data class BackupSearchMetadata( @ProtoNumber(1) var uploader: String? = null, @ProtoNumber(2) var extra: String, @ProtoNumber(3) var indexedExtra: String? = null, - @ProtoNumber(4) var extraVersion: Int + @ProtoNumber(4) var extraVersion: Int, ) { fun getSearchMetadata(mangaId: Long): SearchMetadata { return SearchMetadata( @@ -17,7 +17,7 @@ data class BackupSearchMetadata( uploader = uploader, extra = extra, indexedExtra = indexedExtra, - extraVersion = extraVersion + extraVersion = extraVersion, ) } @@ -27,7 +27,7 @@ data class BackupSearchMetadata( uploader = searchMetadata.uploader, extra = searchMetadata.extra, indexedExtra = searchMetadata.indexedExtra, - extraVersion = searchMetadata.extraVersion + extraVersion = searchMetadata.extraVersion, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/metadata/BackupSearchTag.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/metadata/BackupSearchTag.kt index c210ad0fc..5593ec457 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/metadata/BackupSearchTag.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/metadata/BackupSearchTag.kt @@ -8,7 +8,7 @@ import kotlinx.serialization.protobuf.ProtoNumber data class BackupSearchTag( @ProtoNumber(1) var namespace: String? = null, @ProtoNumber(2) var name: String, - @ProtoNumber(3) var type: Int + @ProtoNumber(3) var type: Int, ) { fun getSearchTag(mangaId: Long): SearchTag { return SearchTag( @@ -16,7 +16,7 @@ data class BackupSearchTag( mangaId = mangaId, namespace = namespace, name = name, - type = type + type = type, ) } @@ -25,7 +25,7 @@ data class BackupSearchTag( return BackupSearchTag( namespace = searchTag.namespace, name = searchTag.name, - type = searchTag.type + type = searchTag.type, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/metadata/BackupSearchTitle.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/metadata/BackupSearchTitle.kt index 848d3efde..40fa4746d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/metadata/BackupSearchTitle.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/metadata/BackupSearchTitle.kt @@ -7,14 +7,14 @@ import kotlinx.serialization.protobuf.ProtoNumber @Serializable data class BackupSearchTitle( @ProtoNumber(1) var title: String, - @ProtoNumber(2) var type: Int + @ProtoNumber(2) var type: Int, ) { fun getSearchTitle(mangaId: Long): SearchTitle { return SearchTitle( id = null, mangaId = mangaId, title = title, - type = type + type = type, ) } @@ -22,7 +22,7 @@ data class BackupSearchTitle( fun copyFrom(searchTitle: SearchTitle): BackupSearchTitle { return BackupSearchTitle( title = searchTitle.title, - type = searchTitle.type + type = searchTitle.type, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupManager.kt index 2ecd1cc01..8a596485e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupManager.kt @@ -302,7 +302,7 @@ class LegacyBackupManager(context: Context, version: Int = CURRENT_VERSION) : Ab source = it.substringBefore(':').toLongOrNull() ?: return@mapNotNull null, content["name"]!!.jsonPrimitive.content, content["query"]!!.jsonPrimitive.contentOrNull?.nullIfBlank(), - Json.encodeToString(content["filters"]!!.jsonArray) + Json.encodeToString(content["filters"]!!.jsonArray), ) }.getOrNull() }.filter { backupSavedSearch -> diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt index 451a589d6..2f8f5d0f3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt @@ -34,7 +34,7 @@ class LegacyBackupRestore(context: Context, notifier: BackupNotifier) : Abstract // Read the json and create a Json Object, // cannot use the backupManager json deserializer one because its not initialized yet val backupObject = Json.decodeFromStream( - context.contentResolver.openInputStream(uri)!! + context.contentResolver.openInputStream(uri)!!, ) // Get parser version @@ -143,7 +143,7 @@ class LegacyBackupRestore(context: Context, notifier: BackupNotifier) : Abstract chapters: List, categories: List, history: List, - tracks: List + tracks: List, ) { val dbManga = backupManager.getMangaFromDatabase(manga) @@ -173,7 +173,7 @@ class LegacyBackupRestore(context: Context, notifier: BackupNotifier) : Abstract chapters: List, categories: List, history: List, - tracks: List + tracks: List, ) { try { val fetchedManga = backupManager.fetchManga(source, manga) @@ -195,7 +195,7 @@ class LegacyBackupRestore(context: Context, notifier: BackupNotifier) : Abstract chapters: List, categories: List, history: List, - tracks: List + tracks: List, ) { if (!backupManager.restoreChaptersForManga(backupManga, chapters)) { updateChapters(source, backupManga, chapters) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestoreValidator.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestoreValidator.kt index d1dafb6ce..0f1410817 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestoreValidator.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestoreValidator.kt @@ -21,7 +21,7 @@ class LegacyBackupRestoreValidator : AbstractBackupRestoreValidator() { val backup = try { backupManager.parser.decodeFromStream( - context.contentResolver.openInputStream(uri)!! + context.contentResolver.openInputStream(uri)!!, ) } catch (e: Exception) { throw ValidatorParseException(e) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/models/Backup.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/models/Backup.kt index cd6d52222..622a44600 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/models/Backup.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/models/Backup.kt @@ -21,7 +21,7 @@ data class Backup( // SY Specific values @SerialName("mergedmangareferences") var mergedMangaReferences: List<@Contextual MergedMangaReference>? = null, - var savedSearches: String? = null + var savedSearches: String? = null, ) { companion object { const val CURRENT_VERSION = 2 @@ -39,5 +39,5 @@ data class MangaObject( var chapters: List<@Contextual Chapter>? = null, var categories: List? = null, var track: List<@Contextual Track>? = null, - var history: List<@Contextual DHistory>? = null + var history: List<@Contextual DHistory>? = null, ) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/CategoryTypeSerializer.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/CategoryTypeSerializer.kt index b5f52a1bb..ab6861bb2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/CategoryTypeSerializer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/CategoryTypeSerializer.kt @@ -27,7 +27,7 @@ open class CategoryBaseSerializer : KSerializer { buildJsonArray { add(value.name) add(value.order) - } + }, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/ChapterTypeSerializer.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/ChapterTypeSerializer.kt index 02f52362f..a1ae4a6bf 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/ChapterTypeSerializer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/ChapterTypeSerializer.kt @@ -35,7 +35,7 @@ open class ChapterBaseSerializer : KSerializer { if (value.last_page_read != 0) { put(LAST_READ, value.last_page_read) } - } + }, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/HistoryTypeSerializer.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/HistoryTypeSerializer.kt index ba19803ed..7cbc7a452 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/HistoryTypeSerializer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/HistoryTypeSerializer.kt @@ -26,7 +26,7 @@ object HistoryTypeSerializer : KSerializer { buildJsonArray { add(value.url) add(value.lastRead) - } + }, ) } @@ -35,7 +35,7 @@ object HistoryTypeSerializer : KSerializer { val array = decoder.decodeJsonElement().jsonArray return DHistory( url = array[0].jsonPrimitive.content, - lastRead = array[1].jsonPrimitive.long + lastRead = array[1].jsonPrimitive.long, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/MangaTypeSerializer.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/MangaTypeSerializer.kt index 1224b3cd5..bec833ab9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/MangaTypeSerializer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/MangaTypeSerializer.kt @@ -31,7 +31,7 @@ open class MangaBaseSerializer : KSerializer { add(value.source) add(value.viewer_flags) add(value.chapter_flags) - } + }, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/MergedMangaReferenceTypeSerializer.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/MergedMangaReferenceTypeSerializer.kt index 2c42fcfff..0fd4bd040 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/MergedMangaReferenceTypeSerializer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/MergedMangaReferenceTypeSerializer.kt @@ -34,7 +34,7 @@ object MergedMangaTypeSerializer : KSerializer { add(value.getChapterUpdates) add(value.isInfoManga) add(value.downloadChapters) - } + }, ) } @@ -52,7 +52,7 @@ object MergedMangaTypeSerializer : KSerializer { isInfoManga = array[6].jsonPrimitive.boolean, downloadChapters = array[7].jsonPrimitive.boolean, mangaId = null, - mergeId = null + mergeId = null, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/TrackTypeSerializer.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/TrackTypeSerializer.kt index 1c259dd06..4691e9a86 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/TrackTypeSerializer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/serializer/TrackTypeSerializer.kt @@ -33,7 +33,7 @@ open class TrackBaseSerializer : KSerializer { put(LIBRARY, value.library_id) put(LAST_READ, value.last_chapter_read) put(TRACKING_URL, value.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 7f4918e66..5ce71accb 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/cache/ChapterCache.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/cache/ChapterCache.kt @@ -93,7 +93,7 @@ class ChapterCache(private val context: Context) { File(context.cacheDir, PARAMETER_CACHE_DIRECTORY), PARAMETER_APP_VERSION, PARAMETER_VALUE_COUNT, - cacheSize * 1024 * 1024 + cacheSize * 1024 * 1024, ) } // <-- EH diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/coil/MangaCoverFetcher.kt b/app/src/main/java/eu/kanade/tachiyomi/data/coil/MangaCoverFetcher.kt index 59de4bdf5..978765c43 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/coil/MangaCoverFetcher.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/coil/MangaCoverFetcher.kt @@ -47,7 +47,7 @@ class MangaCoverFetcher( private val options: Options, private val coverCache: CoverCache, private val callFactoryLazy: Lazy, - private val diskCacheLazy: Lazy + private val diskCacheLazy: Lazy, ) : Fetcher { // For non-custom cover @@ -75,7 +75,7 @@ class MangaCoverFetcher( return SourceResult( source = ImageSource(file = file.toOkioPath(), diskCacheKey = diskCacheKey), mimeType = "image/*", - dataSource = DataSource.DISK + dataSource = DataSource.DISK, ) } @@ -104,7 +104,7 @@ class MangaCoverFetcher( return SourceResult( source = snapshot.toImageSource(), mimeType = "image/*", - dataSource = DataSource.DISK + dataSource = DataSource.DISK, ) } @@ -124,7 +124,7 @@ class MangaCoverFetcher( return SourceResult( source = snapshot.toImageSource(), mimeType = "image/*", - dataSource = DataSource.NETWORK + dataSource = DataSource.NETWORK, ) } @@ -132,7 +132,7 @@ class MangaCoverFetcher( return SourceResult( source = ImageSource(source = responseBody.source(), context = options.context), mimeType = "image/*", - dataSource = if (response.cacheResponse != null) DataSource.DISK else DataSource.NETWORK + dataSource = if (response.cacheResponse != null) DataSource.DISK else DataSource.NETWORK, ) } catch (e: Exception) { responseBody.closeQuietly() @@ -273,7 +273,7 @@ class MangaCoverFetcher( class Factory( private val callFactoryLazy: Lazy, - private val diskCacheLazy: Lazy + private val diskCacheLazy: Lazy, ) : Fetcher.Factory { private val coverCache: CoverCache by injectLazy() diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/coil/TachiyomiImageDecoder.kt b/app/src/main/java/eu/kanade/tachiyomi/data/coil/TachiyomiImageDecoder.kt index b8545b963..160782bc1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/coil/TachiyomiImageDecoder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/coil/TachiyomiImageDecoder.kt @@ -32,7 +32,7 @@ class TachiyomiImageDecoder(private val resources: ImageSource, private val opti return DecodeResult( drawable = bitmap.toDrawable(options.context.resources), - isSampled = false + isSampled = false, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt index 1040316e6..b6a3238ea 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt @@ -54,7 +54,8 @@ open class DatabaseHelper(context: Context) : CategoryQueries, MangaCategoryQueries, HistoryQueries - /* SY --> */, + /* SY --> */ + , SearchMetadataQueries, SearchTagQueries, SearchTitleQueries, @@ -62,7 +63,8 @@ open class DatabaseHelper(context: Context) : FavoriteEntryQueries, SavedSearchQueries, FeedSavedSearchQueries -/* SY <-- */ { +/* SY <-- */ +{ private val configuration = SupportSQLiteOpenHelper.Configuration.builder(context) .name(DbOpenCallback.DATABASE_NAME) 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 92e61a67d..93826ab8a 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt @@ -27,7 +27,7 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) { /** * Version of the database. */ - const val DATABASE_VERSION = /* SY --> */ 13 /* SY <-- */ + const val DATABASE_VERSION = /* SY --> */ 13 // SY <-- } override fun onCreate(db: SupportSQLiteDatabase) = with(db) { 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 b2249eeda..dfc7d7709 100755 --- 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() { @@ -42,7 +42,7 @@ class CategoryPutResolver : DefaultPutResolver() { COL_NAME to obj.name, COL_ORDER to obj.order, COL_FLAGS to obj.flags, - COL_MANGA_ORDER to obj.mangaOrder.joinToString("/") + COL_MANGA_ORDER to obj.mangaOrder.joinToString("/"), ) } 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 52a353f04..d56fe36d0 100755 --- 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 @@ -28,7 +28,7 @@ import eu.kanade.tachiyomi.data.database.tables.ChapterTable.TABLE class ChapterTypeMapping : SQLiteTypeMapping( ChapterPutResolver(), ChapterGetResolver(), - ChapterDeleteResolver() + ChapterDeleteResolver(), ) class ChapterPutResolver : DefaultPutResolver() { @@ -56,7 +56,7 @@ class ChapterPutResolver : DefaultPutResolver() { COL_DATE_UPLOAD to obj.date_upload, COL_LAST_PAGE_READ to obj.last_page_read, COL_CHAPTER_NUMBER to obj.chapter_number, - COL_SOURCE_ORDER to obj.source_order + COL_SOURCE_ORDER to obj.source_order, ) } 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 896881cbd..836eb3c13 100755 --- 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() { @@ -40,7 +40,7 @@ open class HistoryPutResolver : DefaultPutResolver() { COL_ID to obj.id, COL_CHAPTER_ID to obj.chapter_id, COL_LAST_READ to obj.last_read, - COL_TIME_READ to obj.time_read + COL_TIME_READ to obj.time_read, ) } 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 93950fbf6..abd807f2f 100755 --- 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() { @@ -37,7 +37,7 @@ class MangaCategoryPutResolver : DefaultPutResolver() { contentValuesOf( COL_ID to obj.id, COL_MANGA_ID to obj.manga_id, - COL_CATEGORY_ID to obj.category_id + COL_CATEGORY_ID to obj.category_id, ) } 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 437b2acfa..234d17ac2 100755 --- 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() { @@ -70,7 +70,7 @@ class MangaPutResolver : DefaultPutResolver() { COL_CHAPTER_FLAGS to obj.chapter_flags, COL_COVER_LAST_MODIFIED to obj.cover_last_modified, COL_DATE_ADDED to obj.date_added, - COL_FILTERED_SCANLATORS to obj.filtered_scanlators + COL_FILTERED_SCANLATORS to obj.filtered_scanlators, ) } 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 ab9477862..24ca7c26e 100755 --- 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() { @@ -58,7 +58,7 @@ class TrackPutResolver : DefaultPutResolver() { COL_TRACKING_URL to obj.tracking_url, COL_SCORE to obj.score, COL_START_DATE to obj.started_reading_date, - COL_FINISH_DATE to obj.finished_reading_date + COL_FINISH_DATE to obj.finished_reading_date, ) } 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 34627579b..4fa3a1449 100755 --- 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 @@ -133,6 +133,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/queries/CategoryQueries.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/CategoryQueries.kt index bf769b154..f940a50c7 100755 --- 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 956f10b8f..b117e9bf1 100755 --- 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() // SY <-- @@ -37,7 +37,7 @@ interface ChapterQueries : DbProvider { .query(getRecentsQuery()) .args(date.time) .observesTables(ChapterTable.TABLE) - .build() + .build(), ) .withGetResolver(MangaChapterGetResolver.INSTANCE) .prepare() @@ -49,7 +49,7 @@ interface ChapterQueries : DbProvider { .table(ChapterTable.TABLE) .where("${ChapterTable.COL_ID} = ?") .whereArgs(id) - .build() + .build(), ) .prepare() @@ -60,7 +60,7 @@ interface ChapterQueries : DbProvider { .table(ChapterTable.TABLE) .where("${ChapterTable.COL_URL} = ?") .whereArgs(url) - .build() + .build(), ) .prepare() @@ -71,7 +71,7 @@ interface ChapterQueries : DbProvider { .table(ChapterTable.TABLE) .where("${ChapterTable.COL_URL} = ? AND ${ChapterTable.COL_MANGA_ID} = ?") .whereArgs(url, mangaId) - .build() + .build(), ) .prepare() @@ -83,7 +83,7 @@ interface ChapterQueries : DbProvider { .table(ChapterTable.TABLE) .where("${ChapterTable.COL_URL} = ?") .whereArgs(url) - .build() + .build(), ) .prepare() @@ -94,7 +94,7 @@ interface ChapterQueries : DbProvider { .table(ChapterTable.TABLE) .where("${ChapterTable.COL_URL} IN (?) AND (${ChapterTable.COL_READ} = 1 OR ${ChapterTable.COL_LAST_PAGE_READ} != 0)") .whereArgs(urls.joinToString { "\"$it\"" }) - .build() + .build(), ) .prepare() // SY <-- 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 d0d7e63e0..7b2ec55e2 100755 --- 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 @@ -33,7 +33,7 @@ interface HistoryQueries : DbProvider { .query(getRecentMangasQuery(search)) .args(date.time, limit, offset) .observesTables(HistoryTable.TABLE) - .build() + .build(), ) .withGetResolver(MangaChapterHistoryGetResolver.INSTANCE) .prepare() @@ -45,7 +45,7 @@ interface HistoryQueries : DbProvider { .query(getHistoryByMangaId()) .args(mangaId) .observesTables(HistoryTable.TABLE) - .build() + .build(), ) .prepare() @@ -56,7 +56,7 @@ interface HistoryQueries : DbProvider { .query(getHistoryByChapterUrl()) .args(chapterUrl) .observesTables(HistoryTable.TABLE) - .build() + .build(), ) .prepare() @@ -84,7 +84,7 @@ interface HistoryQueries : DbProvider { .byQuery( DeleteQuery.builder() .table(HistoryTable.TABLE) - .build() + .build(), ) .prepare() @@ -94,7 +94,7 @@ interface HistoryQueries : DbProvider { .table(HistoryTable.TABLE) .where("${HistoryTable.COL_LAST_READ} = ?") .whereArgs(0) - .build() + .build(), ) .prepare() @@ -110,7 +110,7 @@ interface HistoryQueries : DbProvider { .table(HistoryTable.TABLE) .where("${HistoryTable.COL_ID} IN (?)") .whereArgs(ids.joinToString()) - .build() + .build(), ) .prepare() // SY <-- 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 228ac3af5..8a67355d5 100755 --- 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 a3001226b..d9e9debdc 100755 --- 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 @@ -35,7 +35,7 @@ interface MangaQueries : DbProvider { RawQuery.builder() .query(libraryQuery) .observesTables(MangaTable.TABLE, ChapterTable.TABLE, MangaCategoryTable.TABLE, CategoryTable.TABLE) - .build() + .build(), ) .withGetResolver(LibraryMangaGetResolver.INSTANCE) .prepare() @@ -51,7 +51,7 @@ interface MangaQueries : DbProvider { manga.source, ) .limit(1) - .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() @@ -110,7 +110,7 @@ interface MangaQueries : DbProvider { .withQuery( Query.builder() .table(MangaTable.TABLE) - .build() + .build(), ) .prepare() @@ -119,7 +119,7 @@ interface MangaQueries : DbProvider { .withQuery( RawQuery.builder() .query(getReadMangaNotInLibraryQuery()) - .build() + .build(), ) .prepare() @@ -209,11 +209,11 @@ interface MangaQueries : DbProvider { ${MangaTable.COL_FAVORITE} = ? AND ${MangaTable.COL_SOURCE} IN (${Queries.placeholders(sourceIds.size)}) AND ${MangaTable.COL_ID} NOT IN ( SELECT ${MergedTable.COL_MANGA_ID} FROM ${MergedTable.TABLE} WHERE ${MergedTable.COL_MANGA_ID} != ${MergedTable.COL_MERGE_ID} ) - """.trimIndent() + """.trimIndent(), ) // SY <-- .whereArgs(0, *sourceIds.toTypedArray()) - .build() + .build(), ) .prepare() @@ -229,10 +229,10 @@ interface MangaQueries : DbProvider { ) AND ${MangaTable.COL_ID} NOT IN ( SELECT ${ChapterTable.COL_MANGA_ID} FROM ${ChapterTable.TABLE} WHERE ${ChapterTable.COL_READ} = 1 OR ${ChapterTable.COL_LAST_PAGE_READ} != 0 ) - """.trimIndent() + """.trimIndent(), ) .whereArgs(0, *sourceIds.toTypedArray()) - .build() + .build(), ) .prepare() // SY <-- @@ -241,7 +241,7 @@ interface MangaQueries : DbProvider { .byQuery( DeleteQuery.builder() .table(MangaTable.TABLE) - .build() + .build(), ) .prepare() @@ -251,7 +251,7 @@ interface MangaQueries : DbProvider { RawQuery.builder() .query(getLastReadMangaQuery()) .observesTables(MangaTable.TABLE) - .build() + .build(), ) .prepare() @@ -261,7 +261,7 @@ interface MangaQueries : DbProvider { RawQuery.builder() .query(getTotalChapterMangaQuery()) .observesTables(MangaTable.TABLE) - .build() + .build(), ) .prepare() @@ -271,7 +271,7 @@ interface MangaQueries : DbProvider { RawQuery.builder() .query(getLatestChapterMangaQuery()) .observesTables(MangaTable.TABLE) - .build() + .build(), ) .prepare() @@ -281,7 +281,7 @@ interface MangaQueries : DbProvider { RawQuery.builder() .query(getChapterFetchDateMangaQuery()) .observesTables(MangaTable.TABLE) - .build() + .build(), ) .prepare() @@ -296,9 +296,9 @@ interface MangaQueries : DbProvider { INNER JOIN ${SearchMetadataTable.TABLE} ON ${MangaTable.TABLE}.${MangaTable.COL_ID} = ${SearchMetadataTable.TABLE}.${SearchMetadataTable.COL_MANGA_ID} ORDER BY ${MangaTable.TABLE}.${MangaTable.COL_ID} - """.trimIndent() + """.trimIndent(), ) - .build() + .build(), ) .prepare() @@ -313,9 +313,9 @@ interface MangaQueries : DbProvider { ON ${MangaTable.TABLE}.${MangaTable.COL_ID} = ${SearchMetadataTable.TABLE}.${SearchMetadataTable.COL_MANGA_ID} WHERE ${MangaTable.TABLE}.${MangaTable.COL_FAVORITE} = 1 ORDER BY ${MangaTable.TABLE}.${MangaTable.COL_ID} - """.trimIndent() + """.trimIndent(), ) - .build() + .build(), ) .prepare() @@ -330,9 +330,9 @@ interface MangaQueries : DbProvider { ON ${MangaTable.TABLE}.${MangaTable.COL_ID} = ${SearchMetadataTable.TABLE}.${SearchMetadataTable.COL_MANGA_ID} WHERE ${MangaTable.TABLE}.${MangaTable.COL_FAVORITE} = 1 ORDER BY ${MangaTable.TABLE}.${MangaTable.COL_ID} - """.trimIndent() + """.trimIndent(), ) - .build() + .build(), ) .prepare() // SY <-- 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 1947a0218..cd1fe8582 100755 --- 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 @@ -15,7 +15,7 @@ interface TrackQueries : DbProvider { .withQuery( Query.builder() .table(TrackTable.TABLE) - .build() + .build(), ) .prepare() @@ -26,7 +26,7 @@ interface TrackQueries : DbProvider { .table(TrackTable.TABLE) .where("${TrackTable.COL_MANGA_ID} = ?") .whereArgs(manga.id) - .build() + .build(), ) .prepare() @@ -40,7 +40,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/ChapterBackupPutResolver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterBackupPutResolver.kt index 76516139f..7fb01a821 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterBackupPutResolver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterBackupPutResolver.kt @@ -29,6 +29,6 @@ class ChapterBackupPutResolver : 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/ChapterKnownBackupPutResolver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterKnownBackupPutResolver.kt index 5b8882e11..da62066c4 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/ChapterProgressPutResolver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterProgressPutResolver.kt index 949dcafd7..27a6838cc 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterProgressPutResolver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterProgressPutResolver.kt @@ -29,6 +29,6 @@ class ChapterProgressPutResolver : 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/ChapterSourceOrderPutResolver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterSourceOrderPutResolver.kt index 9814e9dc5..1e39d6534 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterSourceOrderPutResolver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/ChapterSourceOrderPutResolver.kt @@ -27,6 +27,6 @@ class ChapterSourceOrderPutResolver : PutResolver() { fun mapToContentValues(chapter: Chapter) = contentValuesOf( - ChapterTable.COL_SOURCE_ORDER to chapter.source_order + ChapterTable.COL_SOURCE_ORDER to chapter.source_order, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/HistoryChapterIdPutResolver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/HistoryChapterIdPutResolver.kt index f6b6c71dc..f5c529610 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/HistoryChapterIdPutResolver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/HistoryChapterIdPutResolver.kt @@ -27,6 +27,6 @@ class HistoryChapterIdPutResolver : PutResolver() { fun mapToContentValues(history: History) = contentValuesOf( - HistoryTable.COL_CHAPTER_ID to history.chapter_id + HistoryTable.COL_CHAPTER_ID to history.chapter_id, ) } 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 8546c7e55..7bcba97f7 100755 --- 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(), ) cursor.use { putCursor -> @@ -47,6 +47,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/MangaCoverLastModifiedPutResolver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaCoverLastModifiedPutResolver.kt index 0db595e42..6ab59168f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaCoverLastModifiedPutResolver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaCoverLastModifiedPutResolver.kt @@ -27,6 +27,6 @@ class MangaCoverLastModifiedPutResolver : PutResolver() { fun mapToContentValues(manga: Manga) = contentValuesOf( - MangaTable.COL_COVER_LAST_MODIFIED to manga.cover_last_modified + MangaTable.COL_COVER_LAST_MODIFIED to manga.cover_last_modified, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFavoritePutResolver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFavoritePutResolver.kt index e8e1af12a..0389d4854 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFavoritePutResolver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaFavoritePutResolver.kt @@ -28,6 +28,6 @@ class MangaFavoritePutResolver : PutResolver() { fun mapToContentValues(manga: Manga) = contentValuesOf( MangaTable.COL_FAVORITE to manga.favorite, - MangaTable.COL_DATE_ADDED to manga.date_added + MangaTable.COL_DATE_ADDED to manga.date_added, ) } 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 6a0874f83..72691c649 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 @@ -27,6 +27,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 7437e932e..a90784d82 100755 --- 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 @@ -28,6 +28,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/database/resolvers/MangaInfoPutResolver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaInfoPutResolver.kt index 411d3e117..0d7df08d7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaInfoPutResolver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaInfoPutResolver.kt @@ -32,7 +32,7 @@ class MangaInfoPutResolver(val reset: Boolean = false) : PutResolver() { MangaTable.COL_AUTHOR to manga.originalAuthor, MangaTable.COL_ARTIST to manga.originalArtist, MangaTable.COL_DESCRIPTION to manga.originalDescription, - MangaTable.COL_STATUS to manga.originalStatus + MangaTable.COL_STATUS to manga.originalStatus, ) private fun resetToContentValues(manga: Manga) = contentValuesOf( @@ -41,7 +41,7 @@ class MangaInfoPutResolver(val reset: Boolean = false) : PutResolver() { MangaTable.COL_AUTHOR to manga.author?.split(splitter)?.lastOrNull(), MangaTable.COL_ARTIST to manga.artist?.split(splitter)?.lastOrNull(), MangaTable.COL_DESCRIPTION to manga.description?.split(splitter)?.lastOrNull(), - MangaTable.COL_STATUS to manga.status.nullIfZero()?.toString()?.split(splitter)?.lastOrNull() + MangaTable.COL_STATUS to manga.status.nullIfZero()?.toString()?.split(splitter)?.lastOrNull(), ) companion object { diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaLastUpdatedPutResolver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaLastUpdatedPutResolver.kt index 5cd673c6e..e2dcb22dc 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaLastUpdatedPutResolver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaLastUpdatedPutResolver.kt @@ -27,6 +27,6 @@ class MangaLastUpdatedPutResolver : PutResolver() { fun mapToContentValues(manga: Manga) = contentValuesOf( - MangaTable.COL_LAST_UPDATE to manga.last_update + MangaTable.COL_LAST_UPDATE to manga.last_update, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaMigrationPutResolver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaMigrationPutResolver.kt index 06124d819..b15af8e0f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaMigrationPutResolver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaMigrationPutResolver.kt @@ -30,6 +30,6 @@ class MangaMigrationPutResolver : PutResolver() { MangaTable.COL_DATE_ADDED to manga.date_added, MangaTable.COL_TITLE to manga.title, MangaTable.COL_CHAPTER_FLAGS to manga.chapter_flags, - MangaTable.COL_VIEWER to manga.viewer_flags + MangaTable.COL_VIEWER to manga.viewer_flags, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaThumbnailPutResolver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaThumbnailPutResolver.kt index f48206509..e1a1462de 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaThumbnailPutResolver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaThumbnailPutResolver.kt @@ -27,6 +27,6 @@ class MangaThumbnailPutResolver : PutResolver() { .build() fun mapToContentValues(manga: Manga) = contentValuesOf( - MangaTable.COL_THUMBNAIL_URL to manga.thumbnail_url + MangaTable.COL_THUMBNAIL_URL to manga.thumbnail_url, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaTitlePutResolver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaTitlePutResolver.kt index 64323d276..5ffa22bef 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaTitlePutResolver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaTitlePutResolver.kt @@ -27,6 +27,6 @@ class MangaTitlePutResolver : PutResolver() { fun mapToContentValues(manga: Manga) = contentValuesOf( - MangaTable.COL_TITLE to manga.title + MangaTable.COL_TITLE to manga.title, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaUrlPutResolver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaUrlPutResolver.kt index 32a68e1ca..81d0546bb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaUrlPutResolver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaUrlPutResolver.kt @@ -27,6 +27,6 @@ class MangaUrlPutResolver : PutResolver() { .build() fun mapToContentValues(manga: Manga) = contentValuesOf( - MangaTable.COL_URL to manga.url + MangaTable.COL_URL to manga.url, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/TrackTable.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/TrackTable.kt index c3b2cff48..5a9a8f239 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/TrackTable.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/TrackTable.kt @@ -73,7 +73,7 @@ object TrackTable { |INSERT INTO $TABLE($COL_ID,$COL_MANGA_ID,$COL_SYNC_ID,$COL_MEDIA_ID,$COL_LIBRARY_ID,$COL_TITLE,$COL_LAST_CHAPTER_READ,$COL_TOTAL_CHAPTERS,$COL_STATUS,$COL_SCORE,$COL_TRACKING_URL,$COL_START_DATE,$COL_FINISH_DATE) |SELECT $COL_ID,$COL_MANGA_ID,$COL_SYNC_ID,$COL_MEDIA_ID,$COL_LIBRARY_ID,$COL_TITLE,$COL_LAST_CHAPTER_READ,$COL_TOTAL_CHAPTERS,$COL_STATUS,$COL_SCORE,$COL_TRACKING_URL,$COL_START_DATE,$COL_FINISH_DATE |FROM ${TABLE}_tmp - """.trimMargin() + """.trimMargin() val dropTempTable: String get() = "DROP TABLE ${TABLE}_tmp" 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 579ff20cb..cbdc476ab 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 @@ -27,7 +27,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(), ) { /** @@ -251,7 +251,7 @@ class DownloadCache( */ private class RootDirectory( val dir: UniFile, - var files: Map = hashMapOf() + var files: Map = hashMapOf(), ) /** @@ -259,7 +259,7 @@ class DownloadCache( */ private class SourceDirectory( val dir: UniFile, - var files: Map = hashMapOf() + var files: Map = hashMapOf(), ) /** @@ -267,7 +267,7 @@ class DownloadCache( */ private class MangaDirectory( val dir: UniFile, - var files: Set = hashSetOf() + var files: Set = 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 eadbc1a2c..8810c1f1d 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt @@ -32,7 +32,7 @@ import uy.kohesive.injekt.injectLazy */ class DownloadManager( private val context: Context, - private val db: DatabaseHelper = Injekt.get() + private val db: DatabaseHelper = Injekt.get(), ) { private val sourceManager: SourceManager by injectLazy() 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 e4a384c39..2d55f2df0 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt @@ -93,14 +93,14 @@ internal class DownloadNotifier(private val context: Context) { addAction( R.drawable.ic_pause_24dp, context.getString(R.string.action_pause), - NotificationReceiver.pauseDownloadsPendingBroadcast(context) + NotificationReceiver.pauseDownloadsPendingBroadcast(context), ) } val downloadingProgressText = context.getString( R.string.chapter_downloading_progress, download.downloadedImages, - download.pages!!.size + download.pages!!.size, ) if (preferences.hideNotificationContent()) { @@ -138,13 +138,13 @@ internal class DownloadNotifier(private val context: Context) { addAction( R.drawable.ic_play_arrow_24dp, context.getString(R.string.action_resume), - NotificationReceiver.resumeDownloadsPendingBroadcast(context) + NotificationReceiver.resumeDownloadsPendingBroadcast(context), ) // Clear action addAction( R.drawable.ic_close_24dp, context.getString(R.string.action_cancel_all), - NotificationReceiver.clearDownloadsPendingBroadcast(context) + NotificationReceiver.clearDownloadsPendingBroadcast(context), ) show(Notifications.ID_DOWNLOAD_CHAPTER_PROGRESS) @@ -213,7 +213,7 @@ internal class DownloadNotifier(private val context: Context) { // Create notification with(errorNotificationBuilder) { setContentTitle( - mangaTitle?.plus(": $chapter") ?: context.getString(R.string.download_notifier_downloader_title) + mangaTitle?.plus(": $chapter") ?: context.getString(R.string.download_notifier_downloader_title), ) setContentText(error ?: context.getString(R.string.download_notifier_unknown_error)) setSmallIcon(R.drawable.ic_warning_white_24dp) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadPendingDeleter.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadPendingDeleter.kt index c2c50b57b..8c50559bd 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadPendingDeleter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadPendingDeleter.kt @@ -126,7 +126,7 @@ class DownloadPendingDeleter(context: Context) { @Serializable private data class Entry( val chapters: List, - val manga: MangaEntry + val manga: MangaEntry, ) /** @@ -137,7 +137,7 @@ class DownloadPendingDeleter(context: Context) { val id: Long, val url: String, val name: String, - val scanlator: String? = null + val scanlator: String? = null, ) /** @@ -148,7 +148,7 @@ class DownloadPendingDeleter(context: Context) { val id: Long, val url: String, val title: String, - val source: Long + val source: Long, ) /** 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 a794f36e4..acfd32dac 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt @@ -121,7 +121,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() return mangaDir.listFiles().orEmpty().asList().filter { @@ -164,7 +164,7 @@ class DownloadProvider(private val context: Context) { when { chapter.scanlator != null -> "${chapter.scanlator}_${chapter.name}" else -> chapter.name - } + }, ) } @@ -183,7 +183,7 @@ class DownloadProvider(private val context: Context) { "$chapterName.cbz", // Legacy chapter directory name used in v0.9.2 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 90d8c802c..11e1f7898 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadService.kt @@ -177,7 +177,9 @@ class DownloadService : Service() { */ private fun listenDownloaderState() { subscriptions += downloadManager.runningRelay - .doOnError { /* Swallow wakelock error */ } + .doOnError { + /* Swallow wakelock error */ + } .subscribe { running -> if (running) { wakeLock.acquireIfNeeded() diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadStore.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadStore.kt index 22b13d676..0f4624d3a 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadStore.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadStore.kt @@ -20,7 +20,7 @@ import uy.kohesive.injekt.injectLazy */ class DownloadStore( context: Context, - private val sourceManager: SourceManager + private val sourceManager: SourceManager, ) { /** 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 2b272aaa5..2cf4ff9c6 100755 --- 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 chapterCache: ChapterCache by injectLazy() @@ -213,7 +213,7 @@ class Downloader( downloadChapter(download).subscribeOn(Schedulers.io()) } }, - 5 + 5, ) .onBackpressureLatest() .observeOn(AndroidSchedulers.mainThread()) @@ -225,7 +225,7 @@ class Downloader( DownloadService.stop(context) logcat(LogPriority.ERROR, error) notifier.onError(error.message) - } + }, ) } @@ -484,7 +484,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 af4982bb9..4b7b623c2 100755 --- 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 @@ -11,7 +11,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 { private val statusSubject = PublishSubject.create() 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 fc5aa5765..89a5fcc90 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 @@ -22,7 +22,7 @@ class CustomMangaManager(val context: Context) { val json = try { Json.decodeFromString( - editJson.bufferedReader().use { it.readText() } + editJson.bufferedReader().use { it.readText() }, ) } catch (e: Exception) { null @@ -67,13 +67,13 @@ class CustomMangaManager(val context: Context) { artist, description, genre?.split(", "), - status + status, ) } @Serializable data class MangaList( - val mangas: List? = null + val mangas: List? = null, ) @Serializable @@ -84,7 +84,7 @@ class CustomMangaManager(val context: Context) { val artist: String? = null, val description: String? = null, val genre: List? = 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 a1d31dfbc..218c82554 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt @@ -49,7 +49,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 5940f5da3..d5d2a52b5 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 @@ -87,7 +87,7 @@ class LibraryUpdateNotifier(private val context: Context) { Notifications.ID_LIBRARY_PROGRESS, progressNotificationBuilder .setProgress(total, current, false) - .build() + .build(), ) } @@ -111,7 +111,7 @@ class LibraryUpdateNotifier(private val context: Context) { setContentIntent(NotificationReceiver.openErrorLogPendingActivity(context, uri)) } - .build() + .build(), ) } @@ -132,7 +132,7 @@ class LibraryUpdateNotifier(private val context: Context) { setSmallIcon(R.drawable.ic_tachi) addAction(R.drawable.ic_help_24dp, context.getString(R.string.learn_more), NotificationHandler.openUrl(context, HELP_SKIPPED_URL)) } - .build() + .build(), ) } @@ -162,8 +162,8 @@ class LibraryUpdateNotifier(private val context: Context) { NotificationCompat.BigTextStyle().bigText( updates.joinToString("\n") { it.first.title.chop(NOTIF_TITLE_MAX_LEN) - } - ) + }, + ), ) } } @@ -178,7 +178,7 @@ class LibraryUpdateNotifier(private val context: Context) { setContentIntent(getNotificationIntent()) setAutoCancel(true) - } + }, ) // Per-manga notification @@ -223,8 +223,8 @@ class LibraryUpdateNotifier(private val context: Context) { context, manga, chapters, - Notifications.ID_NEW_CHAPTERS - ) + Notifications.ID_NEW_CHAPTERS, + ), ) // View chapters action addAction( @@ -233,8 +233,8 @@ class LibraryUpdateNotifier(private val context: Context) { NotificationReceiver.openChapterPendingActivity( context, manga, - Notifications.ID_NEW_CHAPTERS - ) + Notifications.ID_NEW_CHAPTERS, + ), ) // Download chapters action // Only add the action when chapters is within threshold @@ -246,8 +246,8 @@ class LibraryUpdateNotifier(private val context: Context) { context, manga, chapters, - Notifications.ID_NEW_CHAPTERS - ) + Notifications.ID_NEW_CHAPTERS, + ), ) } } @@ -274,7 +274,7 @@ class LibraryUpdateNotifier(private val context: Context) { val formatter = DecimalFormat( "#.###", DecimalFormatSymbols() - .apply { decimalSeparator = '.' } + .apply { decimalSeparator = '.' }, ) val displayableChapterNumbers = chapters 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 8fda65603..e961a2867 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt @@ -92,7 +92,7 @@ class LibraryUpdateService( val preferences: PreferencesHelper = Injekt.get(), val downloadManager: DownloadManager = Injekt.get(), val trackManager: TrackManager = Injekt.get(), - val coverCache: CoverCache = Injekt.get() + val coverCache: CoverCache = Injekt.get(), ) : Service() { private lateinit var wakeLock: PowerManager.WakeLock @@ -420,7 +420,7 @@ class LibraryUpdateService( // Convert to the manga that contains new chapters newUpdates.add( manga to newChapters.sortedByDescending { ch -> ch.source_order } - .toTypedArray() + .toTypedArray(), ) } } @@ -646,7 +646,7 @@ class LibraryUpdateService( notifier.showProgressNotification( updatingManga, completed.get(), - mangaToUpdate.size + mangaToUpdate.size, ) block(manga) @@ -660,7 +660,7 @@ class LibraryUpdateService( notifier.showProgressNotification( updatingManga, completed.get(), - mangaToUpdate.size + mangaToUpdate.size, ) } @@ -693,7 +693,7 @@ class LibraryUpdateService( dbManga = Manga.create( networkManga.url, networkManga.title, - mangaDex.id + mangaDex.id, ) dbManga.date_added = System.currentTimeMillis() } 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 9ffcfdafe..26fc7dea7 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt @@ -59,14 +59,14 @@ class NotificationReceiver : BroadcastReceiver() { shareImage( context, intent.getStringExtra(EXTRA_FILE_LOCATION)!!, - intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1) + intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1), ) // Delete image from path and dismiss notification ACTION_DELETE_IMAGE -> deleteImage( context, intent.getStringExtra(EXTRA_FILE_LOCATION)!!, - intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1) + intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1), ) // Share backup file ACTION_SHARE_BACKUP -> @@ -74,11 +74,11 @@ class NotificationReceiver : BroadcastReceiver() { context, intent.getParcelableExtra(EXTRA_URI)!!, "application/x-protobuf+gzip", - intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1) + intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1), ) ACTION_CANCEL_RESTORE -> cancelRestore( context, - intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1) + intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1), ) // Cancel library update and dismiss notification ACTION_CANCEL_LIBRARY_UPDATE -> cancelLibraryUpdate(context, Notifications.ID_LIBRARY_PROGRESS) @@ -87,7 +87,7 @@ class NotificationReceiver : BroadcastReceiver() { openChapter( context, intent.getLongExtra(EXTRA_MANGA_ID, -1), - intent.getLongExtra(EXTRA_CHAPTER_ID, -1) + intent.getLongExtra(EXTRA_CHAPTER_ID, -1), ) } // Mark updated manga chapters as read @@ -120,7 +120,7 @@ class NotificationReceiver : BroadcastReceiver() { context, intent.getParcelableExtra(EXTRA_URI)!!, "text/plain", - intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1) + intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1), ) } } @@ -461,7 +461,7 @@ class NotificationReceiver : BroadcastReceiver() { context: Context, manga: Manga, chapters: Array, - groupId: Int + groupId: Int, ): PendingIntent { val newIntent = Intent(context, NotificationReceiver::class.java).apply { action = ACTION_MARK_AS_READ @@ -483,7 +483,7 @@ class NotificationReceiver : BroadcastReceiver() { context: Context, manga: Manga, chapters: Array, - groupId: Int + groupId: Int, ): PendingIntent { val newIntent = Intent(context, NotificationReceiver::class.java).apply { action = ACTION_DOWNLOAD_CHAPTER 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 e7cae48b8..42e9c6d46 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 @@ -116,7 +116,7 @@ object Notifications { buildNotificationChannelGroup(GROUP_APK_UPDATES) { setName(context.getString(R.string.label_recent_updates)) }, - ) + ), ) notificationService.createNotificationChannelsCompat( @@ -182,7 +182,7 @@ object Notifications { setGroup(GROUP_APK_UPDATES) setName(context.getString(R.string.channel_ext_updates)) }, - ) + ), ) } } 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 386fb4e86..c7cbd0629 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt @@ -37,13 +37,13 @@ class PreferencesHelper(val context: Context) { private val defaultDownloadsDir = File( Environment.getExternalStorageDirectory().absolutePath + File.separator + context.getString(R.string.app_name), - "downloads" + "downloads", ).toUri() private val defaultBackupDir = File( Environment.getExternalStorageDirectory().absolutePath + File.separator + context.getString(R.string.app_name), - "backup" + "backup", ).toUri() fun startScreen() = prefs.getInt(Keys.startScreen, 1) @@ -70,12 +70,12 @@ class PreferencesHelper(val context: Context) { fun themeMode() = flowPrefs.getEnum( "pref_theme_mode_key", - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { Values.ThemeMode.system } else { Values.ThemeMode.light } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { Values.ThemeMode.system } else { Values.ThemeMode.light }, ) fun appTheme() = flowPrefs.getEnum( "pref_app_theme", - if (DeviceUtil.isDynamicColorAvailable) { Values.AppTheme.MONET } else { Values.AppTheme.DEFAULT } + if (DeviceUtil.isDynamicColorAvailable) { Values.AppTheme.MONET } else { Values.AppTheme.DEFAULT }, ) fun themeDarkAmoled() = flowPrefs.getBoolean("pref_theme_dark_amoled_key", false) @@ -327,7 +327,7 @@ class PreferencesHelper(val context: Context) { fun extensionInstaller() = flowPrefs.getEnum( "extension_installer", - if (DeviceUtil.isMiui) Values.ExtensionInstaller.LEGACY else Values.ExtensionInstaller.PACKAGEINSTALLER + if (DeviceUtil.isMiui) Values.ExtensionInstaller.LEGACY else Values.ExtensionInstaller.PACKAGEINSTALLER, ) fun verboseLogging() = prefs.getBoolean(Keys.verboseLogging, false) @@ -431,12 +431,12 @@ class PreferencesHelper(val context: Context) { fun exhSettingsLanguages() = flowPrefs.getString( "eh_settings_languages", - "false*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false" + "false*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false", ) fun exhEnabledCategories() = flowPrefs.getString( "eh_enabled_categories", - "false,false,false,false,false,false,false,false,false,false" + "false,false,false,false,false,false,false,false,false,false", ) fun feedTabInFront() = flowPrefs.getBoolean("latest_tab_position", false) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/saver/ImageSaver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/saver/ImageSaver.kt index be6af8cca..c17349a42 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/saver/ImageSaver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/saver/ImageSaver.kt @@ -20,7 +20,7 @@ import java.io.File import java.io.InputStream class ImageSaver( - val context: Context + val context: Context, ) { @SuppressLint("InlinedApi") @@ -47,13 +47,13 @@ class ImageSaver( put( MediaStore.Images.Media.RELATIVE_PATH, "${Environment.DIRECTORY_PICTURES}/${context.getString(R.string.app_name)}/" + - (image.location as Location.Pictures).relativePath + (image.location as Location.Pictures).relativePath, ) } val picture = context.contentResolver.insert( pictureDir, - contentValues + contentValues, ) ?: throw IOException("Couldn't create file") data().use { input -> @@ -83,18 +83,18 @@ class ImageSaver( sealed class Image( open val name: String, - open val location: Location + open val location: Location, ) { data class Cover( val bitmap: Bitmap, override val name: String, - override val location: Location + override val location: Location, ) : Image(name, location) data class Page( val inputStream: () -> InputStream, override val name: String, - override val location: Location + override val location: Location, ) : Image(name, location) val data: () -> InputStream @@ -129,12 +129,12 @@ sealed class Location { is Pictures -> { val file = File( Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES), - context.getString(R.string.app_name) + context.getString(R.string.app_name), ) if (relativePath.isNotEmpty()) { return File( file, - relativePath + relativePath, ) } file diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt index 13333daeb..f38bff651 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt @@ -63,7 +63,7 @@ class TrackManager(context: Context) { context.getString(R.string.plan_to_read) to PLAN_TO_READ, context.getString(R.string.paused) to PAUSED, context.getString(R.string.completed) to COMPLETED, - context.getString(R.string.dropped) to DROPPED + context.getString(R.string.dropped) to DROPPED, ) } // SY <-- 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 f05a0dc06..035ddc1ff 100755 --- 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 @@ -43,7 +43,8 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) { | status |} |} - |""".trimMargin() + | + """.trimMargin() val payload = buildJsonObject { put("query", query) putJsonObject("variables") { @@ -55,8 +56,8 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) { authClient.newCall( POST( apiUrl, - body = payload.toString().toRequestBody(jsonMime) - ) + body = payload.toString().toRequestBody(jsonMime), + ), ) .await() .parseAs() @@ -84,7 +85,8 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) { |progress |} |} - |""".trimMargin() + | + """.trimMargin() val payload = buildJsonObject { put("query", query) putJsonObject("variables") { @@ -127,7 +129,8 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) { |} |} |} - |""".trimMargin() + | + """.trimMargin() val payload = buildJsonObject { put("query", query) putJsonObject("variables") { @@ -137,8 +140,8 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) { authClient.newCall( POST( apiUrl, - body = payload.toString().toRequestBody(jsonMime) - ) + body = payload.toString().toRequestBody(jsonMime), + ), ) .await() .parseAs() @@ -193,7 +196,8 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) { |} |} |} - |""".trimMargin() + | + """.trimMargin() val payload = buildJsonObject { put("query", query) putJsonObject("variables") { @@ -204,8 +208,8 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) { authClient.newCall( POST( apiUrl, - body = payload.toString().toRequestBody(jsonMime) - ) + body = payload.toString().toRequestBody(jsonMime), + ), ) .await() .parseAs() @@ -238,15 +242,16 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) { |} |} |} - |""".trimMargin() + | + """.trimMargin() val payload = buildJsonObject { put("query", query) } authClient.newCall( POST( apiUrl, - body = payload.toString().toRequestBody(jsonMime) - ) + body = payload.toString().toRequestBody(jsonMime), + ), ) .await() .parseAs() @@ -255,7 +260,7 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) { val viewer = data["Viewer"]!!.jsonObject Pair( viewer["id"]!!.jsonPrimitive.int, - viewer["mediaListOptions"]!!.jsonObject["scoreFormat"]!!.jsonPrimitive.content + viewer["mediaListOptions"]!!.jsonObject["scoreFormat"]!!.jsonPrimitive.content, ) } } @@ -270,7 +275,7 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) { struct["format"]!!.jsonPrimitive.content.replace("_", "-"), struct["status"]!!.jsonPrimitive.contentOrNull ?: "", parseDate(struct, "startDate"), - struct["chapters"]!!.jsonPrimitive.intOrNull ?: 0 + struct["chapters"]!!.jsonPrimitive.intOrNull ?: 0, ) } @@ -282,7 +287,7 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) { struct["progress"]!!.jsonPrimitive.int, parseDate(struct, "startedAt"), parseDate(struct, "completedAt"), - jsonToALManga(struct["media"]!!.jsonObject) + jsonToALManga(struct["media"]!!.jsonObject), ) } @@ -292,7 +297,7 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) { date.set( struct[dateKey]!!.jsonObject["year"]!!.jsonPrimitive.int, struct[dateKey]!!.jsonObject["month"]!!.jsonPrimitive.int - 1, - struct[dateKey]!!.jsonObject["day"]!!.jsonPrimitive.int + struct[dateKey]!!.jsonObject["day"]!!.jsonPrimitive.int, ) date.timeInMillis } catch (_: Exception) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistModels.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistModels.kt index 93f09fc04..41cd2fe8a 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistModels.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistModels.kt @@ -16,7 +16,7 @@ data class ALManga( val format: String, val publishing_status: String, val start_date_fuzzy: Long, - val total_chapters: Int + val total_chapters: Int, ) { fun toTrack() = TrackSearch.create(TrackManager.ANILIST).apply { @@ -46,7 +46,7 @@ data class ALUserManga( val chapters_read: Int, val start_date_fuzzy: Long, val completed_date_fuzzy: Long, - val manga: ALManga + val manga: ALManga, ) { fun toTrack() = Track.create(TrackManager.ANILIST).apply { diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/OAuth.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/OAuth.kt index d6de7e1a9..49067070f 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/OAuth.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/OAuth.kt @@ -7,7 +7,7 @@ data class OAuth( val access_token: String, val token_type: String, val expires: Long, - val expires_in: Long + val expires_in: Long, ) { fun isExpired() = System.currentTimeMillis() > expires diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Avatar.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Avatar.kt index d0c2ffa45..1cea3438d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Avatar.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Avatar.kt @@ -6,5 +6,5 @@ import kotlinx.serialization.Serializable data class Avatar( val large: String? = "", val medium: String? = "", - val small: String? = "" + val small: String? = "", ) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/BangumiApi.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/BangumiApi.kt index b2a9abfd0..dc299b3eb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/BangumiApi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/BangumiApi.kt @@ -61,8 +61,8 @@ class BangumiApi(private val client: OkHttpClient, interceptor: BangumiIntercept authClient.newCall( POST( "$apiUrl/subject/${track.media_id}/update/watched_eps", - body = body - ) + body = body, + ), ).await() track @@ -168,7 +168,7 @@ class BangumiApi(private val client: OkHttpClient, interceptor: BangumiIntercept .add("client_secret", clientSecret) .add("code", code) .add("redirect_uri", redirectUrl) - .build() + .build(), ) companion object { @@ -201,7 +201,7 @@ class BangumiApi(private val client: OkHttpClient, interceptor: BangumiIntercept .add("client_secret", clientSecret) .add("refresh_token", token) .add("redirect_uri", redirectUrl) - .build() + .build(), ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/BangumiInterceptor.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/BangumiInterceptor.kt index 899ca8782..391b5e9e1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/BangumiInterceptor.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/BangumiInterceptor.kt @@ -34,7 +34,7 @@ class BangumiInterceptor(val bangumi: Bangumi) : Interceptor { .header("User-Agent", "Tachiyomi") .url( originalRequest.url.newBuilder() - .addQueryParameter("access_token", currAuth.access_token).build() + .addQueryParameter("access_token", currAuth.access_token).build(), ) .build() else originalRequest.newBuilder() .post(addToken(currAuth.access_token, originalRequest.body as FormBody)) @@ -51,7 +51,7 @@ class BangumiInterceptor(val bangumi: Bangumi) : Interceptor { System.currentTimeMillis() / 1000, oauth.expires_in, oauth.refresh_token, - this.oauth?.user_id + this.oauth?.user_id, ) bangumi.saveToken(oauth) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Collection.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Collection.kt index 297a01216..301167366 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Collection.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Collection.kt @@ -12,5 +12,5 @@ data class Collection( val status: Status? = Status(), val tag: List? = listOf(), val user: User? = User(), - val vol_status: Int? = 0 + val vol_status: Int? = 0, ) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/OAuth.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/OAuth.kt index 774438a5e..25776d341 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/OAuth.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/OAuth.kt @@ -9,7 +9,7 @@ data class OAuth( val created_at: Long = System.currentTimeMillis() / 1000, val expires_in: Long, val refresh_token: String?, - val user_id: Long? + val user_id: Long?, ) { // Access token refresh before expired diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Status.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Status.kt index a75f46389..f69bac3f5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Status.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Status.kt @@ -6,5 +6,5 @@ import kotlinx.serialization.Serializable data class Status( val id: Int? = 0, val name: String? = "", - val type: String? = "" + val type: String? = "", ) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/User.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/User.kt index 95c1f6dd2..514be8fb0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/User.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/User.kt @@ -10,5 +10,5 @@ data class User( val sign: String? = "", val url: String? = "", val usergroup: Int? = 0, - val username: String? = "" + val username: String? = "", ) 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 29e148461..1387d9d01 100755 --- 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() @@ -139,8 +139,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() @@ -252,7 +252,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 5cd28c496..33dade31c 100755 --- 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/komga/KomgaApi.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/komga/KomgaApi.kt index 5f65ab4b8..5292dac21 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/komga/KomgaApi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/komga/KomgaApi.kt @@ -72,7 +72,7 @@ class KomgaApi(private val client: OkHttpClient) { Request.Builder() .url("${track.tracking_url.replace("/api/v1/series/", "/api/v2/series/")}/read-progress/tachiyomi") .put(payload.toRequestBody("application/json".toMediaType())) - .build() + .build(), ) .await() return getTrackSearch(track.tracking_url) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/komga/KomgaModels.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/komga/KomgaModels.kt index 85b1e89b8..3b8a4ce4a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/komga/KomgaModels.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/komga/KomgaModels.kt @@ -15,7 +15,7 @@ data class SeriesDto( val booksUnreadCount: Int, val booksInProgressCount: Int, val metadata: SeriesMetadataDto, - val booksMetadata: BookMetadataAggregationDto + val booksMetadata: BookMetadataAggregationDto, ) @Serializable @@ -38,7 +38,7 @@ data class SeriesMetadataDto( val genres: Set, val genresLock: Boolean, val tags: Set, - val tagsLock: Boolean + val tagsLock: Boolean, ) @Serializable @@ -49,13 +49,13 @@ data class BookMetadataAggregationDto( val summaryNumber: String, val created: String, - val lastModified: String + val lastModified: String, ) @Serializable data class AuthorDto( val name: String, - val role: String + val role: String, ) @Serializable @@ -75,7 +75,7 @@ data class ReadListDto( val bookIds: List, val createdDate: String, val lastModifiedDate: String, - val filtered: Boolean + val filtered: Boolean, ) @Serializable diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt index 1792b03ef..4898ccc39 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt @@ -103,7 +103,7 @@ class MdList(private val context: Context, id: Int) : TrackService(id) { FollowStatus.READING.int } else FollowStatus.PLAN_TO_READ.int } - } + }, ) override suspend fun refresh(track: Track): Track { 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 fe526274d..5eef11d57 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 590e6f225..17cd1c3ef 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 @@ -8,7 +8,7 @@ data class OAuth( val access_token: String, val token_type: String, val created_at: Long = System.currentTimeMillis(), - val expires_in: Long + val expires_in: Long, ) { fun isExpired() = System.currentTimeMillis() > created_at + (expires_in * 1000) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/OAuth.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/OAuth.kt index 998789197..16b01db2f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/OAuth.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/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?, ) { // Access token lives 1 day diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/ShikimoriApi.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/ShikimoriApi.kt index efde7c7eb..1aeb598eb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/ShikimoriApi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/ShikimoriApi.kt @@ -44,8 +44,8 @@ class ShikimoriApi(private val client: OkHttpClient, interceptor: ShikimoriInter authClient.newCall( POST( "$apiUrl/v2/user_rates", - body = payload.toString().toRequestBody(jsonMime) - ) + body = payload.toString().toRequestBody(jsonMime), + ), ).await() track } @@ -153,7 +153,7 @@ class ShikimoriApi(private val client: OkHttpClient, interceptor: ShikimoriInter .add("client_secret", clientSecret) .add("code", code) .add("redirect_uri", redirectUrl) - .build() + .build(), ) companion object { @@ -186,7 +186,7 @@ class ShikimoriApi(private val client: OkHttpClient, interceptor: ShikimoriInter .add("client_id", clientId) .add("client_secret", clientSecret) .add("refresh_token", token) - .build() + .build(), ) } } 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 20a433a01..9786fa0d2 100755 --- 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) 7, 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 d0d2a03cb..f6bcce4b7 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 @@ -105,12 +105,12 @@ internal class AppUpdateNotifier(private val context: Context) { addAction( R.drawable.ic_system_update_alt_white_24dp, context.getString(R.string.action_install), - installIntent + installIntent, ) addAction( R.drawable.ic_close_24dp, context.getString(R.string.action_cancel), - NotificationReceiver.dismissNotificationPendingBroadcast(context, Notifications.ID_APP_UPDATER) + NotificationReceiver.dismissNotificationPendingBroadcast(context, Notifications.ID_APP_UPDATER), ) } notificationBuilder.show() @@ -132,12 +132,12 @@ internal class AppUpdateNotifier(private val context: Context) { addAction( R.drawable.ic_refresh_24dp, context.getString(R.string.action_retry), - AppUpdateService.downloadApkPendingService(context, url) + AppUpdateService.downloadApkPendingService(context, url), ) addAction( R.drawable.ic_close_24dp, context.getString(R.string.action_cancel), - NotificationReceiver.dismissNotificationPendingBroadcast(context, Notifications.ID_APP_UPDATER) + NotificationReceiver.dismissNotificationPendingBroadcast(context, Notifications.ID_APP_UPDATER), ) } notificationBuilder.show(Notifications.ID_APP_UPDATER) 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 a64b696c6..ff2b0174c 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/GithubRelease.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/GithubRelease.kt @@ -11,7 +11,7 @@ data class GithubRelease( @SerialName("tag_name") val version: String, @SerialName("body") val info: String, @SerialName("html_url") val releaseLink: String, - @SerialName("assets") private val assets: List + @SerialName("assets") private val assets: List, ) { /** 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 0d46cfbe3..b98afef9b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt @@ -42,7 +42,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(), ) { /** 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 1c4deb199..0f70dba75 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt @@ -50,8 +50,8 @@ class ExtensionUpdateJob(private val context: Context, workerParams: WorkerParam context.resources.getQuantityString( R.plurals.update_check_notification_ext_updates, names.size, - names.size - ) + names.size, + ), ) val extNames = names.joinToString(", ") setContentText(extNames) @@ -59,7 +59,7 @@ class ExtensionUpdateJob(private val context: Context, workerParams: WorkerParam setSmallIcon(R.drawable.ic_extension_24dp) setContentIntent(NotificationReceiver.openExtensionsPendingActivity(context)) setAutoCancel(true) - } + }, ) } } @@ -79,7 +79,7 @@ class ExtensionUpdateJob(private val context: Context, workerParams: WorkerParam 2, TimeUnit.DAYS, 3, - TimeUnit.HOURS + TimeUnit.HOURS, ) .addTag(TAG) .setConstraints(constraints) diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt index d328e0502..0d760a751 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt @@ -105,7 +105,7 @@ internal class ExtensionGithubApi { apkName = it.apk, iconUrl = "${/* SY --> */ repoUrl /* SY <-- */}icon/${it.apk.replace(".apk", ".png")}", // SY --> - repoUrl = repoUrl + repoUrl = repoUrl, // SY <-- ) } @@ -116,18 +116,18 @@ internal class ExtensionGithubApi { AvailableExtensionSources( name = it.name, id = it.id, - baseUrl = it.baseUrl + baseUrl = it.baseUrl, ) } } fun getApkUrl(extension: Extension.Available): String { - return /* SY --> */ "${extension.repoUrl}/apk/${extension.apkName}" /* SY <-- */ + return /* SY --> */ "${extension.repoUrl}/apk/${extension.apkName}" // SY <-- } // SY --> private fun Extension.isBlacklisted( - blacklistEnabled: Boolean = preferences.enableSourceBlacklist().get() + blacklistEnabled: Boolean = preferences.enableSourceBlacklist().get(), ): Boolean { return pkgName in BlacklistedSources.BLACKLISTED_EXTENSIONS && blacklistEnabled } @@ -155,6 +155,6 @@ private data class ExtensionJsonObject( private data class ExtensionSourceJsonObject( val name: String, val id: Long, - val baseUrl: String + val baseUrl: String, ) diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/installer/PackageInstallerInstaller.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/installer/PackageInstallerInstaller.kt index 85db552cc..ecaedf10c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/installer/PackageInstallerInstaller.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/installer/PackageInstallerInstaller.kt @@ -70,7 +70,7 @@ class PackageInstallerInstaller(private val service: Service) : Installer(servic service, activeSession!!.second, Intent(INSTALL_ACTION), - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_MUTABLE else 0 + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_MUTABLE else 0, ).intentSender session.commit(intentSender) } 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 8d698a238..c93bf8987 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 @@ -30,7 +30,7 @@ sealed class Extension { val isObsolete: Boolean = false, val isUnofficial: Boolean = false, // SY --> - val isRedundant: Boolean = false + val isRedundant: Boolean = false, // SY <-- ) : Extension() @@ -47,7 +47,7 @@ sealed class Extension { val apkName: String, val iconUrl: String, // SY --> - val repoUrl: String + val repoUrl: String, // SY <-- ) : Extension() @@ -67,5 +67,5 @@ sealed class Extension { data class AvailableExtensionSources( val name: String, val id: Long, - val baseUrl: String + val baseUrl: String, ) diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallService.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallService.kt index f470caa54..2b8301fe9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallService.kt @@ -72,7 +72,7 @@ class ExtensionInstallService : Service() { context: Context, downloadId: Long, uri: Uri, - installer: PreferenceValues.ExtensionInstaller + installer: PreferenceValues.ExtensionInstaller, ): Intent { return Intent(context, ExtensionInstallService::class.java) .setDataAndType(uri, ExtensionInstaller.APK_MIME) 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 14fa14504..9f387b500 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 @@ -249,7 +249,7 @@ internal class ExtensionInstaller(private val context: Context) { downloadManager.query(query).use { cursor -> if (cursor.moveToFirst()) { val localUri = cursor.getString( - cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_LOCAL_URI) + cursor.getColumnIndexOrThrow(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 77c63760c..240cb1f65 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 @@ -120,7 +120,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", ) logcat(LogPriority.WARN, exception) return LoadResult.Error(exception) @@ -190,7 +190,7 @@ internal object ExtensionLoader { sources = sources, pkgFactory = appInfo.metaData.getString(METADATA_SOURCE_FACTORY), isUnofficial = signatureHash != officialSignature, - icon = context.getApplicationIcon(pkgName) + icon = context.getApplicationIcon(pkgName), ) return LoadResult.Success(extension) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/network/DohProviders.kt b/app/src/main/java/eu/kanade/tachiyomi/network/DohProviders.kt index 9a6d5cd2a..9a783495c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/network/DohProviders.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/network/DohProviders.kt @@ -28,7 +28,7 @@ fun OkHttpClient.Builder.dohCloudflare() = dns( InetAddress.getByName("2606:4700:4700::0064"), InetAddress.getByName("2606:4700:4700::6400"), ) - .build() + .build(), ) fun OkHttpClient.Builder.dohGoogle() = dns( @@ -40,7 +40,7 @@ fun OkHttpClient.Builder.dohGoogle() = dns( InetAddress.getByName("2001:4860:4860::8888"), InetAddress.getByName("2001:4860:4860::8844"), ) - .build() + .build(), ) // AdGuard "Default" DNS works too but for the sake of making sure no site is blacklisted, @@ -54,7 +54,7 @@ fun OkHttpClient.Builder.dohAdGuard() = dns( InetAddress.getByName("2a10:50c0::1:ff"), InetAddress.getByName("2a10:50c0::2:ff"), ) - .build() + .build(), ) fun OkHttpClient.Builder.dohQuad9() = dns( @@ -66,5 +66,5 @@ fun OkHttpClient.Builder.dohQuad9() = dns( InetAddress.getByName("2620:fe::fe"), InetAddress.getByName("2620:fe::9"), ) - .build() + .build(), ) diff --git a/app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt index b6421bfec..1b1313551 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt @@ -12,7 +12,8 @@ import uy.kohesive.injekt.injectLazy import java.io.File import java.util.concurrent.TimeUnit -/* SY --> */ open /* SY <-- */ class NetworkHelper(context: Context) { +/* SY --> */ +open /* SY <-- */ class NetworkHelper(context: Context) { private val preferences: PreferencesHelper by injectLazy() @@ -20,7 +21,8 @@ import java.util.concurrent.TimeUnit private val cacheSize = 5L * 1024 * 1024 // 5 MiB - /* SY --> */ open /* SY <-- */val cookieManager = AndroidCookieJar() + /* SY --> */ + open /* SY <-- */val cookieManager = AndroidCookieJar() private val baseClientBuilder: OkHttpClient.Builder get() { @@ -48,9 +50,11 @@ import java.util.concurrent.TimeUnit return builder } - /* SY --> */ open /* SY <-- */val client by lazy { baseClientBuilder.cache(Cache(cacheDir, cacheSize)).build() } + /* SY --> */ + open /* SY <-- */val client by lazy { baseClientBuilder.cache(Cache(cacheDir, cacheSize)).build() } - /* SY --> */ open /* SY <-- */val cloudflareClient by lazy { + /* SY --> */ + open /* SY <-- */val cloudflareClient by lazy { client.newBuilder() .addInterceptor(CloudflareInterceptor(context)) .build() 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 58cc444dd..7c12f284d 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt @@ -79,7 +79,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/Requests.kt b/app/src/main/java/eu/kanade/tachiyomi/network/Requests.kt index 3d3b88b54..8931b90b9 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/network/Requests.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/network/Requests.kt @@ -14,7 +14,7 @@ private val DEFAULT_BODY: RequestBody = FormBody.Builder().build() fun GET( url: String, headers: Headers = DEFAULT_HEADERS, - cache: CacheControl = DEFAULT_CACHE_CONTROL + cache: CacheControl = DEFAULT_CACHE_CONTROL, ): Request { return Request.Builder() .url(url) @@ -27,7 +27,7 @@ fun POST( url: String, headers: Headers = DEFAULT_HEADERS, body: RequestBody = DEFAULT_BODY, - cache: CacheControl = DEFAULT_CACHE_CONTROL + cache: CacheControl = DEFAULT_CACHE_CONTROL, ): Request { return Request.Builder() .url(url) 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 0a8464143..b697a9f16 100755 --- 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/source/LocalSource.kt b/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt index 1f58677d8..9a769fdf1 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt @@ -196,7 +196,7 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour val artist: String? = null, val description: String? = null, val genre: List? = null, - val status: Int? = null + val status: Int? = null, ) // SY <-- @@ -346,7 +346,7 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour private class OrderBy(context: Context) : Filter.Sort( context.getString(R.string.local_filter_order_by), arrayOf(context.getString(R.string.title), context.getString(R.string.date)), - Selection(0, true) + Selection(0, true), ) sealed class Format { diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/Source.kt b/app/src/main/java/eu/kanade/tachiyomi/source/Source.kt index 70de5a4a7..c08a610dd 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/Source.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/Source.kt @@ -42,7 +42,7 @@ interface Source : tachiyomi.source.Source { */ @Deprecated( "Use the 1.x API instead", - ReplaceWith("getMangaDetails") + ReplaceWith("getMangaDetails"), ) fun fetchMangaDetails(manga: SManga): Observable = throw IllegalStateException("Not used") @@ -53,7 +53,7 @@ interface Source : tachiyomi.source.Source { */ @Deprecated( "Use the 1.x API instead", - ReplaceWith("getChapterList") + ReplaceWith("getChapterList"), ) fun fetchChapterList(manga: SManga): Observable> = throw IllegalStateException("Not used") @@ -65,7 +65,7 @@ interface Source : tachiyomi.source.Source { */ @Deprecated( "Use the 1.x API instead", - ReplaceWith("getPageList") + ReplaceWith("getPageList"), ) fun fetchPageList(chapter: SChapter): Observable> = Observable.empty() 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 1e11a46c9..ff357aa1c 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt @@ -115,7 +115,7 @@ open class SourceManager(private val context: Context) { xLogD("Delegating source: %s -> %s!", sourceQName, delegate.newSourceClass.qualifiedName) val enhancedSource = EnhancedHttpSource( source, - delegate.newSourceClass.constructors.find { it.parameters.size == 2 }!!.call(source, context) + delegate.newSourceClass.constructors.find { it.parameters.size == 2 }!!.call(source, context), ) currentDelegatedSources[enhancedSource.originalSource.id] = DelegatedSource( @@ -123,7 +123,7 @@ open class SourceManager(private val context: Context) { enhancedSource.originalSource.id, enhancedSource.originalSource::class.qualifiedName ?: delegate.originalSourceQualifiedClassName, (enhancedSource.enhancedSource as DelegatedHttpSource)::class, - delegate.factory + delegate.factory, ) enhancedSource } else source @@ -147,13 +147,13 @@ open class SourceManager(private val context: Context) { } private fun createInternalSources(): List = listOf( - LocalSource(context) + LocalSource(context), ) // SY --> private fun createEHSources(): List { val sources = listOf( - EHentai(EH_SOURCE_ID, false, context) + EHentai(EH_SOURCE_ID, false, context), ) return if (prefs.enableExhentai().get()) { sources + EHentai(EXH_SOURCE_ID, true, context) @@ -198,59 +198,59 @@ open class SourceManager(private val context: Context) { "Pururin", PURURIN_SOURCE_ID, "eu.kanade.tachiyomi.extension.en.pururin.Pururin", - Pururin::class + Pururin::class, ), DelegatedSource( "Tsumino", TSUMINO_SOURCE_ID, "eu.kanade.tachiyomi.extension.en.tsumino.Tsumino", - Tsumino::class + Tsumino::class, ), DelegatedSource( "MangaDex", fillInSourceId, "eu.kanade.tachiyomi.extension.all.mangadex", MangaDex::class, - true + true, ), DelegatedSource( "HBrowse", HBROWSE_SOURCE_ID, "eu.kanade.tachiyomi.extension.en.hbrowse.HBrowse", - HBrowse::class + HBrowse::class, ), DelegatedSource( "8Muses", EIGHTMUSES_SOURCE_ID, "eu.kanade.tachiyomi.extension.en.eightmuses.EightMuses", - EightMuses::class + EightMuses::class, ), DelegatedSource( "Hitomi", fillInSourceId, "eu.kanade.tachiyomi.extension.all.hitomi.Hitomi", Hitomi::class, - true + true, ), DelegatedSource( "PervEden English", PERV_EDEN_EN_SOURCE_ID, "eu.kanade.tachiyomi.extension.en.perveden.Perveden", - PervEden::class + PervEden::class, ), DelegatedSource( "PervEden Italian", PERV_EDEN_IT_SOURCE_ID, "eu.kanade.tachiyomi.extension.it.perveden.Perveden", - PervEden::class + PervEden::class, ), DelegatedSource( "NHentai", fillInSourceId, "eu.kanade.tachiyomi.extension.all.nhentai.NHentai", NHentai::class, - true - ) + true, + ), ).associateBy { it.originalSourceQualifiedClassName } val currentDelegatedSources = ListenMutableMap(mutableMapOf(), ::handleSourceLibrary) @@ -260,7 +260,7 @@ open class SourceManager(private val context: Context) { val sourceId: Long, val originalSourceQualifiedClassName: String, val newSourceClass: KClass, - val factory: Boolean = false + val factory: Boolean = false, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/model/Filter.kt b/app/src/main/java/eu/kanade/tachiyomi/source/model/Filter.kt index 75e704a9b..16d213cb7 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/model/Filter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/model/Filter.kt @@ -32,7 +32,7 @@ sealed class Filter(val name: String, var state: T) { val values: List, val skipAutoFillTags: List = emptyList(), val excludePrefix: String? = null, - state: List + state: List, ) : Filter>(name, state) // SY <-- diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/model/MangasPage.kt b/app/src/main/java/eu/kanade/tachiyomi/source/model/MangasPage.kt index 86bc8228e..b57ae6093 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/model/MangasPage.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/model/MangasPage.kt @@ -2,7 +2,8 @@ package eu.kanade.tachiyomi.source.model import exh.metadata.metadata.base.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/app/src/main/java/eu/kanade/tachiyomi/source/model/Page.kt b/app/src/main/java/eu/kanade/tachiyomi/source/model/Page.kt index d285fb1bb..1db75179a 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/model/Page.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/model/Page.kt @@ -13,7 +13,7 @@ open class Page( /* SY --> */ var /* SY <-- */ 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 @@ -69,13 +69,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 e9d10fb89..f7e8a14ad 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/model/SChapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/model/SChapter.kt @@ -36,7 +36,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 098bcf6ba..f7ead6db2 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt @@ -56,19 +56,19 @@ interface SManga : Serializable { // EXH <-- if (other.author != null) { - author = /* SY --> */ other.originalAuthor /* SY <-- */ + author = /* SY --> */ other.originalAuthor // SY <-- } if (other.artist != null) { - artist = /* SY --> */ other.originalArtist /* SY <-- */ + artist = /* SY --> */ other.originalArtist // SY <-- } if (other.description != null) { - description = /* SY --> */ other.originalDescription /* SY <-- */ + description = /* SY --> */ other.originalDescription // SY <-- } if (other.genre != null) { - genre = /* SY --> */ other.originalGenre /* SY <-- */ + genre = /* SY --> */ other.originalGenre // SY <-- } if (other.thumbnail_url != null) { @@ -106,7 +106,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/HttpSource.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/HttpSource.kt index e707805eb..5082c5f3d 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/HttpSource.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/HttpSource.kt @@ -84,7 +84,8 @@ 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. @@ -191,14 +192,16 @@ abstract class HttpSource : CatalogueSource { * * @param page the page number to retrieve. */ - /* SY --> protected <-- SY */ abstract fun latestUpdatesRequest(page: Int): Request + /* SY --> protected <-- SY */ + abstract fun latestUpdatesRequest(page: Int): Request /** * Parses the response from the site and returns a [MangasPage] object. * * @param response the response from the site. */ - /* SY --> protected <-- SY */ abstract fun latestUpdatesParse(response: Response): MangasPage + /* SY --> protected <-- SY */ + abstract fun latestUpdatesParse(response: Response): MangasPage /** * Returns an observable with the updated details for a manga. Normally it's not needed to @@ -330,7 +333,8 @@ abstract class HttpSource : CatalogueSource { * * @param page the page whose source image has to be downloaded. */ - /* SY --> */ open /* SY <-- */ fun fetchImage(page: Page): Observable { + /* SY --> */ + open /* SY <-- */ fun fetchImage(page: Page): Observable { return client.newCallWithProgress(imageRequest(page), page) .asObservableSuccess() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt index 15f6faa07..717d7659a 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt @@ -88,7 +88,7 @@ import java.util.ArrayList class EHentai( override val id: Long, val exh: Boolean, - val context: Context + val context: Context, ) : HttpSource(), MetadataSource, UrlImportableSource, @@ -134,7 +134,7 @@ class EHentai( ParsedManga( fav = FAVORITES_BORDER_HEX_COLORS.indexOf( - favElement?.attr("style")?.substring(14, 17) + favElement?.attr("style")?.substring(14, 17), ), manga = Manga.create(id).apply { // Get title @@ -155,9 +155,9 @@ class EHentai( element.hasClass("gtl") -> TAG_TYPE_LIGHT element.hasClass("gtw") -> TAG_TYPE_WEAK else -> TAG_TYPE_NORMAL - } + }, ) - } + }, ) } } else { @@ -169,7 +169,7 @@ class EHentai( parsedTags += RaisedTag( namespace, element.attr("title").substringAfter(":").trim(), - TAG_TYPE_NORMAL + TAG_TYPE_NORMAL, ) } } @@ -196,7 +196,7 @@ class EHentai( genreString = parsedGenre?.text() ?.nullIfBlank() ?.lowercase() - ?.replace(" ", "") + ?.replace(" ", ""), ) val info = body.selectFirst(".gl2c")!! @@ -220,7 +220,7 @@ class EHentai( length = getPageCount(extraInfoList.getOrNull(2)) } } - } + }, ) } @@ -301,7 +301,7 @@ class EHentai( while (true) { val gid = EHentaiSearchMetadata.galleryId(url).toInt() val cachedParent = updateHelper.parentLookupTable.get( - gid + gid, ) if (cachedParent == null) { throttleFunc() @@ -316,8 +316,8 @@ class EHentai( gid, GalleryEntry( EHentaiSearchMetadata.galleryId(parentLink), - EHentaiSearchMetadata.galleryToken(parentLink) - ) + EHentaiSearchMetadata.galleryToken(parentLink), + ), ) url = EHentaiSearchMetadata.normalizeUrl(parentLink) } else break @@ -325,7 +325,7 @@ class EHentai( this@EHentai.xLogD("Parent cache hit: %s!", gid) url = EHentaiSearchMetadata.idAndTokenToUrl( cachedParent.gId, - cachedParent.gToken + cachedParent.gToken, ) } } @@ -338,8 +338,8 @@ class EHentai( dateUpload = MetadataUtil.EX_DATE_FORMAT.parse( doc.select("#gdd .gdt1").find { el -> el.text().lowercase() == "posted:" - }!!.nextElementSibling()!!.text() - )!!.time + }!!.nextElementSibling()!!.text(), + )!!.time, ) // Build and append the rest of the galleries return if (DebugToggles.INCLUDE_ONLY_ROOT_WHEN_LOADING_EXH_VERSIONS.enabled) { @@ -353,7 +353,7 @@ class EHentai( key = EHentaiSearchMetadata.normalizeUrl(link), name = "v${index + 2}: $name", number = index + 2f, - dateUpload = MetadataUtil.EX_DATE_FORMAT.parse(posted)!!.time + dateUpload = MetadataUtil.EX_DATE_FORMAT.parse(posted)!!.time, ) }.reversed() + self } @@ -376,14 +376,14 @@ class EHentai( }!! .doOnNext { pages -> if (pages.any { it.url == "https://$domain/img/509.gif" }) throw Exception( - "Hit page limit" + "Hit page limit", ) } private fun fetchChapterPage( chapter: SChapter, np: String, - pastUrls: List = emptyList() + pastUrls: List = emptyList(), ): Observable> { val urls = ArrayList(pastUrls) return chapterPageCall(np).flatMap { @@ -508,7 +508,7 @@ class EHentai( } } headers.build() - } else headers + } else headers, ).let { if (cache) { it @@ -543,8 +543,8 @@ class EHentai( Observable.just( manga.apply { initialized = true - } - ) + }, + ), ) } } else { @@ -673,7 +673,7 @@ class EHentai( element.hasClass("gtl") -> TAG_TYPE_LIGHT element.hasClass("gtw") -> TAG_TYPE_WEAK else -> TAG_TYPE_NORMAL - } + }, ) } } @@ -730,8 +730,8 @@ class EHentai( exGet( favoriteUrl, page = page, - cache = false - ) + cache = false, + ), ).awaitResponse() } val doc = response2.asJsoup() @@ -827,13 +827,13 @@ class EHentai( arrayOf( Filter.Header("Note: Will ignore other parameters!"), ToplistOptions(), - Filter.Separator() + Filter.Separator(), ) }, AutoCompleteTags( EHTags.getNamespaces0Tags().map { "$it:" } + EHTags.getAllTags(), EHTags.getNamespaces0Tags().map { "$it:" }, - excludePrefix + excludePrefix, ), if (preferences.exhWatchedListDefaultState().get()) { Watched(isEnabled = true) @@ -842,7 +842,7 @@ class EHentai( }, GenreGroup(), AdvancedGroup(), - ReverseFilter() + ReverseFilter(), ) } @@ -868,7 +868,7 @@ class EHentai( class ToplistOptions : Filter.Select( "Toplists", - ToplistOption.values() + ToplistOption.values(), ) class GenreOption(name: String, val genreId: Int) : Filter.CheckBox(name, false) @@ -885,8 +885,8 @@ class EHentai( GenreOption("Image Set", 32), GenreOption("Cosplay", 64), GenreOption("Asian Porn", 128), - GenreOption("Misc", 1) - ) + GenreOption("Misc", 1), + ), ), UriFilter { override fun addToUri(builder: Uri.Builder) { @@ -954,7 +954,7 @@ class EHentai( values = tags, skipAutoFillTags = skipAutoFillTags, excludePrefix = excludePrefix, - state = emptyList() + state = emptyList(), ) class MinPagesOption : PageOption("Minimum Pages", "f_spf") @@ -968,8 +968,8 @@ class EHentai( "2 stars", "3 stars", "4 stars", - "5 stars" - ) + "5 stars", + ), ), UriFilter { override fun addToUri(builder: Uri.Builder) { @@ -993,8 +993,8 @@ class EHentai( AdvancedOption("Show Expunged Galleries", "f_sh"), RatingOption(), MinPagesOption(), - MaxPagesOption() - ) + MaxPagesOption(), + ), ) class ReverseFilter : Filter.CheckBox("Reverse search results") @@ -1010,10 +1010,10 @@ class EHentai( // === URL IMPORT STUFF override val matchingHosts: List = if (exh) listOf( - "exhentai.org" + "exhentai.org", ) else listOf( "g.e-hentai.org", - "e-hentai.org" + "e-hentai.org", ) override suspend fun mapUrlToMangaUrl(uri: Uri): String? { @@ -1050,9 +1050,9 @@ class EHentai( add(gallery.toInt()) add(pageToken) add(pageNum.toInt()) - } + }, ) - } + }, ) } @@ -1061,8 +1061,8 @@ class EHentai( Request.Builder() .url(EH_API_BASE) .post(json.toString().toRequestBody(JSON)) - .build() - ).execute().body!!.string() + .build(), + ).execute().body!!.string(), ) val obj = outJson["tokenlist"]!!.jsonArray.first().jsonObject @@ -1092,7 +1092,7 @@ class EHentai( "4bf", "00f", "508", - "e8e" + "e8e", ) fun buildCookies(cookies: Map) = cookies.entries.joinToString(separator = "; ") { diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt index b2f7beed0..d73985c25 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt @@ -68,7 +68,7 @@ class Hitomi(delegate: HttpSource, val context: Context) : HitomiSearchMetadata.TAG_TYPE_DEFAULT } else { RaisedSearchMetadata.TAG_TYPE_VIRTUAL - } + }, ) } "type" -> { @@ -93,7 +93,7 @@ class Hitomi(delegate: HttpSource, val context: Context) : RaisedTag( "character", it, - HitomiSearchMetadata.TAG_TYPE_DEFAULT + HitomiSearchMetadata.TAG_TYPE_DEFAULT, ) } } @@ -107,7 +107,7 @@ class Hitomi(delegate: HttpSource, val context: Context) : RaisedTag( ns, it.text().dropLast(if (ns == "misc") 0 else 2), - HitomiSearchMetadata.TAG_TYPE_DEFAULT + HitomiSearchMetadata.TAG_TYPE_DEFAULT, ) } } @@ -123,7 +123,7 @@ class Hitomi(delegate: HttpSource, val context: Context) : } override val matchingHosts = listOf( - "hitomi.la" + "hitomi.la", ) override suspend fun mapUrlToMangaUrl(uri: Uri): String? { 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 ec488ae18..0f7389ffb 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 @@ -89,7 +89,7 @@ class MangaDex(delegate: HttpSource, val context: Context) : override val baseHttpClient: OkHttpClient = delegate.client.newBuilder() .authenticator( - TokenAuthenticator(loginHelper) + TokenAuthenticator(loginHelper), ) .build() @@ -142,7 +142,7 @@ class MangaDex(delegate: HttpSource, val context: Context) : azukHandler, mangaHotHandler, preferences, - mdList + mdList, ) } @@ -243,7 +243,7 @@ class MangaDex(delegate: HttpSource, val context: Context) : override suspend fun login( username: String, password: String, - twoFactorCode: String? + twoFactorCode: String?, ): Boolean { val result = loginHelper.login(username, password) return if (result) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MergedSource.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MergedSource.kt index 8678e6bf7..89f786fc4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MergedSource.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MergedSource.kt @@ -76,7 +76,7 @@ class MergedSource : HttpSource() { val mangaInfoReference = mangaReferences.firstOrNull { it.isInfoManga } ?: mangaReferences.firstOrNull { it.mangaId != it.mergeId } val dbManga = mangaInfoReference?.let { db.getManga(it.mangaUrl, it.mangaSourceId).executeOnIO()?.toMangaInfo() } (dbManga ?: mergedManga.toMangaInfo()).copy( - key = manga.key + key = manga.key, ) } } @@ -163,7 +163,7 @@ class MergedSource : HttpSource() { if (ifDownloadNewChapters && reference.downloadChapters) { downloadManager.downloadChapters( loadedManga, - results.first + results.first, ) } results diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt index aab52d0bb..2c35454f7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt @@ -56,7 +56,7 @@ class NHentai(delegate: HttpSource, val context: Context) : override suspend fun parseIntoMetadata(metadata: NHentaiSearchMetadata, input: Response) { val json = GALLERY_JSON_REGEX.find(input.body?.string().orEmpty())!!.groupValues[1].replace( - UNICODE_ESCAPE_REGEX + UNICODE_ESCAPE_REGEX, ) { it.groupValues[1].toInt(radix = 16).toChar().toString() } val jsonResponse = jsonParser.decodeFromString(json) @@ -100,7 +100,7 @@ class NHentai(delegate: HttpSource, val context: Context) : RaisedSearchMetadata.TAG_TYPE_VIRTUAL } else { NHentaiSearchMetadata.TAG_TYPE_DEFAULT - } + }, ) } } @@ -120,21 +120,21 @@ class NHentai(delegate: HttpSource, val context: Context) : @SerialName("num_pages") val numPages: Int? = null, @SerialName("num_favorites") - val numFavorites: Long? = null + val numFavorites: Long? = null, ) @Serializable data class JsonTitle( val english: String? = null, val japanese: String? = null, - val pretty: String? = null + val pretty: String? = null, ) @Serializable data class JsonImages( val pages: List = emptyList(), val cover: JsonPage? = null, - val thumbnail: JsonPage? = null + val thumbnail: JsonPage? = null, ) @Serializable @@ -144,7 +144,7 @@ class NHentai(delegate: HttpSource, val context: Context) : @SerialName("w") val width: Long? = null, @SerialName("h") - val height: Long? = null + val height: Long? = null, ) @Serializable @@ -153,11 +153,11 @@ class NHentai(delegate: HttpSource, val context: Context) : val type: String? = null, val name: String? = null, val url: String? = null, - val count: Long? = null + val count: Long? = null, ) override val matchingHosts = listOf( - "nhentai.net" + "nhentai.net", ) override suspend fun mapUrlToMangaUrl(uri: Uri): String? { diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/PervEden.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/PervEden.kt index 9eff027f9..4b610d79e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/PervEden.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/PervEden.kt @@ -76,7 +76,7 @@ class PervEden(delegate: HttpSource, val context: Context) : tags += RaisedTag( "artist", it.text().lowercase(), - RaisedSearchMetadata.TAG_TYPE_VIRTUAL + RaisedSearchMetadata.TAG_TYPE_VIRTUAL, ) } } @@ -85,7 +85,7 @@ class PervEden(delegate: HttpSource, val context: Context) : tags += RaisedTag( null, it.text().lowercase(), - PervEdenSearchMetadata.TAG_TYPE_DEFAULT + PervEdenSearchMetadata.TAG_TYPE_DEFAULT, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/EightMuses.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/EightMuses.kt index 430ab0407..c753cb411 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/EightMuses.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/EightMuses.kt @@ -71,13 +71,13 @@ class EightMuses(delegate: HttpSource, val context: Context) : tags += RaisedTag( EightMusesSearchMetadata.ARTIST_NAMESPACE, breadcrumbs.selectFirst("li:nth-child(2) > a")!!.text(), - EightMusesSearchMetadata.TAG_TYPE_DEFAULT + EightMusesSearchMetadata.TAG_TYPE_DEFAULT, ) tags += input.select(".album-tags a").map { RaisedTag( EightMusesSearchMetadata.TAGS_NAMESPACE, it.text(), - EightMusesSearchMetadata.TAG_TYPE_DEFAULT + EightMusesSearchMetadata.TAG_TYPE_DEFAULT, ) } } @@ -86,7 +86,7 @@ class EightMuses(delegate: HttpSource, val context: Context) : override val matchingHosts = listOf( "www.8muses.com", "comics.8muses.com", - "8muses.com" + "8muses.com", ) override suspend fun mapUrlToMangaUrl(uri: Uri): String { diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/HBrowse.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/HBrowse.kt index 37b8502da..1e8cd8621 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/HBrowse.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/HBrowse.kt @@ -56,7 +56,7 @@ class HBrowse(delegate: HttpSource, val context: Context) : tags += RaisedTag( lowercaseNs, it.text(), - HBrowseSearchMetadata.TAG_TYPE_DEFAULT + HBrowseSearchMetadata.TAG_TYPE_DEFAULT, ) } } @@ -78,7 +78,7 @@ class HBrowse(delegate: HttpSource, val context: Context) : override val matchingHosts = listOf( "www.hbrowse.com", - "hbrowse.com" + "hbrowse.com", ) override suspend fun mapUrlToMangaUrl(uri: Uri): String? { diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Pururin.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Pururin.kt index d613061fb..46807a8f2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Pururin.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Pururin.kt @@ -97,7 +97,7 @@ class Pururin(delegate: HttpSource, val context: Context) : tags += RaisedTag( namespace, searchUrl.lastPathSegment!!.substringBefore("."), - if (namespace != PururinSearchMetadata.TAG_NAMESPACE_CATEGORY) PururinSearchMetadata.TAG_TYPE_DEFAULT else RaisedSearchMetadata.TAG_TYPE_VIRTUAL + if (namespace != PururinSearchMetadata.TAG_NAMESPACE_CATEGORY) PururinSearchMetadata.TAG_TYPE_DEFAULT else RaisedSearchMetadata.TAG_TYPE_VIRTUAL, ) } } @@ -108,7 +108,7 @@ class Pururin(delegate: HttpSource, val context: Context) : override val matchingHosts = listOf( "pururin.io", - "www.pururin.io" + "www.pururin.io", ) override suspend fun mapUrlToMangaUrl(uri: Uri): String { diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Tsumino.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Tsumino.kt index d815ab4a5..6f611c1ce 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Tsumino.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Tsumino.kt @@ -124,7 +124,7 @@ class Tsumino(delegate: HttpSource, val context: Context) : tags.addAll( tagElements.map { RaisedTag("tags", it.attr("data-define").trim(), TAG_TYPE_DEFAULT) - } + }, ) } } @@ -132,7 +132,7 @@ class Tsumino(delegate: HttpSource, val context: Context) : override val matchingHosts = listOf( "www.tsumino.com", - "tsumino.com" + "tsumino.com", ) companion object { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/changehandler/OneWayFadeChangeHandler.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/changehandler/OneWayFadeChangeHandler.kt index eadbe3979..ba8771c2b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/changehandler/OneWayFadeChangeHandler.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/changehandler/OneWayFadeChangeHandler.kt @@ -18,7 +18,7 @@ class OneWayFadeChangeHandler : FadeChangeHandler { constructor(duration: Long) : super(duration) constructor(duration: Long, removesFromViewOnPush: Boolean) : super( duration, - removesFromViewOnPush + removesFromViewOnPush, ) override fun getAnimator(container: ViewGroup, from: View?, to: View?, isPush: Boolean, toAddedToContainer: Boolean): Animator { 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 34383b16e..18bf71abf 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 @@ -46,7 +46,7 @@ abstract class BaseController(bundle: Bundle? = null) : Contro viewScope.cancel() logcat { "Destroy view for ${controller.instance()}" } } - } + }, ) } @@ -107,7 +107,7 @@ abstract class BaseController(bundle: Bundle? = null) : Contro 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 643d8dcf9..ac8549c36 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/SearchableNucleusController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/SearchableNucleusController.kt index a0251c25e..583437a9e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/SearchableNucleusController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/SearchableNucleusController.kt @@ -21,8 +21,7 @@ import reactivecircus.flowbinding.appcompat.queryTextEvents /** * Implementation of the NucleusController that has a built-in ViewSearch */ -abstract class SearchableNucleusController> -(bundle: Bundle? = null) : NucleusController(bundle) { +abstract class SearchableNucleusController>(bundle: Bundle? = null) : NucleusController(bundle) { enum class SearchViewState { LOADING, LOADED, COLLAPSING, FOCUSED } @@ -45,7 +44,7 @@ abstract class SearchableNucleusController expandActionViewFromInteraction = true R.id.action_settings -> { parentController!!.router.pushController( - ExtensionFilterController().withFadeTransaction() + ExtensionFilterController().withFadeTransaction(), ) } } @@ -215,7 +215,7 @@ open class ExtensionController : is Extension.Untrusted -> it.extension.name.contains(query, ignoreCase = true) } } - } + }, ) } else { adapter?.updateDataSet(extensions) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionGroupItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionGroupItem.kt index fcbea0a16..53adf7588 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionGroupItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionGroupItem.kt @@ -16,7 +16,7 @@ import eu.kanade.tachiyomi.R data class ExtensionGroupItem( val name: String, val size: Int, - val showSize: Boolean = false + val showSize: Boolean = false, ) : AbstractHeaderItem() { var actionLabel: String? = null @@ -43,7 +43,7 @@ data class ExtensionGroupItem( adapter: FlexibleAdapter>, holder: ExtensionGroupHolder, position: Int, - payloads: List? + payloads: List?, ) { holder.bind(this) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt index e7afa7ac4..33209ecfd 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt @@ -96,7 +96,7 @@ class ExtensionHolder(view: View, val adapter: ExtensionAdapter) : is Extension.Available -> R.string.ext_install } } - } + }, ) // SY --> if (extension is Extension.Installed && diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionItem.kt index cd0059f5c..5e895f6b5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionItem.kt @@ -19,7 +19,7 @@ import eu.kanade.tachiyomi.source.CatalogueSource data class ExtensionItem( val extension: Extension, val header: ExtensionGroupItem? = null, - val installStep: InstallStep = InstallStep.Idle + val installStep: InstallStep = InstallStep.Idle, ) : AbstractSectionableItem(header) { @@ -44,7 +44,7 @@ data class ExtensionItem( adapter: FlexibleAdapter>, holder: ExtensionHolder, position: Int, - payloads: List? + payloads: List?, ) { if (payloads == null || payloads.isEmpty()) { holder.bind(this) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionPresenter.kt index d79725f5b..9e3f1aacd 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionPresenter.kt @@ -26,7 +26,7 @@ private typealias ExtensionTuple = */ open class ExtensionPresenter( private val extensionManager: ExtensionManager = Injekt.get(), - private val preferences: PreferencesHelper = Injekt.get() + private val preferences: PreferencesHelper = Injekt.get(), ) : BasePresenter() { private var extensions = emptyList() @@ -64,15 +64,15 @@ open class ExtensionPresenter( val items = mutableListOf() val updatesSorted = installed.filter { it.hasUpdate && (showNsfwSources || !it.isNsfw) } - .sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER, { it.name })) + .sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.name }) val installedSorted = installed.filter { !it.hasUpdate && (showNsfwSources || !it.isNsfw) } .sortedWith( compareBy { !it.isObsolete /* SY --> */ && !it.isRedundant /* SY <-- */ } - .thenBy(String.CASE_INSENSITIVE_ORDER) { it.name } + .thenBy(String.CASE_INSENSITIVE_ORDER) { it.name }, ) - val untrustedSorted = untrusted.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER, { it.name })) + val untrustedSorted = untrusted.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.name }) val availableSorted = available // Filter out already installed extensions and disabled languages @@ -82,7 +82,7 @@ open class ExtensionPresenter( avail.lang in activeLangs && (showNsfwSources || !avail.isNsfw) } - .sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER, { it.name })) + .sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.name }) if (updatesSorted.isNotEmpty()) { val header = ExtensionGroupItem(context.getString(R.string.ext_updates_pending), updatesSorted.size, true) @@ -163,7 +163,7 @@ open class ExtensionPresenter( if (item != null) { view.downloadUpdate(item) } - }) + },) } fun uninstallExtension(pkgName: String) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionTrustDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionTrustDialog.kt index c1de2551d..23d23a32b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionTrustDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionTrustDialog.kt @@ -14,8 +14,8 @@ class ExtensionTrustDialog(bundle: Bundle? = null) : DialogController(bundle) constructor(target: T, signatureHash: String, pkgName: String) : this( bundleOf( SIGNATURE_KEY to signatureHash, - PKGNAME_KEY to pkgName - ) + PKGNAME_KEY to pkgName, + ), ) { targetController = target } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt index b2dcd2f2e..02747b2ea 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt @@ -55,7 +55,7 @@ class ExtensionDetailsController(bundle: Bundle? = null) : private var preferenceScreen: PreferenceScreen? = null constructor(pkgName: String) : this( - bundleOf(PKGNAME_KEY to pkgName) + bundleOf(PKGNAME_KEY to pkgName), ) init { @@ -91,7 +91,7 @@ class ExtensionDetailsController(bundle: Bundle? = null) : binding.extensionPrefsRecycler.layoutManager = LinearLayoutManager(context) binding.extensionPrefsRecycler.adapter = ConcatAdapter( ExtensionDetailsHeaderAdapter(presenter), - initPreferencesAdapter(context, extension) + initPreferencesAdapter(context, extension), ) } @@ -166,7 +166,7 @@ class ExtensionDetailsController(bundle: Bundle? = null) : block() onSettingsClick = View.OnClickListener { router.pushController( - SourcePreferencesController(source.id).withFadeTransaction() + SourcePreferencesController(source.id).withFadeTransaction(), ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsPresenter.kt index 9a18a597f..bfe30a46a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsPresenter.kt @@ -33,7 +33,7 @@ class ExtensionDetailsPresenter( .observeOn(AndroidSchedulers.mainThread()) .subscribeFirst({ view, _ -> view.onExtensionUninstalled() - }) + },) } fun uninstallExtension() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesController.kt index 55da0274d..ef3021f01 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesController.kt @@ -44,7 +44,7 @@ class SourcePreferencesController(bundle: Bundle? = null) : private var preferenceScreen: PreferenceScreen? = null constructor(sourceId: Long) : this( - bundleOf(SOURCE_ID to sourceId) + bundleOf(SOURCE_ID to sourceId), ) override fun createBinding(inflater: LayoutInflater): SourcePreferencesControllerBinding { @@ -70,7 +70,7 @@ class SourcePreferencesController(bundle: Bundle? = null) : val themedContext by lazy { getPreferenceThemeContext() } val manager = PreferenceManager(themedContext) val dataStore = SharedPreferencesDataStore( - context.getSharedPreferences(source.getPreferenceKey(), Context.MODE_PRIVATE) + context.getSharedPreferences(source.getPreferenceKey(), Context.MODE_PRIVATE), ) manager.preferenceDataStore = dataStore manager.onDisplayPreferenceDialogListener = this @@ -169,7 +169,7 @@ class SourcePreferencesController(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/browse/extension/details/SourcePreferencesPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesPresenter.kt index 3e3147c66..1ac5af766 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesPresenter.kt @@ -7,7 +7,7 @@ import uy.kohesive.injekt.api.get class SourcePreferencesPresenter( val sourceId: Long, - sourceManager: SourceManager = Injekt.get() + sourceManager: SourceManager = Injekt.get(), ) : BasePresenter() { val source = sourceManager.get(sourceId) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedCardItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedCardItem.kt index 5a920e0d6..2c83a3d42 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedCardItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedCardItem.kt @@ -22,7 +22,7 @@ class FeedCardItem(val manga: Manga) : AbstractFlexibleItem() { adapter: FlexibleAdapter>, holder: FeedCardHolder, position: Int, - payloads: List? + payloads: List?, ) { holder.bind(manga) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedItem.kt index cffac85ff..9a1c46c25 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedItem.kt @@ -22,7 +22,7 @@ class FeedItem( val savedSearch: SavedSearch?, val source: CatalogueSource?, val results: List?, - val highlighted: Boolean = false + val highlighted: Boolean = false, ) : AbstractFlexibleItem() { /** @@ -50,7 +50,7 @@ class FeedItem( adapter: FlexibleAdapter>, holder: FeedHolder, position: Int, - payloads: List? + payloads: List?, ) { holder.bind(this) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedPresenter.kt index e85ddc5b3..21c6b932f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedPresenter.kt @@ -41,7 +41,7 @@ import xyz.nulldev.ts.api.http.serializer.FilterSerializer open class FeedPresenter( val sourceManager: SourceManager = Injekt.get(), val db: DatabaseHelper = Injekt.get(), - val preferences: PreferencesHelper = Injekt.get() + val preferences: PreferencesHelper = Injekt.get(), ) : BasePresenter() { /** @@ -104,8 +104,8 @@ open class FeedPresenter( id = null, source = source.id, savedSearch = savedSearch?.id, - global = true - ) + global = true, + ), ).executeAsBlocking() } } @@ -130,7 +130,7 @@ open class FeedPresenter( feed: FeedSavedSearch, savedSearch: SavedSearch?, source: CatalogueSource?, - results: List? + results: List?, ): FeedItem { return FeedItem(feed, savedSearch, source, results) } @@ -148,7 +148,7 @@ open class FeedPresenter( feed, savedSearch, sourceManager.get(feed.source) as? CatalogueSource, - null + null, ) } var items = initialItems @@ -176,7 +176,7 @@ open class FeedPresenter( Observable.just(createCatalogueSearchItem(feed, null, null, emptyList())) } }, - 5 + 5, ) .observeOn(AndroidSchedulers.mainThread()) // Update matching source with the obtained results @@ -193,7 +193,7 @@ open class FeedPresenter( }, { _, error -> logcat(LogPriority.ERROR, error) - } + }, ) } @@ -205,7 +205,7 @@ open class FeedPresenter( val originalFilters = source.getFilterList() filterSerializer.deserialize( filters = originalFilters, - json = Json.decodeFromString(filters) + json = Json.decodeFromString(filters), ) originalFilters }.getOrElse { FilterList() } @@ -242,7 +242,7 @@ open class FeedPresenter( }, { error -> logcat(LogPriority.ERROR, error) - } + }, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationMangaDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationMangaDialog.kt index 51ebebe8c..53c07701f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationMangaDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationMangaDialog.kt @@ -30,7 +30,7 @@ class MigrationMangaDialog(bundle: Bundle? = null) : DialogController(bundle) ( if (mangaSkipped > 0) " " + applicationContext?.getString(R.string.skipping_, mangaSkipped) else "" - ) + ), ).orEmpty() return MaterialAlertDialogBuilder(activity!!) .setMessage(confirmString) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationBottomSheetDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationBottomSheetDialog.kt index d16cacfc7..0f5ebb884 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationBottomSheetDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationBottomSheetDialog.kt @@ -42,7 +42,7 @@ class MigrationBottomSheetDialog(private val activity: Activity, private val lis listener.startMigration( if (binding.useSmartSearch.isChecked && binding.extraSearchParamText.text.isNotBlank()) { binding.extraSearchParamText.toString() - } else null + } else null, ) dismiss() } @@ -77,7 +77,7 @@ class MigrationBottomSheetDialog(private val activity: Activity, private val lis if (isChecked) { context.toast( R.string.pre_migration_skip_toast, - Toast.LENGTH_LONG + Toast.LENGTH_LONG, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationSourceAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationSourceAdapter.kt index 517356af6..435a3c834 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationSourceAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationSourceAdapter.kt @@ -8,11 +8,11 @@ import uy.kohesive.injekt.injectLazy class MigrationSourceAdapter( var items: List, - controllerPre: PreMigrationController + controllerPre: PreMigrationController, ) : FlexibleAdapter( items, controllerPre, - true + true, ) { val preferences: PreferencesHelper by injectLazy() val sourceManager: SourceManager by injectLazy() @@ -25,8 +25,8 @@ class MigrationSourceAdapter( ArrayList( currentItems.map { it.asParcelable() - } - ) + }, + ), ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationSourceItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationSourceItem.kt index 41ef3a4f0..f2b16abfe 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationSourceItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/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, - migrationSource.sourceEnabled + migrationSource.sourceEnabled, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/PreMigrationController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/PreMigrationController.kt index 2306b8dae..8fb7e0c91 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/PreMigrationController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/PreMigrationController.kt @@ -58,7 +58,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) @@ -98,9 +98,9 @@ class PreMigrationController(bundle: Bundle? = null) : MigrationListController.create( MigrationProcedureConfig( config.toList(), - extraSearchParams = extraParam - ) - ).withFadeTransaction().tag(MigrationListController.TAG) + extraSearchParams = extraParam, + ), + ).withFadeTransaction().tag(MigrationListController.TAG), ) } @@ -187,19 +187,19 @@ 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), ) } fun create(mangaIds: List): PreMigrationController { return PreMigrationController( bundleOf( - MANGA_IDS_EXTRA to mangaIds.toLongArray() - ) + MANGA_IDS_EXTRA to mangaIds.toLongArray(), + ), ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigratingManga.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigratingManga.kt index 95c0857d8..bd759abd6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigratingManga.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigratingManga.kt @@ -15,7 +15,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/browse/migration/advanced/process/MigrationListController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt index 1a5fb36f8..e8250df0b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt @@ -179,7 +179,7 @@ class MigrationListController(bundle: Bundle? = null) : if (searchResult != null && !(searchResult.url == mangaObj.url && source.id == mangaObj.source)) { val localManga = smartSearchEngine.networkToLocalManga( searchResult, - source.id + source.id, ) val chapters = if (source is EHentai) { @@ -309,8 +309,8 @@ class MigrationListController(bundle: Bundle? = null) : res.getQuantityString( R.plurals.manga_migrated, manualMigrations, - manualMigrations - ) + manualMigrations, + ), ) } if (adapter?.hideNotFound == false) { @@ -459,7 +459,7 @@ class MigrationListController(bundle: Bundle? = null) : menuMigrate.icon = VectorDrawableCompat.create( resources!!, R.drawable.ic_done_24dp, - null + null, ) } @@ -487,13 +487,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) } @@ -524,8 +524,8 @@ class MigrationListController(bundle: Bundle? = null) : fun create(config: MigrationProcedureConfig): MigrationListController { return MigrationListController( bundleOf( - CONFIG_EXTRA to config - ) + CONFIG_EXTRA to config, + ), ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcedureConfig.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcedureConfig.kt index a0f080a95..a3d813bc5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcedureConfig.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcedureConfig.kt @@ -6,5 +6,5 @@ import kotlinx.parcelize.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/browse/migration/advanced/process/MigrationProcessAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessAdapter.kt index f866100bf..23b9b6c47 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessAdapter.kt @@ -15,7 +15,7 @@ import kotlinx.coroutines.cancel import uy.kohesive.injekt.injectLazy class MigrationProcessAdapter( - val controller: MigrationListController + val controller: MigrationListController, ) : FlexibleAdapter(null, controller, true) { private val db: DatabaseHelper by injectLazy() private val preferences: PreferencesHelper by injectLazy() @@ -62,7 +62,7 @@ class MigrationProcessAdapter( migrateMangaInternal( manga.manga() ?: return@forEach, toMangaObj, - !copy + !copy, ) } } @@ -80,7 +80,7 @@ class MigrationProcessAdapter( migrateMangaInternal( manga.manga() ?: return@launchUI, toMangaObj, - !copy + !copy, ) } removeManga(position) @@ -107,7 +107,7 @@ class MigrationProcessAdapter( private fun migrateMangaInternal( prevManga: Manga, manga: Manga, - replace: Boolean + replace: Boolean, ) { controller.config ?: return val flags = preferences.migrateFlags().get() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessHolder.kt index b43206173..f680c0f1d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessHolder.kt @@ -28,7 +28,7 @@ import java.text.DecimalFormat class MigrationProcessHolder( private val view: View, - private val adapter: MigrationProcessAdapter + private val adapter: MigrationProcessAdapter, ) : FlexibleViewHolder(view, adapter) { private val db: DatabaseHelper by injectLazy() private val sourceManager: SourceManager by injectLazy() @@ -52,11 +52,11 @@ class MigrationProcessHolder( binding.migrationMenu.setVectorCompat( R.drawable.ic_more_24dp, - R.attr.colorOnPrimary + R.attr.colorOnPrimary, ) binding.skipManga.setVectorCompat( R.drawable.ic_close_24dp, - R.attr.colorOnPrimary + R.attr.colorOnPrimary, ) binding.migrationMenu.isInvisible = true binding.skipManga.isVisible = true @@ -68,8 +68,8 @@ class MigrationProcessHolder( adapter.controller.router.pushController( MangaController( manga, - true - ).withFadeTransaction() + true, + ).withFadeTransaction(), ) } .launchIn(adapter.controller.viewScope) @@ -104,8 +104,8 @@ class MigrationProcessHolder( adapter.controller.router.pushController( MangaController( searchResult, - true - ).withFadeTransaction() + true, + ).withFadeTransaction(), ) } .launchIn(adapter.controller.viewScope) @@ -165,12 +165,12 @@ class MigrationProcessHolder( if (latestChapter > 0f) { mangaLastChapterLabel.text = root.context.getString( R.string.latest_, - DecimalFormat("#.#").format(latestChapter) + DecimalFormat("#.#").format(latestChapter), ) } else { mangaLastChapterLabel.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/browse/migration/advanced/process/MigrationProcessItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessItem.kt index 3f34532b1..ec304f130 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/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/browse/migration/manga/MigrationMangaController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaController.kt index d32056251..7cd5777cd 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaController.kt @@ -30,14 +30,14 @@ class MigrationMangaController : constructor(sourceId: Long, sourceName: String?) : super( bundleOf( SOURCE_ID_EXTRA to sourceId, - SOURCE_NAME_EXTRA to sourceName - ) + SOURCE_NAME_EXTRA to sourceName, + ), ) @Suppress("unused") constructor(bundle: Bundle) : this( bundle.getLong(SOURCE_ID_EXTRA), - bundle.getString(SOURCE_NAME_EXTRA) + bundle.getString(SOURCE_NAME_EXTRA), ) private val sourceId: Long = args.getLong(SOURCE_ID_EXTRA) @@ -83,7 +83,7 @@ class MigrationMangaController : PreMigrationController.navigateToMigration( Injekt.get().skipPreMigration().get(), router, - listOf(item.manga.id!!) + listOf(item.manga.id!!), ) // SY <-- return false diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaHolder.kt index 97b0f8b46..3e398f1bd 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaHolder.kt @@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.databinding.SourceListItemBinding class MigrationMangaHolder( view: View, - private val adapter: MigrationMangaAdapter + private val adapter: MigrationMangaAdapter, ) : FlexibleViewHolder(view, adapter) { private val binding = SourceListItemBinding.bind(view) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaItem.kt index 3af0924cd..6ad16471b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaItem.kt @@ -22,7 +22,7 @@ class MigrationMangaItem(val manga: Manga) : AbstractFlexibleItem>, holder: MigrationMangaHolder, position: Int, - payloads: List? + payloads: List?, ) { holder.bind(this) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaPresenter.kt index ceb78812b..3df1b180c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaPresenter.kt @@ -24,7 +24,7 @@ import uy.kohesive.injekt.api.get class MigrationMangaPresenter( private val sourceId: Long, - private val db: DatabaseHelper = Injekt.get() + private val db: DatabaseHelper = Injekt.get(), ) : BasePresenter() { private val enhancedServices by lazy { Injekt.get().services.filterIsInstance() } @@ -62,7 +62,7 @@ class MigrationMangaPresenter( sourceChapters: List, prevManga: Manga, manga: Manga, - replace: Boolean + replace: Boolean, ) { val flags = Injekt.get().migrateFlags().get() val migrateChapters = MigrationFlags.hasChapters(flags) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt index 428bf609a..1b709751f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt @@ -24,27 +24,27 @@ import uy.kohesive.injekt.api.get 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(), + ), ) { constructor(targetController: MigrationListController?, mangaId: Long, sources: LongArray) : this( Injekt.get().getManga(mangaId).executeAsBlocking(), - sources.map { Injekt.get().getOrStub(it) }.filterIsInstance() + sources.map { Injekt.get().getOrStub(it) }.filterIsInstance(), ) { - this.targetController = targetController - } + this.targetController = targetController + } @Suppress("unused") constructor(bundle: Bundle) : this( null, bundle.getLong(OLD_MANGA), - bundle.getLongArray(SOURCES) ?: LongArray(0) + bundle.getLongArray(SOURCES) ?: LongArray(0), ) /** @@ -58,7 +58,7 @@ class SearchController( return SearchPresenter( initialQuery, manga!!, - sources + sources, ) } @@ -93,7 +93,7 @@ class SearchController( searchView.onActionViewExpanded() // Required to show the query in the view searchView.setQuery(presenter.query, false) true - }) + },) searchView.queryTextEvents() .filter { it is QueryTextEvent.QuerySubmitted } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt index 3ff530416..05a257203 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt @@ -9,7 +9,7 @@ import eu.kanade.tachiyomi.ui.browse.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/browse/migration/search/SourceSearchController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchController.kt index feb41dbf1..21c6b8c5e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchController.kt @@ -13,15 +13,15 @@ import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get class SourceSearchController( - bundle: Bundle + bundle: Bundle, ) : BrowseSourceController(bundle) { constructor(targetController: MigrationListController, manga: Manga, source: CatalogueSource, searchQuery: String? = null) : this( bundleOf( SOURCE_ID_KEY to source.id, MANGA_KEY to manga, - SEARCH_QUERY_KEY to searchQuery - ) + SEARCH_QUERY_KEY to searchQuery, + ), ) { this.targetController = targetController } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt index 0af5f8478..b40169c82 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt @@ -150,7 +150,7 @@ class MigrationSourcesController : router } }, - sourceMangas + sourceMangas, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesPresenter.kt index 42a17eceb..94720e289 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesPresenter.kt @@ -21,7 +21,7 @@ import java.util.Locale class MigrationSourcesPresenter( private val sourceManager: SourceManager = Injekt.get(), - private val db: DatabaseHelper = Injekt.get() + private val db: DatabaseHelper = Injekt.get(), ) : BasePresenter() { private val preferences: PreferencesHelper by injectLazy() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SelectionHeader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SelectionHeader.kt index 6ce4794fa..c2d4dcb57 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SelectionHeader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SelectionHeader.kt @@ -27,7 +27,7 @@ class SelectionHeader : AbstractHeaderItem() { override fun createViewHolder(view: View, adapter: FlexibleAdapter>): Holder { return Holder( view, - adapter + adapter, ) } @@ -39,7 +39,7 @@ class SelectionHeader : AbstractHeaderItem() { holder: Holder, position: Int, // SY --> - payloads: MutableList? + payloads: MutableList?, // SY <-- ) { // Intentionally empty diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceItem.kt index 08dd11846..b2bde56c7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceItem.kt @@ -30,7 +30,7 @@ data class SourceItem(val source: Source, val mangaCount: Int, val header: Selec override fun createViewHolder(view: View, adapter: FlexibleAdapter>): SourceHolder { return SourceHolder( view, - adapter as SourceAdapter + adapter as SourceAdapter, ) } @@ -41,7 +41,7 @@ data class SourceItem(val source: Source, val mangaCount: Int, val header: Selec adapter: FlexibleAdapter>, holder: SourceHolder, position: Int, - payloads: List? + payloads: List?, ) { holder.bind(this) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/LangItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/LangItem.kt index b94e4b5dd..a9d02b014 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/LangItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/LangItem.kt @@ -35,7 +35,7 @@ data class LangItem(val code: String) : AbstractHeaderItem() { adapter: FlexibleAdapter>, holder: LangHolder, position: Int, - payloads: MutableList + payloads: MutableList, ) { holder.bind(this) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt index 500cdbff3..bc439b110 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt @@ -53,7 +53,8 @@ class SourceController(bundle: Bundle? = null) : FlexibleAdapter.OnItemClickListener, FlexibleAdapter.OnItemLongClickListener, SourceAdapter.OnSourceClickListener, - /*SY -->*/ ChangeSourceCategoriesDialog.Listener /*SY <--*/ { + /*SY -->*/ + ChangeSourceCategoriesDialog.Listener /*SY <--*/ { private val preferences: PreferencesHelper by injectLazy() @@ -153,9 +154,9 @@ class SourceController(bundle: Bundle? = null) : SmartSearchController( bundleOf( SmartSearchController.ARG_SOURCE_ID to source.id, - SmartSearchController.ARG_SMART_SEARCH_CONFIG to smartSearchConfig - ) - ).withFadeTransaction() + SmartSearchController.ARG_SMART_SEARCH_CONFIG to smartSearchConfig, + ), + ).withFadeTransaction(), ) } // SY <-- @@ -168,7 +169,7 @@ class SourceController(bundle: Bundle? = null) : val isPinned = item.header?.code?.equals(SourcePresenter.PINNED_KEY) ?: false val items = mutableListOf( - activity.getString(if (isPinned) R.string.action_unpin else R.string.action_pin) to { toggleSourcePin(item.source) } + activity.getString(if (isPinned) R.string.action_unpin else R.string.action_pin) to { toggleSourcePin(item.source) }, ) if (item.source !is LocalSource) { items.add(activity.getString(R.string.action_disable) to { disableSource(item.source) }) @@ -176,17 +177,17 @@ class SourceController(bundle: Bundle? = null) : // SY --> items.add( - activity.getString(R.string.categories) to { addToCategories(item.source) } + activity.getString(R.string.categories) to { addToCategories(item.source) }, ) if (preferences.dataSaver().get()) { val isExcluded = item.source.id.toString() in preferences.dataSaverExcludedSources().get() items.add( activity.getString( - if (isExcluded) R.string.data_saver_stop_exclude else R.string.data_saver_exclude + if (isExcluded) R.string.data_saver_stop_exclude else R.string.data_saver_exclude, ) to { excludeFromDataSaver(item.source, isExcluded) - } + }, ) } // SY <-- @@ -258,7 +259,7 @@ class SourceController(bundle: Bundle? = null) : } preferences.sourcesTabSourcesInCategories().set( - preferenceSources.sorted().toSet() + preferenceSources.sorted().toSet(), ) presenter.updateSources() } @@ -327,7 +328,7 @@ class SourceController(bundle: Bundle? = null) : R.id.action_settings -> { parentController!!.router.pushController( SourceFilterController() - .withFadeTransaction() + .withFadeTransaction(), ) } } @@ -381,7 +382,7 @@ class SourceController(bundle: Bundle? = null) : R.menu.browse_sources, R.id.action_search, R.string.action_global_search_hint, - false // GlobalSearch handles the searching here + false, // GlobalSearch handles the searching here ) } } @@ -390,7 +391,7 @@ class SourceController(bundle: Bundle? = null) : // SY --> if (mode == Mode.CATALOGUE) { parentController!!.router.pushController( - GlobalSearchController(query).withFadeTransaction() + GlobalSearchController(query).withFadeTransaction(), ) } // SY <-- diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt index 7f40d1647..6d908e8e2 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt @@ -86,8 +86,8 @@ class SourceFilterController : SettingsController() { } true } - } - ) + }, + ), ) } } @@ -204,7 +204,7 @@ class SourceFilterController : SettingsController() { activity?.invalidateOptionsMenu() return true } - } + }, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceHolder.kt index ac0d9e950..cc7e451bf 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceHolder.kt @@ -46,7 +46,7 @@ class SourceHolder(view: View, val adapter: SourceAdapter /* SY --> */, private item.source.id == LocalSource.ID -> binding.image.load(R.mipmap.ic_local_source) } - binding.sourceLatest.isVisible = source.supportsLatest/* SY --> */ && showLatest /* SY <-- */ + binding.sourceLatest.isVisible = source.supportsLatest/* SY --> */ && showLatest // SY <-- binding.pin.isVisible = showPins if (item.isPinned) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceItem.kt index 3edf9b6da..0a21b538d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceItem.kt @@ -20,7 +20,7 @@ data class SourceItem( val isPinned: Boolean = false, // SY --> val showLatest: Boolean, - val showPins: Boolean + val showPins: Boolean, // SY <-- ) : AbstractSectionableItem(header) { @@ -37,7 +37,7 @@ data class SourceItem( adapter: FlexibleAdapter>, holder: SourceHolder, position: Int, - payloads: MutableList + payloads: MutableList, ) { holder.bind(this) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcePresenter.kt index c28f3f2dd..d2898ba5a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcePresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcePresenter.kt @@ -23,7 +23,7 @@ class SourcePresenter( val sourceManager: SourceManager = Injekt.get(), private val preferences: PreferencesHelper = Injekt.get(), // SY --> - private val controllerMode: SourceController.Mode + private val controllerMode: SourceController.Mode, // SY <-- ) : BasePresenter() { @@ -86,8 +86,8 @@ class SourcePresenter( LangItem("custom|" + SourceAndCategory.second), isPinned, showLatest, - showPins - ) + showPins, + ), ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt index 9f944d25d..9ebf73302 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt @@ -84,7 +84,7 @@ open class BrowseSourceController(bundle: Bundle) : // SY --> smartSearchConfig: SourceController.SmartSearchConfig? = null, savedSearch: Long? = null, - filterList: String? = null + filterList: String? = null, // SY <-- ) : this( Bundle().apply { @@ -107,7 +107,7 @@ open class BrowseSourceController(bundle: Bundle) : putString(FILTERS_CONFIG_KEY, filterList) } // SY <-- - } + }, ) private val preferences: PreferencesHelper by injectLazy() @@ -115,7 +115,8 @@ open class BrowseSourceController(bundle: Bundle) : /** * Adapter containing the list of manga from the catalogue. */ - /* SY --> */ protected /* SY <-- */ var adapter: FlexibleAdapter>? = null + /* SY --> */ + protected /* SY <-- */ var adapter: FlexibleAdapter>? = null private var actionFab: ExtendedFloatingActionButton? = null private var actionFabScrollListener: RecyclerView.OnScrollListener? = null @@ -159,7 +160,7 @@ open class BrowseSourceController(bundle: Bundle) : args.getLong(SOURCE_ID_KEY), args.getString(SEARCH_QUERY_KEY), filters = args.getString(FILTERS_CONFIG_KEY), - savedSearch = args.getLong(SAVED_SEARCH_CONFIG_KEY, 0).takeUnless { it == 0L } + savedSearch = args.getLong(SAVED_SEARCH_CONFIG_KEY, 0).takeUnless { it == 0L }, ) // SY <-- } @@ -273,7 +274,7 @@ open class BrowseSourceController(bundle: Bundle) : } .show() } - } + }, // EXH <-- ) filterSheet?.setFilters(presenter.filterItems) @@ -388,7 +389,7 @@ open class BrowseSourceController(bundle: Bundle) : } true - } + }, ) val displayItem = when (preferences.sourceDisplayMode().get()) { @@ -452,7 +453,7 @@ open class BrowseSourceController(bundle: Bundle) : // SY --> private fun openSourceSettings() { router.pushController( - SourcePreferencesController(presenter.source.id).withFadeTransaction() + SourcePreferencesController(presenter.source.id).withFadeTransaction(), ) } // SY <-- @@ -543,13 +544,14 @@ open class BrowseSourceController(bundle: Bundle) : * * @param error the error received. */ - /* SY --> */ open /* SY <-- */fun onAddPageError(error: Throwable) { + /* SY --> */ + open /* SY <-- */fun onAddPageError(error: Throwable) { // SY --> xLogW("> Failed to load next catalogue page!", error) xLogW( "> (source.id: %s, source.name: %s)", presenter.source.id, - presenter.source.name + presenter.source.name, ) // SY <-- @@ -573,13 +575,13 @@ open class BrowseSourceController(bundle: Bundle) : if (adapter.isEmpty) { val actions = if (presenter.source is LocalSource) { listOf( - EmptyView.Action(R.string.local_source_help_guide, R.drawable.ic_help_24dp) { openLocalSourceHelpGuide() } + EmptyView.Action(R.string.local_source_help_guide, R.drawable.ic_help_24dp) { openLocalSourceHelpGuide() }, ) } else { listOf( EmptyView.Action(R.string.action_retry, R.drawable.ic_refresh_24dp, retryAction), EmptyView.Action(R.string.action_open_in_web_view, R.drawable.ic_public_24dp) { openInWebView() }, - EmptyView.Action(R.string.label_help, R.drawable.ic_help_24dp) { activity?.openInBrowser(MoreController.URL_HELP) } + EmptyView.Action(R.string.label_help, R.drawable.ic_help_24dp) { activity?.openInBrowser(MoreController.URL_HELP) }, ) } @@ -720,8 +722,8 @@ open class BrowseSourceController(bundle: Bundle) : MangaController( item.manga, true, - args.getParcelable(MangaController.SMART_SEARCH_CONFIG_EXTRA) - ).withFadeTransaction() + args.getParcelable(MangaController.SMART_SEARCH_CONFIG_EXTRA), + ).withFadeTransaction(), ) return false } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt index ead822ee4..b0759389e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt @@ -79,7 +79,7 @@ open class BrowseSourcePresenter( private val sourceManager: SourceManager = Injekt.get(), private val db: DatabaseHelper = Injekt.get(), private val prefs: PreferencesHelper = Injekt.get(), - private val coverCache: CoverCache = Injekt.get() + private val coverCache: CoverCache = Injekt.get(), ) : BasePresenter() { /** @@ -166,7 +166,7 @@ open class BrowseSourcePresenter( .subscribeLatestCache( { controller, savedSearches -> controller.setSavedSearches(savedSearches) - } + }, ) // SY <-- @@ -223,7 +223,7 @@ open class BrowseSourcePresenter( }, { _, error -> logcat(LogPriority.ERROR, error) - } + }, ) // Request first page. @@ -490,7 +490,7 @@ open class BrowseSourcePresenter( source = source.id, name = name.trim(), query = query.nullIfBlank(), - filtersJson = filterSerializer.serialize(filterList).ifEmpty { null }?.let { Json.encodeToString(it) } + filtersJson = filterSerializer.serialize(filterList).ifEmpty { null }?.let { Json.encodeToString(it) }, ) db.insertSavedSearch(savedSearch).executeAsBlocking() @@ -516,10 +516,10 @@ open class BrowseSourcePresenter( filters = originalFilters, json = search.filtersJson ?.let { Json.decodeFromString(it) } - ?: return@runCatching null + ?: return@runCatching null, ) originalFilters - }.getOrNull() + }.getOrNull(), ) } @@ -529,7 +529,7 @@ open class BrowseSourcePresenter( id = it.id!!, name = it.name, query = it.query.orEmpty(), - filterList = null + filterList = null, ) val filters = try { Json.decodeFromString(filtersJson) @@ -540,7 +540,7 @@ open class BrowseSourcePresenter( id = it.id!!, name = it.name, query = it.query.orEmpty(), - filterList = null + filterList = null, ) try { @@ -550,7 +550,7 @@ open class BrowseSourcePresenter( id = it.id!!, name = it.name, query = it.query.orEmpty(), - filterList = originalFilters + filterList = originalFilters, ) } catch (t: RuntimeException) { // Load failed @@ -559,7 +559,7 @@ open class BrowseSourcePresenter( id = it.id!!, name = it.name, query = it.query.orEmpty(), - filterList = null + filterList = null, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/EHentaiPager.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/EHentaiPager.kt index d9b4e2ce6..45e3d3669 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/EHentaiPager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/EHentaiPager.kt @@ -33,13 +33,13 @@ open class EHentaiPager(source: CatalogueSource, query: String, filters: FilterL if (mangasPage is MetadataMangasPage) { mangasPage.copy( mangas = mangasPage.mangas.subList(startIndex, lastIndex), - mangasMetadata = mangasPage.mangasMetadata.subList(startIndex, lastIndex) + mangasMetadata = mangasPage.mangasMetadata.subList(startIndex, lastIndex), ) } else { mangasPage.copy( - mangas = mangasPage.mangas.subList(startIndex, lastIndex) + mangas = mangasPage.mangas.subList(startIndex, lastIndex), ) - } + }, ) } else { onPageReceived(mangasPage) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceComfortableGridHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceComfortableGridHolder.kt index 798cc1c3a..0acf6a4c0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceComfortableGridHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceComfortableGridHolder.kt @@ -21,7 +21,7 @@ import exh.metadata.metadata.base.RaisedSearchMetadata */ class SourceComfortableGridHolder( override val binding: SourceComfortableGridItemBinding, - adapter: FlexibleAdapter<*> + adapter: FlexibleAdapter<*>, ) : SourceHolder(binding.root, adapter) { /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceCompactGridHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceCompactGridHolder.kt index 65fb3c777..126790dc1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceCompactGridHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceCompactGridHolder.kt @@ -21,7 +21,7 @@ import exh.metadata.metadata.base.RaisedSearchMetadata */ class SourceCompactGridHolder( override val binding: SourceCompactGridItemBinding, - adapter: FlexibleAdapter<*> + adapter: FlexibleAdapter<*>, ) : SourceHolder(binding.root, adapter) { /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceEnhancedEHentaiListHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceEnhancedEHentaiListHolder.kt index 8447951af..b88ebc3f4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceEnhancedEHentaiListHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceEnhancedEHentaiListHolder.kt @@ -88,7 +88,7 @@ class SourceEnhancedEHentaiListHolder(view: View, adapter: FlexibleAdapter<*>) : val locale = SourceTagsUtil.getLocaleSourceUtil( metadata.tags .firstOrNull { it.namespace == EHentaiSearchMetadata.EH_LANGUAGE_NAMESPACE } - ?.name + ?.name, ) val pageCount = metadata.length diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt index dc66c483a..a498c27ae 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt @@ -32,7 +32,7 @@ class SourceFilterSheet( // EXH --> private val onSaveClicked: () -> Unit, var onSavedSearchClicked: (Long) -> Unit = {}, - var onSavedSearchDeleteClicked: (Long, String) -> Unit = { _, _ -> } + var onSavedSearchDeleteClicked: (Long, String) -> Unit = { _, _ -> }, // EXH <-- ) : BaseBottomSheetDialog(activity) { @@ -42,7 +42,7 @@ class SourceFilterSheet( searches = searches, source = source, controller = controller, - dismissSheet = ::dismiss + dismissSheet = ::dismiss, // SY <-- ) @@ -85,7 +85,7 @@ class SourceFilterSheet( searches: List = emptyList(), source: CatalogueSource? = null, controller: BaseController<*>? = null, - dismissSheet: (() -> Unit)? = null + dismissSheet: (() -> Unit)? = null, // SY <-- ) : SimpleNavigationView(context, attrs) { @@ -109,7 +109,7 @@ class SourceFilterSheet( private val binding = SourceFilterSheetBinding.inflate( LayoutInflater.from(context), null, - false + false, ) init { @@ -121,8 +121,8 @@ class SourceFilterSheet( ?.getFilterHeader(it) { dismissSheet?.invoke() } }, savedSearchesAdapter, - adapter - ) + adapter, + ), ) // SY <-- recycler.setHasFixedSize(true) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt index d6ecdbb98..986bcf979 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt @@ -37,7 +37,7 @@ class SourceItem(val manga: Manga, private val displayMode: Preference> + adapter: FlexibleAdapter>, ): SourceHolder<*> { // SY --> if (manga.isEhBasedManga() && preferences.enhancedEHentaiView().get()) { @@ -61,7 +61,7 @@ class SourceItem(val manga: Manga, private val displayMode: Preference>, holder: SourceHolder<*>, position: Int, - payloads: List? + payloads: List?, ) { holder.onSetValues(manga) // SY --> diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedCardItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedCardItem.kt index d1cba299f..cbcc49708 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedCardItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedCardItem.kt @@ -22,7 +22,7 @@ class SourceFeedCardItem(val manga: Manga) : AbstractFlexibleItem>, holder: SourceFeedCardHolder, position: Int, - payloads: List? + payloads: List?, ) { holder.bind(manga) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedController.kt index a42b2597e..491a9e59b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedController.kt @@ -47,14 +47,14 @@ open class SourceFeedController : constructor(source: CatalogueSource?) : super( bundleOf( - SOURCE_EXTRA to (source?.id ?: 0) - ) + SOURCE_EXTRA to (source?.id ?: 0), + ), ) { this.source = source } constructor(sourceId: Long) : this( - Injekt.get().get(sourceId) as? CatalogueSource + Injekt.get().get(sourceId) as? CatalogueSource, ) @Suppress("unused") @@ -191,12 +191,12 @@ open class SourceFeedController : filterSheet?.dismiss() if (allDefault) { onBrowseClick( - presenter.query.nullIfBlank() + presenter.query.nullIfBlank(), ) } else { onBrowseClick( presenter.query.nullIfBlank(), - filters = Json.encodeToString(filterSerializer.serialize(presenter.sourceFilters)) + filters = Json.encodeToString(filterSerializer.serialize(presenter.sourceFilters)), ) } }, @@ -228,7 +228,7 @@ open class SourceFeedController : if (!allDefault) { onBrowseClick( search = presenter.query.nullIfBlank(), - savedSearch = search.id + savedSearch = search.id, ) } }, @@ -245,7 +245,7 @@ open class SourceFeedController : } .setNegativeButton(android.R.string.cancel, null) .show() - } + }, ) filterSheet?.setFilters(presenter.filterItems) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedItem.kt index e23406c21..937667bae 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedItem.kt @@ -17,7 +17,7 @@ import eu.kanade.tachiyomi.R class SourceFeedItem( val sourceFeed: SourceFeed, val results: List?, - val highlighted: Boolean = false + val highlighted: Boolean = false, ) : AbstractFlexibleItem() { /** @@ -45,7 +45,7 @@ class SourceFeedItem( adapter: FlexibleAdapter>, holder: SourceFeedHolder, position: Int, - payloads: List? + payloads: List?, ) { holder.bind(this) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedPresenter.kt index af078efbe..7729e6945 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedPresenter.kt @@ -52,7 +52,7 @@ sealed class SourceFeed { open class SourceFeedPresenter( val source: CatalogueSource, val db: DatabaseHelper = Injekt.get(), - val preferences: PreferencesHelper = Injekt.get() + val preferences: PreferencesHelper = Injekt.get(), ) : BasePresenter() { /** @@ -121,8 +121,8 @@ open class SourceFeedPresenter( id = null, source = source.id, savedSearch = savedSearchId, - global = false - ) + global = false, + ), ).executeAsBlocking() } } @@ -141,7 +141,7 @@ open class SourceFeedPresenter( if (source.supportsLatest) { SourceFeed.Latest } else null, - SourceFeed.Browse + SourceFeed.Browse, ) + db.getSourceFeedSavedSearches(source.id).executeAsBlocking() .map { SourceFeed.SourceSavedSearch(it, savedSearches[it.savedSearch]!!) } } @@ -151,7 +151,7 @@ open class SourceFeedPresenter( */ protected open fun createCatalogueSearchItem( sourceFeed: SourceFeed, - results: List? + results: List?, ): SourceFeedItem { return SourceFeedItem(sourceFeed, results) } @@ -167,7 +167,7 @@ open class SourceFeedPresenter( val initialItems = getSourcesToGetFeed().map { createCatalogueSearchItem( it, - null + null, ) } var items = initialItems @@ -183,7 +183,7 @@ open class SourceFeedPresenter( is SourceFeed.SourceSavedSearch -> source.fetchSearchManga( page = 1, query = sourceFeed.savedSearch.query.orEmpty(), - filters = getFilterList(sourceFeed.savedSearch, source) + filters = getFilterList(sourceFeed.savedSearch, source), ) } } @@ -194,7 +194,7 @@ open class SourceFeedPresenter( .doOnNext { fetchImage(it, source, sourceFeed) } // Load manga covers. .map { list -> createCatalogueSearchItem(sourceFeed, list.map { SourceFeedCardItem(it) }) } }, - 5 + 5, ) .observeOn(AndroidSchedulers.mainThread()) // Update matching source with the obtained results @@ -211,7 +211,7 @@ open class SourceFeedPresenter( }, { _, error -> logcat(LogPriority.ERROR, error) - } + }, ) } @@ -223,7 +223,7 @@ open class SourceFeedPresenter( val originalFilters = source.getFilterList() filterSerializer.deserialize( filters = originalFilters, - json = Json.decodeFromString(filters) + json = Json.decodeFromString(filters), ) originalFilters }.getOrElse { FilterList() } @@ -260,7 +260,7 @@ open class SourceFeedPresenter( }, { error -> logcat(LogPriority.ERROR, error) - } + }, ) } @@ -312,10 +312,10 @@ open class SourceFeedPresenter( filters = originalFilters, json = search.filtersJson ?.let { Json.decodeFromString(it) } - ?: return@runCatching null + ?: return@runCatching null, ) originalFilters - }.getOrNull() + }.getOrNull(), ) } @@ -325,7 +325,7 @@ open class SourceFeedPresenter( id = it.id!!, name = it.name, query = it.query.orEmpty(), - filterList = null + filterList = null, ) val filters = try { Json.decodeFromString(filtersJson) @@ -335,7 +335,7 @@ open class SourceFeedPresenter( id = it.id!!, name = it.name, query = it.query.orEmpty(), - filterList = null + filterList = null, ) try { @@ -345,7 +345,7 @@ open class SourceFeedPresenter( id = it.id!!, name = it.name, query = it.query.orEmpty(), - filterList = originalFilters + filterList = originalFilters, ) } catch (t: RuntimeException) { // Load failed @@ -354,7 +354,7 @@ open class SourceFeedPresenter( id = it.id!!, name = it.name, query = it.query.orEmpty(), - filterList = null + filterList = null, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/filter/AutoComplete.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/filter/AutoComplete.kt index cc21549ba..0ccb5ffc8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/filter/AutoComplete.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/filter/AutoComplete.kt @@ -38,8 +38,8 @@ open class AutoComplete(val filter: Filter.AutoComplete) : AbstractFlexibleItem< holder.itemView.context, android.R.layout.simple_dropdown_item_1line, filter.values, - filter.excludePrefix - ) + filter.excludePrefix, + ), ) holder.autoComplete.threshold = 3 diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/filter/GroupItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/filter/GroupItem.kt index e0878c7e5..c49c6ea8d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/filter/GroupItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/filter/GroupItem.kt @@ -44,7 +44,7 @@ class GroupItem(val filter: Filter.Group<*>) : AbstractExpandableHeaderItem) : AbstractFlexibleItem( holder.itemView.context, android.R.layout.simple_spinner_item, - filter.values + filter.values, ).apply { setDropDownViewResource(R.layout.common_spinner_item) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/filter/SortGroup.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/filter/SortGroup.kt index c991c083e..f64837004 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/filter/SortGroup.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/filter/SortGroup.kt @@ -36,7 +36,7 @@ class SortGroup(val filter: Filter.Sort) : AbstractExpandableHeaderItem TR.drawable.ic_check_box_24dp Filter.TriState.STATE_EXCLUDE -> TR.drawable.ic_check_box_x_24dp else -> throw Exception("Unknown state") - } + }, )?.apply { val color = if (filter.state == Filter.TriState.STATE_INCLUDE) { view.context.getResourceColor(R.attr.colorAccent) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchCardItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchCardItem.kt index 47cb5b8eb..67031667d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchCardItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchCardItem.kt @@ -23,7 +23,7 @@ class GlobalSearchCardItem(val manga: Manga) : AbstractFlexibleItem>, holder: GlobalSearchCardHolder, position: Int, - payloads: List? + payloads: List?, ) { holder.bind(manga) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt index 61140b6eb..2d8c46dc2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt @@ -29,7 +29,7 @@ import uy.kohesive.injekt.injectLazy open class GlobalSearchController( protected val initialQuery: String? = null, protected val extensionFilter: String? = null, - bundle: Bundle? = null + bundle: Bundle? = null, ) : SearchableNucleusController(bundle), GlobalSearchCardAdapter.OnMangaClickListener, GlobalSearchAdapter.OnTitleClickListener { @@ -97,7 +97,7 @@ open class GlobalSearchController( R.menu.global_search, R.id.action_search, null, - false // the onMenuItemActionExpand will handle this + false, // the onMenuItemActionExpand will handle this ) optionsMenuSearchItem = menu.findItem(R.id.action_search) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchItem.kt index fbfb28bc2..b2df301c4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchItem.kt @@ -43,7 +43,7 @@ class GlobalSearchItem(val source: CatalogueSource, val results: List>, holder: GlobalSearchHolder, position: Int, - payloads: List? + payloads: List?, ) { holder.bind(this) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt index c0c8d5ae1..8331fc904 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt @@ -40,7 +40,7 @@ open class GlobalSearchPresenter( private val sourcesToUse: List? = null, val sourceManager: SourceManager = Injekt.get(), val db: DatabaseHelper = Injekt.get(), - val preferences: PreferencesHelper = Injekt.get() + val preferences: PreferencesHelper = Injekt.get(), ) : BasePresenter() { /** @@ -76,7 +76,7 @@ open class GlobalSearchPresenter( // Perform a search with previous or initial state search( savedState?.getString(BrowseSourcePresenter::query.name) - ?: initialQuery.orEmpty() + ?: initialQuery.orEmpty(), ) } @@ -174,7 +174,7 @@ open class GlobalSearchPresenter( .doOnNext { fetchImage(it, source) } // Load manga covers .map { list -> createCatalogueSearchItem(source, list.map { GlobalSearchCardItem(it) }) } }, - 5 + 5, ) .observeOn(AndroidSchedulers.mainThread()) // Update matching source with the obtained results @@ -187,8 +187,8 @@ open class GlobalSearchPresenter( { it.results.isNullOrEmpty() }, // Same as initial sort, i.e. pinned first then alphabetically { it.source.id.toString() !in pinnedSourceIds }, - { "${it.source.name.lowercase()} (${it.source.lang})" } - ) + { "${it.source.name.lowercase()} (${it.source.lang})" }, + ), ) } // Update current state @@ -201,7 +201,7 @@ open class GlobalSearchPresenter( }, { _, error -> logcat(LogPriority.ERROR, error) - } + }, ) } @@ -236,7 +236,7 @@ open class GlobalSearchPresenter( }, { error -> logcat(LogPriority.ERROR, error) - } + }, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/latest/LatestUpdatesController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/latest/LatestUpdatesController.kt index 2c696036e..2561eeb57 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/latest/LatestUpdatesController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/latest/LatestUpdatesController.kt @@ -14,7 +14,7 @@ import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourcePresenter class LatestUpdatesController(bundle: Bundle) : BrowseSourceController(bundle) { constructor(source: CatalogueSource) : this( - bundleOf(SOURCE_ID_KEY to source.id) + bundleOf(SOURCE_ID_KEY to source.id), ) override fun createPresenter(): BrowseSourcePresenter { 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 a4f218369..7781ac365 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 @@ -195,7 +195,7 @@ class CategoryController : (activity as? MainActivity)?.binding?.rootCoordinator!!, R.string.snack_categories_deleted, R.string.action_undo, - 4000 + 4000, ) mode.finish() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryItem.kt index cdcde2a8b..27578c201 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryItem.kt @@ -47,7 +47,7 @@ class CategoryItem(val category: Category) : AbstractFlexibleItem>, holder: CategoryHolder, position: Int, - payloads: List? + payloads: List?, ) { holder.bind(category) } 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 1c6aab6b6..2b5d2002f 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryPresenter.kt @@ -13,7 +13,7 @@ import uy.kohesive.injekt.api.get * Presenter of [CategoryController]. Used to manage the categories of the library. */ class CategoryPresenter( - private val db: DatabaseHelper = Injekt.get() + private val db: DatabaseHelper = Injekt.get(), ) : BasePresenter() { /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/biometric/BiometricTimesController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/biometric/BiometricTimesController.kt index aa2c40445..0bfdc0143 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/biometric/BiometricTimesController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/biometric/BiometricTimesController.kt @@ -196,7 +196,7 @@ class BiometricTimesController : (activity as? MainActivity)?.binding?.rootCoordinator!!, R.string.biometric_lock_time_deleted_snack, R.string.action_undo, - 3000 + 3000, ) mode.finish() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/biometric/BiometricTimesItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/biometric/BiometricTimesItem.kt index 61362735c..7b9027931 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/biometric/BiometricTimesItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/biometric/BiometricTimesItem.kt @@ -48,7 +48,7 @@ class BiometricTimesItem(val timeRange: TimeRange) : AbstractFlexibleItem>, holder: BiometricTimesHolder, position: Int, - payloads: List? + payloads: List?, ) { holder.bind(timeRange) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/biometric/BiometricTimesPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/biometric/BiometricTimesPresenter.kt index 5152ce861..6c80263d5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/biometric/BiometricTimesPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/biometric/BiometricTimesPresenter.kt @@ -69,7 +69,7 @@ class BiometricTimesPresenter : BasePresenter() { */ fun deleteTimeRanges(timeRanges: List) { preferences.authenticatorTimeRanges().set( - this.timeRanges.filterNot { it in timeRanges }.map { it.toPreferenceString() }.toSet() + this.timeRanges.filterNot { it in timeRanges }.map { it.toPreferenceString() }.toSet(), ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/genre/SortTagController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/genre/SortTagController.kt index e8ba8da7f..5ca8150f0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/genre/SortTagController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/genre/SortTagController.kt @@ -220,7 +220,7 @@ class SortTagController : (activity as? MainActivity)?.binding?.rootCoordinator!!, R.string.snack_tags_deleted, R.string.action_undo, - 3000 + 3000, ) mode.finish() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/genre/SortTagCreateDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/genre/SortTagCreateDialog.kt index be02cdc36..1fd3fc74f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/genre/SortTagCreateDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/genre/SortTagCreateDialog.kt @@ -34,7 +34,7 @@ class SortTagCreateDialog(bundle: Bundle? = null) : DialogController(bundle) .setTitle(R.string.action_add_category) .setTextInput( hint = resources?.getString(R.string.name), - prefill = currentName + prefill = currentName, ) { input -> currentName = input } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/genre/SortTagItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/genre/SortTagItem.kt index b5521e75d..47a08b600 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/genre/SortTagItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/genre/SortTagItem.kt @@ -46,7 +46,7 @@ class SortTagItem(val tag: String) : AbstractFlexibleItem() { adapter: FlexibleAdapter>, holder: SortTagHolder, position: Int, - payloads: List? + payloads: List?, ) { holder.bind(tag) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/repos/RepoController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/repos/RepoController.kt index ebac3c783..9bc167ace 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/repos/RepoController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/repos/RepoController.kt @@ -191,7 +191,7 @@ class RepoController : (activity as? MainActivity)?.binding?.rootCoordinator!!, R.string.snack_repo_deleted, R.string.action_undo, - 3000 + 3000, ) mode.finish() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/repos/RepoCreateDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/repos/RepoCreateDialog.kt index 59dc1e72f..2a163ca71 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/repos/RepoCreateDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/repos/RepoCreateDialog.kt @@ -35,7 +35,7 @@ class RepoCreateDialog(bundle: Bundle? = null) : DialogController(bundle) .setMessage(R.string.action_add_repo_message) .setTextInput( hint = resources?.getString(R.string.name), - prefill = currentName + prefill = currentName, ) { input -> currentName = input } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/repos/RepoItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/repos/RepoItem.kt index 3fb6f7b27..9ccbfde1f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/repos/RepoItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/repos/RepoItem.kt @@ -46,7 +46,7 @@ class RepoItem(val repo: String) : AbstractFlexibleItem() { adapter: FlexibleAdapter>, holder: RepoHolder, position: Int, - payloads: List? + payloads: List?, ) { holder.bind(repo) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/repos/RepoPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/repos/RepoPresenter.kt index b8a095293..ef671a538 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/repos/RepoPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/repos/RepoPresenter.kt @@ -14,7 +14,7 @@ import uy.kohesive.injekt.api.get * Presenter of [RepoController]. Used to manage the repos for the extensions. */ class RepoPresenter( - private val preferences: PreferencesHelper = Injekt.get() + private val preferences: PreferencesHelper = Injekt.get(), ) : BasePresenter() { /** * List containing repos. @@ -67,7 +67,7 @@ class RepoPresenter( */ fun deleteRepos(repos: List) { preferences.extensionRepos().set( - this.repos.filterNot { it in repos }.toSet() + this.repos.filterNot { it in repos }.toSet(), ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/ChangeSourceCategoriesDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/ChangeSourceCategoriesDialog.kt index 1955df644..70f98d89a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/ChangeSourceCategoriesDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/ChangeSourceCategoriesDialog.kt @@ -21,7 +21,7 @@ class ChangeSourceCategoriesDialog(bundle: Bundle? = null) : target: T, source: Source, categories: Array, - selection: BooleanArray + selection: BooleanArray, ) : this() { this.source = source this.categories = categories @@ -34,7 +34,7 @@ class ChangeSourceCategoriesDialog(bundle: Bundle? = null) : .setTitle(R.string.action_move_category) .setMultiChoiceItems( categories, - selection + selection, ) { _, which, selected -> selection[which] = selected } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/SourceCategoryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/SourceCategoryController.kt index 17c2c0492..cc872b6b6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/SourceCategoryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/SourceCategoryController.kt @@ -192,7 +192,7 @@ class SourceCategoryController : (activity as? MainActivity)?.binding?.rootCoordinator!!, R.string.snack_categories_deleted, R.string.action_undo, - 3000 + 3000, ) mode.finish() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/SourceCategoryCreateDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/SourceCategoryCreateDialog.kt index 7dbd74306..f3945b9e2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/SourceCategoryCreateDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/SourceCategoryCreateDialog.kt @@ -35,7 +35,7 @@ class SourceCategoryCreateDialog(bundle: Bundle? = null) : DialogController(b .setNegativeButton(android.R.string.cancel, null) .setTextInput( hint = resources?.getString(R.string.name), - prefill = currentName + prefill = currentName, ) { input -> currentName = input } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/SourceCategoryItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/SourceCategoryItem.kt index 258446651..de61d9179 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/SourceCategoryItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/SourceCategoryItem.kt @@ -46,7 +46,7 @@ class SourceCategoryItem(val category: String) : AbstractFlexibleItem>, holder: SourceCategoryHolder, position: Int, - payloads: List? + payloads: List?, ) { holder.bind(category) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/SourceCategoryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/SourceCategoryPresenter.kt index f295f0862..58dc9e431 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/SourceCategoryPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/SourceCategoryPresenter.kt @@ -15,7 +15,7 @@ import uy.kohesive.injekt.api.get * Presenter of [SourceCategoryController]. Used to manage the categories of the library. */ class SourceCategoryPresenter( - private val db: DatabaseHelper = Injekt.get() + private val db: DatabaseHelper = Injekt.get(), ) : BasePresenter() { /** @@ -79,7 +79,7 @@ class SourceCategoryPresenter( preferences.sourcesTabSourcesInCategories().set(sources.toSet()) preferences.sourcesTabCategories().set( - this.categories.filterNot { it in categories }.toSet() + this.categories.filterNot { it in categories }.toSet(), ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/SourceCategoryRenameDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/SourceCategoryRenameDialog.kt index 99a8d1b2c..4a8786a8b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/SourceCategoryRenameDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/SourceCategoryRenameDialog.kt @@ -38,7 +38,7 @@ class SourceCategoryRenameDialog(bundle: Bundle? = null) : DialogController(b .setTitle(R.string.action_rename_category) .setTextInput( hint = resources?.getString(R.string.name), - prefill = currentName + prefill = currentName, ) { input -> currentName = input } 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 9ba345141..227dc6fe7 100755 --- 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: DownloadController) : FlexibleAdapter>( null, controller, - true + true, ) { /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadController.kt index 51db5949a..0b6b1d663 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadController.kt @@ -197,7 +197,9 @@ class DownloadController : onUpdateDownloadedPages(download) } Download.State.ERROR -> unsubscribeProgress(download) - else -> { /* unused */ } + else -> { + /* unused */ + } } } @@ -310,7 +312,7 @@ class DownloadController : R.string.action_pause } else { R.string.action_resume - } + }, ) setIconResource( @@ -318,7 +320,7 @@ class DownloadController : R.drawable.ic_pause_24dp } else { R.drawable.ic_play_arrow_24dp - } + }, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHeaderItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHeaderItem.kt index b69cc07bd..b4103a7e5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHeaderItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHeaderItem.kt @@ -10,7 +10,7 @@ import eu.kanade.tachiyomi.R data class DownloadHeaderItem( val id: Long, val name: String, - val size: Int + val size: Int, ) : AbstractExpandableHeaderItem() { override fun getLayoutRes(): Int { @@ -19,7 +19,7 @@ data class DownloadHeaderItem( override fun createViewHolder( view: View, - adapter: FlexibleAdapter> + adapter: FlexibleAdapter>, ): DownloadHeaderHolder { return DownloadHeaderHolder(view, adapter) } @@ -28,7 +28,7 @@ data class DownloadHeaderItem( adapter: FlexibleAdapter>, holder: DownloadHeaderHolder, position: Int, - payloads: List? + payloads: List?, ) { holder.bind(this) } 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 371869fe6..8f4623143 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHolder.kt @@ -95,7 +95,7 @@ class DownloadHolder(private val view: View, val adapter: DownloadAdapter) : }, onMenuItemClick = { adapter.downloadItemListener.onMenuItemClick(bindingAdapterPosition, this) - } + }, ) } } 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 3393d7c12..783ec061f 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 @@ -10,7 +10,7 @@ import eu.kanade.tachiyomi.data.download.model.Download class DownloadItem( val download: Download, - header: DownloadHeaderItem + header: DownloadHeaderItem, ) : AbstractSectionableItem(header) { override fun getLayoutRes(): Int { @@ -25,7 +25,7 @@ class DownloadItem( */ override fun createViewHolder( view: View, - adapter: FlexibleAdapter> + adapter: FlexibleAdapter>, ): DownloadHolder { return DownloadHolder(view, adapter as DownloadAdapter) } @@ -42,7 +42,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/library/ChangeMangaCategoriesDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/ChangeMangaCategoriesDialog.kt index 6c7802dc9..224a7555b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/ChangeMangaCategoriesDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/ChangeMangaCategoriesDialog.kt @@ -25,7 +25,7 @@ class ChangeMangaCategoriesDialog(bundle: Bundle? = null) : target: T, mangas: List, categories: List, - preselected: Array + preselected: Array, ) : this() { this.mangas = mangas this.categories = categories @@ -43,7 +43,7 @@ class ChangeMangaCategoriesDialog(bundle: Bundle? = null) : setQuadStateMultiChoiceItems( items = categories.map { it.name }, isActionList = false, - initialSelected = preselected.toIntArray() + initialSelected = preselected.toIntArray(), ) { selections -> selected = selections } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryAdapter.kt index 6a18ef897..c472a7625 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryAdapter.kt @@ -21,7 +21,7 @@ import uy.kohesive.injekt.api.get */ class LibraryAdapter( private val controller: LibraryController, - private val preferences: PreferencesHelper = Injekt.get() + private val preferences: PreferencesHelper = Injekt.get(), ) : RecyclerViewPagerAdapter() { /** 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 6ceb05c25..d110404ea 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt @@ -171,7 +171,7 @@ class LibraryCategoryAdapter(view: LibraryCategoryView, val controller: LibraryC manga: LibraryManga, checkGenre: Boolean = true, searchTags: List? = null, - searchTitles: List? = null + searchTitles: List? = null, ): Boolean { val mappedQueries = queries.groupBy { it.excluded } val tracks = if (hasLoggedServices) db.getTracks(manga).executeAsBlocking().toList() else null diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt index eda56987e..12506aa2a 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt @@ -147,7 +147,7 @@ class LibraryCategoryView @JvmOverloads constructor(context: Context, attrs: Att ) || preferences.groupLibraryUpdateType().get() == PreferenceValues.GroupLibraryMode.GLOBAL -> R.string.updating_library else -> R.string.updating_category - } + }, ) } // SY <-- diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryComfortableGridHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryComfortableGridHolder.kt index d5df15e96..3efda2c43 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryComfortableGridHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryComfortableGridHolder.kt @@ -23,7 +23,7 @@ import reactivecircus.flowbinding.android.view.clicks */ class LibraryComfortableGridHolder( override val binding: SourceComfortableGridItemBinding, - adapter: FlexibleAdapter> + adapter: FlexibleAdapter>, ) : LibraryHolder(binding.root, adapter) { // SY --> diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCompactGridHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCompactGridHolder.kt index e361d360e..df2fb9d17 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCompactGridHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCompactGridHolder.kt @@ -24,7 +24,7 @@ import reactivecircus.flowbinding.android.view.clicks class LibraryCompactGridHolder( override val binding: SourceCompactGridItemBinding, adapter: FlexibleAdapter<*>, - private val coverOnly: Boolean + private val coverOnly: Boolean, ) : LibraryHolder(binding.root, adapter) { // SY --> 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 9f02b6f7a..179767f83 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 @@ -74,7 +74,7 @@ import kotlin.time.Duration.Companion.seconds class LibraryController( bundle: Bundle? = null, private val preferences: PreferencesHelper = Injekt.get(), - private val trackManager: TrackManager = Injekt.get() + private val trackManager: TrackManager = Injekt.get(), ) : SearchableNucleusController(bundle), RootController, TabbedController, @@ -252,7 +252,7 @@ class LibraryController( binding.btnGlobalSearch.clicks() .onEach { router.pushController( - GlobalSearchController(presenter.query).withFadeTransaction() + GlobalSearchController(presenter.query).withFadeTransaction(), ) } .launchIn(viewScope) @@ -322,7 +322,7 @@ class LibraryController( listOf( EmptyView.Action(R.string.getting_started_guide, R.drawable.ic_help_24dp) { activity?.openInBrowser("https://tachiyomi.org/help/guides/getting-started") - } + }, ), ) (activity as? MainActivity)?.ready = true @@ -834,7 +834,8 @@ class LibraryController( favSyncDialog?.show() } is FavoritesSyncStatus.Processing, - is FavoritesSyncStatus.Initializing -> { + is FavoritesSyncStatus.Initializing, +-> { takeSyncLocks() if (favSyncDialog == null || ( 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 e9bb4d532..ede6bf462 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.kt @@ -14,7 +14,7 @@ import eu.davidea.viewholders.FlexibleViewHolder abstract class LibraryHolder( view: View, - val adapter: FlexibleAdapter<*> + val adapter: FlexibleAdapter<*>, ) : FlexibleViewHolder(view, adapter) { abstract val binding: VB 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 a79ecdb32..c17a1da2f 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 @@ -19,7 +19,7 @@ import uy.kohesive.injekt.api.get class LibraryItem( val manga: LibraryManga, private val shouldSetFromCategory: Preference, - private val defaultLibraryDisplayMode: Preference + private val defaultLibraryDisplayMode: Preference, ) : AbstractFlexibleItem>(), IFilterable { @@ -72,7 +72,7 @@ class LibraryItem( adapter: FlexibleAdapter>, holder: LibraryHolder<*>, position: Int, - payloads: List? + payloads: List?, ) { holder.onSetValues(this) } 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 8f746c5c6..7d4b2c277 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt @@ -18,7 +18,7 @@ import eu.kanade.tachiyomi.databinding.SourceListItemBinding */ class LibraryListHolder( private val view: View, - adapter: FlexibleAdapter<*> + adapter: FlexibleAdapter<*>, ) : LibraryHolder(view, adapter) { override val binding = SourceListItemBinding.bind(view) 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 2e468bcab..a62874855 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt @@ -66,7 +66,7 @@ class LibraryPresenter( private val downloadManager: DownloadManager = Injekt.get(), private val trackManager: TrackManager = Injekt.get(), // SY --> - private val customMangaManager: CustomMangaManager = Injekt.get() + private val customMangaManager: CustomMangaManager = Injekt.get(), // SY <-- ) : BasePresenter() { @@ -151,7 +151,7 @@ class LibraryPresenter( .observeOn(AndroidSchedulers.mainThread()) .subscribeLatestCache({ view, (categories, mangaMap) -> view.onNextLibraryUpdate(categories, mangaMap) - }) + },) } } @@ -484,11 +484,11 @@ class LibraryPresenter( } else if (!libraryIsGrouped) { editedCategories = listOf(Category.create("All").apply { this.id = 0 }) mapOf( - 0 to map.values.flatten().distinctBy { it.manga.id } + 0 to map.values.flatten().distinctBy { it.manga.id }, ) } else { val (items, customCategories) = getGroupedMangaItems( - map.values.flatten().distinctBy { it.manga.id } + map.values.flatten().distinctBy { it.manga.id }, ) editedCategories = customCategories items @@ -523,7 +523,7 @@ class LibraryPresenter( LibraryItem( libraryManga, shouldSetFromCategory, - defaultLibraryDisplayMode + defaultLibraryDisplayMode, ) }.groupBy { it.manga.category } } @@ -645,7 +645,8 @@ class LibraryPresenter( downloadManager.downloadChapters(mergedManga, chapters) } } else { - /* SY --> */ val chapters = if (manga.isEhBasedManga()) { + /* SY --> */ + val chapters = if (manga.isEhBasedManga()) { db.getChapters(manga).executeOnIO().minByOrNull { it.source_order }?.let { chapter -> if (!chapter.read) listOf(chapter) else emptyList() } ?: emptyList() @@ -677,7 +678,7 @@ class LibraryPresenter( manga.artist.takeUnless { it == manga.originalArtist }, manga.description.takeUnless { it == manga.originalDescription }, manga.genre.takeUnless { it == manga.originalGenre }?.let { manga.getGenres() }, - manga.status.takeUnless { it == manga.originalStatus } + manga.status.takeUnless { it == manga.originalStatus }, ) } if (mangaJson != null) { @@ -832,8 +833,8 @@ class LibraryPresenter( SManga.ON_HIATUS to context.getString(R.string.ongoing), SManga.PUBLISHING_FINISHED to context.getString(R.string.publishing_finished), SManga.COMPLETED to context.getString(R.string.completed), - SManga.UNKNOWN to context.getString(R.string.unknown) - ).associateBy(Pair::first) + SManga.UNKNOWN to context.getString(R.string.unknown), + ).associateBy(Pair::first), ) } LibraryGroup.BY_SOURCE -> @@ -854,8 +855,8 @@ class LibraryPresenter( TrackManager.PAUSED to context.getString(R.string.on_hold), TrackManager.COMPLETED to context.getString(R.string.completed), TrackManager.DROPPED to context.getString(R.string.dropped), - TrackManager.OTHER to context.getString(R.string.not_tracked) - ).associateBy(Pair::first) + TrackManager.OTHER to context.getString(R.string.not_tracked), + ).associateBy(Pair::first), ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt index 5606754f3..9824a8077 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt @@ -23,7 +23,7 @@ import uy.kohesive.injekt.injectLazy class LibrarySettingsSheet( router: Router, private val trackManager: TrackManager = Injekt.get(), - onGroupClickListener: (ExtendedNavigationView.Group) -> Unit + onGroupClickListener: (ExtendedNavigationView.Group) -> Unit, ) : TabbedBottomSheetDialog(router.activity!!) { val filters: Filter @@ -62,14 +62,14 @@ class LibrarySettingsSheet( filters, sort, display, - grouping + grouping, ) override fun getTabTitles(): List = listOf( R.string.action_filter, R.string.action_sort, R.string.action_display, - R.string.group + R.string.group, ) /** @@ -213,7 +213,7 @@ class LibrarySettingsSheet( override val header = null override val items = - listOf(alphabetically, lastRead, lastChecked, unread, total, latestChapter, chapterFetchDate, dateAdded /* SY --> */, dragAndDrop) + if (preferences.sortTagsForLibrary().get().isNotEmpty()) listOf(tagList) else emptyList() /* SY <-- */ + listOf(alphabetically, lastRead, lastChecked, unread, total, latestChapter, chapterFetchDate, dateAdded /* SY --> */, dragAndDrop) + if (preferences.sortTagsForLibrary().get().isNotEmpty()) listOf(tagList) else emptyList() // SY <-- override val footer = null override fun initModels() { @@ -521,7 +521,7 @@ class LibrarySettingsSheet( val groupingItems = mutableListOf( LibraryGroup.BY_DEFAULT, LibraryGroup.BY_SOURCE, - LibraryGroup.BY_STATUS + LibraryGroup.BY_STATUS, ) if (trackManager.hasLoggedServices()) { groupingItems.add(LibraryGroup.BY_TRACK_STATUS) @@ -534,7 +534,7 @@ class LibrarySettingsSheet( id, this, LibraryGroup.groupTypeStringRes(id, hasCategories), - LibraryGroup.groupTypeDrawableRes(id) + LibraryGroup.groupTypeDrawableRes(id), ) } } 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 5ad315ca9..80208ace2 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -231,7 +231,7 @@ class MainActivity : BaseActivity() { from: Controller?, isPush: Boolean, container: ViewGroup, - handler: ControllerChangeHandler + handler: ControllerChangeHandler, ) { syncActivityViewWithController(to, from, isPush) } @@ -241,10 +241,10 @@ class MainActivity : BaseActivity() { from: Controller?, isPush: Boolean, container: ViewGroup, - handler: ControllerChangeHandler + handler: ControllerChangeHandler, ) { } - } + }, ) if (!router.hasRootController()) { // Set start screen @@ -548,7 +548,7 @@ class MainActivity : BaseActivity() { // Color taken from m3_appbar_background window.statusBarColor = ColorUtils.compositeColors( getColor(R.color.m3_appbar_overlay_color), - getThemeColor(R.attr.colorSurface) + getThemeColor(R.attr.colorSurface), ) super.onSupportActionModeStarted(mode) } 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 055249326..eed7503ea 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 @@ -48,7 +48,7 @@ class EditMangaDialog : DialogController { private val context: Context get() = binding.root.context constructor(target: MangaController, manga: Manga) : super( - bundleOf(KEY_MANGA to manga.id!!) + bundleOf(KEY_MANGA to manga.id!!), ) { targetController = target this.manga = manga @@ -89,7 +89,7 @@ class EditMangaDialog : DialogController { R.string.publishing_finished, R.string.cancelled, R.string.on_hiatus, - ).map { context.getString(it) } + ).map { context.getString(it) }, ) binding.status.adapter = statusAdapter @@ -104,7 +104,7 @@ class EditMangaDialog : DialogController { SManga.CANCELLED, 62 -> 5 SManga.ON_HIATUS, 63 -> 6 else -> 0 - } + }, ) } @@ -146,8 +146,8 @@ class EditMangaDialog : DialogController { R.string.description_hint, manga.originalDescription?.replace( "\n", - " " - )?.chop(20) + " ", + )?.chop(20), ) } } @@ -204,7 +204,7 @@ class EditMangaDialog : DialogController { } }, customCoverUri, - willResetCover + willResetCover, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt index 3f4a2bec3..bb51451f4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt @@ -142,9 +142,9 @@ class MangaController : FROM_SOURCE_EXTRA to fromSource, // SY --> SMART_SEARCH_CONFIG_EXTRA to smartSearchConfig, - UPDATE_EXTRA to update + UPDATE_EXTRA to update, // SY <-- - ) + ), ) { this.manga = manga if (manga != null) { @@ -153,7 +153,7 @@ class MangaController : } constructor(mangaId: Long) : this( - Injekt.get().getManga(mangaId).executeAsBlocking() + Injekt.get().getManga(mangaId).executeAsBlocking(), ) @Suppress("unused") @@ -163,8 +163,8 @@ class MangaController : constructor(redirect: MangaPresenter.EXHRedirect) : super( bundleOf( MANGA_EXTRA to (redirect.manga.id ?: 0), - UPDATE_EXTRA to redirect.update - ) + UPDATE_EXTRA to redirect.update, + ), ) { this.manga = redirect.manga if (manga != null) { @@ -236,7 +236,7 @@ class MangaController : // EXH --> val smartSearchConfig: SourceController.SmartSearchConfig? = args.getParcelable( - SMART_SEARCH_CONFIG_EXTRA + SMART_SEARCH_CONFIG_EXTRA, ) private var editMangaDialog: EditMangaDialog? = null @@ -273,7 +273,7 @@ class MangaController : override fun createPresenter(): MangaPresenter { return MangaPresenter( manga!!, - source!! + source!!, ) } @@ -324,8 +324,8 @@ class MangaController : mangaInfoAdapter, mangaInfoButtonsAdapter, chaptersHeaderAdapter, - chaptersAdapter - ) + chaptersAdapter, + ), ) // Skips directly to chapters list if navigated to from the library @@ -334,7 +334,7 @@ class MangaController : val mainActivityAppBar = (activity as? MainActivity)?.binding?.appbar (it.layoutManager as LinearLayoutManager).scrollToPositionWithOffset( 1, - mainActivityAppBar?.height ?: 0 + mainActivityAppBar?.height ?: 0, ) mainActivityAppBar?.isLifted = true } @@ -369,8 +369,8 @@ class MangaController : binding.infoRecycler?.adapter = ConcatAdapter( listOfNotNull( mangaInfoAdapter, - mangaInfoButtonsAdapter - ) + mangaInfoButtonsAdapter, + ), ) binding.chaptersRecycler?.adapter = ConcatAdapter(chaptersHeaderAdapter, chaptersAdapter) @@ -497,7 +497,7 @@ class MangaController : // Hide options for non-library manga menu.findItem(R.id.action_edit_categories).isVisible = presenter.manga.favorite && presenter.getCategories().isNotEmpty() - menu.findItem(R.id.action_migrate).isVisible = presenter.manga.favorite /* SY --> */ && presenter.manga.source != MERGED_SOURCE_ID /* SY <-- */ + menu.findItem(R.id.action_migrate).isVisible = presenter.manga.favorite /* SY --> */ && presenter.manga.source != MERGED_SOURCE_ID // SY <-- // SY --> menu.findItem(R.id.action_edit).isVisible = presenter.manga.favorite || isLocalSource @@ -511,14 +511,14 @@ class MangaController : when (item.itemId) { R.id.action_share -> shareManga() R.id.download_next, R.id.download_next_5, R.id.download_next_10, - R.id.download_custom, R.id.download_unread, R.id.download_all + R.id.download_custom, R.id.download_unread, R.id.download_all, -> downloadChapters(item.itemId) // SY --> R.id.action_edit -> { editMangaDialog = EditMangaDialog( this, - presenter.manga + presenter.manga, ) editMangaDialog?.showDialog(router) } @@ -529,7 +529,7 @@ class MangaController : R.id.action_merged -> { editMergedSettingsDialog = EditMergedSettingsDialog( this, - presenter.manga + presenter.manga, ) editMergedSettingsDialog?.showDialog(router) } @@ -611,7 +611,7 @@ class MangaController : .setSingleChoiceItems( mergedManga.mapIndexed { index, _ -> sources[index].toString() } .toTypedArray(), - -1 + -1, ) { dialog, index -> dialog.dismiss() openMangaInWebView(mergedManga[index], sources[index] as? HttpSource) @@ -676,11 +676,11 @@ class MangaController : val source = sourceManager.getOrStub(libraryManga.source) MaterialAlertDialogBuilder(it).apply { setMessage(activity?.getString(R.string.confirm_manga_add_duplicate, source.name)) - setPositiveButton(activity?.getString(R.string.action_add)) { _, _, -> + setPositiveButton(activity?.getString(R.string.action_add)) { _, _ -> addToLibrary(newManga) } - setNegativeButton(activity?.getString(R.string.action_cancel)) { _, _, -> } - setNeutralButton(activity?.getString(R.string.action_show_manga)) { _, _, -> + setNegativeButton(activity?.getString(R.string.action_cancel)) { _, _ -> } + setNeutralButton(activity?.getString(R.string.action_show_manga)) { _, _ -> router.pushController(MangaController(libraryManga).withFadeTransaction()) } setCancelable(true) @@ -764,9 +764,9 @@ class MangaController : router?.pushController( SourceController( bundleOf( - SourceController.SMART_SEARCH_CONFIG to smartSearchConfig - ) - ).withFadeTransaction().tag(SMART_SEARCH_SOURCE_TAG) + SourceController.SMART_SEARCH_CONFIG to smartSearchConfig, + ), + ).withFadeTransaction().tag(SMART_SEARCH_SOURCE_TAG), ) } @@ -782,8 +782,8 @@ class MangaController : MangaController( mergedManga, true, - update = true - ).withFadeTransaction() + update = true, + ).withFadeTransaction(), ) applicationContext?.toast(R.string.manga_merged) } catch (e: Exception) { @@ -804,9 +804,9 @@ class MangaController : .setSingleChoiceItems( arrayOf( activity!!.getString(R.string.mangadex_similar), - activity!!.getString(R.string.community_recommendations) + activity!!.getString(R.string.community_recommendations), ), - -1 + -1, ) { dialog, index -> dialog.dismiss() when (index) { @@ -863,7 +863,7 @@ class MangaController : super.postDestroy(controller) dialog = null } - } + }, ) dialog?.showDialog(router) } @@ -905,7 +905,7 @@ class MangaController : previousController.search(query) } is UpdatesController, - is HistoryController -> { + is HistoryController, -> { // Manually navigate to LibraryController router.handleBack() (router.activity as MainActivity).setSelectedNavItem(R.id.nav_library) @@ -978,7 +978,7 @@ class MangaController : super.postDestroy(controller) dialog = null } - } + }, ) dialog?.showDialog(router) } @@ -993,8 +993,8 @@ class MangaController : image = Image.Cover( bitmap = coverBitmap, name = manga.title, - location = Location.Cache - ) + location = Location.Cache, + ), ) launchUI { startActivity(uri.toShareIntent(activity)) @@ -1017,8 +1017,8 @@ class MangaController : image = Image.Cover( bitmap = coverBitmap, name = manga.title, - location = Location.Pictures.create() - ) + location = Location.Pictures.create(), + ), ) launchUI { activity.toast(R.string.cover_saved) @@ -1048,9 +1048,9 @@ class MangaController : startActivityForResult( Intent.createChooser( intent, - resources?.getString(R.string.file_select_cover) + resources?.getString(R.string.file_select_cover), ), - REQUEST_IMAGE_OPEN + REQUEST_IMAGE_OPEN, ) } else { activity?.toast(R.string.notification_first_add_to_library) @@ -1098,7 +1098,7 @@ class MangaController : PreMigrationController.navigateToMigration( preferences.skipPreMigration().get(), router, - listOf(presenter.manga.id!!) + listOf(presenter.manga.id!!), ) // SY <-- } @@ -1172,7 +1172,7 @@ class MangaController : val activityOptions = ActivityOptions.makeSceneTransitionAnimation( activity, sharedElement, - ReaderActivity.SHARED_ELEMENT_NAME + ReaderActivity.SHARED_ELEMENT_NAME, ) startActivity( intent.apply { @@ -1477,7 +1477,7 @@ class MangaController : private fun showCustomDownloadDialog() { DownloadCustomChaptersDialog( this, - presenter.allChapters.size + presenter.allChapters.size, ).showDialog(router) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt index 551316300..d4e60e48b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt @@ -93,7 +93,7 @@ class MangaPresenter( private val trackManager: TrackManager = Injekt.get(), private val downloadManager: DownloadManager = Injekt.get(), private val coverCache: CoverCache = Injekt.get(), - private val sourceManager: SourceManager = Injekt.get() + private val sourceManager: SourceManager = Injekt.get(), ) : BasePresenter() { /** @@ -198,7 +198,7 @@ class MangaPresenter( this.meta = meta // SY <-- view.onNextMangaInfo(manga, source, meta) - }) + },) getTrackingObservable() .observeOn(AndroidSchedulers.mainThread()) @@ -214,7 +214,7 @@ class MangaPresenter( filteredAndSortedChapters = chapters view?.onNextChapters(chapters) }, - { _, error -> logcat(LogPriority.ERROR, error) } + { _, error -> logcat(LogPriority.ERROR, error) }, ) // Manga info - end @@ -257,15 +257,15 @@ class MangaPresenter( redirectFlow.emit( EXHRedirect( acceptedChain.manga, - update - ) + update, + ), ) } }.launchIn(presenterScope) } // SY <-- } - .subscribe { chaptersRelay.call(it) } + .subscribe { chaptersRelay.call(it) }, ) // Chapters list - end @@ -345,7 +345,7 @@ class MangaPresenter( tags: List?, status: Int?, uri: Uri?, - resetCover: Boolean = false + resetCover: Boolean = false, ) { if (manga.source == LocalSource.ID) { manga.title = if (title.isNullOrBlank()) manga.url else title.trim() @@ -370,7 +370,7 @@ class MangaPresenter( artist?.trimOrNull(), description?.trimOrNull(), genre, - status.takeUnless { it == manga.originalStatus } + status.takeUnless { it == manga.originalStatus }, ) customMangaManager.saveMangaInfo(manga) } @@ -389,7 +389,7 @@ class MangaPresenter( .subscribeLatestCache( { view, _ -> view.setRefreshing() - } + }, ) fetchMangaFromSource(manualFetch = true) } else { @@ -399,7 +399,7 @@ class MangaPresenter( .subscribeLatestCache( { view, _ -> view.onNextMangaInfo(manga, source, meta) - } + }, ) } } @@ -425,8 +425,8 @@ class MangaPresenter( mergeUrl = originalManga.url, mangaId = manga.id!!, mangaUrl = manga.url, - mangaSourceId = manga.source - ) + mangaSourceId = manga.source, + ), ) if (children.isEmpty() || children.all { it.mangaSourceId != MERGED_SOURCE_ID }) { @@ -441,7 +441,7 @@ class MangaPresenter( mergeUrl = originalManga.url, mangaId = originalManga.id!!, mangaUrl = originalManga.url, - mangaSourceId = MERGED_SOURCE_ID + mangaSourceId = MERGED_SOURCE_ID, ) } @@ -495,7 +495,7 @@ class MangaPresenter( mergeUrl = mergedManga.url, mangaId = originalManga.id!!, mangaUrl = originalManga.url, - mangaSourceId = originalManga.source + mangaSourceId = originalManga.source, ) val newMangaReference = MergedMangaReference( @@ -509,7 +509,7 @@ class MangaPresenter( mergeUrl = mergedManga.url, mangaId = manga.id!!, mangaUrl = manga.url, - mangaSourceId = manga.source + mangaSourceId = manga.source, ) val mergedMangaReference = MergedMangaReference( @@ -523,7 +523,7 @@ class MangaPresenter( mergeUrl = mergedManga.url, mangaId = mergedManga.id!!, mangaUrl = mergedManga.url, - mangaSourceId = MERGED_SOURCE_ID + mangaSourceId = MERGED_SOURCE_ID, ) db.insertMergedMangas(listOf(originalMangaReference, newMangaReference, mergedMangaReference)).executeAsBlocking() @@ -706,7 +706,7 @@ class MangaPresenter( .observeOn(AndroidSchedulers.mainThread()) .subscribeFirst( { view, _ -> view.onSetCoverSuccess() }, - { view, e -> view.onSetCoverError(e) } + { view, e -> view.onSetCoverError(e) }, ) } @@ -721,7 +721,7 @@ class MangaPresenter( .observeOn(AndroidSchedulers.mainThread()) .subscribeFirst( { view, _ -> view.onSetCoverSuccess() }, - { view, e -> view.onSetCoverError(e) } + { view, e -> view.onSetCoverError(e) }, ) } @@ -747,7 +747,7 @@ class MangaPresenter( }, { _, error -> logcat(LogPriority.ERROR, error) - } + }, ) observeDownloadsPageSubscription?.let { remove(it) } 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 3d35936f9..3678f49e0 100755 --- 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 @@ -17,7 +17,7 @@ import java.util.Date class ChapterHolder( view: View, - private val adapter: ChaptersAdapter + private val adapter: ChaptersAdapter, ) : BaseChapterHolder(view, adapter) { private val binding = ChaptersItemBinding.bind(view) 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 02713a0ff..d63f7d602 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 @@ -26,7 +26,7 @@ class ChapterItem(chapter: Chapter, val manga: Manga) : adapter: FlexibleAdapter>, holder: ChapterHolder, position: Int, - payloads: List? + payloads: List?, ) { holder.bind(this, manga) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersAdapter.kt index 18bcc7483..b62267a15 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersAdapter.kt @@ -13,7 +13,7 @@ import java.text.DecimalFormatSymbols class ChaptersAdapter( controller: MangaController, - context: Context + context: Context, ) : BaseChaptersAdapter(controller) { private val preferences: PreferencesHelper by injectLazy() @@ -29,7 +29,7 @@ class ChaptersAdapter( val decimalFormat = DecimalFormat( "#.###", DecimalFormatSymbols() - .apply { decimalSeparator = '.' } + .apply { decimalSeparator = '.' }, ) val relativeTime: Int = preferences.relativeTime().get() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSettingsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSettingsSheet.kt index 8584ba0b5..149eecbec 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSettingsSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSettingsSheet.kt @@ -22,7 +22,7 @@ import kotlinx.coroutines.supervisorScope class ChaptersSettingsSheet( private val router: Router, private val presenter: MangaPresenter, - private val onGroupClickListener: (ExtendedNavigationView.Group) -> Unit + private val onGroupClickListener: (ExtendedNavigationView.Group) -> Unit, ) : TabbedBottomSheetDialog(router.activity!!) { val filters = Filter(router.activity!!) @@ -43,13 +43,13 @@ class ChaptersSettingsSheet( override fun getTabViews(): List = listOf( filters, sort, - display + display, ) override fun getTabTitles(): List = listOf( R.string.action_filter, R.string.action_sort, - R.string.action_display + R.string.action_display, ) private fun showPopupMenu(view: View) { @@ -61,7 +61,7 @@ class ChaptersSettingsSheet( SetChapterSettingsDialog(presenter.manga).showDialog(router) } } - } + }, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/DownloadCustomChaptersDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/DownloadCustomChaptersDialog.kt index 782a863fc..a1af94cc3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/DownloadCustomChaptersDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/DownloadCustomChaptersDialog.kt @@ -26,7 +26,7 @@ class DownloadCustomChaptersDialog : DialogController */ constructor(target: T, maxChapters: Int) : super( // Add maximum number of chapters to download value to bundle. - bundleOf(KEY_ITEM_MAX to maxChapters) + bundleOf(KEY_ITEM_MAX to maxChapters), ) { targetController = target this.maxChapters = maxChapters diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/MangaChaptersHeaderAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/MangaChaptersHeaderAdapter.kt index 4ae569a63..0ee049342 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/MangaChaptersHeaderAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/MangaChaptersHeaderAdapter.kt @@ -14,7 +14,7 @@ import kotlinx.coroutines.flow.onEach import reactivecircus.flowbinding.android.view.clicks class MangaChaptersHeaderAdapter( - private val controller: MangaController + private val controller: MangaController, ) : RecyclerView.Adapter() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/SetChapterSettingsDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/SetChapterSettingsDialog.kt index 9b3d4efd7..a94c0fc89 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/SetChapterSettingsDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/SetChapterSettingsDialog.kt @@ -14,7 +14,7 @@ import eu.kanade.tachiyomi.widget.DialogCheckboxView class SetChapterSettingsDialog(bundle: Bundle? = null) : DialogController(bundle) { constructor(manga: Manga) : this( - bundleOf(MANGA_KEY to manga) + bundleOf(MANGA_KEY to manga), ) override fun onCreateDialog(savedViewState: Bundle?): Dialog { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/base/BaseChapterHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/base/BaseChapterHolder.kt index 1241d02ca..a3a38dd43 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/base/BaseChapterHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/base/BaseChapterHolder.kt @@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.util.view.popupMenu open class BaseChapterHolder( view: View, - private val adapter: BaseChaptersAdapter<*> + private val adapter: BaseChaptersAdapter<*>, ) : FlexibleViewHolder(view, adapter) { fun onDownloadClick(view: View, position: Int) { @@ -36,7 +36,7 @@ open class BaseChapterHolder( } else { adapter.clickListener.deleteChapter(position) } - } + }, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/base/BaseChapterItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/base/BaseChapterItem.kt index 04aee7d55..2be19f9c2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/base/BaseChapterItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/base/BaseChapterItem.kt @@ -8,7 +8,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/info/MangaFullCoverDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaFullCoverDialog.kt index 46934d322..d8ec5980a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaFullCoverDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaFullCoverDialog.kt @@ -59,7 +59,7 @@ class MangaFullCoverDialog : DialogController { } true } - menu?.findItem(R.id.action_edit_cover)?.isVisible = /* SY --> */ false /* manga?.favorite ?: false SY <-- */ + menu?.findItem(R.id.action_edit_cover)?.isVisible = /* SY --> */ false // manga?.favorite ?: false SY <-- } setImage(manga) @@ -107,8 +107,8 @@ class MangaFullCoverDialog : DialogController { binding?.container?.setImage( it, ReaderPageImageView.Config( - zoomDuration = 500 - ) + zoomDuration = 500, + ), ) } .build() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoButtonsAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoButtonsAdapter.kt index 1ab284fa5..7ad6dd634 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoButtonsAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoButtonsAdapter.kt @@ -15,7 +15,7 @@ import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy class MangaInfoButtonsAdapter( - private val controller: MangaController + private val controller: MangaController, ) : RecyclerView.Adapter() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt index 27d202ba8..e545e8271 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt @@ -151,7 +151,7 @@ class MangaInfoHeaderAdapter( text = view.context.resources.getQuantityString( R.plurals.num_trackers, trackCount, - trackCount + trackCount, ) isActivated = true } else { @@ -190,7 +190,7 @@ class MangaInfoHeaderAdapter( .onEach { controller.activity?.copyToClipboard( view.context.getString(R.string.title), - binding.mangaFullTitle.text.toString() + binding.mangaFullTitle.text.toString(), ) } .launchIn(controller.viewScope) @@ -207,7 +207,7 @@ class MangaInfoHeaderAdapter( val author = binding.mangaAuthor.text.toString() controller.activity?.copyToClipboard( author, - SourceTagsUtil.getWrappedTag(source.id, namespace = "artist", tag = author) ?: author + SourceTagsUtil.getWrappedTag(source.id, namespace = "artist", tag = author) ?: author, ) // SY <-- } @@ -228,7 +228,7 @@ class MangaInfoHeaderAdapter( val artist = binding.mangaArtist.text.toString() controller.activity?.copyToClipboard( artist, - SourceTagsUtil.getWrappedTag(source.id, namespace = "artist", tag = artist) ?: artist + SourceTagsUtil.getWrappedTag(source.id, namespace = "artist", tag = artist) ?: artist, ) // SY <-- } @@ -263,7 +263,7 @@ class MangaInfoHeaderAdapter( R.string.action_share, R.string.action_save, // Can only edit cover for library manga - if (manga.favorite) R.string.action_edit else null + if (manga.favorite) R.string.action_edit else null, ).map(controller.activity!!::getString).toTypedArray() MaterialAlertDialogBuilder(controller.activity!!) @@ -322,11 +322,11 @@ class MangaInfoHeaderAdapter( // SY --> isMergedSource && hasOneActiveLanguages -> getMergedSourcesString( enabledLanguages, - true + true, ) isMergedSource -> getMergedSourcesString( enabledLanguages, - false + false, ) // SY <-- // For edge cases where user disables a source they got manga of in their library. @@ -368,7 +368,7 @@ class MangaInfoHeaderAdapter( meta, controller::performGenreSearch, controller::performGlobalSearch, - source + source, ) // SY <-- binding.mangaSummarySection.description = manga.description diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/NamespaceTagsHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/NamespaceTagsHolder.kt index d8d1d8abd..03df91cff 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/NamespaceTagsHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/NamespaceTagsHolder.kt @@ -13,7 +13,7 @@ import exh.util.makeSearchChip class NamespaceTagsHolder( view: View, - adapter: FlexibleAdapter<*> + adapter: FlexibleAdapter<*>, ) : FlexibleViewHolder(view, adapter) { val binding = MangaInfoGenreGroupingBinding.bind(view) @@ -24,7 +24,7 @@ class NamespaceTagsHolder( binding.namespace.addView( Chip(binding.root.context).apply { text = namespace - } + }, ) binding.tags.updateLayoutParams { marginStart = 8.dpToPx @@ -45,7 +45,7 @@ class NamespaceTagsHolder( item.onLongClick, item.source.id, namespace, - type + type, ) }.forEach { binding.tags.addView(it) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/NamespaceTagsItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/NamespaceTagsItem.kt index a9083b499..34d7c6f09 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/NamespaceTagsItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/NamespaceTagsItem.kt @@ -13,7 +13,7 @@ class NamespaceTagsItem( val tags: List>, val onClick: (item: String) -> Unit, val onLongClick: (item: String) -> Unit, - val source: Source + val source: Source, ) : AbstractFlexibleItem() { @@ -29,7 +29,7 @@ class NamespaceTagsItem( adapter: FlexibleAdapter>, holder: NamespaceTagsHolder, position: Int, - payloads: List? + payloads: List?, ) { holder.bind(this) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaItem.kt index 890d7cc10..863e88cce 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaItem.kt @@ -31,7 +31,7 @@ class EditMergedMangaItem(val mergedManga: Manga?, val mergedMangaReference: Mer adapter: FlexibleAdapter>?, holder: EditMergedMangaHolder, position: Int, - payloads: MutableList? + payloads: MutableList?, ) { holder.bind(this) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt index a4c47e458..177812c77 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt @@ -33,7 +33,7 @@ class EditMergedSettingsDialog : DialogController, EditMergedMangaAdapter.EditMe get() = targetController as MangaController constructor(target: MangaController, manga: Manga) : super( - bundleOf(KEY_MANGA to manga.id!!) + bundleOf(KEY_MANGA to manga.id!!), ) { targetController = target this.manga = manga diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsHeaderAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsHeaderAdapter.kt index c16a1b3f1..9b009bfc8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsHeaderAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsHeaderAdapter.kt @@ -25,7 +25,7 @@ class EditMergedSettingsHeaderAdapter(private val controller: EditMergedSettings binding = EditMergedSettingsHeaderBinding.inflate( LayoutInflater.from(parent.context), parent, - false + false, ) return HeaderViewHolder(binding.root) } @@ -45,8 +45,8 @@ class EditMergedSettingsHeaderAdapter(private val controller: EditMergedSettings itemView.context.getString(R.string.no_dedupe), itemView.context.getString(R.string.dedupe_priority).let { null }, itemView.context.getString(R.string.dedupe_most_chapters), - itemView.context.getString(R.string.dedupe_highest_chapter) - ) + itemView.context.getString(R.string.dedupe_highest_chapter), + ), ) dedupeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) binding.dedupeModeSpinner.adapter = dedupeAdapter @@ -58,7 +58,7 @@ class EditMergedSettingsHeaderAdapter(private val controller: EditMergedSettings MergedMangaReference.CHAPTER_SORT_MOST_CHAPTERS -> 1 MergedMangaReference.CHAPTER_SORT_HIGHEST_CHAPTER_NUMBER -> 2 else -> 0 - } + }, ) } binding.dedupeModeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { @@ -66,7 +66,7 @@ class EditMergedSettingsHeaderAdapter(private val controller: EditMergedSettings parent: AdapterView<*>?, view: View?, position: Int, - id: Long + id: Long, ) { controller.mergeReference?.chapterSortMode = when (position) { 0 -> MergedMangaReference.CHAPTER_SORT_NO_DEDUPE @@ -91,7 +91,7 @@ class EditMergedSettingsHeaderAdapter(private val controller: EditMergedSettings android.R.layout.simple_spinner_item, mergedMangas.map { sourceManager.getOrStub(it.second.mangaSourceId).toString() + " " + it.first?.title - } + }, ) mangaInfoAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) binding.mangaInfoSpinner.adapter = mangaInfoAdapter @@ -107,7 +107,7 @@ class EditMergedSettingsHeaderAdapter(private val controller: EditMergedSettings parent: AdapterView<*>?, view: View?, position: Int, - id: Long + id: Long, ) { val mergedInfoManga = controller.mergedMangas .find { mergedManga -> diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackChaptersDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackChaptersDialog.kt index 9ae0b03c3..bfd7e4837 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackChaptersDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackChaptersDialog.kt @@ -22,7 +22,7 @@ class SetTrackChaptersDialog : DialogController private lateinit var listener: Listener constructor(target: T, listener: Listener, item: TrackItem) : super( - bundleOf(KEY_ITEM_TRACK to item.track) + bundleOf(KEY_ITEM_TRACK to item.track), ) { targetController = target this.listener = listener diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackScoreDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackScoreDialog.kt index fd0d407d7..d7732933b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackScoreDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackScoreDialog.kt @@ -22,7 +22,7 @@ class SetTrackScoreDialog : DialogController private lateinit var listener: Listener constructor(target: T, listener: Listener, item: TrackItem) : super( - bundleOf(KEY_ITEM_TRACK to item.track) + bundleOf(KEY_ITEM_TRACK to item.track), ) { targetController = target this.listener = listener diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackStatusDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackStatusDialog.kt index 0a760d1ea..961efe6eb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackStatusDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackStatusDialog.kt @@ -20,7 +20,7 @@ class SetTrackStatusDialog : DialogController private lateinit var listener: Listener constructor(target: T, listener: Listener, item: TrackItem) : super( - bundleOf(KEY_ITEM_TRACK to item.track) + bundleOf(KEY_ITEM_TRACK to item.track), ) { targetController = target this.listener = listener diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchAdapter.kt index 338481881..e46cebcb2 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchAdapter.kt @@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.databinding.TrackSearchItemBinding class TrackSearchAdapter( private val currentTrackUrl: String?, - private val onSelectionChanged: (TrackSearch?) -> Unit + private val onSelectionChanged: (TrackSearch?) -> Unit, ) : RecyclerView.Adapter() { var selectedItemPosition = -1 set(value) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchDialog.kt index 9cbff4f90..e918ca6cd 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchDialog.kt @@ -45,7 +45,7 @@ class TrackSearchDialog : DialogController { constructor( target: MangaController, _service: TrackService, - _currentTrackUrl: String? + _currentTrackUrl: String?, ) : super(bundleOf(KEY_SERVICE to _service.id, KEY_CURRENT_URL to _currentTrackUrl)) { targetController = target service = _service diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchHolder.kt index beabf2ebe..cfd9807f6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchHolder.kt @@ -10,7 +10,7 @@ import java.util.Locale class TrackSearchHolder( private val binding: TrackSearchItemBinding, - private val adapter: TrackSearchAdapter + private val adapter: TrackSearchAdapter, ) : RecyclerView.ViewHolder(binding.root) { fun bind(track: TrackSearch, position: Int) { binding.root.isChecked = position == adapter.selectedItemPosition diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSheet.kt index a23dd4bca..cf7a2a230 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSheet.kt @@ -31,7 +31,7 @@ class TrackSheet( val controller: MangaController, val manga: Manga, val fragmentManager: FragmentManager, - private val sourceManager: SourceManager = Injekt.get() + private val sourceManager: SourceManager = Injekt.get(), ) : BaseBottomSheetDialog(controller.activity!!), TrackAdapter.OnClickListener, SetTrackStatusDialog.Listener, 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 7959adff8..eea7b91d7 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 @@ -133,7 +133,7 @@ class AboutController : SettingsController(), NoAppBarElevationController { val outputDf = DateFormat.getDateTimeInstance( DateFormat.MEDIUM, DateFormat.SHORT, - Locale.getDefault() + Locale.getDefault(), ) outputDf.timeZone = TimeZone.getDefault() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/NewUpdateDialogController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/NewUpdateDialogController.kt index 7d1521ce8..cb52be32f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/NewUpdateDialogController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/NewUpdateDialogController.kt @@ -12,7 +12,7 @@ import eu.kanade.tachiyomi.ui.base.controller.DialogController class NewUpdateDialogController(bundle: Bundle? = null) : DialogController(bundle) { constructor(update: AppUpdateResult.NewUpdate) : this( - bundleOf(BODY_KEY to update.release.info, URL_KEY to update.release.getDownloadLink()) + bundleOf(BODY_KEY to update.release.info, URL_KEY to update.release.getDownloadLink()), ) override fun onCreateDialog(savedViewState: Bundle?): Dialog { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/licenses/LicensesItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/licenses/LicensesItem.kt index 2325e5d9d..fc5a02722 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/licenses/LicensesItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/licenses/LicensesItem.kt @@ -22,7 +22,7 @@ class LicensesItem(val library: Library) : AbstractFlexibleItem( adapter: FlexibleAdapter>, holder: LicensesHolder, position: Int, - payloads: List? + payloads: List?, ) { holder.bind(library) } 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 fa750a680..d0cd94f2a 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,5 +48,5 @@ private val strokeColor = Color.rgb(45, 45, 45) // A span object with text outlining properties private 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 012d9db79..7ada13307 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 @@ -447,7 +447,7 @@ class ReaderActivity : BaseRxActivity() { action = MainActivity.SHORTCUT_MANGA putExtra(MangaController.MANGA_EXTRA, id) addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) - } + }, ) } } @@ -533,13 +533,13 @@ class ReaderActivity : BaseRxActivity() { it.foreground = RippleDrawable( ColorStateList.valueOf(getThemeColor(android.R.attr.colorControlHighlight)), null, - it.background + it.background, ) } val toolbarColor = ColorUtils.setAlphaComponent( toolbarBackground.resolvedTintColor, - toolbarBackground.alpha + toolbarBackground.alpha, ) window.statusBarColor = toolbarColor if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) { @@ -610,7 +610,7 @@ class ReaderActivity : BaseRxActivity() { R.string.on } else { R.string.off - } + }, ) } } @@ -712,7 +712,7 @@ class ReaderActivity : BaseRxActivity() { } else { it.toString() } - } + }, ) binding.ehAutoscroll.checkedChanges() @@ -722,7 +722,7 @@ class ReaderActivity : BaseRxActivity() { preferences.autoscrollInterval().get().toDouble() } else { -1.0 - } + }, ) } .launchIn(lifecycleScope) @@ -950,7 +950,7 @@ class ReaderActivity : BaseRxActivity() { R.drawable.ic_crop_24dp } else { R.drawable.ic_crop_off_24dp - } + }, ) } @@ -973,7 +973,7 @@ class ReaderActivity : BaseRxActivity() { // Fix status bar being translucent the first time it's opened. window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) } - } + }, ) // EXH --> binding.header.startAnimation(toolbarAnimation) @@ -1009,7 +1009,7 @@ class ReaderActivity : BaseRxActivity() { override fun onAnimationEnd(animation: Animation) { binding.readerMenu.isVisible = false } - } + }, ) // EXH --> binding.header.startAnimation(toolbarAnimation) @@ -1047,7 +1047,7 @@ class ReaderActivity : BaseRxActivity() { applicationContext, url, source.id, - presenter.manga!!.title + presenter.manga!!.title, ) startActivity(intent) } @@ -1069,7 +1069,7 @@ class ReaderActivity : BaseRxActivity() { if (window.sharedElementEnterTransition is MaterialContainerTransform) { // Wait until transition is complete to avoid crash on API 26 window.sharedElementEnterTransition.addListener( - onEnd = { setOrientation(presenter.getMangaOrientationType()) } + onEnd = { setOrientation(presenter.getMangaOrientationType()) }, ) } else { setOrientation(presenter.getMangaOrientationType()) @@ -1340,7 +1340,7 @@ class ReaderActivity : BaseRxActivity() { page, extraPage, (viewer !is R2LPagerViewer) xor (viewer?.config?.invertDoublePages ?: false), - viewer?.config?.pageCanvasColor + viewer?.config?.pageCanvasColor, ).show() } catch (e: WindowManager.BadTokenException) { xLogE("Caught and ignoring reader page sheet launch exception!", e) @@ -1414,7 +1414,7 @@ class ReaderActivity : BaseRxActivity() { val intent = uri.toShareIntent( context = applicationContext, - message = /* SY --> */ text /* SY <-- */ + message = /* SY --> */ text, // SY <-- ) startActivity(Intent.createChooser(intent, getString(R.string.action_share))) } @@ -1466,7 +1466,7 @@ class ReaderActivity : BaseRxActivity() { Success -> R.string.cover_updated AddToLibraryFirst -> R.string.notification_first_add_to_library Error -> R.string.notification_cover_update_failed - } + }, ) } @@ -1513,12 +1513,12 @@ class ReaderActivity : BaseRxActivity() { -1f, 0f, 0f, 0f, 255f, 0f, -1f, 0f, 0f, 255f, 0f, 0f, -1f, 0f, 255f, - 0f, 0f, 0f, 1f, 0f - ) - ) + 0f, 0f, 0f, 1f, 0f, + ), + ), ) } - } + }, ) } } @@ -1535,7 +1535,7 @@ class ReaderActivity : BaseRxActivity() { 2 -> R.color.reader_background_dark 3 -> automaticBackgroundColor() else -> android.R.color.black - } + }, ) } .launchIn(lifecycleScope) @@ -1598,7 +1598,7 @@ class ReaderActivity : BaseRxActivity() { PagerConfig.PageLayout.AUTOMATIC -> resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE else -> false }, - true + true, ) } .launchIn(lifecycleScope) 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 4638c4dd1..6266ab239 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 androidx.core.graphics.toXfermode class ReaderColorFilterView( context: Context, - attrs: AttributeSet? = null + attrs: AttributeSet? = null, ) : View(context, attrs) { private val colorFilterPaint: Paint = Paint() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt index e319c213a..b8f68cd07 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt @@ -18,7 +18,7 @@ class ReaderPageSheet( private val page: ReaderPage, private val extraPage: ReaderPage? = null, private val isLTR: Boolean = false, - private val bg: Int? = null + private val bg: Int? = null, ) : BaseBottomSheetDialog(activity) { private lateinit var binding: ReaderPageSheetBinding 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 6dd4a3e15..b6685c25b 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 @@ -115,7 +115,8 @@ class ReaderPresenter( /** * Relay for currently active viewer chapters. */ - /* [EXH] private */ val viewerChaptersRelay = BehaviorRelay.create() + /* [EXH] private */ + val viewerChaptersRelay = BehaviorRelay.create() /** * Relay used when loading prev/next chapter needed to lock the UI (with a dialog). @@ -272,7 +273,7 @@ class ReaderPresenter( { _, _ -> // Ignore onNext event }, - ReaderActivity::setInitialChapterError + ReaderActivity::setInitialChapterError, ) } @@ -312,7 +313,7 @@ class ReaderPresenter( { _, _ -> // Ignore onNext event }, - ReaderActivity::setInitialChapterError + ReaderActivity::setInitialChapterError, ) } @@ -322,7 +323,7 @@ class ReaderPresenter( val decimalFormat = DecimalFormat( "#.###", DecimalFormatSymbols() - .apply { decimalSeparator = '.' } + .apply { decimalSeparator = '.' }, ) return chapterList.map { @@ -332,7 +333,7 @@ class ReaderPresenter( it.chapter.id == currentChapter?.chapter?.id, context, preferences.dateFormat(), - decimalFormat + decimalFormat, ) } } @@ -347,7 +348,7 @@ class ReaderPresenter( */ private fun getLoadObservable( loader: ChapterLoader, - chapter: ReaderChapter + chapter: ReaderChapter, ): Observable { return loader.loadChapter(chapter) .andThen( @@ -357,9 +358,9 @@ class ReaderPresenter( ViewerChapters( chapter, chapterList.getOrNull(chapterPos - 1), - chapterList.getOrNull(chapterPos + 1) + chapterList.getOrNull(chapterPos + 1), ) - } + }, ) .observeOn(AndroidSchedulers.mainThread()) .doOnNext { newChapters -> @@ -415,7 +416,7 @@ class ReaderPresenter( }, { _, _ -> // Ignore onError event, viewers handle that state - } + }, ) } @@ -638,7 +639,7 @@ class ReaderPresenter( view.setManga(manga) view.setChapters(currChapters) } - }) + },) } /** @@ -669,7 +670,7 @@ class ReaderPresenter( if (currChapters != null) { view.setOrientation(getMangaOrientationType()) } - }) + },) } /** @@ -682,7 +683,7 @@ class ReaderPresenter( val chapter = page.chapter.chapter val filenameSuffix = " - ${page.number}" return DiskUtil.buildValidFilename( - "${manga.title} - ${chapter.name}".takeBytes(MAX_FILE_NAME_BYTES - filenameSuffix.byteSize()) + "${manga.title} - ${chapter.name}".takeBytes(MAX_FILE_NAME_BYTES - filenameSuffix.byteSize()), ) + filenameSuffix } @@ -711,8 +712,8 @@ class ReaderPresenter( image = Image.Page( inputStream = page.stream!!, name = filename, - location = Location.Pictures.create(relativePath) - ) + location = Location.Pictures.create(relativePath), + ), ) launchUI { DiskUtil.scanMedia(context, uri) @@ -748,7 +749,7 @@ class ReaderPresenter( isLTR = isLTR, bg = bg, location = Location.Pictures.create(relativePath), - manga = manga + manga = manga, ) launchUI { DiskUtil.scanMedia(context, uri) @@ -768,7 +769,7 @@ class ReaderPresenter( isLTR: Boolean, @ColorInt bg: Int, location: Location, - manga: Manga + manga: Manga, ): Uri { val stream1 = page1.stream!! ImageUtil.findImageType(stream1) ?: throw Exception("Not an image") @@ -785,15 +786,15 @@ class ReaderPresenter( // Build destination file. val filenameSuffix = " - ${page1.number}-${page2.number}.jpg" val filename = DiskUtil.buildValidFilename( - "${manga.title} - ${chapter.name}".takeBytes(MAX_FILE_NAME_BYTES - filenameSuffix.byteSize()) + "${manga.title} - ${chapter.name}".takeBytes(MAX_FILE_NAME_BYTES - filenameSuffix.byteSize()), ) + filenameSuffix return imageSaver.save( image = Image.Page( inputStream = { ImageUtil.mergeBitmaps(imageBitmap, imageBitmap2, isLTR, bg) }, name = filename, - location = location - ) + location = location, + ), ) } // SY <-- @@ -821,8 +822,8 @@ class ReaderPresenter( image = Image.Page( inputStream = page.stream!!, name = filename, - location = Location.Cache - ) + location = Location.Cache, + ), ) launchUI { view!!.onShareImageResult(uri, page) @@ -851,7 +852,7 @@ class ReaderPresenter( isLTR = isLTR, bg = bg, location = Location.Cache, - manga = manga + manga = manga, ) launchUI { view!!.onShareImageResult(uri, firstPage, secondPage) @@ -894,7 +895,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 7965ac8ba..94f857785 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 @@ -9,7 +9,7 @@ import com.google.android.material.slider.Slider */ class ReaderSlider @JvmOverloads constructor( context: Context, - attrs: AttributeSet? = null + attrs: AttributeSet? = null, ) : Slider(context, attrs) { init { 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 66f4e160e..5a9744613 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt @@ -47,7 +47,7 @@ class SaveImageNotifier(private val context: Context) { }, onError = { onError(null) - } + }, ) .build() context.imageLoader.enqueue(request) @@ -69,13 +69,13 @@ class SaveImageNotifier(private val context: Context) { addAction( R.drawable.ic_share_24dp, context.getString(R.string.action_share), - NotificationReceiver.shareImagePendingBroadcast(context, uri.path!!, notificationId) + NotificationReceiver.shareImagePendingBroadcast(context, uri.path!!, notificationId), ) // Delete action addAction( R.drawable.ic_delete_24dp, context.getString(R.string.action_delete), - NotificationReceiver.deleteImagePendingBroadcast(context, uri.path!!, notificationId) + NotificationReceiver.deleteImagePendingBroadcast(context, uri.path!!, notificationId), ) updateNotification() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterAdapter.kt index 8bd081026..21d6bad66 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterAdapter.kt @@ -4,7 +4,7 @@ import eu.davidea.flexibleadapter.FlexibleAdapter import eu.kanade.tachiyomi.data.database.models.Chapter class ReaderChapterAdapter( - dialog: OnBookmarkClickListener + dialog: OnBookmarkClickListener, ) : FlexibleAdapter(null, dialog, true) { /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterDialog.kt index 9a0d3b9a1..76dd79dee 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterDialog.kt @@ -59,7 +59,7 @@ class ReaderChapterDialog(private val activity: ReaderActivity) : ReaderChapterA if (scroll) { (binding.chapterRecycler.layoutManager as LinearLayoutManager).scrollToPositionWithOffset( adapter?.getGlobalPositionOf(chapters.find { it.isCurrent }) ?: 0, - (binding.chapterRecycler.height / 2).dpToPx + (binding.chapterRecycler.height / 2).dpToPx, ) } } 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 15f384acd..a24fd2148 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 @@ -39,7 +39,7 @@ class ReaderChapterItem(chapter: Chapter, val manga: Manga, val isCurrent: Boole adapter: FlexibleAdapter>, holder: ViewHolder, position: Int, - payloads: List? + payloads: List?, ) { holder.bind(this) } 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 892b02b28..224759e60 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 @@ -29,7 +29,7 @@ class ChapterLoader( // SY --> private val sourceManager: SourceManager, private val mergedReferences: List, - private val mergedManga: Map + private val mergedManga: Map, // SY <-- ) { @@ -68,7 +68,7 @@ class ChapterLoader( // otherwise use the requested page. if (!chapter.chapter.read /* --> EH */ || prefs .preserveReadingPosition() - .get() /* <-- EH */ + .get() // <-- EH ) { chapter.requestedPage = chapter.chapter.last_page_read } 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 faad167d5..9d6452eda 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 @@ -20,7 +20,7 @@ class DownloadPageLoader( private val chapter: ReaderChapter, private val manga: Manga, private val source: Source, - private val downloadManager: DownloadManager + private val downloadManager: DownloadManager, ) : PageLoader() { // Needed to open input streams 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 99764ac7b..611d21882 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 3a96d9eea..8c98fea79 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 @@ -32,7 +32,7 @@ class HttpPageLoader( private val source: HttpSource, private val chapterCache: ChapterCache = Injekt.get(), // SY --> - private val preferences: PreferencesHelper = Injekt.get() + private val preferences: PreferencesHelper = Injekt.get(), // SY <-- ) : PageLoader() { @@ -46,7 +46,7 @@ class HttpPageLoader( */ private val subscriptions = CompositeSubscription() - private val preloadSize = /* SY --> */ preferences.preloadSize().get() /* SY <-- */ + private val preloadSize = /* SY --> */ preferences.preloadSize().get() // SY <-- // SY --> private val dataSaver = DataSaver(source, preferences) @@ -68,7 +68,7 @@ class HttpPageLoader( if (error !is InterruptedException) { logcat(LogPriority.ERROR, error) } - } + }, ) // EXH --> } @@ -208,7 +208,7 @@ class HttpPageLoader( */ private class PriorityPage( val page: ReaderPage, - val priority: Int + val priority: Int, ) : Comparable { companion object { private val idGenerator = AtomicInteger() @@ -296,7 +296,7 @@ class HttpPageLoader( if (error !is InterruptedException) { logcat(LogPriority.ERROR, error) } - } + }, ) } } 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 3776aec34..5d9489317 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 @@ -63,7 +63,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 f06af6562..3db97c8fa 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 @@ -58,7 +58,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 96105e634..2da46e5b0 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,12 +7,12 @@ 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/ReaderPage.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/ReaderPage.kt index 1d920f093..42a39a309 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 @@ -13,7 +13,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, // SY <-- - var stream: (() -> InputStream)? = null + var stream: (() -> InputStream)? = null, ) : Page(index, url, imageUrl, null) { 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 9d4304840..6fb5905c3 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/setting/ReaderBottomButton.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderBottomButton.kt index 196e399d0..200dfc9ae 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderBottomButton.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderBottomButton.kt @@ -22,7 +22,7 @@ enum class ReaderBottomButton(val value: String, @StringRes val stringRes: Int) WebView, CropBordersPager, CropBordersContinuesVertical, - PageLayout + PageLayout, ).map { it.value }.toSet() } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt index ccb5877e0..3c5f1109d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt @@ -54,7 +54,7 @@ class ReaderSettingsSheet( activity.setMenuVisibility(!isFilterTab) } } - }) + },) 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 e53ee8b72..a85f8dc7d 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/ReaderButton.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderButton.kt index 5de966670..270d5549b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderButton.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderButton.kt @@ -14,7 +14,7 @@ import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerViewer class ReaderButton @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, - defStyleAttr: Int = R.attr.materialButtonStyle + defStyleAttr: Int = R.attr.materialButtonStyle, ) : MaterialButton(context, attrs, defStyleAttr) { var viewer: PagerViewer? = null 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 6a1a2bbe6..7e97847da 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 @@ -47,7 +47,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 @@ -102,7 +102,7 @@ open class ReaderPageImageView @JvmOverloads constructor( override fun onImageLoadError(e: Exception) { onImageLoadError() } - } + }, ) } } @@ -123,7 +123,7 @@ open class ReaderPageImageView @JvmOverloads constructor( .withEasing(EASE_IN_OUT_QUAD) .withInterruptible(true) .start() - }, 500) + }, 500,) } } @@ -233,7 +233,7 @@ open class ReaderPageImageView @JvmOverloads constructor( override fun onCenterChanged(newCenter: PointF?, origin: Int) { // Not used } - } + }, ) setOnClickListener { this@ReaderPageImageView.onViewClicked() } } @@ -254,7 +254,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) @@ -271,7 +271,7 @@ open class ReaderPageImageView @JvmOverloads constructor( override fun onImageLoadError(e: Exception) { this@ReaderPageImageView.onImageLoadError() } - } + }, ) when (image) { @@ -314,7 +314,7 @@ open class ReaderPageImageView @JvmOverloads constructor( this@ReaderPageImageView.onViewClicked() return super.onSingleTapConfirmed(e) } - } + }, ) setOnScaleChangeListener { _, _, _ -> this@ReaderPageImageView.onScaleChanged(scale) @@ -326,7 +326,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()) @@ -350,7 +350,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/ReaderProgressIndicator.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressIndicator.kt index bc9f796dc..e565ee878 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressIndicator.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressIndicator.kt @@ -19,7 +19,7 @@ import com.google.android.material.progressindicator.CircularProgressIndicator class ReaderProgressIndicator @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, - defStyleAttr: Int = 0 + defStyleAttr: Int = 0, ) : FrameLayout(context, attrs, defStyleAttr) { private val indicator: CircularProgressIndicator @@ -31,7 +31,7 @@ class ReaderProgressIndicator @JvmOverloads constructor( Animation.RELATIVE_TO_SELF, 0.5F, Animation.RELATIVE_TO_SELF, - 0.5F + 0.5F, ).apply { interpolator = LinearInterpolator() repeatCount = Animation.INFINITE 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 8f5f8d56c..658987cfd 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 @@ -78,7 +78,7 @@ abstract class ViewerConfig(preferences: PreferencesHelper, private val scope: C fun Preference.register( valueAssignment: (T) -> Unit, - onChanged: (T) -> Unit = {} + onChanged: (T) -> Unit = {}, ) { asFlow() .onEach { valueAssignment(it) } 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 6e0775820..224747466 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 @@ -19,12 +19,12 @@ abstract class ViewerNavigation { data class Region( val rectF: RectF, - val type: NavigationRegion + val type: NavigationRegion, ) { fun invert(invertMode: PreferenceValues.TappingInvertMode): Region { if (invertMode == PreferenceValues.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 c06c703a3..7440b1e35 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 43c081f87..21bf053eb 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 6d3390818..8f94a6100 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 f0df1afa2..b660000f2 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 5d6f959cc..87c1e1678 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 836686577..87b2b9f1a 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( private val viewer: PagerViewer, scope: CoroutineScope, - preferences: PreferencesHelper = Injekt.get() + preferences: PreferencesHelper = Injekt.get(), ) : ViewerConfig(preferences, scope) { var theme = preferences.readerTheme().get() @@ -79,7 +79,7 @@ class PagerConfig( theme = it automaticBackground = it == 3 }, - { imagePropertyChangedListener?.invoke() } + { imagePropertyChangedListener?.invoke() }, ) preferences.imageScaleType() @@ -113,7 +113,7 @@ class PagerConfig( { imagePropertyChangedListener?.invoke() dualPageSplitChangedListener?.invoke(it) - } + }, ) preferences.dualPageInvertPaged() @@ -130,7 +130,7 @@ class PagerConfig( { themeToColor(it) reloadChapterListener?.invoke(doublePages) - } + }, ) preferences.pageLayout() .register( @@ -146,7 +146,7 @@ class PagerConfig( doublePages = it == PageLayout.DOUBLE_PAGES && dualPageSplit == false } reloadChapterListener?.invoke(doublePages) - } + }, ) preferences.invertDoublePages() 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 51023361e..41964ffd8 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 @@ -37,7 +37,7 @@ class PagerPageHolder( readerThemedContext: Context, val viewer: PagerViewer, val page: ReaderPage, - private var extraPage: ReaderPage? = null + private var extraPage: ReaderPage? = null, ) : ReaderPageImageView(readerThemedContext), ViewPagerAdapter.PositionableView { /** @@ -322,7 +322,7 @@ class PagerPageHolder( cropBorders = viewer.config.imageCropBorders, zoomStartPosition = viewer.config.imageZoomType, landscapeZoom = viewer.config.landscapeZoom, - ) + ), ) if (!isAnimated) { pageBackground = background 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 3f97a212d..9f712c2da 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 @@ -27,7 +27,7 @@ import rx.android.schedulers.AndroidSchedulers class PagerTransitionHolder( readerThemedContext: Context, val viewer: PagerViewer, - val transition: ChapterTransition + val transition: ChapterTransition, ) : LinearLayout(readerThemedContext), 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 80ced05b2..7f75a7d87 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 @@ -50,7 +50,8 @@ abstract class PagerViewer(val activity: ReaderActivity) : BaseViewer { /** * Currently active item. It can be a chapter page or a chapter transition. */ - /* [EXH] private */ var currentPage: Any? = null + /* [EXH] private */ + var currentPage: Any? = null /** * Viewer chapters to set when the pager enters idle mode. Otherwise, if the view was settling @@ -95,7 +96,7 @@ abstract class PagerViewer(val activity: ReaderActivity) : BaseViewer { pager.adapter = adapter pager.addOnPageChangeListener( // SY --> - pagerListener + pagerListener, // SY <-- ) pager.tapListener = f@{ event -> @@ -312,7 +313,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 != null + joinedItem?.second != null, ) } } 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 24bedea80..96a2015a5 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 @@ -195,7 +195,7 @@ class PagerViewerAdapter(private val viewer: PagerViewer) : ViewPagerAdapter() { val placeAtIndex = when (viewer) { is L2RPagerViewer, - is VerticalPagerViewer -> currentIndex + 1 + is VerticalPagerViewer, -> currentIndex + 1 else -> currentIndex } @@ -278,7 +278,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 { @@ -317,7 +317,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 { @@ -370,7 +370,7 @@ class PagerViewerAdapter(private val viewer: PagerViewer) : ViewPagerAdapter() { oldCurrent?.second ?: oldCurrent?.first ) as? ReaderPage - )?.index ?: 0 + )?.index ?: 0, ) // The listener may be removed when we split a page, so the ui may not have updated properly 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 4a484035f..6877cf602 100755 --- 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 @@ -149,7 +149,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 eff894517..394f44d48 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 a291d5561..dd4879cfb 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 @@ -20,7 +20,7 @@ import uy.kohesive.injekt.api.get */ class WebtoonConfig( scope: CoroutineScope, - preferences: PreferencesHelper = Injekt.get() + preferences: PreferencesHelper = Injekt.get(), ) : ViewerConfig(preferences, scope) { var themeChangedListener: (() -> Unit)? = null 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 6afa36cc2..fe9c9e628 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 @@ -79,7 +79,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 45d3e8618..1b9abf6c7 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 @@ -35,7 +35,7 @@ import java.util.concurrent.TimeUnit */ class WebtoonPageHolder( private val frame: ReaderPageImageView, - viewer: WebtoonViewer + viewer: WebtoonViewer, ) : WebtoonBaseHolder(frame, viewer) { /** @@ -260,8 +260,8 @@ class WebtoonPageHolder( ReaderPageImageView.Config( zoomDuration = viewer.config.doubleTapAnimDuration, minimumScaleType = SubsamplingScaleImageView.SCALE_TYPE_FIT_WIDTH, - cropBorders = (viewer.config.imageCropBorders && viewer.isContinuous) || (viewer.config.continuousCropBorders && !viewer.isContinuous) - ) + cropBorders = (viewer.config.imageCropBorders && viewer.isContinuous) || (viewer.config.continuousCropBorders && !viewer.isContinuous), + ), ) } // 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 b13c2a66c..863daa7c6 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 @@ -20,7 +20,7 @@ import kotlin.math.abs open class WebtoonRecyclerView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, - defStyle: Int = 0 + defStyle: Int = 0, ) : RecyclerView(context, attrs, defStyle) { private var isZooming = false @@ -107,7 +107,7 @@ open class WebtoonRecyclerView @JvmOverloads constructor( fromX: Float, toX: Float, fromY: Float, - toY: Float + toY: Float, ) { isZooming = true val animatorSet = AnimatorSet() @@ -179,7 +179,7 @@ open class WebtoonRecyclerView @JvmOverloads constructor( // SY --> minRate, // SY <-- - 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 88f916161..328d6725a 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 d14f5bc0a..cad1cd218 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 6645b63b0..5f34c77a2 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 @@ -67,7 +67,8 @@ class WebtoonViewer(val activity: ReaderActivity, val isContinuous: Boolean = tr /** * Currently active item. It can be a chapter page or a chapter transition. */ - /* [EXH] private */ var currentPage: Any? = null + /* [EXH] private */ + var currentPage: Any? = null /** * Subscriptions to keep while this viewer is used. @@ -104,7 +105,7 @@ class WebtoonViewer(val activity: ReaderActivity, val isContinuous: Boolean = tr } } } - } + }, ) recycler.tapListener = f@{ event -> if (!config.tappingEnabled) { @@ -292,7 +293,8 @@ class WebtoonViewer(val activity: ReaderActivity, val isContinuous: Boolean = tr /** * Scrolls down by [scrollDistance]. */ - /* [EXH] private */ fun scrollDown() { + /* [EXH] private */ + fun scrollDown() { // SY --> if (!isContinuous && tapByPage) { val currentPage = currentPage @@ -347,11 +349,13 @@ class WebtoonViewer(val activity: ReaderActivity, val isContinuous: Boolean = tr KeyEvent.KEYCODE_DPAD_LEFT, KeyEvent.KEYCODE_DPAD_UP, - KeyEvent.KEYCODE_PAGE_UP -> if (isUp) scrollUp() + KeyEvent.KEYCODE_PAGE_UP, + -> if (isUp) scrollUp() KeyEvent.KEYCODE_DPAD_RIGHT, KeyEvent.KEYCODE_DPAD_DOWN, - KeyEvent.KEYCODE_PAGE_DOWN -> if (isUp) scrollDown() + KeyEvent.KEYCODE_PAGE_DOWN, + -> if (isUp) scrollDown() else -> return false } return true @@ -374,7 +378,7 @@ class WebtoonViewer(val activity: ReaderActivity, val isContinuous: Boolean = tr adapter.refresh() 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/recent/history/HistoryAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryAdapter.kt index 3042d7ca7..8c1a88ec8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryAdapter.kt @@ -30,7 +30,7 @@ class HistoryAdapter(controller: HistoryController) : val decimalFormat = DecimalFormat( "#.###", DecimalFormatSymbols() - .apply { decimalSeparator = '.' } + .apply { decimalSeparator = '.' }, ) init { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryController.kt index e0b8a206a..333dea3d4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryController.kt @@ -211,7 +211,7 @@ class HistoryController : // Fixes problem with the overflow icon showing up in lieu of search searchItem.fixExpand( - onExpand = { invalidateMenuOnExpand() } + onExpand = { invalidateMenuOnExpand() }, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryHolder.kt index 6ef3a38cd..8164e5cc8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryHolder.kt @@ -21,7 +21,7 @@ import java.util.Date */ class HistoryHolder( view: View, - val adapter: HistoryAdapter + val adapter: HistoryAdapter, ) : FlexibleViewHolder(view, adapter) { private val binding = HistoryItemBinding.bind(view) @@ -58,7 +58,7 @@ class HistoryHolder( binding.mangaSubtitle.text = itemView.context.getString( R.string.recent_manga_time, formattedNumber, - Date(history.last_read).toTimestampString() + Date(history.last_read).toTimestampString(), ) } else { binding.mangaSubtitle.text = Date(history.last_read).toTimestampString() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryItem.kt index 9a10529b2..58f9e0cc2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryItem.kt @@ -24,7 +24,7 @@ class HistoryItem(val mch: MangaChapterHistory, header: DateSectionItem) : adapter: FlexibleAdapter>, holder: HistoryHolder, position: Int, - payloads: List? + payloads: List?, ) { holder.bind(mch) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryPresenter.kt index 1c03d5fd9..e8feb084d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryPresenter.kt @@ -47,7 +47,7 @@ class HistoryPresenter : BasePresenter() { { view, mangas -> view.onNextManga(mangas) }, - HistoryController::onAddPageError + HistoryController::onAddPageError, ) } @@ -96,7 +96,7 @@ class HistoryPresenter : BasePresenter() { { view, mangas -> view.onNextManga(mangas, true) }, - HistoryController::onAddPageError + HistoryController::onAddPageError, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesAdapter.kt index 70b131225..c0b9f7eb2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesAdapter.kt @@ -9,7 +9,7 @@ import eu.kanade.tachiyomi.util.system.getResourceColor class UpdatesAdapter( val controller: UpdatesController, context: Context, - val items: List>? + val items: List>?, ) : BaseChaptersAdapter>(controller, items) { var readColor = context.getResourceColor(R.attr.colorOnSurface, 0.38f) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesHolder.kt index 8fcdd22e0..25f2c4dd6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesHolder.kt @@ -46,7 +46,7 @@ class UpdatesHolder(private val view: View, private val adapter: UpdatesAdapter) } else { binding.mangaTitle.setTextColor(adapter.unreadColor) binding.chapterTitle.setTextColor( - if (item.bookmark) adapter.bookmarkedColor else adapter.unreadColorSecondary + if (item.bookmark) adapter.bookmarkedColor else adapter.unreadColorSecondary, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesItem.kt index 1f25244b5..d5d900616 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesItem.kt @@ -25,7 +25,7 @@ class UpdatesItem(chapter: Chapter, val manga: Manga, header: DateSectionItem) : adapter: FlexibleAdapter>, holder: UpdatesHolder, position: Int, - payloads: List? + payloads: List?, ) { holder.bind(this) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesPresenter.kt index a22003a5a..3fa69379e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesPresenter.kt @@ -55,7 +55,7 @@ class UpdatesPresenter : BasePresenter() { }, { _, error -> logcat(LogPriority.ERROR, error) - } + }, ) downloadManager.queue.getProgressObservable() @@ -180,7 +180,7 @@ class UpdatesPresenter : BasePresenter() { { view, _ -> view.onChaptersDeleted() }, - UpdatesController::onChaptersDeletedError + UpdatesController::onChaptersDeletedError, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/security/UnlockActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/security/UnlockActivity.kt index 40247b871..a066bf64d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/security/UnlockActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/security/UnlockActivity.kt @@ -26,7 +26,7 @@ class UnlockActivity : BaseActivity() { override fun onAuthenticationError( activity: FragmentActivity?, errorCode: Int, - errString: CharSequence + errString: CharSequence, ) { super.onAuthenticationError(activity, errorCode, errString) logcat(LogPriority.ERROR) { errString.toString() } @@ -35,14 +35,14 @@ class UnlockActivity : BaseActivity() { override fun onAuthenticationSucceeded( activity: FragmentActivity?, - result: BiometricPrompt.AuthenticationResult + result: BiometricPrompt.AuthenticationResult, ) { super.onAuthenticationSucceeded(activity, result) SecureActivityDelegate.locked = false preferences.lastAppUnlock().set(Date().time) finish() } - } + }, ) } } 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 4c16b6d2b..da76c3c65 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 @@ -425,7 +425,7 @@ class SettingsAdvancedController : SettingsController() { .setPositiveButton(android.R.string.ok) { _, _ -> (targetController as? SettingsAdvancedController)?.cleanupDownloads( selected[1], - selected[2] + selected[2], ) } .setNegativeButton(android.R.string.cancel, null) @@ -467,7 +467,7 @@ class SettingsAdvancedController : SettingsController() { else resources!!.getQuantityString( R.plurals.cleanup_done, foldersCleared, - foldersCleared + foldersCleared, ) activity.toast(cleanupString, Toast.LENGTH_LONG) } 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 1811e516d..1cf073d99 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 @@ -41,21 +41,21 @@ class SettingsAppearanceController : SettingsController() { entriesRes = arrayOf( R.string.theme_system, R.string.theme_light, - R.string.theme_dark + R.string.theme_dark, ) entryValues = arrayOf( Values.ThemeMode.system.name, Values.ThemeMode.light.name, - Values.ThemeMode.dark.name + Values.ThemeMode.dark.name, ) } else { entriesRes = arrayOf( R.string.theme_light, - R.string.theme_dark + R.string.theme_dark, ) entryValues = arrayOf( Values.ThemeMode.light.name, - Values.ThemeMode.dark.name + Values.ThemeMode.dark.name, ) } 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 765668124..72afea477 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 @@ -114,7 +114,7 @@ class SettingsBackupController : SettingsController() { R.string.update_12hour, R.string.update_24hour, R.string.update_48hour, - R.string.update_weekly + R.string.update_weekly, ) entryValues = arrayOf("0", "6", "12", "24", "48", "168") summary = "%s" @@ -231,7 +231,7 @@ class SettingsBackupController : SettingsController() { R.string.history, // SY --> R.string.custom_manga_info, - R.string.all_read_manga + R.string.all_read_manga, // SY <-- ) .map { activity.getString(it) } @@ -272,7 +272,7 @@ class SettingsBackupController : SettingsController() { class RestoreBackupDialog(bundle: Bundle? = null) : DialogController(bundle) { constructor(uri: Uri) : this( - bundleOf(KEY_URI to uri) + bundleOf(KEY_URI to uri), ) override fun onCreateDialog(savedViewState: Bundle?): Dialog { 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 ea12889e1..82c7cc839 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 @@ -89,7 +89,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, ) entryValues = arrayOf("-1", "0", "1", "2", "3", "4") defaultValue = "-1" @@ -266,7 +266,7 @@ class SettingsDownloadController : SettingsController() { .setQuadStateMultiChoiceItems( message = R.string.pref_download_new_categories_details, items = items, - initialSelected = selected + initialSelected = selected, ) { selections -> selected = selections } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt index f1b06363f..925a86e7a 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt @@ -121,7 +121,7 @@ class SettingsEhController : SettingsController() { summaryRes = R.string.use_hentai_at_home_summary entriesRes = arrayOf( R.string.use_hentai_at_home_option_1, - R.string.use_hentai_at_home_option_2 + R.string.use_hentai_at_home_option_2, ) entryValues = arrayOf("0", "1") @@ -299,7 +299,7 @@ class SettingsEhController : SettingsController() { R.string.eh_image_quality_1600, R.string.eh_image_quality_1280, R.string.eh_image_quality_980, - R.string.eh_image_quality_780 + R.string.eh_image_quality_780, ) entryValues = arrayOf( "auto", @@ -307,7 +307,7 @@ class SettingsEhController : SettingsController() { "ovrs_1600", "high", "med", - "low" + "low", ) onChange { preferences.imageQuality().reconfigure() } @@ -387,7 +387,7 @@ class SettingsEhController : SettingsController() { R.string.time_between_batches_6_hours, R.string.time_between_batches_12_hours, R.string.time_between_batches_24_hours, - R.string.time_between_batches_48_hours + R.string.time_between_batches_48_hours, ) entryValues = arrayOf("0", "1", "2", "3", "6", "12", "24", "48") @@ -491,7 +491,7 @@ class SettingsEhController : SettingsController() { metaInRelativeDuration(2.days), metaInRelativeDuration(7.days), metaInRelativeDuration(30.days), - metaInRelativeDuration(365.days) + metaInRelativeDuration(365.days), ) } finally { progress.dismiss() @@ -589,7 +589,7 @@ class SettingsEhController : SettingsController() { var hours: Long? = null, var minutes: Long? = null, var seconds: Long? = null, - var milliseconds: Long? = null + var milliseconds: Long? = null, ) override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { 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 c0934a1b5..5b2f5a470 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 @@ -29,7 +29,7 @@ class SettingsGeneralController : SettingsController() { R.string.label_library, R.string.label_recent_updates, R.string.label_recent_manga, - R.string.browse + R.string.browse, ) entryValues = arrayOf("1", "3", "2", "4") defaultValue = "1" 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 5e5f8aed3..5fe796b03 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 @@ -171,7 +171,7 @@ class SettingsLibraryController : SettingsController() { R.string.update_24hour, R.string.update_48hour, R.string.update_72hour, - R.string.update_weekly + R.string.update_weekly, ) entryValues = arrayOf("0", "12", "24", "48", "72", "168") summary = "%s" @@ -301,12 +301,12 @@ class SettingsLibraryController : SettingsController() { entriesRes = arrayOf( R.string.library_group_updates_global, R.string.library_group_updates_all_but_ungrouped, - R.string.library_group_updates_all + R.string.library_group_updates_all, ) entryValues = arrayOf( GroupLibraryMode.GLOBAL.name, GroupLibraryMode.ALL_BUT_UNGROUPED.name, - GroupLibraryMode.ALL.name + GroupLibraryMode.ALL.name, ) summary = "%s" } @@ -414,9 +414,11 @@ class SettingsLibraryController : SettingsController() { .map { when (it.id.toString()) { in preferences.libraryUpdateCategories() - .get() -> QuadStateTextView.State.CHECKED.ordinal + .get(), + -> QuadStateTextView.State.CHECKED.ordinal in preferences.libraryUpdateCategoriesExclude() - .get() -> QuadStateTextView.State.INVERSED.ordinal + .get(), + -> QuadStateTextView.State.INVERSED.ordinal else -> QuadStateTextView.State.UNCHECKED.ordinal } } @@ -427,7 +429,7 @@ class SettingsLibraryController : SettingsController() { .setQuadStateMultiChoiceItems( message = R.string.pref_library_update_categories_details, items = items, - initialSelected = selected + initialSelected = selected, ) { selections -> selected = selections } 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 84c04bc9c..a7663a82e 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 @@ -130,7 +130,7 @@ class SettingsMainController : SettingsController() { override fun onMenuItemActionCollapse(item: MenuItem?): Boolean { return true } - } + }, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMangaDexController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMangaDexController.kt index 46d0d94d3..a967ad565 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMangaDexController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMangaDexController.kt @@ -70,7 +70,7 @@ class SettingsMangaDexController : // .setMessage(R.string.mangadex_sync_follows_to_library_message) .setMultiChoiceItems( items, - selection + selection, ) { _, which, selected -> selection[which] = selected } @@ -78,11 +78,11 @@ class SettingsMangaDexController : preferences.mangadexSyncToLibraryIndexes().set( items.filterIndexed { index, _ -> selection[index] } .mapIndexed { index, _ -> (index + 1).toString() } - .toSet() + .toSet(), ) LibraryUpdateService.start( context, - target = LibraryUpdateService.Target.SYNC_FOLLOWS + target = LibraryUpdateService.Target.SYNC_FOLLOWS, ) } .setNegativeButton(android.R.string.cancel, null) @@ -97,7 +97,7 @@ class SettingsMangaDexController : onClick { LibraryUpdateService.start( context, - target = LibraryUpdateService.Target.PUSH_FAVORITES + target = LibraryUpdateService.Target.PUSH_FAVORITES, ) } } 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 bd5e72d4f..d9afb0a85 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 @@ -43,7 +43,7 @@ class SettingsReaderController : SettingsController() { R.string.right_to_left_viewer, R.string.vertical_viewer, R.string.webtoon_viewer, - R.string.vertical_plus_viewer + R.string.vertical_plus_viewer, ) entryValues = ReadingModeType.values().drop(1) .map { value -> "${value.flagValue}" }.toTypedArray() @@ -184,13 +184,13 @@ class SettingsReaderController : SettingsController() { R.string.tapping_inverted_none, R.string.tapping_inverted_horizontal, R.string.tapping_inverted_vertical, - R.string.tapping_inverted_both + R.string.tapping_inverted_both, ) entryValues = arrayOf( TappingInvertMode.NONE.name, TappingInvertMode.HORIZONTAL.name, TappingInvertMode.VERTICAL.name, - TappingInvertMode.BOTH.name + TappingInvertMode.BOTH.name, ) summary = "%s" @@ -205,7 +205,7 @@ class SettingsReaderController : SettingsController() { R.string.scale_type_fit_width, R.string.scale_type_fit_height, R.string.scale_type_original_size, - R.string.scale_type_smart_fit + R.string.scale_type_smart_fit, ) entryValues = arrayOf("1", "2", "3", "4", "5", "6") summary = "%s" @@ -222,7 +222,7 @@ class SettingsReaderController : SettingsController() { R.string.zoom_start_automatic, R.string.zoom_start_left, R.string.zoom_start_right, - R.string.zoom_start_center + R.string.zoom_start_center, ) entryValues = arrayOf("1", "2", "3", "4") summary = "%s" @@ -272,13 +272,13 @@ class SettingsReaderController : SettingsController() { R.string.tapping_inverted_none, R.string.tapping_inverted_horizontal, R.string.tapping_inverted_vertical, - R.string.tapping_inverted_both + R.string.tapping_inverted_both, ) entryValues = arrayOf( TappingInvertMode.NONE.name, TappingInvertMode.HORIZONTAL.name, TappingInvertMode.VERTICAL.name, - TappingInvertMode.BOTH.name + TappingInvertMode.BOTH.name, ) summary = "%s" @@ -293,7 +293,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 = arrayOf("0", "5", "10", "15", "20", "25") summary = "%s" @@ -305,7 +305,7 @@ class SettingsReaderController : SettingsController() { R.string.pref_highest, R.string.pref_high, R.string.pref_low, - R.string.pref_lowest + R.string.pref_lowest, ) entryValues = PreferenceValues.ReaderHideThreshold.values() .map { it.name } @@ -412,7 +412,7 @@ class SettingsReaderController : SettingsController() { R.string.reader_preload_amount_12_pages, R.string.reader_preload_amount_14_pages, R.string.reader_preload_amount_16_pages, - R.string.reader_preload_amount_20_pages + R.string.reader_preload_amount_20_pages, ) summaryRes = R.string.reader_preload_amount_summary } @@ -444,7 +444,7 @@ class SettingsReaderController : SettingsController() { "3500", "4000", "4500", - "5000" + "5000", ) entries = arrayOf( "50 MB", @@ -462,7 +462,7 @@ class SettingsReaderController : SettingsController() { "3.5 GB", "4 GB", "4.5 GB", - "5 GB" + "5 GB", ) summaryRes = R.string.reader_cache_size_summary } @@ -508,7 +508,7 @@ class SettingsReaderController : SettingsController() { entriesRes = arrayOf( R.string.single_page, R.string.double_pages, - R.string.automatic_orientation + R.string.automatic_orientation, ) entryValues = arrayOf("0", "1", "2") } @@ -537,7 +537,7 @@ class SettingsReaderController : SettingsController() { .setTitle(R.string.reader_bottom_buttons) .setMultiChoiceItems( values.map { activity!!.getString(it.stringRes) }.toTypedArray(), - selection + selection, ) { _, which, selected -> selection[which] = selected } 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 a4a3e3856..a988527d5 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 @@ -72,7 +72,7 @@ class SettingsSecurityController : SettingsController() { callback = object : AuthenticatorUtil.AuthenticationCallback() { override fun onAuthenticationSucceeded( activity: FragmentActivity?, - result: BiometricPrompt.AuthenticationResult + result: BiometricPrompt.AuthenticationResult, ) { super.onAuthenticationSucceeded(activity, result) value = newValue as String @@ -81,12 +81,12 @@ class SettingsSecurityController : SettingsController() { override fun onAuthenticationError( activity: FragmentActivity?, errorCode: Int, - errString: CharSequence + errString: CharSequence, ) { super.onAuthenticationError(activity, errorCode, errString) activity?.toast(errString.toString()) } - } + }, ) false } @@ -152,7 +152,7 @@ class SettingsSecurityController : SettingsController() { R.string.wednesday, R.string.thursday, R.string.friday, - R.string.saturday + R.string.saturday, ) .map { activity.getString(it) } .toTypedArray() @@ -175,7 +175,7 @@ class SettingsSecurityController : SettingsController() { .setTitle(R.string.biometric_lock_days) .setMultiChoiceItems( options, - selection + selection, ) { _, which, selected -> selection[which] = selected } 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 4966b0582..f48068dad 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 @@ -95,7 +95,7 @@ class SettingsTrackingController : private inline fun PreferenceGroup.trackPreference( service: TrackService, - crossinline login: () -> Unit + crossinline login: () -> Unit, ): TrackerPreference { return add( TrackerPreference(context).apply { @@ -117,7 +117,7 @@ class SettingsTrackingController : login() } } - } + }, ) } 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 c15e1152e..e9d62c6b3 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 @@ -151,7 +151,7 @@ class ClearDatabaseController : override fun onCreateDialog(savedViewState: Bundle?): Dialog { val item = arrayOf( activity!!.getString(R.string.clear_database_confirmation), - activity!!.getString(R.string.clear_db_exclude_read) + activity!!.getString(R.string.clear_db_exclude_read), ) val selected = booleanArrayOf(true, true) return MaterialAlertDialogBuilder(activity!!) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/eh/FrontPageCategoriesDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/eh/FrontPageCategoriesDialog.kt index 323519a50..bcf9fe264 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/eh/FrontPageCategoriesDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/eh/FrontPageCategoriesDialog.kt @@ -15,7 +15,7 @@ import eu.kanade.tachiyomi.ui.setting.SettingsEhController import uy.kohesive.injekt.injectLazy class FrontPageCategoriesDialog( - bundle: Bundle? = null + bundle: Bundle? = null, ) : DialogController(bundle) { var binding: EhDialogCategoriesBinding? = null @@ -75,8 +75,8 @@ class FrontPageCategoriesDialog( (!imageSetCheckbox.isChecked), (!cosplayCheckbox.isChecked), (!asianPornCheckbox.isChecked), - (!miscCheckbox.isChecked) - ).joinToString(separator = ",") { it.toString() } + (!miscCheckbox.isChecked), + ).joinToString(separator = ",") { it.toString() }, ) } with(targetController as? SettingsEhController ?: return) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/eh/LanguagesDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/eh/LanguagesDialog.kt index 821ab2321..0eec71d09 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/eh/LanguagesDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/eh/LanguagesDialog.kt @@ -15,7 +15,7 @@ import eu.kanade.tachiyomi.ui.setting.SettingsEhController import uy.kohesive.injekt.injectLazy class LanguagesDialog( - bundle: Bundle? = null + bundle: Bundle? = null, ) : DialogController(bundle) { var binding: EhDialogLanguagesBinding? = null @@ -163,7 +163,7 @@ class LanguagesDialog( "${thaiOriginal.isChecked}*${thaiTranslated.isChecked}*${thaiRewrite.isChecked}", "${vietnameseOriginal.isChecked}*${vietnameseTranslated.isChecked}*${vietnameseRewrite.isChecked}", "${notAvailableOriginal.isChecked}*${notAvailableTranslated.isChecked}*${notAvailableRewrite.isChecked}", - "${otherOriginal.isChecked}*${otherTranslated.isChecked}*${otherRewrite.isChecked}" + "${otherOriginal.isChecked}*${otherTranslated.isChecked}*${otherRewrite.isChecked}", ).joinToString("\n") } 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 4c80c9159..2d749363c 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 0cef27e87..462042abc 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 @@ -82,7 +82,7 @@ class SettingsSearchController : router.popCurrentController() return false } - } + }, ) searchView.setOnQueryTextListener( @@ -96,7 +96,7 @@ class SettingsSearchController : setItems(getResultSet(newText)) return false } - } + }, ) searchView.setQuery(presenter.preferences.lastSearchQuerySearchSettings().get(), 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 f5a13ccd9..e2284a6d6 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 @@ -47,7 +47,7 @@ object SettingsSearchHelper { SettingsLibraryController::class, SettingsReaderController::class, SettingsSecurityController::class, - SettingsTrackingController::class + SettingsTrackingController::class, ) val preferences = Injekt.get() if (MdUtil.getEnabledMangaDexs(preferences).isNotEmpty()) { @@ -100,7 +100,7 @@ object SettingsSearchHelper { private fun getSettingSearchResult( ctrl: SettingsController, pref: Preference, - breadcrumbs: String = "" + breadcrumbs: String = "", ) { when { pref is PreferenceGroup -> { @@ -132,8 +132,8 @@ object SettingsSearchHelper { title = title, summary = summary, breadcrumb = breadcrumbsStr, - searchController = ctrl - ) + searchController = ctrl, + ), ) } } @@ -154,6 +154,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 137e6b834..092e0178d 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 @@ -15,7 +15,7 @@ import eu.kanade.tachiyomi.R */ class SettingsSearchItem( val settingsSearchResult: SettingsSearchHelper.SettingsSearchResult, - val results: List? + val results: List?, ) : AbstractFlexibleItem() { @@ -30,7 +30,7 @@ class SettingsSearchItem( */ override fun createViewHolder( view: View, - adapter: FlexibleAdapter> + adapter: FlexibleAdapter>, ): SettingsSearchHolder { return SettingsSearchHolder(view, adapter as SettingsSearchAdapter) } @@ -39,7 +39,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 1f73aac83..2c665a6bd 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 : BaseActivity() { 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/setting/track/TrackLoginDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/TrackLoginDialog.kt index 62e287f94..9ebe27fa6 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/TrackLoginDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/TrackLoginDialog.kt @@ -16,7 +16,7 @@ import uy.kohesive.injekt.api.get class TrackLoginDialog( @StringRes usernameLabelRes: Int? = null, - bundle: Bundle? = null + bundle: Bundle? = null, ) : LoginDialogPreference(usernameLabelRes, bundle) { private val service = Injekt.get().getService(args.getInt("serviceId"))!! 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 c4e5f135f..5e7e0b55b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/CrashLogUtil.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/CrashLogUtil.kt @@ -60,12 +60,12 @@ class CrashLogUtil(private val context: Context) { addAction( R.drawable.ic_folder_24dp, context.getString(R.string.action_open_log), - NotificationReceiver.openErrorLogPendingActivity(context, uri) + NotificationReceiver.openErrorLogPendingActivity(context, uri), ) addAction( R.drawable.ic_share_24dp, context.getString(R.string.action_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/chapter/ChapterSourceSync.kt b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt index 1001d55d7..abd0199f5 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 @@ -26,7 +26,7 @@ fun syncChaptersWithSource( db: DatabaseHelper, rawSourceChapters: List, manga: Manga, - source: Source + source: Source, ): Pair, List> { if (rawSourceChapters.isEmpty()) { throw NoChaptersException() diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/lang/DateExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/lang/DateExtensions.kt index 33368e44a..3cf59811e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/lang/DateExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/lang/DateExtensions.kt @@ -67,7 +67,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), ) } } @@ -92,7 +92,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), ) } } @@ -102,7 +102,7 @@ private const val MILLISECONDS_IN_DAY = 86_400_000L fun Date.toRelativeString( context: Context, range: Int = 7, - dateFormat: DateFormat = DateFormat.getDateInstance(DateFormat.SHORT) + dateFormat: DateFormat = DateFormat.getDateInstance(DateFormat.SHORT), ): String { if (range == 0) { return dateFormat.format(this) @@ -116,7 +116,7 @@ fun Date.toRelativeString( difference < MILLISECONDS_IN_DAY.times(range) -> context.resources.getQuantityString( R.plurals.relative_time, days, - days + days, ) else -> dateFormat.format(this) } 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 a89063208..32d2a2d2e 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 bc1d9a801..8d368cbc6 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/RxCoroutineBridge.kt b/app/src/main/java/eu/kanade/tachiyomi/util/lang/RxCoroutineBridge.kt index 50f6d02ff..391a9a14e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/lang/RxCoroutineBridge.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/lang/RxCoroutineBridge.kt @@ -35,24 +35,24 @@ private suspend fun Observable.awaitOne(): T = suspendCancellableCoroutin override fun onCompleted() { if (cont.isActive) cont.resumeWithException( IllegalStateException( - "Should have invoked onNext" - ) + "Should have invoked onNext", + ), ) } override fun onError(e: Throwable) { -/* - * Rx1 observable throws NoSuchElementException if cancellation happened before - * element emission. To mitigate this we try to atomically resume continuation with exception: - * if resume failed, then we know that continuation successfully cancelled itself - */ + /* + * Rx1 observable throws NoSuchElementException if cancellation happened before + * element emission. To mitigate this we try to atomically resume continuation with exception: + * if resume failed, then we know that continuation successfully cancelled itself + */ val token = cont.tryResumeWithException(e) if (token != null) { cont.completeResume(token) } } - } - ) + }, + ), ) } @@ -80,6 +80,6 @@ fun runAsObservable( } emitter.setCancellation { job.cancel() } }, - backpressureMode + backpressureMode, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/preference/PreferenceDSL.kt b/app/src/main/java/eu/kanade/tachiyomi/util/preference/PreferenceDSL.kt index 0b648a137..772399b1a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/preference/PreferenceDSL.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/preference/PreferenceDSL.kt @@ -44,7 +44,7 @@ inline fun PreferenceGroup.infoPreference(@StringRes infoRes: Int): Preference { iconTint = context.getResourceColor(android.R.attr.textColorHint) summaryRes = infoRes isSelectable = false - } + }, ) } @@ -142,7 +142,7 @@ inline fun SwitchPreferenceCompat.requireAuthentication(activity: FragmentActivi callback = object : AuthenticatorUtil.AuthenticationCallback() { override fun onAuthenticationSucceeded( activity: FragmentActivity?, - result: BiometricPrompt.AuthenticationResult + result: BiometricPrompt.AuthenticationResult, ) { super.onAuthenticationSucceeded(activity, result) isChecked = newValue as Boolean @@ -151,12 +151,12 @@ inline fun SwitchPreferenceCompat.requireAuthentication(activity: FragmentActivi override fun onAuthenticationError( activity: FragmentActivity?, errorCode: Int, - errString: CharSequence + errString: CharSequence, ) { super.onAuthenticationError(activity, errorCode, errString) activity?.toast(errString.toString()) } - } + }, ) } 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 c0e8a971d..f33c11566 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 @@ -31,7 +31,7 @@ object AuthenticatorUtil { title: String, subtitle: String? = null, confirmationRequired: Boolean = true, - callback: AuthenticationCallback + callback: AuthenticationCallback, ) { isAuthenticating = true startClass2BiometricOrCredentialAuthentication( @@ -39,7 +39,7 @@ object AuthenticatorUtil { subtitle = subtitle, confirmationRequired = confirmationRequired, executor = ContextCompat.getMainExecutor(this), - callback = callback + callback = callback, ) } @@ -72,7 +72,7 @@ object AuthenticatorUtil { override fun onAuthenticationError( activity: FragmentActivity?, @AuthenticationError errorCode: Int, - errString: CharSequence + errString: CharSequence, ) { isAuthenticating = false } @@ -90,7 +90,7 @@ object AuthenticatorUtil { @CallSuper override fun onAuthenticationSucceeded( activity: FragmentActivity?, - result: BiometricPrompt.AuthenticationResult + result: BiometricPrompt.AuthenticationResult, ) { isAuthenticating = false } 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 55d066c56..995b4e7cf 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 @@ -383,7 +383,7 @@ object ImageUtil { return GradientDrawable( GradientDrawable.Orientation.TOP_BOTTOM, - gradient + gradient, ) } @@ -401,7 +401,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 @@ -415,7 +415,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) @@ -423,7 +423,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) diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/LogcatExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/LogcatExtensions.kt index e541f52b1..5e2e9c525 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/LogcatExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/LogcatExtensions.kt @@ -7,7 +7,7 @@ import logcat.logcat inline fun Any.logcat( priority: LogPriority = LogPriority.DEBUG, throwable: Throwable? = null, - message: () -> String = { "" } + message: () -> String = { "" }, ) = logcat(priority = priority) { var msg = message() if (throwable != null) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/NotificationExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/NotificationExtensions.kt index 9b44dbcdb..70e44d645 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/NotificationExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/NotificationExtensions.kt @@ -12,7 +12,7 @@ import androidx.core.app.NotificationChannelGroupCompat */ fun buildNotificationChannelGroup( channelId: String, - block: (NotificationChannelGroupCompat.Builder.() -> Unit) + block: (NotificationChannelGroupCompat.Builder.() -> Unit), ): NotificationChannelGroupCompat { val builder = NotificationChannelGroupCompat.Builder(channelId) builder.block() @@ -30,7 +30,7 @@ fun buildNotificationChannelGroup( fun buildNotificationChannel( channelId: String, channelImportance: Int, - block: (NotificationChannelCompat.Builder.() -> Unit) + block: (NotificationChannelCompat.Builder.() -> Unit), ): NotificationChannelCompat { val builder = NotificationChannelCompat.Builder(channelId, channelImportance) builder.block() 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 5ccbb4f7e..6c6fba4ff 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/ImageViewExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/view/ImageViewExtensions.kt index 5df8fcb33..3f6623cea 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/view/ImageViewExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/view/ImageViewExtensions.kt @@ -38,7 +38,7 @@ fun ImageView.setVectorCompat(@DrawableRes drawable: Int, @AttrRes tint: Int? = fun ImageView.loadAutoPause( data: Any?, loader: ImageLoader = context.imageLoader, - builder: ImageRequest.Builder.() -> Unit = {} + builder: ImageRequest.Builder.() -> Unit = {}, ) { load(data, loader) { placeholder(ColorDrawable(context.getColor(R.color.cover_placeholder))) @@ -55,7 +55,7 @@ fun ImageView.loadAutoPause( }, onStart = { request -> originalListener?.onStart(request) }, onCancel = { request -> originalListener?.onCancel(request) }, - onError = { request, throwable -> originalListener?.onError(request, throwable) } + onError = { request, throwable -> originalListener?.onError(request, throwable) }, ) } } 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 53271748e..fb5e11d3a 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 @@ -52,7 +52,7 @@ fun View.getCoordinates() = Point((left + right) / 2, (top + bottom) / 2) inline fun View.snack( message: String, length: Int = 10_000, - f: Snackbar.() -> Unit = {} + f: Snackbar.() -> Unit = {}, ): Snackbar { val snack = Snackbar.make(this, message, length) snack.f() @@ -88,7 +88,7 @@ inline fun View.setTooltip(text: String) { inline fun View.popupMenu( @MenuRes menuRes: Int, noinline initMenu: (Menu.() -> Unit)? = null, - noinline onMenuItemClick: MenuItem.() -> Unit + noinline onMenuItemClick: MenuItem.() -> Unit, ): PopupMenu { val popup = PopupMenu(context, this, Gravity.NO_GRAVITY, R.attr.actionOverflowMenuStyle, 0) popup.menuInflater.inflate(menuRes, popup.menu) @@ -116,7 +116,7 @@ inline fun View.popupMenu( 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, R.attr.actionOverflowMenuStyle, 0) items.forEach { (id, stringRes) -> @@ -172,7 +172,7 @@ inline fun ExtendedFloatingActionButton.shrinkOnScroll(recycler: RecyclerView): */ inline fun ChipGroup.setChips( items: List?, - noinline onClick: (item: String) -> Unit = {} + noinline onClick: (item: String) -> Unit = {}, ) { removeAllViews() @@ -208,7 +208,7 @@ fun RecyclerView.onAnimationsFinished(callback: (RecyclerView) -> Unit) = post( callback(this@onAnimationsFinished) } } - } + }, ) /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/view/WindowExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/view/WindowExtensions.kt index 98dd588d5..be387a656 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/view/WindowExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/view/WindowExtensions.kt @@ -22,7 +22,7 @@ fun Window.setNavigationBarTransparentCompat(context: Context, elevation: Float // Set navbar scrim 70% of navigationBarColor ElevationOverlayProvider(context).compositeOverlayIfNeeded( context.getResourceColor(android.R.attr.navigationBarColor, 0.7F), - elevation + elevation, ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/ActionModeWithToolbar.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/ActionModeWithToolbar.kt index 7c9842319..9ab0bc115 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/ActionModeWithToolbar.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/ActionModeWithToolbar.kt @@ -78,7 +78,7 @@ class ActionModeWithToolbar @JvmOverloads constructor(context: Context, attrs: A callback = null actionMode = null } - } + }, ) } binding.root.startAnimation(bottomAnimation) 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 9086752a4..f0f368bac 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt @@ -48,12 +48,12 @@ class EmptyView @JvmOverloads constructor(context: Context, attrs: AttributeSet? val button = MaterialButton( buttonContext, null, - R.attr.borderlessButtonStyle + R.attr.borderlessButtonStyle, ).apply { layoutParams = LinearLayout.LayoutParams( 0, LinearLayout.LayoutParams.WRAP_CONTENT, - 1f / actions.size + 1f / actions.size, ) setTextColor(buttonColor) @@ -78,7 +78,7 @@ class EmptyView @JvmOverloads constructor(context: Context, attrs: AttributeSet? "ಥ_ಥ", "(˘･_･˘)", "(；￣Д￣)", - "(･Д･。" + "(･Д･。", ) fun getRandomErrorFace(): String { @@ -89,6 +89,6 @@ class EmptyView @JvmOverloads constructor(context: Context, attrs: AttributeSet? data class Action( @StringRes val stringResId: Int, @DrawableRes val iconResId: Int, - val listener: OnClickListener + val listener: OnClickListener, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/ExtendedNavigationView.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/ExtendedNavigationView.kt index 966ceb3b0..027f1846b 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/ExtendedNavigationView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/ExtendedNavigationView.kt @@ -20,7 +20,7 @@ import eu.kanade.tachiyomi.util.system.getResourceColor open class ExtendedNavigationView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, - defStyleAttr: Int = 0 + defStyleAttr: Int = 0, ) : SimpleNavigationView(context, attrs, defStyleAttr) { /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/HideBottomNavigationOnScrollBehavior.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/HideBottomNavigationOnScrollBehavior.kt index a4b7a43dd..648719b0e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/HideBottomNavigationOnScrollBehavior.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/HideBottomNavigationOnScrollBehavior.kt @@ -20,7 +20,7 @@ import kotlin.math.roundToLong */ class HideBottomNavigationOnScrollBehavior @JvmOverloads constructor( context: Context? = null, - attrs: AttributeSet? = null + attrs: AttributeSet? = null, ) : CoordinatorLayout.Behavior(context, attrs) { @ViewCompat.NestedScrollType @@ -37,7 +37,7 @@ class HideBottomNavigationOnScrollBehavior @JvmOverloads constructor( override fun onDependentViewChanged( parent: CoordinatorLayout, child: BottomNavigationView, - dependency: View + dependency: View, ): Boolean { val toolbarSize = (dependency as ViewGroup).findChild()?.height ?: 0 dyRatio = if (toolbarSize > 0) { @@ -54,7 +54,7 @@ class HideBottomNavigationOnScrollBehavior @JvmOverloads constructor( directTargetChild: View, target: View, axes: Int, - type: Int + type: Int, ): Boolean { if (axes != ViewCompat.SCROLL_AXIS_VERTICAL) { return false @@ -71,7 +71,7 @@ class HideBottomNavigationOnScrollBehavior @JvmOverloads constructor( dx: Int, dy: Int, consumed: IntArray, - type: Int + type: Int, ) { super.onNestedPreScroll(coordinatorLayout, child, target, dx, dy, consumed, type) child.translationY = (child.translationY + (dy * dyRatio)).coerceIn(0F, child.height.toFloat()) @@ -81,7 +81,7 @@ class HideBottomNavigationOnScrollBehavior @JvmOverloads constructor( coordinatorLayout: CoordinatorLayout, child: BottomNavigationView, target: View, - type: Int + type: Int, ) { if (lastStartedType == ViewCompat.TYPE_TOUCH || type == ViewCompat.TYPE_NON_TOUCH) { animateBottomNavigationVisibility(child, child.translationY < child.height / 2) @@ -99,7 +99,7 @@ class HideBottomNavigationOnScrollBehavior @JvmOverloads constructor( } offsetAnimator?.setFloatValues( child.translationY, - if (isVisible) 0F else child.height.toFloat() + if (isVisible) 0F else child.height.toFloat(), ) offsetAnimator?.start() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/MangaSummaryView.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/MangaSummaryView.kt index 59c120e96..0de66b20d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/MangaSummaryView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/MangaSummaryView.kt @@ -32,7 +32,7 @@ class MangaSummaryView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr: Int = 0, - @StyleRes defStyleRes: Int = 0 + @StyleRes defStyleRes: Int = 0, ) : FrameLayout(context, attrs, defStyleAttr, defStyleRes) { private val binding = MangaSummaryBinding.inflate(LayoutInflater.from(context), this, true) @@ -84,13 +84,13 @@ class MangaSummaryView @JvmOverloads constructor( meta: RaisedSearchMetadata?, onClick: (item: String) -> Unit, onLongClick: (item: String) -> Unit, - source: Source + source: Source, ) { binding.tagChipsShrunk.setChipsExtended( items, onClick, onLongClick, - source.id + source.id, ) // binding.tagChipsExpanded.setChips(items, onClick) setChipsWithNamespace( @@ -98,7 +98,7 @@ class MangaSummaryView @JvmOverloads constructor( meta, onClick, onLongClick, - source + source, ) } // SY <-- @@ -117,7 +117,7 @@ class MangaSummaryView @JvmOverloads constructor( val toggleDrawable = ContextCompat.getDrawable( context, - if (expanded) R.drawable.anim_caret_up else R.drawable.anim_caret_down + if (expanded) R.drawable.anim_caret_up else R.drawable.anim_caret_down, ) toggleMore.setImageDrawable(toggleDrawable) @@ -180,7 +180,7 @@ class MangaSummaryView @JvmOverloads constructor( meta: RaisedSearchMetadata?, onClick: (item: String) -> Unit, onLongClick: (item: String) -> Unit, - source: Source + source: Source, ) { val namespaceTags = when { meta != null -> { @@ -195,7 +195,7 @@ class MangaSummaryView @JvmOverloads constructor( }, onClick, onLongClick, - source + source, ) } } @@ -218,7 +218,7 @@ class MangaSummaryView @JvmOverloads constructor( tags, onClick, onLongClick, - source + source, ) } } else { @@ -228,8 +228,8 @@ class MangaSummaryView @JvmOverloads constructor( genre.map { it to null }, onClick, onLongClick, - source - ) + source, + ), ) } } @@ -270,7 +270,7 @@ class MangaSummaryView @JvmOverloads constructor( description?.let { context.copyToClipboard( context.getString(R.string.description), - it.toString() + it.toString(), ) } true @@ -291,7 +291,7 @@ class MangaSummaryView @JvmOverloads constructor( binding.descriptionText, binding.descriptionScrim, binding.toggleMoreScrim, - binding.toggleMore + binding.toggleMore, ).forEach { it.setOnClickListener { expanded = !expanded } } 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 b7ab3a82f..e5125a28c 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/SimpleNavigationView.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/SimpleNavigationView.kt index c8ed0a104..3c6bd01e7 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/SimpleNavigationView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/SimpleNavigationView.kt @@ -25,7 +25,7 @@ import eu.kanade.tachiyomi.R as TR open class SimpleNavigationView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, - defStyleAttr: Int = 0 + defStyleAttr: Int = 0, ) : FrameLayout(context, attrs, defStyleAttr) { /** @@ -40,7 +40,7 @@ open class SimpleNavigationView @JvmOverloads constructor( attrs, R.styleable.NavigationView, defStyleAttr, - R.style.Widget_Design_NavigationView + R.style.Widget_Design_NavigationView, ) a.recycle() diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiAppBarLayout.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiAppBarLayout.kt index e54379e01..eb3ced1f8 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiAppBarLayout.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiAppBarLayout.kt @@ -30,7 +30,7 @@ import reactivecircus.flowbinding.android.view.hierarchyChangeEvents */ class TachiyomiAppBarLayout @JvmOverloads constructor( context: Context, - attrs: AttributeSet? = null + attrs: AttributeSet? = null, ) : AppBarLayout(context, attrs) { private var lifted = true diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiBottomNavigationView.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiBottomNavigationView.kt index 836715b70..89e2fff3d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiBottomNavigationView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiBottomNavigationView.kt @@ -29,7 +29,7 @@ class TachiyomiBottomNavigationView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = R.attr.bottomNavigationStyle, - defStyleRes: Int = R.style.Widget_Design_BottomNavigationView + defStyleRes: Int = R.style.Widget_Design_BottomNavigationView, ) : BottomNavigationView(context, attrs, defStyleAttr, defStyleRes) { private var currentAnimator: ViewPropertyAnimator? = null @@ -90,7 +90,7 @@ class TachiyomiBottomNavigationView @JvmOverloads constructor( animateTranslation( 0F, SLIDE_UP_ANIMATION_DURATION, - LinearOutSlowInInterpolator() + LinearOutSlowInInterpolator(), ) } @@ -105,7 +105,7 @@ class TachiyomiBottomNavigationView @JvmOverloads constructor( animateTranslation( height.toFloat(), SLIDE_DOWN_ANIMATION_DURATION, - FastOutLinearInInterpolator() + FastOutLinearInInterpolator(), ) } @@ -120,7 +120,7 @@ class TachiyomiBottomNavigationView @JvmOverloads constructor( currentAnimator = null postInvalidate() } - }) + },) } internal class SavedState : AbsSavedState { diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiChangeHandlerFrameLayout.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiChangeHandlerFrameLayout.kt index 91aade2ee..2667b5659 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiChangeHandlerFrameLayout.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiChangeHandlerFrameLayout.kt @@ -11,7 +11,7 @@ import com.bluelinelabs.conductor.ChangeHandlerFrameLayout */ class TachiyomiChangeHandlerFrameLayout( context: Context, - attrs: AttributeSet + attrs: AttributeSet, ) : ChangeHandlerFrameLayout(context, attrs), CoordinatorLayout.AttachedBehavior { /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiCoordinatorLayout.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiCoordinatorLayout.kt index 90516828e..e7d7db22c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiCoordinatorLayout.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiCoordinatorLayout.kt @@ -29,7 +29,7 @@ import eu.kanade.tachiyomi.util.view.findChild class TachiyomiCoordinatorLayout @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, - defStyleAttr: Int = R.attr.coordinatorLayoutStyle + defStyleAttr: Int = R.attr.coordinatorLayoutStyle, ) : CoordinatorLayout(context, attrs, defStyleAttr) { /** @@ -58,7 +58,7 @@ class TachiyomiCoordinatorLayout @JvmOverloads constructor( dxUnconsumed: Int, dyUnconsumed: Int, type: Int, - consumed: IntArray + consumed: IntArray, ) { super.onNestedScroll(target, dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, type, consumed) // Disable elevation overlay when tabs are visible diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiSearchView.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiSearchView.kt index b4f01a19e..cc913f618 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiSearchView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiSearchView.kt @@ -23,7 +23,7 @@ import uy.kohesive.injekt.api.get class TachiyomiSearchView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, - defStyleAttr: Int = R.attr.searchViewStyle + defStyleAttr: Int = R.attr.searchViewStyle, ) : SearchView(context, attrs, defStyleAttr) { private var scope: CoroutineScope? = null 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 275f112bc..0bbd328a6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiTextInputEditText.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiTextInputEditText.kt @@ -26,7 +26,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/ThemedSwipeRefreshLayout.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/ThemedSwipeRefreshLayout.kt index e0bde8512..51bf2ec4f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/ThemedSwipeRefreshLayout.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/ThemedSwipeRefreshLayout.kt @@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.util.system.getThemeColor class ThemedSwipeRefreshLayout @JvmOverloads constructor( context: Context, - attrs: AttributeSet? = null + attrs: AttributeSet? = null, ) : SwipeRefreshLayout(context, attrs) { init { // Background diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/MaterialAlertDialogBuilderExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/MaterialAlertDialogBuilderExtensions.kt index da8b93d91..33a18380d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/MaterialAlertDialogBuilderExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/MaterialAlertDialogBuilderExtensions.kt @@ -15,7 +15,7 @@ import eu.kanade.tachiyomi.databinding.DialogStubTextinputBinding fun MaterialAlertDialogBuilder.setTextInput( hint: String? = null, prefill: String? = null, - onTextChanged: (String) -> Unit + onTextChanged: (String) -> Unit, ): MaterialAlertDialogBuilder { val binding = DialogStubTextinputBinding.inflate(LayoutInflater.from(context)) binding.textField.hint = hint @@ -43,7 +43,7 @@ fun MaterialAlertDialogBuilder.setQuadStateMultiChoiceItems( items: List, initialSelected: IntArray, disabledIndices: IntArray? = null, - selection: QuadStateMultiChoiceListener + selection: QuadStateMultiChoiceListener, ): MaterialAlertDialogBuilder { val binding = DialogStubQuadstatemultichoiceBinding.inflate(LayoutInflater.from(context)) binding.list.layoutManager = LinearLayoutManager(context) @@ -52,7 +52,7 @@ fun MaterialAlertDialogBuilder.setQuadStateMultiChoiceItems( disabledItems = disabledIndices, initialSelected = initialSelected, isActionList = isActionList, - listener = selection + listener = selection, ) val updateScrollIndicators = { binding.scrollIndicatorUp.isVisible = binding.list.canScrollVertically(-1) diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/QuadStateMultiChoiceDialogAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/QuadStateMultiChoiceDialogAdapter.kt index fb4bff7dd..e9152f248 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/QuadStateMultiChoiceDialogAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/QuadStateMultiChoiceDialogAdapter.kt @@ -19,7 +19,7 @@ internal class QuadStateMultiChoiceDialogAdapter( disabledItems: IntArray?, private var initialSelected: IntArray, internal var listener: QuadStateMultiChoiceListener, - val isActionList: Boolean = true + val isActionList: Boolean = true, ) : RecyclerView.Adapter() { private val states = QuadStateTextView.State.values() @@ -80,12 +80,12 @@ internal class QuadStateMultiChoiceDialogAdapter( override fun onCreateViewHolder( parent: ViewGroup, - viewType: Int + viewType: Int, ): QuadStateMultiChoiceViewHolder { return QuadStateMultiChoiceViewHolder( itemBinding = DialogQuadstatemultichoiceItemBinding .inflate(LayoutInflater.from(parent.context), parent, false), - adapter = this + adapter = this, ) } @@ -93,7 +93,7 @@ internal class QuadStateMultiChoiceDialogAdapter( override fun onBindViewHolder( holder: QuadStateMultiChoiceViewHolder, - position: Int + position: Int, ) { holder.isEnabled = !disabledIndices.contains(position) holder.controlView.state = states[currentSelection[position]] @@ -103,7 +103,7 @@ internal class QuadStateMultiChoiceDialogAdapter( override fun onBindViewHolder( holder: QuadStateMultiChoiceViewHolder, position: Int, - payloads: MutableList + payloads: MutableList, ) { when (payloads.firstOrNull()) { CheckPayload -> { diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/QuadStateMultiChoiceViewHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/QuadStateMultiChoiceViewHolder.kt index fc427b185..c75c21604 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/QuadStateMultiChoiceViewHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/QuadStateMultiChoiceViewHolder.kt @@ -6,7 +6,7 @@ import eu.kanade.tachiyomi.databinding.DialogQuadstatemultichoiceItemBinding internal class QuadStateMultiChoiceViewHolder( itemBinding: DialogQuadstatemultichoiceItemBinding, - private val adapter: QuadStateMultiChoiceDialogAdapter + private val adapter: QuadStateMultiChoiceDialogAdapter, ) : RecyclerView.ViewHolder(itemBinding.root), View.OnClickListener { init { itemView.setOnClickListener(this) 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 4a359872d..1773c937f 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginDialogPreference.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginDialogPreference.kt @@ -17,7 +17,7 @@ import uy.kohesive.injekt.injectLazy abstract class LoginDialogPreference( @StringRes private val usernameLabelRes: Int? = null, - bundle: Bundle? = null + bundle: Bundle? = null, ) : DialogController(bundle) { var binding: PrefAccountLoginBinding? = null @@ -36,7 +36,8 @@ abstract class LoginDialogPreference( .create() } - /* SY --> */ open /* SY <-- */ fun onViewCreated(view: View) { + /* SY --> */ + open /* SY <-- */ fun onViewCreated(view: View) { if (usernameLabelRes != null) { binding!!.usernameLabel.hint = view.context.getString(usernameLabelRes) } 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 15d64392a..26bdaba09 100755 --- 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/ThemesPreference.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/ThemesPreference.kt index 330a1fcb0..ff07c56ed 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/ThemesPreference.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/ThemesPreference.kt @@ -42,7 +42,7 @@ class ThemesPreference @JvmOverloads constructor(context: Context, attrs: Attrib super.onScrolled(recyclerView, dx, dy) lastScrollPosition = recyclerView.computeHorizontalScrollOffset() } - }) + },) lastScrollPosition?.let { scrollToOffset(it) } } @@ -65,7 +65,7 @@ class ThemesPreference @JvmOverloads constructor(context: Context, attrs: Attrib scrollToPositionWithOffset( // 114dp is the width of the pref_theme_item layout lX / 114.dpToPx, - -lX % 114.dpToPx + -lX % 114.dpToPx, ) } lastScrollPosition = it.computeHorizontalScrollOffset() diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/ThemesPreferenceAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/ThemesPreferenceAdapter.kt index 38e71410f..4c5bd324d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/ThemesPreferenceAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/ThemesPreferenceAdapter.kt @@ -25,7 +25,7 @@ class ThemesPreferenceAdapter(private val clickListener: OnItemClickListener) : override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ThemeViewHolder { val themeResIds = ThemingDelegate.getThemeResIds(themes[viewType], preferences.themeDarkAmoled().get()) val themedContext = themeResIds.fold(parent.context) { - context, themeResId -> + context, themeResId -> ContextThemeWrapper(context, themeResId) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/sheet/BottomSheetViewPager.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/sheet/BottomSheetViewPager.kt index af8be9aaf..ac982efcf 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/sheet/BottomSheetViewPager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/sheet/BottomSheetViewPager.kt @@ -10,7 +10,7 @@ import java.lang.reflect.Field */ class BottomSheetViewPager @JvmOverloads constructor( context: Context, - attrs: AttributeSet? = null + attrs: AttributeSet? = null, ) : ViewPager(context, attrs) { private val positionField: Field = LayoutParams::class.java.getDeclaredField("position").also { @@ -49,6 +49,6 @@ class BottomSheetViewPager @JvmOverloads constructor( override fun onPageSelected(position: Int) { requestLayout() } - }) + },) } } diff --git a/app/src/main/java/exh/EXHMigrations.kt b/app/src/main/java/exh/EXHMigrations.kt index b90d9533d..661999af7 100644 --- a/app/src/main/java/exh/EXHMigrations.kt +++ b/app/src/main/java/exh/EXHMigrations.kt @@ -108,7 +108,7 @@ object EXHMigrations { Query.builder() .table(MangaTable.TABLE) .where("${MangaTable.COL_SOURCE} = $HBROWSE_SOURCE_ID") - .build() + .build(), ) .prepare() .executeAsBlocking() @@ -145,7 +145,7 @@ object EXHMigrations { Query.builder() .table(MangaTable.TABLE) .where("${MangaTable.COL_SOURCE} = $MERGED_SOURCE_ID") - .build() + .build(), ) .prepare() .executeAsBlocking() @@ -172,7 +172,7 @@ object EXHMigrations { mergeUrl = mergedManga.first.url, mangaId = mergedManga.first.id!!, mangaUrl = mergedManga.first.url, - mangaSourceId = MERGED_SOURCE_ID + mangaSourceId = MERGED_SOURCE_ID, ) mergedManga.second.children.distinct().forEachIndexed { index, mangaSource -> val load = mangaSource.load(db, sourceManager) ?: return@forEachIndexed @@ -187,7 +187,7 @@ object EXHMigrations { mergeUrl = mergedManga.first.url, mangaId = load.manga.id!!, mangaUrl = load.manga.url, - mangaSourceId = load.source.id + mangaSourceId = load.source.id, ) } } @@ -206,7 +206,7 @@ object EXHMigrations { Query.builder() .table(ChapterTable.TABLE) .where("${ChapterTable.COL_MANGA_ID} IN (${mergedMangas.filter { it.id != null }.joinToString { it.id.toString() }})") - .build() + .build(), ) .prepare() .executeAsBlocking() @@ -216,7 +216,7 @@ object EXHMigrations { Query.builder() .table(ChapterTable.TABLE) .where("${ChapterTable.COL_MANGA_ID} IN (${loadedMangaList.filter { it.manga.id != null }.joinToString { it.manga.id.toString() }})") - .build() + .build(), ) .prepare() .executeAsBlocking() @@ -291,7 +291,7 @@ object EXHMigrations { .table(TrackTable.TABLE) .where("${TrackTable.COL_SYNC_ID} = ?") .whereArgs(6) - .build() + .build(), ) } if (oldVersion under 18) { @@ -367,7 +367,7 @@ object EXHMigrations { "fav-sync", "fav-sync.management", "fav-sync.lock", - "fav-sync.note" + "fav-sync.note", ).map { File(context.filesDir, it) }.filter(File::exists).forEach { @@ -412,7 +412,7 @@ object EXHMigrations { source = it.substringBefore(':').toLongOrNull() ?: return@mapNotNull null, content["name"]!!.jsonPrimitive.content, content["query"]!!.jsonPrimitive.contentOrNull?.nullIfBlank(), - Json.encodeToString(content["filters"]!!.jsonArray) + Json.encodeToString(content["filters"]!!.jsonArray), ) }.getOrNull() }?.ifEmpty { null } @@ -424,7 +424,7 @@ object EXHMigrations { id = null, source = it.toLong(), savedSearch = null, - global = true + global = true, ) }?.ifEmpty { null } if (feed != null) { @@ -518,13 +518,13 @@ object EXHMigrations { @SerialName("u") val url: String, @SerialName("m") - val mangaUrl: String + val mangaUrl: String, ) @Serializable private data class MangaConfig( @SerialName("c") - val children: List + val children: List, ) { companion object { fun readFromUrl(url: String): MangaConfig? { @@ -546,7 +546,7 @@ object EXHMigrations { @SerialName("s") val source: Long, @SerialName("u") - val url: String + val url: String, ) { fun load(db: DatabaseHelper, sourceManager: SourceManager): LoadedMangaSource? { val manga = db.getManga(url, source).executeAsBlocking() ?: return null @@ -573,10 +573,10 @@ object EXHMigrations { UPDATE ${MangaTable.TABLE} SET ${MangaTable.COL_SOURCE} = $newId WHERE ${MangaTable.COL_SOURCE} = $oldId - """.trimIndent() + """.trimIndent(), ) .affectsTables(MangaTable.TABLE) - .build() + .build(), ) } } diff --git a/app/src/main/java/exh/GalleryAdder.kt b/app/src/main/java/exh/GalleryAdder.kt index 597abf1ee..63611157f 100755 --- a/app/src/main/java/exh/GalleryAdder.kt +++ b/app/src/main/java/exh/GalleryAdder.kt @@ -51,7 +51,7 @@ class GalleryAdder { url: String, fav: Boolean = false, forceSource: UrlImportableSource? = null, - throttleFunc: suspend () -> Unit = {} + throttleFunc: suspend () -> Unit = {}, ): GalleryAddEvent { logger.d(context.getString(R.string.gallery_adder_importing_manga, url, fav.toString(), forceSource)) try { @@ -177,7 +177,7 @@ class GalleryAdder { return GalleryAddEvent.Fail.Error( url, - ((e.message ?: "Unknown error!") + " (Gallery: $url)").trim() + ((e.message ?: "Unknown error!") + " (Gallery: $url)").trim(), ) } } @@ -192,7 +192,7 @@ sealed class GalleryAddEvent { override val galleryUrl: String, val manga: Manga, val context: Context, - val chapter: Chapter? = null + val chapter: Chapter? = null, ) : GalleryAddEvent() { override val galleryTitle = manga.title override val logMessage = context.getString(R.string.batch_add_success_log_message, galleryTitle) @@ -205,7 +205,7 @@ sealed class GalleryAddEvent { open class Error( override val galleryUrl: String, - override val logMessage: String + override val logMessage: String, ) : Fail() class NotFound(galleryUrl: String, context: Context) : diff --git a/app/src/main/java/exh/debug/DebugFunctions.kt b/app/src/main/java/exh/debug/DebugFunctions.kt index d9b406ca1..0892efec1 100644 --- a/app/src/main/java/exh/debug/DebugFunctions.kt +++ b/app/src/main/java/exh/debug/DebugFunctions.kt @@ -144,10 +144,10 @@ object DebugFunctions { """ UPDATE ${MangaTable.TABLE} SET ${MangaTable.COL_FAVORITE} = 1 - """.trimIndent() + """.trimIndent(), ) .affectsTables(MangaTable.TABLE) - .build() + .build(), ) } } @@ -235,10 +235,10 @@ object DebugFunctions { UPDATE ${MangaTable.TABLE} SET ${MangaTable.COL_SOURCE} = $to WHERE ${MangaTable.COL_SOURCE} = $from - """.trimIndent() + """.trimIndent(), ) .affectsTables(MangaTable.TABLE) - .build() + .build(), ) } @@ -329,10 +329,10 @@ object DebugFunctions { UPDATE ${MangaTable.TABLE} SET ${MangaTable.COL_VIEWER} = 0 WHERE ${MangaTable.COL_VIEWER} = -1 - """.trimIndent() + """.trimIndent(), ) .affectsTables(MangaTable.TABLE) - .build() + .build(), ) } } @@ -345,10 +345,10 @@ object DebugFunctions { """ UPDATE ${MangaTable.TABLE} SET ${MangaTable.COL_VIEWER} = 0 - """.trimIndent() + """.trimIndent(), ) .affectsTables(MangaTable.TABLE) - .build() + .build(), ) } } @@ -366,10 +366,10 @@ object DebugFunctions { UPDATE ${MangaTable.TABLE} SET ${MangaTable.COL_SOURCE} = ${NHentai.otherId} WHERE ${MangaTable.COL_FAVORITE} = 1 AND ${MangaTable.COL_SOURCE} in ($sources) - """.trimIndent() + """.trimIndent(), ) .affectsTables(MangaTable.TABLE) - .build() + .build(), ) } } diff --git a/app/src/main/java/exh/eh/EHentaiThrottleManager.kt b/app/src/main/java/exh/eh/EHentaiThrottleManager.kt index 2d2b6cd63..30a5c3cb6 100644 --- a/app/src/main/java/exh/eh/EHentaiThrottleManager.kt +++ b/app/src/main/java/exh/eh/EHentaiThrottleManager.kt @@ -7,7 +7,7 @@ import kotlin.time.Duration.Companion.seconds class EHentaiThrottleManager( private val max: Duration = THROTTLE_MAX, - private val inc: Duration = THROTTLE_INC + private val inc: Duration = THROTTLE_INC, ) { private var lastThrottleTime = Duration.ZERO var throttleTime = Duration.ZERO diff --git a/app/src/main/java/exh/eh/EHentaiUpdateHelper.kt b/app/src/main/java/exh/eh/EHentaiUpdateHelper.kt index 833e61e7a..2511a4f18 100644 --- a/app/src/main/java/exh/eh/EHentaiUpdateHelper.kt +++ b/app/src/main/java/exh/eh/EHentaiUpdateHelper.kt @@ -22,7 +22,7 @@ class EHentaiUpdateHelper(context: Context) { val parentLookupTable = MemAutoFlushingLookupTable( File(context.filesDir, "exh-plt.maftable"), - GalleryEntry.Serializer() + GalleryEntry.Serializer(), ) private val db: DatabaseHelper by injectLazy() @@ -55,7 +55,7 @@ class EHentaiUpdateHelper(context: Context) { ChapterChain( manga.await() ?: return@coroutineScope null, chapterList.await(), - history.await() + history.await(), ) } } @@ -143,13 +143,13 @@ class EHentaiUpdateHelper(context: Context) { data class HistoryUpdates( val history: List, val urlHistory: List>, - val historyToDelete: List + val historyToDelete: List, ) private fun getHistory( newChapters: List, chainsAsChapters: List, - chainsAsHistory: List + chainsAsHistory: List, ): HistoryUpdates { val historyMap = chainsAsHistory .groupBy { history -> @@ -185,14 +185,14 @@ class EHentaiUpdateHelper(context: Context) { null } }, - oldHistory + oldHistory, ) } private fun getChapterList( accepted: ChapterChain, toDiscard: List, - chainsAsChapters: List + chainsAsChapters: List, ): Pair, Boolean> { var new = false return toDiscard @@ -256,7 +256,7 @@ data class GalleryEntry(val gId: String, val gToken: String) { val colonIndex = string.indexOf(':') return GalleryEntry( string.substring(0, colonIndex), - string.substring(colonIndex + 1, string.length) + string.substring(colonIndex + 1, string.length), ) } } diff --git a/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt b/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt index 89b505352..2fa60b298 100644 --- a/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt +++ b/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt @@ -125,7 +125,7 @@ class EHentaiUpdateWorker(private val context: Context, workerParams: WorkerPara meta.gId, meta.gToken, failuresThisIteration, - modifiedThisIteration.size + modifiedThisIteration.size, ) if (manga.id in modifiedThisIteration) { @@ -147,7 +147,7 @@ class EHentaiUpdateWorker(private val context: Context, workerParams: WorkerPara manga.id, meta.gId, meta.gToken, - failuresThisIteration + failuresThisIteration, ) } @@ -160,7 +160,7 @@ class EHentaiUpdateWorker(private val context: Context, workerParams: WorkerPara manga.id, meta.gId, meta.gToken, - failuresThisIteration + failuresThisIteration, ) continue @@ -186,9 +186,9 @@ class EHentaiUpdateWorker(private val context: Context, workerParams: WorkerPara EHentaiUpdaterStats( startTime, allMeta.size, - updatedThisIteration - ) - ) + updatedThisIteration, + ), + ), ) if (updatedManga.isNotEmpty()) { @@ -256,7 +256,7 @@ class EHentaiUpdateWorker(private val context: Context, workerParams: WorkerPara interval.toLong(), TimeUnit.HOURS, 10, - TimeUnit.MINUTES + TimeUnit.MINUTES, ) .addTag(TAG) .setConstraints(constraints) diff --git a/app/src/main/java/exh/eh/EHentaiUpdaterStats.kt b/app/src/main/java/exh/eh/EHentaiUpdaterStats.kt index 340c3a3fb..84796c8dc 100644 --- a/app/src/main/java/exh/eh/EHentaiUpdaterStats.kt +++ b/app/src/main/java/exh/eh/EHentaiUpdaterStats.kt @@ -6,5 +6,5 @@ import kotlinx.serialization.Serializable data class EHentaiUpdaterStats( val startTime: Long, val possibleUpdates: Int, - val updateCount: Int + val updateCount: Int, ) diff --git a/app/src/main/java/exh/eh/MemAutoFlushingLookupTable.kt b/app/src/main/java/exh/eh/MemAutoFlushingLookupTable.kt index b0adb1282..791c0fb87 100644 --- a/app/src/main/java/exh/eh/MemAutoFlushingLookupTable.kt +++ b/app/src/main/java/exh/eh/MemAutoFlushingLookupTable.kt @@ -35,7 +35,7 @@ import kotlin.coroutines.CoroutineContext class MemAutoFlushingLookupTable( file: File, private val serializer: EntrySerializer, - private val debounceTimeMs: Long = 3000 + private val debounceTimeMs: Long = 3000, ) : CoroutineScope, Closeable { /** * The context of this scope. diff --git a/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt b/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt index ac2eb9262..ae8f4d646 100644 --- a/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt +++ b/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt @@ -125,14 +125,14 @@ class FavoritesSyncHelper(val context: Context) { wakeLock = ignore { context.powerManager.newWakeLock( PowerManager.PARTIAL_WAKE_LOCK, - "teh:ExhFavoritesSyncWakelock" + "teh:ExhFavoritesSyncWakelock", ) } ignore { wifiLock?.release() } wifiLock = ignore { context.wifiManager.createWifiLock( WifiManager.WIFI_MODE_FULL_HIGH_PERF, - "teh:ExhFavoritesSyncWifi" + "teh:ExhFavoritesSyncWifi", ) } @@ -249,7 +249,7 @@ class FavoritesSyncHelper(val context: Context) { .add("favnote", "") .add("apply", "Add to Favorites") .add("update", "1") - .build() + .build(), ) if (!explicitlyRetryExhRequest(10, request)) { @@ -299,7 +299,7 @@ class FavoritesSyncHelper(val context: Context) { val request = POST( url = "https://exhentai.org/favorites.php", - body = formBody.build() + body = formBody.build(), ) if (!explicitlyRetryExhRequest(10, request)) { @@ -320,7 +320,7 @@ class FavoritesSyncHelper(val context: Context) { status.value = FavoritesSyncStatus.Processing( context.getString(R.string.favorites_sync_adding_to_remote, index + 1, changeSet.added.size), needWarnThrottle(), - context + context, ) throttleManager.throttle() @@ -340,7 +340,7 @@ class FavoritesSyncHelper(val context: Context) { // Consider both EX and EH sources listOf( db.getManga(url, EXH_SOURCE_ID), - db.getManga(url, EH_SOURCE_ID) + db.getManga(url, EH_SOURCE_ID), ).forEach { val manga = it.executeAsBlocking() @@ -368,7 +368,7 @@ class FavoritesSyncHelper(val context: Context) { context.getString(R.string.favorites_sync_add_to_local, index + 1, changeSet.added.size), needWarnThrottle(), context, - it.title + it.title, ) throttleManager.throttle() @@ -379,7 +379,7 @@ class FavoritesSyncHelper(val context: Context) { "${exh.baseUrl}${it.getUrl()}", true, exh, - throttleManager::throttle + throttleManager::throttle, ) if (result is GalleryAddEvent.Fail) { @@ -404,7 +404,7 @@ class FavoritesSyncHelper(val context: Context) { } else if (result is GalleryAddEvent.Success) { insertedMangaCategories += MangaCategory.create( result.manga, - categories[it.category] + categories[it.category], ) to result.manga } } @@ -439,7 +439,7 @@ sealed class FavoritesSyncStatus(val message: String) { class MangaInMultipleCategories( val manga: Manga, val categories: List, - context: Context + context: Context, ) : BadLibraryState(context.getString(R.string.favorites_sync_manga_in_multiple_categories, manga.title, categories.joinToString { it.name })) } @@ -449,7 +449,7 @@ sealed class FavoritesSyncStatus(val message: String) { context.getString(R.string.favorites_sync_processing_throttle, message) } else { message - } + }, ) { val delayedMessage get() = if (title != null) this.message + "\n\n" + title else null } diff --git a/app/src/main/java/exh/favorites/LocalFavoritesStorage.kt b/app/src/main/java/exh/favorites/LocalFavoritesStorage.kt index 0f6b51708..3853e40f1 100644 --- a/app/src/main/java/exh/favorites/LocalFavoritesStorage.kt +++ b/app/src/main/java/exh/favorites/LocalFavoritesStorage.kt @@ -82,7 +82,7 @@ class LocalFavoritesStorage { dbCategories.indexOf( category.firstOrNull() - ?: return@mapNotNull null + ?: return@mapNotNull null, ) to it } } @@ -95,7 +95,7 @@ class LocalFavoritesStorage { title = manga.originalTitle, gid = EHentaiSearchMetadata.galleryId(manga.url), token = EHentaiSearchMetadata.galleryToken(manga.url), - category = categoryId + category = categoryId, ).also { if (it.category > MAX_CATEGORIES) { return@mapNotNull null @@ -113,5 +113,5 @@ class LocalFavoritesStorage { data class ChangeSet( val added: List, - val removed: List + val removed: List, ) diff --git a/app/src/main/java/exh/favorites/sql/mappers/FavoriteEntryTypeMapping.kt b/app/src/main/java/exh/favorites/sql/mappers/FavoriteEntryTypeMapping.kt index 83104c166..2197f4a51 100644 --- a/app/src/main/java/exh/favorites/sql/mappers/FavoriteEntryTypeMapping.kt +++ b/app/src/main/java/exh/favorites/sql/mappers/FavoriteEntryTypeMapping.kt @@ -20,7 +20,7 @@ import exh.favorites.sql.tables.FavoriteEntryTable.TABLE class FavoriteEntryTypeMapping : SQLiteTypeMapping( FavoriteEntryPutResolver(), FavoriteEntryGetResolver(), - FavoriteEntryDeleteResolver() + FavoriteEntryDeleteResolver(), ) class FavoriteEntryPutResolver : DefaultPutResolver() { @@ -40,7 +40,7 @@ class FavoriteEntryPutResolver : DefaultPutResolver() { COL_TITLE to obj.title, COL_GID to obj.gid, COL_TOKEN to obj.token, - COL_CATEGORY to obj.category + COL_CATEGORY to obj.category, ) } @@ -51,7 +51,7 @@ class FavoriteEntryGetResolver : DefaultGetResolver() { title = cursor.getString(cursor.getColumnIndexOrThrow(COL_TITLE)), gid = cursor.getString(cursor.getColumnIndexOrThrow(COL_GID)), token = cursor.getString(cursor.getColumnIndexOrThrow(COL_TOKEN)), - category = cursor.getInt(cursor.getColumnIndexOrThrow(COL_CATEGORY)) + category = cursor.getInt(cursor.getColumnIndexOrThrow(COL_CATEGORY)), ) } diff --git a/app/src/main/java/exh/favorites/sql/queries/FavoriteEntryQueries.kt b/app/src/main/java/exh/favorites/sql/queries/FavoriteEntryQueries.kt index 1abe99886..9f7681255 100644 --- a/app/src/main/java/exh/favorites/sql/queries/FavoriteEntryQueries.kt +++ b/app/src/main/java/exh/favorites/sql/queries/FavoriteEntryQueries.kt @@ -12,7 +12,7 @@ interface FavoriteEntryQueries : DbProvider { .withQuery( Query.builder() .table(FavoriteEntryTable.TABLE) - .build() + .build(), ) .prepare() @@ -24,7 +24,7 @@ interface FavoriteEntryQueries : DbProvider { .byQuery( DeleteQuery.builder() .table(FavoriteEntryTable.TABLE) - .build() + .build(), ) .prepare() } diff --git a/app/src/main/java/exh/favorites/sql/tables/FavoriteEntryTable.kt b/app/src/main/java/exh/favorites/sql/tables/FavoriteEntryTable.kt index 6cf51ab28..e29e2914c 100644 --- a/app/src/main/java/exh/favorites/sql/tables/FavoriteEntryTable.kt +++ b/app/src/main/java/exh/favorites/sql/tables/FavoriteEntryTable.kt @@ -27,6 +27,6 @@ object FavoriteEntryTable { val fixTableQuery: String get() = createTableQuery.replace( "CREATE TABLE", - "CREATE TABLE IF NOT EXISTS" + "CREATE TABLE IF NOT EXISTS", ) } diff --git a/app/src/main/java/exh/log/EHDebugModeOverlay.kt b/app/src/main/java/exh/log/EHDebugModeOverlay.kt index 28424bda3..2820ff205 100644 --- a/app/src/main/java/exh/log/EHDebugModeOverlay.kt +++ b/app/src/main/java/exh/log/EHDebugModeOverlay.kt @@ -34,7 +34,7 @@ class EHDebugModeOverlay(private val context: Context) : OverlayModule(n val view = LinearLayout(root.context).apply { layoutParams = ViewGroup.LayoutParams( ViewGroup.LayoutParams.WRAP_CONTENT, - ViewGroup.LayoutParams.WRAP_CONTENT + ViewGroup.LayoutParams.WRAP_CONTENT, ) setPadding(4.dpToPx, 0, 4.dpToPx, 4.dpToPx) } @@ -46,7 +46,7 @@ class EHDebugModeOverlay(private val context: Context) : OverlayModule(n text = HtmlCompat.fromHtml(buildInfo(), HtmlCompat.FROM_HTML_MODE_LEGACY) layoutParams = LinearLayout.LayoutParams( ViewGroup.LayoutParams.WRAP_CONTENT, - ViewGroup.LayoutParams.WRAP_CONTENT + ViewGroup.LayoutParams.WRAP_CONTENT, ) } diff --git a/app/src/main/java/exh/log/EnhancedFilePrinter.kt b/app/src/main/java/exh/log/EnhancedFilePrinter.kt index 63fd559e6..e3269c2aa 100644 --- a/app/src/main/java/exh/log/EnhancedFilePrinter.kt +++ b/app/src/main/java/exh/log/EnhancedFilePrinter.kt @@ -31,7 +31,7 @@ class EnhancedFilePrinter internal constructor( private val fileNameGenerator: FileNameGenerator, private val backupStrategy: BackupStrategy, private val cleanStrategy: CleanStrategy, - private val flattener: Flattener + private val flattener: Flattener, ) : Printer { /** * Log writer. @@ -191,7 +191,7 @@ class EnhancedFilePrinter internal constructor( fileNameGenerator ?: DefaultsFactory.createFileNameGenerator(), backupStrategy ?: DefaultsFactory.createBackupStrategy(), cleanStrategy ?: DefaultsFactory.createCleanStrategy(), - flattener ?: DefaultsFactory.createFlattener2() + flattener ?: DefaultsFactory.createFlattener2(), ) } diff --git a/app/src/main/java/exh/log/Logging.kt b/app/src/main/java/exh/log/Logging.kt index 8dd921248..d2a740509 100644 --- a/app/src/main/java/exh/log/Logging.kt +++ b/app/src/main/java/exh/log/Logging.kt @@ -64,7 +64,7 @@ sealed class LogLevel(val int: Int, val androidLevel: Int) { Info, Debug, Verbose, - All + All, ) } } diff --git a/app/src/main/java/exh/md/MangaDexFabHeaderAdapter.kt b/app/src/main/java/exh/md/MangaDexFabHeaderAdapter.kt index 6d9635d71..e3aa8e629 100644 --- a/app/src/main/java/exh/md/MangaDexFabHeaderAdapter.kt +++ b/app/src/main/java/exh/md/MangaDexFabHeaderAdapter.kt @@ -46,8 +46,8 @@ class MangaDexFabHeaderAdapter(val controller: BaseController<*>, val source: Ca controller.router.replaceTopController( BrowseSourceController( source, - "id:$randomMangaUrl" - ).withFadeTransaction() + "id:$randomMangaUrl", + ).withFadeTransaction(), ) onClick() }.launchIn(controller.viewScope) diff --git a/app/src/main/java/exh/md/dto/MangaDto.kt b/app/src/main/java/exh/md/dto/MangaDto.kt index 8e60fc30d..43fa77d9d 100644 --- a/app/src/main/java/exh/md/dto/MangaDto.kt +++ b/app/src/main/java/exh/md/dto/MangaDto.kt @@ -8,7 +8,7 @@ data class MangaListDto( override val limit: Int, override val offset: Int, override val total: Int, - override val data: List + override val data: List, ) : ListCallDto @Serializable @@ -44,12 +44,12 @@ data class MangaAttributesDto( @Serializable data class TagDto( val id: String, - val attributes: TagAttributesDto + val attributes: TagAttributesDto, ) @Serializable data class TagAttributesDto( - val name: Map + val name: Map, ) @Serializable diff --git a/app/src/main/java/exh/md/dto/MangaPlusDto.kt b/app/src/main/java/exh/md/dto/MangaPlusDto.kt index c2f063a4c..41b5ace44 100644 --- a/app/src/main/java/exh/md/dto/MangaPlusDto.kt +++ b/app/src/main/java/exh/md/dto/MangaPlusDto.kt @@ -10,7 +10,7 @@ data class MangaPlusResponse( @Serializable data class SuccessResult( - @ProtoNumber(10) val mangaViewer: MangaViewer? = null + @ProtoNumber(10) val mangaViewer: MangaViewer? = null, ) @Serializable @@ -24,5 +24,5 @@ data class MangaPage( @ProtoNumber(1) val imageUrl: String, @ProtoNumber(2) val width: Int, @ProtoNumber(3) val height: Int, - @ProtoNumber(5) val encryptionKey: String? = null + @ProtoNumber(5) val encryptionKey: String? = null, ) diff --git a/app/src/main/java/exh/md/dto/RatingDto.kt b/app/src/main/java/exh/md/dto/RatingDto.kt index ec682cc90..f44f31e81 100644 --- a/app/src/main/java/exh/md/dto/RatingDto.kt +++ b/app/src/main/java/exh/md/dto/RatingDto.kt @@ -5,13 +5,13 @@ import kotlinx.serialization.json.JsonElement @Serializable data class RatingResponseDto( - val ratings: JsonElement + val ratings: JsonElement, ) @Serializable data class PersonalRatingDto( val rating: Int, - val createdAt: String + val createdAt: String, ) @Serializable diff --git a/app/src/main/java/exh/md/dto/SimilarDto.kt b/app/src/main/java/exh/md/dto/SimilarDto.kt index db9985fed..3643fb452 100644 --- a/app/src/main/java/exh/md/dto/SimilarDto.kt +++ b/app/src/main/java/exh/md/dto/SimilarDto.kt @@ -33,7 +33,7 @@ data class RelationDto( @Serializable data class RelationMangaDto( - val id: String + val id: String, ) @Serializable diff --git a/app/src/main/java/exh/md/dto/StatisticsDto.kt b/app/src/main/java/exh/md/dto/StatisticsDto.kt index 3081c2531..44ace17be 100644 --- a/app/src/main/java/exh/md/dto/StatisticsDto.kt +++ b/app/src/main/java/exh/md/dto/StatisticsDto.kt @@ -4,15 +4,15 @@ import kotlinx.serialization.Serializable @Serializable data class StatisticsDto( - val statistics: Map + val statistics: Map, ) @Serializable data class StatisticsMangaDto( - val rating: StatisticsMangaRatingDto + val rating: StatisticsMangaRatingDto, ) @Serializable data class StatisticsMangaRatingDto( - val average: Double? + val average: Double?, ) diff --git a/app/src/main/java/exh/md/follows/MangaDexFollowsController.kt b/app/src/main/java/exh/md/follows/MangaDexFollowsController.kt index c4b0f3027..e46049cf7 100644 --- a/app/src/main/java/exh/md/follows/MangaDexFollowsController.kt +++ b/app/src/main/java/exh/md/follows/MangaDexFollowsController.kt @@ -15,8 +15,8 @@ class MangaDexFollowsController(bundle: Bundle) : BrowseSourceController(bundle) constructor(source: CatalogueSource) : this( bundleOf( - SOURCE_ID_KEY to source.id - ) + SOURCE_ID_KEY to source.id, + ), ) override fun getTitle(): String? { diff --git a/app/src/main/java/exh/md/handlers/ApiMangaParser.kt b/app/src/main/java/exh/md/handlers/ApiMangaParser.kt index cf5e80814..08460fbb5 100644 --- a/app/src/main/java/exh/md/handlers/ApiMangaParser.kt +++ b/app/src/main/java/exh/md/handlers/ApiMangaParser.kt @@ -23,7 +23,7 @@ import uy.kohesive.injekt.injectLazy import java.util.Locale class ApiMangaParser( - private val lang: String + private val lang: String, ) { val db: DatabaseHelper by injectLazy() @@ -42,7 +42,7 @@ class ApiMangaParser( sourceId: Long, input: MangaDto, simpleChapters: List, - statistics: StatisticsMangaDto? + statistics: StatisticsMangaDto?, ): MangaInfo { val mangaId = db.getManga(manga.key, sourceId).executeAsBlocking()?.id val metadata = if (mangaId != null) { @@ -63,13 +63,13 @@ class ApiMangaParser( metadata: MangaDexSearchMetadata, mangaDto: MangaDto, simpleChapters: List, - statistics: StatisticsMangaDto? + statistics: StatisticsMangaDto?, ) { with(metadata) { try { val mangaAttributesDto = mangaDto.data.attributes mdUuid = mangaDto.data.id - title = MdUtil.cleanString(MdUtil.getTitleFromManga(mangaAttributesDto, lang,)) + title = MdUtil.cleanString(MdUtil.getTitleFromManga(mangaAttributesDto, lang)) altTitles = mangaAttributesDto.altTitles.mapNotNull { it[lang] }.nullIfEmpty() val mangaRelationshipsDto = mangaDto.data.relationships @@ -85,8 +85,8 @@ class ApiMangaParser( MdUtil.getFromLangMap( langMap = mangaAttributesDto.description.asMdMap(), currentLang = lang, - originalLanguage = mangaAttributesDto.originalLanguage - ).orEmpty() + originalLanguage = mangaAttributesDto.originalLanguage, + ).orEmpty(), ) authors = mangaRelationshipsDto.filter { relationshipDto -> diff --git a/app/src/main/java/exh/md/handlers/BilibiliHandler.kt b/app/src/main/java/exh/md/handlers/BilibiliHandler.kt index 6d4d36aa0..55575fb9c 100644 --- a/app/src/main/java/exh/md/handlers/BilibiliHandler.kt +++ b/app/src/main/java/exh/md/handlers/BilibiliHandler.kt @@ -87,7 +87,7 @@ class BilibiliHandler(currentClient: OkHttpClient) { return POST( "$baseUrl/$BASE_API_ENDPOINT/ComicDetail?device=pc&platform=web", headers = newHeaders, - body = requestBody + body = requestBody, ) } @@ -136,7 +136,7 @@ class BilibiliHandler(currentClient: OkHttpClient) { return POST( "$baseUrl/$BASE_API_ENDPOINT/GetImageIndex?device=pc&platform=web", headers = newHeaders, - body = requestBody + body = requestBody, ) } @@ -173,7 +173,7 @@ class BilibiliHandler(currentClient: OkHttpClient) { return POST( "$baseUrl/$BASE_API_ENDPOINT/ImageToken?device=pc&platform=web", headers = newHeaders, - body = requestBody + body = requestBody, ) } @@ -187,24 +187,24 @@ class BilibiliHandler(currentClient: OkHttpClient) { @Serializable data class BilibiliPageDto( val token: String, - val url: String + val url: String, ) @Serializable data class BilibiliResultDto( val code: Int = 0, val data: T? = null, - @SerialName("msg") val message: String = "" + @SerialName("msg") val message: String = "", ) @Serializable data class BilibiliReader( - val images: List = emptyList() + val images: List = emptyList(), ) @Serializable data class BilibiliImageDto( - val path: String + val path: String, ) @Serializable @@ -218,7 +218,7 @@ class BilibiliHandler(currentClient: OkHttpClient) { @SerialName("season_id") val seasonId: Int = 0, val styles: List = emptyList(), val title: String, - @SerialName("vertical_cover") val verticalCover: String = "" + @SerialName("vertical_cover") val verticalCover: String = "", ) @Serializable @@ -227,7 +227,7 @@ class BilibiliHandler(currentClient: OkHttpClient) { @SerialName("is_locked") val isLocked: Boolean, @SerialName("ord") val order: Float, @SerialName("pub_time") val publicationTime: String, - val title: String + val title: String, ) companion object { diff --git a/app/src/main/java/exh/md/handlers/FilterHandler.kt b/app/src/main/java/exh/md/handlers/FilterHandler.kt index 7770815eb..0335e50f5 100644 --- a/app/src/main/java/exh/md/handlers/FilterHandler.kt +++ b/app/src/main/java/exh/md/handlers/FilterHandler.kt @@ -13,7 +13,7 @@ class FilterHandler { SortFilter(sortableList.map { it.first }.toTypedArray()), TagList(getTags()), TagInclusionMode(), - TagExclusionMode() + TagExclusionMode(), ).toMutableList() if (true) { // preferencesHelper.showR18Filter()) { @@ -32,7 +32,7 @@ class FilterHandler { Demographic("Shounen"), Demographic("Shoujo"), Demographic("Seinen"), - Demographic("Josei") + Demographic("Josei"), ) private class Status(name: String) : Filter.CheckBox(name) @@ -54,7 +54,7 @@ class FilterHandler { ContentRating("Safe"), ContentRating("Suggestive"), ContentRating("Erotica"), - ContentRating("Pornographic") + ContentRating("Pornographic"), ) private class OriginalLanguage(name: String, val isoCode: String) : Filter.CheckBox(name) @@ -147,7 +147,7 @@ class FilterHandler { Tag("8c86611e-fab7-4986-9dec-d1a2f44acdd5", "Virtual Reality"), Tag("e197df38-d0e7-43b5-9b09-2842d0c326dd", "Web Comic"), Tag("acc803a4-c95a-4c22-86fc-eb6b582d82a2", "Wuxia"), - Tag("631ef465-9aba-4afb-b0fc-ea10efe274a8", "Zombies") + Tag("631ef465-9aba-4afb-b0fc-ea10efe274a8", "Zombies"), ) private class TagInclusionMode : diff --git a/app/src/main/java/exh/md/handlers/FollowsHandler.kt b/app/src/main/java/exh/md/handlers/FollowsHandler.kt index 33a292174..1998a81fa 100644 --- a/app/src/main/java/exh/md/handlers/FollowsHandler.kt +++ b/app/src/main/java/exh/md/handlers/FollowsHandler.kt @@ -20,7 +20,7 @@ import kotlinx.coroutines.async class FollowsHandler( private val lang: String, - private val service: MangaDexAuthService + private val service: MangaDexAuthService, ) { /** @@ -48,7 +48,7 @@ class FollowsHandler( */ private fun followsParseMangaPage( response: List, - statuses: Map + statuses: Map, ): List> { val comparator = compareBy> { it.second.followStatus } .thenBy { it.first.title } @@ -56,7 +56,7 @@ class FollowsHandler( return response.map { MdUtil.createMangaEntry( it, - lang + lang, ).toSManga() to MangaDexSearchMetadata().apply { followStatus = FollowStatus.fromDex(statuses[it.id]).int } diff --git a/app/src/main/java/exh/md/handlers/MangaHandler.kt b/app/src/main/java/exh/md/handlers/MangaHandler.kt index 85b57427b..d9d95d99b 100644 --- a/app/src/main/java/exh/md/handlers/MangaHandler.kt +++ b/app/src/main/java/exh/md/handlers/MangaHandler.kt @@ -26,7 +26,7 @@ class MangaHandler( private val lang: String, private val service: MangaDexService, private val apiMangaParser: ApiMangaParser, - private val followsHandler: FollowsHandler + private val followsHandler: FollowsHandler, ) { suspend fun getMangaDetails(manga: MangaInfo, sourceId: Long): MangaInfo { return coroutineScope { @@ -39,7 +39,7 @@ class MangaHandler( sourceId, response.await(), simpleChapters.await(), - statistics.await() + statistics.await(), ) } } @@ -62,7 +62,7 @@ class MangaHandler( lang, it, blockedGroups, - blockedUploaders + blockedUploaders, ) } diff --git a/app/src/main/java/exh/md/handlers/MangaPlusHandler.kt b/app/src/main/java/exh/md/handlers/MangaPlusHandler.kt index bc5bbaaa4..c8d08496f 100644 --- a/app/src/main/java/exh/md/handlers/MangaPlusHandler.kt +++ b/app/src/main/java/exh/md/handlers/MangaPlusHandler.kt @@ -35,7 +35,7 @@ class MangaPlusHandler(currentClient: OkHttpClient) { private fun pageListRequest(chapterId: String): Request { return GET( "$baseUrl/manga_viewer?chapter_id=$chapterId&split=yes&img_quality=super_high", - headers + headers, ) } diff --git a/app/src/main/java/exh/md/handlers/PageHandler.kt b/app/src/main/java/exh/md/handlers/PageHandler.kt index d1bc3afcb..d8da67b7a 100644 --- a/app/src/main/java/exh/md/handlers/PageHandler.kt +++ b/app/src/main/java/exh/md/handlers/PageHandler.kt @@ -38,20 +38,20 @@ class PageHandler( if (chapterResponse.data.attributes.externalUrl != null && chapterResponse.data.attributes.pages == 0) { when { chapter.scanlator.equals("mangaplus", true) -> mangaPlusHandler.fetchPageList( - chapterResponse.data.attributes.externalUrl + chapterResponse.data.attributes.externalUrl, ) /*chapter.scanlator.equals("comikey", true) -> comikeyHandler.fetchPageList( chapterResponse.data.attributes.externalUrl )*/ chapter.scanlator.equals("bilibili comics", true) -> bilibiliHandler.fetchPageList( chapterResponse.data.attributes.externalUrl, - chapterResponse.data.attributes.chapter.toString() + chapterResponse.data.attributes.chapter.toString(), ) chapter.scanlator.equals("azuki manga", true) -> azukiHandler.fetchPageList( - chapterResponse.data.attributes.externalUrl + chapterResponse.data.attributes.externalUrl, ) chapter.scanlator.equals("mangahot", true) -> mangaHotHandler.fetchPageList( - chapterResponse.data.attributes.externalUrl + chapterResponse.data.attributes.externalUrl, ) else -> throw Exception("${chapter.scanlator} not supported") } diff --git a/app/src/main/java/exh/md/handlers/SimilarHandler.kt b/app/src/main/java/exh/md/handlers/SimilarHandler.kt index a0938d661..1245e555a 100644 --- a/app/src/main/java/exh/md/handlers/SimilarHandler.kt +++ b/app/src/main/java/exh/md/handlers/SimilarHandler.kt @@ -15,7 +15,7 @@ import tachiyomi.source.model.MangaInfo class SimilarHandler( private val lang: String, private val service: MangaDexService, - private val similarService: SimilarService + private val similarService: SimilarService, ) { suspend fun getSimilar(manga: MangaInfo): MetadataMangasPage { @@ -61,7 +61,7 @@ class SimilarHandler( it.relation = relatedListDto.data.firstOrNull { it.relationships.any { it.id == MdUtil.getMangaId(manga.url) } } ?.attributes?.relation?.let(MangaDexRelation::fromDex) } - } + }, ) } } diff --git a/app/src/main/java/exh/md/network/MangaDexLoginHelper.kt b/app/src/main/java/exh/md/network/MangaDexLoginHelper.kt index 9fe159d97..377616150 100644 --- a/app/src/main/java/exh/md/network/MangaDexLoginHelper.kt +++ b/app/src/main/java/exh/md/network/MangaDexLoginHelper.kt @@ -56,7 +56,7 @@ class MangaDexLoginHelper(val authServiceLazy: Lazy, val pr MdUtil.updateLoginToken( loginResponseDto.token, preferences, - mdList + mdList, ) true } else { diff --git a/app/src/main/java/exh/md/service/MangaDexAuthService.kt b/app/src/main/java/exh/md/service/MangaDexAuthService.kt index de2dd6b6f..8ac0e3427 100644 --- a/app/src/main/java/exh/md/service/MangaDexAuthService.kt +++ b/app/src/main/java/exh/md/service/MangaDexAuthService.kt @@ -32,7 +32,7 @@ class MangaDexAuthService( private val client: OkHttpClient, private val headers: Headers, private val preferences: PreferencesHelper, - private val mdList: MdList + private val mdList: MdList, ) { private val noAuthenticatorClient = client.newBuilder() .authenticator(Authenticator.NONE) @@ -41,7 +41,7 @@ class MangaDexAuthService( fun getHeaders() = MdUtil.getAuthHeaders( headers, preferences, - mdList + mdList, ) suspend fun login(request: LoginRequestDto): LoginResponseDto { @@ -49,8 +49,8 @@ class MangaDexAuthService( POST( MdApi.login, body = MdUtil.encodeToBody(request), - cache = CacheControl.FORCE_NETWORK - ) + cache = CacheControl.FORCE_NETWORK, + ), ).await().parseAs(MdUtil.jsonParser) } @@ -59,8 +59,8 @@ class MangaDexAuthService( POST( MdApi.logout, getHeaders(), - cache = CacheControl.FORCE_NETWORK - ) + cache = CacheControl.FORCE_NETWORK, + ), ).await().parseAs(MdUtil.jsonParser) } @@ -69,8 +69,8 @@ class MangaDexAuthService( GET( MdApi.checkToken, getHeaders(), - CacheControl.FORCE_NETWORK - ) + CacheControl.FORCE_NETWORK, + ), ).await().parseAs(MdUtil.jsonParser) } @@ -80,8 +80,8 @@ class MangaDexAuthService( MdApi.refreshToken, getHeaders(), body = MdUtil.encodeToBody(request), - cache = CacheControl.FORCE_NETWORK - ) + cache = CacheControl.FORCE_NETWORK, + ), ).await().parseAs(MdUtil.jsonParser) } @@ -90,8 +90,8 @@ class MangaDexAuthService( GET( "${MdApi.userFollows}?limit=100&offset=$offset&includes[]=${MdConstants.Types.coverArt}", getHeaders(), - CacheControl.FORCE_NETWORK - ) + CacheControl.FORCE_NETWORK, + ), ).await().parseAs(MdUtil.jsonParser) } @@ -100,8 +100,8 @@ class MangaDexAuthService( GET( "${MdApi.manga}/$mangaId/status", getHeaders(), - CacheControl.FORCE_NETWORK - ) + CacheControl.FORCE_NETWORK, + ), ).await().parseAs(MdUtil.jsonParser) } @@ -110,8 +110,8 @@ class MangaDexAuthService( GET( "${MdApi.manga}/$mangaId/read", getHeaders(), - CacheControl.FORCE_NETWORK - ) + CacheControl.FORCE_NETWORK, + ), ).await().parseAs(MdUtil.jsonParser) } @@ -124,8 +124,8 @@ class MangaDexAuthService( "${MdApi.manga}/$mangaId/status", getHeaders(), body = MdUtil.encodeToBody(readingStatusDto), - cache = CacheControl.FORCE_NETWORK - ) + cache = CacheControl.FORCE_NETWORK, + ), ).await().parseAs(MdUtil.jsonParser) } @@ -134,8 +134,8 @@ class MangaDexAuthService( GET( MdApi.readingStatusForAllManga, getHeaders(), - cache = CacheControl.FORCE_NETWORK - ) + cache = CacheControl.FORCE_NETWORK, + ), ).await().parseAs(MdUtil.jsonParser) } @@ -144,8 +144,8 @@ class MangaDexAuthService( GET( "${MdApi.readingStatusForAllManga}?status=$status", getHeaders(), - cache = CacheControl.FORCE_NETWORK - ) + cache = CacheControl.FORCE_NETWORK, + ), ).await().parseAs(MdUtil.jsonParser) } @@ -154,8 +154,8 @@ class MangaDexAuthService( POST( "${MdApi.chapter}/$chapterId/read", getHeaders(), - cache = CacheControl.FORCE_NETWORK - ) + cache = CacheControl.FORCE_NETWORK, + ), ).await().parseAs(MdUtil.jsonParser) } @@ -166,7 +166,7 @@ class MangaDexAuthService( .delete() .headers(getHeaders()) .cacheControl(CacheControl.FORCE_NETWORK) - .build() + .build(), ).await().parseAs(MdUtil.jsonParser) } @@ -175,8 +175,8 @@ class MangaDexAuthService( POST( "${MdApi.manga}/$mangaId/follow", getHeaders(), - cache = CacheControl.FORCE_NETWORK - ) + cache = CacheControl.FORCE_NETWORK, + ), ).await().parseAs(MdUtil.jsonParser) } @@ -187,7 +187,7 @@ class MangaDexAuthService( .delete() .headers(getHeaders()) .cacheControl(CacheControl.FORCE_NETWORK) - .build() + .build(), ).await().parseAs(MdUtil.jsonParser) } @@ -197,8 +197,8 @@ class MangaDexAuthService( "${MdApi.rating}/$mangaId", getHeaders(), body = MdUtil.encodeToBody(RatingDto(rating)), - cache = CacheControl.FORCE_NETWORK - ) + cache = CacheControl.FORCE_NETWORK, + ), ).await().parseAs(MdUtil.jsonParser) } @@ -209,7 +209,7 @@ class MangaDexAuthService( .url("${MdApi.rating}/$mangaId") .headers(getHeaders()) .cacheControl(CacheControl.FORCE_NETWORK) - .build() + .build(), ).await().parseAs(MdUtil.jsonParser) } @@ -226,8 +226,8 @@ class MangaDexAuthService( .build() .toString(), getHeaders(), - cache = CacheControl.FORCE_NETWORK - ) + cache = CacheControl.FORCE_NETWORK, + ), ).await().parseAs(MdUtil.jsonParser) } } diff --git a/app/src/main/java/exh/md/service/MangaDexService.kt b/app/src/main/java/exh/md/service/MangaDexService.kt index 791910853..cd3c89eb7 100644 --- a/app/src/main/java/exh/md/service/MangaDexService.kt +++ b/app/src/main/java/exh/md/service/MangaDexService.kt @@ -25,11 +25,11 @@ import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.OkHttpClient class MangaDexService( - private val client: OkHttpClient + private val client: OkHttpClient, ) { suspend fun viewMangas( - ids: List + ids: List, ): MangaListDto { return client.newCall( GET( @@ -44,13 +44,13 @@ class MangaDexService( } .build() .toString(), - cache = CacheControl.FORCE_NETWORK - ) + cache = CacheControl.FORCE_NETWORK, + ), ).await().parseAs(MdUtil.jsonParser) } suspend fun viewManga( - id: String + id: String, ): MangaDto { return client.newCall( GET( @@ -64,13 +64,13 @@ class MangaDexService( } .build() .toString(), - cache = CacheControl.FORCE_NETWORK - ) + cache = CacheControl.FORCE_NETWORK, + ), ).await().parseAs(MdUtil.jsonParser) } suspend fun mangasRating( - vararg ids: String + vararg ids: String, ): StatisticsDto { return client.newCall( GET( @@ -83,14 +83,14 @@ class MangaDexService( } .build() .toString(), - cache = CacheControl.FORCE_NETWORK - ) + cache = CacheControl.FORCE_NETWORK, + ), ).await().parseAs(MdUtil.jsonParser) } suspend fun aggregateChapters( id: String, - translatedLanguage: String + translatedLanguage: String, ): AggregateDto { return client.newCall( GET( @@ -103,8 +103,8 @@ class MangaDexService( } .build() .toString(), - cache = CacheControl.FORCE_NETWORK - ) + cache = CacheControl.FORCE_NETWORK, + ), ).await().parseAs(MdUtil.jsonParser) } @@ -115,7 +115,7 @@ class MangaDexService( translatedLanguage: String, offset: Int, blockedGroups: String, - blockedUploaders: String + blockedUploaders: String, ): ChapterListDto { val url = MdApi.manga.toHttpUrl() .newBuilder() @@ -145,8 +145,8 @@ class MangaDexService( return client.newCall( GET( url, - cache = CacheControl.FORCE_NETWORK - ) + cache = CacheControl.FORCE_NETWORK, + ), ).await().parseAs(MdUtil.jsonParser) } @@ -167,14 +167,14 @@ class MangaDexService( POST( MdConstants.atHomeReportUrl, body = MdUtil.encodeToBody(atHomeImageReportDto), - cache = CacheControl.FORCE_NETWORK - ) + cache = CacheControl.FORCE_NETWORK, + ), ).await().parseAs(MdUtil.jsonParser) } suspend fun getAtHomeServer( atHomeRequestUrl: String, - headers: Headers + headers: Headers, ): AtHomeDto { return client.newCall(GET(atHomeRequestUrl, headers, CacheControl.FORCE_NETWORK)) .await() @@ -191,8 +191,8 @@ class MangaDexService( } .build() .toString(), - cache = CacheControl.FORCE_NETWORK - ) + cache = CacheControl.FORCE_NETWORK, + ), ).await().parseAs(MdUtil.jsonParser) } } diff --git a/app/src/main/java/exh/md/service/SimilarService.kt b/app/src/main/java/exh/md/service/SimilarService.kt index f24b26779..178e8ec29 100644 --- a/app/src/main/java/exh/md/service/SimilarService.kt +++ b/app/src/main/java/exh/md/service/SimilarService.kt @@ -8,13 +8,13 @@ import exh.md.utils.MdUtil import okhttp3.OkHttpClient class SimilarService( - private val client: OkHttpClient + private val client: OkHttpClient, ) { suspend fun getSimilarManga(mangaId: String): SimilarMangaDto { return client.newCall( GET( - "${MdUtil.similarBaseApi}$mangaId.json" - ) + "${MdUtil.similarBaseApi}$mangaId.json", + ), ).await().parseAs() } } diff --git a/app/src/main/java/exh/md/similar/MangaDexSimilarController.kt b/app/src/main/java/exh/md/similar/MangaDexSimilarController.kt index 2dc7d8901..c08822915 100644 --- a/app/src/main/java/exh/md/similar/MangaDexSimilarController.kt +++ b/app/src/main/java/exh/md/similar/MangaDexSimilarController.kt @@ -18,8 +18,8 @@ class MangaDexSimilarController(bundle: Bundle) : BrowseSourceController(bundle) bundleOf( MANGA_ID to manga.id!!, MANGA_TITLE to manga.title, - SOURCE_ID_KEY to source.id - ) + SOURCE_ID_KEY to source.id, + ), ) private val mangaTitle = args.getString(MANGA_TITLE) diff --git a/app/src/main/java/exh/md/similar/MangaDexSimilarPager.kt b/app/src/main/java/exh/md/similar/MangaDexSimilarPager.kt index cb7e74fd6..a77207112 100644 --- a/app/src/main/java/exh/md/similar/MangaDexSimilarPager.kt +++ b/app/src/main/java/exh/md/similar/MangaDexSimilarPager.kt @@ -24,7 +24,7 @@ class MangaDexSimilarPager(val manga: Manga, val source: MangaDex) : Pager() { MetadataMangasPage( relatedPage.mangas + similarPage.mangas, false, - relatedPage.mangasMetadata + similarPage.mangasMetadata + relatedPage.mangasMetadata + similarPage.mangasMetadata, ) } diff --git a/app/src/main/java/exh/md/utils/MdUtil.kt b/app/src/main/java/exh/md/utils/MdUtil.kt index e779b57f0..9d7120f8d 100644 --- a/app/src/main/java/exh/md/utils/MdUtil.kt +++ b/app/src/main/java/exh/md/utils/MdUtil.kt @@ -79,11 +79,11 @@ class MdUtil { "English :", "[English]:", "English Translaton:", - "[B][ENG][/B]" + "[B][ENG][/B]", ) val bbCodeToRemove = listOf( - "list", "*", "hr", "u", "b", "i", "s", "center", "spoiler=" + "list", "*", "hr", "u", "b", "i", "s", "center", "spoiler=", ) val descriptionLanguages = listOf( "=FRANCAIS=", @@ -274,7 +274,7 @@ class MdUtil { ?.fileName ?.let { coverFileName -> cdnCoverUrl(json.id, coverFileName) - }.orEmpty() + }.orEmpty(), ) } @@ -331,7 +331,7 @@ class MdUtil { fun getAuthHeaders(headers: Headers, preferences: PreferencesHelper, mdList: MdList) = headers.newBuilder().add( "Authorization", - "Bearer " + (sessionToken(preferences, mdList) ?: throw NoSessionException()) + "Bearer " + (sessionToken(preferences, mdList) ?: throw NoSessionException()), ).build() fun getEnabledMangaDex(preferences: PreferencesHelper, sourceManager: SourceManager = Injekt.get()): MangaDex? { diff --git a/app/src/main/java/exh/merged/sql/mappers/MergedMangaTypeMapping.kt b/app/src/main/java/exh/merged/sql/mappers/MergedMangaTypeMapping.kt index 68d60b043..309d815c6 100644 --- a/app/src/main/java/exh/merged/sql/mappers/MergedMangaTypeMapping.kt +++ b/app/src/main/java/exh/merged/sql/mappers/MergedMangaTypeMapping.kt @@ -27,7 +27,7 @@ import exh.merged.sql.tables.MergedTable.TABLE class MergedMangaTypeMapping : SQLiteTypeMapping( MergedMangaPutResolver(), MergedMangaGetResolver(), - MergedMangaDeleteResolver() + MergedMangaDeleteResolver(), ) class MergedMangaPutResolver : DefaultPutResolver() { @@ -53,7 +53,7 @@ class MergedMangaPutResolver : DefaultPutResolver() { COL_MERGE_URL to obj.mergeUrl, COL_MANGA_ID to obj.mangaId, COL_MANGA_URL to obj.mangaUrl, - COL_MANGA_SOURCE to obj.mangaSourceId + COL_MANGA_SOURCE to obj.mangaSourceId, ) } @@ -70,7 +70,7 @@ class MergedMangaGetResolver : DefaultGetResolver() { mergeUrl = cursor.getString(cursor.getColumnIndexOrThrow(COL_MERGE_URL)), mangaId = cursor.getLongOrNull(cursor.getColumnIndexOrThrow(COL_MANGA_ID)), mangaUrl = cursor.getString(cursor.getColumnIndexOrThrow(COL_MANGA_URL)), - mangaSourceId = cursor.getLong(cursor.getColumnIndexOrThrow(COL_MANGA_SOURCE)) + mangaSourceId = cursor.getLong(cursor.getColumnIndexOrThrow(COL_MANGA_SOURCE)), ) } diff --git a/app/src/main/java/exh/merged/sql/models/MergedMangaReference.kt b/app/src/main/java/exh/merged/sql/models/MergedMangaReference.kt index 790fbb256..6526b6b9d 100644 --- a/app/src/main/java/exh/merged/sql/models/MergedMangaReference.kt +++ b/app/src/main/java/exh/merged/sql/models/MergedMangaReference.kt @@ -32,7 +32,7 @@ data class MergedMangaReference( val mangaUrl: String, // source of the manga that is merged into this merge - val mangaSourceId: Long + val mangaSourceId: Long, ) { companion object { const val CHAPTER_SORT_NONE = 0 diff --git a/app/src/main/java/exh/merged/sql/queries/MergedQueries.kt b/app/src/main/java/exh/merged/sql/queries/MergedQueries.kt index 0f049a411..5ca921609 100644 --- a/app/src/main/java/exh/merged/sql/queries/MergedQueries.kt +++ b/app/src/main/java/exh/merged/sql/queries/MergedQueries.kt @@ -26,7 +26,7 @@ interface MergedQueries : DbProvider { .table(MergedTable.TABLE) .where("${MergedTable.COL_MERGE_ID} = ?") .whereArgs(mergedMangaId) - .build() + .build(), ) .prepare() @@ -37,7 +37,7 @@ interface MergedQueries : DbProvider { .table(MergedTable.TABLE) .where("${MergedTable.COL_MERGE_URL} = ?") .whereArgs(mergedMangaUrl) - .build() + .build(), ) .prepare() @@ -47,7 +47,7 @@ interface MergedQueries : DbProvider { .table(MergedTable.TABLE) .where("${MergedTable.COL_MERGE_ID} = ?") .whereArgs(mergedMangaId) - .build() + .build(), ) .prepare() @@ -57,7 +57,7 @@ interface MergedQueries : DbProvider { RawQuery.builder() .query(getMergedMangaQuery()) .args(mergedMangaId) - .build() + .build(), ) .prepare() @@ -67,7 +67,7 @@ interface MergedQueries : DbProvider { RawQuery.builder() .query(getMergedMangaFromUrlQuery()) .args(mergedMangaUrl) - .build() + .build(), ) .prepare() @@ -76,7 +76,7 @@ interface MergedQueries : DbProvider { .withQuery( RawQuery.builder() .query(getAllMergedMangaQuery()) - .build() + .build(), ) .prepare() @@ -86,7 +86,7 @@ interface MergedQueries : DbProvider { .table(MergedTable.TABLE) .where("${MergedTable.COL_MERGE_URL} = ?") .whereArgs(mergedMangaUrl) - .build() + .build(), ) .prepare() @@ -96,7 +96,7 @@ interface MergedQueries : DbProvider { Query.builder() .table(MergedTable.TABLE) .orderBy(MergedTable.COL_ID) - .build() + .build(), ) .prepare() @@ -107,7 +107,7 @@ interface MergedQueries : DbProvider { .query(getMergedChaptersQuery()) .args(mergedMangaId) .observesTables(ChapterTable.TABLE, MergedTable.TABLE) - .build() + .build(), ) .prepare() @@ -126,7 +126,7 @@ interface MergedQueries : DbProvider { fun deleteAllMergedManga() = db.delete().byQuery( DeleteQuery.builder() .table(MergedTable.TABLE) - .build() + .build(), ) .prepare() diff --git a/app/src/main/java/exh/merged/sql/resolvers/MergedMangaIdPutResolver.kt b/app/src/main/java/exh/merged/sql/resolvers/MergedMangaIdPutResolver.kt index 62cfbb687..aaf67f85a 100644 --- a/app/src/main/java/exh/merged/sql/resolvers/MergedMangaIdPutResolver.kt +++ b/app/src/main/java/exh/merged/sql/resolvers/MergedMangaIdPutResolver.kt @@ -26,6 +26,6 @@ class MergedMangaIdPutResolver : PutResolver() { .build() fun mapToContentValues(mergedMangaReference: MergedMangaReference) = contentValuesOf( - MergedTable.COL_MANGA_ID to mergedMangaReference.mangaId + MergedTable.COL_MANGA_ID to mergedMangaReference.mangaId, ) } diff --git a/app/src/main/java/exh/metadata/MetadataUtil.kt b/app/src/main/java/exh/metadata/MetadataUtil.kt index e775e445c..bb82752be 100755 --- a/app/src/main/java/exh/metadata/MetadataUtil.kt +++ b/app/src/main/java/exh/metadata/MetadataUtil.kt @@ -62,7 +62,7 @@ object MetadataUtil { "(wip)", "{wip}", "", - "wip" + "wip", ) val EX_DATE_FORMAT = SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.US) diff --git a/app/src/main/java/exh/metadata/metadata/EHentaiSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/EHentaiSearchMetadata.kt index a77a1f093..003e04603 100644 --- a/app/src/main/java/exh/metadata/metadata/EHentaiSearchMetadata.kt +++ b/app/src/main/java/exh/metadata/metadata/EHentaiSearchMetadata.kt @@ -85,7 +85,7 @@ class EHentaiSearchMetadata : RaisedSearchMetadata() { description = description, genres = genres, status = status, - cover = cover ?: manga.cover + cover = cover ?: manga.cover, ) } diff --git a/app/src/main/java/exh/metadata/metadata/EightMusesSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/EightMusesSearchMetadata.kt index 00e843b7a..0609bdef2 100644 --- a/app/src/main/java/exh/metadata/metadata/EightMusesSearchMetadata.kt +++ b/app/src/main/java/exh/metadata/metadata/EightMusesSearchMetadata.kt @@ -34,7 +34,7 @@ class EightMusesSearchMetadata : RaisedSearchMetadata() { cover = cover ?: manga.cover, artist = artist, genres = genres, - description = description + description = description, ) } @@ -44,7 +44,7 @@ class EightMusesSearchMetadata : RaisedSearchMetadata() { title?.let { getString(R.string.title) to it }, path.nullIfEmpty()?.joinToString("/", prefix = "/") ?.let { getString(R.string.path) to it }, - thumbnailUrl?.let { getString(R.string.thumbnail_url) to it } + thumbnailUrl?.let { getString(R.string.thumbnail_url) to it }, ) } } diff --git a/app/src/main/java/exh/metadata/metadata/HBrowseSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/HBrowseSearchMetadata.kt index 6e9e69906..dc3685c8a 100644 --- a/app/src/main/java/exh/metadata/metadata/HBrowseSearchMetadata.kt +++ b/app/src/main/java/exh/metadata/metadata/HBrowseSearchMetadata.kt @@ -41,7 +41,7 @@ class HBrowseSearchMetadata : RaisedSearchMetadata() { cover = cover ?: manga.cover, artist = artist, genres = genres, - description = description + description = description, ) } @@ -52,7 +52,7 @@ class HBrowseSearchMetadata : RaisedSearchMetadata() { hbUrl?.let { getString(R.string.url) to it }, thumbnail?.let { getString(R.string.thumbnail_url) to it }, title?.let { getString(R.string.title) to it }, - length?.let { getString(R.string.page_count) to it.toString() } + length?.let { getString(R.string.page_count) to it.toString() }, ) } } diff --git a/app/src/main/java/exh/metadata/metadata/HitomiSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/HitomiSearchMetadata.kt index 7fb828acf..5fe57001a 100644 --- a/app/src/main/java/exh/metadata/metadata/HitomiSearchMetadata.kt +++ b/app/src/main/java/exh/metadata/metadata/HitomiSearchMetadata.kt @@ -52,7 +52,7 @@ class HitomiSearchMetadata : RaisedSearchMetadata() { genres = genres, artist = artist, status = status, - description = description + description = description, ) } @@ -65,7 +65,7 @@ class HitomiSearchMetadata : RaisedSearchMetadata() { artists.nullIfEmpty()?.joinToString()?.let { getString(R.string.artist) to it }, genre?.let { getString(R.string.genre) to it }, language?.let { getString(R.string.language) to it }, - uploadDate?.let { getString(R.string.date_posted) to MetadataUtil.EX_DATE_FORMAT.format(Date(it)) } + uploadDate?.let { getString(R.string.date_posted) to MetadataUtil.EX_DATE_FORMAT.format(Date(it)) }, ) } } diff --git a/app/src/main/java/exh/metadata/metadata/MangaDexSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/MangaDexSearchMetadata.kt index 8044e8613..56d7fbe2e 100644 --- a/app/src/main/java/exh/metadata/metadata/MangaDexSearchMetadata.kt +++ b/app/src/main/java/exh/metadata/metadata/MangaDexSearchMetadata.kt @@ -70,7 +70,7 @@ class MangaDexSearchMetadata : RaisedSearchMetadata() { artist = artist ?: manga.artist, status = status ?: manga.status, genres = genres, - description = description ?: manga.description + description = description ?: manga.description, ) } diff --git a/app/src/main/java/exh/metadata/metadata/NHentaiSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/NHentaiSearchMetadata.kt index 0cd786a59..550c2c570 100644 --- a/app/src/main/java/exh/metadata/metadata/NHentaiSearchMetadata.kt +++ b/app/src/main/java/exh/metadata/metadata/NHentaiSearchMetadata.kt @@ -81,7 +81,7 @@ class NHentaiSearchMetadata : RaisedSearchMetadata() { artist = artist ?: manga.artist, genres = genres, status = status, - description = description + description = description, ) } diff --git a/app/src/main/java/exh/metadata/metadata/PervEdenSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/PervEdenSearchMetadata.kt index 0e765fc48..0c419e1ba 100644 --- a/app/src/main/java/exh/metadata/metadata/PervEdenSearchMetadata.kt +++ b/app/src/main/java/exh/metadata/metadata/PervEdenSearchMetadata.kt @@ -60,7 +60,7 @@ class PervEdenSearchMetadata : RaisedSearchMetadata() { artist = artist ?: manga.artist, status = status, genres = genres, - description = description + description = description, ) } diff --git a/app/src/main/java/exh/metadata/metadata/PururinSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/PururinSearchMetadata.kt index e56fb4599..2cea3e332 100644 --- a/app/src/main/java/exh/metadata/metadata/PururinSearchMetadata.kt +++ b/app/src/main/java/exh/metadata/metadata/PururinSearchMetadata.kt @@ -49,7 +49,7 @@ class PururinSearchMetadata : RaisedSearchMetadata() { cover = cover ?: manga.cover, artist = artist, genres = genres, - description = description + description = description, ) } diff --git a/app/src/main/java/exh/metadata/metadata/TsuminoSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/TsuminoSearchMetadata.kt index 6b7189585..e19a6ed8b 100644 --- a/app/src/main/java/exh/metadata/metadata/TsuminoSearchMetadata.kt +++ b/app/src/main/java/exh/metadata/metadata/TsuminoSearchMetadata.kt @@ -62,7 +62,7 @@ class TsuminoSearchMetadata : RaisedSearchMetadata() { artist = artist ?: manga.artist, status = status, genres = genres, - description = description + description = description, ) } diff --git a/app/src/main/java/exh/metadata/metadata/base/FlatMetadata.kt b/app/src/main/java/exh/metadata/metadata/base/FlatMetadata.kt index 3939aeb96..5c30a134f 100644 --- a/app/src/main/java/exh/metadata/metadata/base/FlatMetadata.kt +++ b/app/src/main/java/exh/metadata/metadata/base/FlatMetadata.kt @@ -19,7 +19,7 @@ import kotlin.reflect.KClass data class FlatMetadata( val metadata: SearchMetadata, val tags: List, - val titles: List + val titles: List, ) { inline fun raise(): T = raise(T::class) diff --git a/app/src/main/java/exh/metadata/metadata/base/RaisedSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/base/RaisedSearchMetadata.kt index 894f9b728..b1d3322f7 100644 --- a/app/src/main/java/exh/metadata/metadata/base/RaisedSearchMetadata.kt +++ b/app/src/main/java/exh/metadata/metadata/base/RaisedSearchMetadata.kt @@ -100,7 +100,7 @@ abstract class RaisedSearchMetadata { uploader, extra, indexedExtra, - 0 + 0, ), tags.map { SearchTag( @@ -108,7 +108,7 @@ abstract class RaisedSearchMetadata { mangaId, it.namespace, it.name, - it.type + it.type, ) }, titles.map { @@ -116,9 +116,9 @@ abstract class RaisedSearchMetadata { null, mangaId, it.title, - it.type + it.type, ) - } + }, ) } diff --git a/app/src/main/java/exh/metadata/metadata/base/RaisedTag.kt b/app/src/main/java/exh/metadata/metadata/base/RaisedTag.kt index 4c33606f2..cb21175ef 100644 --- a/app/src/main/java/exh/metadata/metadata/base/RaisedTag.kt +++ b/app/src/main/java/exh/metadata/metadata/base/RaisedTag.kt @@ -6,5 +6,5 @@ import kotlinx.serialization.Serializable data class RaisedTag( val namespace: String?, val name: String, - val type: Int + val type: Int, ) diff --git a/app/src/main/java/exh/metadata/metadata/base/RaisedTitle.kt b/app/src/main/java/exh/metadata/metadata/base/RaisedTitle.kt index db4927c3d..b6bfef3c1 100644 --- a/app/src/main/java/exh/metadata/metadata/base/RaisedTitle.kt +++ b/app/src/main/java/exh/metadata/metadata/base/RaisedTitle.kt @@ -5,5 +5,5 @@ import kotlinx.serialization.Serializable @Serializable data class RaisedTitle( val title: String, - val type: Int = 0 + val type: Int = 0, ) diff --git a/app/src/main/java/exh/metadata/sql/mappers/SearchMetadataTypeMapping.kt b/app/src/main/java/exh/metadata/sql/mappers/SearchMetadataTypeMapping.kt index 79b099a59..9f748bc2c 100755 --- a/app/src/main/java/exh/metadata/sql/mappers/SearchMetadataTypeMapping.kt +++ b/app/src/main/java/exh/metadata/sql/mappers/SearchMetadataTypeMapping.kt @@ -20,7 +20,7 @@ import exh.metadata.sql.tables.SearchMetadataTable.TABLE class SearchMetadataTypeMapping : SQLiteTypeMapping( SearchMetadataPutResolver(), SearchMetadataGetResolver(), - SearchMetadataDeleteResolver() + SearchMetadataDeleteResolver(), ) class SearchMetadataPutResolver : DefaultPutResolver() { @@ -52,7 +52,7 @@ class SearchMetadataGetResolver : DefaultGetResolver() { uploader = cursor.getString(cursor.getColumnIndexOrThrow(COL_UPLOADER)), extra = cursor.getString(cursor.getColumnIndexOrThrow(COL_EXTRA)), indexedExtra = cursor.getString(cursor.getColumnIndexOrThrow(COL_INDEXED_EXTRA)), - extraVersion = cursor.getInt(cursor.getColumnIndexOrThrow(COL_EXTRA_VERSION)) + extraVersion = cursor.getInt(cursor.getColumnIndexOrThrow(COL_EXTRA_VERSION)), ) } diff --git a/app/src/main/java/exh/metadata/sql/mappers/SearchTagTypeMapping.kt b/app/src/main/java/exh/metadata/sql/mappers/SearchTagTypeMapping.kt index 45fd9c7ce..191b41b82 100755 --- a/app/src/main/java/exh/metadata/sql/mappers/SearchTagTypeMapping.kt +++ b/app/src/main/java/exh/metadata/sql/mappers/SearchTagTypeMapping.kt @@ -20,7 +20,7 @@ import exh.metadata.sql.tables.SearchTagTable.TABLE class SearchTagTypeMapping : SQLiteTypeMapping( SearchTagPutResolver(), SearchTagGetResolver(), - SearchTagDeleteResolver() + SearchTagDeleteResolver(), ) class SearchTagPutResolver : DefaultPutResolver() { @@ -51,7 +51,7 @@ class SearchTagGetResolver : DefaultGetResolver() { mangaId = cursor.getLong(cursor.getColumnIndexOrThrow(COL_MANGA_ID)), namespace = cursor.getString(cursor.getColumnIndexOrThrow(COL_NAMESPACE)), name = cursor.getString(cursor.getColumnIndexOrThrow(COL_NAME)), - type = cursor.getInt(cursor.getColumnIndexOrThrow(COL_TYPE)) + type = cursor.getInt(cursor.getColumnIndexOrThrow(COL_TYPE)), ) } diff --git a/app/src/main/java/exh/metadata/sql/mappers/SearchTitleTypeMapping.kt b/app/src/main/java/exh/metadata/sql/mappers/SearchTitleTypeMapping.kt index b6e6516fc..57036a083 100755 --- a/app/src/main/java/exh/metadata/sql/mappers/SearchTitleTypeMapping.kt +++ b/app/src/main/java/exh/metadata/sql/mappers/SearchTitleTypeMapping.kt @@ -19,7 +19,7 @@ import exh.metadata.sql.tables.SearchTitleTable.TABLE class SearchTitleTypeMapping : SQLiteTypeMapping( SearchTitlePutResolver(), SearchTitleGetResolver(), - SearchTitleDeleteResolver() + SearchTitleDeleteResolver(), ) class SearchTitlePutResolver : DefaultPutResolver() { @@ -48,7 +48,7 @@ class SearchTitleGetResolver : DefaultGetResolver() { id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_ID)), mangaId = cursor.getLong(cursor.getColumnIndexOrThrow(COL_MANGA_ID)), title = cursor.getString(cursor.getColumnIndexOrThrow(COL_TITLE)), - type = cursor.getInt(cursor.getColumnIndexOrThrow(COL_TYPE)) + type = cursor.getInt(cursor.getColumnIndexOrThrow(COL_TYPE)), ) } diff --git a/app/src/main/java/exh/metadata/sql/models/SearchMetadata.kt b/app/src/main/java/exh/metadata/sql/models/SearchMetadata.kt index bb1bf377f..63a64b5c5 100644 --- a/app/src/main/java/exh/metadata/sql/models/SearchMetadata.kt +++ b/app/src/main/java/exh/metadata/sql/models/SearchMetadata.kt @@ -18,7 +18,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 diff --git a/app/src/main/java/exh/metadata/sql/models/SearchTag.kt b/app/src/main/java/exh/metadata/sql/models/SearchTag.kt index 87260b9ac..5a2896217 100644 --- a/app/src/main/java/exh/metadata/sql/models/SearchTag.kt +++ b/app/src/main/java/exh/metadata/sql/models/SearchTag.kt @@ -17,5 +17,5 @@ data class SearchTag( val name: String, // Tag type - val type: Int + val type: Int, ) diff --git a/app/src/main/java/exh/metadata/sql/models/SearchTitle.kt b/app/src/main/java/exh/metadata/sql/models/SearchTitle.kt index fa346b841..ac81353c1 100644 --- a/app/src/main/java/exh/metadata/sql/models/SearchTitle.kt +++ b/app/src/main/java/exh/metadata/sql/models/SearchTitle.kt @@ -14,5 +14,5 @@ data class SearchTitle( val title: String, // Title type, useful for distinguishing between main/alt titles - val type: Int + val type: Int, ) diff --git a/app/src/main/java/exh/metadata/sql/queries/SearchMetadataQueries.kt b/app/src/main/java/exh/metadata/sql/queries/SearchMetadataQueries.kt index 4e30d3928..76e1152bc 100755 --- a/app/src/main/java/exh/metadata/sql/queries/SearchMetadataQueries.kt +++ b/app/src/main/java/exh/metadata/sql/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/exh/metadata/sql/queries/SearchTagQueries.kt b/app/src/main/java/exh/metadata/sql/queries/SearchTagQueries.kt index 11a12e2b9..07202476f 100755 --- a/app/src/main/java/exh/metadata/sql/queries/SearchTagQueries.kt +++ b/app/src/main/java/exh/metadata/sql/queries/SearchTagQueries.kt @@ -15,7 +15,7 @@ interface SearchTagQueries : DbProvider { .table(SearchTagTable.TABLE) .where("${SearchTagTable.COL_MANGA_ID} = ?") .whereArgs(mangaId) - .build() + .build(), ) .prepare() @@ -25,7 +25,7 @@ interface SearchTagQueries : DbProvider { .table(SearchTagTable.TABLE) .where("${SearchTagTable.COL_MANGA_ID} = ?") .whereArgs(mangaId) - .build() + .build(), ) .prepare() @@ -38,7 +38,7 @@ interface SearchTagQueries : DbProvider { fun deleteAllSearchTags() = db.delete().byQuery( DeleteQuery.builder() .table(SearchTagTable.TABLE) - .build() + .build(), ) .prepare() diff --git a/app/src/main/java/exh/metadata/sql/queries/SearchTitleQueries.kt b/app/src/main/java/exh/metadata/sql/queries/SearchTitleQueries.kt index 29ba48e16..a61056844 100755 --- a/app/src/main/java/exh/metadata/sql/queries/SearchTitleQueries.kt +++ b/app/src/main/java/exh/metadata/sql/queries/SearchTitleQueries.kt @@ -15,7 +15,7 @@ interface SearchTitleQueries : DbProvider { .table(SearchTitleTable.TABLE) .where("${SearchTitleTable.COL_MANGA_ID} = ?") .whereArgs(mangaId) - .build() + .build(), ) .prepare() @@ -25,7 +25,7 @@ interface SearchTitleQueries : DbProvider { .table(SearchTitleTable.TABLE) .where("${SearchTitleTable.COL_MANGA_ID} = ?") .whereArgs(mangaId) - .build() + .build(), ) .prepare() @@ -38,7 +38,7 @@ interface SearchTitleQueries : DbProvider { fun deleteAllSearchTitle() = db.delete().byQuery( DeleteQuery.builder() .table(SearchTitleTable.TABLE) - .build() + .build(), ) .prepare() diff --git a/app/src/main/java/exh/patch/MangaDexLogin.kt b/app/src/main/java/exh/patch/MangaDexLogin.kt index 3221295a9..c1a5611c2 100644 --- a/app/src/main/java/exh/patch/MangaDexLogin.kt +++ b/app/src/main/java/exh/patch/MangaDexLogin.kt @@ -36,7 +36,7 @@ val MANGADEX_LOGIN_PATCH: EHInterceptor = { request, response, sourceId -> "Login", (Injekt.get().get(sourceId) as? HttpSource)?.headers?.toMultimap()?.mapValues { it.value.joinToString(",") - } ?: emptyMap() + } ?: emptyMap(), ) } } @@ -81,6 +81,6 @@ val MANGADEX_SOURCE_IDS = listOf( 3781216447842245147, 4774459486579224459, 4710920497926776490, - 5779037855201976894 + 5779037855201976894, ) const val MANGADEX_DOMAIN = "mangadex.org" diff --git a/app/src/main/java/exh/patch/NetworkPatches.kt b/app/src/main/java/exh/patch/NetworkPatches.kt index 3e0a6834e..50cce6bb2 100644 --- a/app/src/main/java/exh/patch/NetworkPatches.kt +++ b/app/src/main/java/exh/patch/NetworkPatches.kt @@ -35,6 +35,6 @@ fun List.merge(): EHInterceptor { private const val EH_UNIVERSAL_INTERCEPTOR = -1L private val EH_INTERCEPTORS: Map> = mapOf( EH_UNIVERSAL_INTERCEPTOR to listOf( - CAPTCHA_DETECTION_PATCH // Auto captcha detection - ) + CAPTCHA_DETECTION_PATCH, // Auto captcha detection + ), ) diff --git a/app/src/main/java/exh/patch/UniversalCaptchaDetection.kt b/app/src/main/java/exh/patch/UniversalCaptchaDetection.kt index 202a54c6e..11ed6d622 100644 --- a/app/src/main/java/exh/patch/UniversalCaptchaDetection.kt +++ b/app/src/main/java/exh/patch/UniversalCaptchaDetection.kt @@ -15,7 +15,7 @@ val CAPTCHA_DETECTION_PATCH: EHInterceptor = { request, response, sourceId -> BrowserActionActivity.launchUniversal( Injekt.get(), sourceId, - request.url.toString() + request.url.toString(), ) } } diff --git a/app/src/main/java/exh/recs/RecommendsController.kt b/app/src/main/java/exh/recs/RecommendsController.kt index 8f21d2b05..71f89cc0e 100644 --- a/app/src/main/java/exh/recs/RecommendsController.kt +++ b/app/src/main/java/exh/recs/RecommendsController.kt @@ -20,8 +20,8 @@ class RecommendsController(bundle: Bundle) : BrowseSourceController(bundle) { constructor(manga: Manga, source: CatalogueSource) : this( bundleOf( MANGA_ID to manga.id!!, - SOURCE_ID_KEY to source.id - ) + SOURCE_ID_KEY to source.id, + ), ) override fun getTitle(): String? { @@ -54,9 +54,9 @@ class RecommendsController(bundle: Bundle) : BrowseSourceController(bundle) { router.pushController( SourceController( bundleOf( - SourceController.SMART_SEARCH_CONFIG to smartSearchConfig - ) - ).withFadeTransaction() + SourceController.SMART_SEARCH_CONFIG to smartSearchConfig, + ), + ).withFadeTransaction(), ) } diff --git a/app/src/main/java/exh/recs/RecommendsPager.kt b/app/src/main/java/exh/recs/RecommendsPager.kt index d04c2dfc7..9aa641fa6 100644 --- a/app/src/main/java/exh/recs/RecommendsPager.kt +++ b/app/src/main/java/exh/recs/RecommendsPager.kt @@ -150,7 +150,8 @@ class Anilist : API("https://graphql.anilist.co/") { |} |} |} - |""".trimMargin() + | + """.trimMargin() val variables = buildJsonObject { put("search", search) } @@ -172,8 +173,8 @@ class Anilist : API("https://graphql.anilist.co/") { { languageContains(it.jsonObject, "romaji", search) }, { languageContains(it.jsonObject, "english", search) }, { languageContains(it.jsonObject, "native", search) }, - { countOccurrence(it.jsonObject["synonyms"]!!.jsonArray, search) > 0 } - ) + { countOccurrence(it.jsonObject["synonyms"]!!.jsonArray, search) > 0 }, + ), ).last().jsonObject return result["recommendations"]?.jsonObject?.get("edges")?.jsonArray?.map { @@ -193,7 +194,7 @@ class Anilist : API("https://graphql.anilist.co/") { open class RecommendsPager( private val manga: Manga, private val smart: Boolean = true, - private var preferredApi: API = API.MYANIMELIST + private var preferredApi: API = API.MYANIMELIST, ) : Pager() { override suspend fun requestNextPage() { if (smart) preferredApi = if (manga.mangaType() != MangaType.TYPE_MANGA) API.ANILIST else preferredApi @@ -223,7 +224,7 @@ open class RecommendsPager( companion object { val API_MAP = mapOf( API.MYANIMELIST to MyAnimeList(), - API.ANILIST to Anilist() + API.ANILIST to Anilist(), ) enum class API { MYANIMELIST, ANILIST } diff --git a/app/src/main/java/exh/savedsearches/EXHSavedSearch.kt b/app/src/main/java/exh/savedsearches/EXHSavedSearch.kt index 672511080..e7562cb41 100644 --- a/app/src/main/java/exh/savedsearches/EXHSavedSearch.kt +++ b/app/src/main/java/exh/savedsearches/EXHSavedSearch.kt @@ -6,5 +6,5 @@ data class EXHSavedSearch( val id: Long, val name: String, val query: String, - val filterList: FilterList? + val filterList: FilterList?, ) diff --git a/app/src/main/java/exh/savedsearches/mappers/FeedSavedSearchTypeMapping.kt b/app/src/main/java/exh/savedsearches/mappers/FeedSavedSearchTypeMapping.kt index e56c7cf1c..aeb89787b 100644 --- a/app/src/main/java/exh/savedsearches/mappers/FeedSavedSearchTypeMapping.kt +++ b/app/src/main/java/exh/savedsearches/mappers/FeedSavedSearchTypeMapping.kt @@ -20,7 +20,7 @@ import exh.savedsearches.tables.FeedSavedSearchTable.TABLE class FeedSavedSearchTypeMapping : SQLiteTypeMapping( FeedSavedSearchPutResolver(), FeedSavedSearchGetResolver(), - FeedSavedSearchDeleteResolver() + FeedSavedSearchDeleteResolver(), ) class FeedSavedSearchPutResolver : DefaultPutResolver() { @@ -39,7 +39,7 @@ class FeedSavedSearchPutResolver : DefaultPutResolver() { COL_ID to obj.id, COL_SOURCE to obj.source, COL_SAVED_SEARCH_ID to obj.savedSearch, - COL_GLOBAL to obj.global + COL_GLOBAL to obj.global, ) } @@ -49,7 +49,7 @@ class FeedSavedSearchGetResolver : DefaultGetResolver() { id = cursor.getLong(cursor.getColumnIndexOrThrow(COL_ID)), source = cursor.getLong(cursor.getColumnIndexOrThrow(COL_SOURCE)), savedSearch = cursor.getLongOrNull(cursor.getColumnIndexOrThrow(COL_SAVED_SEARCH_ID)), - global = cursor.getInt(cursor.getColumnIndexOrThrow(COL_GLOBAL)) == 1 + global = cursor.getInt(cursor.getColumnIndexOrThrow(COL_GLOBAL)) == 1, ) } diff --git a/app/src/main/java/exh/savedsearches/mappers/SavedSearchTypeMapping.kt b/app/src/main/java/exh/savedsearches/mappers/SavedSearchTypeMapping.kt index f312ea49e..62574d5ad 100644 --- a/app/src/main/java/exh/savedsearches/mappers/SavedSearchTypeMapping.kt +++ b/app/src/main/java/exh/savedsearches/mappers/SavedSearchTypeMapping.kt @@ -21,7 +21,7 @@ import exh.savedsearches.tables.SavedSearchTable.TABLE class SavedSearchTypeMapping : SQLiteTypeMapping( SavedSearchPutResolver(), SavedSearchGetResolver(), - SavedSearchDeleteResolver() + SavedSearchDeleteResolver(), ) class SavedSearchPutResolver : DefaultPutResolver() { @@ -41,7 +41,7 @@ class SavedSearchPutResolver : DefaultPutResolver() { COL_SOURCE to obj.source, COL_NAME to obj.name, COL_QUERY to obj.query, - COL_FILTERS_JSON to obj.filtersJson + COL_FILTERS_JSON to obj.filtersJson, ) } @@ -52,7 +52,7 @@ class SavedSearchGetResolver : DefaultGetResolver() { source = cursor.getLong(cursor.getColumnIndexOrThrow(COL_SOURCE)), name = cursor.getString(cursor.getColumnIndexOrThrow(COL_NAME)), query = cursor.getStringOrNull(cursor.getColumnIndexOrThrow(COL_QUERY)), - filtersJson = cursor.getStringOrNull(cursor.getColumnIndexOrThrow(COL_FILTERS_JSON)) + filtersJson = cursor.getStringOrNull(cursor.getColumnIndexOrThrow(COL_FILTERS_JSON)), ) } diff --git a/app/src/main/java/exh/savedsearches/models/FeedSavedSearch.kt b/app/src/main/java/exh/savedsearches/models/FeedSavedSearch.kt index 547b12d96..a91ca82ca 100644 --- a/app/src/main/java/exh/savedsearches/models/FeedSavedSearch.kt +++ b/app/src/main/java/exh/savedsearches/models/FeedSavedSearch.kt @@ -11,5 +11,5 @@ data class FeedSavedSearch( var savedSearch: Long?, // If the feed is a global or source specific feed - var global: Boolean + var global: Boolean, ) diff --git a/app/src/main/java/exh/savedsearches/queries/FeedSavedSearchQueries.kt b/app/src/main/java/exh/savedsearches/queries/FeedSavedSearchQueries.kt index 29c646b57..fb67ddfce 100644 --- a/app/src/main/java/exh/savedsearches/queries/FeedSavedSearchQueries.kt +++ b/app/src/main/java/exh/savedsearches/queries/FeedSavedSearchQueries.kt @@ -18,7 +18,7 @@ interface FeedSavedSearchQueries : DbProvider { .table(FeedSavedSearchTable.TABLE) .where("${FeedSavedSearchTable.COL_GLOBAL} = 1") .orderBy(FeedSavedSearchTable.COL_ID) - .build() + .build(), ) .prepare() @@ -30,7 +30,7 @@ interface FeedSavedSearchQueries : DbProvider { .where("${FeedSavedSearchTable.COL_SOURCE} = ? AND ${FeedSavedSearchTable.COL_GLOBAL} = 0") .whereArgs(sourceId) .orderBy(FeedSavedSearchTable.COL_ID) - .build() + .build(), ) .prepare() @@ -46,13 +46,13 @@ interface FeedSavedSearchQueries : DbProvider { .table(FeedSavedSearchTable.TABLE) .where("${FeedSavedSearchTable.COL_ID} = ?") .whereArgs(id) - .build() + .build(), ).prepare() fun deleteAllFeedSavedSearches() = db.delete().byQuery( DeleteQuery.builder() .table(FeedSavedSearchTable.TABLE) - .build() + .build(), ) .prepare() @@ -61,7 +61,7 @@ interface FeedSavedSearchQueries : DbProvider { .withQuery( RawQuery.builder() .query(getGlobalFeedSavedSearchQuery()) - .build() + .build(), ) .prepare() @@ -71,7 +71,7 @@ interface FeedSavedSearchQueries : DbProvider { RawQuery.builder() .query(getSourceFeedSavedSearchQuery()) .args(sourceId) - .build() + .build(), ) .prepare() diff --git a/app/src/main/java/exh/savedsearches/queries/SavedSearchQueries.kt b/app/src/main/java/exh/savedsearches/queries/SavedSearchQueries.kt index 214f0bc8c..558c80c69 100644 --- a/app/src/main/java/exh/savedsearches/queries/SavedSearchQueries.kt +++ b/app/src/main/java/exh/savedsearches/queries/SavedSearchQueries.kt @@ -14,7 +14,7 @@ interface SavedSearchQueries : DbProvider { .table(SavedSearchTable.TABLE) .where("${SavedSearchTable.COL_SOURCE} = ?") .whereArgs(source) - .build() + .build(), ) .prepare() @@ -24,7 +24,7 @@ interface SavedSearchQueries : DbProvider { .table(SavedSearchTable.TABLE) .where("${SavedSearchTable.COL_SOURCE} = ?") .whereArgs(source) - .build() + .build(), ) .prepare() @@ -34,7 +34,7 @@ interface SavedSearchQueries : DbProvider { Query.builder() .table(SavedSearchTable.TABLE) .orderBy(SavedSearchTable.COL_ID) - .build() + .build(), ) .prepare() @@ -45,7 +45,7 @@ interface SavedSearchQueries : DbProvider { .table(SavedSearchTable.TABLE) .where("${SavedSearchTable.COL_ID} = ?") .whereArgs(id) - .build() + .build(), ) .prepare() @@ -56,7 +56,7 @@ interface SavedSearchQueries : DbProvider { .table(SavedSearchTable.TABLE) .where("${SavedSearchTable.COL_ID} IN (?)") .whereArgs(ids.joinToString()) - .build() + .build(), ) .prepare() @@ -72,13 +72,13 @@ interface SavedSearchQueries : DbProvider { .table(SavedSearchTable.TABLE) .where("${SavedSearchTable.COL_ID} = ?") .whereArgs(id) - .build() + .build(), ).prepare() fun deleteAllSavedSearches() = db.delete().byQuery( DeleteQuery.builder() .table(SavedSearchTable.TABLE) - .build() + .build(), ) .prepare() diff --git a/app/src/main/java/exh/search/Namespace.kt b/app/src/main/java/exh/search/Namespace.kt index 0e6faae48..de3ff98a6 100755 --- a/app/src/main/java/exh/search/Namespace.kt +++ b/app/src/main/java/exh/search/Namespace.kt @@ -2,5 +2,5 @@ package exh.search class Namespace( var namespace: String, - var tag: Text? = null + var tag: Text? = null, ) : QueryComponent() diff --git a/app/src/main/java/exh/search/SearchEngine.kt b/app/src/main/java/exh/search/SearchEngine.kt index ae96e9903..b5196ec00 100755 --- a/app/src/main/java/exh/search/SearchEngine.kt +++ b/app/src/main/java/exh/search/SearchEngine.kt @@ -10,7 +10,7 @@ class SearchEngine { fun textToSubQueries( namespace: String?, - component: Text? + component: Text?, ): Pair>? { val maybeLenientComponent = component?.let { if (!it.exact) { diff --git a/app/src/main/java/exh/search/Text.kt b/app/src/main/java/exh/search/Text.kt index 2d4806699..2ecfefb0a 100755 --- a/app/src/main/java/exh/search/Text.kt +++ b/app/src/main/java/exh/search/Text.kt @@ -33,7 +33,7 @@ class Text : QueryComponent() { // Can't make it match a single word in Realm :( StringBuilder(" ").append(rBaseBuilder()).append(" ").toString(), StringBuilder(" ").append(rBaseBuilder()).toString(), - rBaseBuilder().append(" ").toString() + rBaseBuilder().append(" ").toString(), ) } return lenientTagQueries!! diff --git a/app/src/main/java/exh/smartsearch/SmartSearchEngine.kt b/app/src/main/java/exh/smartsearch/SmartSearchEngine.kt index 7db4b6778..9e0a340fc 100644 --- a/app/src/main/java/exh/smartsearch/SmartSearchEngine.kt +++ b/app/src/main/java/exh/smartsearch/SmartSearchEngine.kt @@ -15,7 +15,7 @@ import uy.kohesive.injekt.injectLazy import java.util.Locale class SmartSearchEngine( - private val extraSearchParams: String? = null + private val extraSearchParams: String? = null, ) { private val db: DatabaseHelper by injectLazy() @@ -90,7 +90,7 @@ class SmartSearchEngine( splitSortedByLargest.take(2), splitSortedByLargest.take(1), splitCleanedTitle.take(2), - splitCleanedTitle.take(1) + splitCleanedTitle.take(1), ) return searchQueries.map { @@ -121,7 +121,7 @@ class SmartSearchEngine( '(' to ')', '[' to ']', '<' to '>', - '{' to '}' + '{' to '}', ) var openingBracketPairs = bracketPairs.mapIndexed { index, (opening, _) -> opening to index diff --git a/app/src/main/java/exh/source/BlacklistedSources.kt b/app/src/main/java/exh/source/BlacklistedSources.kt index 83ed232bb..1559394bd 100644 --- a/app/src/main/java/exh/source/BlacklistedSources.kt +++ b/app/src/main/java/exh/source/BlacklistedSources.kt @@ -18,16 +18,16 @@ object BlacklistedSources { 5980349886941016589, 6073266008352078708, 5499077866612745456, - 6140480779421365791 + 6140480779421365791, ) val BLACKLISTED_EXT_SOURCES = EHENTAI_EXT_SOURCES val BLACKLISTED_EXTENSIONS = arrayOf( - "eu.kanade.tachiyomi.extension.all.ehentai" + "eu.kanade.tachiyomi.extension.all.ehentai", ) var HIDDEN_SOURCES = setOf( - MERGED_SOURCE_ID + MERGED_SOURCE_ID, ) } diff --git a/app/src/main/java/exh/source/EnhancedHttpSource.kt b/app/src/main/java/exh/source/EnhancedHttpSource.kt index be0752e3f..b563dcbfa 100644 --- a/app/src/main/java/exh/source/EnhancedHttpSource.kt +++ b/app/src/main/java/exh/source/EnhancedHttpSource.kt @@ -15,7 +15,7 @@ import uy.kohesive.injekt.injectLazy @Suppress("OverridingDeprecatedMember", "DEPRECATION") class EnhancedHttpSource( val originalSource: HttpSource, - val enhancedSource: HttpSource + val enhancedSource: HttpSource, ) : HttpSource() { private val prefs: PreferencesHelper by injectLazy() diff --git a/app/src/main/java/exh/source/SourceHelper.kt b/app/src/main/java/exh/source/SourceHelper.kt index 100837371..7ed69054b 100644 --- a/app/src/main/java/exh/source/SourceHelper.kt +++ b/app/src/main/java/exh/source/SourceHelper.kt @@ -36,7 +36,7 @@ private val DELEGATED_METADATA_SOURCES by lazy { EightMuses::class, Hitomi::class, PervEden::class, - NHentai::class + NHentai::class, ) } @@ -52,7 +52,7 @@ var mangaDexSourceIds: List = emptyList() var LIBRARY_UPDATE_EXCLUDED_SOURCES = listOf( EH_SOURCE_ID, EXH_SOURCE_ID, - PURURIN_SOURCE_ID + PURURIN_SOURCE_ID, ) fun handleSourceLibrary() { @@ -87,7 +87,7 @@ fun handleSourceLibrary() { LIBRARY_UPDATE_EXCLUDED_SOURCES = listOf( EH_SOURCE_ID, EXH_SOURCE_ID, - PURURIN_SOURCE_ID + PURURIN_SOURCE_ID, ) + hitomiSourceIds + nHentaiSourceIds } diff --git a/app/src/main/java/exh/uconfig/EHConfigurator.kt b/app/src/main/java/exh/uconfig/EHConfigurator.kt index fd46c9d95..36856cecb 100644 --- a/app/src/main/java/exh/uconfig/EHConfigurator.kt +++ b/app/src/main/java/exh/uconfig/EHConfigurator.kt @@ -32,7 +32,7 @@ class EHConfigurator(val context: Context) { action: String, name: String, set: String, - sp: Int + sp: Int, ) = configuratorClient.newCall( requestWithCreds(sp) @@ -42,9 +42,9 @@ class EHConfigurator(val context: Context) { .add("profile_action", action) .add("profile_name", name) .add("profile_set", set) - .build() + .build(), ) - .build() + .build(), ) .await() @@ -58,7 +58,7 @@ class EHConfigurator(val context: Context) { val perksPage = configuratorClient.newCall( ehSource.requestWithCreds() .url(HATH_PERKS_URL) - .build() + .build(), ) .await().asJsoup() @@ -117,7 +117,7 @@ class EHConfigurator(val context: Context) { "create", PROFILE_NAME, slot.toString(), - 1 + 1, ) // Build new profile @@ -128,7 +128,7 @@ class EHConfigurator(val context: Context) { source.requestWithCreds(sp = slot) .url(source.uconfigUrl) .post(form) - .build() + .build(), ).await() // Persist slot + sk diff --git a/app/src/main/java/exh/uconfig/EhUConfigBuilder.kt b/app/src/main/java/exh/uconfig/EhUConfigBuilder.kt index 64be8dca3..b4af04091 100644 --- a/app/src/main/java/exh/uconfig/EhUConfigBuilder.kt +++ b/app/src/main/java/exh/uconfig/EhUConfigBuilder.kt @@ -175,7 +175,7 @@ object Entry { GenreConfigItem("ct_imageset", list[6]), GenreConfigItem("ct_cosplay", list[7]), GenreConfigItem("ct_asianporn", list[8]), - GenreConfigItem("ct_misc", list[9]) + GenreConfigItem("ct_misc", list[9]), ) } @@ -208,7 +208,7 @@ object Entry { Thai(config[13]), Vietnamese(config[14]), NotAvailable(config[15]), - Other(config[16]) + Other(config[16]), ).flatMap { it.configs } } @@ -219,7 +219,7 @@ object Entry { open val configs: List get() = listOf( LanguageConfigItem(translatedKey, values[1]), - LanguageConfigItem(rewriteKey, values[2]) + LanguageConfigItem(rewriteKey, values[2]), ) protected class LanguageConfigItem(override val key: String, value: Boolean) : ConfigItem { diff --git a/app/src/main/java/exh/ui/base/CoroutinePresenter.kt b/app/src/main/java/exh/ui/base/CoroutinePresenter.kt index ad89446ae..2a8a87761 100644 --- a/app/src/main/java/exh/ui/base/CoroutinePresenter.kt +++ b/app/src/main/java/exh/ui/base/CoroutinePresenter.kt @@ -18,7 +18,7 @@ import kotlin.coroutines.EmptyCoroutineContext @Suppress("DEPRECATION", "unused") open class CoroutinePresenter( - scope: CoroutineScope = MainScope() + scope: CoroutineScope = MainScope(), ) : Presenter(), CoroutineScope by scope { @Suppress("DeprecatedCallableAddReplaceWith") @Deprecated("Use launchInView, Flow.inView, Flow.mapView") diff --git a/app/src/main/java/exh/ui/batchadd/BatchAddController.kt b/app/src/main/java/exh/ui/batchadd/BatchAddController.kt index 6e2a64728..c4b1932c5 100755 --- a/app/src/main/java/exh/ui/batchadd/BatchAddController.kt +++ b/app/src/main/java/exh/ui/batchadd/BatchAddController.kt @@ -113,7 +113,7 @@ class BatchAddController : NucleusController.isVisible: Boolean diff --git a/app/src/main/java/exh/ui/batchadd/BatchAddPresenter.kt b/app/src/main/java/exh/ui/batchadd/BatchAddPresenter.kt index 0fb734db4..2ad94317f 100644 --- a/app/src/main/java/exh/ui/batchadd/BatchAddPresenter.kt +++ b/app/src/main/java/exh/ui/batchadd/BatchAddPresenter.kt @@ -78,7 +78,7 @@ class BatchAddPresenter : BasePresenter() { is GalleryAddEvent.Success -> context.getString(R.string.batch_add_ok) is GalleryAddEvent.Fail -> context.getString(R.string.batch_add_error) } - ) + " " + result.logMessage + ) + " " + result.logMessage, ) } diff --git a/app/src/main/java/exh/ui/captcha/AutoSolvingWebViewClient.kt b/app/src/main/java/exh/ui/captcha/AutoSolvingWebViewClient.kt index f3c98b056..278d66aa3 100644 --- a/app/src/main/java/exh/ui/captcha/AutoSolvingWebViewClient.kt +++ b/app/src/main/java/exh/ui/captcha/AutoSolvingWebViewClient.kt @@ -11,7 +11,7 @@ class AutoSolvingWebViewClient( activity: BrowserActionActivity, verifyComplete: (String) -> Boolean, injectScript: String?, - headers: Map + headers: Map, ) : HeadersInjectingWebViewClient(activity, verifyComplete, injectScript, headers) { override fun shouldInterceptRequest(view: WebView, request: WebResourceRequest): WebResourceResponse? { @@ -25,7 +25,7 @@ class AutoSolvingWebViewClient( return WebResourceResponse( "text/html", "UTF-8", - doc.toString().byteInputStream().buffered() + doc.toString().byteInputStream().buffered(), ) } return super.shouldInterceptRequest(view, request) diff --git a/app/src/main/java/exh/ui/captcha/BasicWebViewClient.kt b/app/src/main/java/exh/ui/captcha/BasicWebViewClient.kt index bed8f1c1a..575efd647 100644 --- a/app/src/main/java/exh/ui/captcha/BasicWebViewClient.kt +++ b/app/src/main/java/exh/ui/captcha/BasicWebViewClient.kt @@ -6,7 +6,7 @@ import android.webkit.WebViewClient open class BasicWebViewClient( protected val activity: BrowserActionActivity, protected val verifyComplete: (String) -> Boolean, - private val injectScript: String? + private val injectScript: String?, ) : WebViewClient() { override fun onPageFinished(view: WebView, url: String) { super.onPageFinished(view, url) diff --git a/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt b/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt index 2139acff1..358c6802e 100644 --- a/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt +++ b/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt @@ -155,7 +155,7 @@ class BrowserActionActivity : AppCompatActivity() { Request.Builder() // Rob demo credentials .url("https://speech-to-text-demo.ng.bluemix.net/api/v1/credentials") - .build() + .build(), ) .asObservableSuccess() .subscribeOn(Schedulers.io()) @@ -206,14 +206,14 @@ class BrowserActionActivity : AppCompatActivity() { { getAudioButtonLocation(loopId) }, - 250 + 250, ) } else { binding.webview.postDelayed( { doStageCheckbox(loopId) }, - 250 + 250, ) } } @@ -236,7 +236,7 @@ class BrowserActionActivity : AppCompatActivity() { { getAudioButtonLocation(loopId) }, - 250 + 250, ) } } @@ -254,20 +254,20 @@ class BrowserActionActivity : AppCompatActivity() { it!! .replace(TRANSCRIPT_CLEANER_REGEX, "") .replace(SPACE_DEDUPE_REGEX, " ") - .trim() + .trim(), ) } }, { runBlocking { captchaSolveFail() } - } + }, ) } else { binding.webview.postDelayed( { doStageDownloadAudio(loopId) }, - 250 + 250, ) } } @@ -287,7 +287,7 @@ class BrowserActionActivity : AppCompatActivity() { httpClient.newCall( Request.Builder() .url(url) - .build() + .build(), ).asObservableSuccess().map { token to it } @@ -300,7 +300,7 @@ class BrowserActionActivity : AppCompatActivity() { "https://stream.watsonplatform.net/speech-to-text/api/v1/recognize".toHttpUrlOrNull()!! .newBuilder() .addQueryParameter("watson-token", token) - .build() + .build(), ) .post( MultipartBody.Builder() @@ -312,12 +312,12 @@ class BrowserActionActivity : AppCompatActivity() { audioFile.toRequestBody( "audio/mp3".toMediaTypeOrNull(), 0, - audioFile.size - ) + audioFile.size, + ), ) - .build() + .build(), ) - .build() + .build(), ).asObservableSuccess() }.map { response -> response.parseAs()["results"]!! @@ -358,7 +358,7 @@ class BrowserActionActivity : AppCompatActivity() { } })(); """.trimIndent().replace("\n", ""), - null + null, ) } @@ -393,7 +393,7 @@ class BrowserActionActivity : AppCompatActivity() { } })(); """.trimIndent().replace("\n", ""), - null + null, ) } @@ -421,7 +421,7 @@ class BrowserActionActivity : AppCompatActivity() { } })(); """.trimIndent().replace("\n", ""), - null + null, ) } @@ -452,7 +452,7 @@ class BrowserActionActivity : AppCompatActivity() { } })(); """.trimIndent().replace("\n", ""), - null + null, ) } @@ -488,7 +488,7 @@ class BrowserActionActivity : AppCompatActivity() { { runValidateCaptcha(loopId) }, - 250 + 250, ) } } @@ -520,7 +520,7 @@ class BrowserActionActivity : AppCompatActivity() { } })(); """.trimIndent().replace("\n", ""), - null + null, ) } @@ -685,7 +685,7 @@ class BrowserActionActivity : AppCompatActivity() { cookies: Map, script: String?, url: String, - autoSolveSubmitBtnSelector: String? = null + autoSolveSubmitBtnSelector: String? = null, ) { val intent = baseIntent(context).apply { putExtra(SOURCE_ID_EXTRA, source.id) @@ -701,7 +701,7 @@ class BrowserActionActivity : AppCompatActivity() { fun launchUniversal( context: Context, source: HttpSource, - url: String + url: String, ) { val intent = baseIntent(context).apply { putExtra(SOURCE_ID_EXTRA, source.id) @@ -714,7 +714,7 @@ class BrowserActionActivity : AppCompatActivity() { fun launchUniversal( context: Context, sourceId: Long, - url: String + url: String, ) { val intent = baseIntent(context).apply { putExtra(SOURCE_ID_EXTRA, sourceId) @@ -729,7 +729,7 @@ class BrowserActionActivity : AppCompatActivity() { completionVerifier: ActionCompletionVerifier, script: String?, url: String, - actionName: String + actionName: String, ) { val intent = baseIntent(context).apply { putExtra(SOURCE_ID_EXTRA, completionVerifier.id) @@ -747,7 +747,7 @@ class BrowserActionActivity : AppCompatActivity() { script: String?, url: String, actionName: String, - headers: Map? = emptyMap() + headers: Map? = emptyMap(), ) { val intent = baseIntent(context).apply { putExtra(HEADERS_EXTRA, HashMap(headers!!)) diff --git a/app/src/main/java/exh/ui/captcha/HeadersInjectingWebViewClient.kt b/app/src/main/java/exh/ui/captcha/HeadersInjectingWebViewClient.kt index 7ce018910..e6ec54cb0 100644 --- a/app/src/main/java/exh/ui/captcha/HeadersInjectingWebViewClient.kt +++ b/app/src/main/java/exh/ui/captcha/HeadersInjectingWebViewClient.kt @@ -8,7 +8,7 @@ open class HeadersInjectingWebViewClient( activity: BrowserActionActivity, verifyComplete: (String) -> Boolean, injectScript: String?, - private val headers: Map + private val headers: Map, ) : BasicWebViewClient(activity, verifyComplete, injectScript) { override fun shouldInterceptRequest(view: WebView, request: WebResourceRequest): WebResourceResponse? { @@ -72,7 +72,7 @@ open class HeadersInjectingWebViewClient( 502 to "Bad Gateway", 503 to "Service Unavailable", 504 to "Gateway Time-out", - 505 to "HTTP Version not supported" + 505 to "HTTP Version not supported", ) } } diff --git a/app/src/main/java/exh/ui/intercept/InterceptActivity.kt b/app/src/main/java/exh/ui/intercept/InterceptActivity.kt index be75f1bb8..f045677ac 100755 --- a/app/src/main/java/exh/ui/intercept/InterceptActivity.kt +++ b/app/src/main/java/exh/ui/intercept/InterceptActivity.kt @@ -76,7 +76,7 @@ class InterceptActivity : BaseActivity() { .setAction(MainActivity.SHORTCUT_MANGA) .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) .putExtra(MangaController.MANGA_EXTRA, it.mangaId) - } + }, ) } is InterceptResult.Failure -> { diff --git a/app/src/main/java/exh/ui/login/EhLoginActivity.kt b/app/src/main/java/exh/ui/login/EhLoginActivity.kt index 2559ec31a..907c8b501 100644 --- a/app/src/main/java/exh/ui/login/EhLoginActivity.kt +++ b/app/src/main/java/exh/ui/login/EhLoginActivity.kt @@ -214,8 +214,10 @@ class EhLoginActivity : BaseActivity() { fun checkLoginCookies(url: String): Boolean { getCookies(url)?.let { parsed -> return parsed.count { - (it.name.equals(MEMBER_ID_COOKIE, ignoreCase = true) || - it.name.equals(PASS_HASH_COOKIE, ignoreCase = true)) && + ( + it.name.equals(MEMBER_ID_COOKIE, ignoreCase = true) || + it.name.equals(PASS_HASH_COOKIE, ignoreCase = true) + ) && it.value.isNotBlank() } >= 2 } diff --git a/app/src/main/java/exh/ui/metadata/MetadataViewController.kt b/app/src/main/java/exh/ui/metadata/MetadataViewController.kt index a6483a804..b89e90fc1 100644 --- a/app/src/main/java/exh/ui/metadata/MetadataViewController.kt +++ b/app/src/main/java/exh/ui/metadata/MetadataViewController.kt @@ -20,8 +20,8 @@ import uy.kohesive.injekt.api.get class MetadataViewController : NucleusController { constructor(manga: Manga?) : super( bundleOf( - MangaController.MANGA_EXTRA to (manga?.id ?: 0) - ) + MangaController.MANGA_EXTRA to (manga?.id ?: 0), + ), ) { this.manga = manga if (manga != null) { @@ -30,7 +30,7 @@ class MetadataViewController : NucleusController().getManga(mangaId).executeAsBlocking() + Injekt.get().getManga(mangaId).executeAsBlocking(), ) @Suppress("unused") @@ -50,7 +50,7 @@ class MetadataViewController : NucleusController() { val meta = MutableStateFlow(null) diff --git a/app/src/main/java/exh/ui/metadata/adapters/EHentaiDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/EHentaiDescriptionAdapter.kt index 9e302553f..6843015b7 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/EHentaiDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/EHentaiDescriptionAdapter.kt @@ -16,7 +16,7 @@ import exh.metadata.metadata.EHentaiSearchMetadata import exh.ui.metadata.MetadataViewController class EHentaiDescriptionAdapter( - private val controller: MangaController + private val controller: MangaController, ) : RecyclerView.Adapter() { @@ -82,12 +82,12 @@ class EHentaiDescriptionAdapter( binding.pages, binding.rating, binding.uploader, - binding.visible + binding.visible, ).forEach { textView -> textView.setOnLongClickListener { itemView.context.copyToClipboard( textView.text.toString(), - textView.text.toString() + textView.text.toString(), ) true } @@ -100,8 +100,8 @@ class EHentaiDescriptionAdapter( binding.moreInfo.setOnClickListener { controller.router?.pushController( MetadataViewController( - controller.manga - ).withFadeTransaction() + controller.manga, + ).withFadeTransaction(), ) } } diff --git a/app/src/main/java/exh/ui/metadata/adapters/EightMusesDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/EightMusesDescriptionAdapter.kt index 415db82c5..9975fbdb3 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/EightMusesDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/EightMusesDescriptionAdapter.kt @@ -14,7 +14,7 @@ import exh.metadata.metadata.EightMusesSearchMetadata import exh.ui.metadata.MetadataViewController class EightMusesDescriptionAdapter( - private val controller: MangaController + private val controller: MangaController, ) : RecyclerView.Adapter() { @@ -43,7 +43,7 @@ class EightMusesDescriptionAdapter( binding.title.setOnLongClickListener { itemView.context.copyToClipboard( binding.title.text.toString(), - binding.title.text.toString() + binding.title.text.toString(), ) true } @@ -51,8 +51,8 @@ class EightMusesDescriptionAdapter( binding.moreInfo.setOnClickListener { controller.router?.pushController( MetadataViewController( - controller.manga - ).withFadeTransaction() + controller.manga, + ).withFadeTransaction(), ) } } diff --git a/app/src/main/java/exh/ui/metadata/adapters/HBrowseDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/HBrowseDescriptionAdapter.kt index 00dd1f48a..08a7cd017 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/HBrowseDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/HBrowseDescriptionAdapter.kt @@ -14,7 +14,7 @@ import exh.metadata.metadata.HBrowseSearchMetadata import exh.ui.metadata.MetadataViewController class HBrowseDescriptionAdapter( - private val controller: MangaController + private val controller: MangaController, ) : RecyclerView.Adapter() { @@ -44,7 +44,7 @@ class HBrowseDescriptionAdapter( binding.pages.setOnLongClickListener { itemView.context.copyToClipboard( binding.pages.text.toString(), - binding.pages.text.toString() + binding.pages.text.toString(), ) true } @@ -52,8 +52,8 @@ class HBrowseDescriptionAdapter( binding.moreInfo.setOnClickListener { controller.router?.pushController( MetadataViewController( - controller.manga - ).withFadeTransaction() + controller.manga, + ).withFadeTransaction(), ) } } diff --git a/app/src/main/java/exh/ui/metadata/adapters/HitomiDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/HitomiDescriptionAdapter.kt index 8ac601c2c..d27879cd7 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/HitomiDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/HitomiDescriptionAdapter.kt @@ -16,7 +16,7 @@ import exh.ui.metadata.MetadataViewController import java.util.Date class HitomiDescriptionAdapter( - private val controller: MangaController + private val controller: MangaController, ) : RecyclerView.Adapter() { @@ -51,12 +51,12 @@ class HitomiDescriptionAdapter( listOf( binding.genre, binding.language, - binding.whenPosted + binding.whenPosted, ).forEach { textView -> textView.setOnLongClickListener { itemView.context.copyToClipboard( textView.text.toString(), - textView.text.toString() + textView.text.toString(), ) true } @@ -65,8 +65,8 @@ class HitomiDescriptionAdapter( binding.moreInfo.setOnClickListener { controller.router?.pushController( MetadataViewController( - controller.manga - ).withFadeTransaction() + controller.manga, + ).withFadeTransaction(), ) } } diff --git a/app/src/main/java/exh/ui/metadata/adapters/MangaDexDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/MangaDexDescriptionAdapter.kt index 0eb11b4e0..949b705f1 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/MangaDexDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/MangaDexDescriptionAdapter.kt @@ -18,7 +18,7 @@ import exh.ui.metadata.MetadataViewController import kotlin.math.round class MangaDexDescriptionAdapter( - private val controller: MangaController + private val controller: MangaController, ) : RecyclerView.Adapter() { @@ -54,7 +54,7 @@ class MangaDexDescriptionAdapter( binding.rating.setOnLongClickListener { itemView.context.copyToClipboard( binding.rating.text.toString(), - binding.rating.text.toString() + binding.rating.text.toString(), ) true } @@ -62,8 +62,8 @@ class MangaDexDescriptionAdapter( binding.moreInfo.setOnClickListener { controller.router?.pushController( MetadataViewController( - controller.manga - ).withFadeTransaction() + controller.manga, + ).withFadeTransaction(), ) } } diff --git a/app/src/main/java/exh/ui/metadata/adapters/NHentaiDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/NHentaiDescriptionAdapter.kt index 37b283e8f..3d3d6fbf0 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/NHentaiDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/NHentaiDescriptionAdapter.kt @@ -17,7 +17,7 @@ import exh.ui.metadata.MetadataViewController import java.util.Date class NHentaiDescriptionAdapter( - private val controller: MangaController + private val controller: MangaController, ) : RecyclerView.Adapter() { @@ -70,12 +70,12 @@ class NHentaiDescriptionAdapter( binding.genre, binding.id, binding.pages, - binding.whenPosted + binding.whenPosted, ).forEach { textView -> textView.setOnLongClickListener { itemView.context.copyToClipboard( textView.text.toString(), - textView.text.toString() + textView.text.toString(), ) true } @@ -84,8 +84,8 @@ class NHentaiDescriptionAdapter( binding.moreInfo.setOnClickListener { controller.router?.pushController( MetadataViewController( - controller.manga - ).withFadeTransaction() + controller.manga, + ).withFadeTransaction(), ) } } diff --git a/app/src/main/java/exh/ui/metadata/adapters/PervEdenDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/PervEdenDescriptionAdapter.kt index 59d175bea..5aa6807d1 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/PervEdenDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/PervEdenDescriptionAdapter.kt @@ -18,7 +18,7 @@ import java.util.Locale import kotlin.math.round class PervEdenDescriptionAdapter( - private val controller: MangaController + private val controller: MangaController, ) : RecyclerView.Adapter() { @@ -60,12 +60,12 @@ class PervEdenDescriptionAdapter( listOf( binding.genre, binding.language, - binding.rating + binding.rating, ).forEach { textView -> textView.setOnLongClickListener { itemView.context.copyToClipboard( textView.text.toString(), - textView.text.toString() + textView.text.toString(), ) true } @@ -74,8 +74,8 @@ class PervEdenDescriptionAdapter( binding.moreInfo.setOnClickListener { controller.router?.pushController( MetadataViewController( - controller.manga - ).withFadeTransaction() + controller.manga, + ).withFadeTransaction(), ) } } diff --git a/app/src/main/java/exh/ui/metadata/adapters/PururinDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/PururinDescriptionAdapter.kt index b0e51c09e..43cad0e53 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/PururinDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/PururinDescriptionAdapter.kt @@ -17,7 +17,7 @@ import exh.ui.metadata.MetadataViewController import kotlin.math.round class PururinDescriptionAdapter( - private val controller: MangaController + private val controller: MangaController, ) : RecyclerView.Adapter() { @@ -66,12 +66,12 @@ class PururinDescriptionAdapter( binding.pages, binding.rating, binding.size, - binding.uploader + binding.uploader, ).forEach { textView -> textView.setOnLongClickListener { itemView.context.copyToClipboard( textView.text.toString(), - textView.text.toString() + textView.text.toString(), ) true } @@ -80,8 +80,8 @@ class PururinDescriptionAdapter( binding.moreInfo.setOnClickListener { controller.router?.pushController( MetadataViewController( - controller.manga - ).withFadeTransaction() + controller.manga, + ).withFadeTransaction(), ) } } diff --git a/app/src/main/java/exh/ui/metadata/adapters/TsuminoDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/TsuminoDescriptionAdapter.kt index 5657cc20b..417c2acb0 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/TsuminoDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/TsuminoDescriptionAdapter.kt @@ -18,7 +18,7 @@ import java.util.Date import kotlin.math.round class TsuminoDescriptionAdapter( - private val controller: MangaController + private val controller: MangaController, ) : RecyclerView.Adapter() { @@ -67,12 +67,12 @@ class TsuminoDescriptionAdapter( binding.pages, binding.rating, binding.uploader, - binding.whenPosted + binding.whenPosted, ).forEach { textView -> textView.setOnLongClickListener { itemView.context.copyToClipboard( textView.text.toString(), - textView.text.toString() + textView.text.toString(), ) true } @@ -81,8 +81,8 @@ class TsuminoDescriptionAdapter( binding.moreInfo.setOnClickListener { controller.router?.pushController( MetadataViewController( - controller.manga - ).withFadeTransaction() + controller.manga, + ).withFadeTransaction(), ) } } diff --git a/app/src/main/java/exh/ui/smartsearch/SmartSearchController.kt b/app/src/main/java/exh/ui/smartsearch/SmartSearchController.kt index a29f47f10..b6bfec8ce 100644 --- a/app/src/main/java/exh/ui/smartsearch/SmartSearchController.kt +++ b/app/src/main/java/exh/ui/smartsearch/SmartSearchController.kt @@ -23,7 +23,7 @@ class SmartSearchController(bundle: Bundle? = null) : NucleusController R.string.manhua MangaType.TYPE_COMIC -> R.string.comic else -> R.string.manga - } + }, ).lowercase(Locale.getDefault()) } diff --git a/app/src/main/java/exh/util/OkHttpExtensions.kt b/app/src/main/java/exh/util/OkHttpExtensions.kt index c50bd6f00..c9b33b987 100644 --- a/app/src/main/java/exh/util/OkHttpExtensions.kt +++ b/app/src/main/java/exh/util/OkHttpExtensions.kt @@ -77,7 +77,7 @@ suspend fun Call.awaitResponse(): Response { if (continuation.isCancelled) return continuation.resumeWithException(e) } - } + }, ) continuation.invokeOnCancellation { diff --git a/app/src/main/java/exh/util/SearchOverride.kt b/app/src/main/java/exh/util/SearchOverride.kt index 488030164..c85a9f70a 100644 --- a/app/src/main/java/exh/util/SearchOverride.kt +++ b/app/src/main/java/exh/util/SearchOverride.kt @@ -28,7 +28,7 @@ fun UrlImportableSource.urlImportFetchSearchManga(context: Context, query: Strin } else { emptyList() }, - false + false, ) } } diff --git a/app/src/main/java/exh/util/SourceTagsUtil.kt b/app/src/main/java/exh/util/SourceTagsUtil.kt index e1df13771..abf54af34 100644 --- a/app/src/main/java/exh/util/SourceTagsUtil.kt +++ b/app/src/main/java/exh/util/SourceTagsUtil.kt @@ -17,7 +17,7 @@ object SourceTagsUtil { sourceId: Long?, namespace: String? = null, tag: String? = null, - fullTag: String? = null + fullTag: String? = null, ): String? { return if ( sourceId == EXH_SOURCE_ID || @@ -89,7 +89,7 @@ object SourceTagsUtil { tag }.substringBefore(':', missingDelimiterValue = "").trimOrNull(), tag.substringAfter(':', missingDelimiterValue = tag).trim(), - if (tag.startsWith("-")) TAG_TYPE_EXCLUDE else TAG_TYPE_DEFAULT + if (tag.startsWith("-")) TAG_TYPE_EXCLUDE else TAG_TYPE_DEFAULT, ) private const val TAG_TYPE_EXCLUDE = 69 // why not diff --git a/app/src/main/java/exh/util/ViewExtensions.kt b/app/src/main/java/exh/util/ViewExtensions.kt index 5e22452c4..08907adab 100644 --- a/app/src/main/java/exh/util/ViewExtensions.kt +++ b/app/src/main/java/exh/util/ViewExtensions.kt @@ -30,7 +30,7 @@ fun Context.makeSearchChip( onLongClick: (item: String) -> Unit = {}, sourceId: Long, namespace: String? = null, - type: Int? = null + type: Int? = null, ): Chip { return Chip(this).apply { text = item diff --git a/app/src/main/java/exh/widget/preference/MangaDexLoginPreference.kt b/app/src/main/java/exh/widget/preference/MangaDexLoginPreference.kt index 9bad7039f..2f026378a 100644 --- a/app/src/main/java/exh/widget/preference/MangaDexLoginPreference.kt +++ b/app/src/main/java/exh/widget/preference/MangaDexLoginPreference.kt @@ -13,7 +13,7 @@ import eu.kanade.tachiyomi.util.system.getResourceColor class MangaDexLoginPreference @JvmOverloads constructor( context: Context, val source: MangaDex, - attrs: AttributeSet? = null + attrs: AttributeSet? = null, ) : Preference(context, attrs) { init { diff --git a/app/src/main/java/exh/widget/preference/MangadexLoginDialog.kt b/app/src/main/java/exh/widget/preference/MangadexLoginDialog.kt index ade773f54..91e3155bb 100644 --- a/app/src/main/java/exh/widget/preference/MangadexLoginDialog.kt +++ b/app/src/main/java/exh/widget/preference/MangadexLoginDialog.kt @@ -42,8 +42,8 @@ class MangadexLoginDialog(bundle: Bundle? = null) : DialogController(bundle) { constructor(source: LoginSource) : this( bundleOf( - "key" to source.id - ) + "key" to source.id, + ), ) override fun onCreateDialog(savedViewState: Bundle?): Dialog { @@ -104,7 +104,7 @@ class MangadexLoginDialog(bundle: Bundle? = null) : DialogController(bundle) { val result = source.login( username, password, - twoFactor.toString() + twoFactor.toString(), ) if (result) { dialog?.dismiss() diff --git a/app/src/main/java/exh/widget/preference/MangadexLogoutDialog.kt b/app/src/main/java/exh/widget/preference/MangadexLogoutDialog.kt index 6817afce9..bdab55f4f 100644 --- a/app/src/main/java/exh/widget/preference/MangadexLogoutDialog.kt +++ b/app/src/main/java/exh/widget/preference/MangadexLogoutDialog.kt @@ -26,8 +26,8 @@ class MangadexLogoutDialog(bundle: Bundle? = null) : DialogController(bundle) { constructor(source: Source) : this( bundleOf( - "key" to source.id - ) + "key" to source.id, + ), ) override fun onCreateDialog(savedViewState: Bundle?): Dialog { diff --git a/app/src/main/java/xyz/nulldev/ts/api/http/serializer/FilterSerializer.kt b/app/src/main/java/xyz/nulldev/ts/api/http/serializer/FilterSerializer.kt index 45cf56323..f8d15666d 100644 --- a/app/src/main/java/xyz/nulldev/ts/api/http/serializer/FilterSerializer.kt +++ b/app/src/main/java/xyz/nulldev/ts/api/http/serializer/FilterSerializer.kt @@ -30,7 +30,7 @@ class FilterSerializer { CheckboxSerializer(this), TriStateSerializer(this), GroupSerializer(this), - SortSerializer(this) + SortSerializer(this), ) fun serialize(filters: FilterList) = buildJsonArray { diff --git a/app/src/main/java/xyz/nulldev/ts/api/http/serializer/FilterSerializerModels.kt b/app/src/main/java/xyz/nulldev/ts/api/http/serializer/FilterSerializerModels.kt index dffcf26b8..16dec5d98 100644 --- a/app/src/main/java/xyz/nulldev/ts/api/http/serializer/FilterSerializerModels.kt +++ b/app/src/main/java/xyz/nulldev/ts/api/http/serializer/FilterSerializerModels.kt @@ -35,7 +35,7 @@ class HeaderSerializer(override val serializer: FilterSerializer) : Serializer::name), - Pair(STATE, Filter.Select::state) + Pair(STATE, Filter.Select::state), ) companion object { @@ -87,7 +87,7 @@ class TextSerializer(override val serializer: FilterSerializer) : Serializer) } else { JsonNull - } + }, ) } } @@ -155,7 +155,7 @@ class GroupSerializer(override val serializer: FilterSerializer) : Serializer::name) + Pair(NAME, Filter.Group::name), ) companion object { @@ -181,7 +181,7 @@ class SortSerializer(override val serializer: FilterSerializer) : Serializer - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - \ No newline at end of file