1 files changed, 33 insertions, 12 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt
index 379bb22d..143c9f5a 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt
@@ -1,18 +1,20 @@
 package com.pitchedapps.frost.web
 
 import android.graphics.Bitmap
-import android.view.View
+import android.view.KeyEvent
 import android.webkit.*
 import com.pitchedapps.frost.facebook.FACEBOOK_COM
 import com.pitchedapps.frost.facebook.FbCookie
 import com.pitchedapps.frost.injectors.CssAssets
 import com.pitchedapps.frost.utils.L
+import com.pitchedapps.frost.views.circularReveal
+import com.pitchedapps.frost.views.fadeOut
 import io.reactivex.subjects.Subject
 
 /**
  * Created by Allan Wang on 2017-05-31.
  */
-class FrostWebViewClient(val observable: Subject<WebStatus>) : WebViewClient() {
+class FrostWebViewClient : WebViewClient() {
 
     companion object {
         //Collections of jewels mapped with url match -> id
@@ -23,31 +25,50 @@ class FrostWebViewClient(val observable: Subject<WebStatus>) : WebViewClient() {
         }
     }
 
-    override fun onReceivedError(view: WebView?, request: WebResourceRequest?, error: WebResourceError?) {
-        super.onReceivedError(view, request, error)
-        observable.onNext(WebStatus.ERROR)
-        L.e("FWV Error ${request}")
-    }
-
     override fun onPageStarted(view: WebView, url: String, favicon: Bitmap?) {
         super.onPageStarted(view, url, favicon)
-        observable.onNext(WebStatus.LOADING)
         L.d("FWV Loading $url")
         if (!url.contains(FACEBOOK_COM)) return
         if (url.contains("logout.php")) FbCookie.logout()
-        view.visibility = View.INVISIBLE
+        view.fadeOut(duration = 200L)
     }
 
     override fun onPageFinished(view: WebView, url: String) {
         super.onPageFinished(view, url)
         if (!url.contains(FACEBOOK_COM)) return
-        observable.onNext(WebStatus.LOADED)
         FbCookie.checkUserId(url, CookieManager.getInstance().getCookie(url))
         CssAssets.BASE.inject(view, {
-            view.visibility = View.VISIBLE
+            view.circularReveal(offset = 150L)
         })
     }
 
+    override fun shouldOverrideKeyEvent(view: WebView, event: KeyEvent): Boolean {
+        L.d("Key event ${event.keyCode}")
+        return super.shouldOverrideKeyEvent(view, event)
+    }
+
+    override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean {
+        L.d("Hi")
+        L.d("Url Loading ${request.url?.path}")
+        return super.shouldOverrideUrlLoading(view, request)
+    }
+
+    override fun shouldInterceptRequest(view: WebView, request: WebResourceRequest): WebResourceResponse? {
+        if (!request.url.host.contains(FACEBOOK_COM)) return super.shouldInterceptRequest(view, request)
+        L.d("Url intercept ${request.url.path}")
+        return super.shouldInterceptRequest(view, request)
+    }
+
+    override fun onLoadResource(view: WebView, url: String) {
+        if (!url.contains(FACEBOOK_COM)) return super.onLoadResource(view, url)
+        L.d("Resource $url")
+        FrostWebOverlay.values.forEach {
+            if (url.contains(it.match))
+                L.d("Loaded $it")
+        }
+        super.onLoadResource(view, url)
+    }
+
     fun logout() {
 
     }