Remove join button on room directory search (#2827)

* Remove 'Join' button in room directory search results * Update screenshots * Add changelog --------- Co-authored-by: ElementBot <[email protected]>
element-hq · May 10, 2024 · b95df7e · b95df7e
1 parent 2f19f57
commit b95df7e
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 63 deletions.
diff --git a/changelog.d/2827.bugfix b/changelog.d/2827.bugfix
@@ -0,0 +1 @@
+Remove 'Join' button in room directory search results.
diff --git a/.../src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryView.kt b/.../src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryView.kt
@@ -21,12 +21,10 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
@@ -76,10 +74,6 @@ fun RoomDirectoryView(
     onBackPressed: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    fun joinRoom(roomDescription: RoomDescription) {
-        state.eventSink(RoomDirectoryEvents.JoinRoom(roomDescription.roomId))
-    }
-
     Scaffold(
         modifier = modifier,
         topBar = {
@@ -89,7 +83,6 @@ fun RoomDirectoryView(
             RoomDirectoryContent(
                 state = state,
                 onResultClicked = onResultClicked,
-                onJoinClicked = ::joinRoom,
                 modifier = Modifier
                         .padding(padding)
                         .consumeWindowInsets(padding)
@@ -132,7 +125,6 @@ private fun RoomDirectoryTopBar(
 private fun RoomDirectoryContent(
     state: RoomDirectoryState,
     onResultClicked: (RoomDescription) -> Unit,
-    onJoinClicked: (RoomDescription) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Column(modifier = modifier) {
@@ -147,7 +139,6 @@ private fun RoomDirectoryContent(
             displayLoadMoreIndicator = state.displayLoadMoreIndicator,
             displayEmptyState = state.displayEmptyState,
             onResultClicked = onResultClicked,
-            onJoinClicked = onJoinClicked,
             onReachedLoadMore = { state.eventSink(RoomDirectoryEvents.LoadMore) },
         )
     }
@@ -159,7 +150,6 @@ private fun RoomDirectoryRoomList(
     displayLoadMoreIndicator: Boolean,
     displayEmptyState: Boolean,
     onResultClicked: (RoomDescription) -> Unit,
-    onJoinClicked: (RoomDescription) -> Unit,
     onReachedLoadMore: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -170,9 +160,6 @@ private fun RoomDirectoryRoomList(
                 onClick = {
                     onResultClicked(roomDescription)
                 },
-                onJoinClick = {
-                    onJoinClicked(roomDescription)
-                },
             )
         }
         if (displayEmptyState) {
@@ -199,10 +186,10 @@ private fun RoomDirectoryRoomList(
 @Composable
 private fun LoadMoreIndicator(modifier: Modifier = Modifier) {
     Box(
-            modifier
-                    .fillMaxWidth()
-                    .wrapContentHeight()
-                    .padding(24.dp),
+        modifier
+                .fillMaxWidth()
+                .wrapContentHeight()
+                .padding(24.dp),
         contentAlignment = Alignment.Center,
     ) {
         CircularProgressIndicator(
@@ -268,7 +255,6 @@ private fun SearchTextField(
 private fun RoomDirectoryRoomRow(
     roomDescription: RoomDescription,
     onClick: () -> Unit,
-    onJoinClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Row(
@@ -289,7 +275,7 @@ private fun RoomDirectoryRoomRow(
         Column(
             modifier = Modifier
                     .weight(1f)
-                    .padding(start = 16.dp)
+                    .padding(horizontal = 16.dp)
         ) {
             Text(
                 text = roomDescription.computedName,
@@ -306,19 +292,6 @@ private fun RoomDirectoryRoomRow(
                 overflow = TextOverflow.Ellipsis,
             )
         }
-        if (roomDescription.canJoinOrKnock) {
-            Text(
-                text = stringResource(id = CommonStrings.action_join),
-                color = ElementTheme.colors.textSuccessPrimary,
-                modifier = Modifier
-                        .align(Alignment.CenterVertically)
-                        .clickable(onClick = onJoinClick)
-                        .padding(start = 4.dp, end = 12.dp)
-                        .testTag(TestTags.callToAction.value)
-            )
-        } else {
-            Spacer(modifier = Modifier.width(24.dp))
-        }
     }
 }
 

diff --git a/.../test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryViewTest.kt b/.../test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryViewTest.kt
@@ -19,8 +19,6 @@ package io.element.android.features.roomdirectory.impl.root
 import androidx.activity.ComponentActivity
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.compose.ui.test.onAllNodesWithTag
-import androidx.compose.ui.test.onFirst
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
@@ -74,19 +72,6 @@ class RoomDirectoryViewTest {
         }
     }
 
-    @Test
-    fun `clicking on room item join cta emits the expected Event`() {
-        val eventsRecorder = EventsRecorder<RoomDirectoryEvents>()
-        val state = aRoomDirectoryState(
-            roomDescriptions = aRoomDescriptionList(),
-            eventSink = eventsRecorder,
-        )
-        rule.setRoomDirectoryView(state = state)
-        val clickedRoom = state.roomDescriptions.first()
-        rule.onAllNodesWithTag(TestTags.callToAction.value).onFirst().performClick()
-        eventsRecorder.assertSingle(RoomDirectoryEvents.JoinRoom(clickedRoom.roomId))
-    }
-
     @Test
     fun `composing load more indicator emits expected Event`() {
         val eventsRecorder = EventsRecorder<RoomDirectoryEvents>()

diff --git a/...oot_RoomDirectoryView_null_RoomDirectoryView-Day-0_1_null_1,NEXUS_5,1.0,en].png b/...oot_RoomDirectoryView_null_RoomDirectoryView-Day-0_1_null_1,NEXUS_5,1.0,en].png
diff --git a/...oot_RoomDirectoryView_null_RoomDirectoryView-Day-0_1_null_2,NEXUS_5,1.0,en].png b/...oot_RoomDirectoryView_null_RoomDirectoryView-Day-0_1_null_2,NEXUS_5,1.0,en].png
diff --git a/...oot_RoomDirectoryView_null_RoomDirectoryView-Day-0_1_null_3,NEXUS_5,1.0,en].png b/...oot_RoomDirectoryView_null_RoomDirectoryView-Day-0_1_null_3,NEXUS_5,1.0,en].png
diff --git a/...oot_RoomDirectoryView_null_RoomDirectoryView-Day-0_1_null_4,NEXUS_5,1.0,en].png b/...oot_RoomDirectoryView_null_RoomDirectoryView-Day-0_1_null_4,NEXUS_5,1.0,en].png
diff --git a/...t_RoomDirectoryView_null_RoomDirectoryView-Night-0_2_null_1,NEXUS_5,1.0,en].png b/...t_RoomDirectoryView_null_RoomDirectoryView-Night-0_2_null_1,NEXUS_5,1.0,en].png
diff --git a/...t_RoomDirectoryView_null_RoomDirectoryView-Night-0_2_null_2,NEXUS_5,1.0,en].png b/...t_RoomDirectoryView_null_RoomDirectoryView-Night-0_2_null_2,NEXUS_5,1.0,en].png
diff --git a/...t_RoomDirectoryView_null_RoomDirectoryView-Night-0_2_null_3,NEXUS_5,1.0,en].png b/...t_RoomDirectoryView_null_RoomDirectoryView-Night-0_2_null_3,NEXUS_5,1.0,en].png
diff --git a/...t_RoomDirectoryView_null_RoomDirectoryView-Night-0_2_null_4,NEXUS_5,1.0,en].png b/...t_RoomDirectoryView_null_RoomDirectoryView-Night-0_2_null_4,NEXUS_5,1.0,en].png
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Remove 'Join' button in room directory search results.