From b0c61e80f69929494e7ce1a8f88bc31e512649be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Twaro=CC=81g?= <b.twarog90@gmail.com>
Date: Thu, 4 Apr 2024 10:28:34 +0200
Subject: [PATCH 01/14] Add test drawable

---
 sample/src/main/res/drawable/ic_auto_fix_high_24dp.xml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 sample/src/main/res/drawable/ic_auto_fix_high_24dp.xml

diff --git a/sample/src/main/res/drawable/ic_auto_fix_high_24dp.xml b/sample/src/main/res/drawable/ic_auto_fix_high_24dp.xml
new file mode 100644
index 000000000..60eaf0722
--- /dev/null
+++ b/sample/src/main/res/drawable/ic_auto_fix_high_24dp.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="#FFF" android:pathData="M7.5,5.6L10,7 8.6,4.5 10,2 7.5,3.4 5,2l1.4,2.5L5,7zM19.5,15.4L17,14l1.4,2.5L17,19l2.5,-1.4L22,19l-1.4,-2.5L22,14zM22,2l-2.5,1.4L17,2l1.4,2.5L17,7l2.5,-1.4L22,7l-1.4,-2.5zM14.37,7.29c-0.39,-0.39 -1.02,-0.39 -1.41,0L1.29,18.96c-0.39,0.39 -0.39,1.02 0,1.41l2.34,2.34c0.39,0.39 1.02,0.39 1.41,0L16.7,11.05c0.39,-0.39 0.39,-1.02 0,-1.41l-2.33,-2.35zM13.34,12.78l-2.12,-2.12 2.44,-2.44 2.12,2.12 -2.44,2.44z"/>
+    
+</vector>

From b9abd8b4d3cb6b5b216cc237ab9a4756ad76105f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Twaro=CC=81g?= <b.twarog90@gmail.com>
Date: Thu, 4 Apr 2024 10:30:33 +0200
Subject: [PATCH 02/14] Add ChipsActivity with layout

---
 sample/src/main/AndroidManifest.xml           |  4 ++
 .../github/kakaocup/sample/ChipsActivity.kt   | 11 ++++
 sample/src/main/res/layout/activity_chips.xml | 58 +++++++++++++++++++
 3 files changed, 73 insertions(+)
 create mode 100644 sample/src/main/kotlin/io/github/kakaocup/sample/ChipsActivity.kt
 create mode 100644 sample/src/main/res/layout/activity_chips.xml

diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index 4f8ae549d..036bac892 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -128,6 +128,10 @@
         android:name="io.github.kakaocup.sample.AnimatedButtonClickActivity"
         android:label="Animated Button Clicks Activity"
         android:theme="@style/MaterialAppTheme" />
+    <activity
+        android:name="io.github.kakaocup.sample.ChipsActivity"
+        android:label="Chips Activity"
+        android:theme="@style/MaterialAppTheme" />
   </application>
 
 </manifest>
diff --git a/sample/src/main/kotlin/io/github/kakaocup/sample/ChipsActivity.kt b/sample/src/main/kotlin/io/github/kakaocup/sample/ChipsActivity.kt
new file mode 100644
index 000000000..cc5217bb8
--- /dev/null
+++ b/sample/src/main/kotlin/io/github/kakaocup/sample/ChipsActivity.kt
@@ -0,0 +1,11 @@
+package io.github.kakaocup.sample
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+
+class ChipsActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_chips)
+    }
+}
diff --git a/sample/src/main/res/layout/activity_chips.xml b/sample/src/main/res/layout/activity_chips.xml
new file mode 100644
index 000000000..8ef0903b2
--- /dev/null
+++ b/sample/src/main/res/layout/activity_chips.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+  <com.google.android.material.chip.ChipGroup
+      android:id="@+id/chip_group1"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="8dp"
+      app:chipSpacing="8dp">
+
+    <com.google.android.material.chip.Chip
+        android:id="@+id/chip1"
+        style="@style/Widget.MaterialComponents.Chip.Filter"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:checkable="true"
+        android:checked="true"
+        app:checkedIcon="@drawable/ic_sentiment_very_satisfied_black_24dp"
+        android:text="Chip1" />
+
+    <com.google.android.material.chip.Chip
+        android:id="@+id/chip2"
+        style="@style/Base.Widget.MaterialComponents.Chip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:checkable="true"
+        app:chipIcon="@drawable/ic_auto_fix_high_24dp"
+        app:chipIconVisible="true"
+        app:closeIconVisible="false"
+        android:text="Chip2" />
+
+    <com.google.android.material.chip.Chip
+        android:id="@+id/chip3"
+        style="@style/Base.Widget.MaterialComponents.Chip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:checkable="true"
+        app:closeIcon="@drawable/ic_android_black_24dp"
+        app:closeIconTint="@android:color/black"
+        android:text="Chip3" />
+
+    <com.google.android.material.chip.Chip
+        android:id="@+id/chip4"
+        style="@style/Base.Widget.MaterialComponents.Chip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:checkable="true"
+        app:closeIconVisible="false"
+        app:checkedIconVisible="false"
+        app:chipIconVisible="false"
+        android:text="Chip4" />
+
+  </com.google.android.material.chip.ChipGroup>
+</LinearLayout>

From 1f1b2200173a5d10b036eb1cb08869b4f24d9a3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Twaro=CC=81g?= <b.twarog90@gmail.com>
Date: Thu, 4 Apr 2024 10:30:47 +0200
Subject: [PATCH 03/14] Add a button to open new activity

---
 sample/src/main/res/layout/activity_test.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sample/src/main/res/layout/activity_test.xml b/sample/src/main/res/layout/activity_test.xml
index 815339b93..99d36209a 100644
--- a/sample/src/main/res/layout/activity_test.xml
+++ b/sample/src/main/res/layout/activity_test.xml
@@ -122,6 +122,12 @@
             android:layout_height="wrap_content"
             android:text="SWITCHERS"/>
 
+        <Button
+            android:id="@+id/flexbox_chips_type_recycler"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="FLEXBOX CHIPS"/>
+
       </GridLayout>
 
       <LinearLayout

From aaf9bf95ccf4a7fa047913b4ec48e9c6696464b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Twaro=CC=81g?= <b.twarog90@gmail.com>
Date: Thu, 4 Apr 2024 10:31:21 +0200
Subject: [PATCH 04/14] Add ChipDrawableMatcher

---
 .../kakao/chip/ChipDrawableMatcher.kt         | 86 +++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 kakao/src/main/kotlin/io/github/kakaocup/kakao/chip/ChipDrawableMatcher.kt

diff --git a/kakao/src/main/kotlin/io/github/kakaocup/kakao/chip/ChipDrawableMatcher.kt b/kakao/src/main/kotlin/io/github/kakaocup/kakao/chip/ChipDrawableMatcher.kt
new file mode 100644
index 000000000..ff01bb91e
--- /dev/null
+++ b/kakao/src/main/kotlin/io/github/kakaocup/kakao/chip/ChipDrawableMatcher.kt
@@ -0,0 +1,86 @@
+package io.github.kakaocup.kakao.chip
+
+import android.content.res.ColorStateList
+import android.graphics.Bitmap
+import android.graphics.PorterDuff
+import android.graphics.drawable.Drawable
+import android.os.Build
+import android.view.View
+import androidx.annotation.ColorRes
+import androidx.annotation.DrawableRes
+import androidx.core.graphics.drawable.DrawableCompat
+import com.google.android.material.chip.Chip
+import io.github.kakaocup.kakao.common.extentions.toBitmap
+import io.github.kakaocup.kakao.common.utilities.getResourceColor
+import io.github.kakaocup.kakao.common.utilities.getResourceDrawable
+import org.hamcrest.Description
+import org.hamcrest.TypeSafeMatcher
+
+/**
+ * Matches given drawable with current one for the [chipIconType] drawable type.
+ *
+ * @param resId Drawable resource to be matched (default is -1)
+ * @param drawable Drawable instance to be matched (default is null)
+ * @param chipIconType drawable type to verify against
+ * @param tintColorId Tint color resource id (default is null)
+ * @param toBitmap Lambda with custom Drawable -> Bitmap converter (default is null)
+ */
+class ChipDrawableMatcher(
+    @DrawableRes private val resId: Int = -1,
+    private val drawable: Drawable? = null,
+    private val chipIconType: ChipIconType,
+    @ColorRes private val tintColorId: Int? = null,
+    private val toBitmap: ((drawable: Drawable) -> Bitmap)? = null,
+) : TypeSafeMatcher<View>(View::class.java) {
+
+    override fun describeTo(desc: Description) {
+        desc.appendText("with drawable id $resId or provided instance for the $chipIconType icon")
+    }
+
+    override fun matchesSafely(view: View?): Boolean {
+        val viewAsChip = view as? Chip ?: return false
+
+        if (resId < 0 && drawable == null) {
+            return viewAsChip.chipDrawable == null
+        }
+
+        var expectedDrawable: Drawable? = drawable ?: getResourceDrawable(resId)?.mutate()
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP && expectedDrawable != null) {
+            expectedDrawable = DrawableCompat.wrap(expectedDrawable).mutate()
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            tintColorId?.let { tintColorId ->
+                val tintColor = getResourceColor(tintColorId)
+                expectedDrawable?.apply {
+                    setTintList(ColorStateList.valueOf(tintColor))
+                    setTintMode(PorterDuff.Mode.SRC_IN)
+                }
+            }
+        }
+
+        if (expectedDrawable == null) {
+            return false
+        }
+
+        return viewAsChip.getChipActualDrawable(chipIconType)?.mutate()?.let {
+            val bitmap = toBitmap?.invoke(it) ?: it.toBitmap()
+
+            val otherBitmap = toBitmap?.invoke(expectedDrawable) ?: expectedDrawable.toBitmap()
+            bitmap.sameAs(otherBitmap)
+        } ?: false
+    }
+
+    private fun Chip.getChipActualDrawable(chipIconType: ChipIconType): Drawable? = when (chipIconType) {
+        ChipIconType.CHECKED -> checkedIcon?.takeIf { isCheckedIconVisible }
+        ChipIconType.CHIP -> chipIcon?.takeIf { isChipIconVisible }
+        ChipIconType.CLOSE -> closeIcon?.takeIf { isCloseIconVisible }
+    }
+}
+
+enum class ChipIconType {
+    CHECKED,
+    CHIP,
+    CLOSE,
+}

From e6c7fb55141c6557522b2d4361cb7496a240b4b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Twaro=CC=81g?= <b.twarog90@gmail.com>
Date: Thu, 4 Apr 2024 10:31:33 +0200
Subject: [PATCH 05/14] Add ChipAssertions

---
 .../kakaocup/kakao/chip/ChipAssertions.kt     | 83 +++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 kakao/src/main/kotlin/io/github/kakaocup/kakao/chip/ChipAssertions.kt

diff --git a/kakao/src/main/kotlin/io/github/kakaocup/kakao/chip/ChipAssertions.kt b/kakao/src/main/kotlin/io/github/kakaocup/kakao/chip/ChipAssertions.kt
new file mode 100644
index 000000000..95e413759
--- /dev/null
+++ b/kakao/src/main/kotlin/io/github/kakaocup/kakao/chip/ChipAssertions.kt
@@ -0,0 +1,83 @@
+package io.github.kakaocup.kakao.chip
+
+import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import android.view.View
+import androidx.annotation.ColorRes
+import androidx.annotation.DrawableRes
+import androidx.test.espresso.assertion.ViewAssertions
+import com.google.android.material.chip.Chip
+import com.google.android.material.chip.ChipDrawable
+import io.github.kakaocup.kakao.common.assertions.BaseAssertions
+import org.hamcrest.Description
+import org.hamcrest.TypeSafeMatcher
+
+interface ChipAssertions : BaseAssertions {
+
+    /**
+     * Check if Chip has correct icon for [ChipIconType.CHECKED] icon type.
+     *
+     * @param resId Drawable resource to be matched (default is -1)
+     * @param drawable Drawable instance to be matched (default is null)
+     * @param tintColorId Tint color resource id (default is null)
+     * @param toBitmap Lambda with custom Drawable -> Bitmap converter (default is null)
+     */
+    fun hasCheckedIcon(
+        @DrawableRes resId: Int = -1,
+        drawable: Drawable? = null,
+        @ColorRes tintColorId: Int? = null,
+        toBitmap: ((drawable: Drawable) -> Bitmap)? = null,
+    ) = view.check(ViewAssertions.matches(ChipDrawableMatcher(resId, drawable, ChipIconType.CHECKED, tintColorId, toBitmap)))
+
+
+    /**
+     * Check if Chip has correct icon for [ChipIconType.CHIP] icon type.
+     *
+     * @param resId Drawable resource to be matched (default is -1)
+     * @param drawable Drawable instance to be matched (default is null)
+     * @param tintColorId Tint color resource id (default is null)
+     * @param toBitmap Lambda with custom Drawable -> Bitmap converter (default is null)
+     */
+    fun hasChipIcon(
+        @DrawableRes resId: Int = -1,
+        drawable: Drawable? = null,
+        @ColorRes tintColorId: Int? = null,
+        toBitmap: ((drawable: Drawable) -> Bitmap)? = null,
+    ) = view.check(ViewAssertions.matches(ChipDrawableMatcher(resId, drawable, ChipIconType.CHIP, tintColorId, toBitmap)))
+
+    /**
+     * Check if Chip has correct icon for [ChipIconType.CLOSE] icon type.
+     *
+     * @param resId Drawable resource to be matched (default is -1)
+     * @param drawable Drawable instance to be matched (default is null)
+     * @param tintColorId Tint color resource id (default is null)
+     * @param toBitmap Lambda with custom Drawable -> Bitmap converter (default is null)
+     */
+    fun hasCloseIcon(
+        @DrawableRes resId: Int = -1,
+        drawable: Drawable? = null,
+        @ColorRes tintColorId: Int? = null,
+        toBitmap: ((drawable: Drawable) -> Bitmap)? = null,
+    ) = view.check(ViewAssertions.matches(ChipDrawableMatcher(resId, drawable, ChipIconType.CLOSE, tintColorId, toBitmap)))
+
+    /**
+     * Verify all icons are hidden
+     */
+    fun hasNoIconVisible() = view.check(ViewAssertions.matches(object : TypeSafeMatcher<View>(View::class.java) {
+        override fun describeTo(desc: Description) {
+            desc.appendText("without any icons visible")
+        }
+
+        override fun matchesSafely(view: View): Boolean {
+            val viewAsChip = view as? Chip ?: return false
+            return (viewAsChip.chipDrawable as? ChipDrawable)?.verifyNoIconVisible() ?: run {
+                println("Drawable should be ChipDrawable unless implementation has changed")
+                false
+            }
+        }
+    }))
+
+    fun ChipDrawable.verifyNoIconVisible(): Boolean {
+        return !isCheckedIconVisible && !isChipIconVisible && !isCloseIconVisible
+    }
+}

From 1b04efd91edb6dc5c75cecc40594ba69be91f06c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Twaro=CC=81g?= <b.twarog90@gmail.com>
Date: Thu, 4 Apr 2024 10:31:48 +0200
Subject: [PATCH 06/14] Add KChip definition

---
 .../io/github/kakaocup/kakao/chip/KChip.kt       | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 kakao/src/main/kotlin/io/github/kakaocup/kakao/chip/KChip.kt

diff --git a/kakao/src/main/kotlin/io/github/kakaocup/kakao/chip/KChip.kt b/kakao/src/main/kotlin/io/github/kakaocup/kakao/chip/KChip.kt
new file mode 100644
index 000000000..e15160030
--- /dev/null
+++ b/kakao/src/main/kotlin/io/github/kakaocup/kakao/chip/KChip.kt
@@ -0,0 +1,16 @@
+package io.github.kakaocup.kakao.chip
+
+import android.view.View
+import androidx.test.espresso.DataInteraction
+import io.github.kakaocup.kakao.check.CheckableActions
+import io.github.kakaocup.kakao.check.CheckableAssertions
+import io.github.kakaocup.kakao.common.builders.ViewBuilder
+import io.github.kakaocup.kakao.common.views.KBaseView
+import io.github.kakaocup.kakao.text.TextViewAssertions
+import org.hamcrest.Matcher
+
+class KChip : KBaseView<KChip>, CheckableActions, CheckableAssertions, TextViewAssertions, ChipAssertions {
+    constructor(function: ViewBuilder.() -> Unit) : super(function)
+    constructor(parent: Matcher<View>, function: ViewBuilder.() -> Unit) : super(parent, function)
+    constructor(parent: DataInteraction, function: ViewBuilder.() -> Unit) : super(parent, function)
+}

From c22e1ac13e16ac0fa29575a2d24ecf4c0171a56e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Twaro=CC=81g?= <b.twarog90@gmail.com>
Date: Thu, 4 Apr 2024 10:32:08 +0200
Subject: [PATCH 07/14] Add missing button interaction

---
 sample/src/main/kotlin/io/github/kakaocup/sample/TestActivity.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sample/src/main/kotlin/io/github/kakaocup/sample/TestActivity.kt b/sample/src/main/kotlin/io/github/kakaocup/sample/TestActivity.kt
index ab9be766d..a6d01393b 100644
--- a/sample/src/main/kotlin/io/github/kakaocup/sample/TestActivity.kt
+++ b/sample/src/main/kotlin/io/github/kakaocup/sample/TestActivity.kt
@@ -41,6 +41,7 @@ class TestActivity : AppCompatActivity() {
         addRoute(R.id.text_input_layout, TextInputLayoutActivity::class.java)
         addRoute(R.id.text_activity, TextActivity::class.java)
         addRoute(R.id.switchers_button, SwitchersActivity::class.java)
+        addRoute(R.id.flexbox_chips_type_recycler, ChipsActivity::class.java)
 
         findViewById<Button>(R.id.snackbar_button).setOnClickListener {
             val snackbar = Snackbar.make(

From bade9df3bbe651ce80cc20e61790af58c6406ce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Twaro=CC=81g?= <b.twarog90@gmail.com>
Date: Thu, 4 Apr 2024 10:33:52 +0200
Subject: [PATCH 08/14] Add example test for new activity

---
 .../io/github/kakaocup/sample/ChipsTest.kt    | 38 +++++++++++++++++++
 .../kakaocup/sample/screen/ChipsScreen.kt     | 12 ++++++
 2 files changed, 50 insertions(+)
 create mode 100644 sample/src/androidTest/kotlin/io/github/kakaocup/sample/ChipsTest.kt
 create mode 100644 sample/src/androidTest/kotlin/io/github/kakaocup/sample/screen/ChipsScreen.kt

diff --git a/sample/src/androidTest/kotlin/io/github/kakaocup/sample/ChipsTest.kt b/sample/src/androidTest/kotlin/io/github/kakaocup/sample/ChipsTest.kt
new file mode 100644
index 000000000..e00f7f964
--- /dev/null
+++ b/sample/src/androidTest/kotlin/io/github/kakaocup/sample/ChipsTest.kt
@@ -0,0 +1,38 @@
+package io.github.kakaocup.sample
+
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import io.github.kakaocup.kakao.screen.Screen.Companion.onScreen
+import io.github.kakaocup.sample.screen.ChipsScreen
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+class ChipsTest {
+    @Rule
+    @JvmField
+    val rule = ActivityScenarioRule(ChipsActivity::class.java)
+
+    @Test
+    fun testContentItemsRecyclerView() {
+        onScreen<ChipsScreen> {
+            chip1 {
+                hasText("Chip1")
+                hasCheckedIcon(R.drawable.ic_sentiment_very_satisfied_black_24dp)
+            }
+            chip2 {
+                hasText("Chip2")
+                hasChipIcon(R.drawable.ic_auto_fix_high_24dp)
+            }
+            chip3 {
+                hasText("Chip3")
+                hasCloseIcon(R.drawable.ic_android_black_24dp, tintColorId = android.R.color.black)
+            }
+            chip4 {
+                hasText("Chip4")
+                hasNoIconVisible()
+            }
+        }
+    }
+}
diff --git a/sample/src/androidTest/kotlin/io/github/kakaocup/sample/screen/ChipsScreen.kt b/sample/src/androidTest/kotlin/io/github/kakaocup/sample/screen/ChipsScreen.kt
new file mode 100644
index 000000000..970efee0e
--- /dev/null
+++ b/sample/src/androidTest/kotlin/io/github/kakaocup/sample/screen/ChipsScreen.kt
@@ -0,0 +1,12 @@
+package io.github.kakaocup.sample.screen
+
+import io.github.kakaocup.kakao.chip.KChip
+import io.github.kakaocup.kakao.screen.Screen
+import io.github.kakaocup.sample.R
+
+open class ChipsScreen : Screen<ChipsScreen>() {
+    val chip1: KChip = KChip { withId(R.id.chip1) }
+    val chip2: KChip = KChip { withId(R.id.chip2) }
+    val chip3: KChip = KChip { withId(R.id.chip3) }
+    val chip4: KChip = KChip { withId(R.id.chip4) }
+}

From 8a5e094154de6322c653e5af3c7ba9ca1a1d4a72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Twaro=CC=81g?= <b.twarog90@gmail.com>
Date: Thu, 4 Apr 2024 10:46:14 +0200
Subject: [PATCH 09/14] Updated id of the button

---
 .../src/main/kotlin/io/github/kakaocup/sample/TestActivity.kt | 2 +-
 sample/src/main/res/layout/activity_test.xml                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sample/src/main/kotlin/io/github/kakaocup/sample/TestActivity.kt b/sample/src/main/kotlin/io/github/kakaocup/sample/TestActivity.kt
index a6d01393b..06accead9 100644
--- a/sample/src/main/kotlin/io/github/kakaocup/sample/TestActivity.kt
+++ b/sample/src/main/kotlin/io/github/kakaocup/sample/TestActivity.kt
@@ -41,7 +41,7 @@ class TestActivity : AppCompatActivity() {
         addRoute(R.id.text_input_layout, TextInputLayoutActivity::class.java)
         addRoute(R.id.text_activity, TextActivity::class.java)
         addRoute(R.id.switchers_button, SwitchersActivity::class.java)
-        addRoute(R.id.flexbox_chips_type_recycler, ChipsActivity::class.java)
+        addRoute(R.id.chips, ChipsActivity::class.java)
 
         findViewById<Button>(R.id.snackbar_button).setOnClickListener {
             val snackbar = Snackbar.make(
diff --git a/sample/src/main/res/layout/activity_test.xml b/sample/src/main/res/layout/activity_test.xml
index 99d36209a..a85186ad0 100644
--- a/sample/src/main/res/layout/activity_test.xml
+++ b/sample/src/main/res/layout/activity_test.xml
@@ -123,10 +123,10 @@
             android:text="SWITCHERS"/>
 
         <Button
-            android:id="@+id/flexbox_chips_type_recycler"
+            android:id="@+id/chips"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="FLEXBOX CHIPS"/>
+            android:text="CHIPS"/>
 
       </GridLayout>
 

From 76d89e7332ddf2f97ee5ff0b201270909080ebc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Twaro=CC=81g?= <b.twarog90@gmail.com>
Date: Thu, 4 Apr 2024 10:47:07 +0200
Subject: [PATCH 10/14] Updated test name

---
 .../androidTest/kotlin/io/github/kakaocup/sample/ChipsTest.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sample/src/androidTest/kotlin/io/github/kakaocup/sample/ChipsTest.kt b/sample/src/androidTest/kotlin/io/github/kakaocup/sample/ChipsTest.kt
index e00f7f964..6d5d84e29 100644
--- a/sample/src/androidTest/kotlin/io/github/kakaocup/sample/ChipsTest.kt
+++ b/sample/src/androidTest/kotlin/io/github/kakaocup/sample/ChipsTest.kt
@@ -15,7 +15,7 @@ class ChipsTest {
     val rule = ActivityScenarioRule(ChipsActivity::class.java)
 
     @Test
-    fun testContentItemsRecyclerView() {
+    fun testCorrectChipsDisplayed() {
         onScreen<ChipsScreen> {
             chip1 {
                 hasText("Chip1")

From 44e684131c5cc94d3eedc51d9fb32b2340bcca0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Twaro=CC=81g?= <b.twarog90@gmail.com>
Date: Thu, 4 Apr 2024 10:48:29 +0200
Subject: [PATCH 11/14] Added verification regarding checked state

---
 .../androidTest/kotlin/io/github/kakaocup/sample/ChipsTest.kt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sample/src/androidTest/kotlin/io/github/kakaocup/sample/ChipsTest.kt b/sample/src/androidTest/kotlin/io/github/kakaocup/sample/ChipsTest.kt
index 6d5d84e29..fb92595c1 100644
--- a/sample/src/androidTest/kotlin/io/github/kakaocup/sample/ChipsTest.kt
+++ b/sample/src/androidTest/kotlin/io/github/kakaocup/sample/ChipsTest.kt
@@ -18,18 +18,22 @@ class ChipsTest {
     fun testCorrectChipsDisplayed() {
         onScreen<ChipsScreen> {
             chip1 {
+                isChecked()
                 hasText("Chip1")
                 hasCheckedIcon(R.drawable.ic_sentiment_very_satisfied_black_24dp)
             }
             chip2 {
+                isNotChecked()
                 hasText("Chip2")
                 hasChipIcon(R.drawable.ic_auto_fix_high_24dp)
             }
             chip3 {
+                isNotChecked()
                 hasText("Chip3")
                 hasCloseIcon(R.drawable.ic_android_black_24dp, tintColorId = android.R.color.black)
             }
             chip4 {
+                isNotChecked()
                 hasText("Chip4")
                 hasNoIconVisible()
             }

From f6f643f04937a39ac15c1f49d3429ad23ca8a5b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Twaro=CC=81g?= <b.twarog90@gmail.com>
Date: Tue, 9 Apr 2024 11:31:43 +0200
Subject: [PATCH 12/14] Simplified matchesSafely function

---
 .../kakao/chip/ChipDrawableMatcher.kt         | 43 +++++++++----------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/kakao/src/main/kotlin/io/github/kakaocup/kakao/chip/ChipDrawableMatcher.kt b/kakao/src/main/kotlin/io/github/kakaocup/kakao/chip/ChipDrawableMatcher.kt
index ff01bb91e..15f0a5953 100644
--- a/kakao/src/main/kotlin/io/github/kakaocup/kakao/chip/ChipDrawableMatcher.kt
+++ b/kakao/src/main/kotlin/io/github/kakaocup/kakao/chip/ChipDrawableMatcher.kt
@@ -39,36 +39,33 @@ class ChipDrawableMatcher(
 
     override fun matchesSafely(view: View?): Boolean {
         val viewAsChip = view as? Chip ?: return false
-
-        if (resId < 0 && drawable == null) {
-            return viewAsChip.chipDrawable == null
+        val expectedDrawable: Drawable? = when {
+            drawable != null -> drawable
+            resId >= 0 -> getResourceDrawable(resId)?.mutate()
+            else -> return viewAsChip.chipDrawable == null
         }
 
-        var expectedDrawable: Drawable? = drawable ?: getResourceDrawable(resId)?.mutate()
-
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP && expectedDrawable != null) {
-            expectedDrawable = DrawableCompat.wrap(expectedDrawable).mutate()
-        }
+        // Apply backward compatibility wrap and tints if necessary
+        val finalDrawable = when {
+            Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP && expectedDrawable != null -> DrawableCompat.wrap(
+                expectedDrawable
+            )
+                .mutate()
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            tintColorId?.let { tintColorId ->
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && tintColorId != null -> expectedDrawable?.apply {
                 val tintColor = getResourceColor(tintColorId)
-                expectedDrawable?.apply {
-                    setTintList(ColorStateList.valueOf(tintColor))
-                    setTintMode(PorterDuff.Mode.SRC_IN)
-                }
+                setTintList(ColorStateList.valueOf(tintColor))
+                setTintMode(PorterDuff.Mode.SRC_IN)
             }
-        }
-
-        if (expectedDrawable == null) {
-            return false
-        }
 
-        return viewAsChip.getChipActualDrawable(chipIconType)?.mutate()?.let {
-            val bitmap = toBitmap?.invoke(it) ?: it.toBitmap()
+            else -> expectedDrawable
+        } ?: return false
 
-            val otherBitmap = toBitmap?.invoke(expectedDrawable) ?: expectedDrawable.toBitmap()
-            bitmap.sameAs(otherBitmap)
+        // Compare actual vs expected drawables
+        return viewAsChip.getChipActualDrawable(chipIconType)?.mutate()?.let { actualDrawable ->
+            val actualBitmap = toBitmap?.invoke(actualDrawable) ?: actualDrawable.toBitmap()
+            val expectedBitmap = toBitmap?.invoke(finalDrawable) ?: finalDrawable.toBitmap()
+            actualBitmap.sameAs(expectedBitmap)
         } ?: false
     }
 

From 494431c9d95f214b7e9ae1a13ecf9e1467be4aa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Twaro=CC=81g?= <b.twarog90@gmail.com>
Date: Tue, 9 Apr 2024 13:36:14 +0200
Subject: [PATCH 13/14] Extracted method processing drawable due to sdk
 limitations, removed one return call

---
 .../kakao/chip/ChipDrawableMatcher.kt         | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/kakao/src/main/kotlin/io/github/kakaocup/kakao/chip/ChipDrawableMatcher.kt b/kakao/src/main/kotlin/io/github/kakaocup/kakao/chip/ChipDrawableMatcher.kt
index 15f0a5953..13b9d2536 100644
--- a/kakao/src/main/kotlin/io/github/kakaocup/kakao/chip/ChipDrawableMatcher.kt
+++ b/kakao/src/main/kotlin/io/github/kakaocup/kakao/chip/ChipDrawableMatcher.kt
@@ -38,37 +38,38 @@ class ChipDrawableMatcher(
     }
 
     override fun matchesSafely(view: View?): Boolean {
-        val viewAsChip = view as? Chip ?: return false
         val expectedDrawable: Drawable? = when {
             drawable != null -> drawable
             resId >= 0 -> getResourceDrawable(resId)?.mutate()
-            else -> return viewAsChip.chipDrawable == null
+            else -> return (view as? Chip)?.chipDrawable == null
         }
 
         // Apply backward compatibility wrap and tints if necessary
-        val finalDrawable = when {
-            Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP && expectedDrawable != null -> DrawableCompat.wrap(
-                expectedDrawable
-            )
-                .mutate()
-
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && tintColorId != null -> expectedDrawable?.apply {
-                val tintColor = getResourceColor(tintColorId)
-                setTintList(ColorStateList.valueOf(tintColor))
-                setTintMode(PorterDuff.Mode.SRC_IN)
-            }
-
-            else -> expectedDrawable
-        } ?: return false
+        val finalDrawable = expectedDrawable.processDrawableForDueToSdk() ?: return false
 
         // Compare actual vs expected drawables
-        return viewAsChip.getChipActualDrawable(chipIconType)?.mutate()?.let { actualDrawable ->
+        return (view as? Chip)?.getChipActualDrawable(chipIconType)?.mutate()?.let { actualDrawable ->
             val actualBitmap = toBitmap?.invoke(actualDrawable) ?: actualDrawable.toBitmap()
             val expectedBitmap = toBitmap?.invoke(finalDrawable) ?: finalDrawable.toBitmap()
             actualBitmap.sameAs(expectedBitmap)
         } ?: false
     }
 
+    private fun Drawable?.processDrawableForDueToSdk() = when {
+        Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP && this != null -> DrawableCompat.wrap(
+            this
+        )
+            .mutate()
+
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && tintColorId != null -> this?.apply {
+            val tintColor = getResourceColor(tintColorId)
+            setTintList(ColorStateList.valueOf(tintColor))
+            setTintMode(PorterDuff.Mode.SRC_IN)
+        }
+
+        else -> this
+    }
+
     private fun Chip.getChipActualDrawable(chipIconType: ChipIconType): Drawable? = when (chipIconType) {
         ChipIconType.CHECKED -> checkedIcon?.takeIf { isCheckedIconVisible }
         ChipIconType.CHIP -> chipIcon?.takeIf { isChipIconVisible }

From f02d101f29e5989286e94e2453e0de9d983d0118 Mon Sep 17 00:00:00 2001
From: Konstantin Aksenov <aksenov.kostya@gmail.com>
Date: Wed, 10 Apr 2024 09:52:25 +1000
Subject: [PATCH 14/14] Update ChipDrawableMatcher.kt

---
 .../kotlin/io/github/kakaocup/kakao/chip/ChipDrawableMatcher.kt  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kakao/src/main/kotlin/io/github/kakaocup/kakao/chip/ChipDrawableMatcher.kt b/kakao/src/main/kotlin/io/github/kakaocup/kakao/chip/ChipDrawableMatcher.kt
index 13b9d2536..5f17a9418 100644
--- a/kakao/src/main/kotlin/io/github/kakaocup/kakao/chip/ChipDrawableMatcher.kt
+++ b/kakao/src/main/kotlin/io/github/kakaocup/kakao/chip/ChipDrawableMatcher.kt
@@ -37,6 +37,7 @@ class ChipDrawableMatcher(
         desc.appendText("with drawable id $resId or provided instance for the $chipIconType icon")
     }
 
+    @Suppress("ReturnCount")
     override fun matchesSafely(view: View?): Boolean {
         val expectedDrawable: Drawable? = when {
             drawable != null -> drawable