From c7b38bfe2bdf691a88f214f80b5f32b94b0b6bfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Natalie=20Klestrup=20R=C3=B6ijezon?= <nat@nullable.se>
Date: Thu, 29 Aug 2024 21:21:26 +0200
Subject: [PATCH] Add Zalgo mode icon

See #216
---
 .../main/java/se/nullable/flickboard/model/KeyM.kt   |  8 ++++----
 app/src/main/res/drawable/outline_cell_merge_24.xml  | 12 ++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/drawable/outline_cell_merge_24.xml

diff --git a/app/src/main/java/se/nullable/flickboard/model/KeyM.kt b/app/src/main/java/se/nullable/flickboard/model/KeyM.kt
index e90883e..4c3f5f8 100644
--- a/app/src/main/java/se/nullable/flickboard/model/KeyM.kt
+++ b/app/src/main/java/se/nullable/flickboard/model/KeyM.kt
@@ -275,10 +275,10 @@ sealed class Action {
     data object ToggleZalgo : Action() {
         override val isModifier: Boolean = true
 
-        override fun visual(modifier: ModifierState?): ActionVisual = when {
-            modifier?.zalgo ?: true -> ActionVisual.Label("ź̸̥͂a̶̝̲͊͠l̶̻͈͛g̶͖̋̾o̶̠̅")
-            else -> ActionVisual.None
-        }
+        override fun visual(modifier: ModifierState?): ActionVisual =
+            ActionVisual.Icon(R.drawable.outline_cell_merge_24)
+
+        override fun isActive(modifier: ModifierState?): Boolean = modifier?.zalgo ?: false
     }
 
     data object ToggleSelect : Action() {
diff --git a/app/src/main/res/drawable/outline_cell_merge_24.xml b/app/src/main/res/drawable/outline_cell_merge_24.xml
new file mode 100644
index 0000000..e2b55cf
--- /dev/null
+++ b/app/src/main/res/drawable/outline_cell_merge_24.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportHeight="960"
+    android:viewportWidth="960"
+    android:width="24dp">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M120,840L120,600L200,600L200,760L360,760L360,840L120,840ZM600,840L600,760L760,760L760,600L840,600L840,840L600,840ZM287,633L230,577L287,520L80,520L80,440L287,440L230,383L287,327L440,480L287,633ZM673,633L520,480L673,327L730,383L673,440L880,440L880,520L673,520L730,577L673,633ZM120,360L120,120L360,120L360,200L200,200L200,360L120,360ZM760,360L760,200L600,200L600,120L840,120L840,360L760,360Z" />
+
+</vector>