diff --git a/app/apk/src/main/java/com/topjohnwu/magisk/databinding/RecyclerViewItems.kt b/app/apk/src/main/java/com/topjohnwu/magisk/databinding/RecyclerViewItems.kt index 7b26f832d..f2d64f987 100644 --- a/app/apk/src/main/java/com/topjohnwu/magisk/databinding/RecyclerViewItems.kt +++ b/app/apk/src/main/java/com/topjohnwu/magisk/databinding/RecyclerViewItems.kt @@ -16,10 +16,6 @@ interface ItemWrapper { val item: E } -interface ViewAwareItem { - fun onBind(binding: ViewDataBinding, recyclerView: RecyclerView) -} - interface DiffItem { fun itemSameAs(other: T): Boolean { diff --git a/app/apk/src/main/java/com/topjohnwu/magisk/databinding/RvItemAdapter.kt b/app/apk/src/main/java/com/topjohnwu/magisk/databinding/RvItemAdapter.kt index 97ad66892..64c9017ce 100644 --- a/app/apk/src/main/java/com/topjohnwu/magisk/databinding/RvItemAdapter.kt +++ b/app/apk/src/main/java/com/topjohnwu/magisk/databinding/RvItemAdapter.kt @@ -52,10 +52,6 @@ class RvItemAdapter( } holder.binding.lifecycleOwner = lifecycleOwner holder.binding.executePendingBindings() - recyclerView?.let { - if (item is ViewAwareItem) - item.onBind(holder.binding, it) - } } override fun getItemCount() = items.size diff --git a/app/apk/src/main/java/com/topjohnwu/magisk/ui/flash/ConsoleItem.kt b/app/apk/src/main/java/com/topjohnwu/magisk/ui/flash/ConsoleItem.kt index d0639d2d4..a0c3c95bf 100644 --- a/app/apk/src/main/java/com/topjohnwu/magisk/ui/flash/ConsoleItem.kt +++ b/app/apk/src/main/java/com/topjohnwu/magisk/ui/flash/ConsoleItem.kt @@ -1,38 +1,12 @@ package com.topjohnwu.magisk.ui.flash -import android.view.View -import android.widget.TextView -import androidx.core.view.updateLayoutParams -import androidx.databinding.ViewDataBinding -import androidx.recyclerview.widget.RecyclerView import com.topjohnwu.magisk.R import com.topjohnwu.magisk.databinding.DiffItem import com.topjohnwu.magisk.databinding.ItemWrapper import com.topjohnwu.magisk.databinding.RvItem -import com.topjohnwu.magisk.databinding.ViewAwareItem -import kotlin.math.max class ConsoleItem( override val item: String -) : RvItem(), ViewAwareItem, DiffItem, ItemWrapper { +) : RvItem(), DiffItem, ItemWrapper { override val layoutRes = R.layout.item_console_md2 - - private var parentWidth = -1 - - override fun onBind(binding: ViewDataBinding, recyclerView: RecyclerView) { - if (parentWidth < 0) - parentWidth = (recyclerView.parent as View).width - - val view = binding.root as TextView - view.measure(0, 0) - - // We want our recyclerView at least as wide as screen - val desiredWidth = max(view.measuredWidth, parentWidth) - - view.updateLayoutParams { width = desiredWidth } - - if (recyclerView.width < desiredWidth) { - recyclerView.requestLayout() - } - } } diff --git a/app/apk/src/main/java/com/topjohnwu/magisk/ui/log/LogRvItem.kt b/app/apk/src/main/java/com/topjohnwu/magisk/ui/log/LogRvItem.kt index 21bffb382..abf25fc2f 100644 --- a/app/apk/src/main/java/com/topjohnwu/magisk/ui/log/LogRvItem.kt +++ b/app/apk/src/main/java/com/topjohnwu/magisk/ui/log/LogRvItem.kt @@ -1,28 +1,12 @@ package com.topjohnwu.magisk.ui.log -import androidx.databinding.ViewDataBinding -import androidx.recyclerview.widget.RecyclerView -import com.google.android.material.textview.MaterialTextView import com.topjohnwu.magisk.R import com.topjohnwu.magisk.databinding.DiffItem import com.topjohnwu.magisk.databinding.ItemWrapper import com.topjohnwu.magisk.databinding.ObservableRvItem -import com.topjohnwu.magisk.databinding.ViewAwareItem class LogRvItem( override val item: String -) : ObservableRvItem(), DiffItem, ItemWrapper, ViewAwareItem { - +) : ObservableRvItem(), DiffItem, ItemWrapper { override val layoutRes = R.layout.item_log_textview - - override fun onBind(binding: ViewDataBinding, recyclerView: RecyclerView) { - val view = binding.root as MaterialTextView - view.measure(0, 0) - val desiredWidth = view.measuredWidth - val layoutParams = view.layoutParams - layoutParams.width = desiredWidth - if (recyclerView.width < desiredWidth) { - recyclerView.requestLayout() - } - } } diff --git a/app/apk/src/main/res/layout/item_console_md2.xml b/app/apk/src/main/res/layout/item_console_md2.xml index f86c3d83b..fd8ed0bf1 100644 --- a/app/apk/src/main/res/layout/item_console_md2.xml +++ b/app/apk/src/main/res/layout/item_console_md2.xml @@ -11,7 +11,7 @@