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

3 files changed, 49 insertions, 37 deletions

diff --git a/client/Piztor/res/layout/activity_login.xml b/client/Piztor/res/layout/activity_login.xml
index c408a1d..cb27495 100644
--- a/client/Piztor/res/layout/activity_login.xml
+++ b/client/Piztor/res/layout/activity_login.xml
@@ -1,10 +1,12 @@
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content" >
 <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">
+    android:layout_height="fill_parent">
 
     
     <LinearLayout
@@ -12,14 +14,23 @@
     android:layout_height="wrap_content"
     android:background="@android:color/black"
     android:gravity="center_horizontal"
-    android:orientation="vertical" >
+    android:orientation="vertical" 
+    android:layout_marginTop="16dip">
     
     <ImageView
         android:id="@+id/main_headbar_img"
         android:layout_width="180dp"
-        android:layout_height="190dp"
+        android:layout_height="200dp"
         android:layout_gravity="center_horizontal"
         android:src="@drawable/title_logo" />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:text="@string/app_name"
+        android:textSize="30dip"
+        android:textColor="#FFFFFF"/>
     </LinearLayout>
 
     <LinearLayout 
@@ -27,7 +38,7 @@
         android:id="@+id/user_layout" 
         android:layout_width="fill_parent" 
         android:layout_height="wrap_content" 
-        android:layout_marginTop="200.0dip" 
+        android:layout_marginTop="260.0dip" 
         android:layout_marginLeft="28.0dip" 
         android:layout_marginRight="28.0dip">
         <EditText 
@@ -75,8 +86,9 @@
         android:layout_height="wrap_content" 
         android:layout_marginLeft="70.0dip"
         android:layout_marginRight="70.0dip" 
-        android:layout_marginTop="12.0dip" 
+        android:layout_marginTop="40.0dip" 
         android:text="@string/login"    
         android:layout_below="@id/user_layout" />
     
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
+</ScrollView>
\ 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 36bacf3..ba67683 100644
--- a/client/Piztor/res/layout/activity_settings.xml
+++ b/client/Piztor/res/layout/activity_settings.xml
@@ -30,16 +30,18 @@
 	        	android:layout_gravity="center"
 	        	android:gravity="center"
 	        	android:layout_marginTop="10dip"
+           		android:layout_marginBottom="2dip"
 	        	android:text="@string/GPSrefreshrate"
 	        	android:textColor="@android:color/white"
-	        	android:textSize="20dip" />
+	        	android:textSize="17dip" />
         	<TextView
             	android:id="@+id/settings_GPSrefreshrate"
             	android:layout_width="wrap_content"
             	android:layout_height="wrap_content"
-            	android:textSize="20dip"
+            	android:textSize="17dip"
            		android:layout_marginTop="10dip"
-           		android:layout_marginLeft="10dip"
+           		android:layout_marginLeft="4dip"
+           		android:layout_marginBottom="2dip"
             	android:layout_gravity="center_vertical"
             	android:textColor="@android:color/white"
             	android:layout_toRightOf="@+id/settings_GPSrefreshrate_text"
@@ -87,31 +89,26 @@
 	        android:layout_marginLeft="20dip"
 	        android:layout_marginRight="20dip"
 	        android:background="#ffc0c3c4" />
+	    
 	    <LinearLayout
 	        android:layout_width="fill_parent"
 	        android:layout_height="wrap_content"
-	        android:layout_gravity="center"
-	        android:gravity="center"
-	        android:layout_marginTop="10dip"
-	        android:orientation="horizontal">
-	    <TextView
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:layout_gravity="center"
-	        android:gravity="center"
-	        android:textSize="30dip"
-	        android:textColor="@android:color/white"
-	        android:text="@string/subscribe_info"/>
-	    
-		   	<Button
-		   	    android:id="@+id/settings_btn_subscribe"
-		   	    android:layout_width="wrap_content"
-		   	    android:layout_height="wrap_content"
-		   	    android:layout_marginLeft="20dip"
-		   	    android:text="@string/change"
-		   	    android:textSize="22dip" />
-
-	    </LinearLayout>
+	        android:layout_marginLeft="50dip"
+            android:layout_marginRight="50dip"
+            android:orientation="vertical">
+		    
+        	<Button
+            	android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:paddingTop="5dip"
+				android:paddingBottom="5dip"
+            	android:layout_marginTop="20dip"
+            	android:text="@string/change"
+            	android:textSize="20dip"
+            	android:textColor="@android:color/white"
+            	android:background="#0F9D58"
+            	android:id="@+id/settings_btn_subscribe" />
+        	</LinearLayout>
 	    <View
 	        android:layout_width="fill_parent"
 	        android:layout_height="1.0px"
@@ -141,13 +138,16 @@
  			<RadioButton 
  			    android:layout_width="wrap_content" 
  			    android:layout_height="wrap_content" 
- 			    android:id="@+id/show_by_team" 
+ 			    android:id="@+id/show_by_team"
+ 			    android:textSize="18dip" 
  			    android:text="@string/show_team" 
  			    android:checked="true"/>
 			<RadioButton 
 			    android:layout_width="wrap_content" 
 			    android:layout_height="wrap_content" 
+			    android:layout_marginLeft="10dip"
 			    android:id="@+id/show_by_sex" 
+			    android:textSize="18dip"
 			    android:text="@string/show_sex"/>    
 		</RadioGroup>
 	    </LinearLayout>
@@ -171,7 +171,7 @@
             	android:paddingTop="5dip"
             	android:paddingBottom="5dip"
             	android:text="@string/update_info"
-            	android:textSize="30dip"
+            	android:textSize="20dip"
             	android:textColor="@android:color/white"
             	android:background="#4285F4"
             	android:id="@+id/settings_btn_updateinfo" />
@@ -182,7 +182,7 @@
 				android:paddingBottom="5dip"
             	android:layout_marginTop="20dip"
             	android:text="@string/logout"
-            	android:textSize="30dip"
+            	android:textSize="20dip"
             	android:textColor="@android:color/white"
             	android:background="#DB4437"
             	android:id="@+id/settings_btn_logout" />
diff --git a/client/Piztor/res/layout/subscribe_settings.xml b/client/Piztor/res/layout/subscribe_settings.xml
index 1bfd975..a90837c 100644
--- a/client/Piztor/res/layout/subscribe_settings.xml
+++ b/client/Piztor/res/layout/subscribe_settings.xml
@@ -19,7 +19,7 @@
 	    android:gravity="center"
 	    android:orientation="horizontal">
 	    <EditText
-	        android:layout_width="120dip"
+	        android:layout_width="80dip"
 	        android:layout_height="wrap_content"
 	        android:layout_alignParentLeft="true"
 	        android:layout_marginLeft="10dip"
@@ -28,7 +28,7 @@
 	        android:phoneNumber="true"
 	 		android:id="@+id/subscribe_company"/>
 	    <EditText
-	        android:layout_width="120dip"
+	        android:layout_width="80dip"
 	        android:layout_height="wrap_content"
 	        android:layout_marginLeft="10dip"
 	        android:layout_toRightOf="@+id/subscribe_company"