From 04db46fe75c2406fe9750e97da65774a6b268f27 Mon Sep 17 00:00:00 2001 From: "Tran M. Cuong" Date: Tue, 6 Aug 2024 21:38:56 +0700 Subject: [PATCH] fix: drawScrollbar crash on list with 0 item but only sticky header (#1083) --- .../main/java/tachiyomi/presentation/core/util/Scrollbar.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/util/Scrollbar.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/util/Scrollbar.kt index e0cd0a3e0..40bcb70b0 100644 --- a/presentation-core/src/main/java/tachiyomi/presentation/core/util/Scrollbar.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/util/Scrollbar.kt @@ -119,15 +119,15 @@ private fun Modifier.drawScrollbar( 0f } else { items - .fastFirstOrNull { (it.key as? String)?.startsWith(STICKY_HEADER_KEY_PREFIX)?.not() ?: true }!! - .run { + .fastFirstOrNull { (it.key as? String)?.startsWith(STICKY_HEADER_KEY_PREFIX)?.not() ?: true } + ?.run { val startPadding = if (reverseDirection) { layoutInfo.afterContentPadding } else { layoutInfo.beforeContentPadding } startPadding + ((estimatedItemSize * index - offset) / totalSize * viewportSize) - } + } ?: 0f } val drawScrollbar = onDrawScrollbar( orientation, reverseDirection, atEnd, showScrollbar,