1 files changed, 13 insertions, 25 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt
index f8b229830..3fedb4969 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt
@@ -5,43 +5,31 @@ package org.yuzu.yuzu_emu.features.settings.ui.viewholder
 
 import android.view.View
 import android.widget.CompoundButton
-import android.widget.TextView
-import com.google.android.material.materialswitch.MaterialSwitch
-import org.yuzu.yuzu_emu.R
+import org.yuzu.yuzu_emu.databinding.ListItemSettingSwitchBinding
 import org.yuzu.yuzu_emu.features.settings.model.view.SwitchSetting
 import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
 import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter
 
-class SwitchSettingViewHolder(itemView: View, adapter: SettingsAdapter) :
-    SettingViewHolder(itemView, adapter) {
-    private lateinit var item: SwitchSetting
-    private lateinit var textSettingName: TextView
-    private lateinit var textSettingDescription: TextView
-    private lateinit var switch: MaterialSwitch
-
-    override fun findViews(root: View) {
-        textSettingName = root.findViewById(R.id.text_setting_name)
-        textSettingDescription = root.findViewById(R.id.text_setting_description)
-        switch = root.findViewById(R.id.switch_widget)
-    }
+class SwitchSettingViewHolder(val binding: ListItemSettingSwitchBinding, adapter: SettingsAdapter) :
+    SettingViewHolder(binding.root, adapter) {
 
     override fun bind(item: SettingsItem) {
-        this.item = item as SwitchSetting
-        textSettingName.setText(item.nameId)
+        val setting = item as SwitchSetting
+        binding.textSettingName.setText(item.nameId)
         if (item.descriptionId!! > 0) {
-            textSettingDescription.setText(item.descriptionId)
-            textSettingDescription.visibility = View.VISIBLE
+            binding.textSettingDescription.setText(item.descriptionId)
+            binding.textSettingDescription.visibility = View.VISIBLE
         } else {
-            textSettingDescription.text = ""
-            textSettingDescription.visibility = View.GONE
+            binding.textSettingDescription.text = ""
+            binding.textSettingDescription.visibility = View.GONE
         }
-        switch.isChecked = this.item.isChecked
-        switch.setOnCheckedChangeListener { _: CompoundButton, _: Boolean ->
-            adapter.onBooleanClick(item, bindingAdapterPosition, switch.isChecked)
+        binding.switchWidget.isChecked = setting.isChecked
+        binding.switchWidget.setOnCheckedChangeListener { _: CompoundButton, _: Boolean ->
+            adapter.onBooleanClick(item, bindingAdapterPosition, binding.switchWidget.isChecked)
         }
     }
 
     override fun onClick(clicked: View) {
-        switch.toggle()
+        binding.switchWidget.toggle()
     }
 }