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

Remove useless selectedUsers parameter

Browse source
This commit is contained in:
Florian Renaud 2023-04-13 11:37:17 +02:00
parent 93b06116a3
commit 9cbfa4096a
3 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/ConfigureRoomFlowNode.kt
View file

@ -37,7 +37,6 @@ import io.element.android.libraries.architecture.bindings
import io.element.android.libraries.architecture.createNode import io.element.android.libraries.architecture.createNode
import io.element.android.libraries.di.DaggerComponentOwner import io.element.android.libraries.di.DaggerComponentOwner
import io.element.android.libraries.di.SessionScope import io.element.android.libraries.di.SessionScope
import io.element.android.libraries.matrix.ui.model.MatrixUser
import kotlinx.parcelize.Parcelize import kotlinx.parcelize.Parcelize
@ContributesNode(SessionScope::class) @ContributesNode(SessionScope::class)
@ -73,7 +72,7 @@ class ConfigureRoomFlowNode @AssistedInject constructor(
return when (navTarget) { return when (navTarget) {
NavTarget.Root -> { NavTarget.Root -> {
val callback = object : AddPeopleNode.Callback { val callback = object : AddPeopleNode.Callback {
override fun onContinue(selectedUsers: List<MatrixUser>) { override fun onContinue() {
backstack.push(NavTarget.ConfigureRoom) backstack.push(NavTarget.ConfigureRoom)
} }
} }

9
features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleNode.kt
View file

@ -26,7 +26,6 @@ import dagger.assisted.Assisted
import dagger.assisted.AssistedInject import dagger.assisted.AssistedInject
import io.element.android.anvilannotations.ContributesNode import io.element.android.anvilannotations.ContributesNode
import io.element.android.features.createroom.impl.di.CreateRoomScope import io.element.android.features.createroom.impl.di.CreateRoomScope
import io.element.android.libraries.matrix.ui.model.MatrixUser
@ContributesNode(CreateRoomScope::class) @ContributesNode(CreateRoomScope::class)
class AddPeopleNode @AssistedInject constructor( class AddPeopleNode @AssistedInject constructor(
@ -36,11 +35,11 @@ class AddPeopleNode @AssistedInject constructor(
) : Node(buildContext, plugins = plugins) { ) : Node(buildContext, plugins = plugins) {
interface Callback : Plugin { interface Callback : Plugin {
fun onContinue(selectedUsers: List<MatrixUser>) fun onContinue()
} }
private fun onContinue(selectedUsers: List<MatrixUser>) { private fun onContinue() {
plugins<Callback>().forEach { it.onContinue(selectedUsers) } plugins<Callback>().forEach { it.onContinue() }
} }
@Composable @Composable
@ -49,7 +48,7 @@ class AddPeopleNode @AssistedInject constructor(
AddPeopleView( AddPeopleView(
state = state, state = state,
modifier = modifier, modifier = modifier,
onBackPressed = { navigateUp() }, onBackPressed = this::navigateUp,
onNextPressed = this::onContinue, onNextPressed = this::onContinue,
) )
} }

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

@ -39,7 +39,6 @@ import io.element.android.libraries.designsystem.theme.components.CenterAlignedT
import io.element.android.libraries.designsystem.theme.components.Scaffold import io.element.android.libraries.designsystem.theme.components.Scaffold
import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.designsystem.theme.components.TextButton import io.element.android.libraries.designsystem.theme.components.TextButton
import io.element.android.libraries.matrix.ui.model.MatrixUser
import io.element.android.libraries.ui.strings.R as StringR import io.element.android.libraries.ui.strings.R as StringR
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
@ -48,7 +47,7 @@ fun AddPeopleView(
state: UserListState, state: UserListState,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
onBackPressed: () -> Unit = {}, onBackPressed: () -> Unit = {},
onNextPressed: (List<MatrixUser>) -> Unit = {}, onNextPressed: () -> Unit = {},
) { ) {
Scaffold( Scaffold(
topBar = { topBar = {
@ -56,7 +55,7 @@ fun AddPeopleView(
AddPeopleViewTopBar( AddPeopleViewTopBar(
hasSelectedUsers = state.selectedUsers.isNotEmpty(), hasSelectedUsers = state.selectedUsers.isNotEmpty(),
onBackPressed = onBackPressed, onBackPressed = onBackPressed,
onNextPressed = { onNextPressed(state.selectedUsers) }, onNextPressed = onNextPressed,
) )
} }
} }