Merge pull request #69 from tarkalabs/raja/codecleanup/tags

cleanup : component tags maintained in same file

example/src/main/java/com/tarkalabs/ui/UIComponentListActivity.kt

@@ -37,7 +37,7 @@ class UIComponentListActivity : ComponentActivity() {
           TUICheckBoxRow(
             checked = status.value,
             enabled = true,
-            icon = TarkaIcons.CheckMark20Filled,
+            icon = TarkaIcons.CheckMark16Filled,
             title = "TUICheckBoxRow",
             style = TitleWithDescription("Description")
           ) {

tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUIBadgeTest.kt

@@ -3,9 +3,9 @@ package com.tarkalabs.uicomponents
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
-import com.tarkalabs.uicomponents.components.BadgeSize.L
-import com.tarkalabs.uicomponents.components.TUIBadge
-import com.tarkalabs.uicomponents.components.TUIBadgeTags
+import com.tarkalabs.uicomponents.components.base.BadgeSize.L
+import com.tarkalabs.uicomponents.components.base.TUIBadge
+import com.tarkalabs.uicomponents.components.base.TUIBadgeTags
 import org.junit.Rule
 import org.junit.Test
 

tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUICheckBoxRowTest.kt

@@ -21,7 +21,8 @@ class TUICheckBoxRowTest {
 
   private val checkBoxTag: TUICheckBoxTags = TUICheckBoxTags(parentTag = "check_box_parent_tag")
   private val textRowTag: TUITextRowTags = TUITextRowTags()
-  private val tuiCheckBoxRowTag: TUICheckBoxRowTags = TUICheckBoxRowTags()
+  private val tuiCheckBoxRowTags: TUICheckBoxRowTags =
+    TUICheckBoxRowTags(checkBoxTags = checkBoxTag, textRowTags = textRowTag)
 
   @Test fun check_box_row_displayed() {
 
@@ -34,19 +35,17 @@ class TUICheckBoxRowTest {
         checked = checkedState,
         title = title,
         style = TextRowStyle.Title,
-        checkBoxTags = checkBoxTag,
-        textRowTags = textRowTag,
         onCheckedChange = onCheckedChange,
-        tuiCheckBoxRowTag = tuiCheckBoxRowTag
+        tags = tuiCheckBoxRowTags
       )
     }
 
-    composeTestRule.onNodeWithTag(tuiCheckBoxRowTag.parentTag).assertIsDisplayed()
+    composeTestRule.onNodeWithTag(tuiCheckBoxRowTags.parentTag).assertIsDisplayed()
 
     composeTestRule.onNode(hasTestTag(checkBoxTag.parentTag), useUnmergedTree = true)
       .assertIsDisplayed()
 
-    composeTestRule.onNode(hasTestTag(tuiCheckBoxRowTag.parentTag), useUnmergedTree = true)
+    composeTestRule.onNode(hasTestTag(tuiCheckBoxRowTags.parentTag), useUnmergedTree = true)
       .assertIsDisplayed()
 
     composeTestRule.onNodeWithText(title, useUnmergedTree = true).assertIsDisplayed()
@@ -62,14 +61,12 @@ class TUICheckBoxRowTest {
         checked = checkedState,
         title = title,
         style = TextRowStyle.Title,
-        checkBoxTags = checkBoxTag,
-        textRowTags = textRowTag,
         onCheckedChange = onCheckedChange,
-        tuiCheckBoxRowTag = tuiCheckBoxRowTag
+        tags = tuiCheckBoxRowTags
       )
     }
 
-    composeTestRule.onNodeWithTag(tuiCheckBoxRowTag.parentTag, useUnmergedTree = true)
+    composeTestRule.onNodeWithTag(tuiCheckBoxRowTags.parentTag, useUnmergedTree = true)
       .assertIsToggleable()
       .assertIsOn()
   }

tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUIChipTest.kt

@@ -44,7 +44,7 @@ class TUIChipTest {
 
     composable.onNodeWithTag("Assist").assertIsDisplayed()
     composable.onNodeWithText("Assist chip").assertIsDisplayed()
-    composable.onNodeWithTag(Tags.TAG_AVATAR, useUnmergedTree = true).assertIsDisplayed()
+    composable.onNodeWithTag("TUIAvatar", useUnmergedTree = true).assertIsDisplayed()
     composable.onNodeWithText("Assist chip").performClick()
     verify(onClick).invoke()
   }
@@ -91,6 +91,6 @@ class TUIChipTest {
         )
     }
 
-    composable.onNodeWithTag(Tags.TAG_AVATAR, useUnmergedTree = true).assertIsDisplayed()
+    composable.onNodeWithTag("TUIAvatar", useUnmergedTree = true).assertIsDisplayed()
   }
 }

tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUIFabTest.kt

@@ -2,8 +2,8 @@ import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
-import com.tarkalabs.uicomponents.components.TUIFloatingActionButton
-import com.tarkalabs.uicomponents.components.TUIFloatingActionButtonTags
+import com.tarkalabs.uicomponents.components.base.TUIFloatingActionButton
+import com.tarkalabs.uicomponents.components.base.TUIFloatingActionButtonTags
 import com.tarkalabs.uicomponents.models.TarkaIcons
 import org.junit.Rule
 import org.junit.Test

tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUIIconButtonTest.kt

@@ -2,8 +2,8 @@ import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
-import com.tarkalabs.uicomponents.components.TUIIconButton
-import com.tarkalabs.uicomponents.components.TUIIconButtonTags
+import com.tarkalabs.uicomponents.components.base.TUIIconButton
+import com.tarkalabs.uicomponents.components.base.TUIIconButtonTags
 import com.tarkalabs.uicomponents.models.TarkaIcons
 import org.junit.Rule
 import org.junit.Test

tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUISearchBarTest.kt

@@ -5,7 +5,7 @@ import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
-import com.tarkalabs.uicomponents.components.TUIIconButtonTags
+import com.tarkalabs.uicomponents.components.base.TUIIconButtonTags
 import com.tarkalabs.uicomponents.components.TUISearchBar
 import com.tarkalabs.uicomponents.components.TUISearchBarTags
 import com.tarkalabs.uicomponents.models.TarkaIcons

tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUITopBarTest.kt

@@ -6,7 +6,7 @@ import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
-import com.tarkalabs.uicomponents.components.TUIIconButtonTags
+import com.tarkalabs.uicomponents.components.base.TUIIconButtonTags
 import com.tarkalabs.uicomponents.components.TUITopBar
 import com.tarkalabs.uicomponents.components.TUITopBarTags
 import com.tarkalabs.uicomponents.models.TarkaIcons

tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIAvatarScreenshotTest.kt

@@ -7,9 +7,11 @@ import org.junit.runners.Parameterized;
 import android.graphics.BitmapFactory
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.ui.graphics.asImageBitmap
-import com.tarkalabs.uicomponents.components.AvatarSize
-import com.tarkalabs.uicomponents.components.AvatarType
-import com.tarkalabs.uicomponents.components.TUIAvatar
+import com.tarkalabs.uicomponents.components.base.AvatarSize
+import com.tarkalabs.uicomponents.components.base.AvatarType.Icon
+import com.tarkalabs.uicomponents.components.base.AvatarType.Image
+import com.tarkalabs.uicomponents.components.base.AvatarType.Text
+import com.tarkalabs.uicomponents.components.base.TUIAvatar
 import com.tarkalabs.uicomponents.models.TarkaIcons
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -47,19 +49,19 @@ class TUIAvatarScreenshotTest(
   @Test fun test_avatar_with_image(){
     val bitmap = BitmapFactory.decodeStream(assetManager.open("avatarTest.webp"))
     compareScreenshotFor(darkTheme = darkTheme, imageName = "_testAvatarWithImage_$testName") {
-      TUIAvatar(avatarType = AvatarType.Image(bitmap.asImageBitmap()), avatarSize = avatarSize, showBadge = showBadge)
+      TUIAvatar(avatarType = Image(bitmap.asImageBitmap()), avatarSize = avatarSize, showBadge = showBadge)
     }
   }
 
   @Test fun test_avatar_with_text(){
     compareScreenshotFor(darkTheme = darkTheme, imageName = "_testAvatarWithText_$testName") {
-      TUIAvatar(avatarType = AvatarType.Text("AB"), avatarSize = avatarSize, showBadge = showBadge)
+      TUIAvatar(avatarType = Text("AB"), avatarSize = avatarSize, showBadge = showBadge)
     }
   }
 
   @Test fun test_avatar_with_icon(){
     compareScreenshotFor(darkTheme = darkTheme, imageName = "_testAvatarWithIcon_$testName") {
-      TUIAvatar(avatarType = AvatarType.Icon(TarkaIcons.Dismiss16Filled), avatarSize = avatarSize, showBadge = showBadge)
+      TUIAvatar(avatarType = Icon(TarkaIcons.Dismiss16Filled), avatarSize = avatarSize, showBadge = showBadge)
     }
   }
 }

tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIBadgeScreenShotTest.kt

@@ -1,8 +1,8 @@
 package com.tarkalabs.uicomponents.screenshots
 
-import com.tarkalabs.uicomponents.components.BadgeSize.M
-import com.tarkalabs.uicomponents.components.BadgeSize.S
-import com.tarkalabs.uicomponents.components.TUIBadge
+import com.tarkalabs.uicomponents.components.base.BadgeSize.M
+import com.tarkalabs.uicomponents.components.base.BadgeSize.S
+import com.tarkalabs.uicomponents.components.base.TUIBadge
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized

tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIFloatingActionButtonScreenShotTest.kt

@@ -1,9 +1,9 @@
 package com.tarkalabs.uicomponents.screenshots
 
-import com.tarkalabs.uicomponents.components.FloatingActionButtonSize.L
-import com.tarkalabs.uicomponents.components.FloatingActionButtonSize.R
-import com.tarkalabs.uicomponents.components.FloatingActionButtonSize.S
-import com.tarkalabs.uicomponents.components.TUIFloatingActionButton
+import com.tarkalabs.uicomponents.components.base.FloatingActionButtonSize.L
+import com.tarkalabs.uicomponents.components.base.FloatingActionButtonSize.R
+import com.tarkalabs.uicomponents.components.base.FloatingActionButtonSize.S
+import com.tarkalabs.uicomponents.components.base.TUIFloatingActionButton
 import com.tarkalabs.uicomponents.models.TarkaIcons
 import org.junit.Test
 import org.junit.runner.RunWith

tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIIconButtonScreenShotTest.kt

@@ -3,9 +3,12 @@
 package com.tarkalabs.uicomponents.screenshots
 
 import androidx.compose.material3.ExperimentalMaterial3Api
-import com.tarkalabs.uicomponents.components.TUIIconButton
-import com.tarkalabs.uicomponents.components.IconButtonSize
-import com.tarkalabs.uicomponents.components.IconButtonStyle
+import com.tarkalabs.uicomponents.components.base.TUIIconButton
+import com.tarkalabs.uicomponents.components.base.IconButtonSize.XS
+import com.tarkalabs.uicomponents.components.base.IconButtonStyle.GHOST
+import com.tarkalabs.uicomponents.components.base.IconButtonStyle.OUTLINE
+import com.tarkalabs.uicomponents.components.base.IconButtonStyle.PRIMARY
+import com.tarkalabs.uicomponents.components.base.IconButtonStyle.SECONDARY
 import com.tarkalabs.uicomponents.models.TarkaIcons
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -32,32 +35,32 @@ class TUIIconButtonScreenShotTest(
   @Test fun primaryIconButton() = compareScreenshotFor(darkTheme, "_primaryIconButton_$testName"){
       TUIIconButton(
         icon = TarkaIcons.ChevronRight20Regular,
-        buttonSize = IconButtonSize.XS,
-        iconButtonStyle = IconButtonStyle.PRIMARY,
+        buttonSize = XS,
+        iconButtonStyle = PRIMARY,
       )
   }
 
   @Test fun secondaryIconButton() = compareScreenshotFor(darkTheme, "_secondaryIconButton_$testName"){
       TUIIconButton(
         icon = TarkaIcons.ChevronRight20Regular,
-        buttonSize = IconButtonSize.XS,
-        iconButtonStyle = IconButtonStyle.SECONDARY,
+        buttonSize = XS,
+        iconButtonStyle = SECONDARY,
       )
   }
 
   @Test fun ghostIconButton()  = compareScreenshotFor(darkTheme, "_ghostIconButton_$testName"){
       TUIIconButton(
         icon = TarkaIcons.ChevronRight20Regular,
-        buttonSize = IconButtonSize.XS,
-        iconButtonStyle = IconButtonStyle.GHOST,
+        buttonSize = XS,
+        iconButtonStyle = GHOST,
       )
   }
 
   @Test fun outlineIconButton() = compareScreenshotFor(darkTheme, "_outlineIconButton_$testName"){
       TUIIconButton(
         icon = TarkaIcons.ChevronRight20Regular,
-        buttonSize = IconButtonSize.XS,
-        iconButtonStyle = IconButtonStyle.OUTLINE,
+        buttonSize = XS,
+        iconButtonStyle = OUTLINE,
       )
   }
 }

tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIInputFieldScreenshotTest.kt

@@ -1,6 +1,6 @@
 package com.tarkalabs.uicomponents.screenshots
 
-import com.tarkalabs.uicomponents.components.TUIInputFieldStatus
+import com.tarkalabs.uicomponents.components.base.TUIInputFieldStatus
 import com.tarkalabs.uicomponents.models.TarkaIcon
 import com.tarkalabs.uicomponents.models.TarkaIcons
 import org.junit.runner.RunWith

tarkaui/src/main/java/com/tarkalabs/uicomponents/components/TUICheckBox.kt

@@ -18,7 +18,6 @@ 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.uicomponents.Tags
 import com.tarkalabs.uicomponents.models.TarkaIcon
 import com.tarkalabs.uicomponents.models.TarkaIcons
 import com.tarkalabs.uicomponents.theme.TUITheme
@@ -114,5 +113,5 @@ import com.tarkalabs.uicomponents.theme.TUITheme
 }
 
 data class TUICheckBoxTags(
-  val parentTag: String = Tags.TAG_CHECK_BOX,
+  val parentTag: String = "TUICheckBox",
 )

tarkaui/src/main/java/com/tarkalabs/uicomponents/components/TUICheckBoxRow.kt

@@ -14,7 +14,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.tarkalabs.uicomponents.Tags
 import com.tarkalabs.uicomponents.models.TarkaIcon
 import com.tarkalabs.uicomponents.models.TarkaIcons
 
@@ -26,8 +25,6 @@ import com.tarkalabs.uicomponents.models.TarkaIcons
  * @param enabled Whether the checkbox is enabled and can be interacted with.
  * @param title The text to display in the text row.
  * @param style The style to apply to the text row.
- * @param checkBoxTags Additional tags to apply to the checkbox.
- * @param textRowTags Additional tags to apply to the text row.
  * @param onCheckedChange Callback triggered when the checkbox's checked state changes.
  *
  * How to use TUICheckBoxRow() composable function
@@ -46,9 +43,7 @@ onCheckedChange = { isChecked = !isChecked }
   enabled: Boolean = true,
   title: String,
   style: TextRowStyle,
-  checkBoxTags: TUICheckBoxTags = TUICheckBoxTags(),
-  textRowTags: TUITextRowTags = TUITextRowTags(),
-  tuiCheckBoxRowTag: TUICheckBoxRowTags = TUICheckBoxRowTags(),
+  tags: TUICheckBoxRowTags = TUICheckBoxRowTags(),
   onCheckedChange: () -> Unit,
 ) {
   Row(
@@ -61,27 +56,29 @@ onCheckedChange = { isChecked = !isChecked }
             onCheckedChange.invoke()
           }
         })
-      .testTag(tuiCheckBoxRowTag.parentTag)
+      .testTag(tags.parentTag)
   ) {
     TUICheckBox(
       checked = checked,
       onCheckedChange = null,
       enabled = enabled,
       icon = icon,
-      tags = checkBoxTags
+      tags = tags.checkBoxTags
     )
     HorizontalSpacer(space = 16)
     TUITextRow(
       title = title,
       style = style,
-      tags = textRowTags,
+      tags = tags.textRowTags,
       onTextRowClick = null,
     )
   }
 }
 
 data class TUICheckBoxRowTags(
-  val parentTag: String = Tags.TAG_CHECK_BOX_ROW,
+  val parentTag: String = "TUICheckBoxRow",
+  val checkBoxTags: TUICheckBoxTags = TUICheckBoxTags(parentTag = "TUICheckBoxRow_CheckBox"),
+  val textRowTags: TUITextRowTags = TUITextRowTags(parentTag = "TUICheckBoxRow_TextRow"),
 )
 
 @Preview @Composable fun PreviewTUICheckBoxRow() {