From 1984436fccfb0ac1caf74f61cbadcec16e44fee1 Mon Sep 17 00:00:00 2001 From: priyacs651 Date: Mon, 29 Apr 2024 17:17:39 +0530 Subject: [PATCH 1/2] Implemented Not Available in TUISelectionCard.kt --- tarka-ui/build.gradle.kts | 2 +- .../components/card/TUISelectionCard.kt | 29 +++++++++++++------ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/tarka-ui/build.gradle.kts b/tarka-ui/build.gradle.kts index 7fbf4171..9f03918e 100644 --- a/tarka-ui/build.gradle.kts +++ b/tarka-ui/build.gradle.kts @@ -66,7 +66,7 @@ publishing { run { groupId = "com.tarkalabs" artifactId = getLibraryArtifactId() - version = "1.1.16" + version = "1.1.17" artifact("$buildDir/outputs/aar/tarka-ui-release.aar") } } diff --git a/tarka-ui/src/main/java/com/tarkalabs/tarkaui/components/card/TUISelectionCard.kt b/tarka-ui/src/main/java/com/tarkalabs/tarkaui/components/card/TUISelectionCard.kt index 0993cbbd..b3527836 100644 --- a/tarka-ui/src/main/java/com/tarkalabs/tarkaui/components/card/TUISelectionCard.kt +++ b/tarka-ui/src/main/java/com/tarkalabs/tarkaui/components/card/TUISelectionCard.kt @@ -18,10 +18,12 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import com.tarkalabs.tarkaui.R import com.tarkalabs.tarkaui.components.HorizontalSpacer import com.tarkalabs.tarkaui.components.VerticalSpacer import com.tarkalabs.tarkaui.components.base.BadgeStyle @@ -64,7 +66,7 @@ fun TUISelectionCard( modifier: Modifier = Modifier, leadingIcon: TarkaIcon? = null, label: String? = null, - primaryDescription: String, + primaryDescription: String? = null, secondaryDescription: String? = null, primaryDetails: String? = null, secondaryDetails: String? = null, @@ -119,12 +121,21 @@ fun TUISelectionCard( } - Text( - modifier = Modifier.testTag(tags.descriptionTag), - text = primaryDescription, - color = TUITheme.colors.inputText, - style = TUITheme.typography.heading6 - ) + if (primaryDescription != null) { + Text( + modifier = Modifier.testTag(tags.descriptionTag), + text = primaryDescription, + color = TUITheme.colors.inputText, + style = TUITheme.typography.heading6 + ) + }else{ + Text( + modifier = Modifier.testTag(tags.descriptionTag), + text = stringResource(id = R.string.not_availble), + color = TUITheme.colors.utilityDisabledContent, + style = TUITheme.typography.heading6 + ) + } VerticalSpacer(space = 4) primaryDetails?.let { @@ -225,7 +236,7 @@ fun TUISelectionCardPreview() { ) { TUISelectionCard( label = "itemNum", - primaryDescription = "item Description", + primaryDescription = null, primaryDetails = "location", secondaryDetails = "- 11 Unit", secondaryDetailStyle = ERROR, @@ -286,7 +297,7 @@ fun TUISelectionCardPreview() { TUISelectionCard( leadingIcon = Regular.Person24, label = "Label", - primaryDescription = "Description", + primaryDescription = null, secondaryDescription = "Description2", primaryDetails = "Details", secondaryDetails = "Details2", From 274c1c43c149504e0f74bb9a8e762b246c6cbcaa Mon Sep 17 00:00:00 2001 From: priyacs651 Date: Mon, 29 Apr 2024 17:38:36 +0530 Subject: [PATCH 2/2] " implemented nullandempty" --- .../tarkaui/components/card/TUISelectionCard.kt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tarka-ui/src/main/java/com/tarkalabs/tarkaui/components/card/TUISelectionCard.kt b/tarka-ui/src/main/java/com/tarkalabs/tarkaui/components/card/TUISelectionCard.kt index b3527836..6ee515ca 100644 --- a/tarka-ui/src/main/java/com/tarkalabs/tarkaui/components/card/TUISelectionCard.kt +++ b/tarka-ui/src/main/java/com/tarkalabs/tarkaui/components/card/TUISelectionCard.kt @@ -42,6 +42,7 @@ enum class SecondaryDetailsStyle { NORMAL, ERROR } + /** * This Composable function is used to Show the Cards in a list to pick the particular from User. * @@ -121,18 +122,18 @@ fun TUISelectionCard( } - if (primaryDescription != null) { + if (primaryDescription.isNullOrEmpty()) { Text( modifier = Modifier.testTag(tags.descriptionTag), - text = primaryDescription, - color = TUITheme.colors.inputText, + text = stringResource(id = R.string.not_availble), + color = TUITheme.colors.utilityDisabledContent, style = TUITheme.typography.heading6 ) - }else{ + } else { Text( modifier = Modifier.testTag(tags.descriptionTag), - text = stringResource(id = R.string.not_availble), - color = TUITheme.colors.utilityDisabledContent, + text = primaryDescription, + color = TUITheme.colors.inputText, style = TUITheme.typography.heading6 ) }