diff options
| author | campbeb <bpcampbell@gmail.com> | 2012-06-02 18:21:19 +0900 |
|---|---|---|
| committer | campbeb <bpcampbell@gmail.com> | 2012-06-08 18:13:36 +0900 |
| commit | bbc713d01b655870ffdd35941bdd0b3395e09210 (patch) | |
| tree | 76935eb9787d9a8d72bfe16f63c71f99e313dda8 /main/res/layout | |
| parent | 550eb54d1c76dd2788c43ae9b67d43e57b90bf26 (diff) | |
| download | cgeo-bbc713d01b655870ffdd35941bdd0b3395e09210.zip cgeo-bbc713d01b655870ffdd35941bdd0b3395e09210.tar.gz cgeo-bbc713d01b655870ffdd35941bdd0b3395e09210.tar.bz2 | |
Display cache and waypoint information on compass
For caches: displays difficulty, terrain, and size.
For waypoints: displays waypoint type.
For direct navigation: displays nothing.
Also includes some refactoring in the code used do display
information about caches and waypoints.
Diffstat (limited to 'main/res/layout')
| -rw-r--r-- | main/res/layout/navigate.xml | 71 |
1 files changed, 41 insertions, 30 deletions
diff --git a/main/res/layout/navigate.xml b/main/res/layout/navigate.xml index 8e98136..94ed7bc 100644 --- a/main/res/layout/navigate.xml +++ b/main/res/layout/navigate.xml @@ -17,36 +17,47 @@ <RelativeLayout android:layout_width="fill_parent" android:layout_height="fill_parent" > - <TextView android:id="@+id/destination" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_centerHorizontal="true" - android:layout_gravity="center" - android:textSize="14dip" - android:textColor="?text_color"/> - <TextView android:id="@+id/heading" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="16dip" - android:layout_marginLeft="3dip" - android:layout_alignParentTop="true" - android:layout_alignParentLeft="true" - android:layout_gravity="left" - android:textSize="26dip" - android:textColor="?text_color" - android:text="@null" /> - <TextView android:id="@+id/distance" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="16dip" - android:layout_marginRight="3dip" - android:layout_alignParentTop="true" - android:layout_alignParentRight="true" - android:layout_gravity="right" - android:textSize="26dip" - android:textColor="?text_color" - android:text="@null" /> + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + <TextView android:id="@+id/destination" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_gravity="center" + android:textSize="14dip" + android:textColor="?text_color"/> + <TextView android:id="@+id/cacheinfo" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_gravity="center" + android:textSize="14dip" + android:textColor="?text_color"/> + <RelativeLayout + android:layout_width="fill_parent" + android:layout_height="30dip" > + <TextView android:id="@+id/heading" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="3dip" + android:layout_alignParentLeft="true" + android:layout_gravity="left" + android:textSize="26dip" + android:textColor="?text_color" + android:text="@null" /> + <TextView android:id="@+id/distance" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginRight="3dip" + android:layout_alignParentRight="true" + android:layout_gravity="right" + android:textSize="26dip" + android:textColor="?text_color" + android:text="@null" /> + </RelativeLayout> + </LinearLayout> <view class="cgeo.geocaching.ui.CompassView" android:id="@+id/rose" android:layout_width="fill_parent" |