Merge remote-tracking branch 'origin/develop' into misc/jme/2579-move…

…-session-recovery-to-ftue

.github/workflows/generate_github_pages.yml

@@ -32,7 +32,7 @@ jobs:
           mkdir -p screenshots/en
           cp tests/uitests/src/test/snapshots/images/* screenshots/en
       - name: Deploy GitHub Pages
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./screenshots

app/src/main/kotlin/io/element/android/x/MainActivity.kt

@@ -19,6 +19,7 @@ package io.element.android.x
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
@@ -31,7 +32,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.core.view.WindowCompat
 import com.bumble.appyx.core.integration.NodeHost
 import com.bumble.appyx.core.integrationpoint.NodeActivity
 import com.bumble.appyx.core.plugin.NodeReadyObserver
@@ -60,7 +60,7 @@ class MainActivity : NodeActivity() {
         super.onCreate(savedInstanceState)
         appBindings = bindings()
         appBindings.lockScreenService().handleSecureFlag(this)
-        WindowCompat.setDecorFitsSystemWindows(window, false)
+        enableEdgeToEdge()
         setContent {
             MainContent(appBindings)
         }

appnav/src/main/kotlin/io/element/android/appnav/room/RoomLoadedFlowNode.kt

@@ -40,6 +40,7 @@ import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.di.DaggerComponentOwner
 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.core.UserId
 import io.element.android.libraries.matrix.api.room.MatrixRoom
@@ -61,6 +62,7 @@ class RoomLoadedFlowNode @AssistedInject constructor(
     private val roomDetailsEntryPoint: RoomDetailsEntryPoint,
     private val appNavigationStateService: AppNavigationStateService,
     private val appCoroutineScope: CoroutineScope,
+    private val matrixClient: MatrixClient,
     roomComponentFactory: RoomComponentFactory,
     roomMembershipObserver: RoomMembershipObserver,
 ) : BaseFlowNode<RoomLoadedFlowNode.NavTarget>(
@@ -92,6 +94,7 @@ class RoomLoadedFlowNode @AssistedInject constructor(
                 Timber.v("OnCreate => ${inputs.room.roomId}")
                 appNavigationStateService.onNavigateToRoom(id, inputs.room.roomId)
                 fetchRoomMembers()
+                trackVisitedRoom()
             },
             onResume = {
                 appCoroutineScope.launch {
@@ -117,6 +120,10 @@ class RoomLoadedFlowNode @AssistedInject constructor(
         inputs<Inputs>()
     }
 
+    private fun trackVisitedRoom() = lifecycleScope.launch {
+        matrixClient.trackRecentlyVisitedRoom(inputs.room.roomId)
+    }
+
     private fun fetchRoomMembers() = lifecycleScope.launch {
         inputs.room.updateMembers()
     }

appnav/src/test/kotlin/io/element/android/appnav/RoomFlowNodeTest.kt

@@ -33,6 +33,7 @@ import io.element.android.features.roomdetails.api.RoomDetailsEntryPoint
 import io.element.android.libraries.architecture.childNode
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
+import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
 import io.element.android.services.appnavstate.test.FakeAppNavigationStateService
 import kotlinx.coroutines.CoroutineScope
@@ -101,6 +102,7 @@ class RoomFlowNodeTest {
         roomMembershipObserver = RoomMembershipObserver(),
         appCoroutineScope = coroutineScope,
         roomComponentFactory = FakeRoomComponentFactory(),
+        matrixClient = FakeMatrixClient(),
     )
 
     @Test

changelog.d/2581.misc

@@ -0,0 +1 @@
+Improve UI for notification permission screen in onboarding.

changelog.d/2593.misc

@@ -0,0 +1 @@
+Categorise members by role in change roles screen.

changelog.d/2634.misc

@@ -0,0 +1 @@
+Show users from last visited DM as suggestion when starting a Chat or when creating a Room.

changelog.d/2650.feature

@@ -0,0 +1 @@
+Add action to copy permalink

changelog.d/2667.bugfix

@@ -0,0 +1 @@
+Fall back to name-based generated avatars when image avatars don't load.

features/createroom/impl/build.gradle.kts

@@ -69,6 +69,8 @@ dependencies {
     testImplementation(projects.libraries.usersearch.test)
     testImplementation(projects.features.createroom.test)
     testImplementation(projects.tests.testutils)
+    testImplementation(libs.androidx.compose.ui.test.junit)
+    testReleaseImplementation(libs.androidx.compose.ui.test.manifest)
 
     ksp(libs.showkase.processor)
 }

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleUserListStateProvider.kt

@@ -19,6 +19,7 @@ package io.element.android.features.createroom.impl.addpeople
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.createroom.impl.userlist.SelectionMode
 import io.element.android.features.createroom.impl.userlist.UserListState
+import io.element.android.features.createroom.impl.userlist.aRecentDirectRoomList
 import io.element.android.features.createroom.impl.userlist.aUserListState
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
 import io.element.android.libraries.matrix.ui.components.aMatrixUserList
@@ -29,13 +30,13 @@ open class AddPeopleUserListStateProvider : PreviewParameterProvider<UserListSta
     override val values: Sequence<UserListState>
         get() = sequenceOf(
             aUserListState(),
-            aUserListState().copy(
+            aUserListState(
                 searchResults = SearchBarResultState.Results(aMatrixUserList().toImmutableList()),
                 selectedUsers = aMatrixUserList().toImmutableList(),
                 isSearchActive = false,
                 selectionMode = SelectionMode.Multiple,
             ),
-            aUserListState().copy(
+            aUserListState(
                 searchResults = SearchBarResultState.Results(
                     aMatrixUserList()
                         .mapIndexed { index, matrixUser ->
@@ -46,6 +47,9 @@ open class AddPeopleUserListStateProvider : PreviewParameterProvider<UserListSta
                 selectedUsers = aMatrixUserList().toImmutableList(),
                 isSearchActive = true,
                 selectionMode = SelectionMode.Multiple,
-            )
+            ),
+            aUserListState(
+                recentDirectRooms = aRecentDirectRoomList(),
+            ),
         )
 }

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt

@@ -16,10 +16,8 @@
 
 package io.element.android.features.createroom.impl.addpeople
 
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
@@ -64,21 +62,16 @@ fun AddPeopleView(
             )
         }
     ) { padding ->
-        Column(
+        UserListView(
             modifier = Modifier
                 .fillMaxSize()
                 .padding(padding)
                 .consumeWindowInsets(padding),
-        ) {
-            UserListView(
-                modifier = Modifier
-                    .fillMaxWidth(),
-                state = state,
-                showBackButton = false,
-                onUserSelected = { },
-                onUserDeselected = {},
-            )
-        }
+            state = state,
+            showBackButton = false,
+            onUserSelected = {},
+            onUserDeselected = {},
+        )
     }
 }
 

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/UserListView.kt

@@ -19,17 +19,27 @@ package io.element.android.features.createroom.impl.components
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 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.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.HorizontalDivider
+import io.element.android.libraries.designsystem.theme.components.ListSectionHeader
 import io.element.android.libraries.matrix.api.user.MatrixUser
+import io.element.android.libraries.matrix.ui.components.CheckableUserRow
+import io.element.android.libraries.matrix.ui.components.CheckableUserRowData
 import io.element.android.libraries.matrix.ui.components.SelectedUsersRowList
+import io.element.android.libraries.matrix.ui.model.getAvatarData
+import io.element.android.libraries.matrix.ui.model.getBestName
+import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 fun UserListView(
@@ -74,6 +84,43 @@ fun UserListView(
                 },
             )
         }
+        if (!state.isSearchActive && state.recentDirectRooms.isNotEmpty()) {
+            LazyColumn {
+                item {
+                    ListSectionHeader(
+                        title = stringResource(id = CommonStrings.common_suggestions),
+                        hasDivider = false,
+                    )
+                }
+                state.recentDirectRooms.forEachIndexed { index, recentDirectRoom ->
+                    item {
+                        val isSelected = state.selectedUsers.any {
+                            recentDirectRoom.matrixUser.userId == it.userId
+                        }
+                        CheckableUserRow(
+                            checked = isSelected,
+                            onCheckedChange = {
+                                if (isSelected) {
+                                    state.eventSink(UserListEvents.RemoveFromSelection(recentDirectRoom.matrixUser))
+                                    onUserDeselected(recentDirectRoom.matrixUser)
+                                } else {
+                                    state.eventSink(UserListEvents.AddToSelection(recentDirectRoom.matrixUser))
+                                    onUserSelected(recentDirectRoom.matrixUser)
+                                }
+                            },
+                            data = CheckableUserRowData.Resolved(
+                                avatarData = recentDirectRoom.matrixUser.getAvatarData(AvatarSize.UserListItem),
+                                name = recentDirectRoom.matrixUser.getBestName(),
+                                subtext = recentDirectRoom.matrixUser.userId.value,
+                            ),
+                        )
+                        if (index < state.recentDirectRooms.lastIndex) {
+                            HorizontalDivider()
+                        }
+                    }
+                }
+            }
+        }
     }
 }
 

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootStateProvider.kt

@@ -17,9 +17,12 @@
 package io.element.android.features.createroom.impl.root
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.features.createroom.impl.userlist.UserListState
+import io.element.android.features.createroom.impl.userlist.aRecentDirectRoomList
 import io.element.android.features.createroom.impl.userlist.aUserListState
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
+import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.ui.components.aMatrixUser
 import io.element.android.libraries.usersearch.api.UserSearchResult
 import kotlinx.collections.immutable.persistentListOf
@@ -28,7 +31,7 @@ open class CreateRoomRootStateProvider : PreviewParameterProvider<CreateRoomRoot
     override val values: Sequence<CreateRoomRootState>
         get() = sequenceOf(
             aCreateRoomRootState(),
-            aCreateRoomRootState().copy(
+            aCreateRoomRootState(
                 startDmAction = AsyncAction.Loading,
                 userListState = aMatrixUser().let {
                     aUserListState().copy(
@@ -39,7 +42,7 @@ open class CreateRoomRootStateProvider : PreviewParameterProvider<CreateRoomRoot
                     )
                 }
             ),
-            aCreateRoomRootState().copy(
+            aCreateRoomRootState(
                 startDmAction = AsyncAction.Failure(Throwable("error")),
                 userListState = aMatrixUser().let {
                     aUserListState().copy(
@@ -50,12 +53,22 @@ open class CreateRoomRootStateProvider : PreviewParameterProvider<CreateRoomRoot
                     )
                 }
             ),
+            aCreateRoomRootState(
+                userListState = aUserListState(
+                    recentDirectRooms = aRecentDirectRoomList()
+                )
+            ),
         )
 }
 
-fun aCreateRoomRootState() = CreateRoomRootState(
-    eventSink = {},
-    applicationName = "Element X Preview",
-    startDmAction = AsyncAction.Uninitialized,
-    userListState = aUserListState(),
+fun aCreateRoomRootState(
+    applicationName: String = "Element X Preview",
+    userListState: UserListState = aUserListState(),
+    startDmAction: AsyncAction<RoomId> = AsyncAction.Uninitialized,
+    eventSink: (CreateRoomRootEvents) -> Unit = {},
+) = CreateRoomRootState(
+    applicationName = applicationName,
+    userListState = userListState,
+    startDmAction = startDmAction,
+    eventSink = eventSink,
 )