mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-02 12:07:28 +00:00
Lambda parameters in a composable function should be in present tense, not past tense.
https://mrmans0n.github.io/compose-rules/rules/#naming-parameters-properly
This commit is contained in:
+4
-4
@@ -41,7 +41,7 @@ class ViewFileNode @AssistedInject constructor(
|
||||
) : NodeInputs
|
||||
|
||||
interface Callback : Plugin {
|
||||
fun onBackPressed()
|
||||
fun onBackClick()
|
||||
}
|
||||
|
||||
private val inputs: Inputs = inputs()
|
||||
@@ -51,8 +51,8 @@ class ViewFileNode @AssistedInject constructor(
|
||||
name = inputs.name,
|
||||
)
|
||||
|
||||
private fun onBackPressed() {
|
||||
plugins<Callback>().forEach { it.onBackPressed() }
|
||||
private fun onBackClick() {
|
||||
plugins<Callback>().forEach { it.onBackClick() }
|
||||
}
|
||||
|
||||
@Composable
|
||||
@@ -61,7 +61,7 @@ class ViewFileNode @AssistedInject constructor(
|
||||
ViewFileView(
|
||||
state = state,
|
||||
modifier = modifier,
|
||||
onBackPressed = ::onBackPressed,
|
||||
onBackClick = ::onBackClick,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
+3
-3
@@ -62,7 +62,7 @@ import kotlinx.collections.immutable.toImmutableList
|
||||
@Composable
|
||||
fun ViewFileView(
|
||||
state: ViewFileState,
|
||||
onBackPressed: () -> Unit,
|
||||
onBackClick: () -> Unit,
|
||||
modifier: Modifier = Modifier,
|
||||
) {
|
||||
Scaffold(
|
||||
@@ -70,7 +70,7 @@ fun ViewFileView(
|
||||
topBar = {
|
||||
TopAppBar(
|
||||
navigationIcon = {
|
||||
BackButton(onClick = onBackPressed)
|
||||
BackButton(onClick = onBackClick)
|
||||
},
|
||||
title = {
|
||||
Text(
|
||||
@@ -247,6 +247,6 @@ private val colorError = Color(0xFFFF6B68)
|
||||
internal fun ViewFileViewPreview(@PreviewParameter(ViewFileStateProvider::class) state: ViewFileState) = ElementPreview {
|
||||
ViewFileView(
|
||||
state = state,
|
||||
onBackPressed = {},
|
||||
onBackClick = {},
|
||||
)
|
||||
}
|
||||
|
||||
+4
-4
@@ -42,7 +42,7 @@ class ViewFolderNode @AssistedInject constructor(
|
||||
) : NodeInputs
|
||||
|
||||
interface Callback : Plugin {
|
||||
fun onBackPressed()
|
||||
fun onBackClick()
|
||||
fun onNavigateTo(item: Item)
|
||||
}
|
||||
|
||||
@@ -53,8 +53,8 @@ class ViewFolderNode @AssistedInject constructor(
|
||||
path = inputs.path,
|
||||
)
|
||||
|
||||
private fun onBackPressed() {
|
||||
plugins<Callback>().forEach { it.onBackPressed() }
|
||||
private fun onBackClick() {
|
||||
plugins<Callback>().forEach { it.onBackClick() }
|
||||
}
|
||||
|
||||
private fun onNavigateTo(item: Item) {
|
||||
@@ -68,7 +68,7 @@ class ViewFolderNode @AssistedInject constructor(
|
||||
state = state,
|
||||
modifier = modifier,
|
||||
onNavigateTo = ::onNavigateTo,
|
||||
onBackPressed = ::onBackPressed,
|
||||
onBackClick = ::onBackClick,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
+8
-8
@@ -53,7 +53,7 @@ import io.element.android.libraries.designsystem.theme.components.TopAppBar
|
||||
fun ViewFolderView(
|
||||
state: ViewFolderState,
|
||||
onNavigateTo: (Item) -> Unit,
|
||||
onBackPressed: () -> Unit,
|
||||
onBackClick: () -> Unit,
|
||||
modifier: Modifier = Modifier,
|
||||
) {
|
||||
Scaffold(
|
||||
@@ -61,7 +61,7 @@ fun ViewFolderView(
|
||||
topBar = {
|
||||
TopAppBar(
|
||||
navigationIcon = {
|
||||
BackButton(onClick = onBackPressed)
|
||||
BackButton(onClick = onBackClick)
|
||||
},
|
||||
title = {
|
||||
Text(
|
||||
@@ -85,7 +85,7 @@ fun ViewFolderView(
|
||||
) { item ->
|
||||
ItemRow(
|
||||
item = item,
|
||||
onItemClicked = { onNavigateTo(item) },
|
||||
onItemClick = { onNavigateTo(item) },
|
||||
)
|
||||
}
|
||||
if (state.content.none { it !is Item.Parent }) {
|
||||
@@ -108,7 +108,7 @@ fun ViewFolderView(
|
||||
@Composable
|
||||
private fun ItemRow(
|
||||
item: Item,
|
||||
onItemClicked: () -> Unit,
|
||||
onItemClick: () -> Unit,
|
||||
) {
|
||||
when (item) {
|
||||
Item.Parent -> {
|
||||
@@ -121,7 +121,7 @@ private fun ItemRow(
|
||||
style = ElementTheme.typography.fontBodyMdMedium,
|
||||
)
|
||||
},
|
||||
onClick = onItemClicked,
|
||||
onClick = onItemClick,
|
||||
)
|
||||
}
|
||||
is Item.Folder -> {
|
||||
@@ -134,7 +134,7 @@ private fun ItemRow(
|
||||
style = ElementTheme.typography.fontBodyMdMedium,
|
||||
)
|
||||
},
|
||||
onClick = onItemClicked,
|
||||
onClick = onItemClick,
|
||||
)
|
||||
}
|
||||
is Item.File -> {
|
||||
@@ -148,7 +148,7 @@ private fun ItemRow(
|
||||
)
|
||||
},
|
||||
trailingContent = ListItemContent.Text(item.formattedSize),
|
||||
onClick = onItemClicked,
|
||||
onClick = onItemClick,
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -160,6 +160,6 @@ internal fun ViewFolderViewPreview(@PreviewParameter(ViewFolderStateProvider::cl
|
||||
ViewFolderView(
|
||||
state = state,
|
||||
onNavigateTo = {},
|
||||
onBackPressed = {},
|
||||
onBackClick = {},
|
||||
)
|
||||
}
|
||||
|
||||
+2
-2
@@ -97,7 +97,7 @@ class ViewFolderRootNode @AssistedInject constructor(
|
||||
}
|
||||
is NavTarget.File -> {
|
||||
val callback: ViewFileNode.Callback = object : ViewFileNode.Callback {
|
||||
override fun onBackPressed() {
|
||||
override fun onBackClick() {
|
||||
backstack.pop()
|
||||
}
|
||||
}
|
||||
@@ -115,7 +115,7 @@ class ViewFolderRootNode @AssistedInject constructor(
|
||||
inputs: ViewFolderNode.Inputs,
|
||||
): Node {
|
||||
val callback: ViewFolderNode.Callback = object : ViewFolderNode.Callback {
|
||||
override fun onBackPressed() {
|
||||
override fun onBackClick() {
|
||||
onDone()
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user