X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/16a5bdc8d18beb35a2400daa20a0588f669dfa32..8622b6c453aadcab85b4854521fb0f88c8aebf84:/res/layout-land/account_setup.xml

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 74b3e86f..347568eb 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -21,7 +21,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/login_background_color"
-	android:padding="@dimen/standard_padding"
+	android:padding="8dip"
     >
 
     <LinearLayout
@@ -56,18 +56,19 @@
 			    android:layout_height="wrap_content"
 			    android:gravity="center"
 			    android:orientation="vertical"
-			    android:padding="0dp" >
-			    
+			    android:padding="8dp" >
+
 				<android.support.v7.widget.AppCompatButton
-				    android:id="@+id/centeredRefreshButton"
-					android:theme="@style/Button"
-				    android:layout_width="wrap_content"
-				    android:layout_height="wrap_content"
-				    android:layout_gravity="center_horizontal"
+					android:id="@+id/centeredRefreshButton"
+					style="@style/ownCloud.Button"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_horizontal"
 					android:layout_marginBottom="10dp"
-				    android:text="@string/auth_check_server"
-				    android:visibility="gone"
-                    android:contentDescription="@string/auth_check_server"/>
+					android:text="@string/auth_check_server"
+					android:visibility="gone"
+					android:contentDescription="@string/auth_check_server"/>
+
 				<TextView
 				    android:id="@+id/instructions_message"
 				    android:layout_width="wrap_content"
@@ -83,7 +84,7 @@
 	        		android:id="@+id/hostUrlFrame"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:layout_marginBottom="10dp"
+					android:layout_marginBottom="0dp"
 			        >
 					<EditText
 						android:id="@+id/hostUrlInput"
@@ -94,7 +95,6 @@
 						android:inputType="textUri"
 						android:drawablePadding="5dp"
 						android:paddingRight="55dp"
-						android:textColor="@color/login_text_color"
 						android:textColorHint="@color/login_text_hint_color"
 						android:contentDescription="@string/auth_host_address"
 						>
@@ -102,13 +102,13 @@
 					</EditText>
 					<ImageButton
 					    android:id="@+id/embeddedRefreshButton"
-					    android:layout_width="48dp"
-					    android:layout_height="48dp"
+					    android:layout_width="wrap_content"
+					    android:layout_height="wrap_content"
 					    android:layout_gravity="center_vertical|right"
 					    android:layout_marginRight="5dp"
 					    android:padding="0dp"
 					    android:scaleType="fitCenter"
-					    android:src="@drawable/ic_action_refresh_black"
+					    android:src="@drawable/ic_action_refresh_grey"
             			android:onClick="onRefreshClick"
 					    android:visibility="gone"
 						android:background="@android:color/transparent"
@@ -127,16 +127,17 @@
 					android:textColor="@color/login_text_color"
 					android:textColorHint="@color/login_text_hint_color"
 					android:text="@string/auth_testing_connection"
+					android:minHeight="32dp"
                     android:contentDescription="@string/auth_testing_connection"/>
 		             
-				<android.support.v7.widget.AppCompatCheckBox
+				<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:textColor="@color/login_text_color"
+					android:textColor="@color/primary"
 					android:textColorHint="@color/login_text_hint_color"
 					android:textAppearance="?android:attr/textAppearanceSmall"
                     android:contentDescription="@string/oauth_check_onoff"
@@ -151,7 +152,6 @@
 					android:text="@string/oauth2_url_endpoint_auth"
 					android:singleLine="true"
 					android:inputType="textUri"
-					android:textColor="@color/login_text_color"
 					android:textColorHint="@color/login_text_hint_color"
 					android:visibility="gone">
 				</EditText>            
@@ -165,7 +165,6 @@
 					android:text="@string/oauth2_url_endpoint_access"
 					android:singleLine="true"
 					android:inputType="textUri"
-					android:textColor="@color/login_text_color"
 					android:textColorHint="@color/login_text_hint_color"
 					android:visibility="gone">
 					<requestFocus />
@@ -178,7 +177,6 @@
 					android:ems="10"
 					android:hint="@string/auth_username"
 					android:inputType="textNoSuggestions"
-					android:textColor="@color/login_text_color"
 					android:textColorHint="@color/login_text_hint_color"
 					android:contentDescription="@string/auth_username"
 					/>
@@ -191,9 +189,7 @@
 					android:hint="@string/auth_password"
 					android:inputType="textPassword"
 					android:drawablePadding="5dp"
-					android:textColor="@color/login_text_color"
 					android:textColorHint="@color/login_text_hint_color"
-					android:contentDescription="@string/auth_password"
 					/>
 		        
 				<TextView
@@ -221,10 +217,11 @@
         android:layout_height="wrap_content"
 		android:layout_alignParentBottom="true"
         android:orientation="vertical" >
-
+        
 		<android.support.v7.widget.AppCompatButton
 		    android:id="@+id/buttonOK"
-			android:theme="@style/Button"
+			android:theme="@style/Button.Primary"
+			style="@style/Button.Primary"
 		    android:layout_width="match_parent"
 		    android:layout_height="wrap_content"
 		    android:layout_gravity="center_horizontal"
@@ -239,7 +236,8 @@
 		    android:layout_gravity="center_horizontal"
 		    android:background="@android:color/transparent"
 		    android:onClick="onRegisterClick"
-		    android:paddingTop="@dimen/standard_padding"
+		    android:paddingBottom="5dp"
+		    android:paddingTop="5dp"
 		    android:text="@string/auth_register"
 			android:textColor="@color/login_text_color"
             android:contentDescription="@string/auth_register"/>