Merge pull request #1862 from vector-im/feature/bma/moreTests

Remove lambda default value

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AvatarActionBottomSheet.kt

@@ -52,8 +52,8 @@ import kotlinx.coroutines.launch
 fun AvatarActionBottomSheet(
     actions: ImmutableList<AvatarAction>,
     modalBottomSheetState: ModalBottomSheetState,
+    onActionSelected: (action: AvatarAction) -> Unit,
     modifier: Modifier = Modifier,
-    onActionSelected: (action: AvatarAction) -> Unit = {},
 ) {
     val coroutineScope = rememberCoroutineScope()
     fun onItemActionClicked(itemAction: AvatarAction) {
@@ -119,5 +119,6 @@ internal fun AvatarActionBottomSheetPreview() = ElementPreview {
             initialValue = ModalBottomSheetValue.Expanded,
             density = LocalDensity.current,
         ),
+        onActionSelected = { },
     )
 }

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/CheckableMatrixUserRow.kt

@@ -21,8 +21,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
-import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.matrix.ui.model.getBestName
@@ -31,9 +31,9 @@ import io.element.android.libraries.matrix.ui.model.getBestName
 fun CheckableMatrixUserRow(
     checked: Boolean,
     matrixUser: MatrixUser,
+    onCheckedChange: (Boolean) -> Unit,
     modifier: Modifier = Modifier,
     avatarSize: AvatarSize = AvatarSize.UserListItem,
-    onCheckedChange: (Boolean) -> Unit = {},
     enabled: Boolean = true,
 ) = CheckableUserRow(
     checked = checked,
@@ -49,9 +49,27 @@ fun CheckableMatrixUserRow(
 @Composable
 internal fun CheckableMatrixUserRowPreview(@PreviewParameter(MatrixUserProvider::class) matrixUser: MatrixUser) = ElementPreview {
     Column {
-        CheckableMatrixUserRow(checked = true, matrixUser)
-        CheckableMatrixUserRow(checked = false, matrixUser)
-        CheckableMatrixUserRow(checked = true, matrixUser, enabled = false)
-        CheckableMatrixUserRow(checked = false, matrixUser, enabled = false)
+        CheckableMatrixUserRow(
+            checked = true,
+            onCheckedChange = { },
+            matrixUser = matrixUser,
+        )
+        CheckableMatrixUserRow(
+            checked = false,
+            onCheckedChange = { },
+            matrixUser = matrixUser,
+        )
+        CheckableMatrixUserRow(
+            checked = true,
+            onCheckedChange = { },
+            matrixUser = matrixUser,
+            enabled = false,
+        )
+        CheckableMatrixUserRow(
+            checked = false,
+            onCheckedChange = { },
+            matrixUser = matrixUser,
+            enabled = false,
+        )
     }
 }

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/CheckableUnresolvedUserRow.kt

@@ -37,10 +37,10 @@ import io.element.android.libraries.matrix.ui.model.getAvatarData
 @Composable
 fun CheckableUnresolvedUserRow(
     checked: Boolean,
+    onCheckedChange: (Boolean) -> Unit,
     avatarData: AvatarData,
     id: String,
     modifier: Modifier = Modifier,
-    onCheckedChange: (Boolean) -> Unit = {},
     enabled: Boolean = true,
 ) {
     Row(
@@ -71,12 +71,34 @@ fun CheckableUnresolvedUserRow(
 internal fun CheckableUnresolvedUserRowPreview() = ElementThemedPreview {
     val matrixUser = aMatrixUser()
     Column {
-        CheckableUnresolvedUserRow(false, matrixUser.getAvatarData(AvatarSize.UserListItem), matrixUser.userId.value)
+        CheckableUnresolvedUserRow(
+            checked = false,
+            onCheckedChange = { },
+            avatarData = matrixUser.getAvatarData(AvatarSize.UserListItem),
+            id = matrixUser.userId.value,
+        )
         HorizontalDivider()
-        CheckableUnresolvedUserRow(true, matrixUser.getAvatarData(AvatarSize.UserListItem), matrixUser.userId.value)
+        CheckableUnresolvedUserRow(
+            checked = true,
+            onCheckedChange = { },
+            avatarData = matrixUser.getAvatarData(AvatarSize.UserListItem),
+            id = matrixUser.userId.value,
+        )
         HorizontalDivider()
-        CheckableUnresolvedUserRow(false, matrixUser.getAvatarData(AvatarSize.UserListItem), matrixUser.userId.value, enabled = false)
+        CheckableUnresolvedUserRow(
+            checked = false,
+            onCheckedChange = { },
+            avatarData = matrixUser.getAvatarData(AvatarSize.UserListItem),
+            id = matrixUser.userId.value,
+            enabled = false,
+        )
         HorizontalDivider()
-        CheckableUnresolvedUserRow(true, matrixUser.getAvatarData(AvatarSize.UserListItem), matrixUser.userId.value, enabled = false)
+        CheckableUnresolvedUserRow(
+            checked = true,
+            onCheckedChange = { },
+            avatarData = matrixUser.getAvatarData(AvatarSize.UserListItem),
+            id = matrixUser.userId.value,
+            enabled = false,
+        )
     }
 }

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/CheckableUserRow.kt

@@ -31,11 +31,11 @@ import io.element.android.libraries.designsystem.theme.components.Checkbox
 @Composable
 fun CheckableUserRow(
     checked: Boolean,
+    onCheckedChange: (Boolean) -> Unit,
     avatarData: AvatarData,
     name: String,
     subtext: String?,
     modifier: Modifier = Modifier,
-    onCheckedChange: (Boolean) -> Unit = {},
     enabled: Boolean = true,
 ) {
     Row(

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt

@@ -43,7 +43,7 @@ fun MatrixUserHeader(
     matrixUser: MatrixUser?,
     modifier: Modifier = Modifier,
     // TODO handle click on this item, to let the user be able to update their profile.
-    // onClick: () -> Unit = {},
+    // onClick: () -> Unit,
 ) {
     if (matrixUser == null) {
         MatrixUserHeaderPlaceholder(modifier = modifier)
@@ -60,7 +60,7 @@ fun MatrixUserHeader(
 private fun MatrixUserHeaderContent(
     matrixUser: MatrixUser,
     modifier: Modifier = Modifier,
-    // onClick: () -> Unit = {},
+    // onClick: () -> Unit,
 ) {
     Row(
         modifier = modifier

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt

@@ -50,8 +50,8 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun SelectedRoom(
     roomSummary: RoomSummaryDetails,
+    onRoomRemoved: (RoomSummaryDetails) -> Unit,
     modifier: Modifier = Modifier,
-    onRoomRemoved: (RoomSummaryDetails) -> Unit = {},
 ) {
     Box(
         modifier = modifier
@@ -104,6 +104,7 @@ internal fun SelectedRoomPreview() = ElementPreview {
             lastMessageTimestamp = null,
             unreadNotificationCount = 0,
             inviter = null,
-        )
+        ),
+        onRoomRemoved = {},
     )
 }

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUser.kt

@@ -36,8 +36,8 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import io.element.android.libraries.designsystem.components.avatar.Avatar
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
-import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Surface
 import io.element.android.libraries.designsystem.theme.components.Text
@@ -50,8 +50,8 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun SelectedUser(
     matrixUser: MatrixUser,
+    onUserRemoved: (MatrixUser) -> Unit,
     modifier: Modifier = Modifier,
-    onUserRemoved: (MatrixUser) -> Unit = {},
 ) {
     Box(
         modifier = modifier
@@ -93,5 +93,8 @@ fun SelectedUser(
 @PreviewsDayNight
 @Composable
 internal fun SelectedUserPreview() = ElementPreview {
-    SelectedUser(aMatrixUser())
+    SelectedUser(
+        aMatrixUser(),
+        onUserRemoved = {},
+    )
 }

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUsersList.kt

@@ -37,8 +37,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.Layout
 import androidx.compose.ui.unit.dp
-import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.text.toPx
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import kotlinx.collections.immutable.ImmutableList
@@ -48,10 +48,10 @@ import kotlin.math.floor
 @Composable
 fun SelectedUsersList(
     selectedUsers: ImmutableList<MatrixUser>,
+    onUserRemoved: (MatrixUser) -> Unit,
     modifier: Modifier = Modifier,
     autoScroll: Boolean = false,
     contentPadding: PaddingValues = PaddingValues(0.dp),
-    onUserRemoved: (MatrixUser) -> Unit = {},
 ) {
     val lazyListState = rememberLazyListState()
     if (autoScroll) {
@@ -135,6 +135,7 @@ internal fun SelectedUsersListPreview() = ElementPreview {
         // Two users that will be visible with no scrolling
         SelectedUsersList(
             selectedUsers = aMatrixUserList().take(2).toImmutableList(),
+            onUserRemoved = {},
             modifier = Modifier
                 .width(200.dp)
                 .border(1.dp, Color.Red)
@@ -144,6 +145,7 @@ internal fun SelectedUsersListPreview() = ElementPreview {
         for (i in 0..5) {
             SelectedUsersList(
                 selectedUsers = aMatrixUserList().take(6).toImmutableList(),
+                onUserRemoved = {},
                 modifier = Modifier
                     .width((200 + i * 20).dp)
                     .border(1.dp, Color.Red)