From 4d2f7606193078ea0bc1e641042d9efe13759453 Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Sun, 19 Sep 2021 14:26:37 -0400 Subject: [PATCH] Fix transition text in webtoon layout Fixes #1003 --- .../tachiyomi/ui/reader/viewer/ReaderTransitionView.kt | 7 +++++++ .../ui/reader/viewer/webtoon/WebtoonTransitionHolder.kt | 2 ++ 2 files changed, 9 insertions(+) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderTransitionView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderTransitionView.kt index be0c449790..40a90e2b02 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderTransitionView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderTransitionView.kt @@ -4,6 +4,7 @@ import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import android.widget.LinearLayout +import androidx.annotation.ColorInt import androidx.core.text.bold import androidx.core.text.buildSpannedString import androidx.core.view.isVisible @@ -78,6 +79,12 @@ class ReaderTransitionView @JvmOverloads constructor(context: Context, attrs: At } } + fun setTextColors(@ColorInt color: Int) { + binding.upperText.setTextColor(color) + binding.warningText.setTextColor(color) + binding.lowerText.setTextColor(color) + } + private fun missingChapterWarning(transition: ChapterTransition) { if (transition.to == null) { binding.warning.isVisible = false diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonTransitionHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonTransitionHolder.kt index 94eb561294..e528266e90 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonTransitionHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonTransitionHolder.kt @@ -1,5 +1,6 @@ package eu.kanade.tachiyomi.ui.reader.viewer.webtoon +import android.graphics.Color import android.view.Gravity import android.view.ViewGroup.LayoutParams.MATCH_PARENT import android.view.ViewGroup.LayoutParams.WRAP_CONTENT @@ -54,6 +55,7 @@ class WebtoonTransitionHolder( setMargins(0, childMargins, 0, childMargins) } + transitionView.setTextColors(Color.WHITE) layout.addView(transitionView) layout.addView(pagesContainer, childParams) }