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

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index c6b0943a..0789c599 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -32,19 +32,20 @@
         android:background="@color/login_background_color"
         android:gravity="center"
         android:orientation="vertical"
-        android:padding="@dimen/standard_padding" >
+        android:padding="8dp" >
 
         <ImageView
             android:id="@+id/thumbnail"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/standard_margin"
+            android:layout_marginBottom="20dp"
+            android:layout_marginTop="10dp"
             android:src="@drawable/logo"
             android:contentDescription="@string/app_name"/>
 
         <android.support.v7.widget.AppCompatButton
             android:id="@+id/centeredRefreshButton"
-            android:theme="@style/Button"
+            style="@style/ownCloud.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
@@ -80,7 +81,7 @@
 				android:inputType="textUri"
 				android:drawablePadding="5dp"
 				android:paddingRight="55dp"
-                android:textColor="@color/login_text_color"
+                android:textColor="@color/primary"
                 android:textColorHint="@color/login_text_hint_color"
 				android:contentDescription="@string/auth_host_address"
                 >
@@ -115,7 +116,7 @@
             android:text="@string/auth_testing_connection"
             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"
@@ -123,7 +124,7 @@
             android:onClick="onCheckClick"
             android:text="@string/oauth_check_onoff"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="@color/login_text_color"
+            android:textColor="@color/primary"
             android:textColorHint="@color/login_text_hint_color"
             android:contentDescription="@string/oauth_check_onoff"
             />
@@ -134,7 +135,7 @@
             android:layout_height="wrap_content"
             android:ems="10"
 			android:enabled="false"
-            android:textColor="@color/login_text_color"
+            android:textColor="@color/primary"
             android:textColorHint="@color/login_text_hint_color"
             android:text="@string/oauth2_url_endpoint_auth"
             android:singleLine="true"
@@ -151,7 +152,7 @@
             android:text="@string/oauth2_url_endpoint_access"
             android:singleLine="true"
             android:inputType="textUri"
-            android:textColor="@color/login_text_color"
+            android:textColor="@color/primary"
             android:textColorHint="@color/login_text_hint_color"
             android:visibility="gone"/>
 
@@ -162,7 +163,7 @@
             android:ems="10"
             android:hint="@string/auth_username"
             android:inputType="textNoSuggestions"
-            android:textColor="@color/login_text_color"
+            android:textColor="@color/primary"
             android:textColorHint="@color/login_text_hint_color"
             android:contentDescription="@string/auth_username"
             />
@@ -175,7 +176,7 @@
 		    android:ems="10"
 		    android:hint="@string/auth_password"
 		    android:inputType="textPassword"
-            android:textColor="@color/login_text_color"
+            android:textColor="@color/primary"
             android:textColorHint="@color/login_text_hint_color"
 		    android:contentDescription="@string/auth_password"
             />
@@ -195,7 +196,8 @@
 
         <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"
@@ -209,7 +211,8 @@
             android:layout_height="wrap_content"
             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:textColorHint="@color/login_text_hint_color"