<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!--
+ Copyright © 2012-2013 Mike Beattie <mike@ethernal.org>
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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.
- http://www.apache.org/licenses/LICENSE-2.0
+ 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.
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ 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.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
</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_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"
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>
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
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
android:textAppearance="?android:attr/textAppearanceLarge" />
</RelativeLayout>
+
+
+ <RelativeLayout
+ android:id="@+id/text_container"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:layout_below="@id/longitude_container" >
+
+ <TextView
+ android:id="@+id/text"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:layout_above="@+id/version"
+ android:scrollbars="vertical"
+ android:textSize="7dp"
+ android:typeface="monospace" />
- <TextView
- android:id="@+id/text"
- android:layout_width="fill_parent"
- android:layout_height="0dip"
- android:layout_alignParentBottom="true"
- android:layout_below="@id/longitude_container"
- android:gravity="bottom"
- android:scrollbars="vertical"
- android:textSize="7dp"
- android:typeface="monospace" />
+ <TextView
+ android:id="@+id/version"
+ android:layout_width="fill_parent"
+ android:layout_height="10dip"
+ android:layout_alignParentBottom="true"
+ android:gravity="bottom|right"
+ android:textSize="7dp"
+ android:typeface="monospace" />
+
+ </RelativeLayout>
</RelativeLayout>
projects / fw / altos / blobdiff