br0kenpixel/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-09-06 06:36:58 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Cleanup RvItems

Browse Source
This commit is contained in:
topjohnwu
2021-09-01 00:14:55 -07:00
parent f5c982355a
commit 067248da75
16 changed files with 117 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt
+4 -5
View File
@@ -23,8 +23,9 @@ import com.google.android.material.shape.MaterialShapeDrawable
import com.topjohnwu.magisk.BR
import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.arch.itemBindingOf
import com.topjohnwu.magisk.databinding.ComparableRvItem
import com.topjohnwu.magisk.databinding.DiffRvItem
import com.topjohnwu.magisk.databinding.DialogMagiskBaseBinding
import com.topjohnwu.magisk.databinding.RvContainer
import com.topjohnwu.magisk.utils.ObservableHost
import com.topjohnwu.magisk.utils.set
import me.tatarka.bindingcollectionadapter2.BindingRecyclerViewAdapters
@@ -188,12 +189,10 @@ class MagiskDialog(
}
class DialogItem(
val item: CharSequence,
override val item: CharSequence,
val position: Int
) : ComparableRvItem<DialogItem>() {
) : DiffRvItem<DialogItem>(), RvContainer<CharSequence> {
override val layoutRes = R.layout.item_list_single_line
override fun itemSameAs(other: DialogItem) = item == other.item
override fun contentSameAs(other: DialogItem) = itemSameAs(other)
}
interface ActualOnDialogClickListener {
app/src/main/java/com/topjohnwu/magisk/view/TappableHeadlineItem.kt
+2 -8
View File
@@ -1,21 +1,15 @@
package com.topjohnwu.magisk.view
import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.databinding.ComparableRvItem
import com.topjohnwu.magisk.databinding.DiffRvItem
sealed class TappableHeadlineItem : ComparableRvItem<TappableHeadlineItem>() {
sealed class TappableHeadlineItem : DiffRvItem<TappableHeadlineItem>() {
abstract val title: Int
abstract val icon: Int
override val layoutRes = R.layout.item_tappable_headline
override fun itemSameAs(other: TappableHeadlineItem) =
this === other
override fun contentSameAs(other: TappableHeadlineItem) =
title == other.title && icon == other.icon
// --- listener
interface Listener {
app/src/main/java/com/topjohnwu/magisk/view/TextItem.kt
+2 -3
View File
@@ -1,11 +1,10 @@
package com.topjohnwu.magisk.view
import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.databinding.ComparableRvItem
import com.topjohnwu.magisk.databinding.DiffRvItem
class TextItem(val text: Int) : ComparableRvItem<TextItem>() {
class TextItem(val text: Int) : DiffRvItem<TextItem>() {
override val layoutRes = R.layout.item_text
override fun contentSameAs(other: TextItem) = text == other.text
override fun itemSameAs(other: TextItem) = contentSameAs(other)
}