Merge pull request #128 from tarkalabs/nilesh/tuiSearchBar/changes

- Small UI change in TUISelectionCard
tarkalabs · Oct 5, 2023 · 1e97017 · 1e97017
2 parents 01d9a24 + dd350d9
commit 1e97017
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/tarkaui/build.gradle.kts b/tarkaui/build.gradle.kts
@@ -66,7 +66,7 @@ publishing {
       run {
         groupId = "com.tarkalabs"
         artifactId = getLibraryArtifactId()
-        version = "0.47-alpha"
+        version = "0.48-alpha"
         artifact("$buildDir/outputs/aar/${getLibraryArtifactId()}-release.aar")
       }
     }

diff --git a/tarkaui/src/main/java/com/tarkalabs/uicomponents/components/TUISelectionCard.kt b/tarkaui/src/main/java/com/tarkalabs/uicomponents/components/TUISelectionCard.kt
@@ -26,9 +26,15 @@ import com.tarkalabs.tarkaicons.ChevronRight24
 import com.tarkalabs.tarkaicons.Person24
 import com.tarkalabs.tarkaicons.TarkaIcon
 import com.tarkalabs.tarkaicons.TarkaIcons
+import com.tarkalabs.uicomponents.components.SecondaryDetailsStyle.ERROR
+import com.tarkalabs.uicomponents.components.SecondaryDetailsStyle.NORMAL
 import com.tarkalabs.uicomponents.components.base.TUIBadge
 import com.tarkalabs.uicomponents.theme.TUITheme
 
+enum class SecondaryDetailsStyle {
+  NORMAL,
+  ERROR
+}
 /**
  * This Composable function is used to Show the Cards in a list to pick the particular from User.
  *
@@ -39,6 +45,7 @@ import com.tarkalabs.uicomponents.theme.TUITheme
  * @param secondaryDescription - Optional additional description of the card.
  * @param primaryDetails - Optional details of the card.
  * @param secondaryDetails - Optional second details of the card.
+ * @param secondaryDetailStyle - Optional text color style for secondaryDetails.
  * @param badgeCount - Optional Count Details which is shown in Badge style.
  * @param showTrailingIcon - boolean indicated to shown the frontArrow at the end of the card.
  * @param isSelected - a boolean which indicates current clicked state of the card.
@@ -56,6 +63,7 @@ fun TUISelectionCard(
   secondaryDescription: String? = null,
   primaryDetails: String? = null,
   secondaryDetails: String? = null,
+  secondaryDetailStyle: SecondaryDetailsStyle = SecondaryDetailsStyle.NORMAL,
   badgeCount: Int? = null,
   showTrailingIcon: Boolean = false,
   isSelected: Boolean = false,
@@ -132,7 +140,7 @@ fun TUISelectionCard(
         Text(
           modifier = Modifier.testTag(tags.details2Tag),
           text = it,
-          color = TUITheme.colors.inputTextDim.copy(alpha = 0.7f),
+          color = if(secondaryDetailStyle == NORMAL) TUITheme.colors.inputTextDim.copy(alpha = 0.7f) else TUITheme.colors.error,
           style = TUITheme.typography.body7
         )
       }
@@ -186,6 +194,17 @@ fun TUISelectionCardPreview() {
     horizontalAlignment = Alignment.CenterHorizontally,
     verticalArrangement = Arrangement.Center
   ) {
+    TUISelectionCard(
+      label = "itemNum",
+      primaryDescription = "item Description",
+      primaryDetails = "location",
+      secondaryDetails = "- 11 Unit",
+      secondaryDetailStyle = ERROR,
+      showTrailingIcon = false
+    ) {
+    }
+    VerticalSpacer(space = 14)
+
     TUISelectionCard(
       label = null,
       primaryDescription = "Description",
@@ -213,6 +232,7 @@ fun TUISelectionCardPreview() {
       secondaryDescription = "Description2",
       primaryDetails = "Details",
       secondaryDetails = "Details2",
+      secondaryDetailStyle = ERROR,
       badgeCount = 4,
       showTrailingIcon = true
     ) {}
@@ -247,6 +267,7 @@ fun TUISelectionCardPreview() {
       label = "Label",
       primaryDescription = "Description",
       secondaryDescription = "Description2",
+      secondaryDetailStyle = ERROR,
       primaryDetails = "Details",
       secondaryDetails = "Details2",
       badgeCount = 4,

diff --git a/tarkaui/src/main/java/com/tarkalabs/uicomponents/components/TUITopBar.kt b/tarkaui/src/main/java/com/tarkalabs/uicomponents/components/TUITopBar.kt
@@ -112,7 +112,10 @@ scrollBehavior = TopAppBarScrollBehavior.ScrollOnAppBarScroll, // Optional: Spec
   ) {
     if (showSearchBar) {
       TUISearchBar(
-        modifier = Modifier,
+        modifier = Modifier
+          .fillMaxWidth()
+          .padding(horizontal = 16.dp)
+        ,
         query = query,
         placeholder = "",
         leadingIcon = TarkaIcons.Regular.ChevronLeft24,