make permission item fully touchable

ankidroid · Jun 7, 2024 · a09b113 · a09b113
1 parent 1928dd0
commit a09b113
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/PermissionItem.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/PermissionItem.kt
@@ -82,8 +82,19 @@ class PermissionItem(context: Context, attrs: AttributeSet) : FrameLayout(contex
                 }
             }
         }
+        setOnClickListener {
+            if (!isGranted) {
+                Timber.i("Permission item clicked, requesting permission")
+                listener?.invoke()
+            } else {
+                switch.isChecked = !switch.isChecked
+            }
+        }
+        updateSwitchCheckedStatus()
     }
 
+    private var listener: (() -> Unit)? = null
+
     /**
      * Checks the switch if the permission is granted,
      * or uncheck if not
@@ -97,11 +108,6 @@ class PermissionItem(context: Context, attrs: AttributeSet) : FrameLayout(contex
      * The listener isn't invoked if the permission is already granted
      * */
     fun setOnSwitchClickListener(listener: () -> Unit) {
-        switch.setOnClickListener {
-            if (!isGranted) {
-                Timber.i("permission switch pressed")
-                listener.invoke()
-            }
-        }
+        this.listener = listener
     }
 }
diff --git a/AnkiDroid/src/main/res/layout/permission_item.xml b/AnkiDroid/src/main/res/layout/permission_item.xml
@@ -7,6 +7,7 @@
     android:minHeight="?attr/listPreferredItemHeight"
     android:paddingTop="16dp"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:background="?attr/selectableItemBackground"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     tools:context=".ui.windows.permissions.PermissionItem">