Android 13880 Hide last divider in XML Lists (#327)

Telefonica · Jan 11, 2024 · afb1e1a · afb1e1a
1 parent 2d26365
commit afb1e1a
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 6 deletions.
diff --git a/library/screenshots/check_ListRowItem_with_32x32_asset.png b/library/screenshots/check_ListRowItem_with_32x32_asset.png
diff --git a/library/screenshots/check_ListRowItem_with_64x64_asset.png b/library/screenshots/check_ListRowItem_with_64x64_asset.png
diff --git a/library/screenshots/check_ListRowView_xml.png b/library/screenshots/check_ListRowView_xml.png
diff --git a/library/screenshots/check_MisticaRecyclerView_xml_hides_last_divider.png b/library/screenshots/check_MisticaRecyclerView_xml_hides_last_divider.png
diff --git a/...ary/src/main/java/com/telefonica/mistica/list/decoration/divider/DividerItemDecoration.kt b/...ary/src/main/java/com/telefonica/mistica/list/decoration/divider/DividerItemDecoration.kt
@@ -24,7 +24,7 @@ open class DividerItemDecoration @JvmOverloads constructor(
     override fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {
         super.onDrawOver(c, parent, state)
         divider?.let { divider ->
-            drawHorizontal(c, parent, divider)
+            drawHorizontal(c, parent, divider, state.itemCount)
         }
     }
 
@@ -35,23 +35,25 @@ open class DividerItemDecoration @JvmOverloads constructor(
         state: RecyclerView.State,
     ) {
         val position = parent.getChildAdapterPosition(view)
-        if (hasDivider(position)) {
+        if (hasDivider(position, state.getItemCount())) {
             outRect.set(0, 0, 0, divider?.intrinsicHeight ?: 0)
         } else {
             outRect.set(0, 0, 0, 0)
         }
         drawableState = view.drawableState
     }
 
-    private fun hasDivider(position: Int): Boolean =
-        position != RecyclerView.NO_POSITION && adapter.hasDivider(position)
+    private fun hasDivider(position: Int, items: Int): Boolean =
+        position != RecyclerView.NO_POSITION && adapter.hasDivider(position) && !isLastElement(position, items)
 
-    private fun drawHorizontal(c: Canvas, parent: RecyclerView, divider: Drawable) {
+    private fun isLastElement(position: Int, items: Int): Boolean = position == items - 1
+
+    private fun drawHorizontal(c: Canvas, parent: RecyclerView, divider: Drawable, items: Int) {
         c.save()
         for (i in 0 until parent.childCount) {
             val child = parent.getChildAt(i)
             val position = parent.getChildAdapterPosition(child)
-            if (!hasDivider(position)) {
+            if (!hasDivider(position, items)) {
                 continue
             }
             parent.getDecoratedBoundsWithMargins(child, bounds)

diff --git a/library/src/test/java/com/telefonica/mistica/list/MisticaRecyclerViewTest.kt b/library/src/test/java/com/telefonica/mistica/list/MisticaRecyclerViewTest.kt
@@ -0,0 +1,56 @@
+package com.telefonica.mistica.list
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.ext.junit.rules.activityScenarioRule
+import com.telefonica.mistica.DummyActivity
+import com.telefonica.mistica.R
+import com.telefonica.mistica.testutils.ScreenshotsTest
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+internal class MisticaRecyclerViewTest: ScreenshotsTest() {
+    @get:Rule
+    val rule = activityScenarioRule<DummyActivity>()
+
+    @Test
+    fun `check MisticaRecyclerView xml hides last divider`() {
+        rule.scenario.onActivity { activity ->
+            val wrapper: FrameLayout = activity.findViewById(R.id.dummy_activity_wrapper)
+            val view = activity.layoutInflater.inflate(R.layout.test_mistica_recycler_view, wrapper, false)
+            activity.setContentView(view)
+
+            val list: MisticaRecyclerView = view.findViewById(R.id.test_list)
+            list.adapter = ClickableListAdapter()
+            compareScreenshot(Espresso.onView(ViewMatchers.withId(R.id.test_recycler_view)))
+        }
+    }
+
+    class ListViewHolder(val rowView: ListRowView) : RecyclerView.ViewHolder(rowView)
+    class ClickableListAdapter : RecyclerView.Adapter<ListViewHolder>() {
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ListViewHolder {
+            return ListViewHolder(
+                LayoutInflater.from(parent.context).inflate(
+                    R.layout.sheet_list_row_selectable_item,
+                    parent,
+                    false
+                ) as ListRowView
+            )
+        }
+
+        override fun getItemCount(): Int = 2
+
+        override fun onBindViewHolder(holder: ListViewHolder, position: Int) {
+            holder.rowView.setTitle("Row $position")
+        }
+    }
+
+}
+
diff --git a/library/src/test/res/layout/test_mistica_recycler_view.xml b/library/src/test/res/layout/test_mistica_recycler_view.xml
@@ -0,0 +1,19 @@
+<?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:id="@+id/test_recycler_view"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:padding="16dp"
+		android:orientation="vertical"
+		>
+
+	<com.telefonica.mistica.list.MisticaRecyclerView
+			android:id="@+id/test_list"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="8dp"
+			android:nestedScrollingEnabled="false"
+			app:listLayoutType="full_width"
+			/>
+</LinearLayout>