From 71bf560836f3736837ca2724d6b40a5fb0f9c5b3 Mon Sep 17 00:00:00 2001
From: Christophe Henry <contact@c-henry.fr>
Date: Thu, 17 Apr 2025 14:07:38 +0200
Subject: [PATCH] Fix feeds at the bottom of the drawer unclickable on long
 lists

---
 .../app/timelime/drawer/TimelineDrawer.kt     | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/readrops/app/timelime/drawer/TimelineDrawer.kt b/app/src/main/java/com/readrops/app/timelime/drawer/TimelineDrawer.kt
index 41cb1374..d996f872 100644
--- a/app/src/main/java/com/readrops/app/timelime/drawer/TimelineDrawer.kt
+++ b/app/src/main/java/com/readrops/app/timelime/drawer/TimelineDrawer.kt
@@ -82,22 +82,27 @@ fun TimelineDrawerContent(
 ) {
     val scrollState = rememberScrollState()
 
-    ModalDrawerSheet(
-        modifier = Modifier
-            .fillMaxHeight()
-            .verticalScroll(scrollState)
-    ) {
-        Spacer(modifier = Modifier.size(MaterialTheme.spacing.drawerSpacing))
+    ModalDrawerSheet {
+        /*
+         * DO NOT REMOVE THIS LAYER!
+         * ModalDrawerSheet seems to have a problem with Modifier.verticalScroll
+         * causing some items at the bottom to be unclickable with long item lists.
+         */
+        Column(
+            modifier = Modifier
+                .fillMaxHeight()
+                .verticalScroll(scrollState)
+        ){
+            Spacer(modifier = Modifier.size(MaterialTheme.spacing.drawerSpacing))
 
-        DrawerDefaultItems(
-            selectedItem = state.filters.mainFilter,
-            unreadNewItemsCount = state.unreadNewItemsCount,
-            onClick = { onClickDefaultItem(it) }
-        )
+            DrawerDefaultItems(
+                selectedItem = state.filters.mainFilter,
+                unreadNewItemsCount = state.unreadNewItemsCount,
+                onClick = { onClickDefaultItem(it) }
+            )
 
-        DrawerDivider()
+            DrawerDivider()
 
-        Column {
             for (folderEntry in state.foldersAndFeeds) {
                 val folder = folderEntry.key
 
@@ -153,6 +158,8 @@ fun TimelineDrawerContent(
                     }
                 }
             }
+
+            Spacer(modifier = Modifier.size(MaterialTheme.spacing.drawerSpacing))
         }
     }
 }