diff options
author | Allan Wang <me@allanwang.ca> | 2017-08-18 14:40:08 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-18 14:40:08 -0700 |
commit | 52bfdb66ca8d44986b3f1ae51c921a939db17ac6 (patch) | |
tree | 32f58037b4091ed19a15f71b6cf7ee358a6f5820 /app/src/main/kotlin/com/pitchedapps/frost/injectors | |
parent | 2eaad9b72746d57c187d2ded7f40d803f88dfcee (diff) | |
download | frost-52bfdb66ca8d44986b3f1ae51c921a939db17ac6.tar.gz frost-52bfdb66ca8d44986b3f1ae51c921a939db17ac6.tar.bz2 frost-52bfdb66ca8d44986b3f1ae51c921a939db17ac6.zip |
Misc (#190)
* Update play store description
* Finalize description
* Update kotlin and bg2 for custom themes
* Update to Android Studio 3.0 beta 2
* Update test dependencies and add logging to image activity
* Rename throwable to errorRef
* Update searchview and media picker through kau
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/injectors')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt | 7 |
1 files changed, 2 insertions, 5 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 733bc151..e979f8ce 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt @@ -25,13 +25,10 @@ enum class CssAssets(val folder: String = "themes") : InjectorContract { try { var content = webView.context.assets.open("css/$folder/$file").bufferedReader().use { it.readText() } if (this == CUSTOM) { - var bbt = Prefs.bgColor val bt: String - if (Color.alpha(bbt) == 255) { - bbt = bbt.adjustAlpha(0.2f).colorToForeground(0.35f) + if (Color.alpha(Prefs.bgColor) == 255) { bt = Prefs.bgColor.toRgbaString() } else { - bbt = bbt.adjustAlpha(0.05f).colorToForeground(0.5f) bt = "transparent" } content = content @@ -39,7 +36,7 @@ enum class CssAssets(val folder: String = "themes") : InjectorContract { .replace("\$TT\$", Prefs.textColor.colorToBackground(0.05f).toRgbaString()) .replace("\$B\$", Prefs.bgColor.toRgbaString()) .replace("\$BT\$", bt) - .replace("\$BBT\$", bbt.toRgbaString()) + .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("\$D\$", Prefs.textColor.adjustAlpha(0.3f).toRgbaString()) |