diff options
author | Allan Wang <me@allanwang.ca> | 2018-09-27 20:15:11 -0400 |
---|---|---|
committer | Allan Wang <me@allanwang.ca> | 2018-09-27 20:15:11 -0400 |
commit | 2e22f2ae6a963a2e00dc4b50b4a308c80ebe68e2 (patch) | |
tree | b0bfb3d1bede59bc6f54030c3b2ea51b3482ee28 /app/src/main/kotlin/com/pitchedapps/frost/utils | |
parent | 3aa44ba16e52ceaf37dd28a8075b302c42785526 (diff) | |
download | frost-2e22f2ae6a963a2e00dc4b50b4a308c80ebe68e2.tar.gz frost-2e22f2ae6a963a2e00dc4b50b4a308c80ebe68e2.tar.bz2 frost-2e22f2ae6a963a2e00dc4b50b4a308c80ebe68e2.zip |
Fix more lints
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/utils')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/utils/AdBlocker.kt | 4 | ||||
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/AdBlocker.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/AdBlocker.kt index 20041370..1bb0449b 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/utils/AdBlocker.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/AdBlocker.kt @@ -23,7 +23,9 @@ open class AdBlocker(val assetPath: String) { fun init(context: Context) { doAsync { - val content = context.assets.open(assetPath).bufferedReader().use { it.readLines().filter { !it.startsWith("#") } } + val content = context.assets.open(assetPath).bufferedReader().use { f -> + f.readLines().filter { !it.startsWith("#") } + } data.addAll(content) L.i { "Initialized adblock for $assetPath with ${data.size} hosts" } } diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt index dbd4d0d1..9f068a58 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt @@ -61,9 +61,11 @@ object Prefs : KPref() { get() = t.accentColor inline val accentColorForWhite: Int - get() = if (accentColor.isColorVisibleOn(Color.WHITE)) accentColor - else if (textColor.isColorVisibleOn(Color.WHITE)) textColor - else FACEBOOK_BLUE + get() = when { + accentColor.isColorVisibleOn(Color.WHITE) -> accentColor + textColor.isColorVisibleOn(Color.WHITE) -> textColor + else -> FACEBOOK_BLUE + } inline val nativeBgColor: Int get() = Prefs.bgColor.withAlpha(30) |