summaryrefslogtreecommitdiff
path: root/client/Piztor/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'client/Piztor/res/layout')
-rw-r--r--client/Piztor/res/layout/activity_main.xml61
-rw-r--r--client/Piztor/res/layout/activity_settings.xml2
2 files changed, 32 insertions, 31 deletions
diff --git a/client/Piztor/res/layout/activity_main.xml b/client/Piztor/res/layout/activity_main.xml
index a36f8b5..f72ac62 100644
--- a/client/Piztor/res/layout/activity_main.xml
+++ b/client/Piztor/res/layout/activity_main.xml
@@ -1,33 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@android:color/white"
- android:orientation="vertical">
- <RelativeLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:id="@+id/main_headbar_layout"
- >
- <include layout="@layout/main_headbar"/>
- </RelativeLayout>
-
- <LinearLayout
- android:id="@+id/main_footbar_layout"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- >
- <include layout="@layout/main_footbar"/>
- </LinearLayout>
+ xmlns:android1="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@android:color/white" >
- <ImageView
- android:id="@+id/main_mapview"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:layout_below="@+id/main_headbar_layout"
- android:layout_above="@+id/main_footbar_layout"
- android:scaleType="matrix"
- android:src="@drawable/data"/>
-</RelativeLayout> \ No newline at end of file
+ <RelativeLayout
+ android:id="@+id/main_headbar_layout"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true" >
+
+ <include layout="@layout/main_headbar" />
+ </RelativeLayout>
+
+ <LinearLayout
+ android:id="@+id/main_footbar_layout"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true" >
+
+ <include layout="@layout/main_footbar" />
+ </LinearLayout>
+
+ <com.baidu.mapapi.map.MapView
+ android:id="@+id/bmapView"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:layout_above="@+id/main_footbar_layout"
+ android:layout_below="@+id/main_headbar_layout"
+ android:clickable="true" />
+
+</RelativeLayout>
diff --git a/client/Piztor/res/layout/activity_settings.xml b/client/Piztor/res/layout/activity_settings.xml
index 05c849b..c386ae2 100644
--- a/client/Piztor/res/layout/activity_settings.xml
+++ b/client/Piztor/res/layout/activity_settings.xml
@@ -153,7 +153,7 @@
android:background="#ffc0c3c4" />
<Button
- android:id="@+id/button1"
+ android:id="@+id/settings_btn_logout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.00"