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

for double page mode: smaller pages are now scaled up

Browse source
This commit is contained in:
Jays2Kings 2023-03-06 22:18:49 -05:00
parent 4ef3f2437b
commit 202151f0a4
1 changed files with 30 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,7 @@ import androidx.core.graphics.alpha
import androidx.core.graphics.blue import androidx.core.graphics.blue
import androidx.core.graphics.green import androidx.core.graphics.green
import androidx.core.graphics.red import androidx.core.graphics.red
import androidx.core.graphics.scale
import com.hippo.unifile.UniFile import com.hippo.unifile.UniFile
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import tachiyomi.decoder.Format import tachiyomi.decoder.Format
@ -415,18 +416,20 @@ object ImageUtil {
} }
fun mergeBitmaps( fun mergeBitmaps(
imageBitmap: Bitmap, iBitmap: Bitmap,
imageBitmap2: Bitmap, iBitmap2: Bitmap,
isLTR: Boolean, isLTR: Boolean,
@ColorInt background: Int = Color.WHITE, @ColorInt background: Int = Color.WHITE,
hingeGap: Int = 0, hingeGap: Int = 0,
context: Context? = null, context: Context? = null,
progressCallback: ((Int) -> Unit)? = null, progressCallback: ((Int) -> Unit)? = null,
): ByteArrayInputStream { ): ByteArrayInputStream {
val height = imageBitmap.height var imageBitmap = iBitmap
val width = imageBitmap.width var imageBitmap2 = iBitmap2
val height2 = imageBitmap2.height var height = imageBitmap.height
val width2 = imageBitmap2.width var width = imageBitmap.width
var height2 = imageBitmap2.height
var width2 = imageBitmap2.width
val maxHeight = max(height, height2) val maxHeight = max(height, height2)
val maxWidth = max(width, width2) val maxWidth = max(width, width2)
val adjustedHingeGap = context?.let { val adjustedHingeGap = context?.let {
@ -437,19 +440,32 @@ object ImageUtil {
val result = Bitmap.createBitmap((maxWidth * 2) + adjustedHingeGap, maxHeight, Bitmap.Config.ARGB_8888) val result = Bitmap.createBitmap((maxWidth * 2) + adjustedHingeGap, maxHeight, Bitmap.Config.ARGB_8888)
val canvas = Canvas(result) val canvas = Canvas(result)
canvas.drawColor(background) canvas.drawColor(background)
val widthAndHinge = maxWidth + adjustedHingeGap
val minRatio = min(maxHeight / height.toFloat(), maxWidth / width.toFloat())
if (imageBitmap.height != maxHeight && imageBitmap.width != maxWidth) {
imageBitmap = imageBitmap.scale((width * minRatio).toInt(), (height * minRatio).toInt())
}
height = imageBitmap.height
width = imageBitmap.width
val upperPart = Rect( val upperPart = Rect(
if (isLTR) max(maxWidth - imageBitmap.width, 0) else maxWidth + adjustedHingeGap, if (isLTR) max(maxWidth - width, 0) else widthAndHinge,
(maxHeight - imageBitmap.height) / 2, (maxHeight - height) / 2,
(if (isLTR) max(maxWidth - imageBitmap.width, 0) else maxWidth + adjustedHingeGap) + imageBitmap.width, (if (isLTR) max(maxWidth - width, 0) else widthAndHinge) + width,
imageBitmap.height + (maxHeight - imageBitmap.height) / 2, height + (maxHeight - height) / 2,
) )
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) {
imageBitmap2 =
imageBitmap2.scale((width * minRatio).toInt(), (height * minRatio).toInt())
}
height2 = imageBitmap2.height
width2 = imageBitmap2.width
val bottomPart = Rect( val bottomPart = Rect(
if (!isLTR) max(maxWidth - imageBitmap2.width, 0) else maxWidth + adjustedHingeGap, if (!isLTR) max(maxWidth - width2, 0) else widthAndHinge,
(maxHeight - imageBitmap2.height) / 2, (maxHeight - height2) / 2,
(if (!isLTR) max(maxWidth - imageBitmap2.width, 0) else maxWidth + adjustedHingeGap) + imageBitmap2.width, (if (!isLTR) max(maxWidth - width2, 0) else widthAndHinge) + width2,
imageBitmap2.height + (maxHeight - imageBitmap2.height) / 2, height2 + (maxHeight - height2) / 2,
) )
canvas.drawBitmap(imageBitmap2, imageBitmap2.rect, bottomPart, null) canvas.drawBitmap(imageBitmap2, imageBitmap2.rect, bottomPart, null)
progressCallback?.invoke(99) progressCallback?.invoke(99)