diff options
| author | Allan Wang <me@allanwang.ca> | 2017-08-20 10:59:34 -0700 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2017-08-20 10:59:34 -0700 |
| commit | 14efdd91a4ac11babec7f182ce78f3a1a1b27a00 (patch) | |
| tree | 5cf285f95d7e965e48e286ccc49cde2f5d632af2 | |
| parent | f1a15901f329824815370d074dec043ce9532e06 (diff) | |
| download | frost-14efdd91a4ac11babec7f182ce78f3a1a1b27a00.tar.gz frost-14efdd91a4ac11babec7f182ce78f3a1a1b27a00.tar.bz2 frost-14efdd91a4ac11babec7f182ce78f3a1a1b27a00.zip | |
Fix pref text overflow and update dependencies
| -rw-r--r-- | app/build.gradle | 2 | ||||
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/settings/Appearance.kt | 2 | ||||
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt | 2 | ||||
| -rw-r--r-- | gradle.properties | 6 |
4 files changed, 6 insertions, 6 deletions
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)) diff --git a/gradle.properties b/gradle.properties index 6d2d2a98..eaad7a8f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,8 +17,8 @@ MIN_SDK=21 TARGET_SDK=26 BUILD_TOOLS=26.0.1 -KAU=580c6bc -KOTLIN=1.1.4 +KAU=e6a5078 +KOTLIN=1.1.4-2 COMMONS_TEXT=1.1 CRASHLYTICS=2.6.8 @@ -30,7 +30,7 @@ JSOUP=1.10.3 LEAK_CANARY=1.5.1 MATERIAL_DRAWER_KT=1.0.6 OKHTTP=3.8.1 -PAPER_PARCEL=2.0.1 +PAPER_PARCEL=2.0.2 ROBOELECTRIC=3.4 RX_ANDROID=2.0.1 RX_BINDING=2.0.0 |