diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryBadge.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryBadge.kt
index a4e85f304e..62bd52eae1 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryBadge.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryBadge.kt
@@ -7,9 +7,9 @@ import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.databinding.UnreadDownloadBadgeBinding
import eu.kanade.tachiyomi.util.system.contextCompatColor
import eu.kanade.tachiyomi.util.system.dpToPx
+import eu.kanade.tachiyomi.util.system.getResourceColor
import eu.kanade.tachiyomi.util.view.gone
import eu.kanade.tachiyomi.util.view.isVisible
-import eu.kanade.tachiyomi.util.view.setTextColorRes
import eu.kanade.tachiyomi.util.view.updatePaddingRelative
import eu.kanade.tachiyomi.util.view.visibleIf
@@ -26,9 +26,9 @@ class LibraryBadge @JvmOverloads constructor(context: Context, attrs: AttributeS
fun setUnreadDownload(unread: Int, downloads: Int, showTotalChapters: Boolean) {
// Update the unread count and its visibility.
- val unreadBadgeBackground = context.contextCompatColor(
- if (showTotalChapters) R.color.total_badge else R.color.unread_badge
- )
+ val unreadBadgeBackground = if (showTotalChapters) {
+ context.contextCompatColor(R.color.total_badge)
+ } else context.getResourceColor(R.attr.colorAccent)
with(binding.unreadText) {
visibleIf(unread > 0 || unread == -1 || showTotalChapters)
@@ -36,12 +36,12 @@ class LibraryBadge @JvmOverloads constructor(context: Context, attrs: AttributeS
return@with
}
text = if (unread == -1) "0" else unread.toString()
- setTextColorRes(
+ setTextColor(
// hide the badge text when preference is only show badge
when {
- unread == -1 && !showTotalChapters -> R.color.unread_badge
- showTotalChapters -> R.color.total_badge_text
- else -> R.color.unread_badge_text
+ unread == -1 && !showTotalChapters -> context.getResourceColor(R.attr.colorAccent)
+ showTotalChapters -> context.contextCompatColor(R.color.total_badge_text)
+ else -> context.contextCompatColor(R.color.unread_badge_text)
}
)
setBackgroundColor(unreadBadgeBackground)
diff --git a/app/src/main/res/color/unread_badge.xml b/app/src/main/res/color/unread_badge.xml
deleted file mode 100644
index aca8280bd1..0000000000
--- a/app/src/main/res/color/unread_badge.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/favorite_badge_rounded.xml b/app/src/main/res/drawable/favorite_badge_rounded.xml
index 2dab341954..ae6f8244db 100644
--- a/app/src/main/res/drawable/favorite_badge_rounded.xml
+++ b/app/src/main/res/drawable/favorite_badge_rounded.xml
@@ -3,5 +3,5 @@
android:shape="rectangle">
-
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/unread_angled_badge.xml b/app/src/main/res/drawable/unread_angled_badge.xml
index b505c96dd7..26639032e1 100644
--- a/app/src/main/res/drawable/unread_angled_badge.xml
+++ b/app/src/main/res/drawable/unread_angled_badge.xml
@@ -8,8 +8,8 @@
tools:background="@color/material_red_500">
+ android:strokeColor="?colorAccent" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/source_global_search_controller_card_item.xml b/app/src/main/res/layout/source_global_search_controller_card_item.xml
index eca8d6e553..64bedf620a 100644
--- a/app/src/main/res/layout/source_global_search_controller_card_item.xml
+++ b/app/src/main/res/layout/source_global_search_controller_card_item.xml
@@ -49,7 +49,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardCornerRadius="10dp"
- app:cardBackgroundColor="@color/unread_badge"
+ app:cardBackgroundColor="?colorAccent"
app:cardElevation="2dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent">
diff --git a/app/src/main/res/layout/unread_download_badge.xml b/app/src/main/res/layout/unread_download_badge.xml
index 1821957584..9b3d5e322b 100644
--- a/app/src/main/res/layout/unread_download_badge.xml
+++ b/app/src/main/res/layout/unread_download_badge.xml
@@ -52,7 +52,7 @@
style="@style/TextAppearance.Regular.Caption.Light"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@color/unread_badge"
+ android:background="?colorAccent"
android:gravity="center"
android:maxLines="1"
android:paddingStart="5dp"