Bottom search bar on all Android levels

app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt

@@ -199,14 +199,8 @@ class MainActivity : AppCompatActivity() {
                             ) {
                                 val context = LocalContext.current
                                 val scope = rememberCoroutineScope()
-                                val bottomSearchBar = atLeastR()
                                 TaskListDrawer(
-                                    arrangement = when {
+                                    arrangement = if (state.menuQuery.isBlank()) Arrangement.Top else Arrangement.Bottom,
-                                        state.menuQuery.isBlank() -> Arrangement.Top
-                                        bottomSearchBar -> Arrangement.Bottom
-                                        else -> Arrangement.Top
-                                    },
-                                    bottomSearchBar = bottomSearchBar,
                                     filters = if (state.menuQuery.isNotEmpty()) state.searchItems else state.drawerItems,
                                     onClick = {
                                         when (it) {

kmp/src/androidMain/kotlin/org/tasks/previews/TaskListDrawerPreview.kt

@@ -28,7 +28,6 @@ fun MenuPreview() {
                     onQueryChange = {}
                 )
             },
-            bottomSearchBar = true,
             filters = persistentListOf(
                 DrawerItem.Filter(
                     title = "My Tasks",

kmp/src/commonMain/kotlin/org/tasks/compose/drawer/TaskListDrawer.kt

@@ -39,8 +39,6 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -75,7 +73,6 @@ private val SEARCH_BAR_BOTTOM_PADDING = androidx.compose.material3.OutlinedTextF
 @Composable
 fun TaskListDrawer(
     arrangement: Arrangement.Vertical,
-    bottomSearchBar: Boolean,
     filters: ImmutableList<DrawerItem>,
     onClick: (DrawerItem) -> Unit,
     onAddClick: (DrawerItem.Header) -> Unit,
@@ -83,52 +80,29 @@ fun TaskListDrawer(
     searchBar: @Composable RowScope.() -> Unit,
 ) {
     val bottomAppBarScrollBehavior = BottomAppBarDefaults.exitAlwaysScrollBehavior()
-    val topAppBarScrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior()
     Scaffold(
         modifier = Modifier
             .imePadding()
-            .nestedScroll(
+            .nestedScroll(bottomAppBarScrollBehavior.nestedScrollConnection),
-                if (bottomSearchBar)
-                    bottomAppBarScrollBehavior.nestedScrollConnection
-                else
-                    topAppBarScrollBehavior.nestedScrollConnection
-            ),
         bottomBar = {
-            if (bottomSearchBar) {
+            BottomAppBar(
-                BottomAppBar(
+                modifier = Modifier
-                    modifier = Modifier
+                    .layout { measurable, constraints ->
-                        .layout { measurable, constraints ->
+                        val placeable = measurable.measure(constraints)
-                            val placeable = measurable.measure(constraints)
+                        bottomAppBarScrollBehavior.state.heightOffsetLimit =
-                            bottomAppBarScrollBehavior.state.heightOffsetLimit =
+                            -placeable.height.toFloat()
-                                -placeable.height.toFloat()
+                        val height =
-                            val height =
+                            placeable.height + bottomAppBarScrollBehavior.state.heightOffset
-                                placeable.height + bottomAppBarScrollBehavior.state.heightOffset
+                        layout(placeable.width, height.roundToInt().coerceAtLeast(0)) {
-                            layout(placeable.width, height.roundToInt().coerceAtLeast(0)) {
+                            placeable.place(0, 0)
-                                placeable.place(0, 0)
-                            }
-                        },
-                    containerColor = MaterialTheme.colorScheme.surface,
-                    scrollBehavior = bottomAppBarScrollBehavior
-                ) {
-                    searchBar()
-                }
-            }
-        },
-        topBar = {
-            if (!bottomSearchBar) {
-                TopAppBar(
-                    colors = TopAppBarDefaults.topAppBarColors(
-                        containerColor = MaterialTheme.colorScheme.surface,
-                    ),
-                    scrollBehavior = topAppBarScrollBehavior,
-                    title = {
-                        Row {
-                            searchBar()
                         }
-                    }
+                    },
-                )
+                containerColor = MaterialTheme.colorScheme.surface,
+                scrollBehavior = bottomAppBarScrollBehavior
+            ) {
+                searchBar()
             }
-        }
+        },
     ) { contentPadding ->
         val keyboardOpen = rememberImeState().value
         LazyColumn(