fix #29 no screen splash at fetch

1 files changed, 113 insertions, 148 deletions

diff --git a/client/Piztor/res/layout/activity_settings.xml b/client/Piztor/res/layout/activity_settings.xml
index 3080be0..865cbc6 100644
--- a/client/Piztor/res/layout/activity_settings.xml
+++ b/client/Piztor/res/layout/activity_settings.xml
@@ -1,26 +1,17 @@
 <?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="wrap_content"
-	android:background="@android:color/black"
-	android:orientation="horizontal" >
-
-	<RelativeLayout
-		android:id="@+id/settings_headbar_layout"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_alignParentTop="true" >
-
-		<include layout="@layout/settings_headbar" />
-	</RelativeLayout>
-
-	<LinearLayout
-	    android:layout_width="fill_parent"
-	    android:layout_height="match_parent"
-	    android:layout_marginTop="48dip"
-	    android:orientation="vertical" >
-
-	    <TextView
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content" >
+
+    <LinearLayout
+
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical" >
+
+        <include layout="@layout/settings_headbar"></include>
+        
+        <TextView
 	        android:id="@+id/settings_GPSrefreshrate_text"
 	        android:layout_width="wrap_content"
 	        android:layout_height="wrap_content"
@@ -33,134 +24,108 @@
 	    <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 
-				android:id="@+id/GPS_min_text"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentLeft="true"
-				android:layout_marginLeft="10dip"
-				android:text="1s"
-				android:textSize="10dip"
-				android:textColor="@android:color/white"/
-	    -->
-
-
-	    <!--
-            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 -->
-
-	    <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="50dip"
-	         >
-
-	        <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="50dip" >
-
-	        <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>
-
+	        android:layout_marginLeft="40px"
+	        android:layout_marginRight="40px" />
+        
 	    <View
 	        android:layout_width="fill_parent"
 	        android:layout_height="1.0px"
-	        android:layout_marginLeft="1.0px"
-	        android:layout_marginRight="1.0px"
+	        android:layout_marginTop="40px"
+	        android:layout_marginBottom="40px"
+	        android:layout_marginLeft="20.0px"
+	        android:layout_marginRight="20.0px"
 	        android:background="#ffc0c3c4" />
-
-	    <Button
-	        android:id="@+id/settings_btn_logout"
-	        android:layout_width="match_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_weight="0.00"
-	        android:layout_marginTop="100dip"
-	        android:text="Logout" />
-
-	</LinearLayout>
-
-	</RelativeLayout>
+	    
+        <Button
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="Button 2" />
+
+        <Button
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="Button 3" />
+
+        <Button
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="Button 4" />
+
+        <Button
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="Button 5" />
+
+        <ProgressBar
+            android:id="@+id/progressBar1"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <RadioButton
+            android:id="@+id/radioButton2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="RadioButton 1" />
+
+        <RadioButton
+            android:id="@+id/radioButton1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="RadioButton 2" />
+
+        <ToggleButton
+            android:id="@+id/toggleButton1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="ToggleButton" />
+
+        <Button
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="Button 6" />
+
+        <SeekBar
+            android:id="@+id/seekBar1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <Button
+            android:id="@+id/button3"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Button 7" />
+
+        <Button
+            android:id="@+id/button4"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Button 8" />
+
+        <CheckBox
+            android:id="@+id/checkBox1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="CheckBox" />
+
+        <Button
+            android:id="@+id/button2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Button 9" />
+
+        <Button
+            android:id="@+id/button1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Button 10" />
+
+        <Button
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="Button 11"
+            android:id="@+id/settings_btn_logout" />
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file