Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Fix detekted issues.

Browse source
This commit is contained in:
Benoit Marty 2022-12-12 17:18:23 +01:00
parent 64cf12ed28
commit 0dc92de9f9
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
features/roomlist/src/main/java/io/element/android/x/features/roomlist/components/RoomListTopBar.kt
View file

@ -198,10 +198,13 @@ private fun DefaultRoomListTopBar(
) )
// Log out confirmation dialog // Log out confirmation dialog
ConfirmationDialog( ConfirmationDialog(
openDialog, isDisplayed = openDialog.value,
title = "Log out", title = "Log out",
content = "Do you confirm you want to log out?", content = "Do you confirm you want to log out?",
submitText = "Log out", submitText = "Log out",
onSubmitClicked = onLogoutClicked, onSubmitClicked = onLogoutClicked,
onDismiss = {
openDialog.value = false
}
) )
} }

11
libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/dialogs/ConfirmationDialog.kt
View file

@ -8,16 +8,13 @@ import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Button import androidx.compose.material3.Button
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
@Composable @Composable
fun ConfirmationDialog( fun ConfirmationDialog(
isDisplayed: MutableState<Boolean>, isDisplayed: Boolean,
title: String, title: String,
content: String, content: String,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
@ -26,7 +23,7 @@ fun ConfirmationDialog(
onSubmitClicked: () -> Unit = {}, onSubmitClicked: () -> Unit = {},
onDismiss: () -> Unit = {}, onDismiss: () -> Unit = {},
) { ) {
if (!isDisplayed.value) return if (!isDisplayed) return
AlertDialog( AlertDialog(
modifier = modifier, modifier = modifier,
onDismissRequest = onDismiss, onDismissRequest = onDismiss,
@ -44,7 +41,6 @@ fun ConfirmationDialog(
Button( Button(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
onClick = { onClick = {
isDisplayed.value = false
onDismiss() onDismiss()
onSubmitClicked() onSubmitClicked()
}) })
@ -61,7 +57,6 @@ fun ConfirmationDialog(
Button( Button(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
onClick = { onClick = {
isDisplayed.value = false
onDismiss() onDismiss()
}) { }) {
Text(cancelText) Text(cancelText)
@ -75,7 +70,7 @@ fun ConfirmationDialog(
@Preview @Preview
fun ConfirmationDialogPreview() { fun ConfirmationDialogPreview() {
ConfirmationDialog( ConfirmationDialog(
isDisplayed = remember { mutableStateOf(true) }, isDisplayed = true,
title = "Title", title = "Title",
content = "Content", content = "Content",
) )