diff options
| author | Allan Wang <me@allanwang.ca> | 2017-06-03 22:24:19 -0700 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2017-06-03 22:24:19 -0700 |
| commit | 23d0e789c71ace6a11206a0d6176bd8318185694 (patch) | |
| tree | f1b04c07afcccf74dea9180cdc7d4f8be2c08a09 /app/src/main/kotlin/com/pitchedapps/frost/web | |
| parent | 1f6e34c8f7edeab8af071bfa9cdbd8137c658a69 (diff) | |
| download | frost-23d0e789c71ace6a11206a0d6176bd8318185694.tar.gz frost-23d0e789c71ace6a11206a0d6176bd8318185694.tar.bz2 frost-23d0e789c71ace6a11206a0d6176bd8318185694.zip | |
Crashlytics for test builds
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/web')
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt | 5 | ||||
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt | 3 |
2 files changed, 6 insertions, 2 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 70129429..5c1aa5b1 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt @@ -2,7 +2,10 @@ package com.pitchedapps.frost.web import android.graphics.Bitmap import android.view.KeyEvent -import android.webkit.* +import android.webkit.WebResourceRequest +import android.webkit.WebResourceResponse +import android.webkit.WebView +import android.webkit.WebViewClient import com.pitchedapps.frost.LoginActivity import com.pitchedapps.frost.facebook.FACEBOOK_COM import com.pitchedapps.frost.facebook.FbCookie 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 d7c16a20..7073f645 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt @@ -11,6 +11,7 @@ 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.fadeIn import com.pitchedapps.frost.views.snackbar import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.SingleSubject @@ -84,7 +85,7 @@ class LoginWebView @JvmOverloads constructor( cookieObservable.onNext(Pair(url, CookieManager.getInstance().getCookie(url))) CssAssets.LOGIN.inject(view, { if (view.visibility == View.INVISIBLE) - view.circularReveal(offset = 150L) + view.fadeIn(offset = 150L) }) } } |