From 8ec590295993c523193faa5c2b0f0c384da65356 Mon Sep 17 00:00:00 2001 From: "gu.martinm@gmail.com" Date: Wed, 17 Sep 2014 19:59:56 +0200 Subject: [PATCH] WeatherInformation: map with progress bar --- .../res/anim/weather_map_enter_progress.xml | 8 + .../res/anim/weather_map_exit_progress.xml | 8 + .../WeatherInformation/res/layout/weather_map.xml | 32 +-- .../res/layout/weather_map_buttons.xml | 42 +++ .../res/layout/weather_map_progress.xml | 18 ++ .../src/de/example/exampletdd/MapActivity.java | 294 ++++++++++----------- .../exampletdd/fragment/ErrorDialogFragment.java | 8 + .../fragment/map/MapButtonsFragment.java | 31 +++ .../fragment/map/MapProgressFragment.java | 158 +++++++++++ 9 files changed, 426 insertions(+), 173 deletions(-) create mode 100644 Android/WeatherInformation/res/anim/weather_map_enter_progress.xml create mode 100644 Android/WeatherInformation/res/anim/weather_map_exit_progress.xml create mode 100644 Android/WeatherInformation/res/layout/weather_map_buttons.xml create mode 100644 Android/WeatherInformation/res/layout/weather_map_progress.xml create mode 100644 Android/WeatherInformation/src/de/example/exampletdd/fragment/map/MapButtonsFragment.java create mode 100644 Android/WeatherInformation/src/de/example/exampletdd/fragment/map/MapProgressFragment.java diff --git a/Android/WeatherInformation/res/anim/weather_map_enter_progress.xml b/Android/WeatherInformation/res/anim/weather_map_enter_progress.xml new file mode 100644 index 0000000..c747270 --- /dev/null +++ b/Android/WeatherInformation/res/anim/weather_map_enter_progress.xml @@ -0,0 +1,8 @@ + + + + diff --git a/Android/WeatherInformation/res/anim/weather_map_exit_progress.xml b/Android/WeatherInformation/res/anim/weather_map_exit_progress.xml new file mode 100644 index 0000000..f425b7e --- /dev/null +++ b/Android/WeatherInformation/res/anim/weather_map_exit_progress.xml @@ -0,0 +1,8 @@ + + + + diff --git a/Android/WeatherInformation/res/layout/weather_map.xml b/Android/WeatherInformation/res/layout/weather_map.xml index 3f270e8..2e442c1 100644 --- a/Android/WeatherInformation/res/layout/weather_map.xml +++ b/Android/WeatherInformation/res/layout/weather_map.xml @@ -69,34 +69,16 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_below="@+id/weather_map_citycountry_container" - android:layout_above="@+id/weather_map_button_savelocation" /> + android:layout_above="@+id/weather_map_buttons_container" /> - -