From 8334f4e37840b0c7e2a9f951b39c1674c4551c90 Mon Sep 17 00:00:00 2001 From: Gustavo Martin Morcuende Date: Mon, 3 Nov 2014 04:15:29 +0100 Subject: [PATCH] WeatherInformation: About activity --- app/src/main/AndroidManifest.xml | 102 ++++++++++++-------- .../java/de/example/exampletdd/AboutActivity.java | 45 +++++++++ .../de/example/exampletdd/WeatherTabsActivity.java | 6 ++ app/src/main/res/layout/weather_about.xml | 105 +++++++++++++++++++++ app/src/main/res/menu/weather_main_menu.xml | 17 +++- app/src/main/res/values/strings.xml | 37 +++++--- app/src/main/res/values/styles.xml | 1 - 7 files changed, 255 insertions(+), 58 deletions(-) create mode 100644 app/src/main/java/de/example/exampletdd/AboutActivity.java create mode 100644 app/src/main/res/layout/weather_about.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a628b0b..0cbe4d9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,12 +13,15 @@ - + - - + + + @@ -31,87 +34,106 @@ - - - + + - - + + android:launchMode="singleTop" + android:uiOptions="splitActionBarWhenNarrow" > - + + - - + + + - + - + - + + + + + + - + + + - - + + - + - + - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/weather_main_menu.xml b/app/src/main/res/menu/weather_main_menu.xml index f3f36c8..714e6a8 100644 --- a/app/src/main/res/menu/weather_main_menu.xml +++ b/app/src/main/res/menu/weather_main_menu.xml @@ -2,8 +2,7 @@ - - - + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 746757d..f1fec65 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,8 +2,7 @@ Weather Information - Icon weather - + Icon weather SUN RISE @@ -19,7 +18,6 @@ % No data available - Settings Units @@ -58,8 +56,6 @@ pascal standard atmosphere - - Settings Refresh @@ -73,18 +69,35 @@ OFF ON - Select Location city not found country not found - Please wait… + Please wait… Save Location - Get Location - - - - http://api.openweathermap.org/data/{0}/weather?lat={1}&lon={2}&cnt=1 + Get Location + + + About + APPLICATION + Version 1.0 + Legal information + Source code + REMOTE DATA + OpenWeatherMap + DEVELOPER + Gustavo Martin Morcuende + Web + + + http://api.openweathermap.org/data/{0}/weather?lat={1}&lon={2}&cnt=1 http://api.openweathermap.org/data/{0}/forecast/daily?lat={1}&lon={2}&cnt={3}&mode=json 2.5 + https://github.com/gumartinm/JavaForFun/tree/master/Android/WeatherInformation + http://gumartinm.name + http://openweathermap.org/ + About + Hello world! + Settings + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 3563070..b301e1b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -26,6 +26,5 @@ #48aed4 - #ff000000 -- 2.1.4