[Architecture] introduce BackstackNode

2023-03-02 17:55:26 +01:00
parent 15ed58b756
commit c581f0b383
15 changed files with 103 additions and 136 deletions
--- a/features/login/build.gradle.kts
+++ b/features/login/build.gradle.kts
@@ -18,8 +18,8 @@
@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    id("io.element.android-compose-library")
-    alias(libs.plugins.ksp)
    alias(libs.plugins.anvil)
+    alias(libs.plugins.ksp)
    id("kotlin-parcelize")
 }

--- a/features/login/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt
+++ b/features/login/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt
@@ -31,32 +31,25 @@ import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.features.login.impl.changeserver.ChangeServerNode
 import io.element.android.features.login.impl.root.LoginRootNode
+import io.element.android.libraries.architecture.BackstackNode
 import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.AppScope
 import kotlinx.parcelize.Parcelize

@ContributesNode(AppScope::class)
-class LoginFlowNode(
-    buildContext: BuildContext,
-    plugins: List<Plugin>,
-    private val backstack: BackStack<NavTarget>,
-) : ParentNode<LoginFlowNode.NavTarget>(
-    navModel = backstack,
+class LoginFlowNode @AssistedInject constructor(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+) : BackstackNode<LoginFlowNode.NavTarget>(
+    backstack = BackStack(
+        initialElement = NavTarget.Root,
+        savedStateMap = buildContext.savedStateMap,
+    ),
    buildContext = buildContext,
    plugins = plugins,
 ) {

-    @AssistedInject
-    constructor(@Assisted buildContext: BuildContext, @Assisted plugins: List<Plugin>) : this(
-        buildContext = buildContext,
-        plugins = plugins,
-        backstack = BackStack(
-            initialElement = NavTarget.Root,
-            savedStateMap = buildContext.savedStateMap,
-        ),
-    )
-
    sealed interface NavTarget : Parcelable {
        @Parcelize
        object Root : NavTarget
--- a/features/logout/build.gradle.kts
+++ b/features/logout/build.gradle.kts
@@ -18,8 +18,8 @@
@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    id("io.element.android-compose-library")
-    alias(libs.plugins.ksp)
    alias(libs.plugins.anvil)
+    alias(libs.plugins.ksp)
 }

 android {
--- a/features/messages/build.gradle.kts
+++ b/features/messages/build.gradle.kts
@@ -18,8 +18,8 @@
@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    id("io.element.android-compose-library")
-    alias(libs.plugins.ksp)
    alias(libs.plugins.anvil)
+    alias(libs.plugins.ksp)
 }

 android {
--- a/features/onboarding/build.gradle.kts
+++ b/features/onboarding/build.gradle.kts
@@ -18,8 +18,8 @@
@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    id("io.element.android-compose-library")
-    alias(libs.plugins.ksp)
    alias(libs.plugins.anvil)
+    alias(libs.plugins.ksp)
 }

 android {
--- a/features/preferences/build.gradle.kts
+++ b/features/preferences/build.gradle.kts
@@ -18,8 +18,8 @@
@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    id("io.element.android-compose-library")
-    alias(libs.plugins.ksp)
    alias(libs.plugins.anvil)
+    alias(libs.plugins.ksp)
    id("kotlin-parcelize")
 }

--- a/features/preferences/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
+++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
@@ -22,7 +22,6 @@ import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.composable.Children
 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.core.plugin.Plugin
 import com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
@@ -31,32 +30,25 @@ import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.features.preferences.api.PreferencesEntryPoint
 import io.element.android.features.preferences.impl.root.PreferencesRootNode
+import io.element.android.libraries.architecture.BackstackNode
 import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.SessionScope
 import kotlinx.parcelize.Parcelize

@ContributesNode(SessionScope::class)
-class PreferencesFlowNode(
-    buildContext: BuildContext,
-    plugins: List<Plugin>,
-    private val backstack: BackStack<NavTarget>,
-) : ParentNode<PreferencesFlowNode.NavTarget>(
-    navModel = backstack,
+class PreferencesFlowNode @AssistedInject constructor(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+) : BackstackNode<PreferencesFlowNode.NavTarget>(
+    backstack = BackStack(
+        initialElement = NavTarget.Root,
+        savedStateMap = buildContext.savedStateMap,
+    ),
    buildContext = buildContext,
    plugins = plugins
 ) {

-    @AssistedInject
-    constructor(@Assisted buildContext: BuildContext, @Assisted plugins: List<Plugin>) : this(
-        buildContext = buildContext,
-        plugins = plugins,
-        backstack = BackStack(
-            initialElement = NavTarget.Root,
-            savedStateMap = buildContext.savedStateMap,
-        )
-    )
-
    sealed interface NavTarget : Parcelable {
        @Parcelize
        object Root : NavTarget
--- a/features/rageshake/build.gradle.kts
+++ b/features/rageshake/build.gradle.kts
@@ -18,8 +18,8 @@
@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    id("io.element.android-compose-library")
-    alias(libs.plugins.ksp)
    alias(libs.plugins.anvil)
+    alias(libs.plugins.ksp)
    id("kotlin-parcelize")
 }

--- a/features/roomlist/build.gradle.kts
+++ b/features/roomlist/build.gradle.kts
@@ -18,8 +18,8 @@
@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    id("io.element.android-compose-library")
-    alias(libs.plugins.ksp)
    alias(libs.plugins.anvil)
+    alias(libs.plugins.ksp)
 }

 android {
--- a/features/template/build.gradle.kts
+++ b/features/template/build.gradle.kts
@@ -18,8 +18,8 @@
@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    id("io.element.android-compose-library")
-    alias(libs.plugins.ksp)
    alias(libs.plugins.anvil)
+    alias(libs.plugins.ksp)
 }

 android {