diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MyWeather.java b/app/src/main/java/de/apps4ics/mountainnavigation/MyWeather.java
index 285b89d..157d434 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MyWeather.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MyWeather.java
@@ -67,11 +67,6 @@
WeatherCode.SNOW.getCode(),
WeatherCode.HAIL.getCode(),
WeatherCode.SLEET.getCode(),
- WeatherCode.FOGGY.getCode(),
- WeatherCode.HAZE.getCode(),
- WeatherCode.WINDY.getCode(),
- WeatherCode.COLD.getCode(),
- WeatherCode.SUNNY.getCode(),
WeatherCode.MIXED_RAIN_AND_HAIL.getCode(),
WeatherCode.ISOLATED_THUNDERSTORMS.getCode(),
WeatherCode.SCATTERED_THUNDERSTORMS.getCode(),
@@ -125,7 +120,7 @@
}
public boolean isHot(){
- return getWeatherCode() == WeatherCode.SUNNY.getCode() ||
+ return (isSunny() && !isWindy()) ||
getMaxTemp() >= WeatherHandler.getMinHotTemp();
}
@@ -151,6 +146,17 @@
return isAfterSunset(time) || isAfterSunset(time + length);
}
+ public boolean isFoggy() {
+ return getWeatherCode() == WeatherCode.FOGGY.getCode() || getWeatherCode() == WeatherCode.HAZE.getCode();
+ }
+
+ public boolean hasSleet() {
+ return getWeatherCode() == WeatherCode.MIXED_RAIN_SNOW.getCode() ||
+ getWeatherCode() == WeatherCode.MIXED_RAIN_SLEET.getCode() ||
+ getWeatherCode() == WeatherCode.MIXED_SNOW_SLEET.getCode() ||
+ getWeatherCode() == WeatherCode.SLEET.getCode();
+ }
+
public int getClouds() {
return clouds;
}
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java
index a44ecfb..23d56f2 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java
@@ -335,6 +335,16 @@
descs.add(res.getString(R.string.hint_dialog_msgs_sunset));
infos.add("");
}
+ if (weather.isFoggy()) {
+ titles.add(res.getString(R.string.hint_dialog_titles_foggy));
+ descs.add(res.getString(R.string.hint_dialog_msgs_foggy));
+ infos.add(res.getString(R.string.hint_dialog_info_foggy));
+ }
+ if (weather.hasSleet()) {
+ titles.add(res.getString(R.string.hint_dialog_titles_sleet));
+ descs.add(res.getString(R.string.hint_dialog_msgs_sleet));
+ infos.add("");
+ }
if (titles.size() > 0 && descs.size() > 0) {
String[] titleArr = new String[titles.size()];
String[] descArr = new String[descs.size()];
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index a8578ca..fa711e5 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -51,16 +51,21 @@
Hinweise
Keine weiteren Infos vorhanden
Du solltest etwa 0.25l pro 30 Minuten trinken
+ Meide Wege, die in der App als \'ausgesetzt\' markiert sind
Sonnig
Heiß
Kalt
Windig
Sonnenuntergang
+ Nebelig
+ Schneeregen
Es könnte sonnig werden. Du solltest Sonnencreme mitnehmen.
Es ist heiß draußen. Denk daran genug zu trinken mitzunehmen.
Es könnte kalt werden. Du solltest ein paar warme Klamotten mitnehmen.
Es könnte windig werden. Du solltest winddichte Klamotten mitnehmen.
Es ist schon nach Sonnenuntergang. Nimm am besten eine Stirnlampe mit.
+ Es könnte nebelig werden. Schwierige und ausgesetzte Wege sollten gemieden werden.
+ Es könnte Schneeregen geben. Achte auf glatte Stellen und meide ausgesetzte Wege.
Wetterwarnung!
Das Wetter in deiner Umgebung in %1$s ist \'%2$s\'!
Verstanden!
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 86ba0a6..3528489 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -52,16 +52,21 @@
Hints
No additional info available
You should drink around 8.5oz every 30 minutes
+ Avoid paths which are marked as \'exposed\' in this app
Sunny
Hot
Cold
Windy
Sunset
+ Foggy
+ Sleet
It could be sunny. You should take some suncream with you.
It is hot outside. Remember to take enough to drink with you.
It could be could. You should take some warm clothes with you.
It could be windy. You should take windproof clothes with you.
It is already after sunset. Better take a headlamp with you.
+ It could be foggy. Difficult and exposed paths should be avoided.
+ There could be sleet. Pay attention to slick areas and avoid exposed paths.
Weather Warning!
The weather around you in %1$s is \'%2$s\'!
Got it!