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

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 27873a61..347568eb 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -57,17 +57,18 @@
 			    android:gravity="center"
 			    android:orientation="vertical"
 			    android:padding="8dp" >
-			    
-				<Button
-				    android:id="@+id/centeredRefreshButton"
-				    android:layout_width="wrap_content"
-				    android:layout_height="wrap_content"
-				    android:layout_gravity="center_horizontal"
+
+				<android.support.v7.widget.AppCompatButton
+					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:onClick="onRefreshClick"
-				    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"
@@ -76,12 +77,14 @@
 				    android:text="@string/auth_expired_basic_auth_toast" 
 				    android:visibility="gone"
 				    android:layout_marginBottom="10dp"
+					android:textColor="@color/login_text_color"
+					android:textColorHint="@color/login_text_hint_color"
                     android:contentDescription="@string/auth_expired_basic_auth_toast"/>
 			    <FrameLayout 
 	        		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"
@@ -92,19 +95,20 @@
 						android:inputType="textUri"
 						android:drawablePadding="5dp"
 						android:paddingRight="55dp"
+						android:textColorHint="@color/login_text_hint_color"
 						android:contentDescription="@string/auth_host_address"
 						>
 						<requestFocus />
 					</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"
@@ -120,7 +124,10 @@
 					android:drawableLeft="@android:drawable/stat_notify_sync"
 					android:drawablePadding="5dp"
 					android:gravity="center_vertical"
+					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"/>
 		             
 				<CheckBox
@@ -130,6 +137,8 @@
 					android:checked="false"
 					android:onClick="onCheckClick"
 					android:text="@string/oauth_check_onoff"
+					android:textColor="@color/primary"
+					android:textColorHint="@color/login_text_hint_color"
 					android:textAppearance="?android:attr/textAppearanceSmall"
                     android:contentDescription="@string/oauth_check_onoff"
 					/>
@@ -143,6 +152,7 @@
 					android:text="@string/oauth2_url_endpoint_auth"
 					android:singleLine="true"
 					android:inputType="textUri"
+					android:textColorHint="@color/login_text_hint_color"
 					android:visibility="gone">
 				</EditText>            
 				
@@ -155,6 +165,7 @@
 					android:text="@string/oauth2_url_endpoint_access"
 					android:singleLine="true"
 					android:inputType="textUri"
+					android:textColorHint="@color/login_text_hint_color"
 					android:visibility="gone">
 					<requestFocus />
 				</EditText>            
@@ -166,6 +177,7 @@
 					android:ems="10"
 					android:hint="@string/auth_username"
 					android:inputType="textNoSuggestions"
+					android:textColorHint="@color/login_text_hint_color"
 					android:contentDescription="@string/auth_username"
 					/>
 		
@@ -177,7 +189,7 @@
 					android:hint="@string/auth_password"
 					android:inputType="textPassword"
 					android:drawablePadding="5dp"
-					android:contentDescription="@string/auth_password"
+					android:textColorHint="@color/login_text_hint_color"
 					/>
 		        
 				<TextView
@@ -188,6 +200,8 @@
 					android:text="@string/auth_unauthorized"
 					android:drawableLeft="@android:drawable/stat_notify_sync"
 					android:drawablePadding="5dip"
+					android:textColor="@color/login_text_color"
+					android:textColorHint="@color/login_text_hint_color"
                     android:contentDescription="@string/auth_unauthorized"
 					/>
 
@@ -204,13 +218,14 @@
 		android:layout_alignParentBottom="true"
         android:orientation="vertical" >
         
-		<Button
+		<android.support.v7.widget.AppCompatButton
 		    android:id="@+id/buttonOK"
+			android:theme="@style/Button.Primary"
+			style="@style/Button.Primary"
 		    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:contentDescription="@string/setup_btn_connect"/>
 		
@@ -224,7 +239,7 @@
 		    android:paddingBottom="5dp"
 		    android:paddingTop="5dp"
 		    android:text="@string/auth_register"
-		    android:textColor="#0000FF"
+			android:textColor="@color/login_text_color"
             android:contentDescription="@string/auth_register"/>
 	</LinearLayout>