diff options
| author | Allan Wang <me@allanwang.ca> | 2017-06-14 17:01:13 -0700 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2017-06-14 17:01:13 -0700 |
| commit | fbbc92e4c98a30e107fb2a63887f8b6d20bffabb (patch) | |
| tree | ec603d3379ddad94df084f94132ac0c739bcb4ac /app/src/main/kotlin/com/pitchedapps/frost/web | |
| parent | aa01ec691ef2638da7c22bf3cbd1a9c5e213ca1f (diff) | |
| download | frost-fbbc92e4c98a30e107fb2a63887f8b6d20bffabb.tar.gz frost-fbbc92e4c98a30e107fb2a63887f8b6d20bffabb.tar.bz2 frost-fbbc92e4c98a30e107fb2a63887f8b6d20bffabb.zip | |
Update themes and started theme settings
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/web')
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt | 7 | ||||
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClientMenu.kt | 4 |
2 files changed, 3 insertions, 8 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 2f24d055..4845f553 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt @@ -10,9 +10,7 @@ import com.pitchedapps.frost.MainActivity import com.pitchedapps.frost.SelectorActivity import com.pitchedapps.frost.facebook.FACEBOOK_COM import com.pitchedapps.frost.facebook.FbCookie -import com.pitchedapps.frost.injectors.CssAssets -import com.pitchedapps.frost.injectors.JsActions -import com.pitchedapps.frost.injectors.JsAssets +import com.pitchedapps.frost.injectors.* import com.pitchedapps.frost.utils.L import com.pitchedapps.frost.utils.Prefs import com.pitchedapps.frost.utils.cookies @@ -63,7 +61,8 @@ open class FrostWebViewClient(val refreshObservable: Subject<Boolean>) : WebView internal fun onPageFinishedReveal(view: FrostWebViewCore, animate: Boolean) { L.d("Page finished reveal") - CssAssets.HEADER.inject(view, { + view.jsInject(CssHider.HEADER, CssAssets.MATERIAL_DARK, callback = { + L.d("Finished ${it.contentToString()}") refreshObservable.onNext(false) if (animate) view.circularReveal(offset = 150L) else view.fadeIn(duration = 100L) diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClientMenu.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClientMenu.kt index faf42fdd..3b032f62 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClientMenu.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClientMenu.kt @@ -13,7 +13,6 @@ class FrostWebViewClientMenu(refreshObservable: Subject<Boolean>) : FrostWebView var content: String? = null var view: FrostWebViewCore? = null - var loadingFromBase: Boolean = false override fun onPageStarted(view: WebView, url: String, favicon: Bitmap?) { super.onPageStarted(view, url, favicon) @@ -22,7 +21,6 @@ class FrostWebViewClientMenu(refreshObservable: Subject<Boolean>) : FrostWebView "https://m.facebook.com/settings", "https://m.facebook.com/settings#", "https://m.facebook.com/settings#!/settings?soft=bookmarks" -> { - loadingFromBase = true L.d("Load from stored $url") view.stopLoading() view.loadDataWithBaseURL("https://touch.facebook.com/notifications", content, "text/html", "utf-8", "https://google.ca/test") @@ -33,8 +31,6 @@ class FrostWebViewClientMenu(refreshObservable: Subject<Boolean>) : FrostWebView override fun onPageFinished(view: WebView, url: String) { super.onPageFinished(view, url) - L.d("DON $url") - loadingFromBase = false with(view as FrostWebViewCore) { if (url == view.baseUrl) { this@FrostWebViewClientMenu.view = view |