diff options
| author | Keith Packard <keithp@keithp.com> | 2015-06-22 18:26:34 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2015-06-22 21:04:43 -0700 |
| commit | 18fe64cf2648568dd0bde5acd7b627f1ddb6917e (patch) | |
| tree | 99e2b93b94077735ae06f8eaf1d1294de7798918 /altosdroid/res | |
| parent | ee656c9d41238ab2c56859a03fe6b8ce8ff2df4e (diff) | |
altosdroid: Display online/offline maps in same tab
Make the map portion switchable between online and offline maps,
leaving the rest of the tab alone.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altosdroid/res')
| -rw-r--r-- | altosdroid/res/layout/tab_map.xml | 13 | ||||
| -rw-r--r-- | altosdroid/res/layout/tab_map_offline.xml | 24 |
2 files changed, 25 insertions, 12 deletions
diff --git a/altosdroid/res/layout/tab_map.xml b/altosdroid/res/layout/tab_map.xml index f611ae48..b4c97f91 100644 --- a/altosdroid/res/layout/tab_map.xml +++ b/altosdroid/res/layout/tab_map.xml @@ -20,13 +20,12 @@ android:layout_height="match_parent" android:orientation="vertical" > - <LinearLayout + <LinearLayout android:id="@+id/map" - android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="0dp" - android:layout_weight="1"> - + android:orientation="horizontal" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_weight="1"> </LinearLayout> <LinearLayout @@ -185,4 +184,4 @@ android:textAppearance="?android:attr/textAppearanceSmall" /> </RelativeLayout> </LinearLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/altosdroid/res/layout/tab_map_offline.xml b/altosdroid/res/layout/tab_map_offline.xml index e6f134d8..1b0f28a7 100644 --- a/altosdroid/res/layout/tab_map_offline.xml +++ b/altosdroid/res/layout/tab_map_offline.xml @@ -20,11 +20,25 @@ android:layout_height="match_parent" android:orientation="vertical" > - <org.altusmetrum.AltosDroid.AltosMapView android:id="@+id/map_view_offline" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - /> + <FrameLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:baselineAligned="true" + android:orientation="horizontal" + android:layout_weight="1"> + <LinearLayout + android:id="@+id/map_online" + android:orientation="horizontal" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_weight="1"> + </LinearLayout> + <org.altusmetrum.AltosDroid.AltosMapOffline android:id="@+id/map_view_offline" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + /> + </FrameLayout> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" |