diff --git a/app/src/main/java/dev/achmad/ledgerr/ui/screens/expenses/ExpenseListScreen.kt b/app/src/main/java/dev/achmad/ledgerr/ui/screens/expenses/ExpenseListScreen.kt index 341ee1a..6824b1c 100644 --- a/app/src/main/java/dev/achmad/ledgerr/ui/screens/expenses/ExpenseListScreen.kt +++ b/app/src/main/java/dev/achmad/ledgerr/ui/screens/expenses/ExpenseListScreen.kt @@ -270,29 +270,28 @@ private fun ExpensesTabContent( return } - LazyColumn( - contentPadding = contentPadding, - ) { - item { - SingleSelectFilterChipGroup( - options = DateRangeFilter.entries.map { it to stringResource(it.labelRes()) }, - selectedOption = dateRangeFilter to stringResource(dateRangeFilter.labelRes()), - onSelectionChanged = { (filter, _) -> screenModel.setDateRangeFilter(filter) }, - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 16.dp, vertical = 4.dp), - ) - } - item { - HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp)) - } - items(items = expenses, key = { it.expense.id }) { item -> - ExpenseRow( - item = item, - onClick = { onExpenseClick(item.expense.id) }, - onLongClick = { onExpenseLongClick(item.expense.id) }, - ) - HorizontalDivider() + Column(modifier = Modifier.fillMaxSize()) { + SingleSelectFilterChipGroup( + options = DateRangeFilter.entries.map { it to stringResource(it.labelRes()) }, + selectedOption = dateRangeFilter to stringResource(dateRangeFilter.labelRes()), + onSelectionChanged = { (filter, _) -> screenModel.setDateRangeFilter(filter) }, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp, vertical = 4.dp), + ) + HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp)) + LazyColumn( + modifier = Modifier.fillMaxSize(), + contentPadding = contentPadding, + ) { + items(items = expenses, key = { it.expense.id }) { item -> + ExpenseRow( + item = item, + onClick = { onExpenseClick(item.expense.id) }, + onLongClick = { onExpenseLongClick(item.expense.id) }, + ) + HorizontalDivider() + } } } } @@ -318,6 +317,7 @@ private fun RecurringTabContent( } LazyColumn( + modifier = Modifier.fillMaxSize(), contentPadding = contentPadding, ) { items(items = recurring, key = { it.recurring.id }) { item ->