Remove show notes and text color controls

Author: timkimadobe

Documentation/style-guide.md

@@ -282,7 +282,6 @@ Feature toggles and interaction configuration.
 | `behavior.feedback.thumbsPlacement` | string | `"inline"` | Thumbs up/down placement. `"inline"` places thumbs beside the sources label; `"below"` places them below the sources accordion with an optional label. |
 | `behavior.feedback.showCloseButton` | boolean \| null | `null` | X close button visibility. `null` = shown for `"action"`, hidden for `"modal"`. |
 | `behavior.feedback.showCancelButton` | boolean \| null | `null` | Cancel button visibility. `null` = shown for `"modal"`, hidden for `"action"`. Both set to `false` is honored: Submit and (in action mode) drag-down still dismiss. |
-| `behavior.feedback.showNotes` | boolean \| null | `null` | Notes field visibility override for modal mode. `null` falls back to per-sentiment `positiveNotesEnabled` / `negativeNotesEnabled`. Not rendered in action mode. |
 
 ### Citations
 
@@ -340,8 +339,7 @@ Feature toggles and interaction configuration.
       "displayMode": "action",
       "thumbsPlacement": "below",
       "showCloseButton": true,
-      "showCancelButton": false,
-      "showNotes": null
+      "showCancelButton": false
     },
     "citations": {
       "showLinkIcon": true
@@ -698,15 +696,14 @@ These tokens style the feedback dialog (modal card and action bottom sheet).
 | `--feedback-question-text-color` | `colors.feedback.questionText` | `String?` | falls back to the title color | Dialog question color. |
 | `--feedback-options-text-color` | `colors.feedback.optionsText` | `String?` | falls back to the title color | Checkbox option label color. |
 | `--feedback-checkbox-border-color` | `colors.feedback.checkboxBorder` | `String?` | `"#7F7F7F"` (light) / `"#B0B0B0"` (dark) | Checkbox unchecked outline color. Also used for the notes editor outline. |
-| `--feedback-notes-text-color` | `colors.feedback.notesText` | `String?` | falls back to the title color | Notes label, entered text, and placeholder color. |
 | `--feedback-drag-handle-color` | `colors.feedback.dragHandle` | `String?` | `"#CCCCCC"` | Drag handle color. Only visible in action mode. |
 | `--feedback-submit-button-fill-color` | `colors.feedback.submitButtonFill` | `String?` | falls back to `colors.button.primaryBackground` | Submit button fill color. |
 | `--feedback-submit-button-text-color` | `colors.feedback.submitButtonText` | `String?` | falls back to `colors.button.primaryText` | Submit button text color. |
 | `--feedback-cancel-button-fill-color` | `colors.feedback.cancelButtonFill` | `String?` | `null` (transparent; outline style) | Cancel button fill. `null` = transparent (outline style). Also tints the X close icon. |
 | `--feedback-cancel-button-text-color` | `colors.feedback.cancelButtonText` | `String?` | falls back to `colors.button.secondaryText` | Cancel button label color. |
 | `--feedback-cancel-button-border-color` | `colors.feedback.cancelButtonBorder` | `String?` | falls back to `colors.button.secondaryBorder` | Cancel button outline color. |
 
-> **Contrast note:** When `--feedback-sheet-background-color` is pinned, also set `--feedback-title-text-color`, `--feedback-question-text-color`, `--feedback-options-text-color`, and `--feedback-notes-text-color` to maintain text contrast. System defaults track the device palette, not the themed surface.
+> **Contrast note:** When `--feedback-sheet-background-color` is pinned, also set `--feedback-title-text-color`, `--feedback-question-text-color`, and `--feedback-options-text-color` to maintain text contrast. System defaults track the device palette, not the themed surface.
 
 ### Colors - Disclaimer
 
@@ -846,8 +843,8 @@ Non-CSS `components.feedback` overrides for the feedback dialog.
 | JSON Key | Type | Default | Description |
 |----------|------|---------|-------------|
 | `components.feedback.iconButtonSizeDesktop` | number | `32` | Feedback icon button hit target size (dp). Mirrors `--feedback-icon-btn-size-desktop`. |
-| `components.feedback.positiveNotesEnabled` | boolean | `true` | Notes field visibility for positive-sentiment modal. Overridden by `behavior.feedback.showNotes`. Not applied in action mode. |
-| `components.feedback.negativeNotesEnabled` | boolean | `true` | Notes field visibility for negative-sentiment modal. Overridden by `behavior.feedback.showNotes`. Not applied in action mode. |
+| `components.feedback.positiveNotesEnabled` | boolean | `true` | Notes field visibility for positive-sentiment modal. Not applied in action mode. |
+| `components.feedback.negativeNotesEnabled` | boolean | `true` | Notes field visibility for negative-sentiment modal. Not applied in action mode. |
 
 ### Layout - Citations
 

code/concierge/src/main/kotlin/com/adobe/marketing/mobile/concierge/ui/components/feedback/FeedbackDialog.kt

@@ -59,7 +59,6 @@ import androidx.compose.ui.unit.dp
 import com.adobe.marketing.mobile.concierge.R
 import com.adobe.marketing.mobile.concierge.ui.state.Feedback
 import com.adobe.marketing.mobile.concierge.ui.state.FeedbackType
-import com.adobe.marketing.mobile.concierge.ui.theme.ConciergeFeedbackBehavior
 import com.adobe.marketing.mobile.concierge.ui.theme.ConciergeStyles
 import com.adobe.marketing.mobile.concierge.ui.theme.ConciergeTheme
 import com.adobe.marketing.mobile.concierge.ui.theme.FeedbackDisplayMode
@@ -149,17 +148,15 @@ private fun resolveQuestion(feedbackType: FeedbackType): String {
     }
 }
 
-/** Notes field visibility: `showNotes` when set, otherwise per-sentiment `positive/negativeNotesEnabled`. */
+/** Notes field visibility: per-sentiment `positive/negativeNotesEnabled` (defaults to `true`). */
 @Composable
 private fun resolveNotesEnabled(feedbackType: FeedbackType): Boolean {
     val componentsFeedback = ConciergeTheme.tokens?.components?.feedback
-    val sentimentFallback = if (feedbackType == FeedbackType.POSITIVE) {
+    return if (feedbackType == FeedbackType.POSITIVE) {
         componentsFeedback?.positiveNotesEnabled ?: true
     } else {
         componentsFeedback?.negativeNotesEnabled ?: true
     }
-    val behavior: ConciergeFeedbackBehavior? = ConciergeTheme.behavior?.feedback
-    return behavior?.resolvedShowNotes(sentimentFallback) ?: sentimentFallback
 }
 
 /** Close (X) button visibility: `true` for `"action"`, `false` for `"modal"` by default. */

code/concierge/src/main/kotlin/com/adobe/marketing/mobile/concierge/ui/theme/CSSKeyMapper.kt

@@ -335,11 +335,6 @@ internal object CSSKeyMapper {
                 existing?.copy(checkboxBorder = color) ?: ConciergeFeedbackColors(checkboxBorder = color)
             }
         },
-        "feedback-notes-text-color" to { cssValue, theme ->
-            updateFeedbackColors(cssValue, theme) { existing, color ->
-                existing?.copy(notesText = color) ?: ConciergeFeedbackColors(notesText = color)
-            }
-        },
         "feedback-drag-handle-color" to { cssValue, theme ->
             updateFeedbackColors(cssValue, theme) { existing, color ->
                 existing?.copy(dragHandle = color) ?: ConciergeFeedbackColors(dragHandle = color)

code/concierge/src/main/kotlin/com/adobe/marketing/mobile/concierge/ui/theme/ConciergeColors.kt

@@ -86,7 +86,6 @@ data class ConciergeColors(
     val feedbackQuestionText: Color? = null,
     val feedbackOptionsText: Color? = null,
     val feedbackCheckboxBorder: Color? = null,
-    val feedbackNotesText: Color? = null,
     val feedbackDragHandle: Color? = null,
     val feedbackSubmitButtonFill: Color? = null,
     val feedbackSubmitButtonText: Color? = null,

code/concierge/src/main/kotlin/com/adobe/marketing/mobile/concierge/ui/theme/ConciergeStyles.kt

@@ -1173,8 +1173,8 @@ internal object ConciergeStyles {
             val titleColor = themeColors.feedbackTitleText ?: dialogTextColor
             val questionColor = themeColors.feedbackQuestionText ?: dialogTextColor.copy(alpha = 0.7f)
             val categoryTextColor = themeColors.feedbackOptionsText ?: dialogTextColor
-            val notesTextColor = themeColors.feedbackNotesText ?: dialogTextColor.copy(alpha = 0.7f)
-            val notesPlaceholderColor = themeColors.feedbackNotesText ?: dialogTextColor.copy(alpha = 0.5f)
+            val notesLabelColor = dialogTextColor.copy(alpha = 0.7f)
+            val notesPlaceholderColor = dialogTextColor.copy(alpha = 0.5f)
             // iOS reuses the checkbox outline for the notes editor outline when set.
             val textFieldBorder = themeColors.feedbackCheckboxBorder ?: dialogTextColor.copy(alpha = 0.2f)
 
@@ -1202,7 +1202,7 @@ internal object ConciergeStyles {
                 categoryTextColor = categoryTextColor,
                 categoriesNotesSpacing = 6.dp,
                 notesLabelStyle = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.Medium),
-                notesLabelColor = notesTextColor,
+                notesLabelColor = notesLabelColor,
                 notesLabelSpacing = 8.dp,
                 notesPlaceholderStyle = MaterialTheme.typography.bodyMedium,
                 notesPlaceholderColor = notesPlaceholderColor,

code/concierge/src/main/kotlin/com/adobe/marketing/mobile/concierge/ui/theme/ConciergeThemeModels.kt

@@ -218,8 +218,6 @@ data class ConciergeFeedbackColors(
     val optionsText: String? = null,
     /** Checkbox unchecked outline color; also reused for the notes editor outline. */
     val checkboxBorder: String? = null,
-    /** Notes label and placeholder color. */
-    val notesText: String? = null,
     /** Action sheet drag handle color. */
     val dragHandle: String? = null,
     /** Submit button fill color. */

code/concierge/src/main/kotlin/com/adobe/marketing/mobile/concierge/ui/theme/ConciergeThemeTokens.kt

@@ -339,18 +339,13 @@ data class ConciergeFeedbackBehavior(
     /** Overrides the close (X) button visibility. `null` defaults to `true` for `"action"`, `false` for `"modal"`. */
     val showCloseButton: Boolean? = null,
     /** Overrides the Cancel button visibility. `null` defaults to `true` for `"modal"`, `false` for `"action"`. */
-    val showCancelButton: Boolean? = null,
-    /** Overrides notes field visibility. `null` falls back to per-sentiment `positiveNotesEnabled` / `negativeNotesEnabled`. */
-    val showNotes: Boolean? = null
+    val showCancelButton: Boolean? = null
 ) {
     /** Effective close button visibility: `showCloseButton` when set, otherwise `displayMode == ACTION`. */
     fun resolvedShowCloseButton(): Boolean = showCloseButton ?: (displayMode == FeedbackDisplayMode.ACTION)
 
     /** Effective Cancel button visibility: `showCancelButton` when set, otherwise `displayMode == MODAL`. */
     fun resolvedShowCancelButton(): Boolean = showCancelButton ?: (displayMode == FeedbackDisplayMode.MODAL)
-
-    /** Notes field visibility: `showNotes` when set, otherwise the provided per-sentiment fallback. */
-    fun resolvedShowNotes(fallback: Boolean): Boolean = showNotes ?: fallback
 }
 
 /**

code/concierge/src/main/kotlin/com/adobe/marketing/mobile/concierge/ui/theme/ThemeParser.kt

@@ -355,7 +355,6 @@ internal object ThemeParser {
             feedbackQuestionText = themeColors.feedback?.questionText?.toComposeColor(),
             feedbackOptionsText = themeColors.feedback?.optionsText?.toComposeColor(),
             feedbackCheckboxBorder = themeColors.feedback?.checkboxBorder?.toComposeColor(),
-            feedbackNotesText = themeColors.feedback?.notesText?.toComposeColor(),
             feedbackDragHandle = themeColors.feedback?.dragHandle?.toComposeColor(),
             feedbackSubmitButtonFill = themeColors.feedback?.submitButtonFill?.toComposeColor(),
             feedbackSubmitButtonText = themeColors.feedback?.submitButtonText?.toComposeColor(),
@@ -444,8 +443,7 @@ internal object ThemeParser {
                 displayMode = FeedbackDisplayMode.fromString(DataReader.optString(it, "displayMode", "modal")),
                 thumbsPlacement = FeedbackThumbsPlacement.fromString(DataReader.optString(it, "thumbsPlacement", "inline")),
                 showCloseButton = it["showCloseButton"] as? Boolean,
-                showCancelButton = it["showCancelButton"] as? Boolean,
-                showNotes = it["showNotes"] as? Boolean
+                showCancelButton = it["showCancelButton"] as? Boolean
             )
         }
 

code/concierge/src/test/kotlin/com/adobe/marketing/mobile/concierge/ui/theme/CSSKeyMapperTest.kt

@@ -64,7 +64,6 @@ class CSSKeyMapperTest {
             "feedback-question-text-color",
             "feedback-options-text-color",
             "feedback-checkbox-border-color",
-            "feedback-notes-text-color",
             "feedback-drag-handle-color",
             "feedback-submit-button-fill-color",
             "feedback-submit-button-text-color",
@@ -1120,12 +1119,6 @@ class CSSKeyMapperTest {
         assertEquals("#131313", result.colors?.feedback?.checkboxBorder)
     }
 
-    @Test
-    fun `apply maps feedback-notes-text-color`() {
-        val result = CSSKeyMapper.apply("--feedback-notes-text-color", "#131313", emptyTheme)
-        assertEquals("#131313", result.colors?.feedback?.notesText)
-    }
-
     @Test
     fun `apply maps feedback-drag-handle-color`() {
         val result = CSSKeyMapper.apply("--feedback-drag-handle-color", "#CCCCCC", emptyTheme)
@@ -1253,7 +1246,6 @@ class CSSKeyMapperTest {
             "feedback-question-text-color",
             "feedback-options-text-color",
             "feedback-checkbox-border-color",
-            "feedback-notes-text-color",
             "feedback-drag-handle-color",
             "feedback-submit-button-fill-color",
             "feedback-submit-button-text-color",

code/concierge/src/test/kotlin/com/adobe/marketing/mobile/concierge/ui/theme/ConciergeFeedbackBehaviorTest.kt

@@ -19,8 +19,8 @@ import org.junit.Assert.assertTrue
 import org.junit.Test
 
 /**
- * Tests visibility defaults and overrides for the feedback close (X) and Cancel buttons,
- * and for the notes field. Mirrors the iOS `ConciergeFeedbackBehaviorTests` coverage.
+ * Tests visibility defaults and overrides for the feedback close (X) and Cancel buttons.
+ * Mirrors the iOS `ConciergeFeedbackBehaviorTests` coverage.
  */
 class ConciergeFeedbackBehaviorTest {
 
@@ -98,34 +98,6 @@ class ConciergeFeedbackBehaviorTest {
 
         assertNull(behavior.showCloseButton)
         assertNull(behavior.showCancelButton)
-        assertNull(behavior.showNotes)
-    }
-
-    // ========== showNotes resolver ==========
-
-    /** When `showNotes` is null, fall back to the per-sentiment value. */
-    @Test
-    fun `resolvedShowNotes null falls back to per sentiment fallback`() {
-        val behavior = ConciergeFeedbackBehavior(showNotes = null)
-
-        assertTrue(behavior.resolvedShowNotes(fallback = true))
-        assertFalse(behavior.resolvedShowNotes(fallback = false))
-    }
-
-    @Test
-    fun `resolvedShowNotes explicit true overrides fallback`() {
-        val behavior = ConciergeFeedbackBehavior(showNotes = true)
-
-        assertTrue(behavior.resolvedShowNotes(fallback = false))
-        assertTrue(behavior.resolvedShowNotes(fallback = true))
-    }
-
-    @Test
-    fun `resolvedShowNotes explicit false overrides fallback`() {
-        val behavior = ConciergeFeedbackBehavior(showNotes = false)
-
-        assertFalse(behavior.resolvedShowNotes(fallback = true))
-        assertFalse(behavior.resolvedShowNotes(fallback = false))
     }
 
     // ========== ConciergeFeedbackComponent per-sentiment flags ==========
@@ -160,14 +132,12 @@ class ConciergeFeedbackBehaviorTest {
         val original = ConciergeFeedbackBehavior(
             displayMode = FeedbackDisplayMode.ACTION,
             showCloseButton = false,
-            showCancelButton = true,
-            showNotes = false
+            showCancelButton = true
         )
         val updated = original.copy(displayMode = FeedbackDisplayMode.MODAL)
 
         assertEquals(FeedbackDisplayMode.MODAL, updated.displayMode)
         assertFalse(updated.showCloseButton!!)
         assertTrue(updated.showCancelButton!!)
-        assertFalse(updated.showNotes!!)
     }
 }