aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res/layout
diff options
context:
space:
mode:
authorAlex Ning <chineseperson5@gmail.com>2020-07-19 06:12:26 +0000
committerAlex Ning <chineseperson5@gmail.com>2020-07-19 06:12:26 +0000
commit5f18f7df646ce5d2637b29fca557ca00766682c7 (patch)
tree193958ddb26b815e6a8cb277ac3e2b2b3a8161ab /app/src/main/res/layout
parentf37a46e2c234fe50efcc867fdd224a14dcbfe45e (diff)
downloadinfinity-for-reddit-5f18f7df646ce5d2637b29fca557ca00766682c7.tar
infinity-for-reddit-5f18f7df646ce5d2637b29fca557ca00766682c7.tar.gz
infinity-for-reddit-5f18f7df646ce5d2637b29fca557ca00766682c7.tar.bz2
infinity-for-reddit-5f18f7df646ce5d2637b29fca557ca00766682c7.tar.lz
infinity-for-reddit-5f18f7df646ce5d2637b29fca557ca00766682c7.tar.xz
infinity-for-reddit-5f18f7df646ce5d2637b29fca557ca00766682c7.tar.zst
infinity-for-reddit-5f18f7df646ce5d2637b29fca557ca00766682c7.zip
Delete webView.getSettings().setDomStorageEnabled(true); in LoginActivity to fix wrong password error. Show an info to guide users how to type in 2FA code.
Diffstat (limited to '')
-rw-r--r--app/src/main/res/layout/activity_login.xml25
1 files changed, 22 insertions, 3 deletions
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>