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

Remove lambda default value
2023-11-24 11:00:34 +01:00 · 2023-11-24 11:00:34 +01:00 · 05ba424e75
commit 05ba424e75
parent 3895d6ae97 ae0c3edd24
49 changed files with 436 additions and 230 deletions
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt
@ -32,8 +32,8 @@ import io.element.android.features.createroom.impl.components.UserListView
 import io.element.android.features.createroom.impl.userlist.UserListEvents
 import io.element.android.features.createroom.impl.userlist.UserListState
 import io.element.android.libraries.designsystem.components.button.BackButton
-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.aliasScreenTitle
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
@ -46,9 +46,9 @@ import io.element.android.libraries.ui.strings.CommonStrings
@Composable
 fun AddPeopleView(
    state: UserListState,
+    onBackPressed: () -> Unit,
+    onNextPressed: () -> Unit,
    modifier: Modifier = Modifier,
-    onBackPressed: () -> Unit = {},
-    onNextPressed: () -> Unit = {},
 ) {
    Scaffold(
        modifier = modifier,
@ -77,6 +77,8 @@ fun AddPeopleView(
                    .fillMaxWidth(),
                state = state,
                showBackButton = false,
+                onUserSelected = { },
+                onUserDeselected = {},
            )
        }
    }
@ -86,9 +88,9 @@ fun AddPeopleView(
@Composable
 private fun AddPeopleViewTopBar(
    hasSelectedUsers: Boolean,
+    onBackPressed: () -> Unit,
+    onNextPressed: () -> Unit,
    modifier: Modifier = Modifier,
-    onBackPressed: () -> Unit = {},
-    onNextPressed: () -> Unit = {},
 ) {
    TopAppBar(
        modifier = modifier,
@ -112,5 +114,9 @@ private fun AddPeopleViewTopBar(
@PreviewsDayNight
@Composable
 internal fun AddPeopleViewPreview(@PreviewParameter(AddPeopleUserListStateProvider::class) state: UserListState) = ElementPreview {
-    AddPeopleView(state = state)
+    AddPeopleView(
+        state = state,
+        onBackPressed = {},
+        onNextPressed = {},
+    )
 }
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/RoomPrivacyOption.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/RoomPrivacyOption.kt
@ -41,9 +41,9 @@ import io.element.android.libraries.theme.ElementTheme
@Composable
 fun RoomPrivacyOption(
    roomPrivacyItem: RoomPrivacyItem,
+    onOptionSelected: (RoomPrivacyItem) -> Unit,
    modifier: Modifier = Modifier,
    isSelected: Boolean = false,
-    onOptionSelected: (RoomPrivacyItem) -> Unit = {},
 ) {
    Row(
        modifier
@ -97,10 +97,12 @@ internal fun RoomPrivacyOptionPreview() = ElementPreview {
    Column {
        RoomPrivacyOption(
            roomPrivacyItem = aRoomPrivacyItem,
+            onOptionSelected = {},
            isSelected = true,
        )
        RoomPrivacyOption(
            roomPrivacyItem = aRoomPrivacyItem,
+            onOptionSelected = {},
            isSelected = false,
        )
    }
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/SearchMultipleUsersResultItem.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/SearchMultipleUsersResultItem.kt
@ -33,8 +33,8 @@ import io.element.android.libraries.usersearch.api.UserSearchResult
 fun SearchMultipleUsersResultItem(
    searchResult: UserSearchResult,
    isUserSelected: Boolean,
+    onCheckedChange: (Boolean) -> Unit,
    modifier: Modifier = Modifier,
-    onCheckedChange: (Boolean) -> Unit = {},
 ) {
    if (searchResult.isUnresolved) {
        CheckableUnresolvedUserRow(
@ -62,12 +62,40 @@ internal fun SearchMultipleUsersResultItemPreview() = ElementThemedPreview { Con
@Composable
 private fun ContentToPreview() {
    Column {
-        SearchMultipleUsersResultItem(searchResult = UserSearchResult(aMatrixUser(), isUnresolved = false), isUserSelected = false)
+        SearchMultipleUsersResultItem(
+            searchResult = UserSearchResult(
+                aMatrixUser(),
+                isUnresolved = false
+            ),
+            isUserSelected = false,
+            onCheckedChange = {}
+        )
        HorizontalDivider()
-        SearchMultipleUsersResultItem(searchResult = UserSearchResult(aMatrixUser(), isUnresolved = false), isUserSelected = true)
+        SearchMultipleUsersResultItem(
+            searchResult = UserSearchResult(
+                aMatrixUser(),
+                isUnresolved = false
+            ),
+            isUserSelected = true,
+            onCheckedChange = {}
+        )
        HorizontalDivider()
-        SearchMultipleUsersResultItem(searchResult = UserSearchResult(aMatrixUser(), isUnresolved = true), isUserSelected = false)
+        SearchMultipleUsersResultItem(
+            searchResult = UserSearchResult(
+                aMatrixUser(),
+                isUnresolved = true
+            ),
+            isUserSelected = false,
+            onCheckedChange = {}
+        )
        HorizontalDivider()
-        SearchMultipleUsersResultItem(searchResult = UserSearchResult(aMatrixUser(), isUnresolved = true), isUserSelected = true)
+        SearchMultipleUsersResultItem(
+            searchResult = UserSearchResult(
+                aMatrixUser(),
+                isUnresolved = true
+            ),
+            isUserSelected = true,
+            onCheckedChange = {}
+        )
    }
 }
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/SearchSingleUserResultItem.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/SearchSingleUserResultItem.kt
@ -33,8 +33,8 @@ import io.element.android.libraries.usersearch.api.UserSearchResult
@Composable
 fun SearchSingleUserResultItem(
    searchResult: UserSearchResult,
+    onClick: () -> Unit,
    modifier: Modifier = Modifier,
-    onClick: () -> Unit = {},
 ) {
    if (searchResult.isUnresolved) {
        UnresolvedUserRow(
@ -58,8 +58,14 @@ internal fun SearchSingleUserResultItemPreview() = ElementThemedPreview { Conten
@Composable
 private fun ContentToPreview() {
    Column {
-        SearchSingleUserResultItem(searchResult = UserSearchResult(aMatrixUser(), isUnresolved = false))
+        SearchSingleUserResultItem(
+            searchResult = UserSearchResult(aMatrixUser(), isUnresolved = false),
+            onClick = {},
+        )
        HorizontalDivider()
-        SearchSingleUserResultItem(searchResult = UserSearchResult(aMatrixUser(), isUnresolved = true))
+        SearchSingleUserResultItem(
+            searchResult = UserSearchResult(aMatrixUser(), isUnresolved = true),
+            onClick = {},
+        )
    }
 }
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/SearchUserBar.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/SearchUserBar.kt
@ -52,13 +52,13 @@ fun SearchUserBar(
    selectedUsers: ImmutableList<MatrixUser>,
    active: Boolean,
    isMultiSelectionEnabled: Boolean,
+    onActiveChanged: (Boolean) -> Unit,
+    onTextChanged: (String) -> Unit,
+    onUserSelected: (MatrixUser) -> Unit,
+    onUserDeselected: (MatrixUser) -> Unit,
    modifier: Modifier = Modifier,
    showBackButton: Boolean = true,
    placeHolderTitle: String = stringResource(CommonStrings.common_search_for_someone),
-    onActiveChanged: (Boolean) -> Unit = {},
-    onTextChanged: (String) -> Unit = {},
-    onUserSelected: (MatrixUser) -> Unit = {},
-    onUserDeselected: (MatrixUser) -> Unit = {},
 ) {
    val columnState = rememberLazyListState()

--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/UserListView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/UserListView.kt
@ -26,18 +26,18 @@ import androidx.compose.ui.unit.dp
 import io.element.android.features.createroom.impl.userlist.UserListEvents
 import io.element.android.features.createroom.impl.userlist.UserListState
 import io.element.android.features.createroom.impl.userlist.UserListStateProvider
-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.components.SelectedUsersList

@Composable
 fun UserListView(
    state: UserListState,
+    onUserSelected: (MatrixUser) -> Unit,
+    onUserDeselected: (MatrixUser) -> Unit,
    modifier: Modifier = Modifier,
    showBackButton: Boolean = true,
-    onUserSelected: (MatrixUser) -> Unit = {},
-    onUserDeselected: (MatrixUser) -> Unit = {},
 ) {
    Column(
        modifier = modifier,
@ -79,5 +79,9 @@ fun UserListView(
@PreviewsDayNight
@Composable
 internal fun UserListViewPreview(@PreviewParameter(UserListStateProvider::class) state: UserListState) = ElementPreview {
-    UserListView(state = state)
+    UserListView(
+        state = state,
+        onUserSelected = {},
+        onUserDeselected = {},
+    )
 }
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
@ -167,9 +167,9 @@ fun ConfigureRoomView(
@Composable
 private fun ConfigureRoomToolbar(
    isNextActionEnabled: Boolean,
+    onBackPressed: () -> Unit,
+    onNextPressed: () -> Unit,
    modifier: Modifier = Modifier,
-    onBackPressed: () -> Unit = {},
-    onNextPressed: () -> Unit = {},
 ) {
    TopAppBar(
        modifier = modifier,
@ -194,9 +194,9 @@ private fun ConfigureRoomToolbar(
 private fun RoomNameWithAvatar(
    avatarUri: Uri?,
    roomName: String,
+    onAvatarClick: () -> Unit,
+    onRoomNameChanged: (String) -> Unit,
    modifier: Modifier = Modifier,
-    onAvatarClick: () -> Unit = {},
-    onRoomNameChanged: (String) -> Unit = {},
 ) {
    Row(
        modifier = modifier,
@ -221,8 +221,8 @@ private fun RoomNameWithAvatar(
@Composable
 private fun RoomTopic(
    topic: String,
+    onTopicChanged: (String) -> Unit,
    modifier: Modifier = Modifier,
-    onTopicChanged: (String) -> Unit = {},
 ) {
    LabelledTextField(
        modifier = modifier,
@ -240,8 +240,8 @@ private fun RoomTopic(
@Composable
 private fun RoomPrivacyOptions(
    selected: RoomPrivacy?,
+    onOptionSelected: (RoomPrivacyItem) -> Unit,
    modifier: Modifier = Modifier,
-    onOptionSelected: (RoomPrivacyItem) -> Unit = {},
 ) {
    val items = roomPrivacyItems()
    Column(modifier = modifier.selectableGroup()) {
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
@ -55,11 +55,11 @@ import io.element.android.libraries.ui.strings.CommonStrings
@Composable
 fun CreateRoomRootView(
    state: CreateRoomRootState,
+    onClosePressed: () -> Unit,
+    onNewRoomClicked: () -> Unit,
+    onOpenDM: (RoomId) -> Unit,
+    onInviteFriendsClicked: () -> Unit,
    modifier: Modifier = Modifier,
-    onClosePressed: () -> Unit = {},
-    onNewRoomClicked: () -> Unit = {},
-    onOpenDM: (RoomId) -> Unit = {},
-    onInviteFriendsClicked: () -> Unit = {},
 ) {
    Scaffold(
        modifier = modifier.fillMaxWidth(),
@ -81,6 +81,7 @@ fun CreateRoomRootView(
                onUserSelected = {
                    state.eventSink(CreateRoomRootEvents.StartDM(it))
                },
+                onUserDeselected = { },
            )

            if (!state.userListState.isSearchActive) {
@ -111,8 +112,8 @@ fun CreateRoomRootView(
@OptIn(ExperimentalMaterial3Api::class)
@Composable
 private fun CreateRoomRootViewTopBar(
+    onClosePressed: () -> Unit,
    modifier: Modifier = Modifier,
-    onClosePressed: () -> Unit = {},
 ) {
    TopAppBar(
        modifier = modifier,
@ -134,9 +135,9 @@ private fun CreateRoomRootViewTopBar(
@Composable
 private fun CreateRoomActionButtonsList(
    state: CreateRoomRootState,
+    onNewRoomClicked: () -> Unit,
+    onInvitePeopleClicked: () -> Unit,
    modifier: Modifier = Modifier,
-    onNewRoomClicked: () -> Unit = {},
-    onInvitePeopleClicked: () -> Unit = {},
 ) {
    Column(modifier = modifier) {
        CreateRoomActionButton(
@ -156,8 +157,8 @@ private fun CreateRoomActionButtonsList(
 private fun CreateRoomActionButton(
    @DrawableRes iconRes: Int,
    text: String,
+    onClick: () -> Unit,
    modifier: Modifier = Modifier,
-    onClick: () -> Unit = {},
 ) {
    Row(
        modifier = modifier
@ -187,5 +188,9 @@ internal fun CreateRoomRootViewPreview(@PreviewParameter(CreateRoomRootStateProv
    ElementPreview {
        CreateRoomRootView(
            state = state,
+            onClosePressed = {},
+            onNewRoomClicked = {},
+            onOpenDM = {},
+            onInviteFriendsClicked = {},
        )
    }