Merge branch 'master' of github.com:Determinant/piztor

6 files changed, 280 insertions, 203 deletions

diff --git a/client/Piztor/res/layout/activity_gather.xml b/client/Piztor/res/layout/activity_gather.xml
index f887cf0..9bc7ea4 100644
--- a/client/Piztor/res/layout/activity_gather.xml
+++ b/client/Piztor/res/layout/activity_gather.xml
@@ -20,4 +20,12 @@
 		>
 		<include layout="@layout/gather_footbar"></include>
 	</LinearLayout>
+	<ImageView 
+	   	    android:id="@+id/activity_mapview"
+	   	    android:layout_width="fill_parent"
+	   	    android:layout_height="fill_parent"
+	   	    android:layout_below="@+id/gather_timer_layout"
+	   	    android:layout_above="@+id/gather_footbar_layout"
+	   	    android:scaleType="matrix"
+	   	    android:src="@drawable/data"/>
 </RelativeLayout>
diff --git a/client/Piztor/res/layout/activity_init.xml b/client/Piztor/res/layout/activity_init.xml
index 43e6253..aa9cf66 100644
--- a/client/Piztor/res/layout/activity_init.xml
+++ b/client/Piztor/res/layout/activity_init.xml
@@ -1,16 +1,16 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".InitAct" >
+	android:orientation="vertical" 
+	android:id="@+id/init_layout"
+    android:background="@android:color/black">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/hello_world" />
+    <ImageView
+        android:id="@+id/init_img"
+        android:layout_width="180dip"
+        android:layout_height="400dip"
+        android:src="@drawable/title_logo"
+        android:layout_gravity="center" />
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/client/Piztor/res/layout/activity_login.xml b/client/Piztor/res/layout/activity_login.xml
index cd2d34c..b1f2f5b 100644
--- a/client/Piztor/res/layout/activity_login.xml
+++ b/client/Piztor/res/layout/activity_login.xml
@@ -1,11 +1,13 @@
-<?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="fill_parent"
-	android:background="@android:color/black"
-	android:orientation="vertical">
-	
-<LinearLayout
+<RelativeLayout 
+    android:orientation="vertical" 
+    android:id="@+id/login_layout"
+    android:background="@android:color/black" 
+    android:layout_width="fill_parent" 
+    android:layout_height="fill_parent"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    
+    <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@android:color/black"
@@ -18,75 +20,62 @@
         android:layout_height="240dp"
         android:layout_gravity="center_horizontal"
         android:src="@drawable/title_logo" />
+    </LinearLayout>
 
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
+    <LinearLayout 
         android:orientation="vertical" 
-        android:layout_gravity="center">
-
-        <TableLayout 
-            android:layout_width="match_parent" 
-            android:layout_height="wrap_content">
-
-            <TableRow 
-                android:layout_marginBottom="15dp"
-                android:layout_marginTop="15dp">
-                <TextView 
-                    android:layout_width="0dp" 
-                    android:layout_height="wrap_content" 
-                    android:layout_weight="0.25"
-                    android:gravity="right" 
-                    android:id="@+id/user_id_text" 
-                    android:text="User ID" 
-                    android:textColor="@android:color/white"
-                     />
-
-                <EditText  
-                    android:layout_width="0dp"
-                                android:layout_weight="0.75"
-                    android:id="@+id/user_id"
-                    android:textColor="@android:color/black"
-                    android:singleLine="true"/>
-                    <requestFocus/>
-            </TableRow>
-
-            <TableRow>
-                <TextView 
-                    android:layout_width="0dp" 
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.25" 
-                    android:gravity="right" 
-                    android:id="@+id/user_pass_text" 
-                    android:text="Password" 
-                    android:textColor="@android:color/black"
-                />
-
-                <EditText  
-                    android:layout_width="0dp" 
-                    android:layout_weight="0.75"
-                    android:id="@+id/user_pass"           
-                    android:password="true"
-                    android:textColor="@android:color/black"
-                    android:singleLine="true"/>
-             </TableRow>     
-        </TableLayout>
-    </LinearLayout>
-	
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:orientation="vertical"
-        >
-    <Button
-        android:id="@+id/login_btn_login"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:text="Login"
-        android:textColor="@android:color/white" />
+        android:id="@+id/user_layout" 
+        android:layout_width="fill_parent" 
+        android:layout_height="wrap_content" 
+        android:layout_marginTop="220.0dip" 
+        android:layout_marginLeft="28.0dip" 
+        android:layout_marginRight="28.0dip">
+        <EditText 
+            android:textSize="16.0sp" 
+            android:textColor="@android:color/white"
+            android:textColorHint="#ff666666" 
+            android:id="@+id/user_id" 
+            android:background="#00ffffff" 
+            android:paddingLeft="12.0dip" 
+            android:layout_width="fill_parent" 
+            android:layout_height="44.0dip" 
+            android:hint="account" android:maxLines="1" 
+            android:maxLength="16"/>
+        <View 
+            android:background="#ffc0c3c4" 
+            android:layout_width="fill_parent" 
+            android:layout_height="1.0px" 
+            android:layout_marginLeft="1.0px" 
+            android:layout_marginRight="1.0px" />
+        <EditText 
+            android:textSize="16.0sp" 
+            android:textColor="@android:color/white" 
+            android:textColorHint="#ff666666" 
+            android:gravity="center_vertical" 
+            android:id="@+id/user_pass" 
+            android:background="#00ffffff" 
+            android:paddingLeft="12.0dip" 
+            android:layout_width="fill_parent" 
+            android:layout_height="44.0dip" 
+            android:hint="password" 
+            android:maxLines="1" 
+            android:maxLength="16" 
+            android:inputType="textPassword" />
     </LinearLayout>
+    
 
-</LinearLayout>
-</RelativeLayout>
+    <Button 
+        android:textSize="18.0sp" 
+        android:textColor="#ff333333" 
+        android:gravity="center" 
+        android:id="@+id/login_btn_login"
+        android:paddingTop="5.0dip" 
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" 
+        android:layout_marginLeft="28.0dip" 
+        android:layout_marginTop="12.0dip" 
+        android:layout_marginRight="28.0dip" 
+        android:text="login"    
+        android:layout_below="@id/user_layout" />
+    
+</RelativeLayout>
\ No newline at end of file
diff --git a/client/Piztor/res/layout/activity_main.xml b/client/Piztor/res/layout/activity_main.xml
index b2b61ac..a36f8b5 100644
--- a/client/Piztor/res/layout/activity_main.xml
+++ b/client/Piztor/res/layout/activity_main.xml
@@ -12,6 +12,7 @@
 		>
 		<include layout="@layout/main_headbar"/>
 	</RelativeLayout>
+	
 	<LinearLayout
 		android:id="@+id/main_footbar_layout" 
 		android:layout_width="wrap_content"
@@ -20,4 +21,13 @@
 		>
 		<include layout="@layout/main_footbar"/>
 	</LinearLayout>
-</RelativeLayout>
+
+	<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
diff --git a/client/Piztor/res/layout/activity_settings.xml b/client/Piztor/res/layout/activity_settings.xml
index 8ce051f..05c849b 100644
--- a/client/Piztor/res/layout/activity_settings.xml
+++ b/client/Piztor/res/layout/activity_settings.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:background="@drawable/topbar_background"
+	android:background="@android:color/black"
 	android:orientation="horizontal" >
 
 	<RelativeLayout
@@ -15,33 +15,34 @@
 	</RelativeLayout>
 
 	<LinearLayout
-		android:layout_width="fill_parent"
-		android:layout_height="match_parent"
-		android:layout_marginTop="48dip"
-		android:orientation="vertical" >
-
-		<TextView
-			android:id="@+id/settings_GPSrefreshrate_text"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="GPS refresh rate"
-			android:layout_gravity="center"
-			android:layout_marginTop="10dip"
-			android:textSize="20dip"
-			android:textColor="@android:color/white" />
-
-		<SeekBar
-			android:id="@+id/settings_GPSrefreshrate"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content" />
-
-
-		<!-- LinearLayout
+	    android:layout_width="fill_parent"
+	    android:layout_height="match_parent"
+	    android:layout_marginTop="48dip"
+	    android:orientation="vertical" >
+
+	    <TextView
+	        android:id="@+id/settings_GPSrefreshrate_text"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:layout_gravity="center"
+	        android:layout_marginTop="10dip"
+	        android:text="GPS refresh rate"
+	        android:textColor="@android:color/white"
+	        android:textSize="20dip" />
+
+	    <SeekBar
+	        android:id="@+id/settings_GPSrefreshrate"
+	        android:layout_width="match_parent"
+	        android:layout_height="wrap_content" />
+
+	    <!--
+             LinearLayout
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
 			android:orientation="horizontal"
-			-->
-			<!-- TextView 
+	    -->
+	    <!--
+                 TextView 
 				android:id="@+id/GPS_min_text"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
@@ -49,101 +50,116 @@
 				android:layout_marginLeft="10dip"
 				android:text="1s"
 				android:textSize="10dip"
-				android:textColor="@android:color/white"/-->
+				android:textColor="@android:color/white"/
+	    -->
 
-			<!--TextView
+
+	    <!--
+            TextView
 			android:id="@+id/GPS_max_text"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_alignParentRight="true"
 			android:text="30s"
 			android:textColor="@android:color/white"
-			android:textSize="10dip" /-->
-
-			<!-- /LinearLayout --> <!-- end of gps text -->
-
-		<ImageView
-		    android:id="@+id/settings_seperator1"
-		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-		    android:src="@drawable/horizontal_line" />
+			android:textSize="10dip" /
+	    -->
+
+
+	    <!-- /LinearLayout -->
+	    <!-- end of gps text -->
+
+	    <View
+	        android:layout_width="fill_parent"
+	        android:layout_height="1.0px"
+	        android:layout_marginLeft="1.0px"
+	        android:layout_marginRight="1.0px"
+	        android:background="#ffc0c3c4" />
+
+	    <LinearLayout
+	        android:id="@+id/settings_sex_layout"
+	        android:layout_width="match_parent"
+	        android:layout_height="wrap_content"
+	        android:layout_marginTop="10dip" >
+
+	        <TextView
+	            android:id="@+id/settings_sex_text"
+	            android:layout_width="wrap_content"
+	            android:layout_height="wrap_content"
+	            android:layout_marginLeft="10dip"
+	            android:text="@string/show_sex"
+	            android:textColor="@android:color/white"
+	            android:textSize="20dip" />
+
+	        <CheckBox
+	            android:id="@+id/settings_show_male"
+	            android:layout_width="wrap_content"
+	            android:layout_height="wrap_content"
+	            android:text="@string/male"
+	            android:textColor="@android:color/white" />
+
+	        <CheckBox
+	            android:id="@+id/settings_show_female"
+	            android:layout_width="wrap_content"
+	            android:layout_height="wrap_content"
+	            android:text="@string/female"
+	            android:textColor="@android:color/white" />
+	    </LinearLayout>
+
+	    <View
+	        android:layout_width="fill_parent"
+	        android:layout_height="1.0px"
+	        android:layout_marginLeft="1.0px"
+	        android:layout_marginRight="1.0px"
+	        android:background="#ffc0c3c4" />
+
+	    <LinearLayout
+	        android:id="@+id/settings_team_layout"
+	        android:layout_width="match_parent"
+	        android:layout_height="wrap_content"
+	        android:layout_marginTop="10dip" >
+
+	        <TextView
+	            android:id="@+id/settings_team_text"
+	            android:layout_width="wrap_content"
+	            android:layout_height="wrap_content"
+	            android:layout_marginLeft="10dip"
+	            android:text="@string/show_team"
+	            android:textColor="@android:color/white"
+	            android:textSize="20dip" />
+
+	        <RadioButton
+	            android:id="@+id/settings_team_mine"
+	            android:layout_width="wrap_content"
+	            android:layout_height="wrap_content"
+	            android:text="@string/mine"
+	            android:textColor="@android:color/white"
+	            android:textSize="20dip" />
+
+	        <RadioButton
+	            android:id="@+id/settings_team_all"
+	            android:layout_width="wrap_content"
+	            android:layout_height="wrap_content"
+	            android:text="@string/all"
+	            android:textColor="@android:color/white"
+	            android:textSize="20dip" />
+	    </LinearLayout>
+
+	    <View
+	        android:layout_width="fill_parent"
+	        android:layout_height="1.0px"
+	        android:layout_marginLeft="1.0px"
+	        android:layout_marginRight="1.0px"
+	        android:background="#ffc0c3c4" />
+
+	    <Button
+	        android:id="@+id/button1"
+	        android:layout_width="match_parent"
+	        android:layout_height="wrap_content"
+	        android:layout_weight="0.00"
+	        android:layout_marginTop="100dip"
+	        android:text="Logout" />
+
+	</LinearLayout>
 
-		<LinearLayout
-		    android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:id="@+id/settings_sex_layout"
-		    android:layout_marginTop="10dip">
-
-			<TextView
-			    android:id="@+id/settings_sex_text"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:layout_marginLeft="10dip"
-			    android:textSize="20dip"
-				android:textColor="@android:color/white"
-			    android:text="@string/show_sex" />
-
-			<CheckBox
-			    android:id="@+id/settings_show_male"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:text="@string/male" 
-			    android:textColor="@android:color/white"/>
-			
-
-			<CheckBox
-			    android:id="@+id/settings_show_female"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:text="@string/female" 
-			    android:textColor="@android:color/white"/>
-
-		</LinearLayout>
-
-		<ImageView
-		    android:id="@+id/settings_seperator2"
-		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-		    android:src="@drawable/horizontal_line" />
-
-		<LinearLayout
-		    android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:id="@+id/settings_team_layout"
-		    android:layout_marginTop="10dip">
-
-			<TextView
-			    android:id="@+id/settings_team_text"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:layout_marginLeft="10dip"
-			    android:textSize="20dip"
-				android:textColor="@android:color/white"
-			    android:text="@string/show_team" />
-
-			<RadioButton
-			    android:id="@+id/settings_team_mine"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:text="@string/mine" 
-			    android:textSize="20dip"
-				android:textColor="@android:color/white"/>
-
-			<RadioButton
-			    android:id="@+id/settings_team_all"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:text="@string/all" 
-			    android:textSize="20dip"
-				android:textColor="@android:color/white"/>
-
-		</LinearLayout>
-
-		<ImageView
-		    android:id="@+id/settings_seperator3"
-		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-		    android:src="@drawable/horizontal_line" />
-
-		</LinearLayout>
 	</RelativeLayout>
diff --git a/client/Piztor/res/layout/new_login.xml b/client/Piztor/res/layout/new_login.xml
new file mode 100644
index 0000000..36d3eec
--- /dev/null
+++ b/client/Piztor/res/layout/new_login.xml
@@ -0,0 +1,54 @@
+<RelativeLayout 
+    android:orientation="vertical" 
+    android:id="@+id/login_layout"
+    android:background="@android:color/black" 
+    android:layout_width="fill_parent" 
+    android:layout_height="fill_parent"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    
+    <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@android:color/black"
+    android:gravity="center_horizontal"
+    android:orientation="vertical" >
+    
+    <ImageView
+        android:id="@+id/main_headbar_img"
+        android:layout_width="180dp"
+        android:layout_height="240dp"
+        android:layout_gravity="center_horizontal"
+        android:src="@drawable/title_logo" />
+    </LinearLayout>
+
+    <LinearLayout 
+        android:orientation="vertical" 
+        android:id="@+id/user_layout" 
+        android:layout_width="fill_parent" 
+        android:layout_height="wrap_content" 
+        android:layout_marginTop="220.0dip" 
+        android:layout_marginLeft="28.0dip" 
+        android:layout_marginRight="28.0dip">
+        <EditText android:textSize="16.0sp" android:textColor="#ff1d1d1d" android:textColorHint="#ff666666" android:id="@+id/user_id" android:background="#00ffffff" android:paddingLeft="12.0dip" android:layout_width="fill_parent" android:layout_height="44.0dip" android:hint="account" android:maxLines="1" android:maxLength="16"     android:inputType="number"/>
+        <View android:background="#ffc0c3c4" android:layout_width="fill_parent" android:layout_height="1.0px" android:layout_marginLeft="1.0px" android:layout_marginRight="1.0px" />
+        <EditText android:textSize="16.0sp" android:textColor="#ff1d1d1d" android:textColorHint="#ff666666" android:gravity="center_vertical" android:id="@+id/user_pass" android:background="#00ffffff" android:paddingLeft="12.0dip" android:layout_width="fill_parent" android:layout_height="44.0dip" android:hint="password" android:maxLines="1" android:maxLength="16" android:inputType="textPassword" />
+    </LinearLayout>
+    
+
+    <Button 
+        android:textSize="18.0sp" 
+        android:textColor="#ff333333" 
+        android:gravity="center" 
+        android:id="@+id/login_btn_login" 
+        android:background="@android:color/white" 
+        android:paddingTop="5.0dip" 
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" 
+        android:layout_marginLeft="28.0dip" 
+        android:layout_marginTop="12.0dip" 
+        android:layout_marginRight="28.0dip" 
+        android:text="login"    
+        android:layout_below="@id/user_layout" />
+    
+</RelativeLayout>
\ No newline at end of file