diff options
| author | Keith Packard <keithp@keithp.com> | 2015-06-22 18:41:01 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2015-06-22 21:04:43 -0700 |
| commit | a959c1926048d1b96a06aa291131afd7c8e771c7 (patch) | |
| tree | dec770419e61571003c280c08ce43b8115594c70 /altosdroid/res/layout/tab_map.xml | |
| parent | 18fe64cf2648568dd0bde5acd7b627f1ddb6917e (diff) | |
altosdroid: Get rid of on-line only maps tab
The offline tab did both, so delete the online one and replace it with
the offline one.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altosdroid/res/layout/tab_map.xml')
| -rw-r--r-- | altosdroid/res/layout/tab_map.xml | 340 |
1 files changed, 176 insertions, 164 deletions
diff --git a/altosdroid/res/layout/tab_map.xml b/altosdroid/res/layout/tab_map.xml index b4c97f91..2388a20b 100644 --- a/altosdroid/res/layout/tab_map.xml +++ b/altosdroid/res/layout/tab_map.xml @@ -20,168 +20,180 @@ android:layout_height="match_parent" android:orientation="vertical" > - <LinearLayout - android:id="@+id/map" - android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_weight="1"> - </LinearLayout> - - <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:baselineAligned="true" - android:orientation="horizontal" > - - <RelativeLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingTop="5dp" > - - <TextView - android:id="@+id/distance_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingRight="4dp" - android:text="@string/distance_label" /> - - <TextView - android:id="@+id/distance_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@+id/distance_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingTop="5dp" > - - <TextView - android:id="@+id/bearing_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingRight="4dp" - android:text="@string/bearing_label" /> - - <TextView - android:id="@+id/bearing_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@+id/bearing_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - </LinearLayout> - - <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:baselineAligned="true" - android:orientation="horizontal" > - - <RelativeLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingTop="5dp" > - - <TextView - android:id="@+id/target_lat_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingRight="4dp" - android:text="@string/target_latitude_label" /> - - <TextView - android:id="@+id/target_lat_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/target_lat_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingTop="5dp" > - - <TextView - android:id="@+id/target_lon_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingRight="4dp" - android:text="@string/target_longitude_label" /> - - <TextView - android:id="@+id/target_lon_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/target_lon_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - </LinearLayout> - - <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:baselineAligned="true" - android:orientation="horizontal" > - - <RelativeLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingTop="5dp" > - - <TextView - android:id="@+id/receiver_lat_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingRight="4dp" - android:text="@string/receiver_latitude_label" /> - - <TextView - android:id="@+id/receiver_lat_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/receiver_lat_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingTop="5dp" > - - <TextView - android:id="@+id/receiver_lon_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingRight="4dp" - android:text="@string/receiver_longitude_label" /> - - <TextView - android:id="@+id/receiver_lon_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/receiver_lon_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - </LinearLayout> + <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_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" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:baselineAligned="true" + android:orientation="horizontal" > + + <RelativeLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingTop="5dp" > + + <TextView + android:id="@+id/distance_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingRight="4dp" + android:text="@string/distance_label" /> + + <TextView + android:id="@+id/distance_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/distance_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </RelativeLayout> + + <RelativeLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingTop="5dp" > + + <TextView + android:id="@+id/bearing_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingRight="4dp" + android:text="@string/bearing_label" /> + + <TextView + android:id="@+id/bearing_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/bearing_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </RelativeLayout> + + </LinearLayout> + + <LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:baselineAligned="true" + android:orientation="horizontal" > + + <RelativeLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingTop="5dp" > + + <TextView + android:id="@+id/target_lat_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingRight="4dp" + android:text="@string/target_latitude_label" /> + + <TextView + android:id="@+id/target_lat_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/target_lat_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </RelativeLayout> + + <RelativeLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingTop="5dp" > + + <TextView + android:id="@+id/target_lon_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingRight="4dp" + android:text="@string/target_longitude_label" /> + + <TextView + android:id="@+id/target_lon_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/target_lon_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </RelativeLayout> + </LinearLayout> + + <LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:baselineAligned="true" + android:orientation="horizontal" > + + <RelativeLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingTop="5dp" > + + <TextView + android:id="@+id/receiver_lat_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingRight="4dp" + android:text="@string/receiver_latitude_label" /> + + <TextView + android:id="@+id/receiver_lat_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/receiver_lat_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </RelativeLayout> + + <RelativeLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingTop="5dp" > + + <TextView + android:id="@+id/receiver_lon_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingRight="4dp" + android:text="@string/receiver_longitude_label" /> + + <TextView + android:id="@+id/receiver_lon_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/receiver_lon_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </RelativeLayout> + </LinearLayout> </LinearLayout> |