-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: handling group creation errors (#2016)
- Loading branch information
Showing
10 changed files
with
225 additions
and
126 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
133 changes: 133 additions & 0 deletions
133
...src/main/kotlin/com/wire/android/ui/home/newconversation/common/CreateGroupErrorDialog.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2023 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| */ | ||
| package com.wire.android.ui.home.newconversation.common | ||
|
|
||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.text.SpanStyle | ||
| import androidx.compose.ui.text.buildAnnotatedString | ||
| import androidx.compose.ui.text.style.TextDecoration | ||
| import androidx.compose.ui.text.withStyle | ||
| import com.wire.android.R | ||
| import com.wire.android.ui.common.WireDialog | ||
| import com.wire.android.ui.common.WireDialogButtonProperties | ||
| import com.wire.android.ui.common.WireDialogButtonType | ||
| import com.wire.android.ui.common.colorsScheme | ||
| import com.wire.android.ui.markdown.MarkdownConstants | ||
| import com.wire.android.ui.theme.WireTheme | ||
| import com.wire.android.util.DialogAnnotatedErrorStrings | ||
| import com.wire.android.util.ui.PreviewMultipleThemes | ||
|
|
||
| @Composable | ||
| fun CreateGroupErrorDialog( | ||
| error: CreateGroupState.Error, | ||
| onDismiss: () -> Unit, | ||
| onAccept: () -> Unit, | ||
| onCancel: () -> Unit | ||
| ) { | ||
| val dialogStrings = when (error) { | ||
| is CreateGroupState.Error.LackingConnection -> DialogAnnotatedErrorStrings( | ||
| stringResource(R.string.error_no_network_title), | ||
| buildAnnotatedString { append(stringResource(R.string.error_no_network_message)) } | ||
| ) | ||
|
|
||
| is CreateGroupState.Error.Unknown -> DialogAnnotatedErrorStrings( | ||
| stringResource(R.string.error_unknown_title), | ||
| buildAnnotatedString { append(stringResource(R.string.error_unknown_message)) } | ||
| ) | ||
|
|
||
| is CreateGroupState.Error.ConflictedBackends -> DialogAnnotatedErrorStrings( | ||
| title = stringResource(id = R.string.group_can_not_be_created_title), | ||
| annotatedMessage = buildAnnotatedString { | ||
| val description = stringResource( | ||
| id = R.string.group_can_not_be_created_federation_conflict_description, | ||
| error.domains.dropLast(1).joinToString(", "), | ||
| error.domains.last() | ||
| ) | ||
| val learnMore = stringResource(id = R.string.label_learn_more) | ||
|
|
||
| append(description) | ||
| append(' ') | ||
|
|
||
| withStyle( | ||
| style = SpanStyle( | ||
| color = colorsScheme().primary, | ||
| textDecoration = TextDecoration.Underline | ||
| ) | ||
| ) { | ||
| append(learnMore) | ||
| } | ||
| addStringAnnotation( | ||
| tag = MarkdownConstants.TAG_URL, | ||
| annotation = stringResource(id = R.string.url_support), | ||
| start = description.length + 1, | ||
| end = description.length + 1 + learnMore.length | ||
| ) | ||
| } | ||
| ) | ||
| } | ||
|
|
||
| WireDialog( | ||
| dialogStrings.title, | ||
| dialogStrings.annotatedMessage, | ||
| onDismiss = onDismiss, | ||
| buttonsHorizontalAlignment = false, | ||
| optionButton1Properties = WireDialogButtonProperties( | ||
| onClick = if (error.isConflictedBackends) onAccept else onDismiss, | ||
| text = stringResource( | ||
| id = if (error.isConflictedBackends) { | ||
| R.string.group_can_not_be_created_edit_participiant_list | ||
| } else { | ||
| R.string.label_ok | ||
| } | ||
| ), | ||
| type = WireDialogButtonType.Primary, | ||
| ), | ||
| optionButton2Properties = if (error.isConflictedBackends) { | ||
| WireDialogButtonProperties( | ||
| onClick = onCancel, | ||
| text = stringResource(R.string.group_can_not_be_created_discard_group_creation), | ||
| type = WireDialogButtonType.Secondary, | ||
| ) | ||
| } else { | ||
| null | ||
| }, | ||
| ) | ||
| } | ||
|
|
||
| @PreviewMultipleThemes | ||
| @Composable | ||
| private fun PreviewCreateGroupErrorDialogLackingConnection() { | ||
| WireTheme { | ||
| CreateGroupErrorDialog(CreateGroupState.Error.LackingConnection, {}, {}, {}) | ||
| } | ||
| } | ||
| @PreviewMultipleThemes | ||
| @Composable | ||
| private fun PreviewCreateGroupErrorDialogUnknown() { | ||
| WireTheme { | ||
| CreateGroupErrorDialog(CreateGroupState.Error.Unknown, {}, {}, {}) | ||
| } | ||
| } | ||
| @PreviewMultipleThemes | ||
| @Composable | ||
| private fun PreviewCreateGroupErrorDialogConflictedBackends() { | ||
| WireTheme { | ||
| CreateGroupErrorDialog(CreateGroupState.Error.ConflictedBackends(listOf("some.com", "other.com")), {}, {}, {}) | ||
| } | ||
| } |
30 changes: 30 additions & 0 deletions
30
app/src/main/kotlin/com/wire/android/ui/home/newconversation/common/CreateGroupState.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2023 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| */ | ||
| package com.wire.android.ui.home.newconversation.common | ||
|
|
||
| data class CreateGroupState( | ||
| val error: Error? = null | ||
| ) { | ||
| sealed interface Error { | ||
| object Unknown : Error | ||
| object LackingConnection : Error | ||
| data class ConflictedBackends(val domains: List<String>) : Error | ||
|
|
||
| val isConflictedBackends get() = this is ConflictedBackends | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.