Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-09-19 20:09:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Set background for pager before image loads

Browse Source
This commit is contained in:
Jay 2020-05-21 01:17:39 -04:00
parent b791c6c2d8
commit 3067807798
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
View File

@ -4,8 +4,8 @@ import android.annotation.SuppressLint
import android.content.Context
import android.content.Intent
import android.graphics.BitmapFactory
import android.graphics.Color
import android.graphics.PointF
import android.graphics.drawable.ColorDrawable
import android.graphics.drawable.Drawable
import android.net.Uri
import android.view.GestureDetector
@ -107,6 +107,10 @@ class PagerPageHolder(
init {
addView(progressBar)
observeStatus()
setBackgroundColor(when (val theme = viewer.config.readerTheme) {
3 -> Color.TRANSPARENT
else -> ThemeUtil.readerBackgroundColor(theme)
})
}
/**
@ -255,7 +259,7 @@ class PagerPageHolder(
context
)) {
imageView.setImage(ImageSource.inputStream(openStream!!))
background = page.bg
imageView.background = page.bg
}
// if the user switches to automatic when pages are already cached, the bg needs to be loaded
else {
@ -273,16 +277,12 @@ class PagerPageHolder(
} else {
val imageView = initSubsamplingImageView()
imageView.setImage(ImageSource.inputStream(openStream!!))
background = ColorDrawable(ThemeUtil.readerBackgroundColor(viewer.config.readerTheme))
}
} else {
val imageView = initImageView()
imageView.setImage(openStream!!)
if (viewer.config.readerTheme >= 2 && page.bg != null) {
background = page.bg
} else if (viewer.config.readerTheme < 2) {
background =
ColorDrawable(ThemeUtil.readerBackgroundColor(viewer.config.readerTheme))
imageView.background = page.bg
}
}
}