Merge pull request #236 from tarkalabs/younes/TUIButtonEnabled

Fixing Tests, Adding Boolean to Show and Hide the TUIAttachment Upload
tarkalabs · May 10, 2024 · 7a34948 · 7a34948
2 parents d4a6bc7 + 7d6044a
commit 7a34948
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 30 deletions.
diff --git a/example/src/main/java/com/tarkalabs/ui/UIComponentListActivity.kt b/example/src/main/java/com/tarkalabs/ui/UIComponentListActivity.kt
@@ -17,11 +17,16 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 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.VerticalSpacer
 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
 
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
@@ -56,10 +61,16 @@ class UIComponentListActivity : ComponentActivity() {
               .fillMaxHeight()
               .padding(horizontal = 8.dp)
           ) {
-            VerticalSpacer(space = 20)
-            TUITextRow(title = "Dates", style = TextRowStyle.DateStyle("26-11-2020","26-11-2200"))
-            VerticalSpacer(space = 20)
-            TUITextRow(title = "Dates", style = TextRowStyle.DateStyle("Not Available","Not Available"))
+            TUIAttachmentUpload(
+              type = Document,
+              attachmentName = "document.jpg",
+              onTrailingIconClick = {},
+              onAttachmentClick = { },
+              state = UpLoading(50),
+              showLeadingIcon = true,
+              trailingIcon = Regular.Delete24,
+              showDeleteButton = true
+            )
           }
 
         }

diff --git 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.19"
+        version = "1.1.20"
         artifact("$buildDir/outputs/aar/tarka-ui-release.aar")
       }
     }

diff --git a/tarka-ui/src/androidTest/java/com/tarkalabs/uicomponents/TUIEmailFieldTest.kt b/tarka-ui/src/androidTest/java/com/tarkalabs/uicomponents/TUIEmailFieldTest.kt
@@ -14,6 +14,7 @@ import com.tarkalabs.tarkaui.icons.TarkaIcons.Regular
 import com.tarkalabs.tarkaui.components.email.TUIEmailField
 import com.tarkalabs.tarkaui.components.email.TUIEmailFieldTags
 import com.tarkalabs.tarkaui.components.base.TUIIconButtonTags
+import kotlinx.collections.immutable.toImmutableList
 import org.junit.Rule
 import org.junit.Test
 import org.mockito.kotlin.mock
@@ -40,7 +41,7 @@ class TUIEmailFieldTest {
       }
       TUIEmailField(
         title = "To",
-        emailAddressList = emailList,
+        emailAddressList = emailList.toImmutableList(),
         trailingIcon = Regular.AddCircle24,
         onItemRemoved = {},
         trailingIconClick = {
@@ -79,7 +80,7 @@ class TUIEmailFieldTest {
       }
       TUIEmailField(
         title = "To",
-        emailAddressList = emailList,
+        emailAddressList = emailList.toImmutableList(),
         trailingIcon = Regular.AddCircle24,
         onItemRemoved = {},
         trailingIconClick = trailingIconClick,

diff --git a/tarka-ui/src/androidTest/java/com/tarkalabs/uicomponents/TUITabBarTest.kt b/tarka-ui/src/androidTest/java/com/tarkalabs/uicomponents/TUITabBarTest.kt
@@ -14,6 +14,7 @@ import com.tarkalabs.tarkaui.components.tab.TUITabBarTags
 import com.tarkalabs.tarkaui.components.tab.TabItem
 import com.tarkalabs.tarkaui.icons.Tabs24
 import com.tarkalabs.tarkaui.icons.TarkaIcons
+import kotlinx.collections.immutable.toImmutableList
 import org.junit.Rule
 import org.junit.Test
 import org.mockito.kotlin.mock
@@ -36,7 +37,7 @@ class TUITabBarTest {
 
     composeTestRule.setContent {
       TUITabBar(
-        tabItems = tabItems,
+        tabItems = tabItems.toImmutableList(),
         selectedTabIndex = 1,
         tags = testTags,
         onTabChanged = {},
@@ -61,7 +62,7 @@ class TUITabBarTest {
 
     composeTestRule.setContent {
       TUITabBar(
-        tabItems = tabItems,
+        tabItems = tabItems.toImmutableList(),
         selectedTabIndex = 1,
         tags = testTags,
         onTabChanged = {},
@@ -82,7 +83,7 @@ class TUITabBarTest {
 
     composeTestRule.setContent {
       TUITabBar(
-        tabItems = tabItems,
+        tabItems = tabItems.toImmutableList(),
         selectedTabIndex = 0,
         tags = testTags,
         onTabChanged = {},
@@ -105,7 +106,7 @@ class TUITabBarTest {
 
     composeTestRule.setContent {
       TUITabBar(
-        tabItems = tabItems,
+        tabItems = tabItems.toImmutableList(),
         selectedTabIndex = 2,
         tags = testTags,
         onTabChanged = {},
@@ -132,7 +133,7 @@ class TUITabBarTest {
 
     composeTestRule.setContent {
       TUITabBar(
-        tabItems = tabItems,
+        tabItems = tabItems.toImmutableList(),
         selectedTabIndex = 0,
         tags = testTags,
         onTabChanged = onTabChange,

diff --git a/...ui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUITabBarScreenshotTest.kt b/...ui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUITabBarScreenshotTest.kt
@@ -7,6 +7,7 @@ import com.tarkalabs.tarkaui.components.tab.TUITabBar
 import com.tarkalabs.tarkaui.components.tab.TabItem
 import com.tarkalabs.tarkaui.icons.Circle12
 import com.tarkalabs.tarkaui.icons.TarkaIcons.Regular
+import kotlinx.collections.immutable.toImmutableList
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
@@ -78,7 +79,7 @@ class TUITabBarScreenshotTest(
     compareScreenshotFor(darkTheme = darkTheme, imageName = "WithoutIcon_$testName") {
       TUITabBar(
         modifier = Modifier.padding(10.dp),
-        tabItems = tabItems,
+        tabItems = tabItems.toImmutableList(),
         selectedTabIndex = 0,
         onTabChanged = {}
       )
@@ -88,7 +89,7 @@ class TUITabBarScreenshotTest(
     compareScreenshotFor(darkTheme = darkTheme, imageName = "WithIcon_$testName") {
       TUITabBar(
         modifier = Modifier.padding(10.dp),
-        tabItems = tabItemsWithIcons,
+        tabItems = tabItemsWithIcons.toImmutableList(),
         selectedTabIndex = 1,
         onTabChanged = {}
       )
@@ -98,7 +99,7 @@ class TUITabBarScreenshotTest(
     compareScreenshotFor(darkTheme = darkTheme, imageName = "WithContent_$testName") {
       TUITabBar(
         modifier = Modifier.padding(10.dp),
-        tabItems = tabItemsWithContent,
+        tabItems = tabItemsWithContent.toImmutableList(),
         selectedTabIndex = 2,
         onTabChanged = {}
       )
@@ -108,7 +109,7 @@ class TUITabBarScreenshotTest(
     compareScreenshotFor(darkTheme = darkTheme, imageName = "WithIconAndContent_$testName") {
       TUITabBar(
         modifier = Modifier.padding(10.dp),
-        tabItems = tabItemsWithIconAndContent,
+        tabItems = tabItemsWithIconAndContent.toImmutableList(),
         selectedTabIndex = 2,
         onTabChanged = {}
       )

diff --git a/tarka-ui/src/main/java/com/tarkalabs/tarkaui/components/TUIAttachmentUpload.kt b/tarka-ui/src/main/java/com/tarkalabs/tarkaui/components/TUIAttachmentUpload.kt
@@ -78,6 +78,7 @@ object TUIAttachmentUpload {
     trailingIcon: TarkaIcon,
     state: AttachmentState? = null,
     showLeadingIcon: Boolean,
+    showDeleteButton : Boolean = true,
     tags: TUIAttachmentUploadTags = TUIAttachmentUploadTags()
   ) {
 
@@ -155,15 +156,15 @@ object TUIAttachmentUpload {
           AttachmentTitle(attachmentName = attachmentName, attachmentModifier)
         }
       }
-
-      TUIIconButton(
-        icon = trailingIcon,
-        iconButtonStyle = Ghost,
-        buttonSize = IconButtonSize.XL,
-        tags = tags.menuItemTag,
-        onIconClick = onTrailingIconClick
-      )
-
+      if (showDeleteButton) {
+        TUIIconButton(
+          icon = trailingIcon,
+          iconButtonStyle = Ghost,
+          buttonSize = IconButtonSize.XL,
+          tags = tags.menuItemTag,
+          onIconClick = onTrailingIconClick
+        )
+      }
     }
   }
 
@@ -233,15 +234,13 @@ object TUIAttachmentUpload {
       TUIAttachmentUpload(
         type = Document,
         attachmentName = "document.jpg",
-        onTrailingIconClick = {
-
-        },
+        onTrailingIconClick = {},
         onAttachmentClick = { },
         state = UpLoading(50),
         showLeadingIcon = true,
-        trailingIcon = TarkaIcons.Regular.Delete24
+        trailingIcon = TarkaIcons.Regular.Delete24,
+        showDeleteButton = false
       )
-
     }
   }
 }