Merge branch 'fix/unitsList'

This commit is contained in:
Sad Ellie 2022-05-11 23:20:40 +03:00
commit 0f92d24732

View File

@ -43,19 +43,19 @@ fun UnitsList(
if (groupedUnits.isEmpty()) { if (groupedUnits.isEmpty()) {
item { SearchPlaceholder() } item { SearchPlaceholder() }
} else { } else {
groupedUnits.forEach { (groupOfMeasurements, listOfMeasurements) -> groupedUnits.forEach { (unitGroup, listOfUnits) ->
stickyHeader { stickyHeader {
Text( Text(
modifier = Modifier modifier = Modifier
.background(MaterialTheme.colorScheme.background) .background(MaterialTheme.colorScheme.background)
.fillMaxWidth() .fillMaxWidth()
.padding(vertical = 12.dp, horizontal = 8.dp), .padding(vertical = 12.dp, horizontal = 8.dp),
text = stringResource(id = groupOfMeasurements.res), text = stringResource(id = unitGroup.res),
style = MaterialTheme.typography.titleMedium, style = MaterialTheme.typography.titleMedium,
color = MaterialTheme.colorScheme.primary color = MaterialTheme.colorScheme.primary
) )
} }
items(listOfMeasurements) { unit -> items(items = listOfUnits, key = { it.unitId }) { unit ->
UnitListItem( UnitListItem(
modifier = Modifier, modifier = Modifier,
changeAction = changeAction, changeAction = changeAction,