css updates and beginning login migration

1 files changed, 8 insertions, 10 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 143c9f5a..4dcf0d9e 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt
@@ -9,12 +9,11 @@ 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 : WebViewClient() {
+class FrostWebViewClient(val position: () -> Int) : WebViewClient() {
 
     companion object {
         //Collections of jewels mapped with url match -> id
@@ -27,17 +26,17 @@ class FrostWebViewClient : WebViewClient() {
 
     override fun onPageStarted(view: WebView, url: String, favicon: Bitmap?) {
         super.onPageStarted(view, url, favicon)
-        L.d("FWV Loading $url")
+        L.i("FWV Loading $url")
         if (!url.contains(FACEBOOK_COM)) return
-        if (url.contains("logout.php")) FbCookie.logout()
+        if (url.contains("logout.php")) FbCookie.logout(position.invoke())
         view.fadeOut(duration = 200L)
     }
 
     override fun onPageFinished(view: WebView, url: String) {
         super.onPageFinished(view, url)
         if (!url.contains(FACEBOOK_COM)) return
-        FbCookie.checkUserId(url, CookieManager.getInstance().getCookie(url))
-        CssAssets.BASE.inject(view, {
+        FbCookie.checkUserId(url, CookieManager.getInstance().getCookie(url), position.invoke())
+        CssAssets.HEADER.inject(view, {
             view.circularReveal(offset = 150L)
         })
     }
@@ -48,23 +47,22 @@ class FrostWebViewClient : WebViewClient() {
     }
 
     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}")
+        L.v("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")
+        L.v("Resource $url")
         FrostWebOverlay.values.forEach {
             if (url.contains(it.match))
-                L.d("Loaded $it")
+                L.d("Resource Loaded $it")
         }
         super.onLoadResource(view, url)
     }