Cleaned up UI xml
and fixed some lint issues Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
This commit is contained in:
@@ -1,50 +1,27 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/distance_background"
|
||||
android:stretchColumns="0" >
|
||||
android:background="@drawable/distance_background" >
|
||||
|
||||
<!-- distance display -->
|
||||
<TextView
|
||||
android:layout_width="0px"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="2"
|
||||
android:gravity="left"
|
||||
android:text="@string/distance"
|
||||
android:textColor="#000000"
|
||||
android:textSize="22sp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TableRow android:layout_marginBottom="2dip" >
|
||||
<TextView
|
||||
android:id="@+id/tvDistance"
|
||||
android:layout_width="0px"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="3dip"
|
||||
android:layout_weight="1"
|
||||
android:gravity="right"
|
||||
android:textColor="#000000"
|
||||
android:textSize="26sp" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvDistance"
|
||||
android:layout_column="0"
|
||||
android:gravity="left"
|
||||
android:text="@string/distance"
|
||||
android:textColor="#000000"
|
||||
android:textSize="22sp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvDistance2"
|
||||
android:layout_column="1"
|
||||
android:layout_marginRight="3dip"
|
||||
android:gravity="right"
|
||||
android:text="0"
|
||||
android:textColor="#000000"
|
||||
android:textSize="26sp" />
|
||||
</TableRow>
|
||||
|
||||
<!-- accuracy display -->
|
||||
<!-- <TableRow android:background="#505050"> -->
|
||||
<!-- <TextView android:layout_column="0" -->
|
||||
<!-- android:id="@+id/tvAccuracy" -->
|
||||
<!-- android:text="@string/gps_accuracy" -->
|
||||
<!-- android:enabled="false" -->
|
||||
<!-- android:textSize="22sp" -->
|
||||
<!-- android:gravity="left" -->
|
||||
<!-- android:textColor="#FFFFFF" -->
|
||||
<!-- android:textStyle="bold"/> -->
|
||||
<!-- <TextView android:layout_column="1" -->
|
||||
<!-- android:id="@+id/tvAccuracy2" -->
|
||||
<!-- android:gravity="right" -->
|
||||
<!-- android:text="0" -->
|
||||
<!-- android:enabled="false" -->
|
||||
<!-- android:textColor="#FFFFFF" -->
|
||||
<!-- android:textSize="26sp"/> -->
|
||||
<!-- </TableRow> -->
|
||||
|
||||
</TableLayout>
|
||||
</LinearLayout>
|
||||
@@ -1,39 +1,31 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:background="#505050"
|
||||
android:orientation="vertical" >
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" >
|
||||
|
||||
<include
|
||||
android:id="@+id/table"
|
||||
android:id="@+id/distancebar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentTop="true"
|
||||
layout="@layout/distancebar" />
|
||||
layout="@layout/distancebar" >
|
||||
</include>
|
||||
|
||||
<fragment
|
||||
android:id="@+id/map_fragment"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_above="@+id/buttons"
|
||||
android:layout_below="@id/distancebar"
|
||||
class="com.TwentyCodes.android.fragments.SkyHoookUserOverlayMapFragment" >
|
||||
|
||||
<!-- Preview: layout=@layout/map_fragment -->
|
||||
</fragment>
|
||||
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@id/map_fragment"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_below="@id/table" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAccuracy2"
|
||||
android:id="@+id/tvAccuracy"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_below="@id/table"
|
||||
android:layout_below="@id/distancebar"
|
||||
android:layout_marginRight="10dip"
|
||||
android:layout_marginTop="10dip"
|
||||
android:enabled="false"
|
||||
@@ -42,7 +34,7 @@
|
||||
android:textStyle="bold" />
|
||||
|
||||
<include
|
||||
android:id="@+id/buttons"
|
||||
android:id="@id/buttons"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentBottom="true"
|
||||
|
||||
@@ -5,49 +5,89 @@
|
||||
android:background="@drawable/distance_background"
|
||||
android:orientation="horizontal" >
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/my_location"
|
||||
<RelativeLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginBottom="10dip"
|
||||
android:layout_marginTop="10dip"
|
||||
android:layout_weight="1"
|
||||
android:contentDescription="@string/my_location"
|
||||
android:src="@drawable/my_location_action_bar" />
|
||||
android:orientation="vertical" >
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/mark_my_location"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_weight="1"
|
||||
android:contentDescription="@string/mark_car"
|
||||
android:src="@drawable/mark_my_location_action_bar" />
|
||||
<ImageButton
|
||||
android:id="@+id/my_location"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerInParent="true"
|
||||
android:background="@drawable/my_location_action_bar"
|
||||
android:contentDescription="@string/my_location" />
|
||||
</RelativeLayout>
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/show_both"
|
||||
<RelativeLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginBottom="10dip"
|
||||
android:layout_marginTop="10dip"
|
||||
android:layout_weight="1"
|
||||
android:contentDescription="@string/show_both"
|
||||
android:src="@drawable/car_action_bar" />
|
||||
android:orientation="vertical" >
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/parking_timer"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_weight="1"
|
||||
android:contentDescription="@string/parking_timer"
|
||||
android:src="@drawable/time_action_bar" />
|
||||
<ImageButton
|
||||
android:id="@+id/mark_my_location"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerInParent="true"
|
||||
android:background="@drawable/mark_my_location_action_bar"
|
||||
android:contentDescription="@string/mark_car" />
|
||||
</RelativeLayout>
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/directions"
|
||||
<RelativeLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginBottom="10dip"
|
||||
android:layout_marginTop="10dip"
|
||||
android:layout_weight="1"
|
||||
android:contentDescription="@string/directions"
|
||||
android:src="@drawable/nav_action_bar" />
|
||||
android:orientation="vertical" >
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/show_both"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerInParent="true"
|
||||
android:layout_gravity="center"
|
||||
android:background="@drawable/car_action_bar" />
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginBottom="10dip"
|
||||
android:layout_marginTop="10dip"
|
||||
android:layout_weight="1"
|
||||
android:orientation="vertical" >
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/parking_timer"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerInParent="true"
|
||||
android:background="@drawable/time_action_bar"
|
||||
android:contentDescription="@string/parking_timer" />
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginBottom="10dip"
|
||||
android:layout_marginTop="10dip"
|
||||
android:layout_weight="1"
|
||||
android:orientation="vertical" >
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/directions"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerInParent="true"
|
||||
android:background="@drawable/nav_action_bar"
|
||||
android:contentDescription="@string/directions" />
|
||||
</RelativeLayout>
|
||||
|
||||
</LinearLayout>
|
||||
Reference in New Issue
Block a user