diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt index 5aefb15c03..df70b8950a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt @@ -332,7 +332,7 @@ class MangaInfoController : NucleusController(), * Called to run Intent with [Intent.ACTION_SEND], which show share dialog. */ private fun prepareToShareManga() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && manga_cover.drawable != null) GlideApp.with(activity!!).asBitmap().load(presenter.manga).into(object : CustomTarget() { override fun onResourceReady(resource: Bitmap, transition: Transition?) { 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 6bcdf1055a..e29f53caec 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 @@ -271,7 +271,10 @@ class PagerPageHolder( initSubsamplingImageView().setImage(ImageSource.inputStream(openStream!!)) } } else { - initImageView().setImage(openStream!!) + val imageView = initImageView() + imageView.setImage(openStream!!) + if (viewer.config.readerTheme == 2 && page.bg != null) + imageView.background = page.bg } } // Keep the Rx stream alive to close the input stream only when unsubscribed diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/ImageUtil.kt b/app/src/main/java/eu/kanade/tachiyomi/util/ImageUtil.kt index 0d0524f0f8..48f2503860 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/ImageUtil.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/ImageUtil.kt @@ -55,7 +55,7 @@ object ImageUtil { fun autoSetBackground(image: Bitmap): Drawable { if (image.width < 50 || image.height < 50) - return ColorDrawable(Color.WHITE) + return ColorDrawable(android.R.attr.colorBackground) val top = 5 val bot = image.height - 5 val left = (image.width * 0.0275).toInt()