[Feature] Room list invites #2714

ganfra · 2024-04-16T13:52:47Z

Type of change

Feature
Bugfix
Technical
Other :

Content

Show invites as part of the room list :

Remove the separate invites list
Move the invites into the room list
Add an invites filter
Tapping an invite row outside "Decline" and "Accept" buttons open the room flow.
Tapping an invite notification open the room flow too.

Motivation and context

Closes #2707

…tification

github-actions · 2024-04-16T14:15:54Z

📱 Scan the QR code below to install the build (arm64 only) for this PR.

If you can't scan the QR code you can install the build via this link: https://i.diawi.com/t1DhWf

codecov · 2024-04-16T15:10:53Z

Codecov Report

Attention: Patch coverage is 82.79570% with 48 lines in your changes are missing coverage. Please review.

Project coverage is 72.92%. Comparing base (166063f) to head (90e273c).
Report is 33 commits behind head on develop.

Files	Patch %	Lines
...eatures/roomlist/impl/components/RoomSummaryRow.kt	83.45%	2 Missing and 21 partials ⚠️
...list/impl/datasource/RoomListRoomSummaryFactory.kt	30.00%	13 Missing and 1 partial ⚠️
...d/features/roomlist/impl/filters/RoomListFilter.kt	42.85%	4 Missing ⚠️
...es/roomlist/impl/components/RoomListContentView.kt	70.00%	1 Missing and 2 partials ⚠️
...droid/features/roomlist/impl/model/InviteSender.kt	87.50%	1 Missing and 1 partial ⚠️
...ndroid/features/roomlist/impl/RoomListPresenter.kt	92.85%	0 Missing and 1 partial ⚠️
...id/libraries/matrix/api/roomlist/RoomListFilter.kt	0.00%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #2714      +/-   ##
===========================================
- Coverage    73.13%   72.92%   -0.21%     
===========================================
  Files         1478     1467      -11     
  Lines        35709    35529     -180     
  Branches      6862     6851      -11     
===========================================
- Hits         26114    25911     -203     
- Misses        6043     6077      +34     
+ Partials      3552     3541      -11

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

bmarty

Awesome work, thanks!

Testing OK on my side, only minor remarks that are not blocking.

bmarty · 2024-04-17T06:51:43Z

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

            onRoomSettingsClicked = this::onRoomSettingsClicked,
            onMenuActionClicked = { onMenuActionClicked(activity, it) },
            onRoomDirectorySearchClicked = this::onRoomDirectorySearchClicked,
            modifier = modifier,
-        )
+        ) {
+            acceptDeclineInviteView.Render(


For clarity, maybe acceptDeclineInviteView should be renamed to acceptDeclineInviteDialogs? (can be done later)

bmarty · 2024-04-17T06:53:01Z

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

@@ -71,6 +74,7 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.takeWhile
 import kotlinx.coroutines.launch
+import org.jetbrains.annotations.VisibleForTesting


We also use androidx.annotation.VisibleForTesting, not sure what's best

I've changed so we have only one

bmarty · 2024-04-17T06:55:30Z

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

@@ -214,7 +225,7 @@ class RoomListPresenter @Inject constructor(
        val initialState = RoomListState.ContextMenu.Shown(
            roomId = event.roomListRoomSummary.roomId,
            roomName = event.roomListRoomSummary.name,
-            isDm = event.roomListRoomSummary.isDm,
+            isDm = event.roomListRoomSummary.isDirect,


moar confusion here... We should revisit isDm and isDirect terminology and ensure of consistency across the project....

Yes I know this is messed up... I should probably have both values so it's not changing what we have.

bmarty · 2024-04-17T06:59:13Z

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

    modifier: Modifier = Modifier
 ) {
-    Box(
+    EmptyScaffold(


Thanks for having removed the useless Box!

bmarty · 2024-04-17T07:06:34Z

...ist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFilter.kt

-            Favourites -> null
+            Rooms -> setOf(People, Invites)
+            People -> setOf(Rooms, Invites)
+            Unread -> setOf(Invites)


Not sure, but we may want to have "unread" invites. Also the green dot on invite item in room list should be hidden when the invite has been visited.

This has been discussed, and for now invites should be shown only when no filter is selected or only the "invite" filter. Also the green dot should stay, at least from what I've been told.

bmarty · 2024-04-17T07:07:59Z

...oomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/InviteSender.kt

+import io.element.android.libraries.matrix.api.core.UserId
+
+@Immutable
+data class InviteSender(


Maybe use InviteSender to the invite screen, instead of the RoomId?

Will do later

bmarty · 2024-04-17T07:11:32Z

...oomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/InviteSender.kt

+    @Composable
+    fun annotatedString(): AnnotatedString {
+        return stringResource(R.string.screen_invites_invited_you, displayName, userId.value).let { text ->
+            val senderNameStart = LocalContext.current.getString(R.string.screen_invites_invited_you).indexOf("%1\$s")


Searching for %1$s seems a bit risky regarding translated strings, but let's see.

The code was already like that, I didn't touch it...

bmarty · 2024-04-17T07:12:25Z

...c/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryProvider.kt

+                aRoomListRoomSummary(
+                    name = "Bob",
+                    displayType = RoomSummaryDisplayType.INVITE,
+                    inviteSender = InviteSender(


Maybe extract a fun anInviteSender()?

bmarty · 2024-04-17T07:13:35Z

...atrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomListFilter.kt

@@ -57,6 +57,11 @@ sealed interface RoomListFilter {
     */
    data object Favorite : RoomListFilter

+    /**
+     * A filter that matches rooms that with Invited membership.


Suggested change

* A filter that matches rooms that with Invited membership.

* A filter that matches rooms with Invited membership.

sonarqubecloud · 2024-04-17T20:12:22Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

ganfra added 9 commits April 15, 2024 16:58

Room list : activate merged invites in Client

9d87240

RoomList : invite row

26eaed5

RoomList: branch accept/decline invite actions

c102c5b

RoomList : add invite filter

43e336c

Invite : remove invitelist entry points

4dbcd07

RoomList : make invite filter truly exclusive

3e13191

Invites : open room instead of invite list when clicking an invite no…

997c460

…tification

RoomList invites : update and remove tests

e72983f

Room list invites : clean and format

e171472

ganfra added the Record-Screenshots Runs the 'Record Screenshots' CI job and adds a commit with any new screenshots found. label Apr 16, 2024

github-actions bot removed the Record-Screenshots Runs the 'Record Screenshots' CI job and adds a commit with any new screenshots found. label Apr 16, 2024

Update screenshots

253d8aa

ganfra changed the title ~~Feature/fga/room list invites~~ [Feature] Room list invites Apr 16, 2024

ganfra marked this pull request as ready for review April 16, 2024 14:45

ganfra requested a review from a team as a code owner April 16, 2024 14:45

ganfra requested review from bmarty and removed request for a team April 16, 2024 14:45

Room list invite: remove remaining inviteList test

97e79d9

bmarty approved these changes Apr 17, 2024

View reviewed changes

Room list invites: address some remarks and add small tests

90e273c

ganfra added the Run-Maestro Starts a Maestro Cloud session to run integration tests label Apr 17, 2024

github-actions bot removed the Run-Maestro Starts a Maestro Cloud session to run integration tests label Apr 17, 2024

ganfra enabled auto-merge April 17, 2024 20:30

ganfra merged commit 0cda5b9 into develop Apr 17, 2024
18 of 19 checks passed

ganfra deleted the feature/fga/room_list_invites branch April 17, 2024 21:04

ganfra mentioned this pull request Apr 18, 2024

Room Preview iteration #2729

Closed

9 tasks

bmarty mentioned this pull request Apr 3, 2025

Remove the green badge on a pending invite after a first preview #4532

Merged

9 tasks

	* A filter that matches rooms that with Invited membership.
	* A filter that matches rooms with Invited membership.

[Feature] Room list invites #2714

[Feature] Room list invites #2714

Uh oh!

Conversation

ganfra commented Apr 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Type of change

Content

Motivation and context

Uh oh!

github-actions bot commented Apr 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Apr 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

bmarty left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ganfra Apr 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Apr 17, 2024

Quality Gate passed

Uh oh!

Uh oh!

Uh oh!

ganfra commented Apr 16, 2024 •

edited

Loading

github-actions bot commented Apr 16, 2024 •

edited

Loading

codecov bot commented Apr 16, 2024 •

edited

Loading

ganfra Apr 17, 2024 •

edited

Loading