From 76496daa754d88bc2733d171b8e5e5227e2939bc Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sun, 8 Dec 2024 15:18:51 -0500 Subject: [PATCH] Minor cleanup (cherry picked from commit 1b3d76398baa785196817faf3f99355b0e0ca854) --- .../eu/kanade/presentation/library/components/LibraryTabs.kt | 2 -- .../eu/kanade/tachiyomi/data/coil/TachiyomiImageDecoder.kt | 5 ++++- app/src/main/java/exh/eh/MemAutoFlushingLookupTable.kt | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryTabs.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryTabs.kt index e2b3d4a37..a3d48d404 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryTabs.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryTabs.kt @@ -21,9 +21,7 @@ internal fun LibraryTabs( getNumberOfMangaForCategory: (Category) -> Int?, onTabItemClick: (Int) -> Unit, ) { - // SY --> val currentPageIndex = pagerState.currentPage.coerceAtMost(categories.lastIndex) - // SY <-- Column( modifier = Modifier.zIndex(1f), ) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/coil/TachiyomiImageDecoder.kt b/app/src/main/java/eu/kanade/tachiyomi/data/coil/TachiyomiImageDecoder.kt index 00a803e5f..50f11406f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/coil/TachiyomiImageDecoder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/coil/TachiyomiImageDecoder.kt @@ -66,7 +66,10 @@ class TachiyomiImageDecoder(private val resources: ImageSource, private val opti check(bitmap != null) { "Failed to decode image" } - if (options.bitmapConfig == Bitmap.Config.HARDWARE && ImageUtil.canUseHardwareBitmap(bitmap)) { + if ( + options.bitmapConfig == Bitmap.Config.HARDWARE && + ImageUtil.canUseHardwareBitmap(bitmap) + ) { val hwBitmap = bitmap.copy(Bitmap.Config.HARDWARE, false) if (hwBitmap != null) { bitmap.recycle() diff --git a/app/src/main/java/exh/eh/MemAutoFlushingLookupTable.kt b/app/src/main/java/exh/eh/MemAutoFlushingLookupTable.kt index 89f709e11..886231b36 100644 --- a/app/src/main/java/exh/eh/MemAutoFlushingLookupTable.kt +++ b/app/src/main/java/exh/eh/MemAutoFlushingLookupTable.kt @@ -92,7 +92,7 @@ class MemAutoFlushingLookupTable( val size = bb.getInt(4) val strBArr = ByteArray(size) if (!input.requireBytes(strBArr, size)) break - table.put(k, serializer.read(strBArr.toString(Charsets.UTF_8))) + table.put(k, serializer.read(strBArr.decodeToString())) } } } catch (e: FileNotFoundException) { @@ -131,7 +131,7 @@ class MemAutoFlushingLookupTable( try { val out = fos.sink().buffer() table.forEach { key, value -> - val v = serializer.write(value).toByteArray(Charsets.UTF_8) + val v = serializer.write(value).encodeToByteArray() bb.putInt(0, key) bb.putInt(4, v.size) out.write(bb.array())