From 772b15425317d1da231c9925839320721cdb1269 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 12 Jul 2021 10:03:24 -0700
Subject: [PATCH] altosdroid: Show altitude as well as height

TeleGPS is more useful with altitude

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 .../org/altusmetrum/AltosDroid/TabFlight.java |  6 +++
 .../app/src/main/res/layout/tab_flight.xml    | 45 +++++++++++++++++++
 .../app/src/main/res/values/strings.xml       |  2 +
 3 files changed, 53 insertions(+)

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabFlight.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabFlight.java
index ba45c47e..8230757c 100644
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabFlight.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabFlight.java
@@ -28,8 +28,10 @@ import android.location.Location;
 public class TabFlight extends AltosDroidTab {
 	private TextView speed_view;
 	private TextView height_view;
+	private TextView altitude_view;
 	private TextView max_speed_view;
 	private TextView max_height_view;
+	private TextView max_altitude_view;
 	private TextView elevation_view;
 	private TextView range_view;
 	private TextView bearing_view;
@@ -52,8 +54,10 @@ public class TabFlight extends AltosDroidTab {
 
 		speed_view     = (TextView) v.findViewById(R.id.speed_value);
 		height_view    = (TextView) v.findViewById(R.id.height_value);
+		altitude_view    = (TextView) v.findViewById(R.id.altitude_value);
 		max_speed_view = (TextView) v.findViewById(R.id.max_speed_value);
 		max_height_view= (TextView) v.findViewById(R.id.max_height_value);
+		max_altitude_view= (TextView) v.findViewById(R.id.max_altitude_value);
 		elevation_view = (TextView) v.findViewById(R.id.elevation_value);
 		range_view     = (TextView) v.findViewById(R.id.range_value);
 		bearing_view   = (TextView) v.findViewById(R.id.bearing_value);
@@ -85,8 +89,10 @@ public class TabFlight extends AltosDroidTab {
 		if (state != null) {
 			set_value(speed_view, AltosConvert.speed, 1, state.speed());
 			set_value(height_view, AltosConvert.height, 1, state.height());
+			set_value(altitude_view, AltosConvert.height, 1, state.altitude());
 			set_value(max_speed_view, AltosConvert.speed, 1, state.max_speed());
 			set_value(max_height_view, AltosConvert.height, 1, state.max_height());
+			set_value(max_altitude_view, AltosConvert.height, 1, state.max_altitude());
 			if (from_receiver != null) {
 				elevation_view.setText(AltosDroid.number("%1.0f°", from_receiver.elevation));
 				set_value(range_view, AltosConvert.distance, 1, from_receiver.range);
diff --git a/altosdroid/app/src/main/res/layout/tab_flight.xml b/altosdroid/app/src/main/res/layout/tab_flight.xml
index 545bf047..db655270 100644
--- a/altosdroid/app/src/main/res/layout/tab_flight.xml
+++ b/altosdroid/app/src/main/res/layout/tab_flight.xml
@@ -75,6 +75,29 @@
 	      android:textAppearance="?android:attr/textAppearanceSmall" />
       </TableRow>
 
+      <TableRow
+	  android:layout_weight="1"
+	  android:padding="2dip"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  >
+
+	  <TextView
+	      android:id="@+id/altitude_label"
+	      android:layout_width="wrap_content"
+	      android:layout_height="wrap_content"
+	      android:layout_column="2"
+	      android:text="@string/altitude_label" />
+
+	  <TextView
+	      android:id="@+id/altitude_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"
@@ -119,6 +142,28 @@
 	      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"
+	  >
+
+	  <TextView
+	      android:id="@+id/max_altitude_label"
+	      android:layout_width="wrap_content"
+	      android:layout_height="wrap_content"
+	      android:layout_column="2"
+	      android:text="@string/max_altitude_label" />
+
+	  <TextView
+	      android:id="@+id/max_altitude_value"
+	      android:layout_width="wrap_content"
+	      android:layout_height="wrap_content"
+	      android:text="" />
+      </TableRow>
+
       <TableRow
 	  android:layout_weight="1"
 	  android:padding="2dip"
diff --git a/altosdroid/app/src/main/res/values/strings.xml b/altosdroid/app/src/main/res/values/strings.xml
index 12b6d04f..86267fd9 100644
--- a/altosdroid/app/src/main/res/values/strings.xml
+++ b/altosdroid/app/src/main/res/values/strings.xml
@@ -71,6 +71,7 @@
 
 	<!-- Tab fields -->
 	<string name="height_label">Height</string>
+	<string name="altitude_label">Altitude</string>
 	<string name="speed_label">Speed</string>
 	<string name="accel_label">Acceleration</string>
 	<string name="bearing_label">Bearing</string>
@@ -80,6 +81,7 @@
 	<string name="distance_label">Distance</string>
 	<string name="gnd_distance_label">Ground Distance</string>
 	<string name="max_height_label">Max Height</string>
+	<string name="max_altitude_label">Max Altitude</string>
 	<string name="max_speed_label">Max Speed</string>
 	<string name="max_accel_label">Max Accel</string>
 	<string name="battery_voltage_label">Battery</string>
-- 
2.30.2