From 5f18f7df646ce5d2637b29fca557ca00766682c7 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Sun, 19 Jul 2020 14:12:26 +0800
Subject: Delete webView.getSettings().setDomStorageEnabled(true); in
 LoginActivity to fix wrong password error. Show an info to guide users how to
 type in 2FA code.

---
 app/src/main/res/layout/activity_login.xml | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 04c07f43..b46b2f26 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:id="@+id/coordinator_layout_login_activity"
     tools:application="ml.docilealligator.infinityforreddit.Activity.LoginActivity">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -22,10 +23,28 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <ml.docilealligator.infinityforreddit.CustomView.LollipopBugFixedWebView
-        android:id="@+id/webview_login_activity"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+        android:orientation="vertical"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <TextView
+            android:id="@+id/two_fa_infO_text_view_login_activity"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="16dp"
+            android:drawablePadding="32dp"
+            android:text="@string/login_activity_2fa_prompt"
+            android:textSize="?attr/font_default"
+            android:fontFamily="?attr/font_family" />
+
+        <ml.docilealligator.infinityforreddit.CustomView.LollipopBugFixedWebView
+            android:id="@+id/webview_login_activity"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+    </LinearLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
-- 
cgit v1.2.3