From b05a25d500b047a39328d8ae7c4f7ccd80499f52 Mon Sep 17 00:00:00 2001 From: Mahendran Date: Wed, 6 Sep 2023 13:03:38 +0530 Subject: [PATCH 1/3] Font & Color Changed for TUISelectionCard's Primary & Secondary Details & Order was updated properly like in figma. --- .../uicomponents/TUIRadioButtonRowTest.kt | 6 +++--- .../uicomponents/components/TUISelectionCard.kt | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUIRadioButtonRowTest.kt b/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUIRadioButtonRowTest.kt index a01d3701..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,7 @@ 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 @@ -30,7 +30,7 @@ class TUIRadioButtonRowTest { TUIRadioButtonRow( selected = selectedState, title = title, - style = TextRowStyle.Title, + style = ToggleRowStyle.Title, onOptionSelected = onOptionSelected, tags = radioButtonRowTag ) @@ -56,7 +56,7 @@ class TUIRadioButtonRowTest { TUIRadioButtonRow( selected = selectedState, title = title, - style = TextRowStyle.Title, + style = ToggleRowStyle.Title, onOptionSelected = onOptionSelected, tags = radioButtonRowTag ) 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 392d9840..49750a7f 100644 --- a/tarkaui/src/main/java/com/tarkalabs/uicomponents/components/TUISelectionCard.kt +++ b/tarkaui/src/main/java/com/tarkalabs/uicomponents/components/TUISelectionCard.kt @@ -107,18 +107,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 @@ -129,8 +129,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 ) } From f9d3048fff2a05acbde40cc46b441c9f859e6dea Mon Sep 17 00:00:00 2001 From: Mahendran Date: Wed, 6 Sep 2023 13:08:59 +0530 Subject: [PATCH 2/3] Version Increment --- tarkaui/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tarkaui/build.gradle.kts b/tarkaui/build.gradle.kts index 3b325992..478c7c3a 100644 --- a/tarkaui/build.gradle.kts +++ b/tarkaui/build.gradle.kts @@ -66,7 +66,7 @@ publishing { run { groupId = "com.tarkalabs" artifactId = getLibraryArtifactId() - version = "0.39-alpha" + version = "0.40-alpha" artifact("$buildDir/outputs/aar/${getLibraryArtifactId()}-release.aar") } } From da5af4db13b0f2b3f86fc52d5762478390ab9e7d Mon Sep 17 00:00:00 2001 From: Mahendran Date: Thu, 7 Sep 2023 20:09:40 +0530 Subject: [PATCH 3/3] trailingIcon color updated properly based on selected state --- .../com/tarkalabs/uicomponents/components/TUISelectionCard.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 49750a7f..6c31aebe 100644 --- a/tarkaui/src/main/java/com/tarkalabs/uicomponents/components/TUISelectionCard.kt +++ b/tarkaui/src/main/java/com/tarkalabs/uicomponents/components/TUISelectionCard.kt @@ -152,7 +152,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 ) }