瀏覽代碼

extracted text colors for account setup to color.xml, see https://github.com/owncloud/android/commit/e72caebbce437a6aa72d347d6530c7858a776f86 comments

Andy Scherzinger 9 年之前
父節點
當前提交
f9a370e7e6
共有 2 個文件被更改,包括 22 次插入21 次删除
  1. 20 20
      res/layout/account_setup.xml
  2. 2 1
      res/values/colors.xml

+ 20 - 20
res/layout/account_setup.xml

@@ -62,8 +62,8 @@
             android:text="@string/auth_expired_basic_auth_toast"
             android:visibility="gone"
             android:layout_marginBottom="10dp"
-            android:textColor="#AAAAAA"
-            android:textColorHint="#AAAAAA"
+            android:textColor="@color/login_text_color"
+            android:textColorHint="@color/login_text_hint_color"
             android:contentDescription="@string/auth_expired_basic_auth_toast"/>
 
 	    <FrameLayout 
@@ -81,8 +81,8 @@
 				android:inputType="textUri"
 				android:drawablePadding="5dp"
 				android:paddingRight="55dp"
-                android:textColor="#AAAAAA"
-                android:textColorHint="#AAAAAA"
+                android:textColor="@color/login_text_color"
+                android:textColorHint="@color/login_text_hint_color"
 				android:contentDescription="@string/auth_host_address"
                 >
 				<requestFocus />
@@ -111,8 +111,8 @@
             android:drawableLeft="@android:drawable/stat_notify_sync"
             android:drawablePadding="5dp"
             android:gravity="center_vertical"
-            android:textColor="#AAAAAA"
-            android:textColorHint="#AAAAAA"
+            android:textColor="@color/login_text_color"
+            android:textColorHint="@color/login_text_hint_color"
             android:text="@string/auth_testing_connection"
             android:contentDescription="@string/auth_testing_connection"/>
 
@@ -124,8 +124,8 @@
             android:onClick="onCheckClick"
             android:text="@string/oauth_check_onoff"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="#AAAAAA"
-            android:textColorHint="#AAAAAA"
+            android:textColor="@color/login_text_color"
+            android:textColorHint="@color/login_text_hint_color"
             android:contentDescription="@string/oauth_check_onoff"
             />
 
@@ -135,8 +135,8 @@
             android:layout_height="wrap_content"
             android:ems="10"
 			android:enabled="false"
-            android:textColor="#AAAAAA"
-            android:textColorHint="#AAAAAA"
+            android:textColor="@color/login_text_color"
+            android:textColorHint="@color/login_text_hint_color"
             android:text="@string/oauth2_url_endpoint_auth"
             android:singleLine="true"
             android:inputType="textUri"
@@ -152,8 +152,8 @@
             android:text="@string/oauth2_url_endpoint_access"
             android:singleLine="true"
             android:inputType="textUri"
-            android:textColor="#AAAAAA"
-            android:textColorHint="#AAAAAA"
+            android:textColor="@color/login_text_color"
+            android:textColorHint="@color/login_text_hint_color"
             android:visibility="gone"/>
 
         <EditText
@@ -163,8 +163,8 @@
             android:ems="10"
             android:hint="@string/auth_username"
             android:inputType="textNoSuggestions"
-            android:textColor="#AAAAAA"
-            android:textColorHint="#AAAAAA"
+            android:textColor="@color/login_text_color"
+            android:textColorHint="@color/login_text_hint_color"
             android:contentDescription="@string/auth_username"
             />
 
@@ -176,8 +176,8 @@
 		    android:ems="10"
 		    android:hint="@string/auth_password"
 		    android:inputType="textPassword"
-            android:textColor="#AAAAAA"
-            android:textColorHint="#AAAAAA"
+            android:textColor="@color/login_text_color"
+            android:textColorHint="@color/login_text_hint_color"
 		    android:contentDescription="@string/auth_password"
             />
         
@@ -190,8 +190,8 @@
             android:drawablePadding="5dp"
             android:gravity="center_vertical"
             android:text="@string/auth_unauthorized"
-            android:textColor="#AAAAAA"
-            android:textColorHint="#AAAAAA"
+            android:textColor="@color/login_text_color"
+            android:textColorHint="@color/login_text_hint_color"
             android:contentDescription="@string/auth_unauthorized"/>
 
         <Button
@@ -213,8 +213,8 @@
             android:paddingBottom="5dp"
             android:paddingTop="5dp"
             android:text="@string/auth_register"
-            android:textColor="#AAAAAA"
-            android:textColorHint="#AAAAAA"
+            android:textColor="@color/login_text_color"
+            android:textColorHint="@color/login_text_hint_color"
             android:contentDescription="@string/auth_register"/>
 
     </LinearLayout>

+ 2 - 1
res/values/colors.xml

@@ -29,7 +29,8 @@
     <color name="drawerMenuTextColor">#757575</color>
     <color name="list_divider_background">#fff0f0f0</color>
     <color name="filelist_icon_backgorund">#DDDDDD</color>
-    <color name="login_text_color">#AAAAAA</color>
+    <color name="login_text_color">#EEEEEE</color>
+    <color name="login_text_hint_color">#AAAAAA</color>
 
     <!-- Colors -->
     <color name="color_accent">@color/owncloud_blue_accent</color>