From 4a6997276b28177bc7a6e2895dfb1b171275bd0a Mon Sep 17 00:00:00 2001
From: Alex <ah8412@proton.me>
Date: Sun, 7 Jun 2026 07:58:33 -0500
Subject: [PATCH] Pre-highlight primary variation on long press

---
 .../components/CharacterVariationPopup.kt     |  4 +
 .../CharacterVariationPopupHighlightTest.kt   | 74 +++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 app/src/test/java/com/urik/keyboard/ui/keyboard/components/CharacterVariationPopupHighlightTest.kt

diff --git a/app/src/main/java/com/urik/keyboard/ui/keyboard/components/CharacterVariationPopup.kt b/app/src/main/java/com/urik/keyboard/ui/keyboard/components/CharacterVariationPopup.kt
index 888705c5..d93a3e8c 100644
--- a/app/src/main/java/com/urik/keyboard/ui/keyboard/components/CharacterVariationPopup.kt
+++ b/app/src/main/java/com/urik/keyboard/ui/keyboard/components/CharacterVariationPopup.kt
@@ -104,6 +104,10 @@ class CharacterVariationPopup(private val context: Context, private val themeMan
             addCharacterView(variation, isBase = false, index = actualIndex, totalCount = totalCount)
         }
 
+        if (variations.isNotEmpty()) {
+            setHighlighted(variations[0])
+        }
+
         val itemSize = (40 * density).toInt()
         val idealWidth = totalCount * itemSize + (16 * density).toInt()
         val popupHeight = itemSize + (8 * density).toInt()
diff --git a/app/src/test/java/com/urik/keyboard/ui/keyboard/components/CharacterVariationPopupHighlightTest.kt b/app/src/test/java/com/urik/keyboard/ui/keyboard/components/CharacterVariationPopupHighlightTest.kt
new file mode 100644
index 00000000..23e8b240
--- /dev/null
+++ b/app/src/test/java/com/urik/keyboard/ui/keyboard/components/CharacterVariationPopupHighlightTest.kt
@@ -0,0 +1,74 @@
+package com.urik.keyboard.ui.keyboard.components
+
+import android.graphics.drawable.GradientDrawable
+import android.widget.HorizontalScrollView
+import android.widget.LinearLayout
+import com.urik.keyboard.theme.Default
+import com.urik.keyboard.theme.KeyboardTheme
+import com.urik.keyboard.theme.ThemeManager
+import kotlinx.coroutines.flow.MutableStateFlow
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [33])
+class CharacterVariationPopupHighlightTest {
+    private lateinit var popup: CharacterVariationPopup
+    private lateinit var theme: KeyboardTheme
+
+    @Before
+    fun setup() {
+        val context = RuntimeEnvironment.getApplication()
+        val themeManager: ThemeManager = mock()
+        theme = Default
+        val themeFlow = MutableStateFlow(theme)
+        whenever(themeManager.currentTheme).thenReturn(themeFlow)
+
+        popup = CharacterVariationPopup(context, themeManager)
+    }
+
+    @Test
+    fun `primary variation is pre-highlighted immediately on construction without drag`() {
+        popup.setCharacterVariations("", listOf("ö", "ò", "ó")) {}
+
+        assertEquals("ö", popup.getHighlightedCharacter())
+    }
+
+    @Test
+    fun `pre-highlighted button has the same highlighted background as setHighlighted applies`() {
+        popup.setCharacterVariations("", listOf("ö", "ò", "ó")) {}
+
+        val scrollView = popup.contentView as HorizontalScrollView
+        val container = scrollView.getChildAt(0) as LinearLayout
+        val highlightedButton = container.getChildAt(0)
+
+        val bg = highlightedButton.background as GradientDrawable
+        val color = bg.color?.defaultColor
+
+        assertEquals(theme.colors.statePressed, color)
+    }
+
+    @Test
+    fun `empty variations list pre-highlights nothing and throws no exception`() {
+        popup.setCharacterVariations("", emptyList()) {}
+
+        assertNull(popup.getHighlightedCharacter())
+    }
+
+    @Test
+    fun `dragging to a different variation overrides the pre-highlight`() {
+        popup.setCharacterVariations("", listOf("ö", "ò", "ó")) {}
+
+        popup.setHighlighted("ó")
+
+        assertEquals("ó", popup.getHighlightedCharacter())
+    }
+}