Merge branch 'develop' into feature/fga/join_space

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

@@ -38,6 +38,18 @@ import io.element.android.libraries.designsystem.theme.components.TextButton
 import io.element.android.libraries.ui.strings.CommonStrings
 import timber.log.Timber
 
+/**
+ * A progress dialog, with a spinner, and optional text content.
+ *
+ * @param modifier
+ * @param text Optional text to show under the spinner.
+ * @param type
+ * @param properties
+ * @param showCancelButton
+ * @param onDismissRequest
+ * @param content Optional additional content to show under the spinner, and above the cancel button (if shown). If both `text` and `content` are supplied,
+ *    `text` is shown above `content`.
+ */
 @Composable
 fun ProgressDialog(
     modifier: Modifier = Modifier,
@@ -46,6 +58,7 @@ fun ProgressDialog(
     properties: DialogProperties = DialogProperties(dismissOnBackPress = false, dismissOnClickOutside = false),
     showCancelButton: Boolean = false,
     onDismissRequest: () -> Unit = {},
+    content: @Composable () -> Unit = {},
 ) {
     DisposableEffect(Unit) {
         onDispose {
@@ -75,7 +88,8 @@ fun ProgressDialog(
                         )
                     }
                 }
-            }
+            },
+            content,
         )
     }
 }
@@ -96,7 +110,8 @@ private fun ProgressDialogContent(
         CircularProgressIndicator(
             color = ElementTheme.colors.iconPrimary
         )
-    }
+    },
+    content: @Composable () -> Unit,
 ) {
     Box(
         contentAlignment = Alignment.Center,
@@ -118,6 +133,7 @@ private fun ProgressDialogContent(
                     color = ElementTheme.colors.textPrimary,
                 )
             }
+            content()
             if (showCancelButton) {
                 Spacer(modifier = Modifier.height(24.dp))
                 Box(
@@ -138,7 +154,7 @@ private fun ProgressDialogContent(
 @Composable
 internal fun ProgressDialogContentPreview() = ElementThemedPreview {
     DialogPreview {
-        ProgressDialogContent(text = "test dialog content", showCancelButton = true)
+        ProgressDialogContent(text = "test dialog content", showCancelButton = true, content = {})
     }
 }
 
@@ -147,3 +163,34 @@ internal fun ProgressDialogContentPreview() = ElementThemedPreview {
 internal fun ProgressDialogPreview() = ElementPreview {
     ProgressDialog(text = "test dialog content", showCancelButton = true)
 }
+
+@PreviewsDayNight
+@Composable
+internal fun ProgressDialogWithContentPreview() = ElementPreview {
+    ProgressDialog(showCancelButton = true) {
+        Spacer(modifier = Modifier.height(8.dp))
+        Text(
+            text = "Heading",
+            color = ElementTheme.colors.textPrimary,
+            style = ElementTheme.typography.fontHeadingSmMedium,
+        )
+        Spacer(modifier = Modifier.height(16.dp))
+        Text(
+            text = "Subtext",
+            color = ElementTheme.colors.textSecondary,
+            style = MaterialTheme.typography.bodyMedium,
+        )
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun ProgressDialogWithTextAndContentPreview() = ElementPreview {
+    ProgressDialog(text = "Text Content") {
+        Text(
+            text = "blah blah",
+            color = ElementTheme.colors.textPrimary,
+            style = ElementTheme.typography.fontHeadingSmMedium,
+        )
+    }
+}

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

@@ -142,7 +142,7 @@ internal fun SimpleAlertDialogContent(
                 Text(
                     text = titleText,
                     style = ElementTheme.typography.fontHeadingSmMedium,
-                    textAlign = TextAlign.Center,
+                    textAlign = if (icon != null) TextAlign.Center else TextAlign.Start,
                 )
             }
         },
@@ -510,3 +510,43 @@ internal fun DialogWithThirdButtonPreview() {
         }
     }
 }
+
+@Preview(group = PreviewGroup.Dialogs, name = "Dialog with a very long title")
+@Composable
+@Suppress("MaxLineLength")
+internal fun DialogWithVeryLongTitlePreview() {
+    ElementThemedPreview(showBackground = false) {
+        DialogPreview {
+            SimpleAlertDialogContent(
+                title = "Dialog Title that takes more than one line",
+                content = "A dialog is a type of modal window that appears in front of app content to provide critical information," +
+                    " or prompt for a decision to be made. Learn more",
+                submitText = "OK",
+                onSubmitClick = {},
+            )
+        }
+    }
+}
+
+@Preview(group = PreviewGroup.Dialogs, name = "Dialog with a very long title and icon")
+@Composable
+@Suppress("MaxLineLength")
+internal fun DialogWithVeryLongTitleAndIconPreview() {
+    ElementThemedPreview(showBackground = false) {
+        DialogPreview {
+            SimpleAlertDialogContent(
+                icon = {
+                    Icon(
+                        imageVector = CompoundIcons.NotificationsSolid(),
+                        contentDescription = null
+                    )
+                },
+                title = "Dialog Title that takes more than one line",
+                content = "A dialog is a type of modal window that appears in front of app content to provide critical information," +
+                    " or prompt for a decision to be made. Learn more",
+                submitText = "OK",
+                onSubmitClick = {},
+            )
+        }
+    }
+}