Skip to content

Commit 2259ebd

Browse files
RyanCheung555RyanCheung555
committed
chore: fix formatting and naming, as well as remove unused imports
1 parent b182f14 commit 2259ebd

4 files changed

Lines changed: 36 additions & 30 deletions

File tree

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ fun EcosystemBottomSheetContent(
113113

114114
val selectedFilters by homeViewModel.selectedFavoritesFilters.collectAsStateWithLifecycle()
115115

116-
if(showFilterSheet) {
116+
if (showFilterSheet) {
117117
ModalBottomSheet(
118118
onDismissRequest = {
119119
homeViewModel.cancelFavoritesFilters()
@@ -161,9 +161,14 @@ private fun BottomSheetFilteredContent(
161161
)
162162
}
163163
}
164-
val showLessPadding = currentFilter == FilterState.FAVORITES && appliedFilters.isEmpty()
164+
val isFilterBarHidden = currentFilter == FilterState.FAVORITES && appliedFilters.isEmpty()
165165
LazyColumn(
166-
contentPadding = PaddingValues(start = 12.dp, end = 12.dp, top = if (showLessPadding) 0.dp else 8.dp, bottom = 90.dp),
166+
contentPadding = PaddingValues(
167+
start = 12.dp,
168+
end = 12.dp,
169+
top = if (isFilterBarHidden) 0.dp else 8.dp,
170+
bottom = 90.dp
171+
),
167172
modifier = Modifier.fillMaxSize(),
168173
verticalArrangement = Arrangement.spacedBy(20.dp)
169174
) {
@@ -216,7 +221,7 @@ private fun LazyListScope.favoriteList(
216221
navigateToPlace: (Place) -> Unit,
217222
onAddFavoritesClick: () -> Unit
218223
) {
219-
item{
224+
item {
220225
Spacer(modifier = Modifier.height(8.dp))
221226
AddFavoritesButton(onAddFavoritesClick = onAddFavoritesClick)
222227
}
@@ -252,7 +257,6 @@ private fun LazyListScope.gymList(
252257
) {
253258
//TODO: Eatery
254259
}
255-
Spacer(Modifier.height(10.dp))
256260
}
257261

258262
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ import com.cornellappdev.transit.ui.theme.robotoFamily
2323

2424
@Composable
2525
fun FilterButton(
26-
onFilterClick : () -> Unit,
27-
modifier : Modifier = Modifier,
26+
onFilterClick: () -> Unit,
27+
modifier: Modifier = Modifier,
2828

29-
){
29+
) {
3030
Button(
3131
onClick = onFilterClick,
3232
colors = ButtonDefaults.buttonColors(
3333
containerColor = Color.Transparent,
3434
contentColor = SecondaryText
3535
),
3636
contentPadding = PaddingValues(horizontal = 8.dp, vertical = 0.dp)
37-
){
37+
) {
3838
Icon(
3939
painter = painterResource(R.drawable.filter_icon),
4040
contentDescription = "Filter Icon",
@@ -55,6 +55,6 @@ fun FilterButton(
5555

5656
@Preview(showBackground = true)
5757
@Composable
58-
private fun FilterButtonPreview(){
58+
private fun FilterButtonPreview() {
5959
FilterButton(onFilterClick = {})
6060
}

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

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,30 @@
11
package com.cornellappdev.transit.ui.components.home
22

3-
import android.R.attr.contentDescription
43
import androidx.compose.foundation.BorderStroke
5-
import androidx.compose.foundation.clickable
64
import androidx.compose.foundation.layout.Arrangement
7-
import androidx.compose.foundation.layout.Column
85
import androidx.compose.foundation.layout.ExperimentalLayoutApi
96
import androidx.compose.foundation.layout.FlowRow
107
import androidx.compose.foundation.layout.Row
11-
import androidx.compose.foundation.layout.Spacer
12-
import androidx.compose.foundation.layout.fillMaxWidth
13-
import androidx.compose.foundation.layout.height
148
import androidx.compose.foundation.layout.padding
159
import androidx.compose.foundation.layout.size
16-
import androidx.compose.foundation.layout.width
1710
import androidx.compose.foundation.shape.RoundedCornerShape
1811
import androidx.compose.material.icons.Icons
1912
import androidx.compose.material.icons.filled.Close
2013
import androidx.compose.material3.Icon
2114
import androidx.compose.material3.IconButton
22-
import androidx.compose.material3.MaterialTheme
2315
import androidx.compose.material3.Surface
2416
import androidx.compose.material3.Text
2517
import androidx.compose.runtime.Composable
2618
import androidx.compose.ui.Alignment
2719
import androidx.compose.ui.Modifier
28-
import androidx.compose.ui.res.painterResource
20+
import androidx.compose.ui.graphics.Color
2921
import androidx.compose.ui.text.font.FontWeight
3022
import androidx.compose.ui.tooling.preview.Preview
3123
import androidx.compose.ui.unit.dp
3224
import androidx.compose.ui.unit.sp
3325
import com.cornellappdev.transit.ui.theme.TransitBlue
3426
import com.cornellappdev.transit.ui.theme.robotoFamily
3527
import com.cornellappdev.transit.ui.viewmodels.FavoritesFilterSheetState
36-
import com.google.common.math.LinearTransformation.horizontal
3728

3829
@OptIn(ExperimentalLayoutApi::class)
3930
@Composable
@@ -43,11 +34,15 @@ fun FilterRow(
4334
onRemoveFilter: (FavoritesFilterSheetState) -> Unit,
4435
modifier: Modifier = Modifier
4536
) {
46-
FlowRow(modifier = modifier,
37+
FlowRow(
38+
modifier = modifier,
4739
horizontalArrangement = Arrangement.spacedBy(8.dp),
4840
verticalArrangement = Arrangement.spacedBy(8.dp),
4941
) {
50-
FilterButton(onFilterClick = onFilterClick, modifier = Modifier.align(Alignment.CenterVertically))
42+
FilterButton(
43+
onFilterClick = onFilterClick,
44+
modifier = Modifier.align(Alignment.CenterVertically)
45+
)
5146

5247
// Selected filter labels
5348
if (selectedFilters.isNotEmpty()) {
@@ -71,7 +66,8 @@ private fun FilterLabel(
7166
Surface(
7267
modifier = modifier,
7368
shape = RoundedCornerShape(40.dp),
74-
border = BorderStroke(1.dp, TransitBlue)
69+
border = BorderStroke(1.dp, TransitBlue),
70+
color = Color.Transparent
7571
) {
7672
Row(
7773
modifier = modifier.padding(start = 14.dp, top = 10.dp, bottom = 10.dp, end = 8.dp),
@@ -101,7 +97,7 @@ private fun FilterLabel(
10197
}
10298
}
10399

104-
@Preview
100+
@Preview(showBackground = true)
105101
@Composable
106102
private fun FilterRowPreview() {
107103
FilterRow(
@@ -113,8 +109,8 @@ private fun FilterRowPreview() {
113109

114110
}
115111

116-
@Preview
112+
@Preview(showBackground = true)
117113
@Composable
118-
private fun FilterLabelPreview(){
114+
private fun FilterLabelPreview() {
119115
FilterLabel("Eateries", {})
120116
}

‎app/src/main/java/com/cornellappdev/transit/ui/viewmodels/HomeViewModel.kt‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ class HomeViewModel @Inject constructor(
127127
fun toggleAddFavoritesSheet(show: Boolean) {
128128
_showAddFavoritesSheet.value = show
129129
}
130+
130131
val favoritesFilterList = listOf(
131132
FavoritesFilterSheetState.GYMS,
132133
FavoritesFilterSheetState.EATERIES,
@@ -135,11 +136,15 @@ class HomeViewModel @Inject constructor(
135136
FavoritesFilterSheetState.OTHER
136137
)
137138

138-
private val _selectedFavoritesFilters = MutableStateFlow<Set<FavoritesFilterSheetState>>(emptySet())
139-
val selectedFavoritesFilters: StateFlow<Set<FavoritesFilterSheetState>> = _selectedFavoritesFilters.asStateFlow()
139+
private val _selectedFavoritesFilters =
140+
MutableStateFlow<Set<FavoritesFilterSheetState>>(emptySet())
141+
val selectedFavoritesFilters: StateFlow<Set<FavoritesFilterSheetState>> =
142+
_selectedFavoritesFilters.asStateFlow()
140143

141-
private val _appliedFavoritesFilters = MutableStateFlow<Set<FavoritesFilterSheetState>>(emptySet())
142-
val appliedFavoritesFilters: StateFlow<Set<FavoritesFilterSheetState>> = _appliedFavoritesFilters.asStateFlow()
144+
private val _appliedFavoritesFilters =
145+
MutableStateFlow<Set<FavoritesFilterSheetState>>(emptySet())
146+
val appliedFavoritesFilters: StateFlow<Set<FavoritesFilterSheetState>> =
147+
_appliedFavoritesFilters.asStateFlow()
143148

144149
fun toggleFavoritesFilter(filter: FavoritesFilterSheetState) {
145150
_selectedFavoritesFilters.value = if (filter in _selectedFavoritesFilters.value) {
@@ -148,6 +153,7 @@ class HomeViewModel @Inject constructor(
148153
_selectedFavoritesFilters.value + filter
149154
}
150155
}
156+
151157
fun applyFavoritesFilters() {
152158
// Save the current selection as applied filters
153159
_appliedFavoritesFilters.value = _selectedFavoritesFilters.value

0 commit comments

Comments
 (0)