projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3e87ca1)
extracted text colors for account setup to color.xml, see https://github.com/owncloud...
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 4 Aug 2015 14:04:28 +0000 (16:04 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 4 Aug 2015 14:41:53 +0000 (16:41 +0200)
res/layout-land/account_setup.xml patch | blob | blame | history
res/layout/account_setup.xml patch | blob | blame | history
res/values/colors.xml patch | blob | blame | history

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 6b89874..d5d6ab0 100644 (file)
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -76,8 +76,8 @@
                                    android:text="@string/auth_expired_basic_auth_toast" \r
                                    android:visibility="gone"\r
                                    android:layout_marginBottom="10dp"\r
                                    android:text="@string/auth_expired_basic_auth_toast" \r
                                    android:visibility="gone"\r
                                    android:layout_marginBottom="10dp"\r
-                                       android:textColor="#AAAAAA"\r
-                                       android:textColorHint="#AAAAAA"\r
+                                       android:textColor="@color/login_text_color"\r
+                                       android:textColorHint="@color/login_text_hint_color"\r
                     android:contentDescription="@string/auth_expired_basic_auth_toast"/>\r
                            <FrameLayout \r
                                android:id="@+id/hostUrlFrame"\r
                     android:contentDescription="@string/auth_expired_basic_auth_toast"/>\r
                            <FrameLayout \r
                                android:id="@+id/hostUrlFrame"\r
@@ -94,8 +94,8 @@
                                                android:inputType="textUri"\r
                                                android:drawablePadding="5dp"\r
                                                android:paddingRight="55dp"\r
                                                android:inputType="textUri"\r
                                                android:drawablePadding="5dp"\r
                                                android:paddingRight="55dp"\r
-                                               android:textColor="#AAAAAA"\r
-                                               android:textColorHint="#AAAAAA"\r
+                                               android:textColor="@color/login_text_color"\r
+                                               android:textColorHint="@color/login_text_hint_color"\r
                                                android:contentDescription="@string/auth_host_address"\r
                                                >\r
                                                <requestFocus />\r
                                                android:contentDescription="@string/auth_host_address"\r
                                                >\r
                                                <requestFocus />\r
@@ -124,8 +124,8 @@
                                        android:drawableLeft="@android:drawable/stat_notify_sync"\r
                                        android:drawablePadding="5dp"\r
                                        android:gravity="center_vertical"\r
                                        android:drawableLeft="@android:drawable/stat_notify_sync"\r
                                        android:drawablePadding="5dp"\r
                                        android:gravity="center_vertical"\r
-                                       android:textColor="#AAAAAA"\r
-                                       android:textColorHint="#AAAAAA"\r
+                                       android:textColor="@color/login_text_color"\r
+                                       android:textColorHint="@color/login_text_hint_color"\r
                                        android:text="@string/auth_testing_connection"\r
                     android:contentDescription="@string/auth_testing_connection"/>\r
                             \r
                                        android:text="@string/auth_testing_connection"\r
                     android:contentDescription="@string/auth_testing_connection"/>\r
                             \r
@@ -136,8 +136,8 @@
                                        android:checked="false"\r
                                        android:onClick="onCheckClick"\r
                                        android:text="@string/oauth_check_onoff"\r
                                        android:checked="false"\r
                                        android:onClick="onCheckClick"\r
                                        android:text="@string/oauth_check_onoff"\r
-                                       android:textColor="#AAAAAA"\r
-                                       android:textColorHint="#AAAAAA"\r
+                                       android:textColor="@color/login_text_color"\r
+                                       android:textColorHint="@color/login_text_hint_color"\r
                                        android:textAppearance="?android:attr/textAppearanceSmall"\r
                     android:contentDescription="@string/oauth_check_onoff"\r
                                        />\r
                                        android:textAppearance="?android:attr/textAppearanceSmall"\r
                     android:contentDescription="@string/oauth_check_onoff"\r
                                        />\r
@@ -151,8 +151,8 @@
                                        android:text="@string/oauth2_url_endpoint_auth"\r
                                        android:singleLine="true"\r
                                        android:inputType="textUri"\r
                                        android:text="@string/oauth2_url_endpoint_auth"\r
                                        android:singleLine="true"\r
                                        android:inputType="textUri"\r
-                                       android:textColor="#AAAAAA"\r
-                                       android:textColorHint="#AAAAAA"\r
+                                       android:textColor="@color/login_text_color"\r
+                                       android:textColorHint="@color/login_text_hint_color"\r
                                        android:visibility="gone">\r
                                </EditText>            \r
                                \r
                                        android:visibility="gone">\r
                                </EditText>            \r
                                \r
@@ -165,8 +165,8 @@
                                        android:text="@string/oauth2_url_endpoint_access"\r
                                        android:singleLine="true"\r
                                        android:inputType="textUri"\r
                                        android:text="@string/oauth2_url_endpoint_access"\r
                                        android:singleLine="true"\r
                                        android:inputType="textUri"\r
-                                       android:textColor="#AAAAAA"\r
-                                       android:textColorHint="#AAAAAA"\r
+                                       android:textColor="@color/login_text_color"\r
+                                       android:textColorHint="@color/login_text_hint_color"\r
                                        android:visibility="gone">\r
                                        <requestFocus />\r
                                </EditText>            \r
                                        android:visibility="gone">\r
                                        <requestFocus />\r
                                </EditText>            \r
@@ -178,8 +178,8 @@
                                        android:ems="10"\r
                                        android:hint="@string/auth_username"\r
                                        android:inputType="textNoSuggestions"\r
                                        android:ems="10"\r
                                        android:hint="@string/auth_username"\r
                                        android:inputType="textNoSuggestions"\r
-                                       android:textColor="#AAAAAA"\r
-                                       android:textColorHint="#AAAAAA"\r
+                                       android:textColor="@color/login_text_color"\r
+                                       android:textColorHint="@color/login_text_hint_color"\r
                                        android:contentDescription="@string/auth_username"\r
                                        />\r
                \r
                                        android:contentDescription="@string/auth_username"\r
                                        />\r
                \r
@@ -191,8 +191,8 @@
                                        android:hint="@string/auth_password"\r
                                        android:inputType="textPassword"\r
                                        android:drawablePadding="5dp"\r
                                        android:hint="@string/auth_password"\r
                                        android:inputType="textPassword"\r
                                        android:drawablePadding="5dp"\r
-                                       android:textColor="#AAAAAA"\r
-                                       android:textColorHint="#AAAAAA"\r
+                                       android:textColor="@color/login_text_color"\r
+                                       android:textColorHint="@color/login_text_hint_color"\r
                                        android:contentDescription="@string/auth_password"\r
                                        />\r
                        \r
                                        android:contentDescription="@string/auth_password"\r
                                        />\r
                        \r
@@ -204,8 +204,8 @@
                                        android:text="@string/auth_unauthorized"\r
                                        android:drawableLeft="@android:drawable/stat_notify_sync"\r
                                        android:drawablePadding="5dip"\r
                                        android:text="@string/auth_unauthorized"\r
                                        android:drawableLeft="@android:drawable/stat_notify_sync"\r
                                        android:drawablePadding="5dip"\r
-                                       android:textColor="#AAAAAA"\r
-                                       android:textColorHint="#AAAAAA"\r
+                                       android:textColor="@color/login_text_color"\r
+                                       android:textColorHint="@color/login_text_hint_color"\r
                     android:contentDescription="@string/auth_unauthorized"\r
                                        />\r
 \r
                     android:contentDescription="@string/auth_unauthorized"\r
                                        />\r
 \r
@@ -242,7 +242,7 @@
                    android:paddingBottom="5dp"\r
                    android:paddingTop="5dp"\r
                    android:text="@string/auth_register"\r
                    android:paddingBottom="5dp"\r
                    android:paddingTop="5dp"\r
                    android:text="@string/auth_register"\r
-                       android:textColor="#AAAAAA"\r
+                       android:textColor="@color/login_text_color"\r
             android:contentDescription="@string/auth_register"/>\r
        </LinearLayout>\r
                \r
             android:contentDescription="@string/auth_register"/>\r
        </LinearLayout>\r
                \r
diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 4021ae2..073ce1a 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -62,8 +62,8 @@
             android:text="@string/auth_expired_basic_auth_toast"\r
             android:visibility="gone"\r
             android:layout_marginBottom="10dp"\r
             android:text="@string/auth_expired_basic_auth_toast"\r
             android:visibility="gone"\r
             android:layout_marginBottom="10dp"\r
-            android:textColor="#AAAAAA"\r
-            android:textColorHint="#AAAAAA"\r
+            android:textColor="@color/login_text_color"\r
+            android:textColorHint="@color/login_text_hint_color"\r
             android:contentDescription="@string/auth_expired_basic_auth_toast"/>\r
 \r
            <FrameLayout \r
             android:contentDescription="@string/auth_expired_basic_auth_toast"/>\r
 \r
            <FrameLayout \r
@@ -81,8 +81,8 @@
                                android:inputType="textUri"\r
                                android:drawablePadding="5dp"\r
                                android:paddingRight="55dp"\r
                                android:inputType="textUri"\r
                                android:drawablePadding="5dp"\r
                                android:paddingRight="55dp"\r
-                android:textColor="#AAAAAA"\r
-                android:textColorHint="#AAAAAA"\r
+                android:textColor="@color/login_text_color"\r
+                android:textColorHint="@color/login_text_hint_color"\r
                                android:contentDescription="@string/auth_host_address"\r
                 >\r
                                <requestFocus />\r
                                android:contentDescription="@string/auth_host_address"\r
                 >\r
                                <requestFocus />\r
@@ -111,8 +111,8 @@
             android:drawableLeft="@android:drawable/stat_notify_sync"\r
             android:drawablePadding="5dp"\r
             android:gravity="center_vertical"\r
             android:drawableLeft="@android:drawable/stat_notify_sync"\r
             android:drawablePadding="5dp"\r
             android:gravity="center_vertical"\r
-            android:textColor="#AAAAAA"\r
-            android:textColorHint="#AAAAAA"\r
+            android:textColor="@color/login_text_color"\r
+            android:textColorHint="@color/login_text_hint_color"\r
             android:text="@string/auth_testing_connection"\r
             android:contentDescription="@string/auth_testing_connection"/>\r
 \r
             android:text="@string/auth_testing_connection"\r
             android:contentDescription="@string/auth_testing_connection"/>\r
 \r
@@ -124,8 +124,8 @@
             android:onClick="onCheckClick"\r
             android:text="@string/oauth_check_onoff"\r
             android:textAppearance="?android:attr/textAppearanceSmall"\r
             android:onClick="onCheckClick"\r
             android:text="@string/oauth_check_onoff"\r
             android:textAppearance="?android:attr/textAppearanceSmall"\r
-            android:textColor="#AAAAAA"\r
-            android:textColorHint="#AAAAAA"\r
+            android:textColor="@color/login_text_color"\r
+            android:textColorHint="@color/login_text_hint_color"\r
             android:contentDescription="@string/oauth_check_onoff"\r
             />\r
 \r
             android:contentDescription="@string/oauth_check_onoff"\r
             />\r
 \r
@@ -135,8 +135,8 @@
             android:layout_height="wrap_content"\r
             android:ems="10"\r
                        android:enabled="false"\r
             android:layout_height="wrap_content"\r
             android:ems="10"\r
                        android:enabled="false"\r
-            android:textColor="#AAAAAA"\r
-            android:textColorHint="#AAAAAA"\r
+            android:textColor="@color/login_text_color"\r
+            android:textColorHint="@color/login_text_hint_color"\r
             android:text="@string/oauth2_url_endpoint_auth"\r
             android:singleLine="true"\r
             android:inputType="textUri"\r
             android:text="@string/oauth2_url_endpoint_auth"\r
             android:singleLine="true"\r
             android:inputType="textUri"\r
@@ -152,8 +152,8 @@
             android:text="@string/oauth2_url_endpoint_access"\r
             android:singleLine="true"\r
             android:inputType="textUri"\r
             android:text="@string/oauth2_url_endpoint_access"\r
             android:singleLine="true"\r
             android:inputType="textUri"\r
-            android:textColor="#AAAAAA"\r
-            android:textColorHint="#AAAAAA"\r
+            android:textColor="@color/login_text_color"\r
+            android:textColorHint="@color/login_text_hint_color"\r
             android:visibility="gone"/>\r
 \r
         <EditText\r
             android:visibility="gone"/>\r
 \r
         <EditText\r
@@ -163,8 +163,8 @@
             android:ems="10"\r
             android:hint="@string/auth_username"\r
             android:inputType="textNoSuggestions"\r
             android:ems="10"\r
             android:hint="@string/auth_username"\r
             android:inputType="textNoSuggestions"\r
-            android:textColor="#AAAAAA"\r
-            android:textColorHint="#AAAAAA"\r
+            android:textColor="@color/login_text_color"\r
+            android:textColorHint="@color/login_text_hint_color"\r
             android:contentDescription="@string/auth_username"\r
             />\r
 \r
             android:contentDescription="@string/auth_username"\r
             />\r
 \r
@@ -176,8 +176,8 @@
                    android:ems="10"\r
                    android:hint="@string/auth_password"\r
                    android:inputType="textPassword"\r
                    android:ems="10"\r
                    android:hint="@string/auth_password"\r
                    android:inputType="textPassword"\r
-            android:textColor="#AAAAAA"\r
-            android:textColorHint="#AAAAAA"\r
+            android:textColor="@color/login_text_color"\r
+            android:textColorHint="@color/login_text_hint_color"\r
                    android:contentDescription="@string/auth_password"\r
             />\r
         \r
                    android:contentDescription="@string/auth_password"\r
             />\r
         \r
@@ -190,8 +190,8 @@
             android:drawablePadding="5dp"\r
             android:gravity="center_vertical"\r
             android:text="@string/auth_unauthorized"\r
             android:drawablePadding="5dp"\r
             android:gravity="center_vertical"\r
             android:text="@string/auth_unauthorized"\r
-            android:textColor="#AAAAAA"\r
-            android:textColorHint="#AAAAAA"\r
+            android:textColor="@color/login_text_color"\r
+            android:textColorHint="@color/login_text_hint_color"\r
             android:contentDescription="@string/auth_unauthorized"/>\r
 \r
         <Button\r
             android:contentDescription="@string/auth_unauthorized"/>\r
 \r
         <Button\r
@@ -213,8 +213,8 @@
             android:paddingBottom="5dp"\r
             android:paddingTop="5dp"\r
             android:text="@string/auth_register"\r
             android:paddingBottom="5dp"\r
             android:paddingTop="5dp"\r
             android:text="@string/auth_register"\r
-            android:textColor="#AAAAAA"\r
-            android:textColorHint="#AAAAAA"\r
+            android:textColor="@color/login_text_color"\r
+            android:textColorHint="@color/login_text_hint_color"\r
             android:contentDescription="@string/auth_register"/>\r
 \r
     </LinearLayout>\r
             android:contentDescription="@string/auth_register"/>\r
 \r
     </LinearLayout>\r
diff --git a/res/values/colors.xml b/res/values/colors.xml
index bd28816..d4cc738 100644 (file)
--- a/res/values/colors.xml
+++ b/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="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>
 
     <!-- Colors -->
     <color name="color_accent">@color/owncloud_blue_accent</color>
ownCloud Android App