Merge branch 'develop' into feature/fga/image_loading

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

@@ -33,6 +33,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import io.element.android.features.createroom.impl.R
 import io.element.android.features.createroom.impl.components.UserListView
+import io.element.android.features.createroom.impl.userlist.UserListEvents
 import io.element.android.features.createroom.impl.userlist.UserListState
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
@@ -54,13 +55,17 @@ fun AddPeopleView(
     Scaffold(
         modifier = modifier,
         topBar = {
-            if (!state.isSearchActive) {
-                AddPeopleViewTopBar(
-                    hasSelectedUsers = state.selectedUsers.isNotEmpty(),
-                    onBackPressed = onBackPressed,
-                    onNextPressed = onNextPressed,
-                )
-            }
+            AddPeopleViewTopBar(
+                hasSelectedUsers = state.selectedUsers.isNotEmpty(),
+                onBackPressed = {
+                    if (state.isSearchActive) {
+                        state.eventSink(UserListEvents.OnSearchActiveChanged(false))
+                    } else {
+                        onBackPressed()
+                    }
+                },
+                onNextPressed = onNextPressed,
+            )
         }
     ) { padding ->
         Column(
@@ -73,6 +78,7 @@ fun AddPeopleView(
                 modifier = Modifier
                     .fillMaxWidth(),
                 state = state,
+                showBackButton = false,
             )
         }
     }

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

@@ -39,6 +39,7 @@ fun SearchUserBar(
     active: Boolean,
     isMultiSelectionEnabled: Boolean,
     modifier: Modifier = Modifier,
+    showBackButton: Boolean = true,
     placeHolderTitle: String = stringResource(R.string.common_search_for_someone),
     onActiveChanged: (Boolean) -> Unit = {},
     onTextChanged: (String) -> Unit = {},
@@ -52,6 +53,7 @@ fun SearchUserBar(
         onActiveChange = onActiveChanged,
         modifier = modifier,
         placeHolderTitle = placeHolderTitle,
+        showBackButton = showBackButton,
         contentPrefix = {
             if (isMultiSelectionEnabled && active && selectedUsers.isNotEmpty()) {
                 SelectedUsersList(

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

@@ -36,6 +36,7 @@ import io.element.android.libraries.matrix.ui.components.SelectedUsersList
 fun UserListView(
     state: UserListState,
     modifier: Modifier = Modifier,
+    showBackButton: Boolean = true,
     onUserSelected: (MatrixUser) -> Unit = {},
     onUserDeselected: (MatrixUser) -> Unit = {},
 ) {
@@ -49,6 +50,7 @@ fun UserListView(
             selectedUsers = state.selectedUsers,
             active = state.isSearchActive,
             isMultiSelectionEnabled = state.isMultiSelectionEnabled,
+            showBackButton = showBackButton,
             onActiveChanged = { state.eventSink(UserListEvents.OnSearchActiveChanged(it)) },
             onTextChanged = { state.eventSink(UserListEvents.UpdateSearchQuery(it)) },
             onUserSelected = {

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

@@ -19,7 +19,6 @@ package io.element.android.features.createroom.impl.root
 import io.element.android.libraries.matrix.api.user.MatrixUser
 
 sealed interface CreateRoomRootEvents {
-    object InvitePeople : CreateRoomRootEvents
     data class StartDM(val matrixUser: MatrixUser) : CreateRoomRootEvents
     object CancelStartDM : CreateRoomRootEvents
 }

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

@@ -16,8 +16,10 @@
 
 package io.element.android.features.createroom.impl.root
 
+import android.content.Context
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
@@ -25,14 +27,22 @@ import com.bumble.appyx.core.plugin.plugins
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
+import io.element.android.libraries.androidutils.system.startSharePlainTextIntent
+import io.element.android.libraries.core.meta.BuildMeta
 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.permalink.PermalinkBuilder
+import io.element.android.libraries.ui.strings.R
+import timber.log.Timber
 
 @ContributesNode(SessionScope::class)
 class CreateRoomRootNode @AssistedInject constructor(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     private val presenter: CreateRoomRootPresenter,
+    private val matrixClient: MatrixClient,
+    private val buildMeta: BuildMeta,
 ) : Node(buildContext, plugins = plugins) {
 
     interface Callback : Plugin {
@@ -53,12 +63,31 @@ class CreateRoomRootNode @AssistedInject constructor(
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
+        val context = LocalContext.current
         CreateRoomRootView(
             state = state,
             modifier = modifier,
             onClosePressed = this::navigateUp,
             onNewRoomClicked = callback::onCreateNewRoom,
             onOpenDM = callback::onStartChatSuccess,
+            onInviteFriendsClicked = { invitePeople(context) }
         )
     }
+
+    private fun invitePeople(context: Context) {
+        val permalinkResult = PermalinkBuilder.permalinkForUser(matrixClient.sessionId)
+        permalinkResult.onSuccess { permalink ->
+            val appName = buildMeta.applicationName
+            startSharePlainTextIntent(
+                context = context,
+                activityResultLauncher = null,
+                chooserTitle = context.getString(R.string.action_invite_friends),
+                text = context.getString(R.string.invite_friends_text, appName, permalink),
+                extraTitle = context.getString(R.string.invite_friends_rich_title, appName),
+                noActivityFoundMessage = context.getString(io.element.android.libraries.androidutils.R.string.error_no_compatible_app_found)
+            )
+        }.onFailure {
+            Timber.e(it)
+        }
+    }
 }

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

@@ -75,7 +75,6 @@ class CreateRoomRootPresenter @Inject constructor(
             when (event) {
                 is CreateRoomRootEvents.StartDM -> startDm(event.matrixUser)
                 CreateRoomRootEvents.CancelStartDM -> startDmAction.value = Async.Uninitialized
-                CreateRoomRootEvents.InvitePeople -> Unit // Todo Handle invite people action
             }
         }
 

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

@@ -64,6 +64,7 @@ fun CreateRoomRootView(
     onClosePressed: () -> Unit = {},
     onNewRoomClicked: () -> Unit = {},
     onOpenDM: (RoomId) -> Unit = {},
+    onInviteFriendsClicked: () -> Unit = {},
 ) {
     if (state.startDmAction is Async.Success) {
         LaunchedEffect(state.startDmAction) {
@@ -96,7 +97,7 @@ fun CreateRoomRootView(
             if (!state.userListState.isSearchActive) {
                 CreateRoomActionButtonsList(
                     onNewRoomClicked = onNewRoomClicked,
-                    onInvitePeopleClicked = { state.eventSink(CreateRoomRootEvents.InvitePeople) },
+                    onInvitePeopleClicked = onInviteFriendsClicked,
                 )
             }
         }

features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootPresenterTests.kt

@@ -62,16 +62,6 @@ class CreateRoomRootPresenterTests {
         }
     }
 
-    @Test
-    fun `present - trigger action buttons`() = runTest {
-        moleculeFlow(RecompositionClock.Immediate) {
-            presenter.present()
-        }.test {
-            val initialState = awaitItem()
-            initialState.eventSink(CreateRoomRootEvents.InvitePeople) // Not implemented yet
-        }
-    }
-
     @Test
     fun `present - trigger create DM action`() = runTest {
         moleculeFlow(RecompositionClock.Immediate) {