Update IPScrambling UI

2 files changed, 14 insertions, 13 deletions

diff --git a/app/src/main/java/foundation/e/privacycentralapp/common/NavToolbarFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/common/NavToolbarFragment.kt
index 52197cd..5930fff 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/common/NavToolbarFragment.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/common/NavToolbarFragment.kt
@@ -19,13 +19,14 @@ package foundation.e.privacycentralapp.common
 
 import androidx.annotation.LayoutRes
 import com.google.android.material.appbar.MaterialToolbar
+import foundation.e.privacycentralapp.R
 
 abstract class NavToolbarFragment(@LayoutRes contentLayoutId: Int) : ToolbarFragment(contentLayoutId) {
 
     override fun setupToolbar(toolbar: MaterialToolbar) {
         super.setupToolbar(toolbar)
         toolbar.apply {
-            setNavigationIcon(lineageos.platform.R.drawable.ic_back)
+            setNavigationIcon(R.drawable.ic_ic_chevron_left_24dp)
             setNavigationOnClickListener {
                 requireActivity().onBackPressed()
             }
diff --git a/app/src/main/java/foundation/e/privacycentralapp/common/ToggleAppsAdapter.kt b/app/src/main/java/foundation/e/privacycentralapp/common/ToggleAppsAdapter.kt
index 4f9a6fc..71b5e97 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/common/ToggleAppsAdapter.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/common/ToggleAppsAdapter.kt
@@ -17,10 +17,10 @@
 
 package foundation.e.privacycentralapp.common
 
-import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.CheckBox
 import android.widget.ImageView
 import android.widget.Switch
 import android.widget.TextView
@@ -28,22 +28,22 @@ import androidx.recyclerview.widget.RecyclerView
 import foundation.e.privacycentralapp.R
 import foundation.e.privacymodules.permissions.data.ApplicationDescription
 
-open class ToggleAppsAdapter(
+class ToggleAppsAdapter(
+    private val itemsLayout: Int,
     private val listener: (String, Boolean) -> Unit
 ) :
-    RecyclerView.Adapter<ToggleAppsAdapter.PermissionViewHolder>() {
+    RecyclerView.Adapter<ToggleAppsAdapter.ViewHolder>() {
 
-    class PermissionViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        val appName: TextView = view.findViewById(R.id.app_title)
+    class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+        val appName: TextView = view.findViewById(R.id.title)
 
-        @SuppressLint("UseSwitchCompatOrMaterialCode")
-        val togglePermission: Switch = view.findViewById(R.id.toggle)
+        val togglePermission: CheckBox = view.findViewById(R.id.toggle)
 
         fun bind(item: Pair<ApplicationDescription, Boolean>) {
             appName.text = item.first.label
             togglePermission.isChecked = item.second
 
-            itemView.findViewById<ImageView>(R.id.app_icon).setImageDrawable(item.first.icon)
+            itemView.findViewById<ImageView>(R.id.icon).setImageDrawable(item.first.icon)
         }
     }
 
@@ -53,10 +53,10 @@ open class ToggleAppsAdapter(
             notifyDataSetChanged()
         }
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PermissionViewHolder {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         val view = LayoutInflater.from(parent.context)
-            .inflate(R.layout.item_app_toggle, parent, false)
-        val holder = PermissionViewHolder(view)
+            .inflate(itemsLayout, parent, false)
+        val holder = ViewHolder(view)
         holder.togglePermission.setOnCheckedChangeListener { _, isChecked ->
             listener(dataSet[holder.adapterPosition].first.packageName, isChecked)
         }
@@ -64,7 +64,7 @@ open class ToggleAppsAdapter(
         return holder
     }
 
-    override fun onBindViewHolder(holder: PermissionViewHolder, position: Int) {
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val permission = dataSet[position]
         holder.bind(permission)
     }