Fix material light theme so colors do not get covered

2 files changed, 12 insertions, 1 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
index 1dbf651e..53745602 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
@@ -11,6 +11,7 @@ import com.pitchedapps.frost.activities.LoginActivity
 import com.pitchedapps.frost.activities.MainActivity
 import com.pitchedapps.frost.activities.SelectorActivity
 import com.pitchedapps.frost.activities.WebOverlayActivity
+import com.pitchedapps.frost.dbflow.removeCookie
 import com.pitchedapps.frost.facebook.FB_URL_BASE
 import com.pitchedapps.frost.facebook.FbCookie
 import com.pitchedapps.frost.facebook.FbItem
@@ -52,7 +53,10 @@ open class FrostWebViewClient(val webCore: FrostWebViewCore) : BaseWebViewClient
         refreshObservable.onNext(true)
         if (!url.isFacebookUrl) return
         if (url.contains("logout.php")) FbCookie.logout(Prefs.userId, { launchLogin(view.context) })
-        else if (url.contains("login.php")) FbCookie.reset({ launchLogin(view.context) })
+        else if (url.contains("login.php")) {
+            removeCookie(Prefs.userId) // cookie is invalid
+            FbCookie.reset({ launchLogin(view.context) })
+        }
     }
 
 
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
index dd8e2390..6bf04ae1 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
@@ -2,6 +2,7 @@ package com.pitchedapps.frost.web
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.graphics.Color
 import android.util.AttributeSet
 import android.view.View
 import android.webkit.*
@@ -17,6 +18,7 @@ import com.pitchedapps.frost.utils.Prefs
 import com.pitchedapps.frost.utils.isFacebookUrl
 import org.jetbrains.anko.doAsync
 import org.jetbrains.anko.uiThread
+import org.jetbrains.anko.withAlpha
 
 /**
  * Created by Allan Wang on 2017-05-29.
@@ -74,6 +76,11 @@ class LoginWebView @JvmOverloads constructor(
             }
         }
 
+        override fun onPageCommitVisible(view: WebView, url: String?) {
+            super.onPageCommitVisible(view, url)
+            view.setBackgroundColor(Color.TRANSPARENT)
+        }
+
         override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean {
             //For now, we will ignore all attempts to launch external apps during login
             if (request.url == null || request.url.scheme == "intent" || request.url.scheme == "android-app")