Merge pull request #247 from tarkalabs/nilesh/TUIIconButton/bug

- Fixed spacing issue in TUI chip
tarkalabs · May 23, 2024 · d2be976 · d2be976
2 parents 7a89d97 + 3e34ef3
commit d2be976
Show file tree

Hide file tree

Showing 3 changed files with 208 additions and 100 deletions.
diff --git a/example/build.gradle.kts b/example/build.gradle.kts
@@ -49,7 +49,8 @@ android {
 
 dependencies {
   val composeUiVersion = "1.4.1"
-  implementation("com.tarkalabs:tarkaui:1.1.28")
+
+  implementation(project(":tarka-ui"))
   implementation("com.tarkalabs:tarkaui-icons:1.0.5")
   implementation("com.microsoft.design:fluent-system-icons:1.1.239@aar")
   implementation("androidx.core:core-ktx:1.10.0")

diff --git a/example/src/main/java/com/tarkalabs/ui/UIComponentListActivity.kt b/example/src/main/java/com/tarkalabs/ui/UIComponentListActivity.kt
@@ -2,9 +2,11 @@ package com.tarkalabs.ui
 
 import android.annotation.SuppressLint
 import android.os.Bundle
+import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -16,16 +18,13 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import com.tarkalabs.tarkaui.components.ChipType.Filter
+import com.tarkalabs.tarkaui.components.HorizontalSpacer
 import com.tarkalabs.tarkaui.components.TUIAppTopBar
-import com.tarkalabs.tarkaui.components.TUIAttachmentUpload
-import com.tarkalabs.tarkaui.components.TUIAttachmentUpload.AttachmentState.UpLoading
-import com.tarkalabs.tarkaui.components.TUIMediaThumbnailType.Document
-import com.tarkalabs.tarkaui.components.TUITextRow
-import com.tarkalabs.tarkaui.components.TextRowStyle
+import com.tarkalabs.tarkaui.components.TUIChip
 import com.tarkalabs.tarkaui.components.VerticalSpacer
+import com.tarkalabs.tarkaui.icons.ArrowSort20
 import com.tarkalabs.tarkaui.icons.ChevronRight20
-import com.tarkalabs.tarkaui.icons.Delete24
-import com.tarkalabs.tarkaui.icons.TarkaIcons
 import com.tarkalabs.tarkaui.icons.TarkaIcons.Regular
 import com.tarkalabs.tarkaui.theme.TUITheme
 
@@ -48,10 +47,10 @@ class UIComponentListActivity : ComponentActivity() {
         Scaffold(topBar = {
           TUIAppTopBar(
             title = "Lorem Ipsum",
-            navigationIcon = TarkaIcons.Regular.ChevronRight20,
-            menuItemIconOne = TarkaIcons.Regular.ChevronRight20,
-            menuItemIconTwo = TarkaIcons.Regular.ChevronRight20,
-            menuItemIconThree = TarkaIcons.Regular.ChevronRight20,
+            navigationIcon = Regular.ChevronRight20,
+            menuItemIconOne = Regular.ChevronRight20,
+            menuItemIconTwo = Regular.ChevronRight20,
+            menuItemIconThree = Regular.ChevronRight20,
           )
         }) { paddingValues ->
           Column(
@@ -61,16 +60,88 @@ class UIComponentListActivity : ComponentActivity() {
               .fillMaxHeight()
               .padding(horizontal = 8.dp)
           ) {
-            TUIAttachmentUpload(
-              type = Document,
-              attachmentName = "document.jpg",
-              onTrailingIconClick = {},
-              onAttachmentClick = { },
-              state = UpLoading(50),
-              showLeadingIcon = true,
-              trailingIcon = Regular.Delete24,
-              showDeleteButton = true
-            )
+            VerticalSpacer(space = 30)
+            Row {
+              HorizontalSpacer(space = 20)
+              TUIChip(
+                type = Filter(
+                  trailingIcon = Regular.ArrowSort20,
+                  showTrailingDismiss = showSearchbar,
+                  showTrailingCaret = true,
+                  selected = showSearchbar
+                ),
+                label = "Something",
+                onClick = {
+                  showSearchbar = true
+                  Log.e("TAG_CHIP", "TUIChipPreview: TAG_CLICKED")
+                },
+                onDismissClick = {
+                  showSearchbar = !showSearchbar
+                  Log.e("TAG_CHIP", "TUIChipPreview: 123")
+                },
+              )
+              HorizontalSpacer(space = 20)
+              TUIChip(
+                type = Filter(
+                  trailingIcon = Regular.ArrowSort20,
+                  showTrailingDismiss = true,
+                  showTrailingCaret = true,
+                  selected = true
+                ),
+                label = "Something",
+                onClick = {
+                  showSearchbar = true
+                  Log.e("TAG_CHIP", "TUIChipPreview: TAG_CLICKED")
+                },
+                onDismissClick = {
+                  showSearchbar = !showSearchbar
+                  Log.e("TAG_CHIP", "TUIChipPreview: 123")
+                },
+              )
+              HorizontalSpacer(space = 20)
+            }
+            VerticalSpacer(space = 30)
+            Row {
+              HorizontalSpacer(space = 20)
+              TUIChip(
+                type = Filter(
+                  trailingIcon = Regular.ArrowSort20,
+                  showTrailingDismiss = showSearchbar,
+                  showTrailingCaret = true,
+                  showLeadingCheck = true,
+                  selected = showSearchbar
+                ),
+                label = "Something",
+                onClick = {
+                  showSearchbar = true
+                  Log.e("TAG_CHIP", "TUIChipPreview: TAG_CLICKED")
+                },
+                onDismissClick = {
+                  showSearchbar = !showSearchbar
+                  Log.e("TAG_CHIP", "TUIChipPreview: 123")
+                },
+              )
+              HorizontalSpacer(space = 20)
+              TUIChip(
+                type = Filter(
+                  trailingIcon = Regular.ArrowSort20,
+                  showTrailingDismiss = true,
+                  showTrailingCaret = true,
+                  selected = true,
+                  showLeadingCheck = true,
+                ),
+                label = "Something",
+                onClick = {
+                  showSearchbar = true
+                  Log.e("TAG_CHIP", "TUIChipPreview: TAG_CLICKED")
+                },
+                onDismissClick = {
+                  showSearchbar = !showSearchbar
+                  Log.e("TAG_CHIP", "TUIChipPreview: 123")
+                },
+              )
+              HorizontalSpacer(space = 20)
+            }
           }
 
         }