diff options
author | Allan Wang <me@allanwang.ca> | 2021-01-11 00:31:19 -0800 |
---|---|---|
committer | Allan Wang <me@allanwang.ca> | 2021-01-11 00:31:19 -0800 |
commit | 89d4a2e596d07585c4a3ed91e6e091111da0c2ad (patch) | |
tree | d32215a2db22073d41de199c727848a5bbb19c27 | |
parent | 5f5389b0fde9d12c56e337dff169fa6319b449cf (diff) | |
download | kau-89d4a2e596d07585c4a3ed91e6e091111da0c2ad.tar.gz kau-89d4a2e596d07585c4a3ed91e6e091111da0c2ad.tar.bz2 kau-89d4a2e596d07585c4a3ed91e6e091111da0c2ad.zip |
Fix viewbinding with merge tags and disable warningsAsErrors
-rw-r--r-- | android-lib.gradle | 2 | ||||
-rw-r--r-- | mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/BlurredImageView.kt | 2 | ||||
-rw-r--r-- | searchview/src/main/kotlin/ca/allanwang/kau/searchview/SearchView.kt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/android-lib.gradle b/android-lib.gradle index d42f8a4..44ed40b 100644 --- a/android-lib.gradle +++ b/android-lib.gradle @@ -48,7 +48,7 @@ android { } lintOptions { - warningsAsErrors true + // warningsAsErrors true disable 'UnusedResources', 'ContentDescription', 'RtlSymmetry', diff --git a/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/BlurredImageView.kt b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/BlurredImageView.kt index d7db7da..50e8d10 100644 --- a/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/BlurredImageView.kt +++ b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/BlurredImageView.kt @@ -53,7 +53,7 @@ class BlurredImageView @JvmOverloads constructor( val imageBase: ImageView get() = binding.imageBase - private val binding: KauBlurredImageviewBinding = KauBlurredImageviewBinding.inflate(LayoutInflater.from(context), this, true) + private val binding: KauBlurredImageviewBinding = KauBlurredImageviewBinding.inflate(LayoutInflater.from(context), this) init { initAttrs(context, attrs) diff --git a/searchview/src/main/kotlin/ca/allanwang/kau/searchview/SearchView.kt b/searchview/src/main/kotlin/ca/allanwang/kau/searchview/SearchView.kt index ddb8d6d..edf7408 100644 --- a/searchview/src/main/kotlin/ca/allanwang/kau/searchview/SearchView.kt +++ b/searchview/src/main/kotlin/ca/allanwang/kau/searchview/SearchView.kt @@ -280,7 +280,7 @@ class SearchView @JvmOverloads constructor( var menuY: Int = -1 // reference for cardview's marginTop var menuHalfHeight: Int = -1 // starting y for circular reveal (relative to the cardview) - private val binding: KauSearchViewBinding = KauSearchViewBinding.inflate(LayoutInflater.from(context), this, true) + private val binding: KauSearchViewBinding = KauSearchViewBinding.inflate(LayoutInflater.from(context), this) init { z = 99f |