admin/ledgerr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix(#44): pin expense filter chips directly under tabs' (#48) from fix/44-expenses-screen-empty-gap-tabs-chips into main

Browse Source 
Reviewed-on: #48
This commit was merged in pull request #48.
This commit is contained in:
admin
2026-06-28 14:58:58 +00:00
parent 7dc95a8191 0977e34a2d
commit f6ac2aace1
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/dev/achmad/ledgerr/ui/screens/expenses/ExpenseListScreen.kt
+23 -23
View File
@@ -270,29 +270,28 @@ private fun ExpensesTabContent(
return return
} }
LazyColumn( Column(modifier = Modifier.fillMaxSize()) {
contentPadding = contentPadding, SingleSelectFilterChipGroup(
) { options = DateRangeFilter.entries.map { it to stringResource(it.labelRes()) },
item { selectedOption = dateRangeFilter to stringResource(dateRangeFilter.labelRes()),
SingleSelectFilterChipGroup( onSelectionChanged = { (filter, _) -> screenModel.setDateRangeFilter(filter) },
options = DateRangeFilter.entries.map { it to stringResource(it.labelRes()) }, modifier = Modifier
selectedOption = dateRangeFilter to stringResource(dateRangeFilter.labelRes()), .fillMaxWidth()
onSelectionChanged = { (filter, _) -> screenModel.setDateRangeFilter(filter) }, .padding(horizontal = 16.dp, vertical = 4.dp),
modifier = Modifier )
.fillMaxWidth() HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
.padding(horizontal = 16.dp, vertical = 4.dp), LazyColumn(
) modifier = Modifier.fillMaxSize(),
} contentPadding = contentPadding,
item { ) {
HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp)) items(items = expenses, key = { it.expense.id }) { item ->
} ExpenseRow(
items(items = expenses, key = { it.expense.id }) { item -> item = item,
ExpenseRow( onClick = { onExpenseClick(item.expense.id) },
item = item, onLongClick = { onExpenseLongClick(item.expense.id) },
onClick = { onExpenseClick(item.expense.id) }, )
onLongClick = { onExpenseLongClick(item.expense.id) }, HorizontalDivider()
) }
HorizontalDivider()
} }
} }
} }
@@ -318,6 +317,7 @@ private fun RecurringTabContent(
} }
LazyColumn( LazyColumn(
modifier = Modifier.fillMaxSize(),
contentPadding = contentPadding, contentPadding = contentPadding,
) { ) {
items(items = recurring, key = { it.recurring.id }) { item -> items(items = recurring, key = { it.recurring.id }) { item ->