From 3e439bc37874f30c89e6268b3e1130ea449a0a43 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Thu, 6 Jun 2019 13:49:13 +0200
Subject: [PATCH] temp

---
 .../messenger/ui/chat/ChatInputFragment.java  |  4 ++--
 .../messenger/ui/login/LoginActivity.java     |  7 ++++---
 app/src/main/res/layout/activity_login.xml    | 21 +++++++------------
 app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatInputFragment.java b/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatInputFragment.java
index d4818f4..6da1a18 100644
--- a/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatInputFragment.java
+++ b/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatInputFragment.java
@@ -46,11 +46,11 @@ public class ChatInputFragment extends Fragment implements View.OnClickListener
         return view;
     }
 
-    @Override2
+    @Override
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         mViewModel = ViewModelProviders.of(this).get(ChatInputViewModel.class);
-        // observeViewModel(mViewModel);
+        observeViewModel(mViewModel);
     }
 
     private void observeViewModel(ChatInputViewModel viewModel) {
diff --git a/app/src/main/java/org/mercury_im/messenger/ui/login/LoginActivity.java b/app/src/main/java/org/mercury_im/messenger/ui/login/LoginActivity.java
index e5cf1bd..a207853 100644
--- a/app/src/main/java/org/mercury_im/messenger/ui/login/LoginActivity.java
+++ b/app/src/main/java/org/mercury_im/messenger/ui/login/LoginActivity.java
@@ -16,6 +16,8 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
+import com.google.android.material.textfield.TextInputEditText;
+
 import org.jxmpp.jid.EntityBareJid;
 import org.jxmpp.jid.impl.JidCreate;
 import org.mercury_im.messenger.MercuryImApplication;
@@ -40,10 +42,10 @@ public class LoginActivity extends AppCompatActivity implements TextView.OnEdito
 
     // UI references.
     @BindView(R.id.jid)
-    private AutoCompleteTextView mJidView;
+    TextInputEditText mJidView;
 
     @BindView(R.id.password)
-    private EditText mPasswordView;
+    TextInputEditText mPasswordView;
 
     private LoginViewModel viewModel;
 
@@ -160,4 +162,3 @@ public class LoginActivity extends AppCompatActivity implements TextView.OnEdito
         return false;
     }
 }
-
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index fca31c4..1168137 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center_horizontal"
@@ -11,15 +13,6 @@
     android:paddingBottom="@dimen/activity_vertical_margin"
     tools:context=".ui.login.LoginActivity">
 
-    <!-- Login progress -->
-    <ProgressBar
-        android:id="@+id/login_progress"
-        style="?android:attr/progressBarStyleLarge"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:visibility="gone" />
-
     <ScrollView
         android:id="@+id/login_form"
         android:layout_width="match_parent"
@@ -35,7 +28,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <AutoCompleteTextView
+                <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/jid"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -48,9 +41,11 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                app:passwordToggleEnabled="true"
+                app:passwordToggleContentDescription="@string/password_show_password">
 
-                <EditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/password"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0ea882a..4d27331 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -88,4 +88,5 @@
     <string name="action_settings">Settings</string>
     <string name="channel_name_foreground">Foreground Service</string>
     <string name="channel_description_foreground">Service that keeps the app running</string>
+    <string name="password_show_password">Show Password</string>
 </resources>