fix white text on configuration screen

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 6b1bd1c..145576b 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -143,9 +143,9 @@
 \r
             <Button\r
                 android:id="@+id/buttonOK"\r
 \r
             <Button\r
                 android:id="@+id/buttonOK"\r

-                android:layout_width="wrap_content"\r
+                android:layout_width="fill_parent"\r

                 android:layout_height="wrap_content"\r
                 android:layout_height="wrap_content"\r

-                android:layout_weight=".50"\r
+                android:layout_weight=".75"\r

                 android:onClick="onOkClick"\r
                 android:textColor="@android:color/black"\r
                 android:text="@string/setup_btn_connect" >\r
                 android:onClick="onOkClick"\r
                 android:textColor="@android:color/black"\r
                 android:text="@string/setup_btn_connect" >\r


@@ -153,9 +153,9 @@
 \r
             <Button\r
                 android:id="@+id/buttonNotUser"\r
 \r
             <Button\r
                 android:id="@+id/buttonNotUser"\r

-                android:layout_width="wrap_content"\r
+                android:layout_width="fill_parent"\r

                 android:layout_height="wrap_content"\r
                 android:layout_height="wrap_content"\r

-                android:layout_weight=".50"\r
+                android:layout_weight=".75"\r

                 android:onClick="onNotUserClick"\r
                 android:textColor="@android:color/black"\r
                 android:text="Get started!" >\r
                 android:onClick="onNotUserClick"\r
                 android:textColor="@android:color/black"\r
                 android:text="Get started!" >\r

diff --git a/src/eu/alefzero/owncloud/authenticator/AccountAuthenticator.java b/src/eu/alefzero/owncloud/authenticator/AccountAuthenticator.java
index 42df09f..a346e2c 100644 (file)
--- a/src/eu/alefzero/owncloud/authenticator/AccountAuthenticator.java
+++ b/src/eu/alefzero/owncloud/authenticator/AccountAuthenticator.java
@@ -10,8 +10,6 @@ import android.util.Log;
 public class AccountAuthenticator extends AbstractAccountAuthenticator {\r
     public static final String OPTIONS_USERNAME = "username";\r
     public static final String OPTIONS_PASSWORD = "password";\r
 public class AccountAuthenticator extends AbstractAccountAuthenticator {\r
     public static final String OPTIONS_USERNAME = "username";\r
     public static final String OPTIONS_PASSWORD = "password";\r

-    public static final String OPTIONS_FILE_LIST_SYNC_ENABLED = "filelist";\r
-    public static final String OPTIONS_PINNED_FILE_SYNC_ENABLED = "pinned";\r

 \r
     public static final String ACCOUNT_TYPE = "owncloud";\r
     public static final String AUTH_TOKEN_TYPE = "org.owncloud";\r
 \r
     public static final String ACCOUNT_TYPE = "owncloud";\r
     public static final String AUTH_TOKEN_TYPE = "org.owncloud";\r

diff --git a/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java b/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
index 9b76810..c62290b 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
@@ -21,6 +21,8 @@ package eu.alefzero.owncloud.ui.activity;
 import java.net.MalformedURLException;\r
 import java.net.URL;\r
 \r
 import java.net.MalformedURLException;\r
 import java.net.URL;\r
 \r

+import com.actionbarsherlock.ActionBarSherlock;\r
+\r

 import android.accounts.Account;\r
 import android.accounts.AccountAuthenticatorActivity;\r
 import android.accounts.AccountManager;\r
 import android.accounts.Account;\r
 import android.accounts.AccountAuthenticatorActivity;\r
 import android.accounts.AccountManager;\r


@@ -167,7 +169,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity {
             url_text.setTextColor(Color.RED);\r
             hasErrors = true;\r
         } else {\r
             url_text.setTextColor(Color.RED);\r
             hasErrors = true;\r
         } else {\r

-            url_text.setTextColor(android.R.color.primary_text_light);\r
+            url_text.setTextColor(android.R.color.black);\r

         }\r
         try {\r
             String url_str = url_text.getText().toString();\r
         }\r
         try {\r
             String url_str = url_text.getText().toString();\r


@@ -190,14 +192,14 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity {
             username_text.setTextColor(Color.RED);\r
             hasErrors = true;\r
         } else {\r
             username_text.setTextColor(Color.RED);\r
             hasErrors = true;\r
         } else {\r

-            username_text.setTextColor(android.R.color.primary_text_light);\r
+            username_text.setTextColor(android.R.color.black);\r

         }\r
 \r
         if (password_text.getText().toString().trim().length() == 0) {\r
             password_text.setTextColor(Color.RED);\r
             hasErrors = true;\r
         } else {\r
         }\r
 \r
         if (password_text.getText().toString().trim().length() == 0) {\r
             password_text.setTextColor(Color.RED);\r
             hasErrors = true;\r
         } else {\r

-            password_text.setTextColor(android.R.color.primary_text_light);\r
+            password_text.setTextColor(android.R.color.black);\r

         }\r
         if (hasErrors) {\r
             return;\r
         }\r
         if (hasErrors) {\r
             return;\r