Invite : remove invitelist entry points

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/InvitesEntryPointView.kt

@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2023 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.element.android.features.roomlist.impl
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.heightIn
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.semantics.Role
-import androidx.compose.ui.tooling.preview.PreviewParameter
-import androidx.compose.ui.unit.dp
-import io.element.android.compound.theme.ElementTheme
-import io.element.android.libraries.designsystem.atomic.atoms.UnreadIndicatorAtom
-import io.element.android.libraries.designsystem.preview.ElementPreview
-import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.designsystem.theme.components.Text
-import io.element.android.libraries.ui.strings.CommonStrings
-
-@Composable
-fun InvitesEntryPointView(
-    onInvitesClicked: () -> Unit,
-    state: InvitesState,
-    modifier: Modifier = Modifier,
-) {
-    Box(
-        modifier = modifier.fillMaxWidth(),
-    ) {
-        Row(
-            modifier = Modifier
-                .clip(RoundedCornerShape(8.dp))
-                .clickable(role = Role.Button, onClick = onInvitesClicked)
-                .padding(start = 24.dp, end = 16.dp)
-                .align(Alignment.CenterEnd)
-                .heightIn(min = 40.dp),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            Text(
-                text = stringResource(CommonStrings.action_invites_list),
-                style = ElementTheme.typography.fontBodyMdMedium,
-            )
-
-            if (state == InvitesState.NewInvites) {
-                Spacer(Modifier.width(8.dp))
-                UnreadIndicatorAtom()
-            }
-        }
-    }
-}
-
-@PreviewsDayNight
-@Composable
-internal fun InvitesEntryPointViewPreview(@PreviewParameter(InvitesStateProvider::class) state: InvitesState) = ElementPreview {
-    InvitesEntryPointView(
-        onInvitesClicked = {},
-        state = state,
-    )
-}

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContentStateProvider.kt

@@ -33,11 +33,9 @@ open class RoomListContentStateProvider : PreviewParameterProvider<RoomListConte
 }
 
 internal fun aRoomsContentState(
-    invitesState: InvitesState = InvitesState.NoInvites,
     securityBannerState: SecurityBannerState = SecurityBannerState.None,
     summaries: ImmutableList<RoomListRoomSummary> = aRoomListRoomSummaryList(),
 ) = RoomListContentState.Rooms(
-    invitesState = invitesState,
     securityBannerState = securityBannerState,
     summaries = summaries,
 )
@@ -46,6 +44,4 @@ internal fun aMigrationContentState() = RoomListContentState.Migration
 
 internal fun aSkeletonContentState() = RoomListContentState.Skeleton(16)
 
-internal fun anEmptyContentState(
-    invitesState: InvitesState = InvitesState.NoInvites,
-) = RoomListContentState.Empty(invitesState)
+internal fun anEmptyContentState() = RoomListContentState.Empty

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListNode.kt

@@ -70,10 +70,6 @@ class RoomListNode @AssistedInject constructor(
         plugins<RoomListEntryPoint.Callback>().forEach { it.onSessionConfirmRecoveryKeyClicked() }
     }
 
-    private fun onInvitesClicked() {
-        plugins<RoomListEntryPoint.Callback>().forEach { it.onInvitesClicked() }
-    }
-
     private fun onRoomSettingsClicked(roomId: RoomId) {
         plugins<RoomListEntryPoint.Callback>().forEach { it.onRoomSettingsClicked(roomId) }
     }
@@ -103,7 +99,6 @@ class RoomListNode @AssistedInject constructor(
             onSettingsClicked = this::onOpenSettings,
             onCreateRoomClicked = this::onCreateRoomClicked,
             onConfirmRecoveryKeyClicked = this::onSessionConfirmRecoveryKeyClicked,
-            onInvitesClicked = this::onInvitesClicked,
             onRoomSettingsClicked = this::onRoomSettingsClicked,
             onMenuActionClicked = { onMenuActionClicked(activity, it) },
             onRoomDirectorySearchClicked = this::onRoomDirectorySearchClicked,

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt

@@ -40,7 +40,6 @@ import io.element.android.features.leaveroom.api.LeaveRoomPresenter
 import io.element.android.features.networkmonitor.api.NetworkMonitor
 import io.element.android.features.networkmonitor.api.NetworkStatus
 import io.element.android.features.preferences.api.store.SessionPreferencesStore
-import io.element.android.features.roomlist.impl.datasource.InviteStateDataSource
 import io.element.android.features.roomlist.impl.datasource.RoomListDataSource
 import io.element.android.features.roomlist.impl.filters.RoomListFiltersState
 import io.element.android.features.roomlist.impl.migration.MigrationScreenState
@@ -83,7 +82,6 @@ class RoomListPresenter @Inject constructor(
     private val client: MatrixClient,
     private val networkMonitor: NetworkMonitor,
     private val snackbarDispatcher: SnackbarDispatcher,
-    private val inviteStateDataSource: InviteStateDataSource,
     private val leaveRoomPresenter: LeaveRoomPresenter,
     private val roomListDataSource: RoomListDataSource,
     private val featureFlagService: FeatureFlagService,
@@ -209,16 +207,11 @@ class RoomListPresenter @Inject constructor(
         }
         return when {
             showMigration -> RoomListContentState.Migration
-            showEmpty -> {
-                val invitesState = inviteStateDataSource.inviteState()
-                RoomListContentState.Empty(invitesState)
-            }
+            showEmpty -> RoomListContentState.Empty
             showSkeleton -> RoomListContentState.Skeleton(count = 16)
             else -> {
-                val invitesState = inviteStateDataSource.inviteState()
                 val securityBannerState by securityBannerState(securityBannerDismissed)
                 RoomListContentState.Rooms(
-                    invitesState = invitesState,
                     securityBannerState = securityBannerState,
                     summaries = roomSummaries.dataOrNull().orEmpty().toPersistentList()
                 )

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt

@@ -72,9 +72,8 @@ enum class SecurityBannerState {
 sealed interface RoomListContentState {
     data object Migration : RoomListContentState
     data class Skeleton(val count: Int) : RoomListContentState
-    data class Empty(val invitesState: InvitesState) : RoomListContentState
+    data object Empty : RoomListContentState
     data class Rooms(
-        val invitesState: InvitesState,
         val securityBannerState: SecurityBannerState,
         val summaries: ImmutableList<RoomListRoomSummary>,
     ) : RoomListContentState

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt

@@ -44,8 +44,6 @@ open class RoomListStateProvider : PreviewParameterProvider<RoomListState> {
             aRoomListState(),
             aRoomListState(snackbarMessage = SnackbarMessage(CommonStrings.common_verification_complete)),
             aRoomListState(hasNetworkConnection = false),
-            aRoomListState(contentState = aRoomsContentState(invitesState = InvitesState.SeenInvites)),
-            aRoomListState(contentState = aRoomsContentState(invitesState = InvitesState.NewInvites)),
             aRoomListState(contextMenu = aContextMenuShown(roomName = "A nice room name")),
             aRoomListState(contextMenu = aContextMenuShown(isFavorite = true)),
             aRoomListState(contentState = aRoomsContentState(securityBannerState = SecurityBannerState.RecoveryKeyConfirmation)),

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt

@@ -32,7 +32,6 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import io.element.android.compound.tokens.generated.CompoundIcons
-import io.element.android.features.invite.api.response.AcceptDeclineInviteView
 import io.element.android.features.leaveroom.api.LeaveRoomView
 import io.element.android.features.networkmonitor.api.ui.ConnectivityIndicatorContainer
 import io.element.android.features.roomlist.impl.components.RoomListContentView
@@ -56,12 +55,11 @@ fun RoomListView(
     onSettingsClicked: () -> Unit,
     onConfirmRecoveryKeyClicked: () -> Unit,
     onCreateRoomClicked: () -> Unit,
-    onInvitesClicked: () -> Unit,
     onRoomSettingsClicked: (roomId: RoomId) -> Unit,
     onMenuActionClicked: (RoomListMenuAction) -> Unit,
     onRoomDirectorySearchClicked: () -> Unit,
     modifier: Modifier = Modifier,
-    acceptDeclineInviteView: @Composable ()->Unit,
+    acceptDeclineInviteView: @Composable () -> Unit,
 ) {
     ConnectivityIndicatorContainer(
         modifier = modifier,
@@ -80,14 +78,13 @@ fun RoomListView(
             LeaveRoomView(state = state.leaveRoomState)
 
             RoomListScaffold(
-                modifier = Modifier.padding(top = topPadding),
                 state = state,
                 onConfirmRecoveryKeyClicked = onConfirmRecoveryKeyClicked,
                 onRoomClicked = onRoomClicked,
                 onOpenSettings = onSettingsClicked,
                 onCreateRoomClicked = onCreateRoomClicked,
-                onInvitesClicked = onInvitesClicked,
                 onMenuActionClicked = onMenuActionClicked,
+                modifier = Modifier.padding(top = topPadding),
             )
             // This overlaid view will only be visible when state.displaySearchResults is true
             RoomListSearchView(
@@ -114,7 +111,6 @@ private fun RoomListScaffold(
     onRoomClicked: (RoomId) -> Unit,
     onOpenSettings: () -> Unit,
     onCreateRoomClicked: () -> Unit,
-    onInvitesClicked: () -> Unit,
     onMenuActionClicked: (RoomListMenuAction) -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -150,7 +146,6 @@ private fun RoomListScaffold(
                 onConfirmRecoveryKeyClicked = onConfirmRecoveryKeyClicked,
                 onRoomClicked = ::onRoomClicked,
                 onCreateRoomClicked = onCreateRoomClicked,
-                onInvitesClicked = onInvitesClicked,
                 modifier = Modifier
                     .padding(padding)
                     .consumeWindowInsets(padding)
@@ -186,7 +181,6 @@ internal fun RoomListViewPreview(@PreviewParameter(RoomListStateProvider::class)
         onSettingsClicked = {},
         onConfirmRecoveryKeyClicked = {},
         onCreateRoomClicked = {},
-        onInvitesClicked = {},
         onRoomSettingsClicked = {},
         onMenuActionClicked = {},
         onRoomDirectorySearchClicked = {},

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListContentView.kt

@@ -44,8 +44,6 @@ import androidx.compose.ui.unit.Velocity
 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.roomlist.impl.InvitesEntryPointView
-import io.element.android.features.roomlist.impl.InvitesState
 import io.element.android.features.roomlist.impl.R
 import io.element.android.features.roomlist.impl.RoomListContentState
 import io.element.android.features.roomlist.impl.RoomListContentStateProvider
@@ -76,7 +74,6 @@ fun RoomListContentView(
     onConfirmRecoveryKeyClicked: () -> Unit,
     onRoomClicked: (RoomListRoomSummary) -> Unit,
     onCreateRoomClicked: () -> Unit,
-    onInvitesClicked: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Box(modifier = modifier) {
@@ -91,8 +88,6 @@ fun RoomListContentView(
             }
             is RoomListContentState.Empty -> {
                 EmptyView(
-                    state = contentState,
-                    onInvitesClicked = onInvitesClicked,
                     onCreateRoomClicked = onCreateRoomClicked,
                 )
             }
@@ -103,7 +98,6 @@ fun RoomListContentView(
                     eventSink = eventSink,
                     onConfirmRecoveryKeyClicked = onConfirmRecoveryKeyClicked,
                     onRoomClicked = onRoomClicked,
-                    onInvitesClicked = onInvitesClicked,
                 )
             }
         }
@@ -126,30 +120,21 @@ private fun SkeletonView(count: Int, modifier: Modifier = Modifier) {
 
 @Composable
 private fun EmptyView(
-    state: RoomListContentState.Empty,
     onCreateRoomClicked: () -> Unit,
-    onInvitesClicked: () -> Unit,
     modifier: Modifier = Modifier
 ) {
-    Box(
+    EmptyScaffold(
+        title = R.string.screen_roomlist_empty_title,
+        subtitle = R.string.screen_roomlist_empty_message,
+        action = {
+            Button(
+                text = stringResource(CommonStrings.action_start_chat),
+                leadingIcon = IconSource.Vector(CompoundIcons.Compose()),
+                onClick = onCreateRoomClicked,
+            )
+        },
         modifier = modifier.fillMaxSize(),
-    ) {
-        if (state.invitesState != InvitesState.NoInvites) {
-            InvitesEntryPointView(onInvitesClicked, state.invitesState)
-        }
-        EmptyScaffold(
-            title = R.string.screen_roomlist_empty_title,
-            subtitle = R.string.screen_roomlist_empty_message,
-            action = {
-                Button(
-                    text = stringResource(CommonStrings.action_start_chat),
-                    leadingIcon = IconSource.Vector(CompoundIcons.Compose()),
-                    onClick = onCreateRoomClicked,
-                )
-            },
-            modifier = Modifier.fillMaxSize(),
-        )
-    }
+    )
 }
 
 @Composable
@@ -159,7 +144,6 @@ private fun RoomsView(
     eventSink: (RoomListEvents) -> Unit,
     onConfirmRecoveryKeyClicked: () -> Unit,
     onRoomClicked: (RoomListRoomSummary) -> Unit,
-    onInvitesClicked: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     if (state.summaries.isEmpty() && filtersState.hasAnyFilterSelected) {
@@ -173,7 +157,6 @@ private fun RoomsView(
             eventSink = eventSink,
             onConfirmRecoveryKeyClicked = onConfirmRecoveryKeyClicked,
             onRoomClicked = onRoomClicked,
-            onInvitesClicked = onInvitesClicked,
             modifier = modifier.fillMaxSize(),
         )
     }
@@ -185,7 +168,6 @@ private fun RoomsViewList(
     eventSink: (RoomListEvents) -> Unit,
     onConfirmRecoveryKeyClicked: () -> Unit,
     onRoomClicked: (RoomListRoomSummary) -> Unit,
-    onInvitesClicked: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val lazyListState = rememberLazyListState()
@@ -223,11 +205,6 @@ private fun RoomsViewList(
             else -> Unit
         }
 
-        if (state.invitesState != InvitesState.NoInvites) {
-            item {
-                InvitesEntryPointView(onInvitesClicked, state.invitesState)
-            }
-        }
         // Note: do not use a key for the LazyColumn, or the scroll will not behave as expected if a room
         // is moved to the top of the list.
         itemsIndexed(
@@ -301,6 +278,5 @@ internal fun RoomListContentViewPreview(@PreviewParameter(RoomListContentStatePr
         onConfirmRecoveryKeyClicked = {},
         onRoomClicked = {},
         onCreateRoomClicked = {},
-        onInvitesClicked = {}
     )
 }

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/datasource/DefaultInviteStateDataSource.kt

@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2023 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.element.android.features.roomlist.impl.datasource
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import com.squareup.anvil.annotations.ContributesBinding
-import io.element.android.features.invite.api.SeenInvitesStore
-import io.element.android.features.roomlist.impl.InvitesState
-import io.element.android.libraries.core.coroutine.CoroutineDispatchers
-import io.element.android.libraries.di.SessionScope
-import io.element.android.libraries.matrix.api.MatrixClient
-import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.matrix.api.roomlist.RoomSummary
-import kotlinx.coroutines.withContext
-import javax.inject.Inject
-
-@ContributesBinding(SessionScope::class)
-class DefaultInviteStateDataSource @Inject constructor(
-    private val client: MatrixClient,
-    private val seenInvitesStore: SeenInvitesStore,
-    private val coroutineDispatchers: CoroutineDispatchers,
-) : InviteStateDataSource {
-    @Composable
-    override fun inviteState(): InvitesState {
-        val invites by client
-            .roomListService
-            .invites
-            .summaries
-            .collectAsState(initial = emptyList())
-
-        val seenInvites by seenInvitesStore
-            .seenRoomIds()
-            .collectAsState(initial = emptySet())
-
-        var state by remember { mutableStateOf(InvitesState.NoInvites) }
-
-        LaunchedEffect(invites, seenInvites) {
-            withContext(coroutineDispatchers.computation) {
-                state = when {
-                    invites.isEmpty() -> InvitesState.NoInvites
-                    seenInvites.containsAll(invites.roomIds) -> InvitesState.SeenInvites
-                    else -> InvitesState.NewInvites
-                }
-            }
-        }
-
-        return state
-    }
-}
-
-private val List<RoomSummary>.roomIds: Collection<RoomId>
-    get() = filterIsInstance<RoomSummary.Filled>().map { it.details.roomId }

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/datasource/InviteStateDataSource.kt

@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2023 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.element.android.features.roomlist.impl.datasource
-
-import androidx.compose.runtime.Composable
-import io.element.android.features.roomlist.impl.InvitesState
-
-interface InviteStateDataSource {
-    @Composable
-    fun inviteState(): InvitesState
-}

features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTests.kt

@@ -28,7 +28,6 @@ import io.element.android.features.networkmonitor.api.NetworkMonitor
 import io.element.android.features.networkmonitor.test.FakeNetworkMonitor
 import io.element.android.features.preferences.api.store.SessionPreferencesStore
 import io.element.android.features.roomlist.impl.datasource.FakeInviteDataSource
-import io.element.android.features.roomlist.impl.datasource.InviteStateDataSource
 import io.element.android.features.roomlist.impl.datasource.RoomListDataSource
 import io.element.android.features.roomlist.impl.datasource.RoomListRoomSummaryFactory
 import io.element.android.features.roomlist.impl.filters.RoomListFiltersState