Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify a bit the API.

Browse source
This commit is contained in:
Benoit Marty 2024-02-07 11:17:15 +01:00 • committed by Benoit Marty
parent 3c38201b2c
commit b6dcadd980
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenu.kt
View file

@ -51,15 +51,15 @@ fun RoomListContextMenu(
contextMenu = contextMenu,
onRoomMarkReadClicked = {
eventSink(RoomListEvents.HideContextMenu)
eventSink(RoomListEvents.MarkAsRead(it))
eventSink(RoomListEvents.MarkAsRead(contextMenu.roomId))
},
onRoomMarkUnreadClicked = {
eventSink(RoomListEvents.HideContextMenu)
eventSink(RoomListEvents.MarkAsUnread(it))
eventSink(RoomListEvents.MarkAsUnread(contextMenu.roomId))
},
onRoomSettingsClicked = {
eventSink(RoomListEvents.HideContextMenu)
onRoomSettingsClicked(it)
onRoomSettingsClicked(contextMenu.roomId)
},
onLeaveRoomClicked = {
eventSink(RoomListEvents.HideContextMenu)
@ -72,10 +72,10 @@ fun RoomListContextMenu(
@Composable
private fun RoomListModalBottomSheetContent(
contextMenu: RoomListState.ContextMenu.Shown,
onRoomMarkReadClicked: (roomId: RoomId) -> Unit,
onRoomMarkUnreadClicked: (roomId: RoomId) -> Unit,
onRoomSettingsClicked: (roomId: RoomId) -> Unit,
onLeaveRoomClicked: (roomId: RoomId) -> Unit,
onRoomMarkReadClicked: () -> Unit,
onRoomMarkUnreadClicked: () -> Unit,
onRoomSettingsClicked: () -> Unit,
onLeaveRoomClicked: () -> Unit,
) {
Column(
modifier = Modifier.fillMaxWidth()
@ -103,9 +103,9 @@ private fun RoomListModalBottomSheetContent(
},
modifier = Modifier.clickable {
if (contextMenu.hasNewContent) {
onRoomMarkReadClicked(contextMenu.roomId)
onRoomMarkReadClicked()
} else {
onRoomMarkUnreadClicked(contextMenu.roomId)
onRoomMarkUnreadClicked()
}
},
/* TODO Design
@ -125,7 +125,7 @@ private fun RoomListModalBottomSheetContent(
style = MaterialTheme.typography.bodyLarge,
)
},
modifier = Modifier.clickable { onRoomSettingsClicked(contextMenu.roomId) },
modifier = Modifier.clickable { onRoomSettingsClicked() },
leadingContent = ListItemContent.Icon(
iconSource = IconSource.Vector(
CompoundIcons.Settings,
@ -145,7 +145,7 @@ private fun RoomListModalBottomSheetContent(
)
Text(text = leaveText)
},
modifier = Modifier.clickable { onLeaveRoomClicked(contextMenu.roomId) },
modifier = Modifier.clickable { onLeaveRoomClicked() },
leadingContent = ListItemContent.Icon(
iconSource = IconSource.Vector(
CompoundIcons.Leave,