diff --git a/features/healthchat/impl/src/main/kotlin/io/element/android/features/healthchat/impl/directory/components/MemberDirectoryHeader.kt b/features/healthchat/impl/src/main/kotlin/io/element/android/features/healthchat/impl/directory/components/MemberDirectoryHeader.kt index 0a398bd3c6..cf43b4d996 100644 --- a/features/healthchat/impl/src/main/kotlin/io/element/android/features/healthchat/impl/directory/components/MemberDirectoryHeader.kt +++ b/features/healthchat/impl/src/main/kotlin/io/element/android/features/healthchat/impl/directory/components/MemberDirectoryHeader.kt @@ -20,13 +20,13 @@ import androidx.compose.ui.unit.dp import io.element.android.compound.theme.ElementTheme import io.element.android.compound.tokens.generated.CompoundIcons import io.element.android.features.healthchat.api.HealthChatStrings -import io.element.android.features.healthchat.api.R as HealthChatR 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.IconButton import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.designsystem.theme.components.TextButton +import io.element.android.features.healthchat.api.R as HealthChatR @Composable fun MemberDirectoryHeader( diff --git a/features/healthchat/impl/src/test/kotlin/io/element/android/features/healthchat/impl/directory/MemberDirectoryPresenterTest.kt b/features/healthchat/impl/src/test/kotlin/io/element/android/features/healthchat/impl/directory/MemberDirectoryPresenterTest.kt index d4d9529e70..aae6fa932c 100644 --- a/features/healthchat/impl/src/test/kotlin/io/element/android/features/healthchat/impl/directory/MemberDirectoryPresenterTest.kt +++ b/features/healthchat/impl/src/test/kotlin/io/element/android/features/healthchat/impl/directory/MemberDirectoryPresenterTest.kt @@ -175,10 +175,8 @@ class MemberDirectoryPresenterTest { private fun createPresenter( directoryService: HealthChatDirectoryService = FakeHealthChatDirectoryService(), startDMAction: StartDMAction = FakeStartDMAction(), - ): MemberDirectoryPresenter { - return MemberDirectoryPresenter( - directoryService = directoryService, - startDMAction = startDMAction, - ) - } + ) = MemberDirectoryPresenter( + directoryService = directoryService, + startDMAction = startDMAction, + ) } diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeView.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeView.kt index ed4475c250..a78cbf6f58 100644 --- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeView.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeView.kt @@ -87,12 +87,12 @@ fun HomeView( onDeclineInviteAndBlockUser: (roomSummary: RoomListRoomSummary) -> Unit, acceptDeclineInviteView: @Composable () -> Unit, modifier: Modifier = Modifier, - leaveRoomView: @Composable () -> Unit, - // HealthChat fork: content of the member directory tab, rendered by features/healthchat. - memberDirectoryView: @Composable (PaddingValues, LazyListState) -> Unit = { _, _ -> }, // HealthChat fork: false while another screen is pushed on top of Home, so the // tab-switching BackHandler cannot swallow back presses during the transition. isBackHandlingEnabled: Boolean = true, + // HealthChat fork: content of the member directory tab, rendered by features/healthchat. + memberDirectoryView: @Composable (PaddingValues, LazyListState) -> Unit = { _, _ -> }, + leaveRoomView: @Composable () -> Unit, ) { val state: RoomListState = homeState.roomListState val coroutineScope = rememberCoroutineScope() @@ -155,9 +155,9 @@ private fun HomeScaffold( onStartChatClick: () -> Unit, onCreateSpaceClick: () -> Unit, onMenuActionClick: (RoomListMenuAction) -> Unit, - memberDirectoryView: @Composable (PaddingValues, LazyListState) -> Unit, isBackHandlingEnabled: Boolean, modifier: Modifier = Modifier, + memberDirectoryView: @Composable (PaddingValues, LazyListState) -> Unit, ) { fun onRoomClick(room: RoomListRoomSummary) { onRoomClick(room.roomId)