Fixes after rebase
This commit is contained in:
parent
ddf9e5055e
commit
e8328858ab
117 changed files with 310 additions and 295 deletions
|
|
@ -18,7 +18,7 @@ import io.element.android.libraries.matrix.api.core.RoomId
|
|||
|
||||
@ContributesBinding(SessionScope::class)
|
||||
@Inject
|
||||
class DefaultAcceptDeclineInviteView() : AcceptDeclineInviteView {
|
||||
class DefaultAcceptDeclineInviteView : AcceptDeclineInviteView {
|
||||
@Composable
|
||||
override fun Render(
|
||||
state: AcceptDeclineInviteState,
|
||||
|
|
|
|||
|
|
@ -25,20 +25,20 @@ import io.element.android.libraries.di.SessionScope
|
|||
class DeclineAndBlockNode(
|
||||
@Assisted buildContext: BuildContext,
|
||||
@Assisted plugins: List<Plugin>,
|
||||
// presenterFactory: DeclineAndBlockPresenter.Factory,
|
||||
presenterFactory: DeclineAndBlockPresenter.Factory,
|
||||
) : Node(buildContext, plugins = plugins) {
|
||||
data class Inputs(val inviteData: InviteData) : NodeInputs
|
||||
|
||||
private val inviteData = inputs<Inputs>().inviteData
|
||||
// private val presenter = presenterFactory.create(inviteData)
|
||||
private val presenter = presenterFactory.create(inviteData)
|
||||
|
||||
@Composable
|
||||
override fun View(modifier: Modifier) {
|
||||
// val state = presenter.present()
|
||||
// DeclineAndBlockView(
|
||||
// state = state,
|
||||
// onBackClick = ::navigateUp,
|
||||
// modifier = modifier
|
||||
// )
|
||||
val state = presenter.present()
|
||||
DeclineAndBlockView(
|
||||
state = state,
|
||||
onBackClick = ::navigateUp,
|
||||
modifier = modifier
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ import io.element.android.libraries.architecture.createNode
|
|||
|
||||
@ContributesBinding(AppScope::class)
|
||||
@Inject
|
||||
class DefaultDeclineAndBlockEntryPoint() : DeclineInviteAndBlockEntryPoint {
|
||||
class DefaultDeclineAndBlockEntryPoint : DeclineInviteAndBlockEntryPoint {
|
||||
override fun createNode(parentNode: Node, buildContext: BuildContext, inviteData: InviteData): Node {
|
||||
val inputs = DeclineAndBlockNode.Inputs(inviteData)
|
||||
return parentNode.createNode<DeclineAndBlockNode>(buildContext, plugins = listOf(inputs))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue