null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

style: Actually set chapter info text color

Browse source 
Apparently it is done programmatically
This commit is contained in:
Ahmad Ansori Palembani 2024-09-03 11:19:04 +07:00
parent 0ee76b9a50
commit bf1f258455
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
3 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterHolder.kt
View file

@ -84,12 +84,12 @@ class ChapterHolder(
if (item.bookmark) R.drawable.ic_bookmark_off_24dp else R.drawable.ic_bookmark_24dp,
)
}
// this will color the scanlator the same bookmarks
ChapterUtil.setTextViewForChapter(
binding.chapterScanlator,
item,
showBookmark = false,
hideStatus = isLocked,
isDetails = true,
)
binding.chapterScanlator.text = statuses.joinToString(" • ")

20
app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterUtil.kt
View file

@ -16,10 +16,10 @@ import eu.kanade.tachiyomi.util.system.dpToPx
import eu.kanade.tachiyomi.util.system.dpToPxEnd
import eu.kanade.tachiyomi.util.system.getResourceColor
import eu.kanade.tachiyomi.util.system.timeSpanFromNow
import yokai.i18n.MR
import yokai.util.lang.getString
import java.text.DecimalFormat
import java.text.DecimalFormatSymbols
import yokai.i18n.MR
import yokai.util.lang.getString
class ChapterUtil {
companion object {
@ -42,9 +42,10 @@ class ChapterUtil {
chapter: Chapter,
showBookmark: Boolean = true,
hideStatus: Boolean = false,
isDetails: Boolean = false,
) {
val context = textView.context
textView.setTextColor(chapterColor(context, chapter, hideStatus))
textView.setTextColor(chapterColor(context, chapter, hideStatus, isDetails))
if (!hideStatus && showBookmark) {
setBookmark(textView, chapter)
}
@ -77,11 +78,11 @@ class ChapterUtil {
}
}
fun chapterColor(context: Context, chapter: Chapter, hideStatus: Boolean = false): Int {
fun chapterColor(context: Context, chapter: Chapter, hideStatus: Boolean = false, secondary: Boolean = false): Int {
return when {
hideStatus -> unreadColor(context)
hideStatus -> unreadColor(context, secondary)
chapter.read -> readColor(context)
else -> unreadColor(context)
else -> unreadColor(context, secondary)
}
}
@ -101,7 +102,12 @@ class ChapterUtil {
private fun readColor(context: Context): Int = context.contextCompatColor(R.color.read_chapter)
private fun unreadColor(context: Context): Int = context.getResourceColor(R.attr.colorOnBackground)
private fun unreadColor(context: Context, secondary: Boolean = false): Int =
if (!secondary) {
context.getResourceColor(R.attr.colorOnBackground)
} else {
context.getResourceColor(android.R.attr.textColorSecondary)
}
private fun bookmarkedColor(context: Context): Int = context.getResourceColor(R.attr.colorSecondary)

1
app/src/main/res/layout/chapters_item.xml
View file

@ -84,7 +84,6 @@
android:layout_marginBottom="12dp"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/download_button"
app:layout_constraintStart_toStartOf="parent"