225 - 5286 trackers screens fixes

1 files changed, 15 insertions, 14 deletions

diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/ToggleTrackersAdapter.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/ToggleTrackersAdapter.kt
index 9ffdd12..b9beccf 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/ToggleTrackersAdapter.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/ToggleTrackersAdapter.kt
@@ -38,7 +38,11 @@ class ToggleTrackersAdapter(
 
     var isEnabled = true
 
-    class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+    class ViewHolder(
+        view: View,
+        private val onToggleSwitch: (Tracker, Boolean) -> Unit,
+        private val onClickTitle: (Tracker) -> Unit
+    ) : RecyclerView.ViewHolder(view) {
         val title: TextView = view.findViewById(R.id.title)
 
         val toggle: Switch = view.findViewById(R.id.toggle)
@@ -59,6 +63,15 @@ class ToggleTrackersAdapter(
             toggle.isChecked = item.second
             toggle.isEnabled = isEnabled
             toggleOverlay.isVisible = !isEnabled
+
+            toggle.setOnClickListener {
+                onToggleSwitch(item.first, toggle.isChecked)
+            }
+            toggleOverlay.setOnClickListener {
+                onToggleSwitch(item.first, false)
+            }
+
+            title.setOnClickListener { onClickTitle(item.first) }
         }
     }
 
@@ -73,19 +86,7 @@ class ToggleTrackersAdapter(
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         val view = LayoutInflater.from(parent.context)
             .inflate(itemsLayout, parent, false)
-        val holder = ViewHolder(view)
-        holder.toggle.setOnClickListener {
-            onToggleSwitch(dataSet[holder.adapterPosition].first, holder.toggle.isChecked)
-        }
-        holder.toggleOverlay.setOnClickListener {
-            onToggleSwitch(dataSet[holder.adapterPosition].first, false)
-        }
-
-        holder.title.setOnClickListener {
-            onClickTitle(dataSet[holder.adapterPosition].first)
-        }
-
-        return holder
+        return ViewHolder(view, onToggleSwitch, onClickTitle)
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {