From 28e6bbe0f1799b4a4c9e3e66a681a2027022f773 Mon Sep 17 00:00:00 2001
From: Kojo Fosu Bempa Edue <kojofosube@gmail.com>
Date: Tue, 27 Jul 2021 13:40:29 +0000
Subject: [PATCH] Fixed null pointer exception
---
README.md | 2 +-
app/src/main/res/layout/activity_main.xml | 1 -
.../library/ui/multisearchviewlib/MultiSearchView.kt | 8 ++++++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 9aafe1d..4c28367 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ allprojects {
dependencies {
//implementation 'com.github.iammert:MultiSearchView:0.3'
- implementation 'com.github.kojofosu:MultiSearchView:0.6'
+ implementation 'com.github.kojofosu:MultiSearchView:0.7'
}
```
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4c82319..4ffeeb9 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -21,7 +21,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
- app:searchIconColor="@android:color/black"
app:selectedTabStyle="dot"/>
</LinearLayout>
diff --git a/multisearchviewlib/src/main/java/com/iammert/library/ui/multisearchviewlib/MultiSearchView.kt b/multisearchviewlib/src/main/java/com/iammert/library/ui/multisearchviewlib/MultiSearchView.kt
index d3f912b..6b4aa90 100644
--- a/multisearchviewlib/src/main/java/com/iammert/library/ui/multisearchviewlib/MultiSearchView.kt
+++ b/multisearchviewlib/src/main/java/com/iammert/library/ui/multisearchviewlib/MultiSearchView.kt
@@ -54,8 +54,12 @@ class MultiSearchView @JvmOverloads constructor(context: Context, attrs: Attribu
setSearchIconDrawable(imageSource)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
- setSearchIconColor(searchIconColorResID)
- setSearchIconColor(searchIconColorColorString!!)
+ if(searchIconColorResID != null)
+ setSearchIconColor(searchIconColorResID)
+
+ if (searchIconColorColorString != null)
+ setSearchIconColor(searchIconColorColorString)
+
}
binding.imageViewSearch.setOnClickListener {