VERY experimental Nintendo Switch 2 emulator
C++
android: Only compare game contents for GameAdapter
t895855ef8dc60a3
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AbstractDiffAdapter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AbstractDiffAdapter.ktindex f006f9e3d2..0ab1b46c3d 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AbstractDiffAdapter.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AbstractDiffAdapter.kt@@ -14,15 +14,20 @@ import androidx.recyclerview.widget.RecyclerView* Generic adapter that implements an [AsyncDifferConfig] and covers some of the basic boilerplate* code used in every [RecyclerView].* Type assigned to [Model] must inherit from [Object] in order to be compared properly.+ * @param exact Decides whether each item will be compared by reference or by their contents*/-abstract class AbstractDiffAdapter<Model : Any, Holder : AbstractViewHolder<Model>> :- ListAdapter<Model, Holder>(AsyncDifferConfig.Builder(DiffCallback<Model>()).build()) {+abstract class AbstractDiffAdapter<Model : Any, Holder : AbstractViewHolder<Model>>(+ exact: Boolean = true+) : ListAdapter<Model, Holder>(AsyncDifferConfig.Builder(DiffCallback<Model>(exact)).build()) {override fun onBindViewHolder(holder: Holder, position: Int) =holder.bind(currentList[position])- private class DiffCallback<Model> : DiffUtil.ItemCallback<Model>() {+ private class DiffCallback<Model>(val exact: Boolean) : DiffUtil.ItemCallback<Model>() {override fun areItemsTheSame(oldItem: Model & Any, newItem: Model & Any): Boolean {- return oldItem === newItem+ if (exact) {+ return oldItem === newItem+ }+ return oldItem == newItem}@SuppressLint("DiffUtilEquals")diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.ktindex b4f4d950f5..85c8249e61 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt@@ -30,7 +30,7 @@ import org.yuzu.yuzu_emu.utils.GameIconUtilsimport org.yuzu.yuzu_emu.viewholder.AbstractViewHolderclass GameAdapter(private val activity: AppCompatActivity) :- AbstractDiffAdapter<Game, GameAdapter.GameViewHolder>() {+ AbstractDiffAdapter<Game, GameAdapter.GameViewHolder>(exact = false) {override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GameViewHolder {CardGameBinding.inflate(LayoutInflater.from(parent.context), parent, false).also { return GameViewHolder(it) }diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Game.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Game.ktindex c8a4a2d179..6859b77806 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Game.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Game.kt@@ -70,11 +70,19 @@ class Game(}override fun equals(other: Any?): Boolean {- if (other !is Game) {- return false- }+ if (this === other) return true+ if (javaClass != other?.javaClass) return false++ other as Game++ if (title != other.title) return false+ if (path != other.path) return false+ if (programId != other.programId) return false+ if (developer != other.developer) return false+ if (version != other.version) return false+ if (isHomebrew != other.isHomebrew) return false- return hashCode() == other.hashCode()+ return true}override fun hashCode(): Int {