diff options
| author | Allan Wang <me@allanwang.ca> | 2019-08-16 00:24:22 -0700 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2019-08-16 00:24:22 -0700 |
| commit | 71dcceaf1970873596a59a734f1a574120beff6b (patch) | |
| tree | d8d79984f591ec5fc43ac93a15715eaef9b887d3 /fastadapter | |
| parent | d6f213563be35b183f81e20e95d925dbd65e4694 (diff) | |
| parent | a9407288fad0d30e71e2f6862b66533e043f9311 (diff) | |
| download | kau-71dcceaf1970873596a59a734f1a574120beff6b.tar.gz kau-71dcceaf1970873596a59a734f1a574120beff6b.tar.bz2 kau-71dcceaf1970873596a59a734f1a574120beff6b.zip | |
Fix conflicts
Diffstat (limited to 'fastadapter')
| -rw-r--r-- | fastadapter/build.gradle | 9 | ||||
| -rw-r--r-- | fastadapter/src/main/kotlin/ca/allanwang/kau/adapters/FastItemThemedAdapter.kt | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/fastadapter/build.gradle b/fastadapter/build.gradle index 43e9c7c..ff58fe8 100644 --- a/fastadapter/build.gradle +++ b/fastadapter/build.gradle @@ -1,4 +1,7 @@ -ext.kauSubModuleMinSdk = kau.Versions.coreMinSdk +import kau.Dependencies +import kau.Versions + +ext.kauSubModuleMinSdk = Versions.coreMinSdk apply from: '../android-lib.gradle' @@ -6,8 +9,8 @@ dependencies { implementation project(':core') api project(':adapter') - api kau.Dependencies.fastAdapter -// api kau.Dependencies.fastAdapterCommons + api Dependencies.fastAdapter + api Dependencies.fastAdapter("utils") } apply from: '../artifacts.gradle' diff --git a/fastadapter/src/main/kotlin/ca/allanwang/kau/adapters/FastItemThemedAdapter.kt b/fastadapter/src/main/kotlin/ca/allanwang/kau/adapters/FastItemThemedAdapter.kt index c5ce61f..32806f2 100644 --- a/fastadapter/src/main/kotlin/ca/allanwang/kau/adapters/FastItemThemedAdapter.kt +++ b/fastadapter/src/main/kotlin/ca/allanwang/kau/adapters/FastItemThemedAdapter.kt @@ -161,7 +161,7 @@ class ThemableIItemDelegate : ThemableIItem, ThemableIItemColors by ThemableIIte override fun bindBackgroundRipple(vararg views: View?) { val background = backgroundColor ?: return val foreground = accentColor ?: textColor ?: backgroundColor - ?: return //default to normal background + ?: return // default to normal background val ripple = createSimpleRippleDrawable(foreground, background) views.forEach { it?.background = ripple } } |