From 5a34f444c22687d791d9694b6fef2c630a4a3d0f Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <msfjarvis@gmail.com>
Date: Sun, 31 May 2020 13:42:31 +0530
Subject: Completely revamp decrypted password screen (#817)

* Completely revamp decrypted password screen

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* update changelog

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

Co-authored-by: Fabian Henneke <FabianHenneke@users.noreply.github.com>
---
 app/src/main/res/layout/decrypt_layout.xml | 155 ++++++++---------------------
 1 file changed, 43 insertions(+), 112 deletions(-)

(limited to 'app/src/main/res/layout/decrypt_layout.xml')

diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml
index 932eefd6..590661b3 100644
--- a/app/src/main/res/layout/decrypt_layout.xml
+++ b/app/src/main/res/layout/decrypt_layout.xml
@@ -68,137 +68,68 @@
             app:layout_constraintTop_toBottomOf="@id/crypto_password_last_changed"
             tools:ignore="ContentDescription" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/crypto_container_decrypt"
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/password_text_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/activity_vertical_margin"
-            android:visibility="invisible"
+            android:layout_marginTop="16dp"
+            android:hint="@string/password"
+            android:visibility="gone"
+            app:endIconMode="password_toggle"
             app:layout_constraintTop_toBottomOf="@id/divider"
             tools:visibility="visible">
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/crypto_password_show_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/password"
-                android:textColor="?android:attr/textColor"
-                android:textStyle="bold"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/crypto_password_show"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="fill"
-                android:gravity="bottom"
-                android:textColor="?android:attr/textColor"
-                android:typeface="monospace"
-                app:layout_constraintBaseline_toBaselineOf="@id/crypto_password_show_label"
-                app:layout_constraintStart_toEndOf="@id/crypto_password_show_label" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/crypto_password_toggle_show"
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/password_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:text="@string/show_password"
-                app:layout_constraintTop_toBottomOf="@id/crypto_password_show_label" />
+                android:editable="false"
+                android:fontFamily="@font/sourcecodepro"
+                android:textIsSelectable="true"
+                tools:text="p@55w0rd!" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/crypto_extra_show_layout"
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/username_text_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="invisible"
-            app:layout_constraintTop_toBottomOf="@id/crypto_container_decrypt"
+            android:layout_marginTop="16dp"
+            android:hint="@string/username"
+            android:visibility="gone"
+            app:endIconDrawable="@drawable/ic_content_copy"
+            app:endIconMode="custom"
+            app:layout_constraintTop_toBottomOf="@id/password_text_container"
             tools:visibility="visible">
 
-            <androidx.appcompat.widget.AppCompatImageButton
-                android:id="@+id/crypto_copy_username"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentEnd="true"
-                android:background="?android:attr/windowBackground"
-                android:contentDescription="@string/copy_username"
-                android:src="@drawable/ic_content_copy"
-                android:visibility="invisible"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:visibility="visible" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/crypto_username_show_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentTop="true"
-                android:layout_toStartOf="@id/crypto_copy_username"
-                android:text="@string/username"
-                android:textColor="?android:attr/textColor"
-                android:textStyle="bold"
-                android:visibility="invisible"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:visibility="visible" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/crypto_username_show"
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/username_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/crypto_username_show_label"
-                android:layout_alignParentStart="true"
-                android:layout_toStartOf="@id/crypto_copy_username"
-                android:textColor="?android:attr/textColor"
+                android:editable="false"
                 android:textIsSelectable="true"
-                android:typeface="monospace"
-                android:visibility="invisible"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/crypto_username_show_label"
-                tools:visibility="visible" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/crypto_extra_show_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/crypto_username_show"
-                android:layout_alignParentStart="true"
-                android:text="@string/extra_content"
-                android:textColor="?android:attr/textColor"
-                android:textStyle="bold"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/crypto_username_show" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/crypto_extra_show"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/crypto_extra_show_label"
-                android:layout_alignParentStart="true"
-                android:textColor="?android:attr/textColor"
-                android:textIsSelectable="true"
-                android:typeface="monospace"
-                app:layout_constraintTop_toBottomOf="@id/crypto_extra_show_label" />
+                tools:text="totally_real_user@example.com" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/extra_content_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:hint="@string/extra_content"
+            android:visibility="gone"
+            app:endIconMode="password_toggle"
+            app:layout_constraintTop_toBottomOf="@id/username_text_container"
+            tools:visibility="visible">
 
-            <ToggleButton
-                android:id="@+id/crypto_extra_toggle_show"
-                style="@style/Widget.MaterialComponents.Button"
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/extra_content"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/crypto_extra_show"
-                android:layout_alignParentStart="true"
-                android:backgroundTint="?attr/colorSecondary"
-                android:checked="false"
-                android:paddingTop="8dp"
-                android:textColor="?android:attr/windowBackground"
-                android:textOff="@string/show_extra"
-                android:textOn="@string/hide_extra"
-                app:layout_constraintTop_toBottomOf="@id/crypto_extra_show" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                android:editable="false"
+                android:textIsSelectable="true"
+                tools:text="lots of extra content that will surely fill this \n up well" />
+        </com.google.android.material.textfield.TextInputLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-- 
cgit v1.2.3