diff options
| author | Allan Wang <me@allanwang.ca> | 2017-09-24 16:18:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-24 16:18:23 -0400 |
| commit | c4453c85557d2dbf24fa72def544335fe5782182 (patch) | |
| tree | b18c2f85cb8917d238b2013e7098cba801728141 /app/src/main/kotlin/com | |
| parent | 3c85f0e84b4aa3062a25c978ea88497f4c1e6f25 (diff) | |
| download | frost-c4453c85557d2dbf24fa72def544335fe5782182.tar.gz frost-c4453c85557d2dbf24fa72def544335fe5782182.tar.bz2 frost-c4453c85557d2dbf24fa72def544335fe5782182.zip | |
Fix background color for non facebook pages (#335)
Diffstat (limited to 'app/src/main/kotlin/com')
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt | 2 | ||||
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt index cf935360..3155b11a 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt @@ -39,7 +39,7 @@ enum class CssAssets(val folder: String = "themes") : InjectorContract { .replace("\$BT\$", bt) .replace("\$BBT\$", Prefs.bgColor.withAlpha(51).colorToForeground(0.35f).toRgbaString()) .replace("\$O\$", Prefs.bgColor.withAlpha(255).toRgbaString()) - .replace("\$OO\$", Prefs.bgColor.colorToForeground(0.35f).withAlpha(255).toRgbaString()) + .replace("\$OO\$", Prefs.bgColor.withAlpha(255).colorToForeground(0.35f).toRgbaString()) .replace("\$D\$", Prefs.textColor.adjustAlpha(0.3f).toRgbaString()) } injector = JsBuilder().css(content).build() 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 c398469c..31aaaa6f 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt @@ -50,7 +50,6 @@ open class FrostWebViewClient(val webCore: FrostWebViewCore) : BaseWebViewClient refreshObservable.onNext(true) } - fun launchLogin(c: Context) { if (c is MainActivity && c.cookies().isNotEmpty()) c.launchNewTask(SelectorActivity::class.java, c.cookies()) @@ -58,8 +57,15 @@ open class FrostWebViewClient(val webCore: FrostWebViewCore) : BaseWebViewClient c.launchNewTask(LoginActivity::class.java) } - private fun injectBackgroundColor() - = webCore.setBackgroundColor(if (isMain) Color.TRANSPARENT else Prefs.bgColor.withAlpha(255)) + private fun injectBackgroundColor() { + webCore.setBackgroundColor( + when { + isMain -> Color.TRANSPARENT + webCore.url.isFacebookUrl -> Prefs.bgColor.withAlpha(255) + else -> Color.WHITE + } + ) + } override fun onPageCommitVisible(view: WebView, url: String?) { |