Browse Source
* Update the chat screen UI using `RoomInfo`. This is specially useful for getting live values for `hasRoomCall`. * Ensure the first `MatrixRoomInfo` is emitted ASAP * Try excluding `*Present$present$*` inner functions from kover as separate entities * Update strings --------- Co-authored-by: ElementBot <benoitm+elementbot@element.io>pull/1650/head
Jorge Martin Espinosa
11 months ago
committed by
GitHub
36 changed files with 338 additions and 52 deletions
@ -0,0 +1 @@
@@ -0,0 +1 @@
|
||||
Element Call: change the 'join call' button in a chat room when there's an active call. |
||||
@ -0,0 +1,21 @@
@@ -0,0 +1,21 @@
|
||||
/* |
||||
* 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.api.room |
||||
|
||||
enum class CurrentUserMembership { |
||||
INVITED, JOINED, LEFT |
||||
} |
||||
@ -0,0 +1,43 @@
@@ -0,0 +1,43 @@
|
||||
/* |
||||
* 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.api.room |
||||
|
||||
import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem |
||||
|
||||
data class MatrixRoomInfo( |
||||
val id: String, |
||||
val name: String?, |
||||
val topic: String?, |
||||
val avatarUrl: String?, |
||||
val isDirect: Boolean, |
||||
val isPublic: Boolean, |
||||
val isSpace: Boolean, |
||||
val isTombstoned: Boolean, |
||||
val canonicalAlias: String?, |
||||
val alternativeAliases: List<String>, |
||||
val currentUserMembership: CurrentUserMembership, |
||||
val latestEvent: EventTimelineItem?, |
||||
val inviter: RoomMember?, |
||||
val activeMembersCount: Long, |
||||
val invitedMembersCount: Long, |
||||
val joinedMembersCount: Long, |
||||
val highlightCount: Long, |
||||
val notificationCount: Long, |
||||
val userDefinedNotificationMode: RoomNotificationMode?, |
||||
val hasRoomCall: Boolean, |
||||
val activeRoomCallParticipants: List<String> |
||||
) |
||||
@ -0,0 +1,69 @@
@@ -0,0 +1,69 @@
|
||||
/* |
||||
* 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.impl.room |
||||
|
||||
import io.element.android.libraries.matrix.api.room.CurrentUserMembership |
||||
import io.element.android.libraries.matrix.api.room.MatrixRoomInfo |
||||
import io.element.android.libraries.matrix.api.room.RoomNotificationMode |
||||
import io.element.android.libraries.matrix.impl.timeline.item.event.EventTimelineItemMapper |
||||
import org.matrix.rustcomponents.sdk.use |
||||
import org.matrix.rustcomponents.sdk.Membership as RustMembership |
||||
import org.matrix.rustcomponents.sdk.RoomInfo as RustRoomInfo |
||||
import org.matrix.rustcomponents.sdk.RoomNotificationMode as RustRoomNotificationMode |
||||
|
||||
class MatrixRoomInfoMapper( |
||||
private val timelineItemMapper: EventTimelineItemMapper = EventTimelineItemMapper(), |
||||
) { |
||||
|
||||
fun map(rustRoomInfo: RustRoomInfo): MatrixRoomInfo = rustRoomInfo.use { |
||||
return MatrixRoomInfo( |
||||
id = it.id, |
||||
name = it.name, |
||||
topic = it.topic, |
||||
avatarUrl = it.avatarUrl, |
||||
isDirect = it.isDirect, |
||||
isPublic = it.isPublic, |
||||
isSpace = it.isSpace, |
||||
isTombstoned = it.isTombstoned, |
||||
canonicalAlias = it.canonicalAlias, |
||||
alternativeAliases = it.alternativeAliases, |
||||
currentUserMembership = it.membership.map(), |
||||
latestEvent = it.latestEvent?.use (timelineItemMapper::map), |
||||
inviter = it.inviter?.use(RoomMemberMapper::map), |
||||
activeMembersCount = it.activeMembersCount.toLong(), |
||||
invitedMembersCount = it.invitedMembersCount.toLong(), |
||||
joinedMembersCount = it.joinedMembersCount.toLong(), |
||||
highlightCount = it.highlightCount.toLong(), |
||||
notificationCount = it.notificationCount.toLong(), |
||||
userDefinedNotificationMode = it.userDefinedNotificationMode?.map(), |
||||
hasRoomCall = it.hasRoomCall, |
||||
activeRoomCallParticipants = it.activeRoomCallParticipants |
||||
) |
||||
} |
||||
} |
||||
|
||||
fun RustMembership.map(): CurrentUserMembership = when(this) { |
||||
RustMembership.INVITED -> CurrentUserMembership.INVITED |
||||
RustMembership.JOINED -> CurrentUserMembership.JOINED |
||||
RustMembership.LEFT -> CurrentUserMembership.LEFT |
||||
} |
||||
|
||||
fun RustRoomNotificationMode.map(): RoomNotificationMode = when(this) { |
||||
RustRoomNotificationMode.ALL_MESSAGES -> RoomNotificationMode.ALL_MESSAGES |
||||
RustRoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY -> RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY |
||||
RustRoomNotificationMode.MUTE -> RoomNotificationMode.MUTE |
||||
} |
||||
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