From 9f05d563f96385e2e0f5fe82f6ce097f8f2ccca2 Mon Sep 17 00:00:00 2001 From: Soitora Date: Mon, 12 Oct 2020 22:59:44 +0200 Subject: [PATCH] Darken the description colors (#3858) * Darken the description colors * Restore UpdatesHolder.kt * Use the same color as the Extensions subtitles --- .../tachiyomi/ui/manga/chapter/ChapterHolder.kt | 12 +++++++++--- .../tachiyomi/ui/manga/chapter/ChaptersAdapter.kt | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterHolder.kt index 7dd16b7fd3..428ef35109 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterHolder.kt @@ -32,13 +32,19 @@ class ChapterHolder( } // Set correct text color - val chapterColor = when { + val chapterTitleColor = when { chapter.read -> adapter.readColor chapter.bookmark -> adapter.bookmarkedColor else -> adapter.unreadColor } - chapter_title.setTextColor(chapterColor) - chapter_description.setTextColor(chapterColor) + chapter_title.setTextColor(chapterTitleColor) + + val chapterDescriptionColor = when { + chapter.read -> adapter.readColor + chapter.bookmark -> adapter.bookmarkedColor + else -> adapter.unreadColorSecondary + } + chapter_description.setTextColor(chapterDescriptionColor) bookmark_icon.isVisible = chapter.bookmark diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersAdapter.kt index f78047d021..7861e9208a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersAdapter.kt @@ -22,6 +22,7 @@ class ChaptersAdapter( val readColor = context.getResourceColor(R.attr.colorOnSurface, 0.38f) val unreadColor = context.getResourceColor(R.attr.colorOnSurface) + val unreadColorSecondary = context.getResourceColor(android.R.attr.textColorSecondary) val bookmarkedColor = context.getResourceColor(R.attr.colorAccent)