Implement Filtering UI

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

@@ -1,6 +1,7 @@
 package com.cornellappdev.transit.ui.components.home
 
 import android.R.attr.text
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -35,7 +36,7 @@ fun AddFavoritesButton(
         ),
         modifier = modifier
             .fillMaxWidth()
-            .height(40.dp)
+            .height(40.dp),
     ) {
 
         Icon(

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

@@ -1,5 +1,6 @@
 package com.cornellappdev.transit.ui.components.home
 
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
@@ -12,8 +13,12 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.AnnotatedString
@@ -22,13 +27,15 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.cornellappdev.transit.R
 import com.cornellappdev.transit.models.Place
 import com.cornellappdev.transit.models.ecosystem.DayOperatingHours
 import com.cornellappdev.transit.models.ecosystem.DetailedEcosystemPlace
 import com.cornellappdev.transit.models.ecosystem.Eatery
 import com.cornellappdev.transit.models.ecosystem.StaticPlaces
 import com.cornellappdev.transit.networking.ApiResponse
+import com.cornellappdev.transit.ui.theme.FavoritesDividerGray
 import com.cornellappdev.transit.ui.theme.robotoFamily
 import com.cornellappdev.transit.ui.viewmodels.FilterState
 import com.cornellappdev.transit.ui.viewmodels.HomeViewModel
@@ -43,6 +50,7 @@ import com.cornellappdev.transit.util.ecosystem.toPlace
  * @param staticPlaces Collection of all places to populate filters with
  * @param navigateToPlace Function called to navigate to route options
  */
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun EcosystemBottomSheetContent(
     filters: List<FilterState>,
@@ -54,7 +62,10 @@ fun EcosystemBottomSheetContent(
     navigateToPlace: (Place) -> Unit,
     onDetailsClick: (DetailedEcosystemPlace) -> Unit,
     onFavoriteStarClick: (Place) -> Unit,
+    showFilterSheet: Boolean,
+    onFilterSheetShow: () -> Unit,
     onAddFavoritesClick: () -> Unit,
+    homeViewModel: HomeViewModel = hiltViewModel(),
 ) {
     Column(modifier = modifier) {
         Row(
@@ -76,7 +87,7 @@ fun EcosystemBottomSheetContent(
             )
         }
 
-        LazyRow {
+        LazyRow(modifier = Modifier.padding(bottom = 12.dp)) {
             items(filters) {
                 BottomSheetFilterItem(
                     imageResId = it.iconId,
@@ -95,9 +106,35 @@ fun EcosystemBottomSheetContent(
             navigateToPlace = navigateToPlace,
             onDetailsClick = onDetailsClick,
             onFavoriteStarClick = onFavoriteStarClick,
+            onFilterButtonClick = onFilterSheetShow,
             onAddFavoritesClick = onAddFavoritesClick
         )
     }
+
+    val selectedFilters by homeViewModel.selectedFavoritesFilters.collectAsStateWithLifecycle()
+
+    if (showFilterSheet) {
+        ModalBottomSheet(
+            onDismissRequest = {
+                homeViewModel.cancelFavoritesFilters()
+            },
+            dragHandle = null
+        ) {
+            FavoritesFilterBottomSheet(
+                onCancelClicked = {
+                    homeViewModel.cancelFavoritesFilters()
+                },
+                onApplyClicked = {
+                    homeViewModel.applyFavoritesFilters()
+                },
+                filters = homeViewModel.favoritesFilterList,
+                selectedFilters = selectedFilters,
+                onFilterToggle = { filter ->
+                    homeViewModel.toggleFavoritesFilter(filter)
+                }
+            )
+        }
+    }
 }
 
 @Composable
@@ -109,43 +146,74 @@ private fun BottomSheetFilteredContent(
     navigateToPlace: (Place) -> Unit,
     onDetailsClick: (DetailedEcosystemPlace) -> Unit,
     onFavoriteStarClick: (Place) -> Unit,
-    onAddFavoritesClick: () -> Unit
+    onAddFavoritesClick: () -> Unit,
+    onFilterButtonClick: () -> Unit
 ) {
-    LazyColumn(
-        contentPadding = PaddingValues(start = 24.dp, end = 24.dp, top = 20.dp, bottom = 90.dp),
-        modifier = Modifier.fillMaxSize()
-    ) {
-        when (currentFilter) {
-            FilterState.FAVORITES -> {
-                favoriteList(favorites, navigateToPlace, onAddFavoritesClick)
+    val appliedFilters by homeViewModel.appliedFavoritesFilters.collectAsStateWithLifecycle()
+    Column {
+        if (currentFilter == FilterState.FAVORITES) {
+            Column(modifier = Modifier.padding(horizontal = 12.dp)) {
+                HorizontalDivider(
+                    modifier = Modifier.padding(vertical = 8.dp),
+                    color = FavoritesDividerGray
+                )
+                FilterRow(
+                    selectedFilters = appliedFilters,
+                    onFilterClick = onFilterButtonClick,
+                    onRemoveFilter = { filter -> homeViewModel.removeAppliedFilter(filter) }
+                )
+                if (appliedFilters.isNotEmpty()) {
+                    Spacer(modifier = Modifier.height(8.dp))
+                }
             }
+        }
+        val isFilterBarHidden = currentFilter == FilterState.FAVORITES && appliedFilters.isEmpty()
+        LazyColumn(
+            contentPadding = PaddingValues(
+                start = 12.dp,
+                end = 12.dp,
+                top = if (isFilterBarHidden) 0.dp else 8.dp,
+                bottom = 120.dp // Makes bottom content visible with padding at the end
+            ),
+            modifier = Modifier.fillMaxSize(),
+            verticalArrangement = Arrangement.spacedBy(20.dp)
+        ) {
+            when (currentFilter) {
+                FilterState.FAVORITES -> {
+                    favoriteList(
+                        favorites,
+                        navigateToPlace,
+                        onAddFavoritesClick
+                    )
+                }
 
-            FilterState.PRINTERS -> {
-                printerList(staticPlaces, navigateToPlace)
-            }
+                FilterState.PRINTERS -> {
+                    printerList(staticPlaces, navigateToPlace)
+                }
 
-            FilterState.GYMS -> {
-                gymList(staticPlaces, navigateToPlace)
-            }
+                FilterState.GYMS -> {
+                    gymList(staticPlaces, navigateToPlace)
+                }
 
-            FilterState.EATERIES -> {
-                eateryList(
-                    eateriesApiResponse = staticPlaces.eateries,
-                    onDetailsClick = onDetailsClick,
-                    favorites = favorites,
-                    onFavoriteStarClick = onFavoriteStarClick,
-                    operatingHoursToString = homeViewModel::isOpenAnnotatedStringFromOperatingHours
-                )
-            }
+                FilterState.EATERIES -> {
+                    eateryList(
+                        eateriesApiResponse = staticPlaces.eateries,
+                        onDetailsClick = onDetailsClick,
+                        favorites = favorites,
+                        onFavoriteStarClick = onFavoriteStarClick,
+                        operatingHoursToString = homeViewModel::isOpenAnnotatedStringFromOperatingHours
+                    )
+                }
 
-            FilterState.LIBRARIES -> {
-                libraryList(
-                    staticPlaces,
-                    navigateToPlace,
-                    onDetailsClick,
-                    favorites,
-                    onFavoriteStarClick,
-                )
+                FilterState.LIBRARIES -> {
+                    libraryList(
+                        staticPlaces,
+                        navigateToPlace,
+                        onDetailsClick,
+                        favorites,
+                        onFavoriteStarClick,
+                    )
+                }
             }
         }
     }
@@ -160,8 +228,8 @@ private fun LazyListScope.favoriteList(
     onAddFavoritesClick: () -> Unit
 ) {
     item {
+        Spacer(modifier = Modifier.height(8.dp))
         AddFavoritesButton(onAddFavoritesClick = onAddFavoritesClick)
-        Spacer(Modifier.height(20.dp))
     }
     items(favorites.toList()) {
         BottomSheetLocationCard(
@@ -170,7 +238,6 @@ private fun LazyListScope.favoriteList(
         ) {
             //TODO: Eatery
         }
-        Spacer(Modifier.height(10.dp))
     }
 }
 
@@ -196,7 +263,6 @@ private fun LazyListScope.gymList(
                 ) {
                     //TODO: Eatery
                 }
-                Spacer(Modifier.height(10.dp))
             }
 
         }
@@ -271,7 +337,6 @@ private fun LazyListScope.eateryList(
                 ) {
                     onDetailsClick(it)
                 }
-                Spacer(Modifier.height(10.dp))
             }
         }
     }
@@ -307,7 +372,6 @@ private fun LazyListScope.libraryList(
                 ) {
                     navigateToDetails(it)
                 }
-                Spacer(Modifier.height(10.dp))
             }
         }
     }
@@ -337,6 +401,8 @@ private fun PreviewEcosystemBottomSheet() {
         navigateToPlace = {},
         onDetailsClick = {},
         onFavoriteStarClick = {},
-        onAddFavoritesClick = {}
+        onAddFavoritesClick = {},
+        showFilterSheet = true,
+        onFilterSheetShow = {}
     )
 }