diff options
| author | Bdale Garbee <bdale@gag.com> | 2015-07-15 16:43:50 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2015-07-15 16:43:50 -0600 |
| commit | 643c2fb03833d658320f476ef731bbb06fe3cc31 (patch) | |
| tree | 878c9df5dbd9bab9169becea4e06e8bae3529541 /altosdroid/res/layout | |
| parent | e41786fb384892961a6547e17812a24314ce9623 (diff) | |
| parent | 271f56a41c7e785b0fab7e572325df842d104277 (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'altosdroid/res/layout')
| -rw-r--r-- | altosdroid/res/layout/device_list.xml | 16 | ||||
| -rw-r--r-- | altosdroid/res/layout/map_preload.xml | 129 | ||||
| -rw-r--r-- | altosdroid/res/layout/map_type.xml | 47 | ||||
| -rw-r--r-- | altosdroid/res/layout/tab_ascent.xml | 299 | ||||
| -rw-r--r-- | altosdroid/res/layout/tab_descent.xml | 339 | ||||
| -rw-r--r-- | altosdroid/res/layout/tab_flight.xml | 402 | ||||
| -rw-r--r-- | altosdroid/res/layout/tab_landed.xml | 211 | ||||
| -rw-r--r-- | altosdroid/res/layout/tab_layout.xml | 16 | ||||
| -rw-r--r-- | altosdroid/res/layout/tab_map.xml | 345 | ||||
| -rw-r--r-- | altosdroid/res/layout/tab_pad.xml | 781 | ||||
| -rw-r--r-- | altosdroid/res/layout/tab_recover.xml | 251 |
11 files changed, 1511 insertions, 1325 deletions
diff --git a/altosdroid/res/layout/device_list.xml b/altosdroid/res/layout/device_list.xml index 93d65517..bf295e4c 100644 --- a/altosdroid/res/layout/device_list.xml +++ b/altosdroid/res/layout/device_list.xml @@ -32,6 +32,13 @@ android:textColor="#fff" android:paddingLeft="5dp" /> + <ListView android:id="@+id/new_devices" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:fadeScrollbars="false" + android:scrollbars="vertical" + /> <TextView android:id="@+id/title_paired_devices" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -44,13 +51,8 @@ <ListView android:id="@+id/paired_devices" android:layout_width="match_parent" android:layout_height="wrap_content" - android:stackFromBottom="true" android:layout_weight="1" - /> - <ListView android:id="@+id/new_devices" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:stackFromBottom="true" - android:layout_weight="2" + android:fadeScrollbars="false" + android:scrollbars="vertical" /> </LinearLayout> diff --git a/altosdroid/res/layout/map_preload.xml b/altosdroid/res/layout/map_preload.xml new file mode 100644 index 00000000..dc613bf2 --- /dev/null +++ b/altosdroid/res/layout/map_preload.xml @@ -0,0 +1,129 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright © 2015 Keith Packard <keithp@keithp.com> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" + > + <ScrollView android:layout_width="fill_parent" + android:layout_height="wrap_content"> + <LinearLayout android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical"> + <TextView android:id="@+id/preload_site_label" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/preload_site_label" + /> + <Spinner android:id="@+id/preload_site_list" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:prompt="@string/preload_site_label" + android:spinnerMode="dropdown" + /> + <TextView android:id="@+id/preload_latitude_label" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/preload_latitude_label" + /> + <EditText android:id="@+id/preload_latitude" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:hint="@string/preload_latitude_label" + android:inputType="number"/> + <TextView android:id="@+id/preload_longitude_label" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/preload_longitude_label" + /> + <EditText android:id="@+id/preload_longitude" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:hint="@string/preload_longitude_label" + android:inputType="number"/> + <TextView android:id="@+id/preload_types" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/preload_types" + /> + <CheckBox android:id="@+id/preload_hybrid" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/preload_hybrid" + /> + <CheckBox android:id="@+id/preload_satellite" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/preload_satellite" + /> + <CheckBox android:id="@+id/preload_roadmap" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/preload_roadmap" + /> + <CheckBox android:id="@+id/preload_terrain" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/preload_terrain" + /> + <TextView android:id="@+id/preload_min_zoom_label" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/preload_min_zoom" + /> + <Spinner android:id="@+id/preload_min_zoom" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:prompt="@string/preload_min_zoom" + android:spinnerMode="dropdown" + /> + <TextView android:id="@+id/preload_max_zoom_label" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/preload_max_zoom" + /> + <Spinner android:id="@+id/preload_max_zoom" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:prompt="@string/preload_max_zoom" + android:spinnerMode="dropdown" + /> + <TextView android:id="@+id/preload_radius_label" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/preload_radius" + /> + <Spinner android:id="@+id/preload_radius" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:prompt="@string/preload_radius" + android:spinnerMode="dropdown" + /> + <Button android:id="@+id/preload_load" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/preload_load" + /> + <ProgressBar android:id="@+id/preload_progress" + android:layout_width="match_parent" + android:layout_height="wrap_content" + style="@android:style/Widget.ProgressBar.Horizontal" + /> + </LinearLayout> + </ScrollView> +</LinearLayout> diff --git a/altosdroid/res/layout/map_type.xml b/altosdroid/res/layout/map_type.xml new file mode 100644 index 00000000..610e6bbf --- /dev/null +++ b/altosdroid/res/layout/map_type.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright © 2015 Keith Packard <keithp@keithp.com> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" + > + <Button android:id="@+id/map_type_hybrid" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/preload_hybrid" + android:onClick="selectType" + /> + <Button android:id="@+id/map_type_satellite" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/preload_satellite" + android:onClick="selectType" + /> + <Button android:id="@+id/map_type_roadmap" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/preload_roadmap" + android:onClick="selectType" + /> + <Button android:id="@+id/map_type_terrain" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/preload_terrain" + android:onClick="selectType" + /> +</LinearLayout> diff --git a/altosdroid/res/layout/tab_ascent.xml b/altosdroid/res/layout/tab_ascent.xml deleted file mode 100644 index b21ec426..00000000 --- a/altosdroid/res/layout/tab_ascent.xml +++ /dev/null @@ -1,299 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright © 2013 Mike Beattie <mike@ethernal.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. ---> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - - <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_weight="0" - android:baselineAligned="true" - android:orientation="horizontal" - android:paddingTop="5dp" > - - <RelativeLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" > - - <TextView - android:id="@+id/height_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/height_label" /> - - <TextView - android:id="@+id/height_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/height_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" > - - <TextView - android:id="@+id/max_height_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/max_height_label" /> - - <TextView - android:id="@+id/max_height_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/max_height_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:layout_weight="0" - android:baselineAligned="true" - android:orientation="horizontal" - android:paddingTop="5dp" > - - <RelativeLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" > - - <TextView - android:id="@+id/speed_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/speed_label" /> - - <TextView - android:id="@+id/speed_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/speed_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" > - - <TextView - android:id="@+id/max_speed_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/max_speed_label" /> - - <TextView - android:id="@+id/max_speed_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/max_speed_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:layout_weight="0" - android:baselineAligned="true" - android:orientation="horizontal" - android:paddingTop="5dp" > - - <RelativeLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" > - - <TextView - android:id="@+id/accel_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/accel_label" /> - - <TextView - android:id="@+id/accel_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/accel_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" > - - <TextView - android:id="@+id/max_accel_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/max_accel_label" /> - - <TextView - android:id="@+id/max_accel_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/max_accel_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - </LinearLayout> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="5dp" > - - <TextView - android:id="@+id/lat_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/latitude_label" /> - - <TextView - android:id="@+id/lat_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/lat_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="5dp" > - - <TextView - android:id="@+id/lon_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/longitude_label" /> - - <TextView - android:id="@+id/lon_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/lon_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="5dp" > - - <ImageView - android:id="@+id/apogee_redled" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@string/apogee_voltage_label" - android:src="@drawable/grayled" /> - - <ImageView - android:id="@+id/apogee_greenled" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/apogee_redled" - android:contentDescription="@string/apogee_voltage_label" - android:paddingRight="5dp" - android:src="@drawable/grayled" /> - - <TextView - android:id="@+id/apogee_voltage_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/apogee_greenled" - android:text="@string/apogee_voltage_label" /> - - <TextView - android:id="@+id/apogee_voltage_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/apogee_voltage_label" - android:layout_toRightOf="@id/apogee_greenled" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="5dp" > - - <ImageView - android:id="@+id/main_redled" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@string/main_voltage_label" - android:src="@drawable/grayled" /> - - <ImageView - android:id="@+id/main_greenled" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/main_redled" - android:contentDescription="@string/main_voltage_label" - android:paddingRight="5dp" - android:src="@drawable/grayled" /> - - <TextView - android:id="@+id/main_voltage_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/main_greenled" - android:text="@string/main_voltage_label" /> - - <TextView - android:id="@+id/main_voltage_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/main_voltage_label" - android:layout_toRightOf="@id/main_greenled" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - -</LinearLayout>
\ No newline at end of file diff --git a/altosdroid/res/layout/tab_descent.xml b/altosdroid/res/layout/tab_descent.xml deleted file mode 100644 index 9e1fc820..00000000 --- a/altosdroid/res/layout/tab_descent.xml +++ /dev/null @@ -1,339 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright © 2013 Mike Beattie <mike@ethernal.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. ---> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - - <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_weight="0" - android:baselineAligned="true" - android:orientation="horizontal" > - - <RelativeLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" > - - <TextView - android:id="@+id/speed_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/speed_label" /> - - <TextView - android:id="@+id/speed_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/speed_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" > - - <TextView - android:id="@+id/height_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/height_label" /> - - <TextView - android:id="@+id/height_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/height_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:layout_weight="0" - android:baselineAligned="true" - android:orientation="horizontal" - android:paddingTop="5dp" > - - <RelativeLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" > - - <TextView - android:id="@+id/elevation_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/elevation_label" /> - - <TextView - android:id="@+id/elevation_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/elevation_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" > - - <TextView - android:id="@+id/range_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/range_label" /> - - <TextView - android:id="@+id/range_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/range_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:layout_weight="0" - android:baselineAligned="true" - android:orientation="horizontal" - android:paddingTop="5dp" > - - <RelativeLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" > - - <TextView - android:id="@+id/bearing_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/bearing_label" /> - - <TextView - android:id="@+id/bearing_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/bearing_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" > - - <TextView - android:id="@+id/compass_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="" /> - - <TextView - android:id="@+id/compass_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/compass_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:layout_weight="0" - android:baselineAligned="true" - android:orientation="horizontal" - android:paddingTop="5dp" > - - <RelativeLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" > - - <TextView - android:id="@+id/distance_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/gnd_distance_label" /> - - <TextView - android:id="@+id/distance_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/distance_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <TextView - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" > - </TextView> - - </LinearLayout> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="5dp" > - - <TextView - android:id="@+id/lat_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/latitude_label" /> - - <TextView - android:id="@+id/lat_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/lat_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="5dp" > - - <TextView - android:id="@+id/lon_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/longitude_label" /> - - <TextView - android:id="@+id/lon_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/lon_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="5dp" > - - <ImageView - android:id="@+id/apogee_redled" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@string/apogee_voltage_label" - android:src="@drawable/grayled" /> - - <ImageView - android:id="@+id/apogee_greenled" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/apogee_redled" - android:contentDescription="@string/apogee_voltage_label" - android:paddingRight="5dp" - android:src="@drawable/grayled" /> - - <TextView - android:id="@+id/apogee_voltage_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/apogee_greenled" - android:text="@string/apogee_voltage_label" /> - - <TextView - android:id="@+id/apogee_voltage_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/apogee_voltage_label" - android:layout_toRightOf="@id/apogee_greenled" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="5dp" > - - <ImageView - android:id="@+id/main_redled" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@string/main_voltage_label" - android:src="@drawable/grayled" /> - - <ImageView - android:id="@+id/main_greenled" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/main_redled" - android:contentDescription="@string/main_voltage_label" - android:paddingRight="5dp" - android:src="@drawable/grayled" /> - - <TextView - android:id="@+id/main_voltage_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/main_greenled" - android:text="@string/main_voltage_label" /> - - <TextView - android:id="@+id/main_voltage_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/main_voltage_label" - android:layout_toRightOf="@id/main_greenled" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - -</LinearLayout> diff --git a/altosdroid/res/layout/tab_flight.xml b/altosdroid/res/layout/tab_flight.xml new file mode 100644 index 00000000..85c171b2 --- /dev/null +++ b/altosdroid/res/layout/tab_flight.xml @@ -0,0 +1,402 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright © 2013 Mike Beattie <mike@ethernal.org> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. +--> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <LinearLayout + android:layout_weight="0" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_weight="0" + android:baselineAligned="true" + android:orientation="horizontal" > + + <RelativeLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" > + + <TextView + android:id="@+id/speed_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/speed_label" /> + + <TextView + android:id="@+id/speed_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@id/speed_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </RelativeLayout> + + <RelativeLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" > + + <TextView + android:id="@+id/height_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/height_label" /> + + <TextView + android:id="@+id/height_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@id/height_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:layout_weight="0" + android:baselineAligned="true" + android:orientation="horizontal" > + + <RelativeLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" > + + <TextView + android:id="@+id/max_speed_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/max_speed_label" /> + + <TextView + android:id="@+id/max_speed_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@id/max_speed_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </RelativeLayout> + + <RelativeLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" > + + <TextView + android:id="@+id/max_height_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/max_height_label" /> + + <TextView + android:id="@+id/max_height_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@id/max_height_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:layout_weight="0" + android:baselineAligned="true" + android:orientation="horizontal" + android:paddingTop="5dp" > + + <RelativeLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" > + + <TextView + android:id="@+id/elevation_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/elevation_label" /> + + <TextView + android:id="@+id/elevation_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@id/elevation_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </RelativeLayout> + + <RelativeLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" > + + <TextView + android:id="@+id/range_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/range_label" /> + + <TextView + android:id="@+id/range_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@id/range_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:layout_weight="0" + android:baselineAligned="true" + android:orientation="horizontal" + android:paddingTop="5dp" > + + <RelativeLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" > + + <TextView + android:id="@+id/bearing_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/bearing_label" /> + + <TextView + android:id="@+id/bearing_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@id/bearing_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </RelativeLayout> + + <RelativeLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" > + + <TextView + android:id="@+id/compass_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="" /> + + <TextView + android:id="@+id/compass_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@id/compass_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:layout_weight="0" + android:baselineAligned="true" + android:orientation="horizontal" + android:paddingTop="5dp" > + + <RelativeLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" > + + <TextView + android:id="@+id/distance_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/gnd_distance_label" /> + + <TextView + android:id="@+id/distance_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@id/distance_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </RelativeLayout> + + <TextView + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" > + </TextView> + + </LinearLayout> + + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingTop="5dp" > + + <TextView + android:id="@+id/lat_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/latitude_label" /> + + <TextView + android:id="@+id/lat_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@id/lat_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </RelativeLayout> + + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingTop="5dp" > + + <TextView + android:id="@+id/lon_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/longitude_label" /> + + <TextView + android:id="@+id/lon_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@id/lon_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </RelativeLayout> + + <RelativeLayout + android:id="@+id/apogee_view" + android:visibility="gone" + android:layout_gravity="fill" + android:layout_weight="1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingTop="5dp" > + + <ImageView + android:id="@+id/apogee_redled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/apogee_voltage_label" + android:src="@drawable/grayled" /> + + <ImageView + android:id="@+id/apogee_greenled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/apogee_redled" + android:contentDescription="@string/apogee_voltage_label" + android:paddingRight="5dp" + android:src="@drawable/grayled" /> + + <TextView + android:id="@+id/apogee_voltage_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/apogee_greenled" + android:text="@string/apogee_voltage_label" /> + + <TextView + android:id="@+id/apogee_voltage_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </RelativeLayout> + + <RelativeLayout + android:id="@+id/main_view" + android:visibility="gone" + android:layout_gravity="fill" + android:layout_weight="1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingTop="5dp" > + + <ImageView + android:id="@+id/main_redled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/main_voltage_label" + android:src="@drawable/grayled" /> + + <ImageView + android:id="@+id/main_greenled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/main_redled" + android:contentDescription="@string/main_voltage_label" + android:paddingRight="5dp" + android:src="@drawable/grayled" /> + + <TextView + android:id="@+id/main_voltage_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/main_greenled" + android:text="@string/main_voltage_label" /> + + <TextView + android:id="@+id/main_voltage_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </RelativeLayout> + </LinearLayout> +</LinearLayout> diff --git a/altosdroid/res/layout/tab_landed.xml b/altosdroid/res/layout/tab_landed.xml deleted file mode 100644 index f27baa9e..00000000 --- a/altosdroid/res/layout/tab_landed.xml +++ /dev/null @@ -1,211 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright © 2013 Mike Beattie <mike@ethernal.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. ---> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" > - - <TextView - android:id="@+id/bearing_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/bearing_label" /> - - <TextView - android:id="@+id/bearing_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@+id/bearing_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="5dp" > - - <TextView - android:id="@+id/distance_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/distance_label" /> - - <TextView - android:id="@+id/distance_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@+id/distance_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="5dp" > - - <TextView - android:id="@+id/target_lat_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - 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_alignParentRight="true" - android:layout_below="@id/target_lat_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="5dp" > - - <TextView - android:id="@+id/target_lon_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - 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_alignParentRight="true" - android:layout_below="@id/target_lon_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="5dp" > - - <TextView - android:id="@+id/receiver_lat_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - 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_alignParentRight="true" - android:layout_below="@id/receiver_lat_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="5dp" > - - <TextView - android:id="@+id/receiver_lon_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - 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_alignParentRight="true" - android:layout_below="@id/receiver_lon_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="5dp" > - - <TextView - android:id="@+id/max_height_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/max_height_label" /> - - <TextView - android:id="@+id/max_height_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/max_height_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="5dp" > - - <TextView - android:id="@+id/max_speed_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/max_speed_label" /> - - <TextView - android:id="@+id/max_speed_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/max_speed_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="5dp" > - - <TextView - android:id="@+id/max_accel_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/max_accel_label" /> - - <TextView - android:id="@+id/max_accel_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/max_accel_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - -</LinearLayout>
\ No newline at end of file diff --git a/altosdroid/res/layout/tab_layout.xml b/altosdroid/res/layout/tab_layout.xml new file mode 100644 index 00000000..2c21c648 --- /dev/null +++ b/altosdroid/res/layout/tab_layout.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/customTabLayout" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <TextView + android:id="@+id/tabLabel" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:textSize="13dp" + android:textColor="#ffffff" + android:gravity="center_horizontal" + android:background="#808080" + android:layout_centerVertical="true" + android:layout_centerHorizontal="true" /> +</RelativeLayout> diff --git a/altosdroid/res/layout/tab_map.xml b/altosdroid/res/layout/tab_map.xml index f611ae48..952abd49 100644 --- a/altosdroid/res/layout/tab_map.xml +++ b/altosdroid/res/layout/tab_map.xml @@ -20,169 +20,182 @@ android:layout_height="match_parent" android:orientation="vertical" > - <LinearLayout - android:id="@+id/map" - android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="0dp" - 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> -</LinearLayout>
\ No newline at end of file + <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> diff --git a/altosdroid/res/layout/tab_pad.xml b/altosdroid/res/layout/tab_pad.xml index 38e61f83..88648c3b 100644 --- a/altosdroid/res/layout/tab_pad.xml +++ b/altosdroid/res/layout/tab_pad.xml @@ -15,306 +15,481 @@ with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_weight="0" - android:orientation="vertical" > - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" > - - <ImageView - android:id="@+id/battery_redled" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@string/battery_voltage_label" - android:src="@drawable/grayled" /> - - <ImageView - android:id="@+id/battery_greenled" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/battery_redled" - android:contentDescription="@string/battery_voltage_label" - android:paddingRight="5dp" - android:src="@drawable/grayled" /> - - <TextView - android:id="@+id/battery_voltage_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/battery_greenled" - android:text="@string/battery_voltage_label" /> - - <TextView - android:id="@+id/battery_voltage_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/battery_voltage_label" - android:layout_toRightOf="@id/battery_greenled" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="5dp" > - - <ImageView - android:id="@+id/apogee_redled" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@string/apogee_voltage_label" - android:src="@drawable/grayled" /> - - <ImageView - android:id="@+id/apogee_greenled" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/apogee_redled" - android:contentDescription="@string/apogee_voltage_label" - android:paddingRight="5dp" - android:src="@drawable/grayled" /> - - <TextView - android:id="@+id/apogee_voltage_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/apogee_greenled" - android:text="@string/apogee_voltage_label" /> - - <TextView - android:id="@+id/apogee_voltage_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/apogee_voltage_label" - android:layout_toRightOf="@id/apogee_greenled" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="5dp" > - - <ImageView - android:id="@+id/main_redled" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@string/main_voltage_label" - android:src="@drawable/grayled" /> - - <ImageView - android:id="@+id/main_greenled" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/main_redled" - android:contentDescription="@string/main_voltage_label" - android:paddingRight="5dp" - android:src="@drawable/grayled" /> - - <TextView - android:id="@+id/main_voltage_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/main_greenled" - android:text="@string/main_voltage_label" /> - - <TextView - android:id="@+id/main_voltage_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/main_voltage_label" - android:layout_toRightOf="@id/main_greenled" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="5dp" > - - <ImageView - android:id="@+id/logging_redled" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@string/logging_label" - android:src="@drawable/grayled" /> - - <ImageView - android:id="@+id/logging_greenled" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/logging_redled" - android:contentDescription="@string/logging_label" - android:paddingRight="5dp" - android:src="@drawable/grayled" /> - - <TextView - android:id="@+id/logging_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/logging_greenled" - android:text="@string/logging_label" /> - - <TextView - android:id="@+id/logging_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/logging_label" - android:layout_toRightOf="@id/logging_greenled" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="5dp" > - - <ImageView - android:id="@+id/gps_locked_redled" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@string/gps_locked_label" - android:src="@drawable/grayled" /> - - <ImageView - android:id="@+id/gps_locked_greenled" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/gps_locked_redled" - android:contentDescription="@string/gps_locked_label" - android:paddingRight="5dp" - android:src="@drawable/grayled" /> - - <TextView - android:id="@+id/gps_locked_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/gps_locked_greenled" - android:text="@string/gps_locked_label" /> - - <TextView - android:id="@+id/gps_locked_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/gps_locked_label" - android:layout_toRightOf="@id/gps_locked_greenled" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="5dp" > - - <ImageView - android:id="@+id/gps_ready_redled" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@string/gps_ready_label" - android:src="@drawable/grayled" /> - - <ImageView - android:id="@+id/gps_ready_greenled" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/gps_ready_redled" - android:contentDescription="@string/gps_ready_label" - android:paddingRight="5dp" - android:src="@drawable/grayled" /> - - <TextView - android:id="@+id/gps_ready_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/gps_ready_greenled" - android:text="@string/gps_ready_label" /> - - <TextView - android:id="@+id/gps_ready_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/gps_ready_label" - android:layout_toRightOf="@id/gps_ready_greenled" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingLeft="69dp"> - - <TextView - android:id="@+id/pad_lat_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:width="100sp" - android:paddingRight="10sp" - android:layout_toRightOf="@id/gps_ready_greenled" - android:text="@string/pad_lat_label" /> - - <TextView - android:id="@+id/pad_lat_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/pad_lat_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingLeft="69dp"> - - <TextView - android:id="@+id/pad_lon_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:width="100sp" - android:paddingRight="10sp" - android:layout_toRightOf="@id/gps_ready_greenled" - android:text="@string/pad_lon_label" /> - - <TextView - android:id="@+id/pad_lon_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/pad_lon_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingLeft="69dp"> - - <TextView - android:id="@+id/pad_alt_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:width="100sp" - android:paddingRight="10sp" - android:layout_toRightOf="@id/gps_ready_greenled" - android:text="@string/pad_alt_label" /> - - <TextView - android:id="@+id/pad_alt_value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/pad_alt_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - -</LinearLayout>
\ No newline at end of file + +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <TableLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:stretchColumns="2,3" + android:layout_weight="0" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <TableRow + android:layout_gravity="center" + android:layout_weight="1" + android:padding="2dip" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <ImageView + android:id="@+id/battery_redled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/battery_voltage_label" + android:src="@drawable/grayled" + /> + + <ImageView + android:id="@+id/battery_greenled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/battery_voltage_label" + android:src="@drawable/grayled" /> + + <TextView + android:id="@+id/battery_voltage_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/battery_voltage_label" /> + + <TextView + android:id="@+id/battery_voltage_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" + /> + </TableRow> + + <TableRow + android:id="@+id/receiver_row" + android:visibility="gone" + android:layout_gravity="center" + android:layout_weight="1" + android:padding="2dip" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <ImageView + android:id="@+id/receiver_redled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/receiver_voltage_label" + android:src="@drawable/grayled" /> + + <ImageView + android:id="@+id/receiver_greenled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/receiver_voltage_label" + android:src="@drawable/grayled" /> + + <TextView + android:id="@+id/receiver_voltage_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/receiver_voltage_label" /> + + <TextView + android:id="@+id/receiver_voltage_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </TableRow> + + <TableRow + android:layout_gravity="center" + android:layout_weight="1" + android:padding="2dip" + android:layout_width="wrap_content" + android:layout_height="wrap_content" > + + <ImageView + android:id="@+id/logging_redled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/logging_label" + android:src="@drawable/grayled" /> + + <ImageView + android:id="@+id/logging_greenled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/logging_label" + android:src="@drawable/grayled" /> + + <TextView + android:id="@+id/logging_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/logging_label" /> + + <TextView + android:id="@+id/logging_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/logging_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </TableRow> + + <TableRow + android:layout_gravity="center" + android:layout_weight="1" + android:padding="2dip" + android:layout_width="wrap_content" + android:layout_height="wrap_content" > + + <ImageView + android:id="@+id/gps_locked_redled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/gps_locked_label" + android:src="@drawable/grayled" /> + + <ImageView + android:id="@+id/gps_locked_greenled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/gps_locked_label" + android:src="@drawable/grayled" /> + + <TextView + android:id="@+id/gps_locked_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/gps_locked_label" /> + + <TextView + android:id="@+id/gps_locked_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/gps_locked_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </TableRow> + + <TableRow + android:layout_gravity="center" + android:layout_weight="1" + android:padding="2dip" + android:layout_width="wrap_content" + android:layout_height="wrap_content" > + + <ImageView + android:id="@+id/gps_ready_redled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/gps_ready_label" + android:src="@drawable/grayled" /> + + <ImageView + android:id="@+id/gps_ready_greenled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/gps_ready_label" + android:src="@drawable/grayled" /> + + <TextView + android:id="@+id/gps_ready_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/gps_ready_label" /> + + <TextView + android:id="@+id/gps_ready_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/gps_ready_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </TableRow> + + <TableRow + android:id="@+id/apogee_row" + android:visibility="gone" + android:layout_gravity="center" + android:layout_weight="1" + android:padding="2dip" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <ImageView + android:id="@+id/apogee_redled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/apogee_voltage_label" + android:src="@drawable/grayled" /> + + <ImageView + android:id="@+id/apogee_greenled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/apogee_voltage_label" + android:src="@drawable/grayled" /> + + <TextView + android:id="@+id/apogee_voltage_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/apogee_voltage_label" /> + + <TextView + android:id="@+id/apogee_voltage_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </TableRow> + + <TableRow + android:id="@+id/main_row" + android:visibility="gone" + android:layout_gravity="center" + android:layout_weight="1" + android:padding="2dip" + android:layout_width="wrap_content" + android:layout_height="wrap_content" > + + <ImageView + android:id="@+id/main_redled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/main_voltage_label" + android:src="@drawable/grayled" /> + + <ImageView + android:id="@+id/main_greenled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/main_voltage_label" + android:src="@drawable/grayled" /> + + <TextView + android:id="@+id/main_voltage_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/main_voltage_label" /> + + <TextView + android:id="@+id/main_voltage_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </TableRow> + + <TableRow + android:id="@+id/ignite_a_row" + android:visibility="gone" + android:layout_gravity="center" + android:layout_weight="1" + android:padding="2dip" + android:layout_width="wrap_content" + android:layout_height="wrap_content" > + + <ImageView + android:id="@+id/ignite_a_redled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/ignite_a_voltage_label" + android:src="@drawable/grayled" /> + + <ImageView + android:id="@+id/ignite_a_greenled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/ignite_a_voltage_label" + android:src="@drawable/grayled" /> + + <TextView + android:id="@+id/ignite_a_voltage_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/ignite_a_voltage_label" /> + + <TextView + android:id="@+id/ignite_a_voltage_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </TableRow> + + <TableRow + android:id="@+id/ignite_b_row" + android:visibility="gone" + android:layout_gravity="center" + android:layout_weight="1" + android:padding="2dip" + android:layout_width="wrap_content" + android:layout_height="wrap_content" > + + <ImageView + android:id="@+id/ignite_b_redled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/ignite_b_voltage_label" + android:src="@drawable/grayled" /> + + <ImageView + android:id="@+id/ignite_b_greenled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/ignite_b_voltage_label" + android:src="@drawable/grayled" /> + + <TextView + android:id="@+id/ignite_b_voltage_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/ignite_b_voltage_label" /> + + <TextView + android:id="@+id/ignite_b_voltage_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </TableRow> + + <TableRow + android:id="@+id/ignite_c_row" + android:visibility="gone" + android:layout_gravity="center" + android:layout_weight="1" + android:padding="2dip" + android:layout_width="wrap_content" + android:layout_height="wrap_content" > + + <ImageView + android:id="@+id/ignite_c_redled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/ignite_c_voltage_label" + android:src="@drawable/grayled" /> + + <ImageView + android:id="@+id/ignite_c_greenled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/ignite_c_voltage_label" + android:src="@drawable/grayled" /> + + <TextView + android:id="@+id/ignite_c_voltage_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/ignite_c_voltage_label" /> + + <TextView + android:id="@+id/ignite_c_voltage_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </TableRow> + + <TableRow + android:id="@+id/ignite_d_row" + android:visibility="gone" + android:layout_gravity="center" + android:layout_weight="1" + android:padding="2dip" + android:layout_width="wrap_content" + android:layout_height="wrap_content" > + + <ImageView + android:id="@+id/ignite_d_redled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/ignite_d_voltage_label" + android:src="@drawable/grayled" /> + + <ImageView + android:id="@+id/ignite_d_greenled" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/ignite_d_voltage_label" + android:src="@drawable/grayled" /> + + <TextView + android:id="@+id/ignite_d_voltage_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/ignite_d_voltage_label" /> + + <TextView + android:id="@+id/ignite_d_voltage_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </TableRow> + + <TableRow + android:padding="2dip" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/receiver_lat_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_column="2" + android:text="@string/receiver_latitude_label" /> + + <TextView + android:id="@+id/receiver_lat_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </TableRow> + + <TableRow + android:padding="2dip" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/receiver_lon_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_column="2" + android:text="@string/receiver_longitude_label" /> + + <TextView + android:id="@+id/receiver_lon_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </TableRow> + + <TableRow + android:padding="2dip" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/receiver_alt_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_column="2" + android:text="@string/receiver_altitude_label" /> + + <TextView + android:id="@+id/receiver_alt_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </TableRow> + </TableLayout> +</LinearLayout> diff --git a/altosdroid/res/layout/tab_recover.xml b/altosdroid/res/layout/tab_recover.xml new file mode 100644 index 00000000..201f45ed --- /dev/null +++ b/altosdroid/res/layout/tab_recover.xml @@ -0,0 +1,251 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright © 2013 Mike Beattie <mike@ethernal.org> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. +--> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_weight="0" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <RelativeLayout + android:layout_gravity="fill" + android:layout_weight="1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" > + + <TextView + android:id="@+id/bearing_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/bearing_label" /> + + <TextView + android:id="@+id/bearing_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@+id/bearing_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </RelativeLayout> + + <RelativeLayout + android:layout_gravity="fill" + android:layout_weight="1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" > + + <TextView + android:id="@+id/direction_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/direction_label" /> + + <TextView + android:id="@+id/direction_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@+id/direction_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </RelativeLayout> + + <RelativeLayout + android:layout_gravity="fill" + android:layout_weight="1" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/distance_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/distance_label" /> + + <TextView + android:id="@+id/distance_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@+id/distance_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </RelativeLayout> + + <RelativeLayout + android:layout_gravity="fill" + android:layout_weight="1" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/target_lat_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + 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_alignParentRight="true" + android:layout_below="@id/target_lat_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </RelativeLayout> + + <RelativeLayout + android:layout_gravity="fill" + android:layout_weight="1" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/target_lon_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + 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_alignParentRight="true" + android:layout_below="@id/target_lon_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </RelativeLayout> + + <RelativeLayout + android:layout_gravity="fill" + android:layout_weight="1" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/receiver_lat_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + 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_alignParentRight="true" + android:layout_below="@id/receiver_lat_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </RelativeLayout> + + <RelativeLayout + android:layout_gravity="fill" + android:layout_weight="1" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/receiver_lon_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + 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_alignParentRight="true" + android:layout_below="@id/receiver_lon_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </RelativeLayout> + + <RelativeLayout + android:layout_gravity="fill" + android:layout_weight="1" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/max_height_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/max_height_label" /> + + <TextView + android:id="@+id/max_height_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@id/max_height_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </RelativeLayout> + + <RelativeLayout + android:layout_gravity="fill" + android:layout_weight="1" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/max_speed_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/max_speed_label" /> + + <TextView + android:id="@+id/max_speed_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@id/max_speed_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </RelativeLayout> + + <RelativeLayout + android:layout_gravity="fill" + android:layout_weight="1" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/max_accel_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/max_accel_label" /> + + <TextView + android:id="@+id/max_accel_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@id/max_accel_label" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </RelativeLayout> + </LinearLayout> +</LinearLayout> |