lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Undo location category spelling changes

Browse Source 
Close #798
This commit is contained in:
MM20 2024-05-17 21:43:29 +02:00
parent c55a9b6aa3
commit c35f0b3694
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/location/LocationItem.kt
View File

@ -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
}

9
core/base/src/main/java/de/mm20/launcher2/search/Location.kt
View File

@ -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(

1
core/i18n/src/main/res/values/strings.xml
View File

@ -995,6 +995,7 @@
<string name="poi_category_fitness">Fitness</string>
<string name="poi_category_tram_stop">Tram stop</string>
<string name="poi_category_railway_station">Railway station</string>
<string name="poi_category_railway_stop">Railway stop</string>
<string name="poi_category_bus_station">Bus station</string>
<string name="poi_category_atm">ATM</string>
<string name="poi_category_art">Art store</string>