README.md

+# ComposeSample1
+This project is a simplified mockup of two pEp's screens.
+
+## Motivation
+I created this project to learn and experiment with Jetpack Compose. 
+And as a learning project, if you follow the commits you can see some experiments. 
+There are also some logs as example that can help to understand how Jetpack Compose works.
+
+## Some Conclusions
+Jetpack Compose makes UI development and testing faster and easier. 
+
+One of the big points is decoupling UI from Activities and Fragments.
+Another one of course, is using just one language for everything (Kotlin). 
+What would take several xml files when using traditional UI, can be done in a few lines of Kotlin code.
+
+It is really useful to be able to test each UI component by itself, with mock data. 
+With this isolation, we can easily identify unwanted behaviors in that component, 
+without having our component's function depending on anything else in the app.
+
+Of course the concepts change a little and we need to learn new patterns with Compose, but I think it's totally worth it :)
+
+## Components
+This project uses the following components and concepts:
+
+* [MVVM architecture][MVVM]
+* [ViewModel][viewmodel] (presentation layer)
+* [Kotlin Coroutines][coroutines] (background operations)
+* [Kotlin StateFlow][stateflow] (communicate presentation and UI layer)
+* [Room Database][room] (storage)
+* [Jetpack Compose][compose] (UI layer)
+* [Dagger Hilt][hilt] (dependency injection)
+
+[MVVM]: https://developer.android.com/jetpack/guide
+[viewmodel]: https://developer.android.com/topic/libraries/architecture/viewmodel
+[coroutines]: https://kotlinlang.org/docs/reference/coroutines-overview.html
+[stateflow]: https://developer.android.com/kotlin/flow/stateflow-and-sharedflow
+[room]: https://developer.android.com/training/data-storage/room
+[compose]: https://developer.android.com/jetpack/compose
+[hilt]: https://developer.android.com/training/dependency-injection/hilt-android

app/src/androidTest/java/com/ignacio/composesample1/ui/MainScreenTest.kt

@@ -106,28 +106,29 @@ class MainScreenTest {
         deleteMessage()
         assertWeAreInMessageListScreen()
         composeTestRule
-            .onNodeWithTag("messageViewHolderTitleAndAbstract1")
+            .onNodeWithTag("${TestTags.MessageList.messageViewHolderTitleAndAbstract}1")
             .assertDoesNotExist()
     }
 
     private fun deleteMessage() {
-        helper.assertNodeWithTag("messageViewDeleteMenuItem").performClick()
+        helper.assertNodeWithTag(TestTags.MessageView.messageViewDeleteMenuItem).performClick()
     }
 
     private fun closeMessage() {
-        helper.assertNodeWithTag("messageViewNavigationIcon").performClick()
+        helper.assertNodeWithTag(TestTags.MessageView.messageViewNavigationIcon).performClick()
         assertWeAreInMessageListScreen()
     }
 
     private fun assertMessageFlaggedInMessageView(flagged: Boolean): SemanticsNodeInteraction {
-        return helper.assertInternalNodeWithTag("messageViewFlagMenuItem").assert(
-            hasContentDescription(
-                helper.context.getString(
-                    if (flagged) R.string.message_remove_star_action
-                    else R.string.message_add_star_action
+        return helper.assertInternalNodeWithTag(TestTags.MessageView.messageViewFlagMenuItem)
+            .assert(
+                hasContentDescription(
+                    helper.context.getString(
+                        if (flagged) R.string.message_remove_star_action
+                        else R.string.message_add_star_action
+                    )
                 )
             )
-        )
     }
 
     @Suppress("SameParameterValue")
@@ -135,14 +136,15 @@ class MainScreenTest {
         id: Int,
         flagged: Boolean
     ): SemanticsNodeInteraction {
-        return helper.assertInternalNodeWithTag("messageViewHolderFlag$id").assert(
-            hasContentDescription(
-                helper.context.getString(
-                    if (flagged) R.string.message_remove_star_action
-                    else R.string.message_add_star_action
+        return helper.assertInternalNodeWithTag("${TestTags.MessageList.messageViewHolderFlag}$id")
+            .assert(
+                hasContentDescription(
+                    helper.context.getString(
+                        if (flagged) R.string.message_remove_star_action
+                        else R.string.message_add_star_action
+                    )
                 )
             )
-        )
     }
 
     private fun assertWeAreInMessageListScreen() {
@@ -151,18 +153,18 @@ class MainScreenTest {
     }
 
     private fun assertWeAreInMessageViewScreen() {
-        helper.assertNodeWithTag("messageViewTopBarBadge")
+        helper.assertNodeWithTag(TestTags.MessageView.messageViewTopBarBadge)
         helper.assertNodeWithText(R.string.secure_and_trusted)
     }
 
     private fun openMessage(id: Int) {
-        helper.assertInternalNodeWithTag("messageViewHolderTitleAndAbstract$id")
+        helper.assertInternalNodeWithTag("${TestTags.MessageList.messageViewHolderTitleAndAbstract}$id")
             .performClick()
         assertWeAreInMessageViewScreen()
     }
 
     private fun openOptionsMenu() {
-        helper.assertNodeWithTag("overflowMenu").performClick()
+        helper.assertNodeWithTag(TestTags.overflowMenu).performClick()
     }
 
     @Suppress("SameParameterValue")
@@ -170,7 +172,7 @@ class MainScreenTest {
         id: Int,
         unread: Boolean
     ): SemanticsNodeInteraction {
-        return helper.assertNodeWithTag("messageViewHolderTitleAndAbstract$id")
+        return helper.assertNodeWithTag("${TestTags.MessageList.messageViewHolderTitleAndAbstract}$id")
             .assert(
                 hasContentDescription(
                     helper.context.getString(

app/src/androidTest/java/com/ignacio/composesample1/ui/messagelist/DrawerTest.kt

@@ -5,8 +5,10 @@ import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.performClick
 import com.ignacio.composesample1.R
 import com.ignacio.composesample1.ui.DrawerUser
+import com.ignacio.composesample1.ui.TestTags
 import com.ignacio.composesample1.ui.UITestHelper
 import com.nhaarman.mockitokotlin2.verify
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -18,6 +20,7 @@ class DrawerTest {
 
     private val drawerUser = DrawerUser()
 
+    @ExperimentalCoroutinesApi
     @Before
     fun setUp() {
         helper.stubViewModel(null, false)
@@ -39,14 +42,14 @@ class DrawerTest {
     @Test
     fun drawer_test() {
         openDrawer()
-        helper.assertInternalNodeWithTag("currentAccountAvatar")
+        helper.assertInternalNodeWithTag(TestTags.MessageList.currentAccountAvatar)
         helper.assertInternalNodeWithText(helper.username)
         helper.assertInternalNodeWithText(helper.email)
 
-        helper.assertInternalNodeWithTag("otherAccountClicker1").performClick()
+        helper.assertInternalNodeWithTag(TestTags.MessageList.otherAccountClicker1).performClick()
         verify(helper.drawerActionClickListener).onDrawerAccountCircleClicked(helper.allAccounts[1])
 
-        helper.assertInternalNodeWithTag("otherAccountClicker2").performClick()
+        helper.assertInternalNodeWithTag(TestTags.MessageList.otherAccountClicker2).performClick()
         verify(helper.drawerActionClickListener).onDrawerAccountCircleClicked(helper.allAccounts[2])
 
         assertSpecialFolderList()
@@ -64,7 +67,8 @@ class DrawerTest {
     }
 
     private fun assertDrawerClosed() {
-        helper.findInternalNodeWithTag("currentAccountAvatar").assertIsNotDisplayed()
+        helper.findInternalNodeWithTag(TestTags.MessageList.currentAccountAvatar)
+            .assertIsNotDisplayed()
         helper.findInternalNodeWithText(helper.username).assertIsNotDisplayed()
         helper.findInternalNodeWithText(helper.email).assertIsNotDisplayed()
     }
@@ -78,12 +82,12 @@ class DrawerTest {
     }
 
     private fun openDrawer() {
-        helper.assertNodeWithTag("drawerIcon").performClick()
+        helper.assertNodeWithTag(TestTags.MessageList.drawerIcon).performClick()
     }
 
     private fun assertSpecialFolderList() {
         helper.assertScrollableList(
-            "drawerSpecialFolderList",
+            TestTags.MessageList.drawerSpecialFolderList,
             helper.specialFolders,
             true
         ) { index ->
@@ -95,7 +99,7 @@ class DrawerTest {
 
     private fun assertNormalFolderList() {
         helper.assertScrollableList(
-            "drawerFolderList",
+            TestTags.MessageList.drawerFolderList,
             helper.folders,
             true
         ) { index ->
@@ -109,7 +113,7 @@ class DrawerTest {
         val otherAccounts = helper.allAccounts
             .takeLast(helper.allAccounts.size - 1)
         helper.assertScrollableList(
-            "drawerAccountList",
+            TestTags.MessageList.drawerAccountList,
             otherAccounts,
             true
         ) { index ->

app/src/androidTest/java/com/ignacio/composesample1/ui/messagelist/MessageListTest.kt

@@ -6,6 +6,7 @@ import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithSubstring
 import androidx.compose.ui.test.performClick
 import com.ignacio.composesample1.R
+import com.ignacio.composesample1.ui.TestTags
 import com.ignacio.composesample1.ui.UITestHelper
 import com.nhaarman.mockitokotlin2.reset
 import com.nhaarman.mockitokotlin2.verify
@@ -30,15 +31,15 @@ class MessageListTest {
         helper.assertNodeWithText(R.string.app_name)
         helper.assertNodeWithText(R.string.subtitle_dummy)
 
-        helper.assertNodeWithTag("searchAction").performClick()
+        helper.assertNodeWithTag(TestTags.MessageList.searchAction).performClick()
         verify(helper.optionsMenuItemClickListener).onOptionsMenuItemClicked(R.string.search_action)
 
-        helper.assertNodeWithTag("overflowMenu").performClick()
+        helper.assertNodeWithTag(TestTags.overflowMenu).performClick()
         helper.assertNodeWithText(R.string.option_1_action).performClick()
         verify(helper.optionsMenuItemClickListener).onOptionsMenuItemClicked(R.string.option_1_action)
         helper.findNodeWithText(R.string.option_1_action).assertDoesNotExist()
 
-        helper.assertNodeWithTag("overflowMenu").performClick()
+        helper.assertNodeWithTag(TestTags.overflowMenu).performClick()
         helper.assertNodeWithText(R.string.option_2_action).performClick()
         verify(helper.optionsMenuItemClickListener).onOptionsMenuItemClicked(R.string.option_2_action)
         helper.findNodeWithText(R.string.option_2_action).assertDoesNotExist()
@@ -53,7 +54,7 @@ class MessageListTest {
             )
         }
         helper.assertScrollableList(
-            "messageList",
+            TestTags.MessageList.messageList,
             helper.allMessages
         ) { position ->
             val message = helper.allMessages[position]
@@ -68,17 +69,19 @@ class MessageListTest {
                 helper.assertInternalNodeWithText("Subject${message.id}")
                 helper.assertInternalNodeWithText("Body${message.id}")
             }
-            helper.assertNodeWithTag("messageViewHolderContactBadge${message.id}").performClick()
+            helper.assertNodeWithTag("${TestTags.MessageList.messageViewHolderContactBadge}${message.id}")
+                .performClick()
             verify(helper.messageViewHolderActionListener).onContactClicked(message.from.first())
 
-            helper.assertNodeWithTag("messageViewHolderTitleAndAbstract${message.id}")
+            helper.assertNodeWithTag("${TestTags.MessageList.messageViewHolderTitleAndAbstract}${message.id}")
                 .performClick()
             verify(helper.messageViewHolderActionListener).onMessageClicked(message)
 
             val sdf = SimpleDateFormat("MMM d", Locale.getDefault())
-            helper.assertNodeWithTag("messageViewHolderDate${message.id}")
+            helper.assertNodeWithTag("${TestTags.MessageList.messageViewHolderDate}${message.id}")
                 .assertTextEquals(sdf.format(Date()))
-            helper.assertNodeWithTag("messageViewHolderFlag${message.id}").performClick()
+            helper.assertNodeWithTag("${TestTags.MessageList.messageViewHolderFlag}${message.id}")
+                .performClick()
             verify(helper.messageViewHolderActionListener).onFlagClicked(message)
 
             reset(helper.messageViewHolderActionListener)

app/src/androidTest/java/com/ignacio/composesample1/ui/messageview/MessageViewTest.kt

@@ -3,6 +3,7 @@ package com.ignacio.composesample1.ui.messageview
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.performClick
 import com.ignacio.composesample1.R
+import com.ignacio.composesample1.ui.TestTags
 import com.ignacio.composesample1.ui.UITestHelper
 import com.nhaarman.mockitokotlin2.verify
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -24,23 +25,23 @@ class MessageViewTest {
                 messageInfo = MessageViewMenuMessageInfo(helper.allMessages.first())
             )
         }
-        helper.assertNodeWithTag("messageViewNavigationIcon").performClick()
+        helper.assertNodeWithTag(TestTags.MessageView.messageViewNavigationIcon).performClick()
         verify(helper.messageViewMenuActionListener).onNavigationClicked()
-        helper.assertNodeWithTag("messageViewTopBarBadge")
+        helper.assertNodeWithTag(TestTags.MessageView.messageViewTopBarBadge)
         helper.assertNodeWithText(R.string.secure_and_trusted)
 
-        helper.assertNodeWithTag("messageViewFlagMenuItem").performClick()
+        helper.assertNodeWithTag(TestTags.MessageView.messageViewFlagMenuItem).performClick()
         verify(helper.messageViewMenuActionListener).onFlagIconToggled()
 
-        helper.assertNodeWithTag("messageViewDeleteMenuItem").performClick()
+        helper.assertNodeWithTag(TestTags.MessageView.messageViewDeleteMenuItem).performClick()
         verify(helper.messageViewMenuActionListener).onDeleteIconClicked()
 
-        helper.assertNodeWithTag("overflowMenu").performClick()
+        helper.assertNodeWithTag(TestTags.overflowMenu).performClick()
         helper.assertNodeWithText(R.string.mark_as_read_action).performClick()
         helper.findNodeWithText(R.string.mark_as_read_action).assertDoesNotExist()
         verify(helper.messageViewMenuActionListener).onUnreadToggleClicked()
 
-        helper.assertNodeWithTag("overflowMenu").performClick()
+        helper.assertNodeWithTag(TestTags.overflowMenu).performClick()
         helper.assertNodeWithText(R.string.option_3_action).performClick()
         helper.findNodeWithText(R.string.option_3_action).assertDoesNotExist()
         verify(helper.optionsMenuItemClickListener).onOptionsMenuItemClicked(R.string.option_3_action)
@@ -57,24 +58,24 @@ class MessageViewTest {
                 homeviewModel = helper.viewModel
             )
         }
-        helper.assertNodeWithTag("messageViewNavigationIcon").performClick()
+        helper.assertNodeWithTag(TestTags.MessageView.messageViewNavigationIcon).performClick()
         verify(helper.viewModel).closeMessage()
-        helper.assertNodeWithTag("messageViewTopBarBadge")
+        helper.assertNodeWithTag(TestTags.MessageView.messageViewTopBarBadge)
         helper.assertNodeWithText(R.string.secure_and_trusted)
 
-        helper.assertNodeWithTag("messageViewFlagMenuItem").performClick()
+        helper.assertNodeWithTag(TestTags.MessageView.messageViewFlagMenuItem).performClick()
         verify(helper.viewModel).toggleMessageFlag(message)
 
-        helper.assertNodeWithTag("messageViewDeleteMenuItem").performClick()
+        helper.assertNodeWithTag(TestTags.MessageView.messageViewDeleteMenuItem).performClick()
         verify(helper.viewModel).deleteMessage(message)
 
-        helper.assertNodeWithTag("overflowMenu").performClick()
+        helper.assertNodeWithTag(TestTags.overflowMenu).performClick()
         helper.assertNodeWithText(R.string.mark_as_read_action).performClick()
         helper.findNodeWithText(R.string.mark_as_read_action).assertDoesNotExist()
         verify(helper.viewModel).toggleMessageUnread(message)
 
 
-        helper.assertNodeWithTag("messageViewAvatar")
+        helper.assertNodeWithTag(TestTags.MessageView.messageViewAvatar)
         helper.assertNodeWithText(message.subject)
         helper.assertNodeWithText(message.body)
         helper.assertNodeWithText(
@@ -87,6 +88,6 @@ class MessageViewTest {
             helper.context.getString(R.string.message_to_field,
                 message.recipients.joinToString(", ") { it.name })
         )
-        helper.assertNodeWithTag("messageViewDate")
+        helper.assertNodeWithTag(TestTags.MessageView.messageViewDate)
     }
 }
\ No newline at end of file

app/src/main/java/com/ignacio/composesample1/ui/Compose.kt

@@ -26,4 +26,35 @@ fun LogCallbacksWithText(text: String) {
 fun getViewModel(): HomeViewModel = viewModel<HomeViewModelImpl>()
 
 val AmbientProvidableMessage: ProvidableAmbient<MyMessage> =
-    ambientOf { MyMessage.emptyMessage() }
+    ambientOf { MyMessage.emptyMessage() }
\ No newline at end of file
+
+
+object TestTags {
+    const val overflowMenu = "overflowMenu"
+
+    object MessageList {
+        const val drawerAccountList = "drawerAccountList"
+        const val drawerSpecialFolderList = "drawerSpecialFolderList"
+        const val drawerFolderList = "drawerFolderList"
+        const val messageList = "messageList"
+        const val searchAction = "searchAction"
+        const val messageViewHolder = "messageViewHolder"
+        const val messageViewHolderContactBadge = "messageViewHolderContactBadge"
+        const val messageViewHolderDate = "messageViewHolderDate"
+        const val messageViewHolderFlag = "messageViewHolderFlag"
+        const val messageViewHolderTitleAndAbstract = "messageViewHolderTitleAndAbstract"
+        const val drawerIcon = "drawerIcon"
+        const val currentAccountAvatar = "currentAccountAvatar"
+        const val otherAccountClicker1 = "otherAccountClicker1"
+        const val otherAccountClicker2 = "otherAccountClicker2"
+    }
+
+    object MessageView {
+        const val messageViewAvatar = "messageViewAvatar"
+        const val messageViewDate = "messageViewDate"
+        const val messageViewFlagMenuItem = "messageViewFlagMenuItem"
+        const val messageViewDeleteMenuItem = "messageViewDeleteMenuItem"
+        const val messageViewNavigationIcon = "messageViewNavigationIcon"
+        const val messageViewTopBarBadge = "messageViewTopBarBadge"
+    }
+}
\ No newline at end of file

app/src/main/java/com/ignacio/composesample1/ui/MainScreen.kt

@@ -91,7 +91,7 @@ fun MyDropDownMenu(
         expanded = showMenu.value,
         onDismissRequest = { showMenu.value = false },
         dropdownOffset = Position((screenWidth).dp, 0.dp),
-        toggleModifier = Modifier.testTag("overflowMenu")
+        toggleModifier = Modifier.testTag(TestTags.overflowMenu)
     ) {
         myMenuScope.content()
     }

app/src/main/java/com/ignacio/composesample1/ui/messagelist/MessageListUI.kt

@@ -145,7 +145,7 @@ fun MyTopBar(
         navigationIcon = {
             IconButton(
                 onClick = { onNavigationClicked() },
-                modifier = Modifier.testTag("drawerIcon")
+                modifier = Modifier.testTag(TestTags.MessageList.drawerIcon)
             ) {
                 Image(vectorResource(id = R.drawable.ic_baseline_menu_24))
             }
@@ -168,7 +168,7 @@ fun MessageListOptionsMenu(
         onClick = {
             optionsMenuItemClickListener.onOptionsMenuItemClicked(R.string.search_action)
         },
-        modifier = Modifier.testTag("searchAction")
+        modifier = Modifier.testTag(TestTags.MessageList.searchAction)
     ) {
         Image(vectorResource(id = R.drawable.ic_baseline_search_24))
     }
@@ -229,7 +229,7 @@ fun DrawerBodyFolderMode(
         DrawerFolderList(
             folders = specialFolders,
             drawerActionClickListener = drawerActionClickListener,
-            modifier = Modifier.testTag("drawerSpecialFolderList")
+            modifier = Modifier.testTag(TestTags.MessageList.drawerSpecialFolderList)
         )
         Text(
             stringResource(id = R.string.folders_title),
@@ -238,7 +238,7 @@ fun DrawerBodyFolderMode(
         DrawerFolderList(
             folders = folders,
             drawerActionClickListener = drawerActionClickListener,
-            modifier = Modifier.testTag("drawerFolderList")
+            modifier = Modifier.testTag(TestTags.MessageList.drawerFolderList)
         )
     }
 }
@@ -263,7 +263,7 @@ private fun NavigationHeader(
                     .preferredSize(50.dp)
                     .clip(shape = CircleShape)
                     .background(colorResource(id = R.color.pep_green))
-                    .testTag("currentAccountAvatar"),
+                    .testTag(TestTags.MessageList.currentAccountAvatar),
                 contentScale = ContentScale.Crop
             )
             Spacer(modifier = Modifier.weight(1f))
@@ -272,7 +272,7 @@ private fun NavigationHeader(
                     image = R.drawable.ic_launcher_foreground,
                     account = accounts[1],
                     drawerActionClickListener = drawerActionClickListener,
-                    modifier = Modifier.testTag("otherAccountClicker1")
+                    modifier = Modifier.testTag(TestTags.MessageList.otherAccountClicker1)
                 )
             }
             if (accounts.size > 2) {
@@ -281,7 +281,7 @@ private fun NavigationHeader(
                     image = R.drawable.ic_launcher_foreground,
                     account = accounts[2],
                     drawerActionClickListener = drawerActionClickListener,
-                    modifier = Modifier.testTag("otherAccountClicker2")
+                    modifier = Modifier.testTag(TestTags.MessageList.otherAccountClicker2)
                 )
             }
         }
@@ -344,7 +344,7 @@ fun MessageList(
     messageViewHolderActionListener: MessageViewHolderActionListener,
     modifier: Modifier = Modifier
 ) {
-    LazyColumn(modifier = modifier.testTag("messageList")) {
+    LazyColumn(modifier = modifier.testTag(TestTags.MessageList.messageList)) {
         items(items = messages,
             itemContent = { message ->
                 MessageViewHolder(
@@ -371,7 +371,7 @@ fun MessageViewHolder(
     Row(
         modifier = modifier
             .clip(RoundedCornerShape(4.dp))
-            .testTag("messageViewHolder${message.id}")
+            .testTag("${TestTags.MessageList.messageViewHolder}${message.id}")
     ) {
         MessageViewHolderContactBadge(message, messageViewHolderActionListener)
         Spacer(
@@ -405,7 +405,7 @@ fun MessageViewHolderContactBadge(
             .clickable(onClick = {
                 messageViewHolderActionListener.onContactClicked(message.from.first())
             })
-            .testTag("messageViewHolderContactBadge${message.id}"),
+            .testTag("${TestTags.MessageList.messageViewHolderContactBadge}${message.id}"),
         shape = CircleShape,
         color = MaterialTheme.colors.onSurface.copy(alpha = 0.2f)
     ) {
@@ -430,7 +430,7 @@ fun RowScope.MessageViewHolderTitleAndAbstract(
                     if (message.read) context.getString(R.string.read_message_conent_description)
                     else context.getString(R.string.unread_message_conent_description)
             }
-            .testTag("messageViewHolderTitleAndAbstract${message.id}")
+            .testTag("${TestTags.MessageList.messageViewHolderTitleAndAbstract}${message.id}")
     ) {
         Text(
             text = message.subject,
@@ -466,7 +466,7 @@ fun MessageViewHolderDateAndFlag(
         val sdf = SimpleDateFormat("MMM d", locale)
         Text(
             sdf.format(Date(message.date)),
-            modifier = Modifier.testTag("messageViewHolderDate${message.id}")
+            modifier = Modifier.testTag("${TestTags.MessageList.messageViewHolderDate}${message.id}")
         )
         Spacer(modifier = Modifier.weight(1f))
         Image(
@@ -485,7 +485,7 @@ fun MessageViewHolderDateAndFlag(
                         if (message.flagged) context.getString(R.string.message_remove_star_action)
                         else context.getString(R.string.message_add_star_action)
                 }
-                .testTag("messageViewHolderFlag${message.id}")
+                .testTag("${TestTags.MessageList.messageViewHolderFlag}${message.id}")
         )
     }
 }
@@ -545,7 +545,7 @@ fun DrawerBodyAccountMode(
         DrawerAccountList(
             accounts = accounts,
             drawerActionClickListener = drawerActionClickListener,
-            modifier = Modifier.testTag("drawerAccountList")
+            modifier = Modifier.testTag(TestTags.MessageList.drawerAccountList)
         )
         DrawerActionRow(
             image = R.drawable.ic_baseline_add_24,

app/src/main/java/com/ignacio/composesample1/ui/messageview/MessageViewUI.kt

@@ -107,7 +107,7 @@ fun MessageViewTopBar(
                     vectorResource(id = R.drawable.pep_status_green),
                     modifier = Modifier
                         .preferredSize(32.dp)
-                        .testTag("messageViewTopBarBadge")
+                        .testTag(TestTags.MessageView.messageViewTopBarBadge)
                 )
                 Spacer(modifier = Modifier.preferredWidth(8.dp))
                 Text(
@@ -122,7 +122,7 @@ fun MessageViewTopBar(
         navigationIcon = {
             IconButton(
                 onClick = { messageViewMenuActionListener.onNavigationClicked() },
-                modifier = Modifier.testTag("messageViewNavigationIcon")
+                modifier = Modifier.testTag(TestTags.MessageView.messageViewNavigationIcon)
             ) {
                 Image(vectorResource(id = R.drawable.ic_clear_daynight))
             }
@@ -156,7 +156,7 @@ fun MessageViewOptionsMenu(
                     if (menuMessageInfo.flagged) context.getString(R.string.message_remove_star_action)
                     else context.getString(R.string.message_add_star_action)
             }
-            .testTag("messageViewFlagMenuItem")
+            .testTag(TestTags.MessageView.messageViewFlagMenuItem)
     ) {
         Image(
             vectorResource(
@@ -170,7 +170,7 @@ fun MessageViewOptionsMenu(
         onClick = {
             messageViewMenuActionListener.onDeleteIconClicked()
         },
-        modifier = Modifier.testTag("messageViewDeleteMenuItem")
+        modifier = Modifier.testTag(TestTags.MessageView.messageViewDeleteMenuItem)
     ) {
         Image(vectorResource(id = R.drawable.ic_trash_can_daynight))
     }
@@ -241,7 +241,7 @@ fun ColumnScope.MessageViewBodyHeader() {
                 .preferredSize(48.dp)
                 .clip(shape = CircleShape)
                 .background(colorResource(id = R.color.grey_scale_color))
-                .testTag("messageViewAvatar"),
+                .testTag(TestTags.MessageView.messageViewAvatar),
             contentScale = ContentScale.Crop
         )
         Spacer(Modifier.preferredWidth(16.dp))
@@ -254,7 +254,7 @@ fun ColumnScope.MessageViewBodyHeader() {
         Date(message.date).toString(),
         Modifier
             .align(Alignment.End)
-            .testTag("messageViewDate")
+            .testTag(TestTags.MessageView.messageViewDate)
     )
 }