Browse Source
Display a notice if Matrix ID isn't resolved If we can't get the profile of a user after an mxid was searched for, show a warning under their ID to say the invite probably won't be delivered. Closes #424feature/fga/small_timeline_improvements
Chris Smith
1 year ago
committed by
GitHub
89 changed files with 503 additions and 216 deletions
@ -0,0 +1 @@
@@ -0,0 +1 @@
|
||||
[Create and join rooms] Show a notice for MXIDs that don't resolve when searching for users to invite |
@ -0,0 +1,150 @@
@@ -0,0 +1,150 @@
|
||||
/* |
||||
* Copyright (c) 2023 New Vector Ltd |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0 |
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package io.element.android.libraries.matrix.ui.components |
||||
|
||||
import androidx.compose.foundation.clickable |
||||
import androidx.compose.foundation.layout.Column |
||||
import androidx.compose.foundation.layout.IntrinsicSize |
||||
import androidx.compose.foundation.layout.Row |
||||
import androidx.compose.foundation.layout.fillMaxWidth |
||||
import androidx.compose.foundation.layout.height |
||||
import androidx.compose.foundation.layout.padding |
||||
import androidx.compose.foundation.layout.size |
||||
import androidx.compose.material.icons.Icons |
||||
import androidx.compose.material.icons.filled.Error |
||||
import androidx.compose.material3.MaterialTheme |
||||
import androidx.compose.runtime.Composable |
||||
import androidx.compose.ui.Alignment |
||||
import androidx.compose.ui.Modifier |
||||
import androidx.compose.ui.res.stringResource |
||||
import androidx.compose.ui.semantics.Role |
||||
import androidx.compose.ui.text.font.FontWeight |
||||
import androidx.compose.ui.text.style.TextOverflow |
||||
import androidx.compose.ui.tooling.preview.Preview |
||||
import androidx.compose.ui.unit.dp |
||||
import androidx.compose.ui.unit.sp |
||||
import io.element.android.libraries.designsystem.components.avatar.Avatar |
||||
import io.element.android.libraries.designsystem.components.avatar.AvatarData |
||||
import io.element.android.libraries.designsystem.preview.ElementThemedPreview |
||||
import io.element.android.libraries.designsystem.theme.components.Checkbox |
||||
import io.element.android.libraries.designsystem.theme.components.Icon |
||||
import io.element.android.libraries.designsystem.theme.components.Text |
||||
import io.element.android.libraries.matrix.ui.model.getAvatarData |
||||
import io.element.android.libraries.ui.strings.R |
||||
|
||||
@Composable |
||||
fun UnresolvedUserRow( |
||||
avatarData: AvatarData, |
||||
id: String, |
||||
modifier: Modifier = Modifier, |
||||
) { |
||||
Row( |
||||
modifier = modifier |
||||
.fillMaxWidth() |
||||
.padding(start = 16.dp, top = 8.dp, end = 16.dp, bottom = 8.dp) |
||||
.height(IntrinsicSize.Min), |
||||
verticalAlignment = Alignment.CenterVertically |
||||
) { |
||||
Avatar(avatarData) |
||||
Column( |
||||
modifier = Modifier |
||||
.padding(start = 12.dp), |
||||
) { |
||||
// ID |
||||
Text( |
||||
fontSize = 16.sp, |
||||
fontWeight = FontWeight.SemiBold, |
||||
text = id, |
||||
maxLines = 1, |
||||
overflow = TextOverflow.Ellipsis, |
||||
color = MaterialTheme.colorScheme.primary, |
||||
) |
||||
|
||||
// Warning |
||||
Row(modifier = Modifier.fillMaxWidth()) { |
||||
Icon( |
||||
imageVector = Icons.Filled.Error, |
||||
contentDescription = "", |
||||
modifier = Modifier |
||||
.size(18.dp) |
||||
.align(Alignment.Top) |
||||
.padding(2.dp), |
||||
tint = MaterialTheme.colorScheme.error, |
||||
) |
||||
|
||||
Text( |
||||
text = stringResource(R.string.common_invite_unknown_profile), |
||||
color = MaterialTheme.colorScheme.secondary, |
||||
fontSize = 12.sp, |
||||
lineHeight = 16.sp, |
||||
) |
||||
} |
||||
} |
||||
} |
||||
} |
||||
|
||||
@Composable |
||||
fun CheckableUnresolvedUserRow( |
||||
checked: Boolean, |
||||
avatarData: AvatarData, |
||||
id: String, |
||||
modifier: Modifier = Modifier, |
||||
onCheckedChange: (Boolean) -> Unit = {}, |
||||
enabled: Boolean = true, |
||||
) { |
||||
Row( |
||||
modifier = modifier |
||||
.fillMaxWidth() |
||||
.clickable(role = Role.Checkbox, enabled = enabled) { |
||||
onCheckedChange(!checked) |
||||
}, |
||||
verticalAlignment = Alignment.CenterVertically, |
||||
) { |
||||
UnresolvedUserRow( |
||||
modifier = Modifier.weight(1f), |
||||
avatarData = avatarData, |
||||
id = id, |
||||
) |
||||
|
||||
Checkbox( |
||||
checked = checked, |
||||
onCheckedChange = onCheckedChange, |
||||
enabled = enabled, |
||||
) |
||||
} |
||||
} |
||||
|
||||
@Preview |
||||
@Composable |
||||
internal fun UnresolvedUserRowPreview() = |
||||
ElementThemedPreview { |
||||
val matrixUser = aMatrixUser() |
||||
UnresolvedUserRow(matrixUser.getAvatarData(), matrixUser.userId.value) |
||||
} |
||||
|
||||
@Preview |
||||
@Composable |
||||
internal fun CheckableUnresolvedUserRowPreview() = |
||||
ElementThemedPreview { |
||||
val matrixUser = aMatrixUser() |
||||
Column { |
||||
CheckableUnresolvedUserRow(false, matrixUser.getAvatarData(), matrixUser.userId.value) |
||||
CheckableUnresolvedUserRow(true, matrixUser.getAvatarData(), matrixUser.userId.value) |
||||
CheckableUnresolvedUserRow(false, matrixUser.getAvatarData(), matrixUser.userId.value, enabled = false) |
||||
CheckableUnresolvedUserRow(true, matrixUser.getAvatarData(), matrixUser.userId.value, enabled = false) |
||||
} |
||||
} |
@ -0,0 +1,24 @@
@@ -0,0 +1,24 @@
|
||||
/* |
||||
* Copyright (c) 2023 New Vector Ltd |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0 |
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package io.element.android.libraries.usersearch.api |
||||
|
||||
import io.element.android.libraries.matrix.api.user.MatrixUser |
||||
|
||||
data class UserSearchResult( |
||||
val matrixUser: MatrixUser, |
||||
val isUnresolved: Boolean = false, |
||||
) |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in new issue