Remove ability to hide unread chapter badges in library

(cherry picked from commit 68345e636efb7f616a91ef8f0accc17a818ebe5b)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
This commit is contained in:
arkon 2023-01-07 14:22:38 -05:00 committed by Jobobby04
parent 1800d00e04
commit 193c311e15
4 changed files with 11 additions and 20 deletions

View File

@ -63,8 +63,6 @@ class LibraryPreferences(
fun localBadge() = preferenceStore.getBoolean("display_local_badge", true) fun localBadge() = preferenceStore.getBoolean("display_local_badge", true)
fun unreadBadge() = preferenceStore.getBoolean("display_unread_badge", true)
fun languageBadge() = preferenceStore.getBoolean("display_language_badge", false) fun languageBadge() = preferenceStore.getBoolean("display_language_badge", false)
fun newShowUpdatesCount() = preferenceStore.getBoolean("library_show_updates_count", true) fun newShowUpdatesCount() = preferenceStore.getBoolean("library_show_updates_count", true)

View File

@ -480,7 +480,6 @@ class LibraryScreenModel(
private fun getLibraryItemPreferencesFlow(): Flow<ItemPreferences> { private fun getLibraryItemPreferencesFlow(): Flow<ItemPreferences> {
return combine( return combine(
libraryPreferences.downloadBadge().changes(), libraryPreferences.downloadBadge().changes(),
libraryPreferences.unreadBadge().changes(),
libraryPreferences.localBadge().changes(), libraryPreferences.localBadge().changes(),
libraryPreferences.languageBadge().changes(), libraryPreferences.languageBadge().changes(),
@ -496,17 +495,16 @@ class LibraryScreenModel(
transform = { transform = {
ItemPreferences( ItemPreferences(
downloadBadge = it[0] as Boolean, downloadBadge = it[0] as Boolean,
unreadBadge = it[1] as Boolean, localBadge = it[1] as Boolean,
localBadge = it[2] as Boolean, languageBadge = it[2] as Boolean,
languageBadge = it[3] as Boolean, globalFilterDownloaded = it[3] as Boolean,
globalFilterDownloaded = it[4] as Boolean, filterDownloaded = it[4] as Int,
filterDownloaded = it[5] as Int, filterUnread = it[5] as Int,
filterUnread = it[6] as Int, filterStarted = it[6] as Int,
filterStarted = it[7] as Int, filterBookmarked = it[7] as Int,
filterBookmarked = it[8] as Int, filterCompleted = it[8] as Int,
filterCompleted = it[9] as Int,
// SY --> // SY -->
filterLewd = it[10] as Int, filterLewd = it[9] as Int,
// SY <-- // SY <--
) )
}, },
@ -539,7 +537,7 @@ class LibraryScreenModel(
} else { } else {
0 0
} }
unreadCount = if (prefs.unreadBadge) libraryManga.unreadCount else 0 unreadCount = libraryManga.unreadCount
isLocal = if (prefs.localBadge) libraryManga.manga.isLocal() else false isLocal = if (prefs.localBadge) libraryManga.manga.isLocal() else false
sourceLanguage = if (prefs.languageBadge) { sourceLanguage = if (prefs.languageBadge) {
sourceManager.getOrStub(libraryManga.manga.source).lang sourceManager.getOrStub(libraryManga.manga.source).lang
@ -1268,7 +1266,6 @@ class LibraryScreenModel(
@Immutable @Immutable
private data class ItemPreferences( private data class ItemPreferences(
val downloadBadge: Boolean, val downloadBadge: Boolean,
val unreadBadge: Boolean,
val localBadge: Boolean, val localBadge: Boolean,
val languageBadge: Boolean, val languageBadge: Boolean,

View File

@ -403,17 +403,15 @@ class LibrarySettingsSheet(
inner class BadgeGroup : Group { inner class BadgeGroup : Group {
private val downloadBadge = Item.CheckboxGroup(R.string.action_display_download_badge, this) private val downloadBadge = Item.CheckboxGroup(R.string.action_display_download_badge, this)
private val unreadBadge = Item.CheckboxGroup(R.string.action_display_unread_badge, this)
private val localBadge = Item.CheckboxGroup(R.string.action_display_local_badge, this) private val localBadge = Item.CheckboxGroup(R.string.action_display_local_badge, this)
private val languageBadge = Item.CheckboxGroup(R.string.action_display_language_badge, this) private val languageBadge = Item.CheckboxGroup(R.string.action_display_language_badge, this)
override val header = Item.Header(R.string.badges_header) override val header = Item.Header(R.string.badges_header)
override val items = listOf(downloadBadge, unreadBadge, localBadge, languageBadge) override val items = listOf(downloadBadge, localBadge, languageBadge)
override val footer = null override val footer = null
override fun initModels() { override fun initModels() {
downloadBadge.checked = libraryPreferences.downloadBadge().get() downloadBadge.checked = libraryPreferences.downloadBadge().get()
unreadBadge.checked = libraryPreferences.unreadBadge().get()
localBadge.checked = libraryPreferences.localBadge().get() localBadge.checked = libraryPreferences.localBadge().get()
languageBadge.checked = libraryPreferences.languageBadge().get() languageBadge.checked = libraryPreferences.languageBadge().get()
} }
@ -423,7 +421,6 @@ class LibrarySettingsSheet(
item.checked = !item.checked item.checked = !item.checked
when (item) { when (item) {
downloadBadge -> libraryPreferences.downloadBadge().set((item.checked)) downloadBadge -> libraryPreferences.downloadBadge().set((item.checked))
unreadBadge -> libraryPreferences.unreadBadge().set((item.checked))
localBadge -> libraryPreferences.localBadge().set((item.checked)) localBadge -> libraryPreferences.localBadge().set((item.checked))
languageBadge -> libraryPreferences.languageBadge().set((item.checked)) languageBadge -> libraryPreferences.languageBadge().set((item.checked))
else -> {} else -> {}

View File

@ -107,7 +107,6 @@
<string name="action_display_list">List</string> <string name="action_display_list">List</string>
<string name="action_display_cover_only_grid">Cover-only grid</string> <string name="action_display_cover_only_grid">Cover-only grid</string>
<string name="action_display_download_badge">Downloaded chapters</string> <string name="action_display_download_badge">Downloaded chapters</string>
<string name="action_display_unread_badge">Unread chapters</string>
<string name="action_display_local_badge">Local source</string> <string name="action_display_local_badge">Local source</string>
<string name="action_display_language_badge">Language</string> <string name="action_display_language_badge">Language</string>
<string name="action_display_show_tabs">Show category tabs</string> <string name="action_display_show_tabs">Show category tabs</string>