Use nested scroll modifier

TeamNewPipe · Aug 10, 2024 · d10c473 · d10c473
1 parent 639451c
commit d10c473
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -291,9 +291,9 @@ dependencies {
     implementation 'androidx.compose.material3.adaptive:adaptive:1.0.0-beta04'
     implementation 'androidx.activity:activity-compose'
     implementation 'androidx.compose.ui:ui-tooling-preview'
-    implementation 'androidx.compose.ui:ui-text:1.7.0-beta06' // Needed for parsing HTML to AnnotatedString
+    implementation 'androidx.compose.ui:ui-text:1.7.0-beta07' // Needed for parsing HTML to AnnotatedString
     implementation 'androidx.lifecycle:lifecycle-viewmodel-compose'
-    implementation 'androidx.paging:paging-compose:3.3.1'
+    implementation 'androidx.paging:paging-compose:3.3.2'
     implementation 'com.github.nanihadesuka:LazyColumnScrollbar:2.2.0'
 
     // Coroutines interop

diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/items/ItemList.kt b/app/src/main/java/org/schabi/newpipe/ui/components/items/ItemList.kt
@@ -9,7 +9,10 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.rememberNestedScrollInteropConnection
 import androidx.compose.ui.res.stringResource
 import androidx.fragment.app.FragmentActivity
 import androidx.preference.PreferenceManager
@@ -62,21 +65,20 @@ fun ItemList(
     }
 
     val showProgress = DependentPreferenceHelper.getPositionsInListsEnabled(context)
+    val nestedScrollModifier = Modifier.nestedScroll(rememberNestedScrollInteropConnection())
 
     if (mode == ItemViewMode.GRID) {
         // TODO: Implement grid layout using LazyVerticalGrid and LazyVerticalGridScrollbar.
     } else {
-        // Card or list views
-        val listState = rememberLazyListState()
+        val state = rememberLazyListState()
 
-        LazyColumnScrollbar(state = listState) {
-            LazyColumn(state = listState) {
+        LazyColumnScrollbar(state = state) {
+            LazyColumn(modifier = nestedScrollModifier, state = state) {
                 listHeader()
 
                 items(items.size) {
                     val item = items[it]
 
-                    // TODO: Implement card layouts.
                     if (item is StreamInfoItem) {
                         val isSelected = selectedStream == item
                         StreamListItem(