Clean up the no GPS location found code

cristan · Nov 3, 2024 · 83e595b · 83e595b
1 parent 24dc4d8
commit 83e595b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/app/src/main/java/nl/ovfietsbeschikbaarheid/ui/screen/HomeScreen.kt b/app/src/main/java/nl/ovfietsbeschikbaarheid/ui/screen/HomeScreen.kt
@@ -129,9 +129,9 @@ private fun HomeView(
                         )
                     }
 
-                    is HomeContent.GpsError -> {
+                    is HomeContent.NoGpsLocation -> {
                         Text(
-                            text = screen.message,
+                            text = stringResource(R.string.home_no_gps_location),
                             modifier = Modifier.padding(horizontal = 16.dp)
                         )
                     }
@@ -463,8 +463,8 @@ fun LoadingGpsPreview() {
 
 @Preview
 @Composable
-fun GpsErrorPreview() {
-    TestHomeView("", HomeContent.GpsError("Geen locatie gevonden"))
+fun NoGpsLocationPreview() {
+    TestHomeView("", HomeContent.NoGpsLocation)
 }
 
 @Preview

diff --git a/app/src/main/java/nl/ovfietsbeschikbaarheid/viewmodel/HomeViewModel.kt b/app/src/main/java/nl/ovfietsbeschikbaarheid/viewmodel/HomeViewModel.kt
@@ -50,7 +50,7 @@ class HomeViewModel(
                 loadLocation()
             }
 
-            currentlyShown is HomeContent.GpsError -> {
+            currentlyShown is HomeContent.NoGpsLocation -> {
                 // Let's try again
                 loadLocation()
             }
@@ -184,7 +184,7 @@ class HomeViewModel(
 
             val coordinates = locationLoader.loadCurrentCoordinates()
             if (coordinates == null) {
-                _content.value = HomeContent.GpsError("Geen locatie gevonden")
+                _content.value = HomeContent.NoGpsLocation
             } else {
                 val locationsWithDistance =
                     LocationsMapper.withDistance(overviewRepository.getAllLocations(), coordinates)
@@ -210,7 +210,7 @@ sealed class HomeContent {
 
     data object GpsTurnedOff : HomeContent()
 
-    data class GpsError(val message: String) : HomeContent()
+    data object NoGpsLocation: HomeContent()
 
     data class GpsContent(
         val locations: List<LocationOverviewWithDistanceModel>,

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -39,6 +39,7 @@
 
     <string name="home_no_search_results_for">Geen zoekresultaten voor \"%1$s\"</string>
     <string name="home_search_results_for">In de buurt van \"%1$s\"</string>
+    <string name="home_no_gps_location">Geen locatie gevonden</string>
 
     <string name="details_amount_available">OV-fietsen beschikbaar</string>
     <string name="details_capacity">Max aantal: %1$d</string>