Merge pull request #168 from tarkalabs/raja/multilevelselectorchanges

fix: Leading Icon and Selection checkbox added in TUIMultiLevelSelectionHe…
tarkalabs · Jan 12, 2024 · b0f9329 · b0f9329
2 parents 1cedc03 + 05b99c9
commit b0f9329
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/tarkaui/build.gradle.kts b/tarkaui/build.gradle.kts
@@ -64,7 +64,7 @@ publishing {
       run {
         groupId = "com.tarkalabs"
         artifactId = getLibraryArtifactId()
-        version = "1.0.0"
+        version = "1.0.1"
         artifact("$buildDir/outputs/aar/${getLibraryArtifactId()}-release.aar")
       }
     }

diff --git a/tarkaui/src/main/java/com/tarkalabs/uicomponents/components/TUIMultiLevelSelectorHeader.kt b/tarkaui/src/main/java/com/tarkalabs/uicomponents/components/TUIMultiLevelSelectorHeader.kt
@@ -17,8 +17,8 @@ import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.tarkalabs.tarkaicons.ApprovalsApp24
-import com.tarkalabs.tarkaicons.TarkaIcon
+import com.tarkalabs.tarkaicons.CheckmarkCircle24
+import com.tarkalabs.tarkaicons.ChevronLeft24
 import com.tarkalabs.tarkaicons.TarkaIcons
 import com.tarkalabs.uicomponents.extentions.maxHeight
 import com.tarkalabs.uicomponents.extentions.maxWidth
@@ -43,10 +43,8 @@ object TUIMultiLevelSelectorHeader {
    */
   @Composable operator fun invoke(
     modifier: Modifier = Modifier,
-    isSelected: Boolean,
     title: String,
-    leadingIcon: TarkaIcon,
-    trailingIcon: TarkaIcon? = null,
+    isSelected: Boolean,
     paddingValues: PaddingValues = PaddingValues(),
     tags: TUIMultiLevelSelectorHeaderTags = TUIMultiLevelSelectorHeaderTags(),
     onClick: () -> Unit,
@@ -63,8 +61,8 @@ object TUIMultiLevelSelectorHeader {
         verticalAlignment = Alignment.CenterVertically
       ) {
         Icon(
-          painter = painterResource(id = leadingIcon.iconRes),
-          contentDescription = leadingIcon.contentDescription,
+          painter = painterResource(id = TarkaIcons.Regular.ChevronLeft24.iconRes),
+          contentDescription = TarkaIcons.Regular.ChevronLeft24.contentDescription,
           modifier = Modifier
             .maxHeight(24)
             .maxWidth(24),
@@ -80,10 +78,10 @@ object TUIMultiLevelSelectorHeader {
           color = color
         )
         HorizontalSpacer(space = 12)
-        if (trailingIcon != null) {
+        if (isSelected) {
           Icon(
-            painter = painterResource(id = trailingIcon.iconRes),
-            contentDescription = trailingIcon.contentDescription,
+            painter = painterResource(id = TarkaIcons.Filled.CheckmarkCircle24.iconRes),
+            contentDescription = TarkaIcons.Filled.CheckmarkCircle24.contentDescription,
             modifier = Modifier
               .maxHeight(24)
               .maxWidth(24),
@@ -108,8 +106,6 @@ object TUIMultiLevelSelectorHeader {
       TUIMultiLevelSelectorHeader(
         modifier = Modifier.fillMaxWidth(),
         isSelected = true,
-        leadingIcon = TarkaIcons.Filled.ApprovalsApp24,
-        trailingIcon = TarkaIcons.Filled.ApprovalsApp24,
         title = "Hello There",
       ) {}
 
@@ -119,7 +115,6 @@ object TUIMultiLevelSelectorHeader {
         modifier = Modifier.fillMaxWidth(),
         isSelected = false,
         title = "Hello There",
-        leadingIcon = TarkaIcons.Filled.ApprovalsApp24,
       ) {}
 
     }