Make ecosystem places searchable

app/src/main/java/com/cornellappdev/transit/models/Route.kt

@@ -1,6 +1,6 @@
 package com.cornellappdev.transit.models
 
-import com.cornellappdev.transit.util.StringUtils.fromMetersToMiles
+import com.cornellappdev.transit.util.StringUtils.fromMetersToFeet
 import com.google.android.gms.maps.model.LatLng
 import com.squareup.moshi.Json
 
@@ -40,7 +40,7 @@ data class Direction(
     val type
         get() = if (directionType == "walk") DirectionType.WALK else DirectionType.DEPART
     val distance: String
-        get() = distanceMeters.fromMetersToMiles()
+        get() = distanceMeters.fromMetersToFeet()
 }
 
 

app/src/main/java/com/cornellappdev/transit/models/RouteRepository.kt

@@ -7,14 +7,20 @@ import com.cornellappdev.transit.networking.EcosystemNetworkApi
 import com.cornellappdev.transit.networking.RoutesNetworkApi
 import com.cornellappdev.transit.util.ECOSYSTEM_FLAG
 import com.google.android.gms.maps.model.LatLng
-import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
+import java.util.concurrent.atomic.AtomicLong
 import javax.inject.Inject
 import javax.inject.Singleton
+import kotlin.coroutines.cancellation.CancellationException
+
+data class PlaceSearchState(
+    val query: String,
+    val response: ApiResponse<List<Place>>,
+)
 
 /**
  * Repository for data related to routes
@@ -52,6 +58,9 @@ class RouteRepository @Inject constructor(
     private val _placeFlow: MutableStateFlow<ApiResponse<List<Place>>> =
         MutableStateFlow(ApiResponse.Pending)
 
+    private val _placeSearchStateFlow: MutableStateFlow<PlaceSearchState> =
+        MutableStateFlow(PlaceSearchState(query = "", response = ApiResponse.Success(emptyList())))
+
     private val _lastRouteFlow: MutableStateFlow<ApiResponse<RouteOptions>> =
         MutableStateFlow(ApiResponse.Pending)
 
@@ -61,6 +70,9 @@ class RouteRepository @Inject constructor(
     private val _libraryFlow: MutableStateFlow<ApiResponse<List<Library>>> =
         MutableStateFlow(ApiResponse.Pending)
 
+    // Monotonic token used to ensure only the latest search request updates placeFlow.
+    private val latestSearchToken = AtomicLong(0L)
+
     init {
         fetchAllStops()
         if (ECOSYSTEM_FLAG) {
@@ -84,6 +96,11 @@ class RouteRepository @Inject constructor(
      */
     val placeFlow = _placeFlow.asStateFlow()
 
+    /**
+     * A StateFlow holding the last queried location tagged by query.
+     */
+    val placeSearchStateFlow = _placeSearchStateFlow.asStateFlow()
+
     /**
      * A StateFlow holding the list of all printers
      */
@@ -143,15 +160,47 @@ class RouteRepository @Inject constructor(
      * Makes a new call to places related to a query string.
      */
     fun makeSearch(query: String) {
-        _placeFlow.value = ApiResponse.Pending
+        val normalizedQuery = query.trim()
+        val token = latestSearchToken.incrementAndGet()
+
+        if (normalizedQuery.isBlank()) {
+            if (token == latestSearchToken.get()) {
+                _placeFlow.value = ApiResponse.Success(emptyList())
+                _placeSearchStateFlow.value =
+                    PlaceSearchState(query = "", response = ApiResponse.Success(emptyList()))
+            }
+            return
+        }
+
+        _placeSearchStateFlow.value = PlaceSearchState(
+            query = normalizedQuery,
+            response = ApiResponse.Pending
+        )
         CoroutineScope(Dispatchers.IO).launch {
             try {
-                val placeResponse = appleSearch(SearchQuery(query))
+                if(token == latestSearchToken.get()){
+                    _placeFlow.value = ApiResponse.Pending
+                }
+                val placeResponse = appleSearch(SearchQuery(normalizedQuery))
                 val res = placeResponse.unwrap()
                 val totalLocations = (res.places ?: emptyList()) + (res.stops ?: (emptyList()))
-                _placeFlow.value = ApiResponse.Success(totalLocations)
+                if (token == latestSearchToken.get()) {
+                    _placeFlow.value = ApiResponse.Success(totalLocations)
+                    _placeSearchStateFlow.value = PlaceSearchState(
+                        query = normalizedQuery,
+                        response = ApiResponse.Success(totalLocations)
+                    )
+                }
+            } catch (_: CancellationException) {
+                // Ignore cancellation; latest query owns the flow update.
             } catch (e: Exception) {
-                _placeFlow.value = ApiResponse.Error
+                if (token == latestSearchToken.get()) {
+                    _placeFlow.value = ApiResponse.Error
+                    _placeSearchStateFlow.value = PlaceSearchState(
+                        query = normalizedQuery,
+                        response = ApiResponse.Error
+                    )
+                }
             }
         }
     }
@@ -194,5 +243,4 @@ class RouteRepository @Inject constructor(
             _lastRouteFlow.value = ApiResponse.Error
         }
     }
-
 }

app/src/main/java/com/cornellappdev/transit/models/search/UnifiedSearchRepository.kt

@@ -0,0 +1,76 @@
+package com.cornellappdev.transit.models.search
+
+import com.cornellappdev.transit.models.Place
+import com.cornellappdev.transit.models.RouteRepository
+import com.cornellappdev.transit.models.ecosystem.EateryRepository
+import com.cornellappdev.transit.models.ecosystem.GymRepository
+import com.cornellappdev.transit.networking.ApiResponse
+import com.cornellappdev.transit.util.ecosystem.buildEcosystemSearchPlaces
+import com.cornellappdev.transit.util.ecosystem.mergeAndRankSearchResults
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Centralized search data source that merges route search results with ecosystem places.
+ *
+ * UI and ViewModels can share this data pipeline to keep search behavior consistent.
+ */
+@Singleton
+class UnifiedSearchRepository @Inject constructor(
+    private val routeRepository: RouteRepository,
+    eateryRepository: EateryRepository,
+    gymRepository: GymRepository,
+    coroutineScope: CoroutineScope,
+) {
+
+    val ecosystemSearchPlacesFlow: StateFlow<List<Place>> =
+        combine(
+            routeRepository.printerFlow,
+            routeRepository.libraryFlow,
+            eateryRepository.eateryFlow,
+            gymRepository.gymFlow
+        ) { printers, libraries, eateries, gyms ->
+            buildEcosystemSearchPlaces(
+                printers = printers,
+                libraries = libraries,
+                eateries = eateries,
+                gyms = gyms
+            )
+        }.stateIn(
+            scope = coroutineScope,
+            started = SharingStarted.Eagerly,
+            initialValue = emptyList()
+        )
+
+    fun mergedSearchResults(queryFlow: Flow<String>): Flow<ApiResponse<List<Place>>> =
+        combine(
+            queryFlow
+                .map { it.trim() }
+                .distinctUntilChanged(),
+            routeRepository.placeSearchStateFlow,
+            ecosystemSearchPlacesFlow
+        ) { query, routeSearchState, ecosystemPlaces ->
+            val routeSearchResults = when {
+                query.isBlank() -> ApiResponse.Success(emptyList())
+                routeSearchState.query.equals(query, ignoreCase = true) -> routeSearchState.response
+                else -> ApiResponse.Pending
+            }
+
+            mergeAndRankSearchResults(
+                query = query,
+                routeSearchResults = routeSearchResults,
+                ecosystemPlaces = ecosystemPlaces
+            )
+        }
+}
+
+
+

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

@@ -2,7 +2,11 @@ package com.cornellappdev.transit.ui.components
 
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
 import com.cornellappdev.transit.models.Place
 import com.cornellappdev.transit.networking.ApiResponse
 
@@ -25,15 +29,18 @@ fun LoadingLocationItems(searchResult: ApiResponse<List<Place>>, onClick: (Place
             if (searchResult.data.isEmpty()) {
                 LocationNotFound()
             } else {
-                LazyColumn {
+                LazyColumn(
+                    contentPadding = PaddingValues(horizontal = 16.dp, vertical = 6.dp),
+                    verticalArrangement = Arrangement.spacedBy(12.dp)
+                ) {
                     items(
                         searchResult.data
                     ) {
                         MenuItem(
                             type = it.type,
                             label = it.name,
                             sublabel = it.subLabel,
-                            onClick = { onClick(it) }
+                            onClick = { onClick(it) },
                         )
                     }
                 }

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

@@ -6,7 +6,7 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -15,6 +15,10 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.annotation.DrawableRes
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.width
 import com.cornellappdev.transit.R
 import com.cornellappdev.transit.models.PlaceType
 import com.cornellappdev.transit.ui.theme.PrimaryText
@@ -23,33 +27,34 @@ import com.cornellappdev.transit.ui.theme.Style
 
 /**
  * Card for each entry in the search bar
- * @param icon The icon for the item
+ * @param type The place type used to resolve icon
  * @param label The label for the item
  * @param sublabel The sublabel for the item
  */
 @Composable
-fun MenuItem(type: PlaceType, label: String, sublabel: String, onClick: () -> Unit) {
+fun MenuItem(
+    type: PlaceType,
+    label: String,
+    sublabel: String,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val displayedSublabel = ecosystemSublabelFor(type) ?: sublabel
+
     Row(
-        Modifier
+        modifier
             .fillMaxWidth()
-            .padding(horizontal = 16.dp, vertical = 6.dp)
+            .defaultMinSize(minHeight = 36.dp)
             .clickable(onClick = onClick),
         verticalAlignment = Alignment.CenterVertically
     ) {
-        //TODO: Add icons for each ecosystem type
-        if (type == PlaceType.APPLE_PLACE) {
-            Image(
-                painterResource(R.drawable.location_pin_gray),
-                contentDescription = "Place",
-                modifier = Modifier.padding(end = 20.dp),
-            )
-        } else {
-            Image(
-                painterResource(R.drawable.bus_stop_pin),
-                contentDescription = "Stop",
-                modifier = Modifier.padding(end = 20.dp),
-            )
-        }
+        Image(
+            painterResource(iconForPlaceType(type)),
+            contentDescription = null,
+            modifier = Modifier
+                .size(24.dp),
+        )
+        Spacer(modifier = Modifier.width(12.dp))
         Column() {
             Text(
                 text = label,
@@ -59,7 +64,7 @@ fun MenuItem(type: PlaceType, label: String, sublabel: String, onClick: () -> Un
                 style = Style.heading3
             )
             Text(
-                text = sublabel,
+                text = displayedSublabel,
                 color = SecondaryText,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis,
@@ -69,6 +74,27 @@ fun MenuItem(type: PlaceType, label: String, sublabel: String, onClick: () -> Un
     }
 }
 
+private fun ecosystemSublabelFor(type: PlaceType): String? = when (type) {
+    PlaceType.EATERY -> "Eatery"
+    PlaceType.LIBRARY -> "Library"
+    PlaceType.PRINTER -> "Printer"
+    PlaceType.GYM -> "Gym"
+    else -> null
+}
+
+private val searchIconByPlaceType = mapOf(
+    PlaceType.BUS_STOP to R.drawable.bus_stop_pin,
+    PlaceType.APPLE_PLACE to R.drawable.location_pin_gray,
+    PlaceType.EATERY to R.drawable.eatery_icon,
+    PlaceType.LIBRARY to R.drawable.library_icon,
+    PlaceType.GYM to R.drawable.gym_icon,
+    PlaceType.PRINTER to R.drawable.printer_icon
+)
+
+@DrawableRes
+private fun iconForPlaceType(type: PlaceType): Int {
+    return searchIconByPlaceType[type] ?: R.drawable.location_pin_gray
+}
 
 @Preview(showBackground = true)
 @Composable
@@ -80,4 +106,28 @@ private fun PreviewMenuItemBusStop() {
 @Composable
 private fun PreviewMenuItemApplePlace() {
     MenuItem(PlaceType.APPLE_PLACE, "Apple Place", "Ithaca, NY", {})
-}
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun PreviewMenuItemEatery() {
+    MenuItem(PlaceType.EATERY, "Eatery", "Ithaca, NY", {})
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun PreviewMenuItemGym() {
+    MenuItem(PlaceType.GYM, "Gym", "Ithaca, NY", {})
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun PreviewMenuItemLibrary() {
+    MenuItem(PlaceType.LIBRARY, "Library", "Ithaca, NY", {})
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun PreviewMenuItemPrinter() {
+    MenuItem(PlaceType.PRINTER, "Printer", "Ithaca, NY", {})
+}