fix rebase

mbta · Dec 16, 2024 · 6620c12 · 6620c12
1 parent 73b8877
commit 6620c12
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 1 deletion.
diff --git a/...src/androidTest/java/com/mbta/tid/mbta_app/android/nearbyTransit/NearbyTransitPageTest.kt b/...src/androidTest/java/com/mbta/tid/mbta_app/android/nearbyTransit/NearbyTransitPageTest.kt
@@ -42,9 +42,11 @@ import com.mbta.tid.mbta_app.repositories.IPinnedRoutesRepository
 import com.mbta.tid.mbta_app.repositories.IPredictionsRepository
 import com.mbta.tid.mbta_app.repositories.IRailRouteShapeRepository
 import com.mbta.tid.mbta_app.repositories.ISchedulesRepository
+import com.mbta.tid.mbta_app.repositories.ISearchResultRepository
 import com.mbta.tid.mbta_app.repositories.IVehiclesRepository
 import com.mbta.tid.mbta_app.repositories.MockRailRouteShapeRepository
 import com.mbta.tid.mbta_app.repositories.MockScheduleRepository
+import com.mbta.tid.mbta_app.repositories.MockSearchResultRepository
 import com.mbta.tid.mbta_app.repositories.MockVehiclesRepository
 import com.mbta.tid.mbta_app.usecases.TogglePinnedRouteUsecase
 import io.github.dellisd.spatialk.geojson.Position
@@ -244,6 +246,7 @@ class NearbyTransitPageTest : KoinTest {
                 single<IRailRouteShapeRepository> { MockRailRouteShapeRepository() }
                 single<TogglePinnedRouteUsecase> { TogglePinnedRouteUsecase(get()) }
                 single<IVehiclesRepository> { MockVehiclesRepository() }
+                single<ISearchResultRepository> { MockSearchResultRepository() }
             }
         )
     }

diff --git a/androidApp/src/main/java/com/mbta/tid/mbta_app/android/pages/NearbyTransitPage.kt b/androidApp/src/main/java/com/mbta/tid/mbta_app/android/pages/NearbyTransitPage.kt
@@ -15,6 +15,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -26,6 +27,7 @@ import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
@@ -37,6 +39,8 @@ import com.mbta.tid.mbta_app.android.component.DragHandle
 import com.mbta.tid.mbta_app.android.location.LocationDataManager
 import com.mbta.tid.mbta_app.android.location.ViewportProvider
 import com.mbta.tid.mbta_app.android.map.HomeMapView
+import com.mbta.tid.mbta_app.android.map.IMapViewModel
+import com.mbta.tid.mbta_app.android.map.MapViewModel
 import com.mbta.tid.mbta_app.android.nearbyTransit.NearbyTransitView
 import com.mbta.tid.mbta_app.android.search.SearchBarOverlay
 import com.mbta.tid.mbta_app.android.util.toPosition
@@ -77,7 +81,8 @@ fun NearbyTransitPage(
     showNavBar: () -> Unit,
     hideNavBar: () -> Unit,
     vehiclesRepository: IVehiclesRepository = koinInject(),
-    bottomBar: @Composable () -> Unit
+    bottomBar: @Composable () -> Unit,
+    mapViewModel: IMapViewModel = viewModel(factory = MapViewModel.Factory())
 ) {
     val navController = rememberNavController()
     val currentNavEntry: NavBackStackEntry? by
@@ -117,6 +122,11 @@ fun NearbyTransitPage(
         }
         vehiclesRepository.disconnect()
     }
+
+    LaunchedEffect(mapViewModel.lastMapboxErrorTimestamp.collectAsState(initial = null).value) {
+        mapViewModel.loadConfig()
+    }
+
     SearchBarOverlay(onStopNavigation = ::handleStopNavigation, currentNavEntry = currentNavEntry) {
         Scaffold(bottomBar = bottomBar) { outerSheetPadding ->
             BottomSheetScaffold(

diff --git a/androidApp/src/main/res/values-b+es/strings_ios_converted.xml b/androidApp/src/main/res/values-b+es/strings_ios_converted.xml
@@ -43,6 +43,7 @@
     <string name="resources_link_mticket">Boletos de tren de cercanías y ferri</string>
     <string name="resources_link_mticket_note">mTicket App</string>
     <string name="resources_link_trip_planner">Planificador de viaje</string>
+    <string name="search_by_stop">Buscar por parada</string>
     <string name="service_ended">Servicio finalizado</string>
     <string name="setting_toggle_hide_maps">Ocultar Mapas</string>
     <string name="settings_link">Configuración</string>

diff --git a/androidApp/src/main/res/values-b+ht/strings_ios_converted.xml b/androidApp/src/main/res/values-b+ht/strings_ios_converted.xml
@@ -43,6 +43,7 @@
     <string name="resources_link_mticket">Tikè Tren Vil la ak Bato</string>
     <string name="resources_link_mticket_note">Aplikasyon mTicket</string>
     <string name="resources_link_trip_planner">Zouti pou planifye vwayaj</string>
+    <string name="search_by_stop">Chèche pa kanpe</string>
     <string name="service_ended">Sèvis ki fini</string>
     <string name="setting_toggle_hide_maps">Kache Kat yo</string>
     <string name="settings_link">Paramèt</string>

diff --git a/androidApp/src/main/res/values-b+pt+BR/strings_ios_converted.xml b/androidApp/src/main/res/values-b+pt+BR/strings_ios_converted.xml
@@ -43,6 +43,7 @@
     <string name="resources_link_mticket">Bilhetes de transporte diário por trem e balsa</string>
     <string name="resources_link_mticket_note">Aplicativo mTicket</string>
     <string name="resources_link_trip_planner">Planejador de trajetos</string>
+    <string name="search_by_stop">Pesquisar por parada</string>
     <string name="service_ended">Serviço encerrado</string>
     <string name="setting_toggle_hide_maps">Ocultar mapas</string>
     <string name="settings_link">Configurações</string>

diff --git a/androidApp/src/main/res/values-b+vi/strings_ios_converted.xml b/androidApp/src/main/res/values-b+vi/strings_ios_converted.xml
@@ -43,6 +43,7 @@
     <string name="resources_link_mticket">Vé phà vé đường sắt ngoại ô (Commuter Rail)</string>
     <string name="resources_link_mticket_note">Ứng dụng mTicket</string>
     <string name="resources_link_trip_planner">Lập kế hoạch chuyến đi</string>
+    <string name="search_by_stop">Tìm kiếm theo điểm dừng</string>
     <string name="service_ended">Dịch vụ đã kết thúc</string>
     <string name="setting_toggle_hide_maps">Ẩn bản đồ</string>
     <string name="settings_link">Cài đặt</string>

diff --git a/androidApp/src/main/res/values-b+zh+Hans+CN/strings_ios_converted.xml b/androidApp/src/main/res/values-b+zh+Hans+CN/strings_ios_converted.xml
@@ -43,6 +43,7 @@
     <string name="resources_link_mticket">通勤列车和轮渡票</string>
     <string name="resources_link_mticket_note">mTicket应用程序</string>
     <string name="resources_link_trip_planner">Trip Planner</string>
+    <string name="search_by_stop">按站点搜索</string>
     <string name="service_ended">服务已结束</string>
     <string name="setting_toggle_hide_maps">隐藏地图</string>
     <string name="settings_link">设置</string>

diff --git a/androidApp/src/main/res/values-b+zh+Hant+TW/strings_ios_converted.xml b/androidApp/src/main/res/values-b+zh+Hant+TW/strings_ios_converted.xml
@@ -43,6 +43,7 @@
     <string name="resources_link_mticket">通勤列車和輪渡票</string>
     <string name="resources_link_mticket_note">mTicket應用程式</string>
     <string name="resources_link_trip_planner">Trip Planner</string>
+    <string name="search_by_stop">按站點搜尋</string>
     <string name="service_ended">服務已結束</string>
     <string name="setting_toggle_hide_maps">隱藏地圖</string>
     <string name="settings_link">設定</string>