From 14efdd91a4ac11babec7f182ce78f3a1a1b27a00 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 20 Aug 2017 10:59:34 -0700 Subject: Fix pref text overflow and update dependencies --- app/build.gradle | 2 +- app/src/main/kotlin/com/pitchedapps/frost/settings/Appearance.kt | 2 +- app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'app') diff --git a/app/build.gradle b/app/build.gradle index 2c9c2c25..ea57331f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -160,7 +160,7 @@ dependencies { debugImplementation "com.squareup.leakcanary:leakcanary-android:${LEAK_CANARY}" releaseTestImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${LEAK_CANARY}" releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${LEAK_CANARY}" - testImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${LEAK_CANARY}" +// testImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${LEAK_CANARY}" implementation "com.github.Raizlabs.DBFlow:dbflow:${DBFLOW}" implementation "com.github.Raizlabs.DBFlow:dbflow-core:${DBFLOW}" diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Appearance.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Appearance.kt index 0dd246da..9a2eddb6 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Appearance.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Appearance.kt @@ -57,7 +57,7 @@ fun SettingsActivity.getAppearancePrefs(): KPrefAdapterBuilder.() -> Unit = { fun KPrefColorPicker.KPrefColorContract.dependsOnCustom() { enabler = { Prefs.isCustomTheme } - onDisabledClick = { itemView, _, _ -> frostSnackbar(R.string.requires_custom_theme); true } + onDisabledClick = { _, _, _ -> frostSnackbar(R.string.requires_custom_theme); true } allowCustom = true } 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 22b628e9..1dbf651e 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt @@ -63,7 +63,7 @@ open class FrostWebViewClient(val webCore: FrostWebViewCore) : BaseWebViewClient c.launchNewTask(LoginActivity::class.java) } - fun injectBackgroundColor() + private fun injectBackgroundColor() = webCore.setBackgroundColor(if (isMain) Color.TRANSPARENT else Prefs.bgColor.withAlpha(255)) -- cgit v1.2.3