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

fix for last commit

Browse source
This commit is contained in:
Jays2Kings 2023-03-07 01:01:43 -05:00
parent 4e3b0d4c10
commit 5f4abb3690
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
View file

@ -1673,7 +1673,7 @@ class ReaderActivity : BaseActivity<ReaderActivityBinding>() {
val newBitmap = Bitmap.createBitmap( val newBitmap = Bitmap.createBitmap(
intrinsicWidth, intrinsicWidth,
intrinsicHeight, intrinsicHeight,
bitmap.config bitmap.config,
) )
val canvas = Canvas(newBitmap) val canvas = Canvas(newBitmap)
val bgColor = ColorUtils.setAlphaComponent(service.getLogoColor(), 255) val bgColor = ColorUtils.setAlphaComponent(service.getLogoColor(), 255)

5
app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt
View file

@ -441,8 +441,8 @@ object ImageUtil {
val canvas = Canvas(result) val canvas = Canvas(result)
canvas.drawColor(background) canvas.drawColor(background)
val widthAndHinge = maxWidth + adjustedHingeGap val widthAndHinge = maxWidth + adjustedHingeGap
val minRatio = min(maxHeight / height.toFloat(), maxWidth / width.toFloat())
if (imageBitmap.height != maxHeight && imageBitmap.width != maxWidth) { if (imageBitmap.height != maxHeight && imageBitmap.width != maxWidth) {
val minRatio = min(maxHeight / height.toFloat(), maxWidth / width.toFloat())
imageBitmap = imageBitmap.scale((width * minRatio).toInt(), (height * minRatio).toInt()) imageBitmap = imageBitmap.scale((width * minRatio).toInt(), (height * minRatio).toInt())
} }
height = imageBitmap.height height = imageBitmap.height
@ -456,8 +456,9 @@ object ImageUtil {
canvas.drawBitmap(imageBitmap, imageBitmap.rect, upperPart, null) canvas.drawBitmap(imageBitmap, imageBitmap.rect, upperPart, null)
progressCallback?.invoke(98) progressCallback?.invoke(98)
if (imageBitmap2.height != maxHeight && imageBitmap2.width != maxWidth) { if (imageBitmap2.height != maxHeight && imageBitmap2.width != maxWidth) {
val minRatio = min(maxHeight / height2.toFloat(), maxWidth / width2.toFloat())
imageBitmap2 = imageBitmap2 =
imageBitmap2.scale((width * minRatio).toInt(), (height * minRatio).toInt()) imageBitmap2.scale((width2 * minRatio).toInt(), (height2 * minRatio).toInt())
} }
height2 = imageBitmap2.height height2 = imageBitmap2.height
width2 = imageBitmap2.width width2 = imageBitmap2.width