altosdroid: Add text size selection

[fw/altos] / altosdroid / app / src / main / res / layout / tab_flight.xml

diff --git a/altosdroid/app/src/main/res/layout/tab_flight.xml b/altosdroid/app/src/main/res/layout/tab_flight.xml
index 36d277d7cc962ebb79617bdbe1581b863d3e0e28..545bf047ed18f348138f503a91e67d082b534245 100644 (file)
--- a/altosdroid/app/src/main/res/layout/tab_flight.xml
+++ b/altosdroid/app/src/main/res/layout/tab_flight.xml
@@ -22,382 +22,339 @@
     android:layout_height="wrap_content"
     android:orientation="vertical" >
 
-  <LinearLayout
+  <TableLayout
+      xmlns:android="http://schemas.android.com/apk/res/android"
+      android:stretchColumns="2,3"
       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>
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content">
 
-    <RelativeLayout
-       android:layout_width="wrap_content"
-       android:layout_height="wrap_content"
-       android:paddingTop="5dp" >
-
-      <TextView
-         android:id="@+id/lat_label"
+      <TableRow
+         android:layout_gravity="center"
+         android:layout_weight="1"
+         android:padding="2dip"
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
-         android:text="@string/latitude_label" />
-
-      <TextView
-         android:id="@+id/lat_value"
+         >
+
+         <TextView
+             android:id="@+id/speed_label"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:layout_column="2"
+             android:text="@string/speed_label" />
+
+         <TextView
+             android:id="@+id/speed_value"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:text=""
+             android:textAppearance="?android:attr/textAppearanceSmall" />
+      </TableRow>
+
+      <TableRow
+         android:layout_weight="1"
+         android:padding="2dip"
          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"
+         >
+
+         <TextView
+             android:id="@+id/height_label"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:layout_column="2"
+             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: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"
-         android:text="@string/longitude_label" />
-
-      <TextView
-         android:id="@+id/lon_value"
+         >
+
+         <TextView
+             android:id="@+id/max_speed_label"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:layout_column="2"
+             android:text="@string/max_speed_label" />
+
+         <TextView
+             android:id="@+id/max_speed_value"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:text="" />
+      </TableRow>
+
+      <TableRow
+         android:layout_gravity="center"
+         android:layout_weight="1"
+         android:padding="2dip"
          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"
+         >
+
+         <TextView
+             android:id="@+id/max_height_label"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:layout_column="2"
+             android:text="@string/max_height_label" />
+
+         <TextView
+             android:id="@+id/max_height_value"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:text="" />
+      </TableRow>
+
+      <TableRow
+         android:layout_weight="1"
+         android:padding="2dip"
          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"
+         >
+
+         <TextView
+             android:id="@+id/elevation_label"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:layout_column="2"
+             android:text="@string/elevation_label" />
+
+         <TextView
+             android:id="@+id/elevation_value"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:text="" />
+      </TableRow>
+
+      <TableRow
+         android:layout_weight="1"
+         android:padding="2dip"
          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"
+         >
+
+         <TextView
+             android:id="@+id/range_label"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:layout_column="2"
+             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:text=""
+             android:textAppearance="?android:attr/textAppearanceSmall" />
+      </TableRow>
+
+      <TableRow
+         android:layout_weight="1"
+         android:padding="2dip"
          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"
+         >
+
+         <TextView
+             android:id="@+id/bearing_label"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:layout_column="2"
+             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:text=""
+             android:textAppearance="?android:attr/textAppearanceSmall" />
+      </TableRow>
+
+      <TableRow
+         android:layout_weight="1"
+         android:padding="2dip"
          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"
+         >
+
+         <TextView
+             android:id="@+id/compass_value"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:layout_alignParentRight="true"
+             android:layout_column="3"
+             android:text=""
+             android:textAppearance="?android:attr/textAppearanceSmall" />
+      </TableRow>
+
+      <TableRow
+         android:layout_weight="1"
+         android:padding="2dip"
          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"
+         >
+
+         <TextView
+             android:id="@+id/distance_label"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:layout_column="2"
+             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:text=""
+             android:textAppearance="?android:attr/textAppearanceSmall" />
+      </TableRow>
+
+
+      <TableRow
+         android:layout_weight="1"
+         android:padding="2dip"
          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"
+         >
+
+         <TextView
+             android:id="@+id/lat_label"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:layout_column="2"
+             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:text=""
+             android:textAppearance="?android:attr/textAppearanceSmall" />
+      </TableRow>
+
+      <TableRow
+         android:layout_weight="1"
+         android:padding="2dip"
          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"
+         >
+
+         <TextView
+             android:id="@+id/lon_label"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:layout_column="2"
+             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:text=""
+             android:textAppearance="?android:attr/textAppearanceSmall" />
+      </TableRow>
+
+      <TableRow
+         android:id="@+id/apogee_view"
+         android:visibility="gone"
+         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="match_parent"
+             android:layout_height="match_parent"
+             android:scaleType="centerInside"
+             android:contentDescription="@string/apogee_voltage_label"
+             android:src="@drawable/grayled" />
+
+         <ImageView
+             android:id="@+id/apogee_greenled"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:scaleType="centerInside"
+             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: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" />
+      </TableRow>
+
+      <TableRow
+         android:id="@+id/main_view"
+         android:visibility="gone"
+         android:layout_weight="1"
+         android:padding="2dip"
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
-         android:layout_alignParentRight="true"
-         android:text=""
-         android:textAppearance="?android:attr/textAppearanceSmall" />
-    </RelativeLayout>
-  </LinearLayout>
+         >
+
+         <ImageView
+             android:id="@+id/main_redled"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:scaleType="centerInside"
+             android:paddingRight="5dp"
+             android:contentDescription="@string/main_voltage_label"
+             android:src="@drawable/grayled" />
+
+         <ImageView
+             android:id="@+id/main_greenled"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:scaleType="centerInside"
+             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" />
+      </TableRow>
+  </TableLayout>
 </LinearLayout>