From: Gustavo Martin Morcuende Date: Mon, 13 Oct 2014 00:32:58 +0000 (+0200) Subject: WeatherInformation: pressure units configuration and access from Android's network... X-Git-Tag: weatherinformation-1.0~103 X-Git-Url: https://git.gumartinm.name/?a=commitdiff_plain;h=df88f9f21fc71256bc38fccf47ae9f1ea7813a5f;p=AndroidWeatherInformation WeatherInformation: pressure units configuration and access from Android's network settings. --- diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a626e9b..55771d1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -56,9 +56,12 @@ android:parentActivityName="de.example.exampletdd.WeatherTabsActivity" > - + + + + diff --git a/res/values/arrays.xml b/res/values/arrays.xml index d306f8e..af804e7 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1,65 +1,5 @@ - - ºC - ºF - K - - - celsius - fahrenheit - kelvin - - - ar - bg - zh_cn - zh_tw - cz - nl - en - fi - fr - gl - de - it - mk - pl - pt - ro - ru - sk - sp - se - tr - ua - vi - - - Arabic - Bulgarian - Chinese Simplified - Chinese Traditional - Czech - Dutch - English - Finnish - French - Galician - German - Italian - Macedonian - Polish - Portuguese - Romanian - Russian - Slovak - Spanish - Swedish - Turkish - Ukrainian - Vietnamese - 5 10 @@ -102,12 +42,30 @@ half day one day + + @string/weather_preferences_temperature_celsius + @string/weather_preferences_temperature_fahrenheit + @string/weather_preferences_temperature_kelvin + + + @string/weather_preferences_temperature_celsius_human_value + @string/weather_preferences_temperature_fahrenheit_human_value + @string/weather_preferences_temperature_kelvin_human_value + - m/s - mph + @string/weather_preferences_wind_meters + @string/weather_preferences_wind_miles - meter per second - miles per hour + @string/weather_preferences_wind_human_value_meters + @string/weather_preferences_wind_human_value_miles + + + @string/weather_preferences_pressure_pascal + @string/weather_preferences_pressure_standard_atm + + + @string/weather_preferences_pressure_human_value_pascal + @string/weather_preferences_pressure_human_value_standard_atm diff --git a/res/values/strings.xml b/res/values/strings.xml index 76158fa..53195da 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -20,8 +20,14 @@ Icon weather Settings Units - weather_preferences_units - Temperature + weather_preferences_temperature + Temperature + ºC + ºF + K + celsius + fahrenheit + kelvin Notifications Disabled Enabled @@ -36,7 +42,16 @@ Refresh interval weather_preferences_wind Wind - meter per second + m/s + mph + meter per second + miles per hour + weather_preferences_pressure + Pressure + hpa + atm + pascal + standard atmosphere Units widget_preferences_units widget_preferences_refresh_interval @@ -51,6 +66,5 @@ Get Location mm 3h % - hpa No data available diff --git a/res/xml/appwidget_preferences.xml b/res/xml/appwidget_preferences.xml index 1445bae..4ab359e 100644 --- a/res/xml/appwidget_preferences.xml +++ b/res/xml/appwidget_preferences.xml @@ -10,7 +10,7 @@ android:summary="five minutes" /> - + android:defaultValue="@string/weather_preferences_temperature_celsius" /> +