From 0fe6fe6a334beae16c9ae1e4fa360840a90308af Mon Sep 17 00:00:00 2001
From: Thomas Andres Gomez <andres.gomez.thomas@gmail.com>
Date: Wed, 2 Aug 2023 09:06:12 +0200
Subject: [PATCH] Bump version to 0.2.2

---
 app/build.gradle.kts                                     | 2 +-
 .../ui/composable/remember/rememberLazyListOffset.kt     | 9 +++++++--
 .../ui/screens/quest/detail/QuestDetailScreen.kt         | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e2a183a..dd104a6 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -27,7 +27,7 @@ android {
         minSdk = 26
         targetSdk = 33
         versionCode = gitBuildNumber
-        versionName = "0.2.1"
+        versionName = "0.2.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/composable/remember/rememberLazyListOffset.kt b/app/src/main/java/com/pixelized/rplexicon/ui/composable/remember/rememberLazyListOffset.kt
index ed92fc3..fe3b8db 100644
--- a/app/src/main/java/com/pixelized/rplexicon/ui/composable/remember/rememberLazyListOffset.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/composable/remember/rememberLazyListOffset.kt
@@ -1,5 +1,6 @@
 package com.pixelized.rplexicon.ui.composable.remember
 
+import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.State
@@ -20,7 +21,9 @@ data class LazyListOffset(
 
 @Composable
 @Stable
-fun rememberLazyListOffset(): LazyListOffset {
+fun rememberLazyListOffset(
+    lazyListState: LazyListState,
+): LazyListOffset {
     val density = LocalDensity.current
 
     return remember {
@@ -30,7 +33,9 @@ fun rememberLazyListOffset(): LazyListOffset {
             offsetY = offsetY,
             connection = object : NestedScrollConnection {
                 override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
-                    offsetY.value -= with(density) { available.y.toDp() }
+                    if (lazyListState.canScrollForward || lazyListState.canScrollBackward) {
+                        offsetY.value -= with(density) { available.y.toDp() }
+                    }
                     return Offset.Zero
                 }
             },
diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/screens/quest/detail/QuestDetailScreen.kt b/app/src/main/java/com/pixelized/rplexicon/ui/screens/quest/detail/QuestDetailScreen.kt
index 4f57da7..704827d 100644
--- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/quest/detail/QuestDetailScreen.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/quest/detail/QuestDetailScreen.kt
@@ -179,7 +179,7 @@ private fun QuestDetailContent(
             )
         },
         content = { padding ->
-            val lazyListOffset = rememberLazyListOffset()
+            val lazyListOffset = rememberLazyListOffset(lazyListState = state)
             Surface(
                 modifier = Modifier
                     .padding(padding)