diff options
| -rw-r--r-- | altosdroid/res/layout/altosdroid.xml | 80 | ||||
| -rw-r--r-- | altosdroid/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java | 9 |
3 files changed, 85 insertions, 7 deletions
diff --git a/altosdroid/res/layout/altosdroid.xml b/altosdroid/res/layout/altosdroid.xml index 56a910ec..f185ea9f 100644 --- a/altosdroid/res/layout/altosdroid.xml +++ b/altosdroid/res/layout/altosdroid.xml @@ -51,11 +51,77 @@ </RelativeLayout> <RelativeLayout - android:id="@+id/state_container" + android:id="@+id/rssi_container" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" android:layout_toRightOf="@id/strut" + android:layout_alignParentRight="true" > + + <TextView + android:id="@+id/rssi_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/rssi_label" /> + + <TextView + android:id="@+id/rssi_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@+id/rssi_label" + android:textAppearance="?android:attr/textAppearanceLarge" /> + </RelativeLayout> + + <RelativeLayout + android:id="@+id/serial_container" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@+id/callsign_container" + android:layout_toLeftOf="@+id/strut" > + + <TextView + android:id="@+id/serial_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/serial_label" /> + + <TextView + android:id="@+id/serial_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@+id/serial_label" + android:textAppearance="?android:attr/textAppearanceLarge" /> + </RelativeLayout> + + <RelativeLayout + android:id="@+id/flight_container" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@+id/callsign_container" + android:layout_toRightOf="@+id/strut" + android:layout_alignParentRight="true" > + + <TextView + android:id="@+id/flight_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/flight_label" /> + + <TextView + android:id="@+id/flight_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@+id/flight_label" + android:textAppearance="?android:attr/textAppearanceLarge" /> + </RelativeLayout> + + <RelativeLayout + android:id="@+id/state_container" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_below="@+id/serial_container" > <TextView android:id="@+id/state_label" @@ -67,10 +133,10 @@ android:id="@+id/state_value" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" android:layout_below="@+id/state_label" - android:text="" - android:textAppearance="?android:attr/textAppearanceLarge" /> + android:layout_centerInParent="true" + android:textAppearance="?android:attr/textAppearanceLarge" + android:textSize="50dip" /> </RelativeLayout> @@ -79,7 +145,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" - android:layout_below="@+id/callsign_container" + android:layout_below="@+id/state_container" android:layout_toLeftOf="@+id/strut" > <TextView @@ -154,7 +220,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" - android:layout_below="@id/accel_container" + android:layout_below="@id/speed_container" android:layout_toRightOf="@id/strut" > <TextView diff --git a/altosdroid/res/values/strings.xml b/altosdroid/res/values/strings.xml index 1bef6ec8..f8038406 100644 --- a/altosdroid/res/values/strings.xml +++ b/altosdroid/res/values/strings.xml @@ -43,6 +43,9 @@ <!-- UI fields --> <string name="callsign_label">Callsign</string> + <string name="serial_label">Serial no.</string> + <string name="flight_label">Flight no.</string> + <string name="rssi_label">RSSI</string> <string name="state_label">State</string> <string name="speed_label">Speed</string> <string name="accel_label">Acceleration</string> diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index 5736a4c7..7d6a8044 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -66,6 +66,9 @@ public class AltosDroid extends Activity { // Flight state values private TextView mCallsignView; + private TextView mRSSIView; + private TextView mSerialView; + private TextView mFlightView; private TextView mStateView; private TextView mSpeedView; private TextView mAccelView; @@ -179,6 +182,9 @@ public class AltosDroid extends Activity { void update_ui(AltosState state) { mCallsignView.setText(state.data.callsign); + mRSSIView.setText(String.format("%d", state.data.rssi)); + mSerialView.setText(String.format("%d", state.data.serial)); + mFlightView.setText(String.format("%d", state.data.flight)); mStateView.setText(state.data.state()); double speed = state.speed; if (!state.ascent) @@ -228,6 +234,9 @@ public class AltosDroid extends Activity { mTextView.setLongClickable(false); mCallsignView = (TextView) findViewById(R.id.callsign_value); + mRSSIView = (TextView) findViewById(R.id.rssi_value); + mSerialView = (TextView) findViewById(R.id.serial_value); + mFlightView = (TextView) findViewById(R.id.flight_value); mStateView = (TextView) findViewById(R.id.state_value); mSpeedView = (TextView) findViewById(R.id.speed_value); mAccelView = (TextView) findViewById(R.id.accel_value); |