diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4716600..95f0f03 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -43,20 +43,4 @@
-
-
-
-
- 1.8
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index a0015b9..1f548a4 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -8,7 +8,6 @@
import android.content.Intent;
import android.content.res.Resources;
import android.graphics.Bitmap;
-import android.graphics.Color;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
@@ -42,6 +41,7 @@
import android.widget.Toast;
import com.survivingwithandroid.weather.lib.WeatherClient;
+import com.survivingwithandroid.weather.lib.WeatherCode;
import com.survivingwithandroid.weather.lib.WeatherConfig;
import com.survivingwithandroid.weather.lib.exception.WeatherLibException;
import com.survivingwithandroid.weather.lib.exception.WeatherProviderInstantiationException;
@@ -58,6 +58,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -84,6 +85,7 @@
private FloatingActionButton fab;
private WeatherClient weatherClient;
+ private static Integer[] severeWeatherCodes;
private DatabaseHandler dbHandler;
@@ -182,6 +184,42 @@
WeatherConfig weatherConfig = new WeatherConfig();
weatherConfig.unitSystem = WeatherConfig.UNIT_SYSTEM.M;
weatherConfig.ApiKey = API_KEY;
+ weatherConfig.lang = res.getString(R.string.lang_identifier);
+
+ //TODO split into sever weather and foggy, windy, sunny, ...
+ severeWeatherCodes = new Integer[]{
+ WeatherCode.TORNADO.getCode(),
+ WeatherCode.TROPICAL_STORM.getCode(),
+ WeatherCode.HURRICANE.getCode(),
+ WeatherCode.SEVERE_THUNDERSTORMS.getCode(),
+ WeatherCode.THUNDERSTORMS.getCode(),
+ WeatherCode.MIXED_RAIN_SNOW.getCode(),
+ WeatherCode.MIXED_RAIN_SLEET.getCode(),
+ WeatherCode.MIXED_SNOW_SLEET.getCode(),
+ WeatherCode.FREEZING_DRIZZLE.getCode(),
+ WeatherCode.FREEZING_RAIN.getCode(),
+ WeatherCode.HEAVY_SHOWERS.getCode(),
+ WeatherCode.SNOW_FLURRIES.getCode(),
+ WeatherCode.LIGHT_SNOW_SHOWERS.getCode(),
+ WeatherCode.BLOWING_SNOW.getCode(),
+ 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(),
+ WeatherCode.HEAVY_SNOW.getCode(),
+ WeatherCode.SCATTERED_SNOW_SHOWERS.getCode(),
+ WeatherCode.THUNDERSHOWERS.getCode(),
+ WeatherCode.SNOW_SHOWERS.getCode(),
+ WeatherCode.ISOLATED_THUDERSHOWERS.getCode(),
+ WeatherCode.TORNADO.getCode()
+ };
weatherClient = null;
try {
@@ -430,8 +468,10 @@
weather.weather.currentCondition.getWeatherCode().getCode(),
weather.weather.currentCondition.getWeatherId());
- InformDialog informWeatherDialog = new InformDialog(title, msg);
- informWeatherDialog.show(getFragmentManager(), "Inform Dialog");
+ //InformDialog informWeatherDialog = new InformDialog(title, msg);
+ //informWeatherDialog.show(getFragmentManager(), "Inform Dialog");
+ Log.d(TAG, title + ": " + msg);
+ Log.d(TAG, "isSevereWeather? " + isSevereWeather(weather.weather.currentCondition.getWeatherCode().getCode()));
}
@Override
@@ -463,6 +503,10 @@
Log.d(TAG, "onProviderDisabled: " + provider);
}
+ public boolean isSevereWeather(int weatherCode){
+ return Arrays.asList(severeWeatherCodes).contains(weatherCode);
+ }
+
public class InformDialog extends DialogFragment {
private String title;
private String msg;
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index ba5d317..1f95983 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -14,6 +14,8 @@
Verstanden!
Dein Standort
Latitude: %1$.03f<br/>Longitude: %2$.03f<br/>Höhe: %3$dm<br/>Zeit: %4$s
+
+ de
H:m
d.MM.yyyy, HH:mm \'Uhr\'
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 30f7d43..021a62b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,6 +15,8 @@
Got it!
Your position
Latitude: %1$.03f<br/>Longitude: %2$.03f<br/>Altitude: %3$d meters<br/>Time: %4$s
+
+ en
h:m a
MM/d/yyyy, hh:mm a