From 351331a5257a6fb14ae12a994c5a97563ecd122f Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 22 Apr 2023 22:29:17 -0400 Subject: [PATCH] Minor cleanup (cherry picked from commit 67b4e53a58209a42d03fcc00e3b7191f955bf257) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt --- .../eu/kanade/tachiyomi/data/backup/models/BackupManga.kt | 2 +- .../kanade/tachiyomi/extension/api/ExtensionGithubApi.kt | 2 +- .../extension/details/ExtensionDetailsScreenModel.kt | 2 +- .../ui/browse/migration/manga/MigrationMangaScreenModel.kt | 2 +- .../ui/browse/source/browse/BrowseSourceScreenModel.kt | 2 +- .../eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt | 4 ++-- .../tachiyomi/ui/reader/loader/DirectoryPageLoader.kt | 3 ++- .../java/eu/kanade/tachiyomi/widget/MaterialSpinnerView.kt | 7 +++---- .../kotlin/tachiyomi/source/local/LocalSource.kt | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt index 7a1d108ee..06ca854c3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt @@ -124,7 +124,7 @@ data class BackupManga( artist = manga.ogArtist, author = manga.ogAuthor, description = manga.ogDescription, - genre = manga.ogGenre ?: emptyList(), + genre = manga.ogGenre.orEmpty(), status = manga.ogStatus.toInt(), // SY <-- thumbnailUrl = manga.thumbnailUrl, 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 bd186024a..c4f69125c 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 @@ -158,7 +158,7 @@ internal class ExtensionGithubApi { isNsfw = it.nsfw == 1, hasReadme = it.hasReadme == 1, hasChangelog = it.hasChangelog == 1, - sources = it.sources?.toExtensionSources() ?: emptyList(), + sources = it.sources?.toExtensionSources().orEmpty(), apkName = it.apk, iconUrl = "${/* SY --> */ repoUrl /* SY <-- */}icon/${it.apk.replace(".apk", ".png")}", // SY --> diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsScreenModel.kt index ceace82ce..9a35a7271 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsScreenModel.kt @@ -173,7 +173,7 @@ data class ExtensionDetailsState( ) { val sources: List - get() = _sources ?: emptyList() + get() = _sources.orEmpty() val isLoading: Boolean get() = extension == null || _sources == null diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaScreenModel.kt index 958976f01..f0cfad2ef 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaScreenModel.kt @@ -64,7 +64,7 @@ data class MigrateMangaState( ) { val titles: List - get() = titleList ?: emptyList() + get() = titleList.orEmpty() val isLoading: Boolean get() = source == null || titleList == null diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt index f79e3807d..f3e65bab2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt @@ -420,7 +420,7 @@ open class BrowseSourceScreenModel( return getCategories.subscribe() .firstOrNull() ?.filterNot { it.isSystemCategory } - ?: emptyList() + .orEmpty() } suspend fun getDuplicateLibraryManga(manga: Manga): Manga? { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt index cc2c76f82..41904af51 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt @@ -518,7 +518,7 @@ class LibraryScreenModel( state.copy(ogCategories = displayCategories) } // SY <-- - displayCategories.associateWith { libraryManga[it.id] ?: emptyList() } + displayCategories.associateWith { libraryManga[it.id].orEmpty() } } } @@ -1283,7 +1283,7 @@ class LibraryScreenModel( } fun getLibraryItemsByPage(page: Int): List { - return library.values.toTypedArray().getOrNull(page) ?: emptyList() + return library.values.toTypedArray().getOrNull(page).orEmpty() } fun getMangaCountForCategory(category: Category): Int? { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/DirectoryPageLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/DirectoryPageLoader.kt index 1b25c273e..c55ebddb6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/DirectoryPageLoader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/DirectoryPageLoader.kt @@ -25,7 +25,8 @@ class DirectoryPageLoader(val file: File) : PageLoader() { stream = streamFn status = Page.State.READY } - } ?: emptyList() + } + .orEmpty() } /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/MaterialSpinnerView.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/MaterialSpinnerView.kt index 38cdc0f19..b57abbba5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/MaterialSpinnerView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/MaterialSpinnerView.kt @@ -57,10 +57,9 @@ class MaterialSpinnerView @JvmOverloads constructor(context: Context, attrs: Att val title = getString(R.styleable.MaterialSpinnerView_title).orEmpty() binding.title.text = title - val viewEntries = ( - getTextArray(R.styleable.MaterialSpinnerView_android_entries) - ?: emptyArray() - ).map { it.toString() } + val viewEntries = getTextArray(R.styleable.MaterialSpinnerView_android_entries) + .orEmpty() + .map { it.toString() } entries = viewEntries binding.details.text = viewEntries.firstOrNull().orEmpty() } diff --git a/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt b/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt index b299a8a67..f3c45d7ae 100755 --- a/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt +++ b/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt @@ -366,8 +366,8 @@ actual class LocalSource( fun getFormat(chapter: SChapter): Format { try { return fileSystem.getBaseDirectories() - .map { directory -> File(directory, chapter.url) } - .find { chapterFile -> chapterFile.exists() } + .map { dir -> File(dir, chapter.url) } + .find { it.exists() } ?.let(Format.Companion::valueOf) ?: throw Exception(context.getString(R.string.chapter_not_found)) } catch (e: Format.UnknownFormatException) {