From eeb86dfb88a441ac1230cb56ec91aabfe791d027 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 8 Nov 2024 18:26:54 +0100
Subject: [PATCH] Tristate keyword checkbox

---
 .../main/java/eu/faircode/email/AdapterKeyword.java |  7 +++++--
 app/src/main/res/drawable/ic_checked.xml            | 10 ++++++++++
 app/src/main/res/drawable/ic_indeterminate.xml      | 13 +++++++++++++
 app/src/main/res/drawable/ic_unchecked.xml          | 10 ++++++++++
 app/src/main/res/layout/item_keyword.xml            |  1 +
 5 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_checked.xml
 create mode 100644 app/src/main/res/drawable/ic_indeterminate.xml
 create mode 100644 app/src/main/res/drawable/ic_unchecked.xml

diff --git a/app/src/main/java/eu/faircode/email/AdapterKeyword.java b/app/src/main/java/eu/faircode/email/AdapterKeyword.java
index 6e66ce3a6a..e20f0f9c27 100644
--- a/app/src/main/java/eu/faircode/email/AdapterKeyword.java
+++ b/app/src/main/java/eu/faircode/email/AdapterKeyword.java
@@ -98,7 +98,10 @@ public class AdapterKeyword extends RecyclerView.Adapter<AdapterKeyword.ViewHold
         private void bindTo(TupleKeyword keyword) {
             cbKeyword.setText(getTitle(keyword.name));
             cbKeyword.setChecked(keyword.selected);
-            cbKeyword.setAlpha(keyword.partial ? Helper.LOW_LIGHT : 1.0f);
+            if (keyword.partial)
+                cbKeyword.setButtonDrawable(R.drawable.ic_indeterminate);
+            else
+                cbKeyword.setButtonDrawable(keyword.selected ? R.drawable.ic_checked : R.drawable.ic_unchecked);
             btnColor.setColor(keyword.color, true);
             grpNotEdit.setVisibility(View.VISIBLE);
             grpEdit.setVisibility(View.GONE);
@@ -112,7 +115,7 @@ public class AdapterKeyword extends RecyclerView.Adapter<AdapterKeyword.ViewHold
 
             TupleKeyword keyword = all.get(pos);
             keyword.selected = isChecked;
-            buttonView.setAlpha(1.0f);
+            cbKeyword.setButtonDrawable(keyword.selected ? R.drawable.ic_checked : R.drawable.ic_unchecked);
 
             Bundle args = new Bundle();
             args.putLongArray("ids", ids);
diff --git a/app/src/main/res/drawable/ic_checked.xml b/app/src/main/res/drawable/ic_checked.xml
new file mode 100644
index 0000000000..810ddab6cc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_checked.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_indeterminate.xml b/app/src/main/res/drawable/ic_indeterminate.xml
new file mode 100644
index 0000000000..2990cbf111
--- /dev/null
+++ b/app/src/main/res/drawable/ic_indeterminate.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group>
+        <clip-path android:pathData="M0,0h24v24H0z M 0,0" />
+        <path
+            android:fillColor="@android:color/white"
+            android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM17,13L7,13v-2h10v2z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_unchecked.xml b/app/src/main/res/drawable/ic_unchecked.xml
new file mode 100644
index 0000000000..2bc1e40020
--- /dev/null
+++ b/app/src/main/res/drawable/ic_unchecked.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,5v14H5V5h14m0,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z" />
+</vector>
diff --git a/app/src/main/res/layout/item_keyword.xml b/app/src/main/res/layout/item_keyword.xml
index 810fd1bf31..1c0a946046 100644
--- a/app/src/main/res/layout/item_keyword.xml
+++ b/app/src/main/res/layout/item_keyword.xml
@@ -15,6 +15,7 @@
             android:id="@+id/cbKeyword"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:paddingStart="6dp"
             android:text="Keyword"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintBottom_toBottomOf="parent"