Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove named injection and provide presenter through a factory

Browse source
This commit is contained in:
Florian Renaud 2023-03-22 11:31:38 +01:00
parent a1fe191b64
commit d08a131429
11 changed files with 68 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

10
features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeoplePresenter.kt
View file

@ -17,17 +17,19 @@
package io.element.android.features.createroom.impl.addpeople
import androidx.compose.runtime.Composable
import io.element.android.features.selectusers.api.MULTI_SELECTION_USERS_VARIANT
import io.element.android.features.selectusers.api.SelectUsersPresenter
import io.element.android.features.selectusers.api.SelectUsersPresenterArgs
import io.element.android.libraries.architecture.Presenter
import javax.inject.Inject
import javax.inject.Named
class AddPeoplePresenter @Inject constructor(
@Named(MULTI_SELECTION_USERS_VARIANT)
private val selectUsersPresenter: SelectUsersPresenter,
private val selectUsersPresenterFactory: SelectUsersPresenter.Factory,
) : Presenter<AddPeopleState> {
private val selectUsersPresenter by lazy {
selectUsersPresenterFactory.create(SelectUsersPresenterArgs(isMultiSelectionEnabled = true))
}
@Composable
override fun present(): AddPeopleState {
val selectUsersState = selectUsersPresenter.present()

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

@ -17,22 +17,24 @@
package io.element.android.features.createroom.impl.root
import androidx.compose.runtime.Composable
import io.element.android.features.selectusers.api.SINGLE_SELECTION_USERS_VARIANT
import io.element.android.features.selectusers.api.SelectUsersPresenter
import io.element.android.features.selectusers.api.SelectUsersPresenterArgs
import io.element.android.libraries.architecture.Presenter
import io.element.android.libraries.matrix.ui.model.MatrixUser
import timber.log.Timber
import javax.inject.Inject
import javax.inject.Named
class CreateRoomRootPresenter @Inject constructor(
@Named(SINGLE_SELECTION_USERS_VARIANT)
private val selectUsersPresenter: SelectUsersPresenter,
private val presenterFactory: SelectUsersPresenter.Factory,
) : Presenter<CreateRoomRootState> {
private val presenter by lazy {
presenterFactory.create(SelectUsersPresenterArgs(isMultiSelectionEnabled = false))
}
@Composable
override fun present(): CreateRoomRootState {
val selectUsersState = selectUsersPresenter.present()
val selectUsersState = presenter.present()
fun handleEvents(event: CreateRoomRootEvents) {
when (event) {

16
features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeoplePresenterTests.kt
View file

@ -22,17 +22,27 @@ import app.cash.molecule.RecompositionClock
import app.cash.molecule.moleculeFlow
import app.cash.turbine.test
import com.google.common.truth.Truth.assertThat
import io.element.android.features.selectusers.impl.DefaultSelectMultipleUsersPresenter
import io.element.android.features.selectusers.api.SelectUsersPresenterArgs
import io.element.android.features.selectusers.impl.DefaultSelectUsersPresenter
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.test.runTest
import org.junit.Before
import org.junit.Test
class AddPeoplePresenterTests {
private lateinit var presenter: AddPeoplePresenter
@Before
fun setup() {
val selectUsersFactory = object : DefaultSelectUsersPresenter.DefaultSelectUsersFactory {
override fun create(args: SelectUsersPresenterArgs) = DefaultSelectUsersPresenter(args)
}
presenter = AddPeoplePresenter(selectUsersFactory)
}
@Test
fun `present - initial state`() = runTest {
val selectUsersPresenter = DefaultSelectMultipleUsersPresenter()
val presenter = AddPeoplePresenter(selectUsersPresenter)
moleculeFlow(RecompositionClock.Immediate) {
presenter.present()
}.test {

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

@ -22,19 +22,29 @@ import app.cash.molecule.RecompositionClock
import app.cash.molecule.moleculeFlow
import app.cash.turbine.test
import com.google.common.truth.Truth.assertThat
import io.element.android.features.selectusers.impl.DefaultSelectSingleUserPresenter
import io.element.android.features.selectusers.api.SelectUsersPresenterArgs
import io.element.android.features.selectusers.impl.DefaultSelectUsersPresenter
import io.element.android.libraries.matrix.api.core.UserId
import io.element.android.libraries.matrix.ui.model.MatrixUser
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.test.runTest
import org.junit.Before
import org.junit.Test
class CreateRoomRootPresenterTests {
private lateinit var presenter: CreateRoomRootPresenter
@Before
fun setup() {
val selectUsersPresenter = object : DefaultSelectUsersPresenter.DefaultSelectUsersFactory {
override fun create(args: SelectUsersPresenterArgs) = DefaultSelectUsersPresenter(args)
}
presenter = CreateRoomRootPresenter(selectUsersPresenter)
}
@Test
fun `present - initial state`() = runTest {
val selectUsersPresenter = DefaultSelectSingleUserPresenter()
val presenter = CreateRoomRootPresenter(selectUsersPresenter)
moleculeFlow(RecompositionClock.Immediate) {
presenter.present()
}.test {
@ -45,8 +55,6 @@ class CreateRoomRootPresenterTests {
@Test
fun `present - trigger action buttons`() = runTest {
val selectUsersPresenter = DefaultSelectSingleUserPresenter()
val presenter = CreateRoomRootPresenter(selectUsersPresenter)
moleculeFlow(RecompositionClock.Immediate) {
presenter.present()
}.test {
@ -57,8 +65,6 @@ class CreateRoomRootPresenterTests {
@Test
fun `present - trigger start DM action`() = runTest {
val selectUsersPresenter = DefaultSelectSingleUserPresenter()
val presenter = CreateRoomRootPresenter(selectUsersPresenter)
moleculeFlow(RecompositionClock.Immediate) {
presenter.present()
}.test {