From e9158d0f59a5dde608fe0afb2e4118840cfee66c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 12 Dec 2022 17:15:09 +0100
Subject: [PATCH] Fix detekted issues.

---
 .../designsystem/{Icons.kt => VectorIcons.kt}  |  2 +-
 .../designsystem/components/ProgressDialog.kt  |  8 ++++++--
 .../designsystem/components/VectorTextField.kt | 18 ------------------
 .../components/avatar/AvatarSize.kt            |  2 +-
 .../components/dialogs/ConfirmationDialog.kt   |  2 ++
 5 files changed, 10 insertions(+), 22 deletions(-)
 rename libraries/designsystem/src/main/java/io/element/android/x/designsystem/{Icons.kt => VectorIcons.kt} (99%)
 delete mode 100644 libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/VectorTextField.kt

diff --git a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/Icons.kt b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/VectorIcons.kt
similarity index 99%
rename from libraries/designsystem/src/main/java/io/element/android/x/designsystem/Icons.kt
rename to libraries/designsystem/src/main/java/io/element/android/x/designsystem/VectorIcons.kt
index bd1d941e3e..0f6be4989d 100644
--- a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/Icons.kt
+++ b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/VectorIcons.kt
@@ -8,4 +8,4 @@ object VectorIcons {
     val Delete = R.drawable.ic_baseline_delete_outline_24
     val Reply = R.drawable.ic_baseline_reply_24
     val Edit = R.drawable.ic_baseline_edit_24
-}
\ No newline at end of file
+}
diff --git a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/ProgressDialog.kt b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/ProgressDialog.kt
index 6be64bc51f..f17dc4bdc2 100644
--- a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/ProgressDialog.kt
+++ b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/ProgressDialog.kt
@@ -18,14 +18,18 @@ import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 
 @Composable
-fun ProgressDialog(text: String? = null, onDismiss: () -> Unit = {}) {
+fun ProgressDialog(
+    modifier: Modifier = Modifier,
+    text: String? = null,
+    onDismiss: () -> Unit = {},
+) {
     Dialog(
         onDismissRequest = onDismiss,
         properties = DialogProperties(dismissOnBackPress = false, dismissOnClickOutside = false)
     ) {
         Box(
             contentAlignment = Alignment.Center,
-            modifier = Modifier
+            modifier = modifier
                 .fillMaxWidth()
                 .background(
                     color = MaterialTheme.colorScheme.onBackground,
diff --git a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/VectorTextField.kt b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/VectorTextField.kt
deleted file mode 100644
index 524aea98b9..0000000000
--- a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/VectorTextField.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.element.android.x.designsystem.components
-
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun VectorTextField(value: String, onValueChange: (String) -> Unit, isError: Boolean = false) {
-    OutlinedTextField(
-        value = value,
-        onValueChange = onValueChange,
-        modifier = Modifier.fillMaxWidth(),
-        isError = isError
-    )
-}
diff --git a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/avatar/AvatarSize.kt b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/avatar/AvatarSize.kt
index 764b547dca..d7834fd352 100644
--- a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/avatar/AvatarSize.kt
+++ b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/avatar/AvatarSize.kt
@@ -8,4 +8,4 @@ enum class AvatarSize(val value: Int) {
     BIG(48);
 
     val dp = value.dp
-}
\ No newline at end of file
+}
diff --git a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/dialogs/ConfirmationDialog.kt b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/dialogs/ConfirmationDialog.kt
index eb07d8f9c5..360c62bf2e 100644
--- a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/dialogs/ConfirmationDialog.kt
+++ b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/dialogs/ConfirmationDialog.kt
@@ -20,6 +20,7 @@ fun ConfirmationDialog(
     isDisplayed: MutableState<Boolean>,
     title: String,
     content: String,
+    modifier: Modifier = Modifier,
     submitText: String = "OK",
     cancelText: String = "Cancel",
     onSubmitClicked: () -> Unit = {},
@@ -27,6 +28,7 @@ fun ConfirmationDialog(
 ) {
     if (!isDisplayed.value) return
     AlertDialog(
+        modifier = modifier,
         onDismissRequest = onDismiss,
         title = {
             Text(text = title)