Merge pull request #684 from vector-im/feature/bma/stringR

Quick PR to introduce `CommonStrings` type alias

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt

@@ -77,9 +77,9 @@ import io.element.android.libraries.designsystem.utils.LogCompositions
 import io.element.android.libraries.designsystem.utils.rememberSnackbarHostState
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.timeline.item.event.EventSendState
+import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.ImmutableList
 import timber.log.Timber
-import io.element.android.libraries.ui.strings.R as StringsR
 
 @OptIn(ExperimentalLayoutApi::class, ExperimentalMaterial3Api::class)
 @Composable
@@ -195,7 +195,7 @@ private fun AttachmentStateView(
         is AttachmentsState.Previewing -> LaunchedEffect(state) {
             onPreviewAttachments(state.attachments)
         }
-        is AttachmentsState.Sending -> ProgressDialog(text = stringResource(id = StringsR.string.common_loading))
+        is AttachmentsState.Sending -> ProgressDialog(text = stringResource(id = CommonStrings.common_loading))
     }
 }
 

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewView.kt

@@ -41,8 +41,7 @@ import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextButton
-import io.element.android.libraries.ui.strings.R
-import io.element.android.libraries.ui.strings.R as StringsR
+import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 fun AttachmentsPreviewView(
@@ -92,7 +91,7 @@ private fun AttachmentSendStateView(
 ) {
     when (sendActionState) {
         is Async.Loading -> {
-            ProgressDialog(text = stringResource(id = R.string.common_loading))
+            ProgressDialog(text = stringResource(id = CommonStrings.common_loading))
         }
 
         is Async.Failure -> {
@@ -151,10 +150,10 @@ private fun AttachmentsPreviewBottomActions(
         modifier = modifier,
     ) {
         TextButton(onClick = onCancelClicked) {
-            Text(stringResource(id = StringsR.string.action_cancel))
+            Text(stringResource(id = CommonStrings.action_cancel))
         }
         TextButton(onClick = onSendClicked) {
-            Text(stringResource(id = StringsR.string.action_send))
+            Text(stringResource(id = CommonStrings.action_send))
         }
     }
 }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/error/ErrorFormatter.kt

@@ -17,14 +17,14 @@
 package io.element.android.features.messages.impl.attachments.preview.error
 
 import io.element.android.libraries.mediaupload.api.MediaPreProcessor
-import io.element.android.libraries.ui.strings.R
+import io.element.android.libraries.ui.strings.CommonStrings
 
 fun sendAttachmentError(
     throwable: Throwable
 ): Int {
     return if (throwable is MediaPreProcessor.Failure) {
-        R.string.screen_media_upload_preview_error_failed_processing
+        CommonStrings.screen_media_upload_preview_error_failed_processing
     } else {
-        R.string.screen_media_upload_preview_error_failed_sending
+        CommonStrings.screen_media_upload_preview_error_failed_sending
     }
 }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt

@@ -66,8 +66,8 @@ import io.element.android.libraries.designsystem.theme.roomListRoomName
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.RoomSummaryDetails
 import io.element.android.libraries.matrix.ui.components.SelectedRoom
+import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.ImmutableList
-import io.element.android.libraries.ui.strings.R as StringR
 
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
 @Composable
@@ -111,7 +111,7 @@ fun ForwardMessagesView(
         modifier = modifier,
         topBar = {
             CenterAlignedTopAppBar(
-                title = { Text(stringResource(StringR.string.common_forward_message), style = ElementTextStyles.Bold.callout) },
+                title = { Text(stringResource(CommonStrings.common_forward_message), style = ElementTextStyles.Bold.callout) },
                 navigationIcon = {
                     BackButton(onClick = { onBackButton(state) })
                 },
@@ -120,7 +120,7 @@ fun ForwardMessagesView(
                         enabled = state.selectedRooms.isNotEmpty(),
                         onClick = { state.eventSink(ForwardMessagesEvents.ForwardEvent) }
                     ) {
-                        Text(text = stringResource(StringR.string.action_send))
+                        Text(text = stringResource(CommonStrings.action_send))
                     }
                 }
             )
@@ -132,7 +132,7 @@ fun ForwardMessagesView(
                 .consumeWindowInsets(paddingValues)
         ) {
             SearchBar<ImmutableList<RoomSummaryDetails>>(
-                placeHolderTitle = stringResource(StringR.string.action_search),
+                placeHolderTitle = stringResource(CommonStrings.action_search),
                 query = state.query,
                 onQueryChange = { state.eventSink(ForwardMessagesEvents.UpdateQuery(it)) },
                 active = state.isSearchActive,

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/viewer/MediaViewerPresenter.kt

@@ -38,10 +38,10 @@ import io.element.android.libraries.designsystem.utils.SnackbarMessage
 import io.element.android.libraries.designsystem.utils.collectSnackbarMessageAsState
 import io.element.android.libraries.matrix.api.media.MatrixMediaLoader
 import io.element.android.libraries.matrix.api.media.MediaFile
+import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import io.element.android.libraries.androidutils.R as UtilsR
-import io.element.android.libraries.ui.strings.R as StringR
 
 class MediaViewerPresenter @AssistedInject constructor(
     @Assisted private val inputs: MediaViewerNode.Inputs,
@@ -119,7 +119,7 @@ class MediaViewerPresenter @AssistedInject constructor(
         if (localMedia is Async.Success) {
             localMediaActions.saveOnDisk(localMedia.data)
                 .onSuccess {
-                    val snackbarMessage = SnackbarMessage(StringR.string.common_file_saved_on_disk_android)
+                    val snackbarMessage = SnackbarMessage(CommonStrings.common_file_saved_on_disk_android)
                     snackbarDispatcher.post(snackbarMessage)
                 }
                 .onFailure {
@@ -153,7 +153,7 @@ class MediaViewerPresenter @AssistedInject constructor(
         return if (throwable is ActivityNotFoundException) {
             UtilsR.string.error_no_compatible_app_found
         } else {
-            StringR.string.error_unknown
+            CommonStrings.error_unknown
         }
     }
 }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/media/viewer/MediaViewerView.kt

@@ -68,8 +68,8 @@ import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.designsystem.utils.rememberSnackbarHostState
 import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.libraries.matrix.ui.media.MediaRequestData
+import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.coroutines.delay
-import io.element.android.libraries.ui.strings.R as StringR
 
 @Composable
 fun MediaViewerView(
@@ -130,7 +130,7 @@ fun MediaViewerView(
             ) {
                 if (state.downloadedMedia is Async.Failure) {
                     ErrorView(
-                        errorMessage = stringResource(id = StringR.string.error_unknown),
+                        errorMessage = stringResource(id = CommonStrings.error_unknown),
                         onRetry = ::onRetry,
                         onDismiss = ::onDismissError
                     )
@@ -187,7 +187,7 @@ private fun MediaViewerTopBar(
                     eventSink(MediaViewerEvents.OpenWith)
                 },
             ) {
-                Icon(imageVector = Icons.Default.OpenInNew, contentDescription = stringResource(id = StringR.string.action_open_with))
+                Icon(imageVector = Icons.Default.OpenInNew, contentDescription = stringResource(id = CommonStrings.action_open_with))
             }
             IconButton(
                 enabled = actionsEnabled,
@@ -195,7 +195,7 @@ private fun MediaViewerTopBar(
                     eventSink(MediaViewerEvents.SaveOnDisk)
                 },
             ) {
-                Icon(imageVector = Icons.Default.Download, contentDescription = stringResource(id = StringR.string.action_save))
+                Icon(imageVector = Icons.Default.Download, contentDescription = stringResource(id = CommonStrings.action_save))
             }
             IconButton(
                 enabled = actionsEnabled,
@@ -203,7 +203,7 @@ private fun MediaViewerTopBar(
                     eventSink(MediaViewerEvents.Share)
                 },
             ) {
-                Icon(imageVector = Icons.Default.Share, contentDescription = stringResource(id = StringR.string.action_share))
+                Icon(imageVector = Icons.Default.Share, contentDescription = stringResource(id = CommonStrings.action_share))
             }
         }
     )

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessagePresenter.kt

@@ -35,9 +35,9 @@ import io.element.android.libraries.designsystem.utils.SnackbarMessage
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import io.element.android.libraries.ui.strings.R as StringR
 
 class ReportMessagePresenter @AssistedInject constructor(
     private val room: MatrixRoom,
@@ -90,7 +90,7 @@ class ReportMessagePresenter @AssistedInject constructor(
             val userIdToBlock = userId.takeIf { blockUser }
             room.reportContent(eventId, reason, userIdToBlock)
                 .onSuccess {
-                    snackbarDispatcher.post(SnackbarMessage(StringR.string.common_report_submitted))
+                    snackbarDispatcher.post(SnackbarMessage(CommonStrings.common_report_submitted))
                 }
         }
     }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageView.kt

@@ -54,7 +54,7 @@ import io.element.android.libraries.designsystem.theme.components.CenterAlignedT
 import io.element.android.libraries.designsystem.theme.components.OutlinedTextField
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
-import io.element.android.libraries.ui.strings.R as StringR
+import io.element.android.libraries.ui.strings.CommonStrings
 
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
 @Composable
@@ -74,7 +74,7 @@ fun ReportMessageView(
         }
         is Async.Failure -> {
             ErrorDialog(
-                content = stringResource(StringR.string.error_unknown),
+                content = stringResource(CommonStrings.error_unknown),
                 onDismiss = { state.eventSink(ReportMessageEvents.ClearError) }
             )
         }
@@ -86,7 +86,7 @@ fun ReportMessageView(
             CenterAlignedTopAppBar(
                 title = {
                     Text(
-                        stringResource(StringR.string.action_report_content),
+                        stringResource(CommonStrings.action_report_content),
                         style = ElementTextStyles.Regular.callout,
                         fontWeight = FontWeight.Medium,
                     )
@@ -112,14 +112,14 @@ fun ReportMessageView(
             OutlinedTextField(
                 value = state.reason,
                 onValueChange = { state.eventSink(ReportMessageEvents.UpdateReason(it)) },
-                placeholder = { Text(stringResource(StringR.string.report_content_hint)) },
+                placeholder = { Text(stringResource(CommonStrings.report_content_hint)) },
                 enabled = !isSending,
                 modifier = Modifier
                     .fillMaxWidth()
                     .heightIn(min = 90.dp)
             )
             Text(
-                text = stringResource(StringR.string.report_content_explanation),
+                text = stringResource(CommonStrings.report_content_explanation),
                 style = ElementTextStyles.Regular.caption1,
                 color = MaterialTheme.colorScheme.secondary,
                 textAlign = TextAlign.Start,
@@ -133,11 +133,11 @@ fun ReportMessageView(
             ) {
                 Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(4.dp)) {
                     Text(
-                        text = stringResource(StringR.string.screen_report_content_block_user),
+                        text = stringResource(CommonStrings.screen_report_content_block_user),
                         style = ElementTextStyles.Regular.callout,
                     )
                     Text(
-                        text = stringResource(StringR.string.screen_report_content_block_user_hint),
+                        text = stringResource(CommonStrings.screen_report_content_block_user_hint),
                         style = ElementTextStyles.Regular.bodyMD,
                         color = MaterialTheme.colorScheme.secondary,
                     )
@@ -152,7 +152,7 @@ fun ReportMessageView(
             Spacer(modifier = Modifier.height(24.dp))
 
             ButtonWithProgress(
-                text = stringResource(StringR.string.action_send),
+                text = stringResource(CommonStrings.action_send),
                 enabled = state.reason.isNotBlank() && !isSending,
                 showProgress = isSending,
                 onClick = {

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineEventTimestampView.kt

@@ -44,7 +44,7 @@ import io.element.android.libraries.designsystem.theme.ElementTheme
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.matrix.api.timeline.item.event.EventSendState
-import io.element.android.libraries.ui.strings.R
+import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 fun TimelineEventTimestampView(
@@ -70,7 +70,7 @@ fun TimelineEventTimestampView(
     ) {
         if (isMessageEdited) {
             Text(
-                stringResource(R.string.common_edited_suffix),
+                stringResource(CommonStrings.common_edited_suffix),
                 style = ElementTextStyles.Regular.caption2,
                 color = tint ?: MaterialTheme.colorScheme.secondary,
             )

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemEncryptedView.kt

@@ -26,8 +26,7 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.matrix.api.timeline.item.event.UnableToDecryptContent
-
-import io.element.android.libraries.ui.strings.R as StringR
+import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 fun TimelineItemEncryptedView(
@@ -35,8 +34,8 @@ fun TimelineItemEncryptedView(
     modifier: Modifier = Modifier
 ) {
     TimelineItemInformativeView(
-        text = stringResource(id = StringR.string.common_decryption_error),
-        iconDescription = stringResource(id = StringR.string.dialog_title_warning),
+        text = stringResource(id = CommonStrings.common_decryption_error),
+        iconDescription = stringResource(id = CommonStrings.dialog_title_warning),
         icon = Icons.Default.Warning,
         modifier = modifier
     )

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemRedactedView.kt

@@ -25,8 +25,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRedactedContent
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
-
-import io.element.android.libraries.ui.strings.R as StringR
+import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 fun TimelineItemRedactedView(
@@ -34,8 +33,8 @@ fun TimelineItemRedactedView(
     modifier: Modifier = Modifier
 ) {
     TimelineItemInformativeView(
-        text = stringResource(id = StringR.string.common_message_removed),
-        iconDescription = stringResource(id = StringR.string.common_message_removed),
+        text = stringResource(id = CommonStrings.common_message_removed),
+        iconDescription = stringResource(id = CommonStrings.common_message_removed),
         icon = Icons.Default.Delete,
         modifier = modifier
     )

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemUnknownView.kt

@@ -25,8 +25,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemUnknownContent
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
-
-import io.element.android.libraries.ui.strings.R as StringR
+import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 fun TimelineItemUnknownView(
@@ -34,8 +33,8 @@ fun TimelineItemUnknownView(
     modifier: Modifier = Modifier
 ) {
     TimelineItemInformativeView(
-        text = stringResource(id = StringR.string.common_unsupported_event),
-        iconDescription = stringResource(id = StringR.string.dialog_title_warning),
+        text = stringResource(id = CommonStrings.common_unsupported_event),
+        iconDescription = stringResource(id = CommonStrings.dialog_title_warning),
         icon = Icons.Default.Info,
         modifier = modifier
     )

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/messagesummary/MessageSummaryFormatterImpl.kt

@@ -30,7 +30,7 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVideoContent
 import io.element.android.libraries.di.ApplicationContext
 import io.element.android.libraries.di.RoomScope
-import io.element.android.libraries.ui.strings.R
+import io.element.android.libraries.ui.strings.CommonStrings
 import javax.inject.Inject
 
 @ContributesBinding(RoomScope::class)
@@ -42,12 +42,12 @@ class MessageSummaryFormatterImpl @Inject constructor(
             is TimelineItemTextBasedContent -> event.content.body
             is TimelineItemStateContent -> event.content.body
             is TimelineItemProfileChangeContent -> event.content.body
-            is TimelineItemEncryptedContent -> context.getString(R.string.common_unable_to_decrypt)
-            is TimelineItemRedactedContent -> context.getString(R.string.common_message_removed)
-            is TimelineItemUnknownContent -> context.getString(R.string.common_unsupported_event)
-            is TimelineItemImageContent -> context.getString(R.string.common_image)
-            is TimelineItemVideoContent -> context.getString(R.string.common_video)
-            is TimelineItemFileContent -> context.getString(R.string.common_file)
+            is TimelineItemEncryptedContent -> context.getString(CommonStrings.common_unable_to_decrypt)
+            is TimelineItemRedactedContent -> context.getString(CommonStrings.common_message_removed)
+            is TimelineItemUnknownContent -> context.getString(CommonStrings.common_unsupported_event)
+            is TimelineItemImageContent -> context.getString(CommonStrings.common_image)
+            is TimelineItemVideoContent -> context.getString(CommonStrings.common_video)
+            is TimelineItemFileContent -> context.getString(CommonStrings.common_file)
         }
     }
 }