X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/b36914df88ff9abd04c19b422889de894df3a714..9fe217ea4a329f3de125e207f839bcbf509c0b98:/res/layout/account_setup.xml

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index d541c099..65237a8b 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -18,236 +18,146 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:layout_gravity="center"
+	android:padding="8dip"
+    android:fillViewport="true"
+    android:orientation="vertical"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+		android:layout_margin="8dip"
+        android:gravity="center"
+        android:orientation="vertical" 
+        android:focusable="true"
+        >
 
-	<LinearLayout
-	    android:layout_width="match_parent"
-	    android:layout_height="wrap_content"
-	    android:layout_gravity="center"
-	    android:focusable="true"
-	    android:gravity="center"
-	    android:orientation="vertical" >
+        <ImageView
+            android:id="@+id/imageView1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:layout_marginTop="10dp"
+            android:src="@drawable/logo" />
 
-    	<FrameLayout
+		<EditText
+			android:id="@+id/hostUrlInput"
 			android:layout_width="match_parent"
-			android:layout_height="0dip"
-			android:layout_gravity="center"
-			android:layout_marginBottom="50dip"
-			android:layout_marginLeft="16dip"
-			android:layout_marginRight="16dip"
-			android:layout_weight="1" >
-		
-			<LinearLayout
-				android:id="@+id/LinearLayout1"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_gravity="center"
-				android:orientation="vertical" >
-		
-				<ImageView
-					android:id="@+id/imageView1"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginBottom="10dp"
-					android:layout_weight="1"
-					android:src="@drawable/owncloud_logo" />
-		
-	            <FrameLayout
-	                android:layout_width="match_parent"
-	                android:layout_height="wrap_content"
-	                android:layout_weight="1" >
-	
-	                <EditText
-	                    android:id="@+id/hostUrlInput"
-	                    android:layout_width="match_parent"
-	                    android:layout_height="wrap_content"
-	                    android:ems="10"
-	                    android:hint="@string/auth_host_url"
-	                    android:inputType="textNoSuggestions" >
-	                    <requestFocus />
-	                </EditText>
-	
-	                <ImageView
-	                    android:id="@+id/refreshButton"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:src="@drawable/ic_action_refresh_black"
-	                    android:layout_gravity="right|center_vertical"
-	                    android:visibility="invisible" />
-	
-	            </FrameLayout>
-	
-	            <LinearLayout
-	                android:layout_width="match_parent"
-	                android:layout_height="50dp"
-	                android:layout_weight="1" >
-	
-	                <ImageView
-	                    android:id="@+id/action_indicator"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:layout_marginLeft="5dp"
-	                    android:layout_marginRight="5dp"
-	                    android:src="@android:drawable/stat_notify_sync"
-	                    android:visibility="invisible" />
-	
-	                <TextView
-	                    android:id="@+id/status_text"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:text="TextView"
-	                    android:visibility="invisible" />
-	
-	            </LinearLayout>
-	
-	            <CheckBox
-	                android:id="@+id/oauth_onOff_check"
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content"
-	                android:checked="false"
-	                android:onClick="onCheckClick"
-	                android:text="@string/oauth_check_onoff"
-	                android:textAppearance="?android:attr/textAppearanceSmall" />
-	
-				<TextView
-	                android:id="@+id/textView2"
-	                android:layout_width="wrap_content"
-	                android:layout_height="0dp"
-	                android:layout_weight="1"
-	                android:text="@string/auth_login_details"
-	                android:textAppearance="?android:attr/textAppearanceSmall" />
-	
-	            <EditText
-	                android:id="@+id/oAuthEntryPoint_1"
-	                android:layout_width="match_parent"
-	                android:layout_height="wrap_content"
-	                android:layout_weight="1"
-	                android:ems="10"
-	                android:text="@string/oauth2_url_endpoint_auth"
-	                android:singleLine="true"
-	                android:visibility="gone" >
-	
-	                <requestFocus />
-	            </EditText>            
-	
-	            <EditText
-	                android:id="@+id/oAuthEntryPoint_2"
-	                android:layout_width="match_parent"
-	                android:layout_height="wrap_content"
-	                android:layout_weight="1"
-	                android:ems="10"
-		            android:text="@string/oauth2_url_endpoint_access"
-	                android:singleLine="true"
-	                android:visibility="gone" >
-	
-	                <requestFocus />
-	            </EditText>            
-	
-				<EditText
-	                android:id="@+id/account_username"
-	                android:layout_width="match_parent"
-	                android:layout_height="0dp"
-	                android:layout_weight="1"
-	                android:ems="10"
-	                android:hint="@string/auth_username"
-	                android:inputType="textNoSuggestions" />
-	
-	            <FrameLayout
-	                android:layout_width="match_parent"
-	                android:layout_height="wrap_content"
-	                android:layout_weight="1" >
-	
-	                <EditText
-	                    android:id="@+id/account_password"
-	                    android:layout_width="match_parent"
-	                    android:layout_height="wrap_content"
-	                    android:ems="10"
-	                    android:hint="@string/auth_password"
-	                    android:inputType="textPassword"/>
-	
-	                <ImageView
-	                    android:id="@+id/viewPasswordButton"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:layout_gravity="right|center_vertical"
-	                    android:src="@android:drawable/ic_menu_view"
-						android:onClick="onViewPasswordClick"
-	                    android:visibility="invisible" />
-	
-	            </FrameLayout>
-		
-	            <TextView
-	                android:id="@+id/auth_status_text"
-	                android:layout_width="match_parent"
-	                android:layout_height="wrap_content"
-	                android:layout_weight="1" 
-	                android:text="@string/text_placeholder"
-	                android:layout_marginLeft="5dp"
-	                android:layout_marginRight="5dp"
-					android:drawableLeft="@android:drawable/stat_notify_sync"
-	    			android:drawablePadding="5dip"
-	    			android:visibility="invisible"                
-	                />
-	                    
-	           </LinearLayout>
-	
-	    </FrameLayout>
-	
-	    <RelativeLayout
-	        android:layout_width="match_parent"
-	        android:layout_height="wrap_content">
-	
-	        <LinearLayout
-	            android:id="@+id/buttons_layout"
-	            android:layout_width="match_parent"
-	            android:layout_height="wrap_content"
-	            android:weightSum="1">
-	
-	            <Button
-	                android:id="@+id/buttonOK"
-	                android:layout_width="match_parent"
-	                android:layout_height="wrap_content"
-		            android:layout_gravity="center_horizontal"
-		           	android:layout_marginLeft="16dip"
-		            android:layout_marginRight="16dip"
-	                android:enabled="false"
-	                android:onClick="onOkClick"
-	                android:text="@string/setup_btn_connect"
-	                android:textColor="@android:color/black" />
-	
-	        </LinearLayout>
-	        
-			<Button
-				android:id="@+id/account_register"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_below="@id/buttons_layout"
-				android:layout_centerHorizontal="true"
-				android:onClick="onRegisterClick"
-				android:paddingTop="10dp"
-				android:paddingBottom="10dp"
-				android:textColor="#0000FF"
-				android:background="@android:color/transparent" />
-			
-			<Button
-				android:id="@+id/account_register"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_below="@id/buttons_layout"
-				android:layout_centerHorizontal="true"
-				android:onClick="onRegisterClick"
-				android:paddingTop="10dp"
-				android:paddingBottom="10dp"
-				android:textColor="#0000FF"
-				android:background="@android:color/transparent" />
-				<!-- android:text="@string/app_name @string/auth_register" /-->
-	        
-	    </RelativeLayout>
-
-	</LinearLayout>
-			
-</ScrollView>
+			android:layout_height="wrap_content"
+			android:ems="10"
+			android:hint="@string/auth_host_url"
+			android:inputType="textUri"
+			android:drawablePadding="5dp"
+			>
+			<requestFocus />
+		</EditText>
+
+        <TextView
+            android:id="@+id/server_status_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:drawableLeft="@android:drawable/stat_notify_sync"
+            android:drawablePadding="5dp"
+            android:gravity="center_vertical"
+            android:text="@string/auth_testing_connection" />
+
+        <CheckBox
+            android:id="@+id/oauth_onOff_check"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:onClick="onCheckClick"
+            android:text="@string/oauth_check_onoff"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:visibility="gone" />
+
+        <EditText
+            android:id="@+id/oAuthEntryPoint_1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:inputType="textUri"
+            android:singleLine="true"
+            android:text="@string/oauth2_url_endpoint_auth"
+            android:visibility="gone" >
+        </EditText>
+
+        <EditText
+            android:id="@+id/oAuthEntryPoint_2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:inputType="textUri"
+            android:singleLine="true"
+            android:text="@string/oauth2_url_endpoint_access"
+            android:visibility="gone" />
+
+        <EditText
+            android:id="@+id/account_username"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:hint="@string/auth_username"
+            android:inputType="textNoSuggestions" />
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" >
+
+            <EditText
+                android:id="@+id/account_password"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:hint="@string/auth_password"
+                android:inputType="textPassword" />
+
+            <ImageView
+                android:id="@+id/viewPasswordButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right|center_vertical"
+                android:onClick="onViewPasswordClick"
+                android:src="@android:drawable/ic_menu_view"
+                android:visibility="invisible" />
+        </FrameLayout>
+
+        <TextView
+            android:id="@+id/auth_status_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:drawableLeft="@android:drawable/stat_notify_sync"
+            android:drawablePadding="5dp"
+            android:gravity="center_vertical"
+            android:text="@string/auth_unauthorized" />
+
+        <Button
+            android:id="@+id/buttonOK"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:enabled="false"
+            android:onClick="onOkClick"
+            android:text="@string/setup_btn_connect"
+            android:textColor="@android:color/black" />
+
+        <Button
+            android:id="@+id/account_register"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            android:textColor="#0000FF" 
+            android:onClick="onRegisterClick"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
+            android:text="@string/auth_register"
+            />
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file