[Media upload] Add media pickers to the Room screen and the composer (#380)

* Add media pickers to the Room screen and the composer.

* Fix exclude rules for translations

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ModalBottomSheetLayout.kt

@@ -19,9 +19,17 @@
 package io.element.android.libraries.designsystem.theme.components
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CornerSize
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.ModalBottomSheetDefaults
 import androidx.compose.material.ModalBottomSheetState
@@ -30,12 +38,14 @@ import androidx.compose.material.rememberModalBottomSheetState
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.contentColorFor
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import io.element.android.libraries.designsystem.modifiers.applyIf
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.preview.PreviewGroup
@@ -46,15 +56,36 @@ fun ModalBottomSheetLayout(
     sheetContent: @Composable ColumnScope.() -> Unit,
     modifier: Modifier = Modifier,
     sheetState: ModalBottomSheetState = rememberModalBottomSheetState(ModalBottomSheetValue.Hidden),
-    sheetShape: Shape = MaterialTheme.shapes.large,
+    sheetShape: Shape = MaterialTheme.shapes.large.copy(bottomStart = CornerSize(0.dp), bottomEnd = CornerSize(0.dp)),
     sheetElevation: Dp = ModalBottomSheetDefaults.Elevation,
     sheetBackgroundColor: Color = MaterialTheme.colorScheme.surface,
     sheetContentColor: Color = contentColorFor(sheetBackgroundColor),
     scrimColor: Color = ModalBottomSheetDefaults.scrimColor,
+    displayHandle: Boolean = false,
+    useSystemPadding: Boolean = true,
     content: @Composable () -> Unit = {}
 ) {
     androidx.compose.material.ModalBottomSheetLayout(
-        sheetContent = sheetContent,
+        sheetContent = {
+            Column(
+                Modifier.fillMaxWidth()
+                    .applyIf(useSystemPadding, ifTrue = {
+                        navigationBarsPadding()
+                    })
+            ) {
+                if (displayHandle) {
+                    Spacer(modifier = Modifier.height(16.dp))
+                    Box(
+                        modifier = Modifier
+                            .background(MaterialTheme.colorScheme.onSurfaceVariant, RoundedCornerShape(2.dp))
+                            .size(width = 32.dp, height = 4.dp)
+                            .align(Alignment.CenterHorizontally),
+                    )
+                    Spacer(modifier = Modifier.height(24.dp))
+                }
+                sheetContent()
+            }
+        },
         modifier = modifier,
         sheetState = sheetState,
         sheetShape = sheetShape,
@@ -79,10 +110,13 @@ internal fun ModalBottomSheetLayoutDarkPreview() =
 @Composable
 private fun ContentToPreview() {
     ModalBottomSheetLayout(
-        modifier = Modifier.height(100.dp),
+        modifier = Modifier.height(140.dp),
+        displayHandle = true,
         sheetState = ModalBottomSheetState(ModalBottomSheetValue.Expanded),
         sheetContent = {
-            Text(text = "Sheet Content", modifier = Modifier.padding(16.dp).background(color = Color.Green))
+            Text(text = "Sheet Content", modifier = Modifier
+                .padding(start = 16.dp, end = 16.dp, bottom = 20.dp)
+                .background(color = Color.Green))
         }
     ) {
         Text(text = "Content", modifier = Modifier.background(color = Color.Red))

libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt

@@ -25,6 +25,8 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
@@ -55,8 +57,9 @@ fun TextComposer(
     if (LocalInspectionMode.current) {
         FakeComposer(modifier)
     } else {
+        val focusRequester = FocusRequester()
         AndroidView(
-            modifier = modifier,
+            modifier = modifier.focusRequester(focusRequester),
             factory = { context ->
                 RichTextComposerLayout(context).apply {
                     // Sets up listeners for View -> Compose communication

libraries/ui-strings/src/main/res/values-de/translations.xml

@@ -95,14 +95,10 @@
   <string name="room_timeline_read_marker_title">"Neu"</string>
   <string name="screen_analytics_settings_share_data">"Teile Analyse-Daten"</string>
   <string name="screen_media_picker_error_failed_selection">"Medienauswahl fehlgeschlagen, bitte versuche es erneut."</string>
-  <string name="screen_room_member_details_block_alert_action">"Blockieren"</string>
-  <string name="screen_room_member_details_block_user">"Nutzer blockieren"</string>
-  <string name="screen_room_member_details_unblock_alert_action">"Blockierung aufheben"</string>
-  <string name="screen_room_member_details_unblock_user">"Nutzer entblockieren"</string>
   <string name="settings_rageshake_detection_threshold">"Erkennungsschwelle"</string>
   <string name="settings_version_number">"Version: %1$s (%2$s)"</string>
   <string name="test_language_identifier">"de"</string>
   <string name="dialog_title_error">"Fehler"</string>
   <string name="dialog_title_success">"Erfolg"</string>
   <string name="screen_report_content_block_user">"Nutzer blockieren"</string>
-</resources>
+</resources>

libraries/ui-strings/src/main/res/values-es/translations.xml

@@ -128,12 +128,6 @@
   <string name="room_timeline_beginning_of_room_no_name">"Este es el principio de esta conversación."</string>
   <string name="room_timeline_read_marker_title">"Nuevos"</string>
   <string name="screen_report_content_block_user_hint">"Marque si quieres ocultar todos los mensajes actuales y futuros de este usuario"</string>
-  <string name="screen_room_member_details_block_alert_action">"Bloquear"</string>
-  <string name="screen_room_member_details_block_alert_description">"Los usuarios bloqueados no podrán enviarte mensajes y se ocultarán todos sus mensajes. Puede revertir esta acción en cualquier momento."</string>
-  <string name="screen_room_member_details_block_user">"Bloquear usuario"</string>
-  <string name="screen_room_member_details_unblock_alert_action">"Desbloquear"</string>
-  <string name="screen_room_member_details_unblock_alert_description">"Al desbloquear al usuario, podrás volver a ver todos sus mensajes."</string>
-  <string name="screen_room_member_details_unblock_user">"Desbloquear usuario"</string>
   <string name="settings_rageshake">"Agitar con fuerza"</string>
   <string name="settings_rageshake_detection_threshold">"Umbral de detección"</string>
   <string name="settings_title_general">"General"</string>
@@ -142,4 +136,4 @@
   <string name="dialog_title_error">"Error"</string>
   <string name="dialog_title_success">"Terminado"</string>
   <string name="screen_report_content_block_user">"Bloquear usuario"</string>
-</resources>
+</resources>

libraries/ui-strings/src/main/res/values-it/translations.xml

@@ -128,12 +128,6 @@
   <string name="room_timeline_beginning_of_room_no_name">"Questo è l\'inizio della conversazione."</string>
   <string name="room_timeline_read_marker_title">"Nuovo"</string>
   <string name="screen_report_content_block_user_hint">"Seleziona se vuoi nascondere tutti i messaggi attuali e futuri di questo utente"</string>
-  <string name="screen_room_member_details_block_alert_action">"Blocca"</string>
-  <string name="screen_room_member_details_block_alert_description">"Gli utenti bloccati non saranno in grado di inviarti nuovi messaggi e tutti quelli già esistenti saranno nascosti. Potrai annullare questa azione in qualsiasi momento."</string>
-  <string name="screen_room_member_details_block_user">"Blocca utente"</string>
-  <string name="screen_room_member_details_unblock_alert_action">"Sblocca"</string>
-  <string name="screen_room_member_details_unblock_alert_description">"Dopo aver sbloccato l\'utente, potrai vedere nuovamente tutti i suoi messaggi."</string>
-  <string name="screen_room_member_details_unblock_user">"Sblocca utente"</string>
   <string name="settings_rageshake">"Rageshake"</string>
   <string name="settings_rageshake_detection_threshold">"Soglia di rilevamento"</string>
   <string name="settings_title_general">"Generali"</string>
@@ -142,4 +136,4 @@
   <string name="dialog_title_error">"Errore"</string>
   <string name="dialog_title_success">"Operazione riuscita"</string>
   <string name="screen_report_content_block_user">"Blocca utente"</string>
-</resources>
+</resources>

libraries/ui-strings/src/main/res/values-ro/translations.xml

@@ -143,12 +143,6 @@
   <string name="screen_analytics_prompt_third_party_sharing"><b>"Nu"</b>" împărtășim informații cu terți"</string>
   <string name="screen_analytics_prompt_title">"Ajutați la îmbunătățirea %1$s"</string>
   <string name="screen_report_content_block_user_hint">"Confirmați că doriți să ascundeți toate mesajele curente și viitoare de la acest utilizator"</string>
-  <string name="screen_room_member_details_block_alert_action">"Blocați"</string>
-  <string name="screen_room_member_details_block_alert_description">"Utilizatorii blocați nu vă vor putea trimite mesaje și toate mesajele lor vor fi ascunse. Puteți anula această acțiune oricând."</string>
-  <string name="screen_room_member_details_block_user">"Blocați utilizatorul"</string>
-  <string name="screen_room_member_details_unblock_alert_action">"Deblocați"</string>
-  <string name="screen_room_member_details_unblock_alert_description">"La deblocarea utilizatorului, veți putea vedea din nou toate mesajele de la acesta."</string>
-  <string name="screen_room_member_details_unblock_user">"Deblocați utilizatorul"</string>
   <string name="settings_rageshake">"Rageshake"</string>
   <string name="settings_rageshake_detection_threshold">"Prag de detecție"</string>
   <string name="settings_title_general">"General"</string>
@@ -160,4 +154,4 @@
   <string name="screen_analytics_settings_read_terms">"Puteți citi toate condițiile noastre %1$s."</string>
   <string name="screen_analytics_settings_read_terms_content_link">"aici"</string>
   <string name="screen_report_content_block_user">"Blocați utilizatorul"</string>
-</resources>
+</resources>

libraries/ui-strings/src/main/res/values/localazy.xml

@@ -147,12 +147,6 @@
   <string name="screen_media_upload_preview_error_failed_processing">"Failed processing media to upload, please try again."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Failed uploading media, please try again."</string>
   <string name="screen_report_content_block_user_hint">"Check if you want to hide all current and future messages from this user"</string>
-  <string name="screen_room_member_details_block_alert_action">"Block"</string>
-  <string name="screen_room_member_details_block_alert_description">"Blocked users will not be able to send you messages and all message by them will be hidden. You can reverse this action anytime."</string>
-  <string name="screen_room_member_details_block_user">"Block user"</string>
-  <string name="screen_room_member_details_unblock_alert_action">"Unblock"</string>
-  <string name="screen_room_member_details_unblock_alert_description">"On unblocking the user, you will be able to see all messages by them again."</string>
-  <string name="screen_room_member_details_unblock_user">"Unblock user"</string>
   <string name="settings_rageshake">"Rageshake"</string>
   <string name="settings_rageshake_detection_threshold">"Detection threshold"</string>
   <string name="settings_title_general">"General"</string>