Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/src/main/java/dev/scuttle/inventory/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@ private fun InventoryNavHost(
closeDrawer()
navController.navigate(Routes.HOUSEHOLDS) { launchSingleTop = true }
},
onNavigateMissingItems = {
closeDrawer()
navController.navigate(Routes.DASHBOARD) { launchSingleTop = true }
},
onNavigateLocation = { householdId, locationId ->
closeDrawer()
navController.navigate(Routes.location(householdId, locationId)) {
Expand Down
24 changes: 24 additions & 0 deletions app/src/main/java/dev/scuttle/inventory/ui/app/AppDrawer.kt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ 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.material.icons.filled.Warning
import androidx.compose.material3.DrawerDefaults
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
Expand All @@ -38,6 +39,7 @@ fun AppDrawer(
onNavigateDashboard: () -> Unit,
onNavigateSearch: (householdId: Long) -> Unit,
onNavigateHouseholds: () -> Unit,
onNavigateMissingItems: () -> Unit,
onNavigateLocation: (householdId: Long, locationId: Long) -> Unit,
onNavigateSettings: () -> Unit,
) {
Expand Down Expand Up @@ -93,6 +95,28 @@ fun AppDrawer(
modifier = Modifier.padding(horizontal = 12.dp),
)

val missingCount = state.missingItemCount
NavigationDrawerItem(
icon = {
Icon(
Icons.Default.Warning,
contentDescription = null,
tint = if (missingCount > 0) MaterialTheme.colorScheme.error
else MaterialTheme.colorScheme.onSurfaceVariant,
)
},
label = {
Text(
text = if (missingCount > 0) "Missing items · $missingCount" else "Missing items",
color = if (missingCount > 0) MaterialTheme.colorScheme.error
else MaterialTheme.colorScheme.onSurfaceVariant,
)
},
selected = false,
onClick = onNavigateMissingItems,
modifier = Modifier.padding(horizontal = 12.dp),
)

HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp, horizontal = 12.dp))

// Scrollable middle section — takes all remaining space
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ data class HouseholdWithLocations(
data class DrawerUiState(
val entries: List<HouseholdWithLocations> = emptyList(),
val locationWarnings: Map<Long, Boolean> = emptyMap(),
val missingItemCount: Int = 0,
val loading: Boolean = false,
)

Expand All @@ -43,11 +44,19 @@ class DrawerViewModel @Inject constructor(
_state.update { it.copy(loading = true) }
runCatching {
val households = householdRepository.list()
var missingItemCount = 0
val entries = households.map { hh ->
val locations = runCatching { locationRepository.list(hh.id) }.getOrDefault(emptyList())
for (location in locations) {
val shelves = runCatching { shelfRepository.list(hh.id, location.id) }.getOrDefault(emptyList())
for (shelf in shelves) {
val products = runCatching { productRepository.list(hh.id, shelf.id) }.getOrDefault(emptyList())
missingItemCount += products.count { it.is_mandatory && it.quantity == 0 }
}
}
HouseholdWithLocations(hh.id, hh.name, locations)
}
_state.update { it.copy(entries = entries, loading = false) }
_state.update { it.copy(entries = entries, missingItemCount = missingItemCount, loading = false) }
}.onFailure {
_state.update { it.copy(loading = false) }
}
Expand Down
Loading