From c35f0b3694087122ff7d5262e56db63833469f77 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Fri, 17 May 2024 21:43:29 +0200 Subject: [PATCH] Undo location category spelling changes Close #798 --- .../ui/launcher/search/location/LocationItem.kt | 7 +++---- .../src/main/java/de/mm20/launcher2/search/Location.kt | 9 +++++---- core/i18n/src/main/res/values/strings.xml | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/location/LocationItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/location/LocationItem.kt index fac783eb..ce6aee71 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/location/LocationItem.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/location/LocationItem.kt @@ -18,7 +18,6 @@ import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable import androidx.compose.foundation.horizontalScroll -import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -40,7 +39,6 @@ import androidx.compose.material.icons.rounded.Star import androidx.compose.material.icons.rounded.StarOutline import androidx.compose.material.icons.rounded.Visibility import androidx.compose.material.icons.rounded.VisibilityOff -import androidx.compose.material.icons.rounded.WifiOff import androidx.compose.material3.AssistChip import androidx.compose.material3.AssistChipDefaults import androidx.compose.material3.Icon @@ -767,7 +765,7 @@ private val LocationCategory.labelRes LocationCategory.LIBRARY -> R.string.poi_category_library LocationCategory.COLLEGE -> R.string.poi_category_college LocationCategory.ICE_CREAM -> R.string.poi_category_ice_cream - LocationCategory.THEATER -> R.string.poi_category_theater + LocationCategory.THEATRE -> R.string.poi_category_theater LocationCategory.PUBLIC_BUILDING -> R.string.poi_category_public_building LocationCategory.CINEMA -> R.string.poi_category_cinema LocationCategory.NIGHTCLUB -> R.string.poi_category_nightclub @@ -805,6 +803,7 @@ private val LocationCategory.labelRes LocationCategory.FITNESS -> R.string.poi_category_fitness LocationCategory.TRAM_STOP -> R.string.poi_category_tram_stop LocationCategory.RAILWAY_STATION -> R.string.poi_category_railway_station + LocationCategory.RAILWAY_STOP -> R.string.poi_category_railway_stop LocationCategory.BUS_STATION -> R.string.poi_category_bus_station LocationCategory.ATM -> R.string.poi_category_atm LocationCategory.KIOSK -> R.string.poi_category_kiosk @@ -813,5 +812,5 @@ private val LocationCategory.labelRes LocationCategory.PARCEL_LOCKER -> R.string.poi_category_parcel_locker LocationCategory.CHEMIST -> R.string.poi_category_chemist LocationCategory.TRAVEL_AGENCY -> R.string.poi_category_travel_agency - LocationCategory.FITNESS_CENTER -> R.string.poi_category_fitness_center + LocationCategory.FITNESS_CENTRE -> R.string.poi_category_fitness_center } \ No newline at end of file diff --git a/core/base/src/main/java/de/mm20/launcher2/search/Location.kt b/core/base/src/main/java/de/mm20/launcher2/search/Location.kt index d8ea356b..21fbdf05 100644 --- a/core/base/src/main/java/de/mm20/launcher2/search/Location.kt +++ b/core/base/src/main/java/de/mm20/launcher2/search/Location.kt @@ -81,7 +81,7 @@ interface Location : SavableSearchable { LocationCategory.LIBRARY, LocationCategory.BOOKS -> R.drawable.ic_location_library to R.color.brown LocationCategory.COLLEGE, LocationCategory.UNIVERSITY -> R.drawable.ic_location_college to R.color.purple LocationCategory.ICE_CREAM -> R.drawable.ic_location_ice_cream to R.color.pink - LocationCategory.THEATER -> R.drawable.ic_location_theatre to R.color.purple + LocationCategory.THEATRE -> R.drawable.ic_location_theatre to R.color.purple LocationCategory.PUBLIC_BUILDING -> R.drawable.ic_location_public_building to R.color.bluegrey LocationCategory.CINEMA -> R.drawable.ic_location_cinema to R.color.purple LocationCategory.NIGHTCLUB -> R.drawable.ic_location_nightclub to R.color.purple @@ -112,7 +112,7 @@ interface Location : SavableSearchable { LocationCategory.SOCCER -> R.drawable.ic_location_soccer to R.color.green LocationCategory.BASKETBALL -> R.drawable.ic_location_basketball to R.color.orange LocationCategory.TENNIS -> R.drawable.ic_location_tennis to R.color.orange - LocationCategory.FITNESS, LocationCategory.FITNESS_CENTER -> R.drawable.ic_location_fitness to R.color.orange + LocationCategory.FITNESS, LocationCategory.FITNESS_CENTRE -> R.drawable.ic_location_fitness to R.color.orange LocationCategory.TRAM_STOP -> R.drawable.ic_location_tram_stop to R.color.blue LocationCategory.RAILWAY_STATION -> R.drawable.ic_location_railway_stop to R.color.lightblue LocationCategory.BUS_STATION, LocationCategory.BUS_STOP -> R.drawable.ic_location_bus_station to R.color.blue @@ -176,7 +176,7 @@ enum class LocationCategory { LIBRARY, COLLEGE, ICE_CREAM, - THEATER, + THEATRE, PUBLIC_BUILDING, CINEMA, NIGHTCLUB, @@ -217,6 +217,7 @@ enum class LocationCategory { FITNESS, TRAM_STOP, RAILWAY_STATION, + RAILWAY_STOP, BUS_STATION, ATM, ART, @@ -226,7 +227,7 @@ enum class LocationCategory { PARCEL_LOCKER, CHEMIST, TRAVEL_AGENCY, - FITNESS_CENTER + FITNESS_CENTRE } data class OpeningHours( diff --git a/core/i18n/src/main/res/values/strings.xml b/core/i18n/src/main/res/values/strings.xml index aeebc72b..e4aa73a7 100644 --- a/core/i18n/src/main/res/values/strings.xml +++ b/core/i18n/src/main/res/values/strings.xml @@ -995,6 +995,7 @@ Fitness Tram stop Railway station + Railway stop Bus station ATM Art store