Merge pull request #580 from vector-im/misc/cjs/invite-string-change

Fix strings and preview provider for creating rooms

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

@@ -29,6 +29,7 @@ import io.element.android.features.createroom.impl.userlist.UserListPresenterArg
 import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.execute
+import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.user.MatrixUser
@@ -44,6 +45,7 @@ class CreateRoomRootPresenter @Inject constructor(
     private val userListDataStore: UserListDataStore,
     private val matrixClient: MatrixClient,
     private val analyticsService: AnalyticsService,
+    private val buildMeta: BuildMeta,
 ) : Presenter<CreateRoomRootState> {
 
     private val presenter by lazy {
@@ -82,6 +84,7 @@ class CreateRoomRootPresenter @Inject constructor(
         }
 
         return CreateRoomRootState(
+            applicationName = buildMeta.applicationName,
             userListState = userListState,
             startDmAction = startDmAction.value,
             eventSink = ::handleEvents,

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

@@ -21,6 +21,7 @@ import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.matrix.api.core.RoomId
 
 data class CreateRoomRootState(
+    val applicationName: String,
     val userListState: UserListState,
     val startDmAction: Async<RoomId>,
     val eventSink: (CreateRoomRootEvents) -> Unit,

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

@@ -22,6 +22,7 @@ import io.element.android.features.createroom.impl.userlist.aUserListState
 import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
 import io.element.android.libraries.matrix.ui.components.aMatrixUser
+import io.element.android.libraries.usersearch.api.UserSearchResult
 import kotlinx.collections.immutable.persistentListOf
 
 open class CreateRoomRootStateProvider : PreviewParameterProvider<CreateRoomRootState> {
@@ -33,7 +34,7 @@ open class CreateRoomRootStateProvider : PreviewParameterProvider<CreateRoomRoot
                 userListState = aMatrixUser().let {
                     aUserListState().copy(
                         searchQuery = it.userId.value,
-                        searchResults = SearchBarResultState.Results(persistentListOf(it)),
+                        searchResults = SearchBarResultState.Results(persistentListOf(UserSearchResult(it, false))),
                         selectedUsers = persistentListOf(it),
                         isSearchActive = true,
                     )
@@ -44,7 +45,7 @@ open class CreateRoomRootStateProvider : PreviewParameterProvider<CreateRoomRoot
                 userListState = aMatrixUser().let {
                     aUserListState().copy(
                         searchQuery = it.userId.value,
-                        searchResults = SearchBarResultState.Results(persistentListOf(it)),
+                        searchResults = SearchBarResultState.Results(persistentListOf(UserSearchResult(it, false))),
                         selectedUsers = persistentListOf(it),
                         isSearchActive = true,
                     )
@@ -55,6 +56,7 @@ open class CreateRoomRootStateProvider : PreviewParameterProvider<CreateRoomRoot
 
 fun aCreateRoomRootState() = CreateRoomRootState(
     eventSink = {},
+    applicationName = "Element X Preview",
     startDmAction = Async.Uninitialized,
     userListState = aUserListState(),
 )

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

@@ -97,6 +97,7 @@ fun CreateRoomRootView(
 
             if (!state.userListState.isSearchActive) {
                 CreateRoomActionButtonsList(
+                    state = state,
                     onNewRoomClicked = onNewRoomClicked,
                     onInvitePeopleClicked = onInviteFriendsClicked,
                 )
@@ -155,6 +156,7 @@ fun CreateRoomRootViewTopBar(
 
 @Composable
 fun CreateRoomActionButtonsList(
+    state: CreateRoomRootState,
     modifier: Modifier = Modifier,
     onNewRoomClicked: () -> Unit = {},
     onInvitePeopleClicked: () -> Unit = {},
@@ -167,7 +169,7 @@ fun CreateRoomActionButtonsList(
         )
         CreateRoomActionButton(
             iconRes = DrawableR.drawable.ic_share,
-            text = stringResource(id = R.string.screen_create_room_action_invite_people),
+            text = stringResource(id = StringR.string.action_invite_friends_to_app, state.applicationName),
             onClick = onInvitePeopleClicked,
         )
     }

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

@@ -27,6 +27,8 @@ import io.element.android.features.createroom.impl.userlist.FakeUserListPresente
 import io.element.android.features.createroom.impl.userlist.UserListDataStore
 import io.element.android.features.createroom.impl.userlist.aUserListState
 import io.element.android.libraries.architecture.Async
+import io.element.android.libraries.core.meta.BuildMeta
+import io.element.android.libraries.core.meta.BuildType
 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.user.MatrixUser
@@ -59,6 +61,7 @@ class CreateRoomRootPresenterTests {
             userListDataStore = UserListDataStore(),
             matrixClient = fakeMatrixClient,
             analyticsService = fakeAnalyticsService,
+            buildMeta = aBuildMeta(),
         )
     }
 
@@ -68,7 +71,11 @@ class CreateRoomRootPresenterTests {
             presenter.present()
         }.test {
             val initialState = awaitItem()
-            assertThat(initialState)
+            assertThat(initialState.startDmAction).isInstanceOf(Async.Uninitialized::class.java)
+            assertThat(initialState.applicationName).isEqualTo(aBuildMeta().applicationName)
+            assertThat(initialState.userListState.selectedUsers).isEmpty()
+            assertThat(initialState.userListState.isSearchActive).isFalse()
+            assertThat(initialState.userListState.isMultiSelectionEnabled).isFalse()
         }
     }
 
@@ -176,3 +183,18 @@ class CreateRoomRootPresenterTests {
         }
     }
 }
+
+private fun aBuildMeta() =
+    BuildMeta(
+        buildType = BuildType.DEBUG,
+        isDebuggable = true,
+        applicationId = "",
+        applicationName = "An Application",
+        lowPrivacyLoggingEnabled = true,
+        versionName = "",
+        gitRevision = "",
+        gitBranchName = "",
+        gitRevisionDate = "",
+        flavorDescription = "",
+        flavorShortDescription = "",
+    )