Improve room setting edition #2849
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -37,6 +37,9 @@ import io.element.android.libraries.matrix.api.room.MatrixRoom | |
| import io.element.android.libraries.matrix.api.room.StateEventType | ||
| import io.element.android.libraries.matrix.api.room.powerlevels.canSendState | ||
| import io.element.android.libraries.matrix.ui.media.AvatarAction | ||
| import io.element.android.libraries.matrix.ui.room.avatarUrl | ||
| import io.element.android.libraries.matrix.ui.room.rawName | ||
| import io.element.android.libraries.matrix.ui.room.topic | ||
| import io.element.android.libraries.mediapickers.api.PickerProvider | ||
| import io.element.android.libraries.mediaupload.api.MediaPreProcessor | ||
| import io.element.android.libraries.permissions.api.PermissionsEvents | ||
|
|
@@ -61,41 +64,56 @@ class RoomDetailsEditPresenter @Inject constructor( | |
| val cameraPermissionState = cameraPermissionPresenter.present() | ||
| val roomSyncUpdateFlow = room.syncUpdateFlow.collectAsState() | ||
|
|
||
| val roomAvatarUri = room.avatarUrl()?.toUri() | ||
| var roomAvatarUriEdited by rememberSaveable { mutableStateOf<Uri?>(null) } | ||
| LaunchedEffect(roomAvatarUri) { | ||
| // Every time the roomAvatar change (from sync), we can set the new avatar. | ||
| roomAvatarUriEdited = roomAvatarUri | ||
| } | ||
|
|
||
| val roomRawNameTrimmed = room.rawName().orEmpty().trim() | ||
| var roomRawNameEdited by rememberSaveable { mutableStateOf("") } | ||
| LaunchedEffect(roomRawNameTrimmed) { | ||
| // Every time the rawName change (from sync), we can set the new name. | ||
| roomRawNameEdited = roomRawNameTrimmed | ||
| } | ||
| val roomTopicTrimmed = room.topic().orEmpty().trim() | ||
| var roomTopicEdited by rememberSaveable { mutableStateOf("") } | ||
| LaunchedEffect(roomTopicTrimmed) { | ||
| // Every time the topic change (from sync), we can set the new topic. | ||
| roomTopicEdited = roomTopicTrimmed | ||
| } | ||
|
|
||
| val saveButtonEnabled by remember( | ||
| roomRawNameTrimmed, | ||
|
There was a problem hiding this comment. This is a bit weird to use There was a problem hiding this comment. Yes, I tried to remove the keys, but this does not work as expected, for instance There was a problem hiding this comment. Because There was a problem hiding this comment. OK, so I have a mix in c3caff0. I think it's still relevant to use de |
||
| roomRawNameEdited, | ||
| roomTopicTrimmed, | ||
| roomTopicEdited, | ||
| roomAvatarUri, | ||
| roomAvatarUriEdited, | ||
| ) { | ||
| derivedStateOf { | ||
| roomRawNameTrimmed != roomRawNameEdited.trim() || | ||
| roomTopicTrimmed != roomTopicEdited.trim() || | ||
| roomAvatarUri != roomAvatarUriEdited | ||
| } | ||
| } | ||
|
|
||
| var canChangeName by remember { mutableStateOf(false) } | ||
| var canChangeTopic by remember { mutableStateOf(false) } | ||
| var canChangeAvatar by remember { mutableStateOf(false) } | ||
|
|
||
| LaunchedEffect(roomSyncUpdateFlow.value) { | ||
| canChangeName = room.canSendState(StateEventType.ROOM_NAME).getOrElse { false } | ||
| canChangeTopic = room.canSendState(StateEventType.ROOM_TOPIC).getOrElse { false } | ||
| canChangeAvatar = room.canSendState(StateEventType.ROOM_AVATAR).getOrElse { false } | ||
| } | ||
|
|
||
| val cameraPhotoPicker = mediaPickerProvider.registerCameraPhotoPicker( | ||
| onResult = { uri -> if (uri != null) roomAvatarUriEdited = uri } | ||
| ) | ||
| val galleryImagePicker = mediaPickerProvider.registerGalleryImagePicker( | ||
| onResult = { uri -> if (uri != null) roomAvatarUriEdited = uri } | ||
| ) | ||
|
|
||
| LaunchedEffect(cameraPermissionState.permissionGranted) { | ||
|
|
@@ -105,12 +123,12 @@ class RoomDetailsEditPresenter @Inject constructor( | |
| } | ||
| } | ||
|
|
||
| val avatarActions by remember(roomAvatarUriEdited) { | ||
| derivedStateOf { | ||
| listOfNotNull( | ||
| AvatarAction.TakePhoto, | ||
| AvatarAction.ChoosePhoto, | ||
| AvatarAction.Remove.takeIf { roomAvatarUriEdited != null }, | ||
| ).toImmutableList() | ||
| } | ||
| } | ||
|
|
@@ -119,7 +137,15 @@ class RoomDetailsEditPresenter @Inject constructor( | |
| val localCoroutineScope = rememberCoroutineScope() | ||
| fun handleEvents(event: RoomDetailsEditEvents) { | ||
| when (event) { | ||
| is RoomDetailsEditEvents.Save -> localCoroutineScope.saveChanges( | ||
| currentNameTrimmed = roomRawNameTrimmed, | ||
| newNameTrimmed = roomRawNameEdited.trim(), | ||
| currentTopicTrimmed = roomTopicTrimmed, | ||
| newTopicTrimmed = roomTopicEdited.trim(), | ||
| currentAvatar = roomAvatarUri, | ||
| newAvatarUri = roomAvatarUriEdited, | ||
| action = saveAction, | ||
| ) | ||
| is RoomDetailsEditEvents.HandleAvatarAction -> { | ||
| when (event.action) { | ||
| AvatarAction.ChoosePhoto -> galleryImagePicker.launch() | ||
|
|
@@ -129,23 +155,23 @@ class RoomDetailsEditPresenter @Inject constructor( | |
| pendingPermissionRequest = true | ||
| cameraPermissionState.eventSink(PermissionsEvents.RequestPermissions) | ||
| } | ||
| AvatarAction.Remove -> roomAvatarUriEdited = null | ||
| } | ||
| } | ||
|
|
||
| is RoomDetailsEditEvents.UpdateRoomName -> roomRawNameEdited = event.name | ||
| is RoomDetailsEditEvents.UpdateRoomTopic -> roomTopicEdited = event.topic | ||
| RoomDetailsEditEvents.CancelSaveChanges -> saveAction.value = AsyncAction.Uninitialized | ||
| } | ||
| } | ||
|
|
||
| return RoomDetailsEditState( | ||
| roomId = room.roomId, | ||
| roomRawName = roomRawNameEdited, | ||
| canChangeName = canChangeName, | ||
| roomTopic = roomTopicEdited, | ||
| canChangeTopic = canChangeTopic, | ||
| roomAvatarUrl = roomAvatarUriEdited, | ||
| canChangeAvatar = canChangeAvatar, | ||
| avatarActions = avatarActions, | ||
| saveButtonEnabled = saveButtonEnabled, | ||
|
|
@@ -156,25 +182,28 @@ class RoomDetailsEditPresenter @Inject constructor( | |
| } | ||
|
|
||
| private fun CoroutineScope.saveChanges( | ||
| currentNameTrimmed: String, | ||
| newNameTrimmed: String, | ||
| currentTopicTrimmed: String, | ||
| newTopicTrimmed: String, | ||
| currentAvatar: Uri?, | ||
| newAvatarUri: Uri?, | ||
| action: MutableState<AsyncAction<Unit>>, | ||
| ) = launch { | ||
| val results = mutableListOf<Result<Unit>>() | ||
| suspend { | ||
| if (newTopicTrimmed != currentTopicTrimmed) { | ||
| results.add(room.setTopic(newTopicTrimmed).onFailure { | ||
| Timber.e(it, "Failed to set room topic") | ||
| }) | ||
| } | ||
| if (newNameTrimmed.isNotEmpty() && newNameTrimmed != currentNameTrimmed) { | ||
| results.add(room.setName(newNameTrimmed).onFailure { | ||
| Timber.e(it, "Failed to set room name") | ||
| }) | ||
| } | ||
| if (newAvatarUri != currentAvatar) { | ||
| results.add(updateAvatar(newAvatarUri).onFailure { | ||
| Timber.e(it, "Failed to update avatar") | ||
| }) | ||
| } | ||
|
|
||
This file contains hidden or 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.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we really want to have live values here? I'd expect to be static
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I think it's fine, having the value change during edition should not happen a lot, just during our cheeky tests :)