From 5e77ae208da1c21eb58f1eb092ac1e9f3151c14a Mon Sep 17 00:00:00 2001 From: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com> Date: Tue, 10 Aug 2021 04:48:28 +0700 Subject: [PATCH] Use correct color for reader loading indicator (#5685) * Revert "Revert "Use correct color for reader loading indicator (#5645)" (fixes #5669)" This reverts commit a4eba50c * Fix crash on older APIs --- .../tachiyomi/ui/reader/ReaderActivity.kt | 18 +++++++++-- .../ui/reader/viewer/pager/PagerConfig.kt | 11 ++++++- .../ui/reader/viewer/pager/PagerPageHolder.kt | 13 ++++---- .../ui/reader/viewer/webtoon/WebtoonConfig.kt | 6 ++++ .../viewer/webtoon/WebtoonPageHolder.kt | 4 ++- .../util/system/ContextExtensions.kt | 30 +++++++++++++++++++ app/src/main/res/layout/reader_activity.xml | 9 ------ 7 files changed, 72 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt index 45c059bbe4..deedca7fa0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt @@ -16,6 +16,7 @@ import android.graphics.Paint import android.graphics.PorterDuff import android.os.Build import android.os.Bundle +import android.view.Gravity import android.view.KeyEvent import android.view.Menu import android.view.MenuItem @@ -24,6 +25,7 @@ import android.view.View.LAYER_TYPE_HARDWARE import android.view.WindowManager import android.view.animation.Animation import android.view.animation.AnimationUtils +import android.widget.FrameLayout import android.widget.SeekBar import android.widget.Toast import androidx.core.graphics.ColorUtils @@ -32,6 +34,7 @@ import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsControllerCompat import androidx.core.view.isInvisible import androidx.core.view.isVisible +import androidx.core.view.updateLayoutParams import androidx.lifecycle.lifecycleScope import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView import com.google.android.material.shape.MaterialShapeDrawable @@ -58,9 +61,11 @@ import eu.kanade.tachiyomi.ui.reader.setting.OrientationType import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsSheet import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType import eu.kanade.tachiyomi.ui.reader.viewer.BaseViewer +import eu.kanade.tachiyomi.ui.reader.viewer.ReaderProgressIndicator import eu.kanade.tachiyomi.ui.reader.viewer.pager.R2LPagerViewer import eu.kanade.tachiyomi.util.storage.getUriCompat import eu.kanade.tachiyomi.util.system.GLUtil +import eu.kanade.tachiyomi.util.system.createReaderThemeContext import eu.kanade.tachiyomi.util.system.getThemeColor import eu.kanade.tachiyomi.util.system.hasDisplayCutout import eu.kanade.tachiyomi.util.system.isNightMode @@ -137,6 +142,8 @@ class ReaderActivity : BaseRxActivity() private val windowInsetsController by lazy { WindowInsetsControllerCompat(window, binding.root) } + private var loadingIndicator: ReaderProgressIndicator? = null + var isScrollingThroughPages = false private set @@ -600,8 +607,13 @@ class ReaderActivity : BaseRxActivity() binding.rightChapter.setTooltip(R.string.action_next_chapter) } - binding.pleaseWait.isVisible = true - binding.pleaseWait.startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_in_long)) + val loadingIndicatorContext = createReaderThemeContext(preferences.readerTheme().get()) + loadingIndicator = ReaderProgressIndicator(loadingIndicatorContext).apply { + updateLayoutParams { + gravity = Gravity.CENTER + } + } + binding.readerContainer.addView(loadingIndicator) } private fun showReadingModeToast(mode: Int) { @@ -620,7 +632,7 @@ class ReaderActivity : BaseRxActivity() * hides or disables the reader prev/next buttons if there's a prev or next chapter */ fun setChapters(viewerChapters: ViewerChapters) { - binding.pleaseWait.isVisible = false + binding.readerContainer.removeView(loadingIndicator) viewer?.setChapters(viewerChapters) binding.toolbar.subtitle = viewerChapters.currChapter.chapter.name diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt index d02fcda4ed..6acfc45195 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt @@ -23,6 +23,9 @@ class PagerConfig( preferences: PreferencesHelper = Injekt.get() ) : ViewerConfig(preferences, scope) { + var theme = preferences.readerTheme().get() + private set + var automaticBackground = false private set @@ -39,7 +42,13 @@ class PagerConfig( init { preferences.readerTheme() - .register({ automaticBackground = it == 3 }, { imagePropertyChangedListener?.invoke() }) + .register( + { + theme = it + automaticBackground = it == 3 + }, + { imagePropertyChangedListener?.invoke() } + ) preferences.imageScaleType() .register({ imageScaleType = it }, { imagePropertyChangedListener?.invoke() }) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt index 5e0b7484df..11cad18dff 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt @@ -30,6 +30,7 @@ import eu.kanade.tachiyomi.ui.reader.viewer.ReaderProgressIndicator import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerConfig.ZoomType import eu.kanade.tachiyomi.ui.webview.WebViewActivity import eu.kanade.tachiyomi.util.system.ImageUtil +import eu.kanade.tachiyomi.util.system.createReaderThemeContext import eu.kanade.tachiyomi.util.system.dpToPx import eu.kanade.tachiyomi.widget.ViewPagerAdapter import rx.Observable @@ -58,11 +59,7 @@ class PagerPageHolder( /** * Loading progress bar to indicate the current progress. */ - private val progressIndicator = ReaderProgressIndicator(context).apply { - updateLayoutParams { - gravity = Gravity.CENTER - } - } + private val progressIndicator: ReaderProgressIndicator /** * Image view that supports subsampling on zoom. @@ -118,6 +115,12 @@ class PagerPageHolder( } init { + val indicatorContext = context.createReaderThemeContext(viewer.config.theme) + progressIndicator = ReaderProgressIndicator(indicatorContext).apply { + updateLayoutParams { + gravity = Gravity.CENTER + } + } addView(progressIndicator) observeStatus() viewer.activity.addOnMenuVisibilityListener(visibilityListener) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt index c5a585724a..9cd3c28a3f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt @@ -28,6 +28,9 @@ class WebtoonConfig( var sidePadding = 0 private set + var theme = preferences.readerTheme().get() + private set + init { preferences.cropBordersWebtoon() .register({ imageCropBorders = it }, { imagePropertyChangedListener?.invoke() }) @@ -50,6 +53,9 @@ class WebtoonConfig( preferences.dualPageInvertWebtoon() .register({ dualPageInvert = it }, { imagePropertyChangedListener?.invoke() }) + + preferences.readerTheme() + .register({ theme = it }, { imagePropertyChangedListener?.invoke() }) } override var navigator: ViewerNavigation = defaultNavigation() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt index 2fd37402f7..6e0498eb80 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt @@ -27,6 +27,7 @@ import eu.kanade.tachiyomi.ui.reader.model.ReaderPage import eu.kanade.tachiyomi.ui.reader.viewer.ReaderProgressIndicator import eu.kanade.tachiyomi.ui.webview.WebViewActivity import eu.kanade.tachiyomi.util.system.ImageUtil +import eu.kanade.tachiyomi.util.system.createReaderThemeContext import eu.kanade.tachiyomi.util.system.dpToPx import rx.Observable import rx.Subscription @@ -345,7 +346,8 @@ class WebtoonPageHolder( progressContainer = FrameLayout(context) frame.addView(progressContainer, MATCH_PARENT, parentHeight) - val progress = ReaderProgressIndicator(context).apply { + val indicatorContext = context.createReaderThemeContext(viewer.config.theme) + val progress = ReaderProgressIndicator(indicatorContext).apply { updateLayoutParams { gravity = Gravity.CENTER_HORIZONTAL updateMargins(top = parentHeight / 4) diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt index e346172eb6..8184381609 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt @@ -26,11 +26,13 @@ import android.widget.Toast import androidx.annotation.AttrRes import androidx.annotation.ColorInt import androidx.annotation.StringRes +import androidx.appcompat.view.ContextThemeWrapper import androidx.browser.customtabs.CustomTabColorSchemeParams import androidx.browser.customtabs.CustomTabsIntent import androidx.core.app.NotificationCompat import androidx.core.content.ContextCompat import androidx.core.content.getSystemService +import androidx.core.content.res.ResourcesCompat import androidx.core.graphics.alpha import androidx.core.graphics.blue import androidx.core.graphics.green @@ -298,3 +300,31 @@ fun Context.isTablet(): Boolean { fun Context.isNightMode(): Boolean { return resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES } + +/** + * Creates night mode Context depending on reader theme/background + * + * Context wrapping method obtained from AppCompatDelegateImpl + * https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:appcompat/appcompat/src/main/java/androidx/appcompat/app/AppCompatDelegateImpl.java;l=348;drc=e28752c96fc3fb4d3354781469a1af3dbded4898 + */ +fun Context.createReaderThemeContext(readerThemeSelected: Int): Context { + val isDarkBackground = when (readerThemeSelected) { + 1, 2 -> true // Black, Gray + 3 -> isNightMode() // Automatic bg uses activity background by default + else -> false // White + } + val expected = if (isDarkBackground) Configuration.UI_MODE_NIGHT_YES else Configuration.UI_MODE_NIGHT_NO + if (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK != expected) { + val overrideConf = Configuration() + overrideConf.setTo(resources.configuration) + overrideConf.uiMode = (overrideConf.uiMode and Configuration.UI_MODE_NIGHT_MASK.inv()) or expected + + val wrappedContext = ContextThemeWrapper(this, R.style.Theme_AppCompat_Empty) + wrappedContext.applyOverrideConfiguration(overrideConf) + if (theme != null) { + ResourcesCompat.ThemeCompat.rebase(wrappedContext.theme) + } + return wrappedContext + } + return this +} diff --git a/app/src/main/res/layout/reader_activity.xml b/app/src/main/res/layout/reader_activity.xml index fb90ddaf5e..baf93e471e 100644 --- a/app/src/main/res/layout/reader_activity.xml +++ b/app/src/main/res/layout/reader_activity.xml @@ -15,15 +15,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - -