diff --git a/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUIRadioButtonRowTest.kt b/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUIRadioButtonRowTest.kt index 74534c37..8c43dd5c 100644 --- a/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUIRadioButtonRowTest.kt +++ b/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUIRadioButtonRowTest.kt @@ -9,7 +9,6 @@ import androidx.compose.ui.test.onNodeWithText import com.tarkalabs.uicomponents.components.TUIRadioButtonRow import com.tarkalabs.uicomponents.components.TUIRadioButtonRowTags import com.tarkalabs.uicomponents.components.TUIRadioButtonTags -import com.tarkalabs.uicomponents.components.TextRowStyle import com.tarkalabs.uicomponents.components.base.ToggleRowStyle import org.junit.Rule import org.junit.Test diff --git a/tarkaui/src/main/java/com/tarkalabs/uicomponents/components/TUISelectionCard.kt b/tarkaui/src/main/java/com/tarkalabs/uicomponents/components/TUISelectionCard.kt index ca3ffc93..d1cf6938 100644 --- a/tarkaui/src/main/java/com/tarkalabs/uicomponents/components/TUISelectionCard.kt +++ b/tarkaui/src/main/java/com/tarkalabs/uicomponents/components/TUISelectionCard.kt @@ -110,18 +110,18 @@ fun TUISelectionCard( style = TUITheme.typography.heading6 ) - secondaryDescription?.let { + primaryDetails?.let { Text( - modifier = Modifier.testTag(tags.description2Tag), + modifier = Modifier.testTag(tags.detailsTag), text = it, - color = TUITheme.colors.inputText, - style = TUITheme.typography.heading6 + color = TUITheme.colors.inputTextDim.copy(alpha = 0.7f), + style = TUITheme.typography.body7 ) } - primaryDetails?.let { + secondaryDescription?.let { Text( - modifier = Modifier.testTag(tags.detailsTag), + modifier = Modifier.testTag(tags.description2Tag), text = it, color = TUITheme.colors.inputText, style = TUITheme.typography.heading6 @@ -132,8 +132,8 @@ fun TUISelectionCard( Text( modifier = Modifier.testTag(tags.details2Tag), text = it, - color = TUITheme.colors.inputText, - style = TUITheme.typography.heading6 + color = TUITheme.colors.inputTextDim.copy(alpha = 0.7f), + style = TUITheme.typography.body7 ) } @@ -155,7 +155,8 @@ fun TUISelectionCard( .size(24.dp) .testTag(tags.trailingFrontArrowIconTag), painter = painterResource(id = TarkaIcons.Regular.ChevronRight24.iconRes), - contentDescription = TarkaIcons.Regular.ChevronRight24.contentDescription + contentDescription = TarkaIcons.Regular.ChevronRight24.contentDescription, + tint = if (isSelected) TUITheme.colors.onSecondaryAlt else TUITheme.colors.utilityOutline ) }