Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 8 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

30
features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentView.kt
View file

@ -52,7 +52,7 @@ import kotlinx.collections.immutable.ImmutableList
@Composable
fun PollContentView(
state: PollContentState,
onAnswerSelected: (pollStartId: EventId, answerId: String) -> Unit,
onSelectAnswer: (pollStartId: EventId, answerId: String) -> Unit,
onPollEdit: (pollStartId: EventId) -> Unit,
onPollEnd: (pollStartId: EventId) -> Unit,
modifier: Modifier = Modifier,
@ -66,7 +66,7 @@ fun PollContentView(
isPollEnded = state.isPollEnded,
isMine = state.isMine,
onPollEdit = onPollEdit,
onAnswerSelected = onAnswerSelected,
onSelectAnswer = onSelectAnswer,
onPollEnd = onPollEnd,
modifier = modifier,
)
@ -81,15 +81,15 @@ fun PollContentView(
isPollEditable: Boolean,
isPollEnded: Boolean,
isMine: Boolean,
onAnswerSelected: (pollStartId: EventId, answerId: String) -> Unit,
onSelectAnswer: (pollStartId: EventId, answerId: String) -> Unit,
onPollEdit: (pollStartId: EventId) -> Unit,
onPollEnd: (pollStartId: EventId) -> Unit,
modifier: Modifier = Modifier,
) {
val votesCount = remember(answerItems) { answerItems.sumOf { it.votesCount } }
fun onAnswerSelected(pollAnswer: PollAnswer) {
eventId?.let { onAnswerSelected(it, pollAnswer.id) }
fun onSelectAnswer(pollAnswer: PollAnswer) {
eventId?.let { onSelectAnswer(it, pollAnswer.id) }
}
fun onPollEdit() {
@ -105,7 +105,7 @@ fun PollContentView(
if (showConfirmation) {
ConfirmationDialog(
content = stringResource(id = CommonStrings.common_poll_end_confirmation),
onSubmitClicked = {
onSubmitClick = {
onPollEnd()
showConfirmation = false
},
@ -119,7 +119,7 @@ fun PollContentView(
) {
PollTitle(title = question, isPollEnded = isPollEnded)
PollAnswers(answerItems = answerItems, onAnswerSelected = ::onAnswerSelected)
PollAnswers(answerItems = answerItems, onSelectAnswer = ::onSelectAnswer)
if (isPollEnded || pollKind == PollKind.Disclosed) {
DisclosedPollBottomNotice(votesCount = votesCount)
@ -170,7 +170,7 @@ private fun PollTitle(
@Composable
private fun PollAnswers(
answerItems: ImmutableList<PollAnswerItem>,
onAnswerSelected: (PollAnswer) -> Unit,
onSelectAnswer: (PollAnswer) -> Unit,
) {
Column(
modifier = Modifier.selectableGroup(),
@ -183,7 +183,7 @@ private fun PollAnswers(
.selectable(
selected = it.isSelected,
enabled = it.isEnabled,
onClick = { onAnswerSelected(it.answer) },
onClick = { onSelectAnswer(it.answer) },
role = Role.RadioButton,
),
)
@ -250,7 +250,7 @@ internal fun PollContentViewUndisclosedPreview() = ElementPreview {
isPollEnded = false,
isPollEditable = false,
isMine = false,
onAnswerSelected = { _, _ -> },
onSelectAnswer = { _, _ -> },
onPollEdit = {},
onPollEnd = {},
)
@ -267,7 +267,7 @@ internal fun PollContentViewDisclosedPreview() = ElementPreview {
isPollEnded = false,
isPollEditable = false,
isMine = false,
onAnswerSelected = { _, _ -> },
onSelectAnswer = { _, _ -> },
onPollEdit = {},
onPollEnd = {},
)
@ -284,7 +284,7 @@ internal fun PollContentViewEndedPreview() = ElementPreview {
isPollEnded = true,
isPollEditable = false,
isMine = false,
onAnswerSelected = { _, _ -> },
onSelectAnswer = { _, _ -> },
onPollEdit = {},
onPollEnd = {},
)
@ -301,7 +301,7 @@ internal fun PollContentViewCreatorEditablePreview() = ElementPreview {
isPollEnded = false,
isPollEditable = true,
isMine = true,
onAnswerSelected = { _, _ -> },
onSelectAnswer = { _, _ -> },
onPollEdit = {},
onPollEnd = {},
)
@ -318,7 +318,7 @@ internal fun PollContentViewCreatorPreview() = ElementPreview {
isPollEnded = false,
isPollEditable = false,
isMine = true,
onAnswerSelected = { _, _ -> },
onSelectAnswer = { _, _ -> },
onPollEdit = {},
onPollEnd = {},
)
@ -335,7 +335,7 @@ internal fun PollContentViewCreatorEndedPreview() = ElementPreview {
isPollEnded = true,
isPollEditable = false,
isMine = true,
onAnswerSelected = { _, _ -> },
onSelectAnswer = { _, _ -> },
onPollEdit = {},
onPollEnd = {},
)

10
features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollView.kt
View file

@ -79,7 +79,7 @@ fun CreatePollView(
if (state.showBackConfirmation) {
ConfirmationDialog(
content = stringResource(id = R.string.screen_create_poll_cancel_confirmation_content_android),
onSubmitClicked = { state.eventSink(CreatePollEvents.NavBack) },
onSubmitClick = { state.eventSink(CreatePollEvents.NavBack) },
onDismiss = { state.eventSink(CreatePollEvents.HideConfirmation) }
)
}
@ -87,7 +87,7 @@ fun CreatePollView(
ConfirmationDialog(
title = stringResource(id = R.string.screen_edit_poll_delete_confirmation_title),
content = stringResource(id = R.string.screen_edit_poll_delete_confirmation),
onSubmitClicked = { state.eventSink(CreatePollEvents.Delete(confirmed = true)) },
onSubmitClick = { state.eventSink(CreatePollEvents.Delete(confirmed = true)) },
onDismiss = { state.eventSink(CreatePollEvents.HideConfirmation) }
)
}
@ -103,7 +103,7 @@ fun CreatePollView(
mode = state.mode,
saveEnabled = state.canSave,
onBackPress = navBack,
onSaveClicked = { state.eventSink(CreatePollEvents.Save) }
onSaveClick = { state.eventSink(CreatePollEvents.Save) }
)
},
) { paddingValues ->
@ -220,7 +220,7 @@ private fun CreatePollTopAppBar(
mode: CreatePollState.Mode,
saveEnabled: Boolean,
onBackPress: () -> Unit = {},
onSaveClicked: () -> Unit = {},
onSaveClick: () -> Unit = {},
) {
TopAppBar(
title = {
@ -241,7 +241,7 @@ private fun CreatePollTopAppBar(
CreatePollState.Mode.New -> stringResource(id = CommonStrings.action_create)
CreatePollState.Mode.Edit -> stringResource(id = CommonStrings.action_done)
},
onClick = onSaveClicked,
onClick = onSaveClick,
enabled = saveEnabled,
)
}

18
features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryView.kt
View file

@ -74,7 +74,7 @@ fun PollHistoryView(
state.eventSink(PollHistoryEvents.LoadMore)
}
fun onAnswerSelected(pollStartId: EventId, answerId: String) {
fun onSelectAnswer(pollStartId: EventId, answerId: String) {
state.eventSink(PollHistoryEvents.PollAnswerSelected(pollStartId, answerId))
}
@ -111,7 +111,7 @@ fun PollHistoryView(
}
PollHistoryFilterButtons(
activeFilter = state.activeFilter,
onFilterSelected = { state.eventSink(PollHistoryEvents.OnFilterSelected(it)) },
onSelectFilter = { state.eventSink(PollHistoryEvents.OnFilterSelected(it)) },
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp, vertical = 8.dp),
@ -128,7 +128,7 @@ fun PollHistoryView(
pollHistoryItems = pollHistoryItems,
hasMoreToLoad = state.hasMoreToLoad,
isLoading = state.isLoading,
onAnswerSelected = ::onAnswerSelected,
onSelectAnswer = ::onSelectAnswer,
onPollEdit = onEditPoll,
onPollEnd = ::onPollEnd,
onLoadMore = ::onLoadMore,
@ -143,7 +143,7 @@ fun PollHistoryView(
@Composable
private fun PollHistoryFilterButtons(
activeFilter: PollHistoryFilter,
onFilterSelected: (PollHistoryFilter) -> Unit,
onSelectFilter: (PollHistoryFilter) -> Unit,
modifier: Modifier = Modifier,
) {
SingleChoiceSegmentedButtonRow(modifier = modifier) {
@ -152,7 +152,7 @@ private fun PollHistoryFilterButtons(
index = filter.ordinal,
count = PollHistoryFilter.entries.size,
selected = activeFilter == filter,
onClick = { onFilterSelected(filter) },
onClick = { onSelectFilter(filter) },
text = stringResource(filter.stringResource),
)
}
@ -165,7 +165,7 @@ private fun PollHistoryList(
pollHistoryItems: ImmutableList<PollHistoryItem>,
hasMoreToLoad: Boolean,
isLoading: Boolean,
onAnswerSelected: (pollStartId: EventId, answerId: String) -> Unit,
onSelectAnswer: (pollStartId: EventId, answerId: String) -> Unit,
onPollEdit: (pollStartId: EventId) -> Unit,
onPollEnd: (pollStartId: EventId) -> Unit,
onLoadMore: () -> Unit,
@ -180,7 +180,7 @@ private fun PollHistoryList(
items(pollHistoryItems) { pollHistoryItem ->
PollHistoryItemRow(
pollHistoryItem = pollHistoryItem,
onAnswerSelected = onAnswerSelected,
onSelectAnswer = onSelectAnswer,
onPollEdit = onPollEdit,
onPollEnd = onPollEnd,
modifier = Modifier.padding(vertical = 8.dp, horizontal = 16.dp)
@ -232,7 +232,7 @@ private fun LoadMoreButton(isLoading: Boolean, onClick: () -> Unit) {
@Composable
private fun PollHistoryItemRow(
pollHistoryItem: PollHistoryItem,
onAnswerSelected: (pollStartId: EventId, answerId: String) -> Unit,
onSelectAnswer: (pollStartId: EventId, answerId: String) -> Unit,
onPollEdit: (pollStartId: EventId) -> Unit,
onPollEnd: (pollStartId: EventId) -> Unit,
modifier: Modifier = Modifier,
@ -251,7 +251,7 @@ private fun PollHistoryItemRow(
Spacer(modifier = Modifier.height(4.dp))
PollContentView(
state = pollHistoryItem.state,
onAnswerSelected = onAnswerSelected,
onSelectAnswer = onSelectAnswer,
onPollEdit = onPollEdit,
onPollEnd = onPollEnd,
)