letro/letro-android
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Handle 'invalid server' error in server selection screen properly. (#214)

Browse Source 
* Handle 'invalid server' error in server selection screen properly.

* Use `action_learn_more` for composing the server location footer action.
This commit is contained in:
Jorge Martin Espinosa
2023-03-21 09:34:14 +01:00
committed by GitHub
parent 9b537bcc01
commit f94d2b6c60
24 changed files with 132 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt
View File

@@ -18,7 +18,6 @@ package io.element.android.libraries.designsystem.components.dialogs
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.AlertDialogDefaults
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
@@ -36,8 +35,8 @@ import io.element.android.libraries.ui.strings.R as StringR
fun ErrorDialog(
content: String,
modifier: Modifier = Modifier,
title: String = stringResource(id = StringR.string.dialog_title_error),
submitText: String = stringResource(id = StringR.string.ok),
title: String = ErrorDialogDefaults.title,
submitText: String = ErrorDialogDefaults.submitText,
onDismiss: () -> Unit = {},
shape: Shape = AlertDialogDefaults.shape,
containerColor: Color = AlertDialogDefaults.containerColor,
@@ -69,6 +68,11 @@ fun ErrorDialog(
)
}
object ErrorDialogDefaults {
val title: String @Composable get() = stringResource(id = StringR.string.dialog_title_error)
val submitText: String @Composable get() = stringResource(id = StringR.string.ok)
}
@Preview
@Composable
internal fun ErrorDialogLightPreview() = ElementPreviewLight { ContentToPreview() }