Merged request #3

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 0fef48a..277ef36 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -74,6 +74,7 @@
                     android:layout_weight="0.75"\r
                     android:hint="@string/setup_hint_address"\r
                     android:inputType="textUri"\r
                     android:layout_weight="0.75"\r
                     android:hint="@string/setup_hint_address"\r
                     android:inputType="textUri"\r

+                    android:textColor="@android:color/black"\r

                     android:singleLine="true" >\r
 \r
                     <requestFocus>\r
                     android:singleLine="true" >\r
 \r
                     <requestFocus>\r


@@ -119,6 +120,22 @@
 \r
                 </EditText>\r
             </TableRow>\r
 \r
                 </EditText>\r
             </TableRow>\r

+            <TableRow android:id="@+id/tableRow5"\r
+                android:layout_width="fill_parent"\r
+                android:layout_height="wrap_content"\r
+                android:gravity="center_horizontal"\r
+                android:weightSum="1.0">\r
+                \r
+                <CheckBox\r
+                                       android:id="@+id/show_password"\r
+                                       android:layout_width="fill_parent"\r
+                                       android:layout_height="wrap_content"\r
+                                       android:layout_weight=".75"\r
+                                       android:hint="@string/setup_hint_show_password"\r
+                                       android:textColor="@android:color/black"\r
+                                       android:onClick="onCheckboxClick"/>\r
+                \r
+            </TableRow>\r

         </TableLayout>\r
 \r
         <LinearLayout\r
         </TableLayout>\r
 \r
         <LinearLayout\r


@@ -135,6 +152,7 @@
                 android:layout_height="wrap_content"\r
                 android:layout_weight=".50"\r
                 android:onClick="onOkClick"\r
                 android:layout_height="wrap_content"\r
                 android:layout_weight=".50"\r
                 android:onClick="onOkClick"\r

+                android:textColor="@android:color/black"\r

                 android:text="@string/setup_btn_connect" >\r
             </Button>\r
         </LinearLayout>\r
                 android:text="@string/setup_btn_connect" >\r
             </Button>\r
         </LinearLayout>\r

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 966bb45..0d2bb3e 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -30,6 +30,7 @@
     <string name="setup_hint_username">Username</string>
     <string name="setup_hint_password">Password</string>
     <string name="setup_hint_address">Web address</string>
     <string name="setup_hint_username">Username</string>
     <string name="setup_hint_password">Password</string>
     <string name="setup_hint_address">Web address</string>

+    <string name="setup_hint_show_password">Show password?</string>

     <string name="setup_title">Connect to your ownCloud</string>
     <string name="setup_btn_connect">Connect</string>
     <string name="uploader_btn_upload_text">Upload</string>
     <string name="setup_title">Connect to your ownCloud</string>
     <string name="setup_btn_connect">Connect</string>
     <string name="uploader_btn_upload_text">Upload</string>

diff --git a/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java b/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
index 79781f3..31874ad 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
@@ -32,9 +32,11 @@ import android.content.Intent;
 import android.graphics.Color;\r
 import android.os.Bundle;\r
 import android.os.Handler;\r
 import android.graphics.Color;\r
 import android.os.Bundle;\r
 import android.os.Handler;\r

+import android.text.InputType;\r

 import android.util.Log;\r
 import android.view.View;\r
 import android.view.Window;\r
 import android.util.Log;\r
 import android.view.View;\r
 import android.view.Window;\r

+import android.widget.CheckBox;\r

 import android.widget.TextView;\r
 import android.widget.Toast;\r
 import eu.alefzero.owncloud.R;\r
 import android.widget.TextView;\r
 import android.widget.Toast;\r
 import eu.alefzero.owncloud.R;\r


@@ -188,4 +190,21 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity {
                 mHandler,\r
                 AuthenticatorActivity.this);\r
     }\r
                 mHandler,\r
                 AuthenticatorActivity.this);\r
     }\r

+    \r
+    /**\r
+     * Handles the show password checkbox\r
+     * @author robstar\r
+     * @param view\r
+     */\r
+    public void onCheckboxClick(View view) {\r
+       CheckBox checkbox = (CheckBox) findViewById(R.id.show_password);\r
+       TextView password_text = (TextView) findViewById(R.id.account_password);\r
+       \r
+       if(checkbox.isChecked()) {\r
+               password_text.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);\r
+       } else {\r
+               password_text.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);\r
+       }\r
+       \r
+    }\r

 }\r
 }\r