SES-5239 : Media folder missing qa-tags (#1963)

jbsession · web-flow · commit a7a616b6076e · 2026-02-18T08:57:51.000+08:00
* added QA tags for mediapicker folder and item

* Imports cleanup
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/compose/Components.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/compose/Components.kt
@@ -1,13 +1,7 @@
 package org.thoughtcrime.securesms.mediasend.compose
 
 import android.net.Uri
-import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.Crossfade
-import androidx.compose.animation.SizeTransform
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -50,6 +44,7 @@ import com.bumptech.glide.integration.compose.ExperimentalGlideComposeApi
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.mediasend.Media
 import org.thoughtcrime.securesms.ui.AnimateFade
+import org.thoughtcrime.securesms.ui.qaTag
 import org.thoughtcrime.securesms.ui.theme.LocalColors
 import org.thoughtcrime.securesms.ui.theme.LocalDimensions
 import org.thoughtcrime.securesms.ui.theme.LocalType
@@ -60,12 +55,14 @@ fun MediaFolderCell(
     title: String,
     count: Int,
     thumbnailUri: Uri?,
+    qaTag : String,
     onClick: () -> Unit
 ) {
     Box(
         modifier = Modifier
             .fillMaxWidth()
             .aspectRatio(1f)
+            .qaTag(qaTag)
             .clickable(onClick = onClick)
     ) {
         AsyncImage(
@@ -137,6 +134,7 @@ fun MediaPickerItemCell(
     isSelected: Boolean = false,
     selectedIndex: Int = 1,
     isMultiSelect: Boolean,
+    qaTag : String,
     onMediaChosen: (Media) -> Unit,
     onSelectionStarted: () -> Unit,
     onSelectionChanged: (selectedMedia: Media) -> Unit,
@@ -147,6 +145,7 @@ fun MediaPickerItemCell(
     Box(
         modifier = modifier
             .aspectRatio(1f)
+            .qaTag(qaTag)
             .combinedClickable(
                 onClick = {
                     if (!isMultiSelect) {
@@ -272,7 +271,8 @@ private fun PreviewMediaFolderCell() {
     MediaFolderCell(
         title = "Test Title",
         count = 100,
-        thumbnailUri = null
+        thumbnailUri = null,
+        qaTag = ""
     ) { }
 }
 
@@ -288,6 +288,7 @@ private fun Preview_MediaPickerItemCell_NotSelected() {
         onMediaChosen = {},
         onSelectionStarted = {},
         onSelectionChanged = {},
+        qaTag = ""
     )
 }
 
@@ -303,6 +304,7 @@ private fun Preview_MediaPickerItemCell_Selected() {
         onMediaChosen = {},
         onSelectionStarted = {},
         onSelectionChanged = {},
+        qaTag = ""
     )
 }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/compose/MediaPickerFolderScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/compose/MediaPickerFolderScreen.kt
@@ -12,7 +12,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
-import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.lazy.grid.itemsIndexed
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -24,6 +24,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import network.loki.messenger.R
@@ -67,7 +68,7 @@ private fun MediaPickerFolder(
     title: String,
     handleBack: () -> Unit,
     showManageMediaAccess: Boolean,
-    manageMediaAccess : () -> Unit
+    manageMediaAccess: () -> Unit
 ) {
 
     // span logic: screenWidth / media_picker_folder_width
@@ -107,15 +108,16 @@ private fun MediaPickerFolder(
                 horizontalArrangement = Arrangement.spacedBy(LocalDimensions.current.tinySpacing),
                 verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.tinySpacing)
             ) {
-                items(
+                itemsIndexed(
                     items = folders,
-                    key = { folder -> folder.bucketId }
-                ) { folder ->
+                    key = { index, folder -> folder.bucketId }
+                ) { index, folder ->
                     MediaFolderCell(
                         title = folder.title,
                         count = folder.itemCount,
                         thumbnailUri = folder.thumbnailUri,
                         onClick = { onFolderClick(folder) },
+                        qaTag = stringResource( R.string.qa_mediapicker_folder_item) +"-$index"
                     )
                 }
             }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/compose/MediaPickerItemScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/compose/MediaPickerItemScreen.kt
@@ -2,12 +2,11 @@ package org.thoughtcrime.securesms.mediasend.compose
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
-import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.lazy.grid.itemsIndexed
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -18,6 +17,7 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.net.toUri
@@ -108,31 +108,35 @@ private fun MediaPickerItem(
             )
         },
     ) { padding ->
-            LazyVerticalGrid(
-                columns = GridCells.Fixed(columns),
-                modifier = Modifier
-                    .padding(padding)
-                    .padding(LocalDimensions.current.tinySpacing)
-                    .fillMaxSize()
-                    .background(LocalColors.current.background),
-                horizontalArrangement = Arrangement.spacedBy(LocalDimensions.current.tinySpacing),
-                verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.tinySpacing)
-            ) {
-                items(media, key = { it.uri }) { item ->
-                    val isSelected = selectedMedia.any { it.uri == item.uri }
-                    MediaPickerItemCell(
-                        media = item,
-                        isSelected = isSelected,
-                        selectedIndex = selectedMedia.indexOfFirst { it.uri == item.uri },
-                        isMultiSelect = isMultiSelect,
-                        canLongPress = canLongPress,
-                        showSelectionOn = isSelected,
-                        onMediaChosen = { onSinglePick(it) },
-                        onSelectionStarted = onStartMultiSelect,
-                        onSelectionChanged = onToggleSelection,
-                    )
-                }
+        LazyVerticalGrid(
+            columns = GridCells.Fixed(columns),
+            modifier = Modifier
+                .padding(padding)
+                .padding(LocalDimensions.current.tinySpacing)
+                .fillMaxSize()
+                .background(LocalColors.current.background),
+            horizontalArrangement = Arrangement.spacedBy(LocalDimensions.current.tinySpacing),
+            verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.tinySpacing)
+        ) {
+            itemsIndexed(
+                items = media,
+                key = { _, item -> item.uri }   // ignore index for stable key
+            ) { index, item ->
+                val isSelected = selectedMedia.any { it.uri == item.uri }
+                MediaPickerItemCell(
+                    media = item,
+                    isSelected = isSelected,
+                    selectedIndex = selectedMedia.indexOfFirst { it.uri == item.uri },
+                    isMultiSelect = isMultiSelect,
+                    canLongPress = canLongPress,
+                    showSelectionOn = isSelected,
+                    onMediaChosen = { onSinglePick(it) },
+                    onSelectionStarted = onStartMultiSelect,
+                    onSelectionChanged = onToggleSelection,
+                    qaTag = stringResource(R.string.qa_mediapicker_image_item) + "-${index}"
+                )
             }
+        }
     }
 }
 
diff --git a/content-descriptions/src/main/res/values/strings.xml b/content-descriptions/src/main/res/values/strings.xml
@@ -330,6 +330,9 @@
     <string name="qa_help_settings_support">preferences-option-help</string>
     <string name="qa_help_settings_faq">preferences-option-faq</string>
 
+    <!-- Media send -->
+    <string name="qa_mediapicker_folder_item">mediapicker-folder-item-thumbnail</string>
+    <string name="qa_mediapicker_image_item">mediapicker-image-item-thumbnail</string>
 
     <!-- Misc. -->
     <string name="AccessibilityId_navigateBack">Navigate back</string>
