Skip to content

Commit b182f14

Browse files
committed
fix: make formatting closer to design
1 parent 7d807bb commit b182f14

2 files changed

Lines changed: 28 additions & 16 deletions

File tree

app/src/main/java/com/cornellappdev/transit/ui/components/home/EcosystemBottomSheetContent.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import androidx.compose.foundation.lazy.items
1616
import androidx.compose.material3.ExperimentalMaterial3Api
1717
import androidx.compose.material3.HorizontalDivider
1818
import androidx.compose.material3.ModalBottomSheet
19+
import androidx.compose.material3.OutlinedTextFieldDefaults.contentPadding
1920
import androidx.compose.material3.Text
2021
import androidx.compose.runtime.Composable
2122
import androidx.compose.runtime.getValue
@@ -148,19 +149,21 @@ private fun BottomSheetFilteredContent(
148149
onAddFavoritesClick: () -> Unit,
149150
onFilterButtonClick: () -> Unit
150151
) {
152+
val appliedFilters by homeViewModel.appliedFavoritesFilters.collectAsStateWithLifecycle()
151153
Column() {
152154
if (currentFilter == FilterState.FAVORITES) {
153155
Column(modifier = Modifier.padding(horizontal = 12.dp)) {
154156
HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
155157
FilterRow(
156-
selectedFilters = homeViewModel.appliedFavoritesFilters.collectAsStateWithLifecycle().value,
158+
selectedFilters = appliedFilters,
157159
onFilterClick = onFilterButtonClick,
158160
onRemoveFilter = { filter -> homeViewModel.removeAppliedFilter(filter) }
159161
)
160162
}
161163
}
164+
val showLessPadding = currentFilter == FilterState.FAVORITES && appliedFilters.isEmpty()
162165
LazyColumn(
163-
contentPadding = PaddingValues(start = 12.dp, end = 12.dp, top = if (currentFilter == FilterState.FAVORITES) 0.dp else 8.dp, bottom = 90.dp),
166+
contentPadding = PaddingValues(start = 12.dp, end = 12.dp, top = if (showLessPadding) 0.dp else 8.dp, bottom = 90.dp),
164167
modifier = Modifier.fillMaxSize(),
165168
verticalArrangement = Arrangement.spacedBy(20.dp)
166169
) {

app/src/main/java/com/cornellappdev/transit/ui/components/home/FilterRow.kt

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,23 +43,20 @@ fun FilterRow(
4343
onRemoveFilter: (FavoritesFilterSheetState) -> Unit,
4444
modifier: Modifier = Modifier
4545
) {
46-
Row(modifier = modifier) {
47-
FilterButton(onFilterClick = onFilterClick)
46+
FlowRow(modifier = modifier,
47+
horizontalArrangement = Arrangement.spacedBy(8.dp),
48+
verticalArrangement = Arrangement.spacedBy(8.dp),
49+
) {
50+
FilterButton(onFilterClick = onFilterClick, modifier = Modifier.align(Alignment.CenterVertically))
4851

4952
// Selected filter labels
5053
if (selectedFilters.isNotEmpty()) {
51-
Spacer(modifier = Modifier.width(8.dp))
52-
FlowRow(
53-
modifier = Modifier.fillMaxWidth(),
54-
horizontalArrangement = Arrangement.spacedBy(8.dp),
55-
verticalArrangement = Arrangement.spacedBy(8.dp)
56-
) {
57-
selectedFilters.forEach { filter ->
58-
FilterLabel(
59-
text = filter.label,
60-
onRemove = { onRemoveFilter(filter) }
61-
)
62-
}
54+
selectedFilters.forEach { filter ->
55+
FilterLabel(
56+
text = filter.label,
57+
onRemove = { onRemoveFilter(filter) },
58+
modifier = Modifier.align(Alignment.CenterVertically)
59+
)
6360
}
6461
}
6562
}
@@ -104,6 +101,18 @@ private fun FilterLabel(
104101
}
105102
}
106103

104+
@Preview
105+
@Composable
106+
private fun FilterRowPreview() {
107+
FilterRow(
108+
selectedFilters = setOf(FavoritesFilterSheetState.EATERIES),
109+
onFilterClick = {},
110+
onRemoveFilter = {}
111+
)
112+
113+
114+
}
115+
107116
@Preview
108117
@Composable
109118
private fun FilterLabelPreview(){

0 commit comments

Comments
 (0)