Browse Source

Fix detekted issues.

feature/bma/flipper
Benoit Marty 2 years ago
parent
commit
e9158d0f59
  1. 2
      libraries/designsystem/src/main/java/io/element/android/x/designsystem/VectorIcons.kt
  2. 8
      libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/ProgressDialog.kt
  3. 18
      libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/VectorTextField.kt
  4. 2
      libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/avatar/AvatarSize.kt
  5. 2
      libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/dialogs/ConfirmationDialog.kt

2
libraries/designsystem/src/main/java/io/element/android/x/designsystem/Icons.kt → 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 Delete = R.drawable.ic_baseline_delete_outline_24
val Reply = R.drawable.ic_baseline_reply_24 val Reply = R.drawable.ic_baseline_reply_24
val Edit = R.drawable.ic_baseline_edit_24 val Edit = R.drawable.ic_baseline_edit_24
} }

8
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 import androidx.compose.ui.window.DialogProperties
@Composable @Composable
fun ProgressDialog(text: String? = null, onDismiss: () -> Unit = {}) { fun ProgressDialog(
modifier: Modifier = Modifier,
text: String? = null,
onDismiss: () -> Unit = {},
) {
Dialog( Dialog(
onDismissRequest = onDismiss, onDismissRequest = onDismiss,
properties = DialogProperties(dismissOnBackPress = false, dismissOnClickOutside = false) properties = DialogProperties(dismissOnBackPress = false, dismissOnClickOutside = false)
) { ) {
Box( Box(
contentAlignment = Alignment.Center, contentAlignment = Alignment.Center,
modifier = Modifier modifier = modifier
.fillMaxWidth() .fillMaxWidth()
.background( .background(
color = MaterialTheme.colorScheme.onBackground, color = MaterialTheme.colorScheme.onBackground,

18
libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/VectorTextField.kt

@ -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
)
}

2
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); BIG(48);
val dp = value.dp val dp = value.dp
} }

2
libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/dialogs/ConfirmationDialog.kt

@ -20,6 +20,7 @@ fun ConfirmationDialog(
isDisplayed: MutableState<Boolean>, isDisplayed: MutableState<Boolean>,
title: String, title: String,
content: String, content: String,
modifier: Modifier = Modifier,
submitText: String = "OK", submitText: String = "OK",
cancelText: String = "Cancel", cancelText: String = "Cancel",
onSubmitClicked: () -> Unit = {}, onSubmitClicked: () -> Unit = {},
@ -27,6 +28,7 @@ fun ConfirmationDialog(
) { ) {
if (!isDisplayed.value) return if (!isDisplayed.value) return
AlertDialog( AlertDialog(
modifier = modifier,
onDismissRequest = onDismiss, onDismissRequest = onDismiss,
title = { title = {
Text(text = title) Text(text = title)

Loading…
Cancel
Save