Merge pull request 'fix(#44): pin expense filter chips directly under tabs' (#48) from fix/44-expenses-screen-empty-gap-tabs-chips into main
Reviewed-on: #48
This commit was merged in pull request #48.
This commit is contained in:
@@ -270,10 +270,7 @@ private fun ExpensesTabContent(
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
LazyColumn(
|
Column(modifier = Modifier.fillMaxSize()) {
|
||||||
contentPadding = contentPadding,
|
|
||||||
) {
|
|
||||||
item {
|
|
||||||
SingleSelectFilterChipGroup(
|
SingleSelectFilterChipGroup(
|
||||||
options = DateRangeFilter.entries.map { it to stringResource(it.labelRes()) },
|
options = DateRangeFilter.entries.map { it to stringResource(it.labelRes()) },
|
||||||
selectedOption = dateRangeFilter to stringResource(dateRangeFilter.labelRes()),
|
selectedOption = dateRangeFilter to stringResource(dateRangeFilter.labelRes()),
|
||||||
@@ -282,10 +279,11 @@ private fun ExpensesTabContent(
|
|||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.padding(horizontal = 16.dp, vertical = 4.dp),
|
.padding(horizontal = 16.dp, vertical = 4.dp),
|
||||||
)
|
)
|
||||||
}
|
|
||||||
item {
|
|
||||||
HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
|
HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
|
||||||
}
|
LazyColumn(
|
||||||
|
modifier = Modifier.fillMaxSize(),
|
||||||
|
contentPadding = contentPadding,
|
||||||
|
) {
|
||||||
items(items = expenses, key = { it.expense.id }) { item ->
|
items(items = expenses, key = { it.expense.id }) { item ->
|
||||||
ExpenseRow(
|
ExpenseRow(
|
||||||
item = item,
|
item = item,
|
||||||
@@ -295,6 +293,7 @@ private fun ExpensesTabContent(
|
|||||||
HorizontalDivider()
|
HorizontalDivider()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
@@ -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 ->
|
||||||
|
|||||||
Reference in New Issue
Block a user