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.

---
 .../infinityforreddit/Activity/LoginActivity.java  | 13 ++++++++++-
 app/src/main/res/layout/activity_login.xml         | 25 +++++++++++++++++++---
 app/src/main/res/values/strings.xml                |  4 ++--
 app/src/main/res/xml/interface_preference.xml      |  2 +-
 4 files changed, 37 insertions(+), 7 deletions(-)

(limited to 'app/src/main')

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/LoginActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/LoginActivity.java
index 4d88df67..a0c51bb3 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/LoginActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/LoginActivity.java
@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
@@ -12,10 +13,12 @@ import android.view.MenuItem;
 import android.webkit.CookieManager;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
 
 import com.google.android.material.appbar.AppBarLayout;
 import com.r0adkll.slidr.Slidr;
@@ -40,6 +43,7 @@ import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
 import ml.docilealligator.infinityforreddit.Utils.APIUtils;
 import ml.docilealligator.infinityforreddit.Utils.SharedPreferencesUtils;
+import ml.docilealligator.infinityforreddit.Utils.Utils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -47,10 +51,14 @@ import retrofit2.Retrofit;
 
 public class LoginActivity extends BaseActivity {
 
+    @BindView(R.id.coordinator_layout_login_activity)
+    CoordinatorLayout coordinatorLayout;
     @BindView(R.id.appbar_layout_login_activity)
     AppBarLayout appBarLayout;
     @BindView(R.id.toolbar_login_activity)
     Toolbar toolbar;
+    @BindView(R.id.two_fa_infO_text_view_login_activity)
+    TextView twoFAInfoTextView;
     @BindView(R.id.webview_login_activity)
     WebView webView;
     @Inject
@@ -95,7 +103,6 @@ public class LoginActivity extends BaseActivity {
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         webView.getSettings().setJavaScriptEnabled(true);
-        webView.getSettings().setDomStorageEnabled(true);
 
         Uri baseUri = Uri.parse(APIUtils.OAUTH_URL);
         Uri.Builder uriBuilder = baseUri.buildUpon();
@@ -223,7 +230,11 @@ public class LoginActivity extends BaseActivity {
 
     @Override
     protected void applyCustomTheme() {
+        coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
         applyAppBarLayoutAndToolbarTheme(appBarLayout, toolbar);
+        twoFAInfoTextView.setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
+        Drawable infoDrawable = Utils.getTintedDrawable(this, R.drawable.ic_info_preference_24dp, mCustomThemeWrapper.getPrimaryIconColor());
+        twoFAInfoTextView.setCompoundDrawablesWithIntrinsicBounds(infoDrawable, null, null, null);
     }
 
     @Override
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: &lt;password&gt;:&lt;2FA code&gt;.\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"
-- 
cgit v1.2.3