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

Re-organize strings

Browse Source 
Add comments, rename some strings, remove unused strings
This commit is contained in:
MM20
2022-02-19 13:16:36 +01:00
parent 07573fe72f
commit 0550e6fe3b
29 changed files with 655 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files
weather/src/main/java/de/mm20/launcher2/weather/brightsky/BrightskyProvider.kt
+10 -10
View File
@@ -94,16 +94,16 @@ class BrightskyProvider(
private fun getCondition(icon: String): String? {
val resId = when (icon) {
"clear-day", "clear-night" -> R.string.weather_clearsky
"partly-cloudy-day", "partly-cloudy-night" -> R.string.weather_partlycloudy
"cloudy" -> R.string.weather_cloudy
"fog" -> R.string.weather_fog
"wind" -> R.string.weather_wind
"rain" -> R.string.weather_rain
"sleet" -> R.string.weather_sleet
"snow" -> R.string.weather_snow
"hail" -> R.string.weather_hail
"thunderstorm" -> R.string.weather_thunder
"clear-day", "clear-night" -> R.string.weather_condition_clearsky
"partly-cloudy-day", "partly-cloudy-night" -> R.string.weather_condition_partlycloudy
"cloudy" -> R.string.weather_condition_cloudy
"fog" -> R.string.weather_condition_fog
"wind" -> R.string.weather_details_wind
"rain" -> R.string.weather_condition_rain
"sleet" -> R.string.weather_condition_sleet
"snow" -> R.string.weather_condition_snow
"hail" -> R.string.weather_condition_hail
"thunderstorm" -> R.string.weather_condition_thunder
else -> return null
}
return context.getString(resId)
weather/src/main/java/de/mm20/launcher2/weather/metno/MetNoProvider.kt
+42 -42
View File
@@ -52,48 +52,48 @@ class MetNoProvider(override val context: Context) : LatLonWeatherProvider() {
private fun conditionForCode(code: String): String {
return context.getString(
when (code.substringBefore("_")) {
"sleetshowers" -> R.string.weather_sleetshowers
"heavysleet" -> R.string.weather_heavysleet
"lightrainshowersandthunder" -> R.string.weather_lightrainshowersandthunder
"heavyrain" -> R.string.weather_heavyrain
"lightsnowandthunder" -> R.string.weather_lightsnowandthunder
"lightrain" -> R.string.weather_lightrain
"lightrainshowers" -> R.string.weather_lightrainshowers
"lightsnow" -> R.string.weather_lightsnow
"heavysleetshowersandthunder" -> R.string.weather_heavysleetshowersandthunder
"lightsnowshowers" -> R.string.weather_lightsnowshowers
"lightssleetshowersandthunder" -> R.string.weather_lightssleetshowersandthunder
"snowandthunder" -> R.string.weather_snowandthunder
"heavysleetshowers" -> R.string.weather_heavysleetshowers
"heavysnow" -> R.string.weather_heavysnow
"cloudy" -> R.string.weather_cloudy
"lightrainandthunder" -> R.string.weather_lightrainandthunder
"snow" -> R.string.weather_snow
"heavysnowshowers" -> R.string.weather_heavysnowshowers
"heavyrainshowers" -> R.string.weather_heavyrainshowers
"rainshowersandthunder" -> R.string.weather_rainshowersandthunder
"clearsky" -> R.string.weather_clearsky
"sleet" -> R.string.weather_sleet
"rain" -> R.string.weather_rain
"sleetandthunder" -> R.string.weather_sleetandthunder
"lightssnowshowersandthunder" -> R.string.weather_lightssnowshowersandthunder
"heavyrainshowersandthunder" -> R.string.weather_heavyrainshowersandthunder
"fair" -> R.string.weather_fair
"fog" -> R.string.weather_fog
"sleetshowersandthunder" -> R.string.weather_sleetshowersandthunder
"rainandthunder" -> R.string.weather_rainandthunder
"lightsleet" -> R.string.weather_lightsleet
"heavysleetandthunder" -> R.string.weather_heavysleetandthunder
"partlycloudy" -> R.string.weather_partlycloudy
"heavysnowandthunder" -> R.string.weather_heavysnowandthunder
"rainshowers" -> R.string.weather_rainshowers
"lightsleetandthunder" -> R.string.weather_lightsleetandthunder
"heavysnowshowersandthunder" -> R.string.weather_heavysnowshowersandthunder
"lightsleetshowers" -> R.string.weather_lightsleetshowers
"snowshowersandthunder" -> R.string.weather_snowshowersandthunder
"snowshowers" -> R.string.weather_snowshowers
"heavyrainandthunder" -> R.string.weather_heavyrainandthunder
else -> R.string.weather_unknown
"sleetshowers" -> R.string.weather_condition_sleetshowers
"heavysleet" -> R.string.weather_condition_heavysleet
"lightrainshowersandthunder" -> R.string.weather_condition_lightrainshowersandthunder
"heavyrain" -> R.string.weather_condition_heavyrain
"lightsnowandthunder" -> R.string.weather_condition_lightsnowandthunder
"lightrain" -> R.string.weather_condition_lightrain
"lightrainshowers" -> R.string.weather_condition_lightrainshowers
"lightsnow" -> R.string.weather_condition_lightsnow
"heavysleetshowersandthunder" -> R.string.weather_condition_heavysleetshowersandthunder
"lightsnowshowers" -> R.string.weather_condition_lightsnowshowers
"lightssleetshowersandthunder" -> R.string.weather_condition_lightssleetshowersandthunder
"snowandthunder" -> R.string.weather_condition_snowandthunder
"heavysleetshowers" -> R.string.weather_condition_heavysleetshowers
"heavysnow" -> R.string.weather_condition_heavysnow
"cloudy" -> R.string.weather_condition_cloudy
"lightrainandthunder" -> R.string.weather_condition_lightrainandthunder
"snow" -> R.string.weather_condition_snow
"heavysnowshowers" -> R.string.weather_condition_heavysnowshowers
"heavyrainshowers" -> R.string.weather_condition_heavyrainshowers
"rainshowersandthunder" -> R.string.weather_condition_rainshowersandthunder
"clearsky" -> R.string.weather_condition_clearsky
"sleet" -> R.string.weather_condition_sleet
"rain" -> R.string.weather_condition_rain
"sleetandthunder" -> R.string.weather_condition_sleetandthunder
"lightssnowshowersandthunder" -> R.string.weather_condition_lightssnowshowersandthunder
"heavyrainshowersandthunder" -> R.string.weather_condition_heavyrainshowersandthunder
"fair" -> R.string.weather_condition_fair
"fog" -> R.string.weather_condition_fog
"sleetshowersandthunder" -> R.string.weather_condition_sleetshowersandthunder
"rainandthunder" -> R.string.weather_condition_rainandthunder
"lightsleet" -> R.string.weather_condition_lightsleet
"heavysleetandthunder" -> R.string.weather_condition_heavysleetandthunder
"partlycloudy" -> R.string.weather_condition_partlycloudy
"heavysnowandthunder" -> R.string.weather_condition_heavysnowandthunder
"rainshowers" -> R.string.weather_condition_rainshowers
"lightsleetandthunder" -> R.string.weather_condition_lightsleetandthunder
"heavysnowshowersandthunder" -> R.string.weather_condition_heavysnowshowersandthunder
"lightsleetshowers" -> R.string.weather_condition_lightsleetshowers
"snowshowersandthunder" -> R.string.weather_condition_snowshowersandthunder
"snowshowers" -> R.string.weather_condition_snowshowers
"heavyrainandthunder" -> R.string.weather_condition_heavyrainandthunder
else -> R.string.weather_condition_unknown
}
)
}