mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 06:55:41 +00:00
Use the modifier parameter.
This commit is contained in:
@@ -32,16 +32,16 @@ import com.bumble.appyx.core.node.ParentNode
|
|||||||
import com.bumble.appyx.core.node.node
|
import com.bumble.appyx.core.node.node
|
||||||
import com.bumble.appyx.navmodel.backstack.BackStack
|
import com.bumble.appyx.navmodel.backstack.BackStack
|
||||||
import com.bumble.appyx.navmodel.backstack.operation.push
|
import com.bumble.appyx.navmodel.backstack.operation.push
|
||||||
|
import io.element.android.features.preferences.PreferencesFlowNode
|
||||||
|
import io.element.android.features.roomlist.RoomListNode
|
||||||
import io.element.android.libraries.architecture.bindings
|
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.x.di.SessionComponent
|
|
||||||
import io.element.android.features.preferences.PreferencesFlowNode
|
|
||||||
import io.element.android.features.roomlist.RoomListNode
|
|
||||||
import io.element.android.libraries.matrix.MatrixClient
|
import io.element.android.libraries.matrix.MatrixClient
|
||||||
import io.element.android.libraries.matrix.core.RoomId
|
import io.element.android.libraries.matrix.core.RoomId
|
||||||
import io.element.android.libraries.matrix.core.SessionId
|
import io.element.android.libraries.matrix.core.SessionId
|
||||||
import io.element.android.libraries.matrix.ui.di.MatrixUIBindings
|
import io.element.android.libraries.matrix.ui.di.MatrixUIBindings
|
||||||
|
import io.element.android.x.di.SessionComponent
|
||||||
import kotlinx.parcelize.Parcelize
|
import kotlinx.parcelize.Parcelize
|
||||||
|
|
||||||
class LoggedInFlowNode(
|
class LoggedInFlowNode(
|
||||||
@@ -124,6 +124,9 @@ class LoggedInFlowNode(
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
override fun View(modifier: Modifier) {
|
override fun View(modifier: Modifier) {
|
||||||
Children(navModel = backstack)
|
Children(
|
||||||
|
navModel = backstack,
|
||||||
|
modifier = modifier,
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -71,6 +71,9 @@ class NotLoggedInFlowNode(
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
override fun View(modifier: Modifier) {
|
override fun View(modifier: Modifier) {
|
||||||
Children(navModel = backstack)
|
Children(
|
||||||
|
navModel = backstack,
|
||||||
|
modifier = modifier,
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,12 +25,12 @@ import com.bumble.appyx.core.modality.BuildContext
|
|||||||
import com.bumble.appyx.core.node.Node
|
import com.bumble.appyx.core.node.Node
|
||||||
import com.bumble.appyx.core.node.ParentNode
|
import com.bumble.appyx.core.node.ParentNode
|
||||||
import com.bumble.appyx.navmodel.backstack.BackStack
|
import com.bumble.appyx.navmodel.backstack.BackStack
|
||||||
|
import io.element.android.features.messages.MessagesNode
|
||||||
import io.element.android.libraries.architecture.bindings
|
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.x.di.RoomComponent
|
|
||||||
import io.element.android.features.messages.MessagesNode
|
|
||||||
import io.element.android.libraries.matrix.room.MatrixRoom
|
import io.element.android.libraries.matrix.room.MatrixRoom
|
||||||
|
import io.element.android.x.di.RoomComponent
|
||||||
import kotlinx.parcelize.Parcelize
|
import kotlinx.parcelize.Parcelize
|
||||||
import timber.log.Timber
|
import timber.log.Timber
|
||||||
|
|
||||||
@@ -70,6 +70,9 @@ class RoomFlowNode(
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
override fun View(modifier: Modifier) {
|
override fun View(modifier: Modifier) {
|
||||||
Children(navModel = backstack)
|
Children(
|
||||||
|
navModel = backstack,
|
||||||
|
modifier = modifier,
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -107,6 +107,7 @@ class RootFlowNode(
|
|||||||
val state by presenterConnector.stateFlow.collectAsState()
|
val state by presenterConnector.stateFlow.collectAsState()
|
||||||
RootView(
|
RootView(
|
||||||
state = state,
|
state = state,
|
||||||
|
modifier = modifier,
|
||||||
onOpenBugReport = this::onOpenBugReport,
|
onOpenBugReport = this::onOpenBugReport,
|
||||||
) {
|
) {
|
||||||
Children(navModel = backstack)
|
Children(navModel = backstack)
|
||||||
|
|||||||
@@ -64,6 +64,9 @@ class LoginFlowNode(
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
override fun View(modifier: Modifier) {
|
override fun View(modifier: Modifier) {
|
||||||
Children(navModel = backstack)
|
Children(
|
||||||
|
navModel = backstack,
|
||||||
|
modifier = modifier,
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
@@ -47,6 +47,7 @@ class ChangeServerNode @AssistedInject constructor(
|
|||||||
val state by presenterConnector.stateFlow.collectAsState()
|
val state by presenterConnector.stateFlow.collectAsState()
|
||||||
ChangeServerView(
|
ChangeServerView(
|
||||||
state = state,
|
state = state,
|
||||||
|
modifier = modifier,
|
||||||
onChangeServerSuccess = this::onSuccess,
|
onChangeServerSuccess = this::onSuccess,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,6 +60,7 @@ class LoginRootNode @AssistedInject constructor(
|
|||||||
}
|
}
|
||||||
LoginRootScreen(
|
LoginRootScreen(
|
||||||
state = state,
|
state = state,
|
||||||
|
modifier = modifier,
|
||||||
onChangeServer = this::onChangeHomeServer,
|
onChangeServer = this::onChangeHomeServer,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-1
@@ -59,6 +59,9 @@ class PreferencesFlowNode(
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
override fun View(modifier: Modifier) {
|
override fun View(modifier: Modifier) {
|
||||||
Children(navModel = backstack)
|
Children(
|
||||||
|
navModel = backstack,
|
||||||
|
modifier = modifier,
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
@@ -52,6 +52,7 @@ class PreferencesRootNode @AssistedInject constructor(
|
|||||||
val state by presenterConnector.stateFlow.collectAsState()
|
val state by presenterConnector.stateFlow.collectAsState()
|
||||||
PreferencesRootView(
|
PreferencesRootView(
|
||||||
state = state,
|
state = state,
|
||||||
|
modifier = modifier,
|
||||||
onBackPressed = this::navigateUp,
|
onBackPressed = this::navigateUp,
|
||||||
onOpenRageShake = this::onOpenBugReport
|
onOpenRageShake = this::onOpenBugReport
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ class RoomListNode @AssistedInject constructor(
|
|||||||
val state by connector.stateFlow.collectAsState()
|
val state by connector.stateFlow.collectAsState()
|
||||||
RoomListView(
|
RoomListView(
|
||||||
state = state,
|
state = state,
|
||||||
|
modifier = modifier,
|
||||||
onRoomClicked = this::onRoomClicked,
|
onRoomClicked = this::onRoomClicked,
|
||||||
onOpenSettings = this::onOpenSettings
|
onOpenSettings = this::onOpenSettings
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user