Cleanup RvItems

app/src/main/java/com/topjohnwu/magisk/databinding/RecyclerViewItems.kt

@@ -26,38 +26,57 @@ abstract class RvItem {
     open fun onBindingBound(binding: ViewDataBinding) {}
 }
 
-abstract class ComparableRvItem<in T> : RvItem() {
+interface RvContainer<E> {
+    val item: E
+}
 
-    // Use Any.equals by default
-    open fun itemSameAs(other: T) = this == other
-
-    // Use compareTo if this is Comparable or assume not same
+interface ComparableRv<T> : Comparable<T> {
     @Suppress("UNCHECKED_CAST")
+    fun comparableEqual(o: Any?) =
+        o != null && o::class == this::class && compareTo(o as T) == 0
+}
+
+abstract class DiffRvItem<T> : RvItem() {
+
+    // Defer to contentSameAs by default
+    open fun itemSameAs(other: T) = true
+
     open fun contentSameAs(other: T) =
-        (this as? Comparable<T>)?.run { compareTo(other) == 0 } ?: false
-
-    @Suppress("UNCHECKED_CAST")
-    open fun genericItemSameAs(other: Any): Boolean = other::class == this::class && itemSameAs(other as T)
-
-    @Suppress("UNCHECKED_CAST")
-    open fun genericContentSameAs(other: Any): Boolean = other::class == this::class && contentSameAs(other as T)
+        when (this) {
+            is RvContainer<*> -> item == (other as RvContainer<*>).item
+            is ComparableRv<*> -> comparableEqual(other)
+            else -> this == other
+        }
 
     companion object {
-        val callback = object : DiffObservableList.Callback<ComparableRvItem<*>> {
+        private val callback = object : DiffObservableList.Callback<DiffRvItem<Any>> {
             override fun areItemsTheSame(
-                oldItem: ComparableRvItem<*>,
-                newItem: ComparableRvItem<*>
-            ) = oldItem.genericItemSameAs(newItem)
+                oldItem: DiffRvItem<Any>,
+                newItem: DiffRvItem<Any>
+            ): Boolean {
+                return oldItem::class == newItem::class && oldItem.itemSameAs(newItem)
+            }
 
             override fun areContentsTheSame(
-                oldItem: ComparableRvItem<*>,
-                newItem: ComparableRvItem<*>
-            ) = oldItem.genericContentSameAs(newItem)
+                oldItem: DiffRvItem<Any>,
+                newItem: DiffRvItem<Any>
+            ): Boolean {
+                return oldItem.contentSameAs(newItem)
+            }
         }
+
+        @Suppress("UNCHECKED_CAST")
+        fun <T : AnyDiffRvItem> callback() = callback as DiffObservableList.Callback<T>
     }
 }
 
-abstract class ObservableItem<T> : ComparableRvItem<T>(), ObservableHost {
+typealias AnyDiffRvItem = DiffRvItem<*>
+
+abstract class ObservableDiffRvItem<T> : DiffRvItem<T>(), ObservableHost {
+    override var callbacks: PropertyChangeRegistry? = null
+}
+
+abstract class ObservableRvItem : RvItem(), ObservableHost {
     override var callbacks: PropertyChangeRegistry? = null
 }