diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt index 3b6326471..fde5d9fe1 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt @@ -55,7 +55,7 @@ object SettingsLibraryScreen : SearchableSettings { val libraryPreferences = remember { Injekt.get() } val allCategories by getCategories.subscribe().collectAsState(initial = runBlocking { getCategories.await() }) - return mutableListOf( + return listOf( getCategoriesGroup(LocalNavigator.currentOrThrow, allCategories, libraryPreferences), getGlobalUpdateGroup(allCategories, libraryPreferences), getChapterSwipeActionsGroup(libraryPreferences), @@ -222,27 +222,24 @@ object SettingsLibraryScreen : SearchableSettings { private fun getChapterSwipeActionsGroup( libraryPreferences: LibraryPreferences, ): Preference.PreferenceGroup { - val chapterSwipeEndActionPref = libraryPreferences.swipeEndAction() - val chapterSwipeStartActionPref = libraryPreferences.swipeStartAction() - return Preference.PreferenceGroup( title = stringResource(R.string.pref_chapter_swipe), preferenceItems = listOf( Preference.PreferenceItem.ListPreference( - pref = chapterSwipeEndActionPref, + pref = libraryPreferences.swipeEndAction(), title = stringResource(R.string.pref_chapter_swipe_end), entries = mapOf( - LibraryPreferences.ChapterSwipeAction.Disabled to stringResource(R.string.action_disable), + LibraryPreferences.ChapterSwipeAction.Disabled to stringResource(R.string.disabled), LibraryPreferences.ChapterSwipeAction.ToggleBookmark to stringResource(R.string.action_bookmark), LibraryPreferences.ChapterSwipeAction.ToggleRead to stringResource(R.string.action_mark_as_read), LibraryPreferences.ChapterSwipeAction.Download to stringResource(R.string.action_download), ), ), Preference.PreferenceItem.ListPreference( - pref = chapterSwipeStartActionPref, + pref = libraryPreferences.swipeStartAction(), title = stringResource(R.string.pref_chapter_swipe_start), entries = mapOf( - LibraryPreferences.ChapterSwipeAction.Disabled to stringResource(R.string.action_disable), + LibraryPreferences.ChapterSwipeAction.Disabled to stringResource(R.string.disabled), LibraryPreferences.ChapterSwipeAction.ToggleBookmark to stringResource(R.string.action_bookmark), LibraryPreferences.ChapterSwipeAction.ToggleRead to stringResource(R.string.action_mark_as_read), LibraryPreferences.ChapterSwipeAction.Download to stringResource(R.string.action_download), diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/debug/DebugInfoScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/debug/DebugInfoScreen.kt index 807fa2107..e45a1c777 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/debug/DebugInfoScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/debug/DebugInfoScreen.kt @@ -94,37 +94,45 @@ object DebugInfoScreen : Screen() { } private fun getDeviceInfoGroup(): Preference.PreferenceGroup { - val items = mutableListOf( - Preference.PreferenceItem.TextPreference( - title = "Model", - subtitle = "${Build.MANUFACTURER} ${Build.MODEL} (${Build.DEVICE})", - ), - ) - - if (DeviceUtil.oneUiVersion != null) { - items += Preference.PreferenceItem.TextPreference( - title = "OneUI version", - subtitle = "${DeviceUtil.oneUiVersion}", + val items = buildList { + add( + Preference.PreferenceItem.TextPreference( + title = "Model", + subtitle = "${Build.MANUFACTURER} ${Build.MODEL} (${Build.DEVICE})", + ), ) - } else if (DeviceUtil.miuiMajorVersion != null) { - items += Preference.PreferenceItem.TextPreference( - title = "MIUI version", - subtitle = "${DeviceUtil.miuiMajorVersion}", + + if (DeviceUtil.oneUiVersion != null) { + add( + Preference.PreferenceItem.TextPreference( + title = "OneUI version", + subtitle = "${DeviceUtil.oneUiVersion}", + ), + ) + } else if (DeviceUtil.miuiMajorVersion != null) { + add( + Preference.PreferenceItem.TextPreference( + title = "MIUI version", + subtitle = "${DeviceUtil.miuiMajorVersion}", + ), + ) + } + + val androidVersion = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + Build.VERSION.RELEASE_OR_CODENAME + } else { + Build.VERSION.RELEASE + } + add( + Preference.PreferenceItem.TextPreference( + title = "Android version", + subtitle = "$androidVersion (${Build.DISPLAY})", + ), ) } - val androidVersion = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY - } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { - Build.VERSION.RELEASE_OR_CODENAME - } else { - Build.VERSION.RELEASE - } - items += Preference.PreferenceItem.TextPreference( - title = "Android version", - subtitle = "$androidVersion (${Build.DISPLAY})", - ) - return Preference.PreferenceGroup( title = "Device info", preferenceItems = items,