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

Lambda parameters in a composable function should be in present tense, not past tense.

Browse source 
https://mrmans0n.github.io/compose-rules/rules/#naming-parameters-properly
This commit is contained in:
Benoit Marty 2024-05-29 10:48:29 +02:00
parent b8f3b66d0e
commit 87689d787e
250 changed files with 1698 additions and 1698 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -44,30 +44,30 @@ import io.element.android.libraries.ui.strings.CommonStrings
fun RoomListContextMenu(
contextMenu: RoomListState.ContextMenu.Shown,
eventSink: (RoomListEvents.ContextMenuEvents) -> Unit,
onRoomSettingsClicked: (roomId: RoomId) -> Unit,
onRoomSettingsClick: (roomId: RoomId) -> Unit,
) {
ModalBottomSheet(
onDismissRequest = { eventSink(RoomListEvents.HideContextMenu) },
) {
RoomListModalBottomSheetContent(
contextMenu = contextMenu,
onRoomMarkReadClicked = {
onRoomMarkReadClick = {
eventSink(RoomListEvents.HideContextMenu)
eventSink(RoomListEvents.MarkAsRead(contextMenu.roomId))
},
onRoomMarkUnreadClicked = {
onRoomMarkUnreadClick = {
eventSink(RoomListEvents.HideContextMenu)
eventSink(RoomListEvents.MarkAsUnread(contextMenu.roomId))
},
onRoomSettingsClicked = {
onRoomSettingsClick = {
eventSink(RoomListEvents.HideContextMenu)
onRoomSettingsClicked(contextMenu.roomId)
onRoomSettingsClick(contextMenu.roomId)
},
onLeaveRoomClicked = {
onLeaveRoomClick = {
eventSink(RoomListEvents.HideContextMenu)
eventSink(RoomListEvents.LeaveRoom(contextMenu.roomId))
},
onFavoriteChanged = { isFavorite ->
onFavoriteChange = { isFavorite ->
eventSink(RoomListEvents.SetRoomIsFavorite(contextMenu.roomId, isFavorite))
},
)
@ -77,11 +77,11 @@ fun RoomListContextMenu(
@Composable
private fun RoomListModalBottomSheetContent(
contextMenu: RoomListState.ContextMenu.Shown,
onRoomSettingsClicked: () -> Unit,
onLeaveRoomClicked: () -> Unit,
onFavoriteChanged: (isFavorite: Boolean) -> Unit,
onRoomMarkReadClicked: () -> Unit,
onRoomMarkUnreadClicked: () -> Unit,
onRoomSettingsClick: () -> Unit,
onLeaveRoomClick: () -> Unit,
onFavoriteChange: (isFavorite: Boolean) -> Unit,
onRoomMarkReadClick: () -> Unit,
onRoomMarkUnreadClick: () -> Unit,
) {
Column(
modifier = Modifier.fillMaxWidth()
@ -111,9 +111,9 @@ private fun RoomListModalBottomSheetContent(
},
modifier = Modifier.clickable {
if (contextMenu.hasNewContent) {
onRoomMarkReadClicked()
onRoomMarkReadClick()
} else {
onRoomMarkUnreadClicked()
onRoomMarkUnreadClick()
}
},
/* TODO Design
@ -143,11 +143,11 @@ private fun RoomListModalBottomSheetContent(
trailingContent = ListItemContent.Switch(
checked = contextMenu.isFavorite,
onChange = { isFavorite ->
onFavoriteChanged(isFavorite)
onFavoriteChange(isFavorite)
},
),
onClick = {
onFavoriteChanged(!contextMenu.isFavorite)
onFavoriteChange(!contextMenu.isFavorite)
},
style = ListItemStyle.Primary,
)
@ -158,7 +158,7 @@ private fun RoomListModalBottomSheetContent(
style = MaterialTheme.typography.bodyLarge,
)
},
modifier = Modifier.clickable { onRoomSettingsClicked() },
modifier = Modifier.clickable { onRoomSettingsClick() },
leadingContent = ListItemContent.Icon(
iconSource = IconSource.Vector(
CompoundIcons.Settings(),
@ -178,7 +178,7 @@ private fun RoomListModalBottomSheetContent(
)
Text(text = leaveText)
},
modifier = Modifier.clickable { onLeaveRoomClicked() },
modifier = Modifier.clickable { onLeaveRoomClick() },
leadingContent = ListItemContent.Icon(
iconSource = IconSource.Vector(
CompoundIcons.Leave(),
@ -200,10 +200,10 @@ internal fun RoomListModalBottomSheetContentPreview(
) = ElementPreview {
RoomListModalBottomSheetContent(
contextMenu = contextMenu,
onRoomMarkReadClicked = {},
onRoomMarkUnreadClicked = {},
onRoomSettingsClicked = {},
onLeaveRoomClicked = {},
onFavoriteChanged = {},
onRoomMarkReadClick = {},
onRoomMarkUnreadClick = {},
onRoomSettingsClick = {},
onLeaveRoomClick = {},
onFavoriteChange = {},
)
}

44
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListNode.kt
View file

@ -54,39 +54,39 @@ class RoomListNode @AssistedInject constructor(
)
}
private fun onRoomClicked(roomId: RoomId) {
plugins<RoomListEntryPoint.Callback>().forEach { it.onRoomClicked(roomId) }
private fun onRoomClick(roomId: RoomId) {
plugins<RoomListEntryPoint.Callback>().forEach { it.onRoomClick(roomId) }
}
private fun onOpenSettings() {
plugins<RoomListEntryPoint.Callback>().forEach { it.onSettingsClicked() }
plugins<RoomListEntryPoint.Callback>().forEach { it.onSettingsClick() }
}
private fun onCreateRoomClicked() {
plugins<RoomListEntryPoint.Callback>().forEach { it.onCreateRoomClicked() }
private fun onCreateRoomClick() {
plugins<RoomListEntryPoint.Callback>().forEach { it.onCreateRoomClick() }
}
private fun onSessionConfirmRecoveryKeyClicked() {
plugins<RoomListEntryPoint.Callback>().forEach { it.onSessionConfirmRecoveryKeyClicked() }
private fun onSessionConfirmRecoveryKeyClick() {
plugins<RoomListEntryPoint.Callback>().forEach { it.onSessionConfirmRecoveryKeyClick() }
}
private fun onRoomSettingsClicked(roomId: RoomId) {
plugins<RoomListEntryPoint.Callback>().forEach { it.onRoomSettingsClicked(roomId) }
private fun onRoomSettingsClick(roomId: RoomId) {
plugins<RoomListEntryPoint.Callback>().forEach { it.onRoomSettingsClick(roomId) }
}
private fun onMenuActionClicked(activity: Activity, roomListMenuAction: RoomListMenuAction) {
private fun onMenuActionClick(activity: Activity, roomListMenuAction: RoomListMenuAction) {
when (roomListMenuAction) {
RoomListMenuAction.InviteFriends -> {
inviteFriendsUseCase.execute(activity)
}
RoomListMenuAction.ReportBug -> {
plugins<RoomListEntryPoint.Callback>().forEach { it.onReportBugClicked() }
plugins<RoomListEntryPoint.Callback>().forEach { it.onReportBugClick() }
}
}
}
private fun onRoomDirectorySearchClicked() {
plugins<RoomListEntryPoint.Callback>().forEach { it.onRoomDirectorySearchClicked() }
private fun onRoomDirectorySearchClick() {
plugins<RoomListEntryPoint.Callback>().forEach { it.onRoomDirectorySearchClick() }
}
@Composable
@ -95,19 +95,19 @@ class RoomListNode @AssistedInject constructor(
val activity = LocalContext.current as Activity
RoomListView(
state = state,
onRoomClicked = this::onRoomClicked,
onSettingsClicked = this::onOpenSettings,
onCreateRoomClicked = this::onCreateRoomClicked,
onConfirmRecoveryKeyClicked = this::onSessionConfirmRecoveryKeyClicked,
onRoomSettingsClicked = this::onRoomSettingsClicked,
onMenuActionClicked = { onMenuActionClicked(activity, it) },
onRoomDirectorySearchClicked = this::onRoomDirectorySearchClicked,
onRoomClick = this::onRoomClick,
onSettingsClick = this::onOpenSettings,
onCreateRoomClick = this::onCreateRoomClick,
onConfirmRecoveryKeyClick = this::onSessionConfirmRecoveryKeyClick,
onRoomSettingsClick = this::onRoomSettingsClick,
onMenuActionClick = { onMenuActionClick(activity, it) },
onRoomDirectorySearchClick = this::onRoomDirectorySearchClick,
modifier = modifier,
) {
acceptDeclineInviteView.Render(
state = state.acceptDeclineInviteState,
onInviteAccepted = this::onRoomClicked,
onInviteDeclined = { },
onAcceptInvite = this::onRoomClick,
onDeclineInvite = { },
modifier = Modifier
)
}

66
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt
View file

@ -51,13 +51,13 @@ import io.element.android.libraries.matrix.api.core.RoomId
@Composable
fun RoomListView(
state: RoomListState,
onRoomClicked: (RoomId) -> Unit,
onSettingsClicked: () -> Unit,
onConfirmRecoveryKeyClicked: () -> Unit,
onCreateRoomClicked: () -> Unit,
onRoomSettingsClicked: (roomId: RoomId) -> Unit,
onMenuActionClicked: (RoomListMenuAction) -> Unit,
onRoomDirectorySearchClicked: () -> Unit,
onRoomClick: (RoomId) -> Unit,
onSettingsClick: () -> Unit,
onConfirmRecoveryKeyClick: () -> Unit,
onCreateRoomClick: () -> Unit,
onRoomSettingsClick: (roomId: RoomId) -> Unit,
onMenuActionClick: (RoomListMenuAction) -> Unit,
onRoomDirectorySearchClick: () -> Unit,
modifier: Modifier = Modifier,
acceptDeclineInviteView: @Composable () -> Unit,
) {
@ -70,7 +70,7 @@ fun RoomListView(
RoomListContextMenu(
contextMenu = state.contextMenu,
eventSink = state.eventSink,
onRoomSettingsClicked = onRoomSettingsClicked,
onRoomSettingsClick = onRoomSettingsClick,
)
}
@ -78,19 +78,19 @@ fun RoomListView(
RoomListScaffold(
state = state,
onConfirmRecoveryKeyClicked = onConfirmRecoveryKeyClicked,
onRoomClicked = onRoomClicked,
onOpenSettings = onSettingsClicked,
onCreateRoomClicked = onCreateRoomClicked,
onMenuActionClicked = onMenuActionClicked,
onConfirmRecoveryKeyClick = onConfirmRecoveryKeyClick,
onRoomClick = onRoomClick,
onOpenSettings = onSettingsClick,
onCreateRoomClick = onCreateRoomClick,
onMenuActionClick = onMenuActionClick,
modifier = Modifier.padding(top = topPadding),
)
// This overlaid view will only be visible when state.displaySearchResults is true
RoomListSearchView(
state = state.searchState,
eventSink = state.eventSink,
onRoomClicked = onRoomClicked,
onRoomDirectorySearchClicked = onRoomDirectorySearchClicked,
onRoomClick = onRoomClick,
onRoomDirectorySearchClick = onRoomDirectorySearchClick,
modifier = Modifier
.statusBarsPadding()
.padding(top = topPadding)
@ -106,15 +106,15 @@ fun RoomListView(
@Composable
private fun RoomListScaffold(
state: RoomListState,
onConfirmRecoveryKeyClicked: () -> Unit,
onRoomClicked: (RoomId) -> Unit,
onConfirmRecoveryKeyClick: () -> Unit,
onRoomClick: (RoomId) -> Unit,
onOpenSettings: () -> Unit,
onCreateRoomClicked: () -> Unit,
onMenuActionClicked: (RoomListMenuAction) -> Unit,
onCreateRoomClick: () -> Unit,
onMenuActionClick: (RoomListMenuAction) -> Unit,
modifier: Modifier = Modifier,
) {
fun onRoomClicked(room: RoomListRoomSummary) {
onRoomClicked(room.roomId)
fun onRoomClick(room: RoomListRoomSummary) {
onRoomClick(room.roomId)
}
val appBarState = rememberTopAppBarState()
@ -129,7 +129,7 @@ private fun RoomListScaffold(
showAvatarIndicator = state.showAvatarIndicator,
areSearchResultsDisplayed = state.searchState.isSearchActive,
onToggleSearch = { state.eventSink(RoomListEvents.ToggleSearchResults) },
onMenuActionClicked = onMenuActionClicked,
onMenuActionClick = onMenuActionClick,
onOpenSettings = onOpenSettings,
scrollBehavior = scrollBehavior,
displayMenuItems = state.displayActions,
@ -142,9 +142,9 @@ private fun RoomListScaffold(
contentState = state.contentState,
filtersState = state.filtersState,
eventSink = state.eventSink,
onConfirmRecoveryKeyClicked = onConfirmRecoveryKeyClicked,
onRoomClicked = ::onRoomClicked,
onCreateRoomClicked = onCreateRoomClicked,
onConfirmRecoveryKeyClick = onConfirmRecoveryKeyClick,
onRoomClick = ::onRoomClick,
onCreateRoomClick = onCreateRoomClick,
modifier = Modifier
.padding(padding)
.consumeWindowInsets(padding)
@ -155,7 +155,7 @@ private fun RoomListScaffold(
FloatingActionButton(
// FIXME align on Design system theme
containerColor = MaterialTheme.colorScheme.primary,
onClick = onCreateRoomClicked
onClick = onCreateRoomClick
) {
Icon(
// Note cannot use Icons.Outlined.EditSquare, it does not exist :/
@ -176,13 +176,13 @@ internal fun RoomListRoomSummary.contentType() = displayType.ordinal
internal fun RoomListViewPreview(@PreviewParameter(RoomListStateProvider::class) state: RoomListState) = ElementPreview {
RoomListView(
state = state,
onRoomClicked = {},
onSettingsClicked = {},
onConfirmRecoveryKeyClicked = {},
onCreateRoomClicked = {},
onRoomSettingsClicked = {},
onMenuActionClicked = {},
onRoomDirectorySearchClicked = {},
onRoomClick = {},
onSettingsClick = {},
onConfirmRecoveryKeyClick = {},
onCreateRoomClick = {},
onRoomSettingsClick = {},
onMenuActionClick = {},
onRoomDirectorySearchClick = {},
acceptDeclineInviteView = {},
)
}

12
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/ConfirmRecoveryKeyBanner.kt
View file

@ -26,16 +26,16 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
@Composable
internal fun ConfirmRecoveryKeyBanner(
onContinueClicked: () -> Unit,
onDismissClicked: () -> Unit,
onContinueClick: () -> Unit,
onDismissClick: () -> Unit,
modifier: Modifier = Modifier,
) {
DialogLikeBannerMolecule(
modifier = modifier,
title = stringResource(R.string.confirm_recovery_key_banner_title),
content = stringResource(R.string.confirm_recovery_key_banner_message),
onSubmitClicked = onContinueClicked,
onDismissClicked = onDismissClicked,
onSubmitClick = onContinueClick,
onDismissClick = onDismissClick,
)
}
@ -43,7 +43,7 @@ internal fun ConfirmRecoveryKeyBanner(
@Composable
internal fun ConfirmRecoveryKeyBannerPreview() = ElementPreview {
ConfirmRecoveryKeyBanner(
onContinueClicked = {},
onDismissClicked = {},
onContinueClick = {},
onDismissClick = {},
)
}

40
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListContentView.kt
View file

@ -71,9 +71,9 @@ fun RoomListContentView(
contentState: RoomListContentState,
filtersState: RoomListFiltersState,
eventSink: (RoomListEvents) -> Unit,
onConfirmRecoveryKeyClicked: () -> Unit,
onRoomClicked: (RoomListRoomSummary) -> Unit,
onCreateRoomClicked: () -> Unit,
onConfirmRecoveryKeyClick: () -> Unit,
onRoomClick: (RoomListRoomSummary) -> Unit,
onCreateRoomClick: () -> Unit,
modifier: Modifier = Modifier,
) {
Box(modifier = modifier) {
@ -88,7 +88,7 @@ fun RoomListContentView(
}
is RoomListContentState.Empty -> {
EmptyView(
onCreateRoomClicked = onCreateRoomClicked,
onCreateRoomClick = onCreateRoomClick,
)
}
is RoomListContentState.Rooms -> {
@ -96,8 +96,8 @@ fun RoomListContentView(
state = contentState,
filtersState = filtersState,
eventSink = eventSink,
onConfirmRecoveryKeyClicked = onConfirmRecoveryKeyClicked,
onRoomClicked = onRoomClicked,
onConfirmRecoveryKeyClick = onConfirmRecoveryKeyClick,
onRoomClick = onRoomClick,
)
}
}
@ -120,7 +120,7 @@ private fun SkeletonView(count: Int, modifier: Modifier = Modifier) {
@Composable
private fun EmptyView(
onCreateRoomClicked: () -> Unit,
onCreateRoomClick: () -> Unit,
modifier: Modifier = Modifier
) {
EmptyScaffold(
@ -130,7 +130,7 @@ private fun EmptyView(
Button(
text = stringResource(CommonStrings.action_start_chat),
leadingIcon = IconSource.Vector(CompoundIcons.Compose()),
onClick = onCreateRoomClicked,
onClick = onCreateRoomClick,
)
},
modifier = modifier.fillMaxSize(),
@ -142,8 +142,8 @@ private fun RoomsView(
state: RoomListContentState.Rooms,
filtersState: RoomListFiltersState,
eventSink: (RoomListEvents) -> Unit,
onConfirmRecoveryKeyClicked: () -> Unit,
onRoomClicked: (RoomListRoomSummary) -> Unit,
onConfirmRecoveryKeyClick: () -> Unit,
onRoomClick: (RoomListRoomSummary) -> Unit,
modifier: Modifier = Modifier,
) {
if (state.summaries.isEmpty() && filtersState.hasAnyFilterSelected) {
@ -155,8 +155,8 @@ private fun RoomsView(
RoomsViewList(
state = state,
eventSink = eventSink,
onConfirmRecoveryKeyClicked = onConfirmRecoveryKeyClicked,
onRoomClicked = onRoomClicked,
onConfirmRecoveryKeyClick = onConfirmRecoveryKeyClick,
onRoomClick = onRoomClick,
modifier = modifier.fillMaxSize(),
)
}
@ -166,8 +166,8 @@ private fun RoomsView(
private fun RoomsViewList(
state: RoomListContentState.Rooms,
eventSink: (RoomListEvents) -> Unit,
onConfirmRecoveryKeyClicked: () -> Unit,
onRoomClicked: (RoomListRoomSummary) -> Unit,
onConfirmRecoveryKeyClick: () -> Unit,
onRoomClick: (RoomListRoomSummary) -> Unit,
modifier: Modifier = Modifier,
) {
val lazyListState = rememberLazyListState()
@ -197,8 +197,8 @@ private fun RoomsViewList(
SecurityBannerState.RecoveryKeyConfirmation -> {
item {
ConfirmRecoveryKeyBanner(
onContinueClicked = onConfirmRecoveryKeyClicked,
onDismissClicked = { eventSink(RoomListEvents.DismissRecoveryKeyPrompt) }
onContinueClick = onConfirmRecoveryKeyClick,
onDismissClick = { eventSink(RoomListEvents.DismissRecoveryKeyPrompt) }
)
}
}
@ -213,7 +213,7 @@ private fun RoomsViewList(
) { index, room ->
RoomSummaryRow(
room = room,
onClick = onRoomClicked,
onClick = onRoomClick,
eventSink = eventSink,
)
if (index != state.summaries.lastIndex) {
@ -275,8 +275,8 @@ internal fun RoomListContentViewPreview(@PreviewParameter(RoomListContentStatePr
filterSelectionStates = RoomListFilter.entries.map { FilterSelectionState(it, isSelected = true) }
),
eventSink = {},
onConfirmRecoveryKeyClicked = {},
onRoomClicked = {},
onCreateRoomClicked = {},
onConfirmRecoveryKeyClick = {},
onRoomClick = {},
onCreateRoomClick = {},
)
}

24
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListTopBar.kt
View file

@ -88,7 +88,7 @@ fun RoomListTopBar(
showAvatarIndicator: Boolean,
areSearchResultsDisplayed: Boolean,
onToggleSearch: () -> Unit,
onMenuActionClicked: (RoomListMenuAction) -> Unit,
onMenuActionClick: (RoomListMenuAction) -> Unit,
onOpenSettings: () -> Unit,
scrollBehavior: TopAppBarScrollBehavior,
displayMenuItems: Boolean,
@ -101,8 +101,8 @@ fun RoomListTopBar(
showAvatarIndicator = showAvatarIndicator,
areSearchResultsDisplayed = areSearchResultsDisplayed,
onOpenSettings = onOpenSettings,
onSearchClicked = onToggleSearch,
onMenuActionClicked = onMenuActionClicked,
onSearchClick = onToggleSearch,
onMenuActionClick = onMenuActionClick,
scrollBehavior = scrollBehavior,
displayMenuItems = displayMenuItems,
displayFilters = displayFilters,
@ -119,8 +119,8 @@ private fun DefaultRoomListTopBar(
areSearchResultsDisplayed: Boolean,
scrollBehavior: TopAppBarScrollBehavior,
onOpenSettings: () -> Unit,
onSearchClicked: () -> Unit,
onMenuActionClicked: (RoomListMenuAction) -> Unit,
onSearchClick: () -> Unit,
onMenuActionClick: (RoomListMenuAction) -> Unit,
displayMenuItems: Boolean,
displayFilters: Boolean,
filtersState: RoomListFiltersState,
@ -211,7 +211,7 @@ private fun DefaultRoomListTopBar(
actions = {
if (displayMenuItems) {
IconButton(
onClick = onSearchClicked,
onClick = onSearchClick,
) {
Icon(
imageVector = CompoundIcons.Search(),
@ -236,7 +236,7 @@ private fun DefaultRoomListTopBar(
DropdownMenuItem(
onClick = {
showMenu = false
onMenuActionClicked(RoomListMenuAction.InviteFriends)
onMenuActionClick(RoomListMenuAction.InviteFriends)
},
text = { Text(stringResource(id = CommonStrings.action_invite)) },
leadingIcon = {
@ -252,7 +252,7 @@ private fun DefaultRoomListTopBar(
DropdownMenuItem(
onClick = {
showMenu = false
onMenuActionClicked(RoomListMenuAction.ReportBug)
onMenuActionClick(RoomListMenuAction.ReportBug)
},
text = { Text(stringResource(id = CommonStrings.common_report_a_problem)) },
leadingIcon = {
@ -324,11 +324,11 @@ internal fun DefaultRoomListTopBarPreview() = ElementPreview {
areSearchResultsDisplayed = false,
scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(rememberTopAppBarState()),
onOpenSettings = {},
onSearchClicked = {},
onSearchClick = {},
displayMenuItems = true,
displayFilters = true,
filtersState = aRoomListFiltersState(),
onMenuActionClicked = {},
onMenuActionClick = {},
)
}
@ -342,10 +342,10 @@ internal fun DefaultRoomListTopBarWithIndicatorPreview() = ElementPreview {
areSearchResultsDisplayed = false,
scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(rememberTopAppBarState()),
onOpenSettings = {},
onSearchClicked = {},
onSearchClick = {},
displayMenuItems = true,
displayFilters = true,
filtersState = aRoomListFiltersState(),
onMenuActionClicked = {},
onMenuActionClick = {},
)
}

12
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt
View file

@ -105,10 +105,10 @@ internal fun RoomSummaryRow(
}
Spacer(modifier = Modifier.height(12.dp))
InviteButtonsRow(
onAcceptClicked = {
onAcceptClick = {
eventSink(RoomListEvents.AcceptInvite(room))
},
onDeclineClicked = {
onDeclineClick = {
eventSink(RoomListEvents.DeclineInvite(room))
}
)
@ -299,8 +299,8 @@ private fun InviteNameAndIndicatorRow(
@Composable
private fun InviteButtonsRow(
onAcceptClicked: () -> Unit,
onDeclineClicked: () -> Unit,
onAcceptClick: () -> Unit,
onDeclineClick: () -> Unit,
modifier: Modifier = Modifier
) {
Row(
@ -309,13 +309,13 @@ private fun InviteButtonsRow(
) {
OutlinedButton(
text = stringResource(CommonStrings.action_decline),
onClick = onDeclineClicked,
onClick = onDeclineClick,
size = ButtonSize.Medium,
modifier = Modifier.weight(1f),
)
Button(
text = stringResource(CommonStrings.action_accept),
onClick = onAcceptClicked,
onClick = onAcceptClick,
size = ButtonSize.Medium,
modifier = Modifier.weight(1f),
)

4
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersView.kt
View file

@ -58,7 +58,7 @@ fun RoomListFiltersView(
state: RoomListFiltersState,
modifier: Modifier = Modifier
) {
fun onClearFiltersClicked() {
fun onClearFiltersClick() {
state.eventSink(RoomListFiltersEvents.ClearSelectedFilters)
}
@ -83,7 +83,7 @@ fun RoomListFiltersView(
.testTag(TestTags.homeScreenClearFilters),
onClick = {
previousFilters.value = state.selectedFilters()
onClearFiltersClicked()
onClearFiltersClick()
}
)
}

28
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchView.kt
View file

@ -72,8 +72,8 @@ import io.element.android.libraries.ui.strings.CommonStrings
internal fun RoomListSearchView(
state: RoomListSearchState,
eventSink: (RoomListEvents) -> Unit,
onRoomClicked: (RoomId) -> Unit,
onRoomDirectorySearchClicked: () -> Unit,
onRoomClick: (RoomId) -> Unit,
onRoomDirectorySearchClick: () -> Unit,
modifier: Modifier = Modifier,
) {
BackHandler(enabled = state.isSearchActive) {
@ -98,9 +98,9 @@ internal fun RoomListSearchView(
if (state.isSearchActive) {
RoomListSearchContent(
state = state,
onRoomClicked = onRoomClicked,
onRoomClick = onRoomClick,
eventSink = eventSink,
onRoomDirectorySearchClicked = onRoomDirectorySearchClicked,
onRoomDirectorySearchClick = onRoomDirectorySearchClick,
)
}
}
@ -112,17 +112,17 @@ internal fun RoomListSearchView(
private fun RoomListSearchContent(
state: RoomListSearchState,
eventSink: (RoomListEvents) -> Unit,
onRoomClicked: (RoomId) -> Unit,
onRoomDirectorySearchClicked: () -> Unit,
onRoomClick: (RoomId) -> Unit,
onRoomDirectorySearchClick: () -> Unit,
) {
val borderColor = MaterialTheme.colorScheme.tertiary
val strokeWidth = 1.dp
fun onBackButtonPressed() {
fun onBackButtonClick() {
state.eventSink(RoomListSearchEvents.ToggleSearchVisibility)
}
fun onRoomClicked(room: RoomListRoomSummary) {
onRoomClicked(room.roomId)
fun onRoomClick(room: RoomListRoomSummary) {
onRoomClick(room.roomId)
}
Scaffold(
topBar = {
@ -135,7 +135,7 @@ private fun RoomListSearchContent(
strokeWidth = strokeWidth.value
)
},
navigationIcon = { BackButton(onClick = ::onBackButtonPressed) },
navigationIcon = { BackButton(onClick = ::onBackButtonClick) },
title = {
val filter = state.query
val focusRequester = FocusRequester()
@ -189,7 +189,7 @@ private fun RoomListSearchContent(
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 24.dp, horizontal = 16.dp),
onClick = onRoomDirectorySearchClicked
onClick = onRoomDirectorySearchClick
)
}
LazyColumn(
@ -201,7 +201,7 @@ private fun RoomListSearchContent(
) { room ->
RoomSummaryRow(
room = room,
onClick = ::onRoomClicked,
onClick = ::onRoomClick,
eventSink = eventSink,
)
}
@ -240,8 +240,8 @@ private fun RoomDirectorySearchButton(
internal fun RoomListSearchContentPreview(@PreviewParameter(RoomListSearchStateProvider::class) state: RoomListSearchState) = ElementPreview {
RoomListSearchContent(
state = state,
onRoomClicked = {},
onRoomClick = {},
eventSink = {},
onRoomDirectorySearchClicked = {},
onRoomDirectorySearchClick = {},
)
}

12
features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenuTest.kt
View file

@ -41,7 +41,7 @@ class RoomListContextMenuTest {
RoomListContextMenu(
contextMenu = contextMenu,
eventSink = eventsRecorder,
onRoomSettingsClicked = EnsureNeverCalledWithParam(),
onRoomSettingsClick = EnsureNeverCalledWithParam(),
)
}
rule.clickOn(R.string.screen_roomlist_mark_as_read)
@ -61,7 +61,7 @@ class RoomListContextMenuTest {
RoomListContextMenu(
contextMenu = contextMenu,
eventSink = eventsRecorder,
onRoomSettingsClicked = EnsureNeverCalledWithParam(),
onRoomSettingsClick = EnsureNeverCalledWithParam(),
)
}
rule.clickOn(R.string.screen_roomlist_mark_as_unread)
@ -81,7 +81,7 @@ class RoomListContextMenuTest {
RoomListContextMenu(
contextMenu = contextMenu,
eventSink = eventsRecorder,
onRoomSettingsClicked = EnsureNeverCalledWithParam(),
onRoomSettingsClick = EnsureNeverCalledWithParam(),
)
}
rule.clickOn(CommonStrings.action_leave_conversation)
@ -101,7 +101,7 @@ class RoomListContextMenuTest {
RoomListContextMenu(
contextMenu = contextMenu,
eventSink = eventsRecorder,
onRoomSettingsClicked = EnsureNeverCalledWithParam(),
onRoomSettingsClick = EnsureNeverCalledWithParam(),
)
}
rule.clickOn(CommonStrings.action_leave_room)
@ -122,7 +122,7 @@ class RoomListContextMenuTest {
RoomListContextMenu(
contextMenu = contextMenu,
eventSink = eventsRecorder,
onRoomSettingsClicked = callback,
onRoomSettingsClick = callback,
)
}
rule.clickOn(CommonStrings.common_settings)
@ -139,7 +139,7 @@ class RoomListContextMenuTest {
RoomListContextMenu(
contextMenu = contextMenu,
eventSink = eventsRecorder,
onRoomSettingsClicked = callback,
onRoomSettingsClick = callback,
)
}
rule.clickOn(CommonStrings.common_favourite)

36
features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListViewTest.kt
View file

@ -67,7 +67,7 @@ class RoomListViewTest {
contentState = aRoomsContentState(securityBannerState = SecurityBannerState.RecoveryKeyConfirmation),
eventSink = eventsRecorder,
),
onConfirmRecoveryKeyClicked = callback,
onConfirmRecoveryKeyClick = callback,
)
rule.clickOn(CommonStrings.action_continue)
}
@ -82,7 +82,7 @@ class RoomListViewTest {
eventSink = eventsRecorder,
contentState = anEmptyContentState(),
),
onCreateRoomClicked = callback,
onCreateRoomClick = callback,
)
rule.clickOn(CommonStrings.action_start_chat)
}
@ -100,7 +100,7 @@ class RoomListViewTest {
ensureCalledOnceWithParam(room0.roomId) { callback ->
rule.setRoomListView(
state = state,
onRoomClicked = callback,
onRoomClick = callback,
)
rule.onNodeWithText(room0.lastMessage!!.toString()).performClick()
}
@ -133,7 +133,7 @@ class RoomListViewTest {
ensureCalledOnceWithParam(room0) { callback ->
rule.setRoomListView(
state = state,
onRoomSettingsClicked = callback,
onRoomSettingsClick = callback,
)
rule.clickOn(CommonStrings.common_settings)
}
@ -160,24 +160,24 @@ class RoomListViewTest {
private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomListView(
state: RoomListState,
onRoomClicked: (RoomId) -> Unit = EnsureNeverCalledWithParam(),
onSettingsClicked: () -> Unit = EnsureNeverCalled(),
onConfirmRecoveryKeyClicked: () -> Unit = EnsureNeverCalled(),
onCreateRoomClicked: () -> Unit = EnsureNeverCalled(),
onRoomSettingsClicked: (RoomId) -> Unit = EnsureNeverCalledWithParam(),
onMenuActionClicked: (RoomListMenuAction) -> Unit = EnsureNeverCalledWithParam(),
onRoomDirectorySearchClicked: () -> Unit = EnsureNeverCalled(),
onRoomClick: (RoomId) -> Unit = EnsureNeverCalledWithParam(),
onSettingsClick: () -> Unit = EnsureNeverCalled(),
onConfirmRecoveryKeyClick: () -> Unit = EnsureNeverCalled(),
onCreateRoomClick: () -> Unit = EnsureNeverCalled(),
onRoomSettingsClick: (RoomId) -> Unit = EnsureNeverCalledWithParam(),
onMenuActionClick: (RoomListMenuAction) -> Unit = EnsureNeverCalledWithParam(),
onRoomDirectorySearchClick: () -> Unit = EnsureNeverCalled(),
) {
setContent {
RoomListView(
state = state,
onRoomClicked = onRoomClicked,
onSettingsClicked = onSettingsClicked,
onConfirmRecoveryKeyClicked = onConfirmRecoveryKeyClicked,
onCreateRoomClicked = onCreateRoomClicked,
onRoomSettingsClicked = onRoomSettingsClicked,
onMenuActionClicked = onMenuActionClicked,
onRoomDirectorySearchClicked = onRoomDirectorySearchClicked,
onRoomClick = onRoomClick,
onSettingsClick = onSettingsClick,
onConfirmRecoveryKeyClick = onConfirmRecoveryKeyClick,
onCreateRoomClick = onCreateRoomClick,
onRoomSettingsClick = onRoomSettingsClick,
onMenuActionClick = onMenuActionClick,
onRoomDirectorySearchClick = onRoomDirectorySearchClick,
acceptDeclineInviteView = { },
)
}

10
features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchViewTest.kt
View file

@ -47,7 +47,7 @@ class RoomListSearchViewTest {
isRoomDirectorySearchEnabled = true,
eventSink = eventsRecorder,
),
onRoomDirectorySearchClicked = it,
onRoomDirectorySearchClick = it,
)
rule.clickOn(R.string.screen_roomlist_room_directory_button_title)
}
@ -57,15 +57,15 @@ class RoomListSearchViewTest {
private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomListSearchView(
state: RoomListSearchState,
eventSink: (RoomListEvents) -> Unit = EventsRecorder(expectEvents = false),
onRoomClicked: (RoomId) -> Unit = EnsureNeverCalledWithParam(),
onRoomDirectorySearchClicked: () -> Unit = EnsureNeverCalled(),
onRoomClick: (RoomId) -> Unit = EnsureNeverCalledWithParam(),
onRoomDirectorySearchClick: () -> Unit = EnsureNeverCalled(),
) {
setContent {
RoomListSearchView(
state = state,
eventSink = eventSink,
onRoomClicked = onRoomClicked,
onRoomDirectorySearchClicked = onRoomDirectorySearchClicked,
onRoomClick = onRoomClick,
onRoomDirectorySearchClick = onRoomDirectorySearchClick,
)
}
}