From 20f8fac4799d9fe1954256e6cc613f8ce6889216 Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Mon, 26 Apr 2021 01:25:53 -0400 Subject: [PATCH] remove java.enumConstants where unneeded --- .../kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt | 4 +--- .../kanade/tachiyomi/ui/setting/SettingsReaderController.kt | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt index 91440be7a1..a356e1ccf9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt @@ -522,9 +522,7 @@ class FilterBottomSheet @JvmOverloads constructor(context: Context, attrs: Attri Tracked ).joinToString("") { it.value.toString() } - fun filterOf(char: Char): Filters? { - return Filters::class.java.enumConstants?.find { it.value == char } - } + fun filterOf(char: Char) = values().find { it.value == char } } } } 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 83af49d0e8..ea66a6c7cc 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 @@ -94,9 +94,9 @@ class SettingsReaderController : SettingsController() { intListPreference(activity) { key = Keys.rotation titleRes = R.string.rotation - val enumConstants = OrientationType::class.java.enumConstants - entriesRes = enumConstants?.map { it.stringRes }.orEmpty().toTypedArray() - entryRange = 1..(enumConstants?.size ?: 5) + val enumConstants = OrientationType.values() + entriesRes = enumConstants.map { it.stringRes }.toTypedArray() + entryRange = 1..enumConstants.size defaultValue = 1 } intListPreference(activity) {