solution

android · Oct 23, 2022 · 90ce589 · 90ce589
1 parent b4444a0
commit 90ce589
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/app/src/main/java/com/google/ads22/speedchallenge/ui/location/LocationScreen.kt b/app/src/main/java/com/google/ads22/speedchallenge/ui/location/LocationScreen.kt
@@ -112,7 +112,7 @@ fun LocationScreenForecast(
     onLocationChange: (String) -> Unit,
     modifier: Modifier = Modifier
 ) {
-    val expandedDays = remember { mutableStateMapOf<String, Int>() }
+    val expandedDays = rememberSaveable(saver = indexSaver) { mutableStateMapOf<String, Int>() }
     LocationScreenForecast(
         forecast = locationForecast,
         onLocationChange = onLocationChange,
@@ -154,11 +154,13 @@ fun LocationScreenForecast(
                 contentDescription = label
             }) {
             val index = 0
-            WeekForecastRow(
-                forecast.forecastWeek[index],
-                expanded = index == expandedDayIndex,
-                onClick = { onExpandedChanged(if (expandedDayIndex == index) -1 else index) }
-            )
+            forecast.forecastWeek.forEachIndexed { index, forecastDay ->
+                WeekForecastRow(
+                    forecast.forecastWeek[index],
+                    expanded = index == expandedDayIndex,
+                    onClick = { onExpandedChanged(if (expandedDayIndex == index) -1 else index) }
+                )
+            }
         }
     }
 }
@@ -175,19 +177,19 @@ fun TopAppBar(
         title = {
             Row(verticalAlignment = Alignment.CenterVertically) {
                 IconButton(
-                    onClick = { onLocationChange("Mountain View") }
+                    onClick = { onLocationChange("Sunnyvale") }
                 ) {
                     Icon(
                         Icons.Default.KeyboardArrowLeft,
                         stringResource(R.string.prev_location)
                     )
                 }
                 Text(
-                    "//TODO",
+                    locationName,
                     modifier = Modifier.padding(horizontal = 32.dp)
                 )
                 IconButton(
-                    onClick = { onLocationChange("Sunnyvale") }
+                    onClick = { onLocationChange("Mountain View") }
                 ) {
                     Icon(
                         Icons.Default.KeyboardArrowRight,

diff --git a/app/src/main/java/com/google/ads22/speedchallenge/ui/location/LocationViewModel.kt b/app/src/main/java/com/google/ads22/speedchallenge/ui/location/LocationViewModel.kt
@@ -45,6 +45,7 @@ class LocationViewModel @Inject constructor(
     val uiState = locationId.flatMapLatest { location ->
         forecastRepository.getForecast(location)
             .map<Forecast, LocationUiState> { Success(it) }
+            .catch { emit(Error(it)) }
     }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), Loading)
 
     fun changeLocation(id: String) {