diff --git a/app/src/main/java/dev/scuttle/inventory/MainActivity.kt b/app/src/main/java/dev/scuttle/inventory/MainActivity.kt index d1ffe73..ccfeb41 100644 --- a/app/src/main/java/dev/scuttle/inventory/MainActivity.kt +++ b/app/src/main/java/dev/scuttle/inventory/MainActivity.kt @@ -128,6 +128,14 @@ private fun InventoryNavHost( closeDrawer() navController.navigate(Routes.DASHBOARD) { launchSingleTop = true } }, + onNavigateSearch = { householdId -> + closeDrawer() + navController.navigate(Routes.search(householdId)) { launchSingleTop = true } + }, + onNavigateHouseholds = { + closeDrawer() + navController.navigate(Routes.HOUSEHOLDS) { launchSingleTop = true } + }, onNavigateLocation = { householdId, locationId -> closeDrawer() navController.navigate(Routes.location(householdId, locationId)) { diff --git a/app/src/main/java/dev/scuttle/inventory/ui/app/AppDrawer.kt b/app/src/main/java/dev/scuttle/inventory/ui/app/AppDrawer.kt index cb1de88..a66201f 100644 --- a/app/src/main/java/dev/scuttle/inventory/ui/app/AppDrawer.kt +++ b/app/src/main/java/dev/scuttle/inventory/ui/app/AppDrawer.kt @@ -14,6 +14,8 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Home +import androidx.compose.material.icons.filled.People +import androidx.compose.material.icons.filled.Search import androidx.compose.material.icons.filled.Settings import androidx.compose.material.icons.filled.Star import androidx.compose.material3.DrawerDefaults @@ -34,6 +36,8 @@ fun AppDrawer( viewModel: DrawerViewModel, onNavigateHome: () -> Unit, onNavigateDashboard: () -> Unit, + onNavigateSearch: (householdId: Long) -> Unit, + onNavigateHouseholds: () -> Unit, onNavigateLocation: (householdId: Long, locationId: Long) -> Unit, onNavigateSettings: () -> Unit, ) { @@ -71,6 +75,24 @@ fun AppDrawer( modifier = Modifier.padding(horizontal = 12.dp), ) + val firstHouseholdId = state.entries.firstOrNull()?.id + NavigationDrawerItem( + icon = { Icon(Icons.Default.Search, contentDescription = null) }, + label = { Text("Search") }, + selected = false, + onClick = { firstHouseholdId?.let(onNavigateSearch) }, + enabled = firstHouseholdId != null, + modifier = Modifier.padding(horizontal = 12.dp), + ) + + NavigationDrawerItem( + icon = { Icon(Icons.Default.People, contentDescription = null) }, + label = { Text("Households") }, + selected = false, + onClick = onNavigateHouseholds, + modifier = Modifier.padding(horizontal = 12.dp), + ) + HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp, horizontal = 12.dp)) // Scrollable middle section — takes all remaining space