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

Merge branch 'develop' into feature/fga/improve_node_architecture

Browse source
This commit is contained in:
ganfra 2023-03-09 12:00:34 +01:00
commit 7455c4923f
57 changed files with 1061 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

1
appnav/build.gradle.kts
View file

@ -43,6 +43,7 @@ dependencies {
implementation(projects.features.preferences.api)
implementation(projects.features.logout.api)
implementation(projects.features.onboarding.api)
implementation(projects.features.createroom)
implementation(projects.libraries.core)
implementation(projects.libraries.architecture)

11
appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
View file

@ -35,6 +35,7 @@ import com.bumble.appyx.navmodel.backstack.operation.push
import dagger.assisted.Assisted
import dagger.assisted.AssistedInject
import io.element.android.anvilannotations.ContributesNode
import io.element.android.features.createroom.CreateRoomFlowNode
import io.element.android.features.preferences.api.PreferencesEntryPoint
import io.element.android.features.roomlist.api.RoomListEntryPoint
import io.element.android.libraries.architecture.BackstackNode
@ -107,6 +108,9 @@ class LoggedInFlowNode @AssistedInject constructor(
@Parcelize
object Settings : NavTarget
@Parcelize
object CreateRoom : NavTarget
}
override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
@ -120,6 +124,10 @@ class LoggedInFlowNode @AssistedInject constructor(
override fun onSettingsClicked() {
backstack.push(NavTarget.Settings)
}
override fun onCreateRoomClicked() {
backstack.push(NavTarget.CreateRoom)
}
}
roomListEntryPoint
.nodeBuilder(this, buildContext)
@ -151,6 +159,9 @@ class LoggedInFlowNode @AssistedInject constructor(
.callback(callback)
.build()
}
NavTarget.CreateRoom -> {
CreateRoomFlowNode(buildContext)
}
}
}