From 4d5754ac5ddbe0f02f8afd8b5b9a0bae4bfc633d Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 15 Mar 2018 21:28:30 +0100
Subject: Change ShowHidePasswordEditText to TextInputEditText.

change the input fields in the AccountActivity to use the TextInputLayout.
---
 src/main/res/drawable/ic_visibility.xml            |   9 ++
 src/main/res/drawable/ic_visibility_off.xml        |   9 ++
 .../res/drawable/visibility_toggle_drawable.xml    |   5 +
 src/main/res/layout/activity_change_password.xml   |  86 +++++++---------
 src/main/res/layout/activity_edit_account.xml      | 114 ++++++++++-----------
 5 files changed, 114 insertions(+), 109 deletions(-)
 create mode 100644 src/main/res/drawable/ic_visibility.xml
 create mode 100644 src/main/res/drawable/ic_visibility_off.xml
 create mode 100644 src/main/res/drawable/visibility_toggle_drawable.xml

(limited to 'src/main/res')

diff --git a/src/main/res/drawable/ic_visibility.xml b/src/main/res/drawable/ic_visibility.xml
new file mode 100644
index 000000000..57ba4f002
--- /dev/null
+++ b/src/main/res/drawable/ic_visibility.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
+</vector>
\ No newline at end of file
diff --git a/src/main/res/drawable/ic_visibility_off.xml b/src/main/res/drawable/ic_visibility_off.xml
new file mode 100644
index 000000000..fd954d349
--- /dev/null
+++ b/src/main/res/drawable/ic_visibility_off.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
+</vector>
\ No newline at end of file
diff --git a/src/main/res/drawable/visibility_toggle_drawable.xml b/src/main/res/drawable/visibility_toggle_drawable.xml
new file mode 100644
index 000000000..9c887e7e9
--- /dev/null
+++ b/src/main/res/drawable/visibility_toggle_drawable.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_visibility" android:state_checked="true" />
+    <item android:drawable="@drawable/ic_visibility_off" android:state_checked="false" />
+</selector>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml
index 8808227e3..de1ad216d 100644
--- a/src/main/res/layout/activity_change_password.xml
+++ b/src/main/res/layout/activity_change_password.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/grey200">
@@ -12,67 +13,54 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/activity_vertical_margin"
             android:layout_marginLeft="@dimen/activity_horizontal_margin"
             android:layout_marginRight="@dimen/activity_horizontal_margin"
             android:layout_marginTop="@dimen/activity_vertical_margin"
-            android:layout_marginBottom="@dimen/activity_vertical_margin"
             android:background="@drawable/infocard_border"
-            android:padding="@dimen/infocard_padding"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:padding="@dimen/infocard_padding">
 
-            <TextView
-                android:id="@+id/current_password_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/current_password"
-                android:textColor="@color/black87"
-                android:textSize="?attr/TextSizeBody" />
-
-            <EditText
-                android:id="@+id/current_password"
+            <android.support.design.widget.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:hint="@string/password"
-                android:inputType="textPassword"
-                android:textColor="@color/black87"
-                android:textColorHint="@color/black54"
-                android:textSize="?attr/TextSizeBody" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/new_password"
-                android:textColor="@color/black87"
-                android:textSize="?attr/TextSizeBody" />
+                app:passwordToggleDrawable="@drawable/visibility_toggle_drawable"
+                app:passwordToggleEnabled="true"
+                app:passwordToggleTint="?attr/color_text_secondary">
 
-            <EditText
-                android:id="@+id/new_password"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:hint="@string/password"
-                android:inputType="textPassword"
-                android:textColor="@color/black87"
-                android:textColorHint="@color/black54"
-                android:textSize="?attr/TextSizeBody" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/account_settings_confirm_password"
-                android:textColor="@color/black87"
-                android:textSize="?attr/TextSizeBody" />
+                <android.support.design.widget.TextInputEditText
+                    android:id="@+id/current_password"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    android:layout_marginBottom="8dp"
+                    android:hint="@string/current_password"
+                    android:inputType="textPassword"
+                    android:textColor="?attr/color_text_primary"
+                    android:textColorHint="?attr/color_text_secondary"
+                    android:textSize="?attr/TextSizeBody" />
+            </android.support.design.widget.TextInputLayout>
 
-            <EditText
-                android:id="@+id/new_password_confirm"
+            <android.support.design.widget.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/password"
-                android:inputType="textPassword"
-                android:textColor="@color/black87"
-                android:textColorHint="@color/black54"
-                android:textSize="?attr/TextSizeBody" />
+                app:passwordToggleDrawable="@drawable/visibility_toggle_drawable"
+                app:passwordToggleEnabled="true"
+                app:passwordToggleTint="?attr/color_text_secondary">
+
+                <android.support.design.widget.TextInputEditText
+                    android:id="@+id/new_password"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    android:layout_marginBottom="8dp"
+                    android:hint="@string/new_password"
+                    android:inputType="textPassword"
+                    android:textColor="?attr/color_text_primary"
+                    android:textColorHint="?attr/color_text_secondary"
+                    android:textSize="?attr/TextSizeBody" />
+            </android.support.design.widget.TextInputLayout>
         </LinearLayout>
     </ScrollView>
 
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 7b60b7a64..9b9611e99 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -51,42 +51,40 @@
                     android:layout_below="@+id/avater"
                     android:orientation="vertical">
 
-                    <TextView
-                        android:id="@+id/account_jid_label"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/account_settings_jabber_id"
-                        android:textColor="@color/black87"
-                        android:textSize="?attr/TextSizeBody" />
-
-                    <AutoCompleteTextView
-                        android:id="@+id/account_jid"
+                    <android.support.design.widget.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:hint="@string/account_settings_example_jabber_id"
-                        android:inputType="textEmailAddress"
-                        android:imeOptions="actionNext"
-                        android:textColor="@color/black87"
-                        android:textColorHint="@color/black54"
-                        android:textSize="?attr/TextSizeBody" />
+                        android:hint="@string/account_settings_jabber_id">
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:text="@string/account_settings_password"
-                        android:textColor="@color/black87"
-                        android:textSize="?attr/TextSizeBody" />
+                        <AutoCompleteTextView
+                            android:id="@+id/account_jid"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:imeOptions="actionNext"
+                            android:inputType="textEmailAddress"
+                            android:textColor="?attr/color_text_primary"
+                            android:textColorHint="?attr/color_text_secondary"
+                            android:textSize="?attr/TextSizeBody" />
+                    </android.support.design.widget.TextInputLayout>
 
-                    <EditText
-                        android:id="@+id/account_password"
+                    <android.support.design.widget.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:hint="@string/password"
-                        android:inputType="textPassword"
-                        android:textColor="@color/black87"
-                        android:textColorHint="@color/black54"
-                        android:textSize="?attr/TextSizeBody" />
+                        android:id="@+id/text_input_password_toggle"
+                        app:passwordToggleDrawable="@drawable/visibility_toggle_drawable"
+                        app:passwordToggleEnabled="true"
+                        app:passwordToggleTint="?attr/color_text_secondary">
+
+                        <android.support.design.widget.TextInputEditText
+                            android:id="@+id/account_password"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/password"
+                            android:inputType="textPassword"
+                            android:textColor="@color/black87"
+                            android:textColorHint="@color/black54"
+                            android:textSize="?attr/TextSizeBody" />
+                    </android.support.design.widget.TextInputLayout>
 
                     <LinearLayout
                         android:id="@+id/name_port"
@@ -102,23 +100,20 @@
                             android:layout_weight="0.8"
                             android:orientation="vertical">
 
-                            <TextView
-                                android:id="@+id/textView"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/account_settings_hostname"
-                                android:textColor="@color/black87"
-                                android:textSize="?attr/TextSizeBody" />
-
-                            <EditText
-                                android:id="@+id/hostname"
-                                android:layout_width="fill_parent"
+                            <android.support.design.widget.TextInputLayout
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:hint="@string/hostname_or_onion"
-                                android:inputType="textNoSuggestions"
-                                android:textColor="@color/black87"
-                                android:textColorHint="@color/black54"
-                                android:textSize="?attr/TextSizeBody" />
+                                android:hint="@string/account_settings_hostname">
+
+                                <EditText
+                                    android:id="@+id/hostname"
+                                    android:layout_width="fill_parent"
+                                    android:layout_height="wrap_content"
+                                    android:inputType="textNoSuggestions"
+                                    android:textColor="?attr/color_text_primary"
+                                    android:textColorHint="?attr/color_text_secondary"
+                                    android:textSize="?attr/TextSizeBody" />
+                            </android.support.design.widget.TextInputLayout>
                         </LinearLayout>
 
                         <LinearLayout
@@ -127,22 +122,21 @@
                             android:layout_weight="0.2"
                             android:orientation="vertical">
 
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/account_settings_port"
-                                android:textColor="@color/black87"
-                                android:textSize="?attr/TextSizeBody" />
-
-                            <EditText
-                                android:id="@+id/port"
+                            <android.support.design.widget.TextInputLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent"
-                                android:inputType="number"
-                                android:maxLength="5"
-                                android:textColor="@color/black87"
-                                android:textColorHint="@color/black54"
-                                android:textSize="?attr/TextSizeBody" />
+                                android:hint="@string/account_settings_port">
+
+                                <EditText
+                                    android:id="@+id/port"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="match_parent"
+                                    android:inputType="number"
+                                    android:maxLength="5"
+                                    android:textColor="?attr/color_text_primary"
+                                    android:textColorHint="?attr/color_text_secondary"
+                                    android:textSize="?attr/TextSizeBody" />
+                            </android.support.design.widget.TextInputLayout>
                         </LinearLayout>
                     </LinearLayout>
 
-- 
cgit v1.2.3