diff options
| author | Alex Ning <chineseperson5@gmail.com> | 2020-07-19 06:12:26 +0000 |
|---|---|---|
| committer | Alex Ning <chineseperson5@gmail.com> | 2020-07-19 06:12:26 +0000 |
| commit | 5f18f7df646ce5d2637b29fca557ca00766682c7 (patch) | |
| tree | 193958ddb26b815e6a8cb277ac3e2b2b3a8161ab /app/src/main/res | |
| parent | f37a46e2c234fe50efcc867fdd224a14dcbfe45e (diff) | |
| download | infinity-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 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/activity_login.xml | 25 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/xml/interface_preference.xml | 2 |
3 files changed, 25 insertions, 6 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> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 591a7c92..447922e7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -847,7 +847,7 @@ <string name="load_video_in_redgifs">Try loading the video on Redgifs</string> <string name="top_score">%1$s pts</string> - <!-- TODO: Remove or change this placeholder text --> - <string name="hello_blank_fragment">Hello blank fragment</string> + + <string name="login_activity_2fa_prompt">If you have 2-factor authentication enabled, kindly type your password like the following: <password>:<2FA code>.\nExample: yourpass:123456</string> </resources> diff --git a/app/src/main/res/xml/interface_preference.xml b/app/src/main/res/xml/interface_preference.xml index cf959d82..059d08ea 100644 --- a/app/src/main/res/xml/interface_preference.xml +++ b/app/src/main/res/xml/interface_preference.xml @@ -30,7 +30,7 @@ <Preference app:title="@string/settings_time_format_title" app:fragment="ml.docilealligator.infinityforreddit.Settings.TimeFormatPreferenceFragment" /> - + <SwitchPreference app:defaultValue="false" app:key="vote_buttons_on_the_right" |