From 1319be177a2ee287ca5ab6cf62a4349f9497fa63 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 24 Jan 2023 09:45:11 +0100 Subject: [PATCH] Use the `modifier` parameter. --- .../io/element/android/x/node/LoggedInFlowNode.kt | 11 +++++++---- .../io/element/android/x/node/NotLoggedInFlowNode.kt | 5 ++++- .../kotlin/io/element/android/x/node/RoomFlowNode.kt | 9 ++++++--- .../kotlin/io/element/android/x/node/RootFlowNode.kt | 1 + .../element/android/features/login/LoginFlowNode.kt | 5 ++++- .../features/login/changeserver/ChangeServerNode.kt | 1 + .../android/features/login/root/LoginRootNode.kt | 1 + .../features/preferences/PreferencesFlowNode.kt | 5 ++++- .../features/preferences/root/PreferencesRootNode.kt | 1 + .../element/android/features/roomlist/RoomListNode.kt | 1 + 10 files changed, 30 insertions(+), 10 deletions(-) diff --git a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt index 774b42b220..22f2f272db 100644 --- a/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/LoggedInFlowNode.kt @@ -32,16 +32,16 @@ import com.bumble.appyx.core.node.ParentNode import com.bumble.appyx.core.node.node import com.bumble.appyx.navmodel.backstack.BackStack 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.createNode 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.core.RoomId import io.element.android.libraries.matrix.core.SessionId import io.element.android.libraries.matrix.ui.di.MatrixUIBindings +import io.element.android.x.di.SessionComponent import kotlinx.parcelize.Parcelize class LoggedInFlowNode( @@ -124,6 +124,9 @@ class LoggedInFlowNode( @Composable override fun View(modifier: Modifier) { - Children(navModel = backstack) + Children( + navModel = backstack, + modifier = modifier, + ) } } diff --git a/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt index 91a85c1e85..a5a20b2a2f 100644 --- a/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/NotLoggedInFlowNode.kt @@ -71,6 +71,9 @@ class NotLoggedInFlowNode( @Composable override fun View(modifier: Modifier) { - Children(navModel = backstack) + Children( + navModel = backstack, + modifier = modifier, + ) } } diff --git a/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt index 0048b143cf..bae60841d6 100644 --- a/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/RoomFlowNode.kt @@ -25,12 +25,12 @@ import com.bumble.appyx.core.modality.BuildContext import com.bumble.appyx.core.node.Node import com.bumble.appyx.core.node.ParentNode 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.createNode 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.x.di.RoomComponent import kotlinx.parcelize.Parcelize import timber.log.Timber @@ -70,6 +70,9 @@ class RoomFlowNode( @Composable override fun View(modifier: Modifier) { - Children(navModel = backstack) + Children( + navModel = backstack, + modifier = modifier, + ) } } diff --git a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt index cf7346f801..3bf65dc7ca 100644 --- a/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt +++ b/app/src/main/kotlin/io/element/android/x/node/RootFlowNode.kt @@ -107,6 +107,7 @@ class RootFlowNode( val state by presenterConnector.stateFlow.collectAsState() RootView( state = state, + modifier = modifier, onOpenBugReport = this::onOpenBugReport, ) { Children(navModel = backstack) diff --git a/features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt b/features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt index ae0f6268a0..a849016d79 100644 --- a/features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/LoginFlowNode.kt @@ -64,6 +64,9 @@ class LoginFlowNode( @Composable override fun View(modifier: Modifier) { - Children(navModel = backstack) + Children( + navModel = backstack, + modifier = modifier, + ) } } diff --git a/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt index 4cec3ad0be..bfd7006d21 100644 --- a/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt @@ -47,6 +47,7 @@ class ChangeServerNode @AssistedInject constructor( val state by presenterConnector.stateFlow.collectAsState() ChangeServerView( state = state, + modifier = modifier, onChangeServerSuccess = this::onSuccess, ) } diff --git a/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt index 87a1c3d248..f63277c32b 100644 --- a/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt +++ b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt @@ -60,6 +60,7 @@ class LoginRootNode @AssistedInject constructor( } LoginRootScreen( state = state, + modifier = modifier, onChangeServer = this::onChangeHomeServer, ) } diff --git a/features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt b/features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt index a3e9e4e283..aed8a1ca81 100644 --- a/features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt +++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/PreferencesFlowNode.kt @@ -59,6 +59,9 @@ class PreferencesFlowNode( @Composable override fun View(modifier: Modifier) { - Children(navModel = backstack) + Children( + navModel = backstack, + modifier = modifier, + ) } } diff --git a/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt index b1ef84646b..fcfabb4cd7 100644 --- a/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt +++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt @@ -52,6 +52,7 @@ class PreferencesRootNode @AssistedInject constructor( val state by presenterConnector.stateFlow.collectAsState() PreferencesRootView( state = state, + modifier = modifier, onBackPressed = this::navigateUp, onOpenRageShake = this::onOpenBugReport ) diff --git a/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListNode.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListNode.kt index 4e153a2328..f492e09871 100644 --- a/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListNode.kt +++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListNode.kt @@ -58,6 +58,7 @@ class RoomListNode @AssistedInject constructor( val state by connector.stateFlow.collectAsState() RoomListView( state = state, + modifier = modifier, onRoomClicked = this::onRoomClicked, onOpenSettings = this::onOpenSettings )