From 64e55be02ff74ed2422fbff370952366898212f8 Mon Sep 17 00:00:00 2001 From: tarsin Date: Mon, 1 May 2023 12:00:09 +0800 Subject: [PATCH] Remove offsetY field in GalleryPreview --- .../main/java/com/hippo/ehviewer/client/data/GalleryPreview.kt | 1 - .../com/hippo/ehviewer/client/parser/GalleryDetailParser.kt | 3 +-- app/src/main/java/com/hippo/ehviewer/ui/widget/EhAsyncThumb.kt | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/GalleryPreview.kt b/app/src/main/java/com/hippo/ehviewer/client/data/GalleryPreview.kt index 98383acfa..4416e985b 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/data/GalleryPreview.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/data/GalleryPreview.kt @@ -34,7 +34,6 @@ data class NormalGalleryPreview( override val imageKey: String, override val position: Int, val offsetX: Int, - val offsetY: Int, val clipWidth: Int, val clipHeight: Int, ) : GalleryPreview diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.kt index b478c9756..abcefd21a 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.kt @@ -495,11 +495,10 @@ object GalleryDetailParser { val position = it.groupValues[6].toInt() - 1 val imageKey = getPreviewThumbKey(it.groupValues[3].trim()) val xOffset = it.groupValues[4].toIntOrNull() ?: 0 - val yOffset = 0 val width = it.groupValues[1].toInt() val height = it.groupValues[2].toInt() val pageUrl = it.groupValues[5].trim() - NormalGalleryPreview(imageKey, position, xOffset, yOffset, width, height) to pageUrl + NormalGalleryPreview(imageKey, position, xOffset, width, height) to pageUrl }.run { first.toList() to second.toList() } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/widget/EhAsyncThumb.kt b/app/src/main/java/com/hippo/ehviewer/ui/widget/EhAsyncThumb.kt index d01f70081..6e9cc0344 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/widget/EhAsyncThumb.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/widget/EhAsyncThumb.kt @@ -64,7 +64,7 @@ fun EhAsyncPreview( it.copy( painter = BitmapPainter( (it.result.drawable as BitmapDrawable).bitmap.asImageBitmap(), - IntOffset(offsetX, offsetY), + IntOffset(offsetX, 0), IntSize(clipWidth - 1, clipHeight - 1), ), )