From 918502742d9cd26ac70b0db067bfae02bb4c4e88 Mon Sep 17 00:00:00 2001 From: Platiplus Date: Sat, 9 Oct 2021 12:10:36 -0300 Subject: [PATCH] [5893] - Implemented Language Badge (#6050) * Implemented language badge on library items * Added left margin for better viewing the badge on list view * Adjusting borders on badges, cleaning string interpolation and cleaning code * Improving readability on Holders and removing unused background and text on grid items --- .../data/preference/PreferenceKeys.kt | 2 + .../data/preference/PreferencesHelper.kt | 2 + .../browse/SourceComfortableGridHolder.kt | 3 +- .../browse/source/browse/SourceGridHolder.kt | 3 +- .../library/LibraryComfortableGridHolder.kt | 8 +- .../ui/library/LibraryCompactGridHolder.kt | 8 +- .../tachiyomi/ui/library/LibraryItem.kt | 1 + .../tachiyomi/ui/library/LibraryListHolder.kt | 5 + .../tachiyomi/ui/library/LibraryPresenter.kt | 8 + .../ui/library/LibrarySettingsSheet.kt | 5 +- .../layout/source_comfortable_grid_item.xml | 153 +++++++++++------- .../res/layout/source_compact_grid_item.xml | 152 ++++++++++------- app/src/main/res/layout/source_list_item.xml | 16 ++ app/src/main/res/values/strings.xml | 1 + 14 files changed, 244 insertions(+), 123 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt index d05e0189a4..f780fd5421 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt @@ -197,6 +197,8 @@ object PreferenceKeys { const val unreadBadge = "display_unread_badge" + const val languageBadge = "display_language_badge" + const val localBadge = "display_local_badge" const val categoryTabs = "display_category_tabs" 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 40d3b6a31f..48b145d015 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt @@ -253,6 +253,8 @@ class PreferencesHelper(val context: Context) { fun unreadBadge() = flowPrefs.getBoolean(Keys.unreadBadge, true) + fun languageBadge() = flowPrefs.getBoolean(Keys.languageBadge, false) + fun categoryTabs() = flowPrefs.getBoolean(Keys.categoryTabs, true) fun categoryNumberOfItems() = flowPrefs.getBoolean(Keys.categoryNumberOfItems, false) 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 6bbe76b8cc..b3dd990714 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 @@ -39,7 +39,8 @@ class SourceComfortableGridHolder(private val view: View, private val adapter: F binding.thumbnail.alpha = if (manga.favorite) 0.3f else 1.0f // For rounded corners - binding.badges.clipToOutline = true + binding.leftBadges.clipToOutline = true + binding.rightBadges.clipToOutline = true // Set favorite badge binding.favoriteText.isVisible = manga.favorite diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceGridHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceGridHolder.kt index 38b5363711..f0cc033854 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceGridHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceGridHolder.kt @@ -39,7 +39,8 @@ open class SourceGridHolder(private val view: View, private val adapter: Flexibl binding.thumbnail.alpha = if (manga.favorite) 0.3f else 1.0f // For rounded corners - binding.badges.clipToOutline = true + binding.leftBadges.clipToOutline = true + binding.rightBadges.clipToOutline = true // Set favorite badge binding.favoriteText.isVisible = manga.favorite 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 41095d9288..518e2ae29a 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 @@ -36,7 +36,8 @@ class LibraryComfortableGridHolder( binding.title.text = item.manga.title // For rounded corners - binding.badges.clipToOutline = true + binding.leftBadges.clipToOutline = true + binding.rightBadges.clipToOutline = true // Update the unread count and its visibility. with(binding.unreadText) { @@ -48,6 +49,11 @@ class LibraryComfortableGridHolder( isVisible = item.downloadCount > 0 text = item.downloadCount.toString() } + // Update the source language and its visibility + with(binding.languageText) { + isVisible = item.sourceLanguage.isNotEmpty() + text = item.sourceLanguage + } // set local visibility if its local manga binding.localText.isVisible = item.isLocal 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 71b0bd1862..45c8349f81 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCompactGridHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCompactGridHolder.kt @@ -34,7 +34,8 @@ open class LibraryCompactGridHolder( binding.title.text = item.manga.title // For rounded corners - binding.badges.clipToOutline = true + binding.leftBadges.clipToOutline = true + binding.rightBadges.clipToOutline = true // Update the unread count and its visibility. with(binding.unreadText) { @@ -46,6 +47,11 @@ open class LibraryCompactGridHolder( isVisible = item.downloadCount > 0 text = item.downloadCount.toString() } + // Update the source language and its visibility + with(binding.languageText) { + isVisible = item.sourceLanguage.isNotEmpty() + text = item.sourceLanguage + } // set local visibility if its local manga binding.localText.isVisible = item.isLocal 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 8d9c669bdf..e90a49999e 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 @@ -34,6 +34,7 @@ class LibraryItem( var downloadCount = -1 var unreadCount = -1 var isLocal = false + var sourceLanguage = "" private fun getDisplayMode(): DisplayModeSetting { return if (shouldSetFromCategory.get() && manga.category != 0) { 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 9de429c259..c6500ef6ac 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt @@ -46,6 +46,11 @@ class LibraryListHolder( isVisible = item.downloadCount > 0 text = "${item.downloadCount}" } + // Update the source language and its visibility + with(binding.languageText) { + isVisible = item.sourceLanguage.isNotEmpty() + text = item.sourceLanguage + } // show local text badge if local manga binding.localText.isVisible = item.isLocal 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 65c0ff6609..b2409562b2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt @@ -200,6 +200,7 @@ class LibraryPresenter( val showDownloadBadges = preferences.downloadBadge().get() val showUnreadBadges = preferences.unreadBadge().get() val showLocalBadges = preferences.localBadge().get() + val showLanguageBadges = preferences.languageBadge().get() for ((_, itemList) in map) { for (item in itemList) { @@ -223,6 +224,13 @@ class LibraryPresenter( // Hide / Unset local badge if not enabled false } + + item.sourceLanguage = if (showLanguageBadges) { + sourceManager.getOrStub(item.manga.source).lang.uppercase() + } else { + // Unset source language if not enabled + "" + } } } } 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 267701af47..e3ff3b7416 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 @@ -367,15 +367,17 @@ class LibrarySettingsSheet( 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 languageBadge = Item.CheckboxGroup(R.string.action_display_language_badge, this) override val header = Item.Header(R.string.badges_header) - override val items = listOf(downloadBadge, unreadBadge, localBadge) + override val items = listOf(downloadBadge, unreadBadge, localBadge, languageBadge) override val footer = null override fun initModels() { downloadBadge.checked = preferences.downloadBadge().get() unreadBadge.checked = preferences.unreadBadge().get() localBadge.checked = preferences.localBadge().get() + languageBadge.checked = preferences.languageBadge().get() } override fun onItemClicked(item: Item) { @@ -385,6 +387,7 @@ class LibrarySettingsSheet( downloadBadge -> preferences.downloadBadge().set((item.checked)) unreadBadge -> preferences.unreadBadge().set((item.checked)) localBadge -> preferences.localBadge().set((item.checked)) + languageBadge -> preferences.languageBadge().set((item.checked)) } adapter.notifyItemChanged(item) } diff --git a/app/src/main/res/layout/source_comfortable_grid_item.xml b/app/src/main/res/layout/source_comfortable_grid_item.xml index 6178796d2e..91f570f5b3 100644 --- a/app/src/main/res/layout/source_comfortable_grid_item.xml +++ b/app/src/main/res/layout/source_comfortable_grid_item.xml @@ -37,74 +37,109 @@ android:layout_height="wrap_content" android:layout_marginStart="4dp" android:layout_marginTop="4dp" - android:background="@drawable/rounded_rectangle"> + android:layout_marginEnd="4dp"> - + android:background="@drawable/rounded_rectangle"> - + + + + + + + + + + + - - - - + android:background="@drawable/rounded_rectangle"> + + + + android:layout_marginEnd="4dp"> - + android:background="@drawable/rounded_rectangle"> - + + + + + + + + + + + - - - - + android:background="@drawable/rounded_rectangle"> + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bfd1b67c32..f7a8ba2f91 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -93,6 +93,7 @@ Download badges Unread badges Local badges + Language badges Show category tabs Show number of items Disable