Explorar o código

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

Andy Scherzinger %!s(int64=9) %!d(string=hai) anos
pai
achega
10c5498879
Modificáronse 3 ficheiros con 41 adicións e 40 borrados
  1. 19 19
      res/layout-land/account_setup.xml
  2. 20 20
      res/layout/account_setup.xml
  3. 2 1
      res/values/colors.xml

+ 19 - 19
res/layout-land/account_setup.xml

@@ -76,8 +76,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 
 	        		android:id="@+id/hostUrlFrame"
@@ -94,8 +94,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 />
@@ -124,8 +124,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"/>
 		             
@@ -136,8 +136,8 @@
 					android:checked="false"
 					android:onClick="onCheckClick"
 					android:text="@string/oauth_check_onoff"
-					android:textColor="#AAAAAA"
-					android:textColorHint="#AAAAAA"
+					android:textColor="@color/login_text_color"
+					android:textColorHint="@color/login_text_hint_color"
 					android:textAppearance="?android:attr/textAppearanceSmall"
                     android:contentDescription="@string/oauth_check_onoff"
 					/>
@@ -151,8 +151,8 @@
 					android:text="@string/oauth2_url_endpoint_auth"
 					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>            
 				
@@ -165,8 +165,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">
 					<requestFocus />
 				</EditText>            
@@ -178,8 +178,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"
 					/>
 		
@@ -191,8 +191,8 @@
 					android:hint="@string/auth_password"
 					android:inputType="textPassword"
 					android:drawablePadding="5dp"
-					android:textColor="#AAAAAA"
-					android:textColorHint="#AAAAAA"
+					android:textColor="@color/login_text_color"
+					android:textColorHint="@color/login_text_hint_color"
 					android:contentDescription="@string/auth_password"
 					/>
 		        
@@ -204,8 +204,8 @@
 					android:text="@string/auth_unauthorized"
 					android:drawableLeft="@android:drawable/stat_notify_sync"
 					android:drawablePadding="5dip"
-					android:textColor="#AAAAAA"
-					android:textColorHint="#AAAAAA"
+					android:textColor="@color/login_text_color"
+					android:textColorHint="@color/login_text_hint_color"
                     android:contentDescription="@string/auth_unauthorized"
 					/>
 
@@ -242,7 +242,7 @@
 		    android:paddingBottom="5dp"
 		    android:paddingTop="5dp"
 		    android:text="@string/auth_register"
-			android:textColor="#AAAAAA"
+			android:textColor="@color/login_text_color"
             android:contentDescription="@string/auth_register"/>
 	</LinearLayout>
 		

+ 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>