From c4453c85557d2dbf24fa72def544335fe5782182 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sun, 24 Sep 2017 16:18:23 -0400
Subject: Fix background color for non facebook pages (#335)

---
 .../kotlin/com/pitchedapps/frost/injectors/CssAssets.kt     |  2 +-
 .../kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt | 12 +++++++++---
 app/src/main/res/xml/frost_changelog.xml                    | 13 ++++++++-----
 3 files changed, 18 insertions(+), 9 deletions(-)

(limited to 'app')

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?) {
diff --git a/app/src/main/res/xml/frost_changelog.xml b/app/src/main/res/xml/frost_changelog.xml
index 895c271f..8841974d 100644
--- a/app/src/main/res/xml/frost_changelog.xml
+++ b/app/src/main/res/xml/frost_changelog.xml
@@ -8,14 +8,17 @@
     <item text="" />
     -->
 
-    <!--<version title="Beta Updates" />-->
-	
-	<version title="Beta Updates"/>
+    <version title="Beta Updates"/>
+    <item text="Numerous bug fixes in KAU" />
+    <item text="Set background back to white on non facebook pages" />
+    <item text="" />
+    <item text="" />
+
+	<version title="v1.5.2"/>
 	<item text="Add default download manager to download all files" />
 	<item text="Limit notification sounds when multiple notifications come in" />
 	<item text="Check that job scheduler exists before scheduling notifications" />
-	<item text="" />
-	
+
 	<version title="v1.5.1"/>
 	<item text="Release day is here!" />
 	<item text="Add full support for messaging in overlays. We will dynamically launch new overlays when required to." />
-- 
cgit v1.2.3