address review feedback

Author: ioannisj

posthog-android-surveys-compose/src/main/java/com/posthog/android/surveys/compose/internal/ui/EmojiRating.kt

@@ -60,10 +60,9 @@ internal fun EmojiRating(
 ) {
     val appearance = localAppearance()
     val emojis = emojisForScale(question.scaleUpperBound - question.scaleLowerBound + 1)
-    // Record the rating against the question's real scale bounds (matching NumberRating and
-    // iOS), not a synthetic 1..size range. Emoji scales are 1-based on the server, so for
-    // thumbs this is 1 = 👍, 2 = 👎 — the same values iOS records and the dashboard expects.
-    val values = (question.scaleLowerBound..question.scaleUpperBound).toList()
+    // Drive the layout off the emoji list (always 2/3/5 faces) rather than the scale range, so an
+    // unexpected scale can never index past the available faces. The recorded rating uses the
+    // question's 1-based scale bounds: lowerBound + index (e.g. thumbs → 1 = 👍, 2 = 👎).
     // Thumbs up/down (a 2-point emoji scale) hides the bound labels — thumbs
     // don't need "lower/upper" captions.
     val showBoundLabels = emojis.size > 2
@@ -78,7 +77,8 @@ internal fun EmojiRating(
             horizontalArrangement = arrangement,
             verticalAlignment = Alignment.CenterVertically,
         ) {
-            values.forEachIndexed { index, value ->
+            emojis.forEachIndexed { index, emoji ->
+                val value = question.scaleLowerBound + index
                 val isSelected = selectedValue == value
                 // Non-selected emojis use a muted version of the input text color (a gray on a
                 // light background); selected ones use the active rating color.
@@ -99,7 +99,7 @@ internal fun EmojiRating(
                     contentAlignment = Alignment.Center,
                 ) {
                     Canvas(modifier = Modifier.size(40.dp)) {
-                        drawPath(emojis[index].buildPath(size.width, size.height), color = tint)
+                        drawPath(emoji.buildPath(size.width, size.height), color = tint)
                     }
                 }
             }

posthog-android-surveys-compose/src/test/java/com/posthog/android/surveys/compose/internal/theme/SurveyColorTest.kt

@@ -0,0 +1,60 @@
+package com.posthog.android.surveys.compose.internal.theme
+
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+internal class SurveyColorTest {
+    private fun argb(input: String?): Int = parseSurveyColor(input).toArgb()
+
+    @Test
+    fun `named colors resolve case-insensitively`() {
+        assertEquals(0xFFFF0000.toInt(), argb("red"))
+        assertEquals(0xFFFF0000.toInt(), argb("RED"))
+        assertEquals(0xFFFFFFFF.toInt(), argb("white"))
+        assertEquals(0xFF000000.toInt(), argb("black"))
+    }
+
+    @Test
+    fun `transparent aliases resolve to fully transparent`() {
+        assertEquals(0x00000000, argb("transparent"))
+        assertEquals(0x00000000, argb("clear"))
+    }
+
+    @Test
+    fun `hex with and without leading hash resolve the same`() {
+        assertEquals(0xFFFF0000.toInt(), argb("#FF0000"))
+        assertEquals(0xFFFF0000.toInt(), argb("FF0000"))
+        assertEquals(0xFF0000FF.toInt(), argb("#0000FF"))
+    }
+
+    @Test
+    fun `short hex forms are expanded`() {
+        // #RGB -> #RRGGBB (opaque)
+        assertEquals(0xFFFF0000.toInt(), argb("#F00"))
+        // #RGBA -> #RRGGBBAA
+        assertEquals(0x88FF0000.toInt(), argb("#F008"))
+    }
+
+    @Test
+    fun `eight-digit hex carries its alpha channel`() {
+        assertEquals(0xFFFF0000.toInt(), argb("#FF0000FF"))
+        assertEquals(0x80FF0000.toInt(), argb("#FF000080"))
+    }
+
+    @Test
+    fun `null blank and unrecognized input fall back to transparent`() {
+        assertEquals(0x00000000, argb(null))
+        assertEquals(0x00000000, argb(""))
+        assertEquals(0x00000000, argb("   "))
+        assertEquals(0x00000000, argb("#GGG"))
+        assertEquals(0x00000000, argb("notacolor"))
+    }
+
+    @Test
+    fun `contrasting text color follows luminance`() {
+        assertEquals(Color.Black, Color.White.contrastingTextColor())
+        assertEquals(Color.White, Color.Black.contrastingTextColor())
+    }
+}

posthog-android/src/main/java/com/posthog/android/surveys/PostHogSurveysIntegration.kt

@@ -113,6 +113,10 @@ public class PostHogSurveysIntegration(
             isStarted = false
         }
 
+        // Tear down any survey UI still on screen so its dialog window doesn't outlive the
+        // integration; clearActiveSurvey() only resets our bookkeeping, not the delegate's UI.
+        cleanupSurveys()
+
         clearActiveSurvey()
 
         this.postHog = null