From 59157f5f729fd975d64ade510c288cf5dd70c233 Mon Sep 17 00:00:00 2001
From: Zsolt Kocsi <zsolt.kocsi@corp.badoo.com>
Date: Fri, 23 Aug 2019 17:50:11 +0100
Subject: [PATCH 01/17] Add initial portal implementation

---
 .../com/badoo/ribs/example/rib/big/Big.kt     | 22 +++++++
 .../ribs/example/rib/big/BigInteractor.kt     | 23 +++++++
 .../com/badoo/ribs/example/rib/big/BigNode.kt | 18 ++++++
 .../badoo/ribs/example/rib/big/BigRouter.kt   | 39 ++++++++++++
 .../com/badoo/ribs/example/rib/big/BigView.kt | 60 ++++++++++++++++++
 .../example/rib/big/builder/BigBuilder.kt     | 27 ++++++++
 .../example/rib/big/builder/BigComponent.kt   | 26 ++++++++
 .../ribs/example/rib/big/builder/BigModule.kt | 54 ++++++++++++++++
 .../ribs/example/rib/big/builder/BigScope.kt  |  7 +++
 .../example/rib/hello_world/HelloWorld.kt     |  6 +-
 .../rib/hello_world/HelloWorldInteractor.kt   |  5 +-
 .../rib/hello_world/HelloWorldRouter.kt       | 21 +++++--
 .../example/rib/hello_world/HelloWorldView.kt |  9 +++
 .../builder/HelloWorldComponent.kt            |  3 +-
 .../hello_world/builder/HelloWorldModule.kt   |  5 +-
 .../com/badoo/ribs/example/rib/small/Small.kt | 19 ++++++
 .../ribs/example/rib/small/SmallInteractor.kt | 34 ++++++++++
 .../badoo/ribs/example/rib/small/SmallNode.kt | 20 ++++++
 .../ribs/example/rib/small/SmallRouter.kt     | 36 +++++++++++
 .../badoo/ribs/example/rib/small/SmallView.kt | 58 +++++++++++++++++
 .../example/rib/small/builder/SmallBuilder.kt | 27 ++++++++
 .../rib/small/builder/SmallComponent.kt       | 26 ++++++++
 .../example/rib/small/builder/SmallModule.kt  | 57 +++++++++++++++++
 .../example/rib/small/builder/SmallScope.kt   |  7 +++
 .../rib/switcher/SwitcherInteractor.kt        |  8 ++-
 .../ribs/example/rib/switcher/SwitcherView.kt |  8 +++
 .../rib/switcher/builder/SwitcherModule.kt    | 22 ++++++-
 .../rib/switcher/feature/PortalFeature.kt     | 62 +++++++++++++++++++
 .../src/main/res/layout/rib_big.xml           | 28 +++++++++
 .../src/main/res/layout/rib_hello_world.xml   | 12 +++-
 .../src/main/res/layout/rib_small.xml         | 23 +++++++
 .../src/main/res/layout/rib_switcher.xml      |  7 +++
 .../ribs/android/AndroidPortalRenderer.kt     | 23 +++++++
 .../java/com/badoo/ribs/android/ViewStack.kt  | 30 +++++++++
 .../src/main/java/com/badoo/ribs/core/Node.kt | 10 ++-
 .../main/java/com/badoo/ribs/core/Portal.kt   | 26 ++++++++
 .../routing/action/CompositeRoutingAction.kt  |  8 +--
 .../routing/action/DialogRoutingAction.kt     |  4 +-
 .../routing/action/FullScreenRoutingAction.kt | 37 +++++++++++
 .../core/routing/action/InvokeOnCleanUp.kt    |  3 +-
 .../core/routing/action/InvokeOnExecute.kt    |  3 +-
 .../ribs/core/routing/action/RoutingAction.kt |  4 +-
 .../action/single/ActivateAction.kt           |  2 +-
 .../action/single/DeactivateAction.kt         |  2 +-
 .../ribs/customisation/CanProvidePortal.kt    |  8 +++
 .../configuration/ConfigurationFeatureTest.kt | 34 +++++-----
 46 files changed, 928 insertions(+), 45 deletions(-)
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/big/Big.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/big/BigInteractor.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/big/BigNode.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/big/BigRouter.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/big/BigView.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/big/builder/BigBuilder.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/big/builder/BigComponent.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/big/builder/BigModule.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/big/builder/BigScope.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/small/Small.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallNode.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallRouter.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallView.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallBuilder.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallComponent.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallModule.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallScope.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/feature/PortalFeature.kt
 create mode 100644 android/app-example/src/main/res/layout/rib_big.xml
 create mode 100644 android/app-example/src/main/res/layout/rib_small.xml
 create mode 100644 android/libraries/rib-base/src/main/java/com/badoo/ribs/android/AndroidPortalRenderer.kt
 create mode 100644 android/libraries/rib-base/src/main/java/com/badoo/ribs/android/ViewStack.kt
 create mode 100644 android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Portal.kt
 create mode 100644 android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/FullScreenRoutingAction.kt
 create mode 100644 android/libraries/rib-base/src/main/java/com/badoo/ribs/customisation/CanProvidePortal.kt

diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/Big.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/Big.kt
new file mode 100644
index 000000000..59762c804
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/Big.kt
@@ -0,0 +1,22 @@
+package com.badoo.ribs.example.rib.big
+
+import com.badoo.ribs.core.Rib
+import com.badoo.ribs.customisation.CanProvidePortal
+import com.badoo.ribs.customisation.CanProvideRibCustomisation
+import com.badoo.ribs.customisation.RibCustomisation
+import io.reactivex.ObservableSource
+import io.reactivex.Single
+import io.reactivex.functions.Consumer
+
+interface Big : Rib {
+
+    interface Dependency :
+        CanProvideRibCustomisation,
+        CanProvidePortal
+
+    class Customisation(
+        val viewFactory: BigView.Factory = BigViewImpl.Factory()
+    ) : RibCustomisation
+
+    interface Workflow
+}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/BigInteractor.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/BigInteractor.kt
new file mode 100644
index 000000000..a44a0b87b
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/BigInteractor.kt
@@ -0,0 +1,23 @@
+package com.badoo.ribs.example.rib.big
+
+import android.arch.lifecycle.Lifecycle
+import android.os.Bundle
+import com.badoo.ribs.core.Interactor
+import com.badoo.ribs.core.Router
+import com.badoo.ribs.example.rib.big.BigRouter.Configuration
+import com.badoo.ribs.example.rib.big.BigRouter.Configuration.Content
+import com.badoo.ribs.example.rib.big.BigRouter.Configuration.Overlay
+
+class BigInteractor(
+    savedInstanceState: Bundle?,
+    router: Router<Configuration, *, Content, Overlay, BigView>
+) : Interactor<Configuration, Content, Overlay, BigView>(
+    savedInstanceState = savedInstanceState,
+    router = router,
+    disposables = null
+) {
+
+    override fun onViewCreated(view: BigView, viewLifecycle: Lifecycle) {
+        view.accept(BigView.ViewModel("My id: " + id.replace("${BigInteractor::class.java.name}.", "")))
+    }
+}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/BigNode.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/BigNode.kt
new file mode 100644
index 000000000..e72d9f008
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/BigNode.kt
@@ -0,0 +1,18 @@
+package com.badoo.ribs.example.rib.big
+
+import android.os.Bundle
+import android.view.ViewGroup
+import com.badoo.ribs.core.Node
+
+class BigNode(
+    savedInstanceState: Bundle?,
+    viewFactory: ((ViewGroup) -> BigView?)?,
+    private val router: BigRouter,
+    private val interactor: BigInteractor
+) : Node<BigView>(
+    savedInstanceState = savedInstanceState,
+    identifier = object : Big {},
+    viewFactory = viewFactory,
+    router = router,
+    interactor = interactor
+), Big.Workflow
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/BigRouter.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/BigRouter.kt
new file mode 100644
index 000000000..b505216b9
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/BigRouter.kt
@@ -0,0 +1,39 @@
+package com.badoo.ribs.example.rib.big
+
+import android.os.Bundle
+import android.os.Parcelable
+import com.badoo.ribs.core.Router
+import com.badoo.ribs.core.routing.action.AttachRibRoutingAction.Companion.attach
+import com.badoo.ribs.core.routing.action.RoutingAction
+import com.badoo.ribs.core.routing.action.RoutingAction.Companion.noop
+import com.badoo.ribs.example.rib.big.BigRouter.Configuration
+import com.badoo.ribs.example.rib.big.BigRouter.Configuration.Content
+import com.badoo.ribs.example.rib.big.BigRouter.Configuration.Overlay
+import com.badoo.ribs.example.rib.big.BigRouter.Configuration.Permanent
+import com.badoo.ribs.example.rib.small.builder.SmallBuilder
+import kotlinx.android.parcel.Parcelize
+
+class BigRouter(
+    savedInstanceState: Bundle?,
+    private val smallBuilder: SmallBuilder
+): Router<Configuration, Permanent, Content, Overlay, BigView>(
+    savedInstanceState = savedInstanceState,
+    initialConfiguration = Content.Default,
+    permanentParts = listOf(Permanent.Small)
+) {
+    sealed class Configuration : Parcelable {
+        sealed class Permanent : Configuration() {
+            @Parcelize object Small : Permanent()
+        }
+        sealed class Content : Configuration() {
+            @Parcelize object Default : Content()
+        }
+        sealed class Overlay : Configuration()
+    }
+
+    override fun resolveConfiguration(configuration: Configuration): RoutingAction<BigView> =
+        when (configuration) {
+            Permanent.Small -> attach { smallBuilder.build(it) }
+            Content.Default -> noop()
+        }
+}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/BigView.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/BigView.kt
new file mode 100644
index 000000000..93b5292f1
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/BigView.kt
@@ -0,0 +1,60 @@
+package com.badoo.ribs.example.rib.big
+
+import android.support.annotation.LayoutRes
+import android.view.ViewGroup
+import android.widget.TextView
+import com.badoo.ribs.core.Rib
+import com.badoo.ribs.core.view.RibView
+import com.badoo.ribs.core.view.ViewFactory
+import com.badoo.ribs.example.R
+import com.badoo.ribs.example.rib.big.BigView.Event
+import com.badoo.ribs.example.rib.big.BigView.ViewModel
+import com.badoo.ribs.example.rib.small.Small
+import com.jakewharton.rxrelay2.PublishRelay
+import io.reactivex.ObservableSource
+import io.reactivex.functions.Consumer
+
+interface BigView : RibView,
+    ObservableSource<Event>,
+    Consumer<ViewModel> {
+
+    sealed class Event
+
+    data class ViewModel(
+        val text: String
+    )
+
+    interface Factory : ViewFactory<Nothing?, BigView>
+}
+
+
+class BigViewImpl private constructor(
+    override val androidView: ViewGroup,
+    private val events: PublishRelay<Event> = PublishRelay.create()
+) : BigView,
+    ObservableSource<Event> by events,
+    Consumer<ViewModel> {
+
+    class Factory(
+        @LayoutRes private val layoutRes: Int = R.layout.rib_big
+    ) : BigView.Factory {
+        override fun invoke(deps: Nothing?): (ViewGroup) -> BigView = {
+            BigViewImpl(
+                com.badoo.ribs.customisation.inflate(it, layoutRes)
+            )
+        }
+    }
+
+    private val idText = androidView.findViewById<TextView>(R.id.big_id)
+    private val smallContainer = androidView.findViewById<ViewGroup>(R.id.small_container)
+
+    override fun accept(vm: ViewModel) {
+        idText.text = vm.text
+    }
+
+    override fun getParentViewForChild(child: Rib): ViewGroup? =
+        when (child) {
+            is Small -> smallContainer
+            else -> null
+        }
+}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/builder/BigBuilder.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/builder/BigBuilder.kt
new file mode 100644
index 000000000..a2f154d3b
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/builder/BigBuilder.kt
@@ -0,0 +1,27 @@
+package com.badoo.ribs.example.rib.big.builder
+
+import android.os.Bundle
+import com.badoo.ribs.core.Builder
+import com.badoo.ribs.customisation.customisationsBranchFor
+import com.badoo.ribs.customisation.getOrDefault
+import com.badoo.ribs.example.rib.big.Big
+import com.badoo.ribs.example.rib.big.BigNode
+
+class BigBuilder(
+    dependency: Big.Dependency
+) : Builder<Big.Dependency>() {
+
+    override val dependency : Big.Dependency = object : Big.Dependency by dependency {
+        override fun ribCustomisation() = dependency.customisationsBranchFor(Big::class)
+    }
+
+    fun build(savedInstanceState: Bundle?): BigNode =
+        DaggerBigComponent
+            .factory()
+            .create(
+                dependency = dependency,
+                customisation = dependency.getOrDefault(Big.Customisation()),
+                savedInstanceState = savedInstanceState
+            )
+            .node()
+}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/builder/BigComponent.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/builder/BigComponent.kt
new file mode 100644
index 000000000..487af388d
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/builder/BigComponent.kt
@@ -0,0 +1,26 @@
+package com.badoo.ribs.example.rib.big.builder
+
+import android.os.Bundle
+import com.badoo.ribs.example.rib.big.Big
+import com.badoo.ribs.example.rib.big.BigNode
+import com.badoo.ribs.example.rib.small.Small
+import dagger.BindsInstance
+
+@BigScope
+@dagger.Component(
+    modules = [BigModule::class],
+    dependencies = [Big.Dependency::class]
+)
+internal interface BigComponent : Small.Dependency {
+
+    @dagger.Component.Factory
+    interface Factory {
+        fun create(
+            dependency: Big.Dependency,
+            @BindsInstance customisation: Big.Customisation,
+            @BindsInstance savedInstanceState: Bundle?
+        ): BigComponent
+    }
+
+    fun node(): BigNode
+}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/builder/BigModule.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/builder/BigModule.kt
new file mode 100644
index 000000000..7720efc1b
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/builder/BigModule.kt
@@ -0,0 +1,54 @@
+@file:SuppressWarnings("LongParameterList", "LongMethod")
+package com.badoo.ribs.example.rib.big.builder
+
+import android.os.Bundle
+import com.badoo.ribs.example.rib.big.Big
+import com.badoo.ribs.example.rib.big.BigInteractor
+import com.badoo.ribs.example.rib.big.BigNode
+import com.badoo.ribs.example.rib.big.BigRouter
+import com.badoo.ribs.example.rib.small.builder.SmallBuilder
+import dagger.Provides
+
+@dagger.Module
+internal object BigModule {
+
+    @BigScope
+    @Provides
+    @JvmStatic
+    internal fun router(
+        // pass component to child rib builders, or remove if there are none
+        component: BigComponent,
+        savedInstanceState: Bundle?
+    ): BigRouter =
+        BigRouter(
+            savedInstanceState = savedInstanceState,
+            smallBuilder = SmallBuilder(component)
+        )
+
+    @BigScope
+    @Provides
+    @JvmStatic
+    internal fun interactor(
+        savedInstanceState: Bundle?,
+        router: BigRouter
+    ): BigInteractor =
+        BigInteractor(
+            savedInstanceState = savedInstanceState,
+            router = router
+        )
+
+    @BigScope
+    @Provides
+    @JvmStatic
+    internal fun node(
+        savedInstanceState: Bundle?,
+        customisation: Big.Customisation,
+        router: BigRouter,
+        interactor: BigInteractor
+    ) : BigNode = BigNode(
+        savedInstanceState = savedInstanceState,
+        viewFactory = customisation.viewFactory(null),
+        router = router,
+        interactor = interactor
+    )
+}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/builder/BigScope.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/builder/BigScope.kt
new file mode 100644
index 000000000..ca558f739
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/builder/BigScope.kt
@@ -0,0 +1,7 @@
+package com.badoo.ribs.example.rib.big.builder
+
+import javax.inject.Scope
+
+@Scope
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class BigScope
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/HelloWorld.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/HelloWorld.kt
index 7eba94732..0f96eea71 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/HelloWorld.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/HelloWorld.kt
@@ -2,6 +2,7 @@ package com.badoo.ribs.example.rib.hello_world
 
 import com.badoo.ribs.android.CanProvideActivityStarter
 import com.badoo.ribs.core.Rib
+import com.badoo.ribs.customisation.CanProvidePortal
 import com.badoo.ribs.customisation.CanProvideRibCustomisation
 import com.badoo.ribs.customisation.RibCustomisation
 import io.reactivex.ObservableSource
@@ -10,7 +11,10 @@ import io.reactivex.functions.Consumer
 
 interface HelloWorld : Rib {
 
-    interface Dependency : CanProvideActivityStarter, CanProvideRibCustomisation {
+    interface Dependency :
+        CanProvideActivityStarter,
+        CanProvideRibCustomisation,
+        CanProvidePortal {
         fun helloWorldInput(): ObservableSource<Input>
         fun helloWorldOutput(): Consumer<Output>
     }
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/HelloWorldInteractor.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/HelloWorldInteractor.kt
index 69f6f6280..7a8d68d79 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/HelloWorldInteractor.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/HelloWorldInteractor.kt
@@ -12,6 +12,7 @@ import com.badoo.ribs.core.Interactor
 import com.badoo.ribs.core.Router
 import com.badoo.ribs.example.app.OtherActivity
 import com.badoo.ribs.example.rib.hello_world.HelloWorldRouter.Configuration
+import com.badoo.ribs.example.rib.hello_world.HelloWorldRouter.Configuration.*
 import com.badoo.ribs.example.rib.hello_world.HelloWorldView.ViewModel
 import com.badoo.ribs.example.rib.hello_world.analytics.HelloWorldAnalytics
 import com.badoo.ribs.example.rib.hello_world.feature.HelloWorldFeature
@@ -24,12 +25,12 @@ import io.reactivex.functions.Consumer
 
 class HelloWorldInteractor(
     savedInstanceState: Bundle?,
-    router: Router<Configuration, Nothing, Configuration, Nothing, HelloWorldView>,
+    router: Router<Configuration, Permanent, Content, Nothing, HelloWorldView>,
     private val input: ObservableSource<HelloWorld.Input>,
     private val output: Consumer<HelloWorld.Output>,
     private val feature: HelloWorldFeature,
     private val activityStarter: ActivityStarter
-) : Interactor<Configuration, Configuration, Nothing, HelloWorldView>(
+) : Interactor<Configuration, Content, Nothing, HelloWorldView>(
     savedInstanceState = savedInstanceState,
     router = router,
     disposables = feature
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/HelloWorldRouter.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/HelloWorldRouter.kt
index dd79f2e12..9fc7badf3 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/HelloWorldRouter.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/HelloWorldRouter.kt
@@ -7,19 +7,30 @@ import com.badoo.ribs.core.routing.action.RoutingAction.Companion.noop
 import com.badoo.ribs.example.rib.hello_world.HelloWorldRouter.Configuration
 import kotlinx.android.parcel.Parcelize
 import android.os.Bundle
+import com.badoo.ribs.core.routing.action.AttachRibRoutingAction.Companion.attach
+import com.badoo.ribs.example.rib.hello_world.HelloWorldRouter.Configuration.*
+import com.badoo.ribs.example.rib.small.builder.SmallBuilder
 
 class HelloWorldRouter(
-    savedInstanceState: Bundle?
-): Router<Configuration, Nothing, Configuration, Nothing, HelloWorldView>(
+    savedInstanceState: Bundle?,
+    private val smallBuilder: SmallBuilder
+): Router<Configuration, Permanent, Content, Nothing, HelloWorldView>(
     savedInstanceState = savedInstanceState,
-    initialConfiguration = Configuration.Default
+    initialConfiguration = Content.Default,
+    permanentParts = listOf(Permanent.Small)
 ) {
     sealed class Configuration : Parcelable {
-        @Parcelize object Default : Configuration()
+        sealed class Permanent : Configuration() {
+            @Parcelize object Small : Permanent()
+        }
+        sealed class Content : Configuration() {
+            @Parcelize object Default : Content()
+        }
     }
 
     override fun resolveConfiguration(configuration: Configuration): RoutingAction<HelloWorldView> =
         when (configuration) {
-            Configuration.Default -> noop()
+            Permanent.Small -> attach { smallBuilder.build(it) }
+            Content.Default -> noop()
     }
 }
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/HelloWorldView.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/HelloWorldView.kt
index 111f64b19..4ccd8277b 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/HelloWorldView.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/HelloWorldView.kt
@@ -3,12 +3,14 @@ package com.badoo.ribs.example.rib.hello_world
 import android.support.annotation.LayoutRes
 import android.view.ViewGroup
 import android.widget.TextView
+import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.view.RibView
 import com.badoo.ribs.core.view.ViewFactory
 import com.badoo.ribs.customisation.inflate
 import com.badoo.ribs.example.R
 import com.badoo.ribs.example.rib.hello_world.HelloWorldView.Event
 import com.badoo.ribs.example.rib.hello_world.HelloWorldView.ViewModel
+import com.badoo.ribs.example.rib.small.Small
 import com.jakewharton.rxrelay2.PublishRelay
 import io.reactivex.ObservableSource
 import io.reactivex.functions.Consumer
@@ -47,6 +49,7 @@ class HelloWorldViewImpl private constructor(
 
     private val text: TextView = androidView.findViewById(R.id.hello_debug)
     private val launchButton: TextView = androidView.findViewById(R.id.hello_button_launch)
+    private val smallContainer: ViewGroup = androidView.findViewById(R.id.small_container)
 
     init {
         launchButton.setOnClickListener { events.accept(Event.ButtonClicked) }
@@ -55,4 +58,10 @@ class HelloWorldViewImpl private constructor(
     override fun accept(vm: ViewModel) {
         text.text = vm.text
     }
+
+    override fun getParentViewForChild(child: Rib): ViewGroup? =
+        when (child) {
+            is Small -> smallContainer
+            else -> null
+        }
 }
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/builder/HelloWorldComponent.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/builder/HelloWorldComponent.kt
index 2d351c37e..e33f73237 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/builder/HelloWorldComponent.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/builder/HelloWorldComponent.kt
@@ -3,6 +3,7 @@ package com.badoo.ribs.example.rib.hello_world.builder
 import android.os.Bundle
 import com.badoo.ribs.example.rib.hello_world.HelloWorld
 import com.badoo.ribs.example.rib.hello_world.HelloWorldNode
+import com.badoo.ribs.example.rib.small.Small
 import dagger.BindsInstance
 
 
@@ -11,7 +12,7 @@ import dagger.BindsInstance
     modules = [HelloWorldModule::class],
     dependencies = [HelloWorld.Dependency::class]
 )
-internal interface HelloWorldComponent {
+internal interface HelloWorldComponent : Small.Dependency {
 
     @dagger.Component.Factory
     interface Factory {
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/builder/HelloWorldModule.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/builder/HelloWorldModule.kt
index 05c8ca429..44192ef8f 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/builder/HelloWorldModule.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/builder/HelloWorldModule.kt
@@ -9,6 +9,7 @@ import com.badoo.ribs.example.rib.hello_world.HelloWorldInteractor
 import com.badoo.ribs.example.rib.hello_world.HelloWorldNode
 import com.badoo.ribs.example.rib.hello_world.HelloWorldRouter
 import com.badoo.ribs.example.rib.hello_world.feature.HelloWorldFeature
+import com.badoo.ribs.example.rib.small.builder.SmallBuilder
 import dagger.Provides
 import io.reactivex.ObservableSource
 import io.reactivex.functions.Consumer
@@ -20,10 +21,12 @@ internal object HelloWorldModule {
     @Provides
     @JvmStatic
     internal fun router(
+        component: HelloWorldComponent,
         savedInstanceState: Bundle?
     ): HelloWorldRouter =
         HelloWorldRouter(
-            savedInstanceState = savedInstanceState
+            savedInstanceState = savedInstanceState,
+            smallBuilder = SmallBuilder(component)
         )
 
     @HelloWorldScope
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/Small.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/Small.kt
new file mode 100644
index 000000000..b6ac795e4
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/Small.kt
@@ -0,0 +1,19 @@
+package com.badoo.ribs.example.rib.small
+
+import com.badoo.ribs.core.Rib
+import com.badoo.ribs.customisation.CanProvidePortal
+import com.badoo.ribs.customisation.CanProvideRibCustomisation
+import com.badoo.ribs.customisation.RibCustomisation
+
+interface Small : Rib {
+
+    interface Dependency :
+        CanProvideRibCustomisation,
+        CanProvidePortal
+
+    class Customisation(
+        val viewFactory: SmallView.Factory = SmallViewImpl.Factory()
+    ) : RibCustomisation
+
+    interface Workflow
+}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt
new file mode 100644
index 000000000..de25cb612
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt
@@ -0,0 +1,34 @@
+package com.badoo.ribs.example.rib.small
+
+import android.arch.lifecycle.Lifecycle
+import android.os.Bundle
+import com.badoo.mvicore.android.lifecycle.createDestroy
+import com.badoo.ribs.core.Interactor
+import com.badoo.ribs.core.Router
+import com.badoo.ribs.example.rib.small.SmallRouter.Configuration
+import com.badoo.ribs.example.rib.small.SmallRouter.Configuration.Content
+import com.badoo.ribs.example.rib.small.SmallView.Event
+import com.badoo.ribs.example.rib.small.SmallView.ViewModel
+import io.reactivex.functions.Consumer
+
+class SmallInteractor(
+    savedInstanceState: Bundle?,
+    router: Router<Configuration, *, Content, Nothing, SmallView>
+) : Interactor<Configuration, Content, Nothing, SmallView>(
+    savedInstanceState = savedInstanceState,
+    router = router,
+    disposables = null
+) {
+    override fun onViewCreated(view: SmallView, viewLifecycle: Lifecycle) {
+        view.accept(ViewModel("My id: " + id.replace("${SmallInteractor::class.java.name}.", "")))
+        viewLifecycle.createDestroy {
+            bind(view to viewEventConsumer)
+        }
+    }
+
+    private val viewEventConsumer: Consumer<Event> = Consumer {
+        when (it) {
+            Event.OpenBigClicked -> router.push(Content.ShowBig)
+        }
+    }
+}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallNode.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallNode.kt
new file mode 100644
index 000000000..6caf443f5
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallNode.kt
@@ -0,0 +1,20 @@
+package com.badoo.ribs.example.rib.small
+
+import android.os.Bundle
+import android.view.ViewGroup
+import com.badoo.ribs.core.Node
+
+class SmallNode(
+    savedInstanceState: Bundle?,
+    viewFactory: ((ViewGroup) -> SmallView?)?,
+    private val router: SmallRouter,
+    private val interactor: SmallInteractor
+) : Node<SmallView>(
+    savedInstanceState = savedInstanceState,
+    identifier = object : Small {},
+    viewFactory = viewFactory,
+    router = router,
+    interactor = interactor
+), Small.Workflow {
+
+}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallRouter.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallRouter.kt
new file mode 100644
index 000000000..df3958869
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallRouter.kt
@@ -0,0 +1,36 @@
+package com.badoo.ribs.example.rib.small
+
+import android.os.Bundle
+import android.os.Parcelable
+import com.badoo.ribs.core.Portal
+import com.badoo.ribs.core.Router
+import com.badoo.ribs.core.routing.action.FullScreenRoutingAction.Companion.fullScreen
+import com.badoo.ribs.core.routing.action.RoutingAction
+import com.badoo.ribs.core.routing.action.RoutingAction.Companion.noop
+import com.badoo.ribs.example.rib.big.builder.BigBuilder
+import com.badoo.ribs.example.rib.small.SmallRouter.Configuration
+import com.badoo.ribs.example.rib.small.SmallRouter.Configuration.Content
+import kotlinx.android.parcel.Parcelize
+
+class SmallRouter(
+    savedInstanceState: Bundle?,
+    private val portal: Portal.Sink,
+    private val bigBuilder: BigBuilder
+): Router<Configuration, Nothing, Content, Nothing, SmallView>(
+    savedInstanceState = savedInstanceState,
+    initialConfiguration = Content.Default,
+    permanentParts = emptyList()
+) {
+    sealed class Configuration : Parcelable {
+        sealed class Content : Configuration() {
+            @Parcelize object Default : Content()
+            @Parcelize object ShowBig : Content()
+        }
+    }
+
+    override fun resolveConfiguration(configuration: Configuration): RoutingAction<SmallView> =
+        when (configuration) {
+            Content.Default -> noop()
+            Content.ShowBig -> fullScreen(portal) { bigBuilder.build(it) }
+        }
+}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallView.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallView.kt
new file mode 100644
index 000000000..cd3be80f8
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallView.kt
@@ -0,0 +1,58 @@
+package com.badoo.ribs.example.rib.small
+
+import android.support.annotation.LayoutRes
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.TextView
+import com.badoo.ribs.core.view.RibView
+import com.badoo.ribs.core.view.ViewFactory
+import com.badoo.ribs.example.R
+import com.badoo.ribs.example.rib.small.SmallView.Event
+import com.badoo.ribs.example.rib.small.SmallView.ViewModel
+import com.jakewharton.rxrelay2.PublishRelay
+import io.reactivex.ObservableSource
+import io.reactivex.functions.Consumer
+
+interface SmallView : RibView,
+    ObservableSource<Event>,
+    Consumer<ViewModel> {
+
+    sealed class Event {
+        object OpenBigClicked : Event()
+    }
+
+    data class ViewModel(
+        val text: String
+    )
+
+    interface Factory : ViewFactory<Nothing?, SmallView>
+}
+
+
+class SmallViewImpl private constructor(
+    override val androidView: ViewGroup,
+    private val events: PublishRelay<Event> = PublishRelay.create()
+) : SmallView,
+    ObservableSource<Event> by events {
+
+    class Factory(
+        @LayoutRes private val layoutRes: Int = R.layout.rib_small
+    ) : SmallView.Factory {
+        override fun invoke(deps: Nothing?): (ViewGroup) -> SmallView = {
+            SmallViewImpl(
+                com.badoo.ribs.customisation.inflate(it, layoutRes)
+            )
+        }
+    }
+
+    private val idText = androidView.findViewById<TextView>(R.id.small_id)
+    private val openBigButton = androidView.findViewById<Button>(R.id.open_big)
+
+    init {
+        openBigButton.setOnClickListener { events.accept(Event.OpenBigClicked)  }
+    }
+
+    override fun accept(vm: ViewModel) {
+        idText.text = vm.text
+    }
+}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallBuilder.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallBuilder.kt
new file mode 100644
index 000000000..7d080f91c
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallBuilder.kt
@@ -0,0 +1,27 @@
+package com.badoo.ribs.example.rib.small.builder
+
+import android.os.Bundle
+import com.badoo.ribs.core.Builder
+import com.badoo.ribs.customisation.customisationsBranchFor
+import com.badoo.ribs.customisation.getOrDefault
+import com.badoo.ribs.example.rib.small.Small
+import com.badoo.ribs.example.rib.small.SmallNode
+
+class SmallBuilder(
+    dependency: Small.Dependency
+) : Builder<Small.Dependency>() {
+
+    override val dependency : Small.Dependency = object : Small.Dependency by dependency {
+        override fun ribCustomisation() = dependency.customisationsBranchFor(Small::class)
+    }
+
+    fun build(savedInstanceState: Bundle?): SmallNode =
+        DaggerSmallComponent
+            .factory()
+            .create(
+                dependency = dependency,
+                customisation = dependency.getOrDefault(Small.Customisation()),
+                savedInstanceState = savedInstanceState
+            )
+            .node()
+}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallComponent.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallComponent.kt
new file mode 100644
index 000000000..8a38db0de
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallComponent.kt
@@ -0,0 +1,26 @@
+package com.badoo.ribs.example.rib.small.builder
+
+import android.os.Bundle
+import com.badoo.ribs.example.rib.big.Big
+import com.badoo.ribs.example.rib.small.Small
+import com.badoo.ribs.example.rib.small.SmallNode
+import dagger.BindsInstance
+
+@SmallScope
+@dagger.Component(
+    modules = [SmallModule::class],
+    dependencies = [Small.Dependency::class]
+)
+internal interface SmallComponent : Big.Dependency {
+
+    @dagger.Component.Factory
+    interface Factory {
+        fun create(
+            dependency: Small.Dependency,
+            @BindsInstance customisation: Small.Customisation,
+            @BindsInstance savedInstanceState: Bundle?
+        ): SmallComponent
+    }
+
+    fun node(): SmallNode
+}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallModule.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallModule.kt
new file mode 100644
index 000000000..9f412df8f
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallModule.kt
@@ -0,0 +1,57 @@
+@file:SuppressWarnings("LongParameterList", "LongMethod")
+package com.badoo.ribs.example.rib.small.builder
+
+import android.os.Bundle
+import com.badoo.ribs.core.Portal
+import com.badoo.ribs.example.rib.big.builder.BigBuilder
+import com.badoo.ribs.example.rib.small.Small
+import com.badoo.ribs.example.rib.small.SmallInteractor
+import com.badoo.ribs.example.rib.small.SmallNode
+import com.badoo.ribs.example.rib.small.SmallRouter
+import dagger.Provides
+
+@dagger.Module
+internal object SmallModule {
+
+    @SmallScope
+    @Provides
+    @JvmStatic
+    internal fun router(
+        // pass component to child rib builders, or remove if there are none
+        component: SmallComponent,
+        savedInstanceState: Bundle?,
+        portal: Portal.Sink
+    ): SmallRouter =
+        SmallRouter(
+            savedInstanceState = savedInstanceState,
+            portal = portal,
+            bigBuilder = BigBuilder(component)
+        )
+
+    @SmallScope
+    @Provides
+    @JvmStatic
+    internal fun interactor(
+        savedInstanceState: Bundle?,
+        router: SmallRouter
+    ): SmallInteractor =
+        SmallInteractor(
+            savedInstanceState = savedInstanceState,
+            router = router
+        )
+
+    @SmallScope
+    @Provides
+    @JvmStatic
+    internal fun node(
+        savedInstanceState: Bundle?,
+        customisation: Small.Customisation,
+        router: SmallRouter,
+        interactor: SmallInteractor
+    ) : SmallNode = SmallNode(
+        savedInstanceState = savedInstanceState,
+        viewFactory = customisation.viewFactory(null),
+        router = router,
+        interactor = interactor
+    )
+}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallScope.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallScope.kt
new file mode 100644
index 000000000..ea759f373
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallScope.kt
@@ -0,0 +1,7 @@
+package com.badoo.ribs.example.rib.small.builder
+
+import javax.inject.Scope
+
+@Scope
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class SmallScope
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherInteractor.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherInteractor.kt
index e514703c1..5395fd034 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherInteractor.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherInteractor.kt
@@ -15,21 +15,25 @@ import com.badoo.ribs.example.rib.switcher.SwitcherView.Event
 import com.badoo.ribs.example.rib.switcher.dialog.DialogToTestOverlay
 import io.reactivex.functions.Consumer
 import android.os.Bundle
+import com.badoo.ribs.example.rib.switcher.feature.PortalFeature
 
 class SwitcherInteractor(
     savedInstanceState: Bundle?,
     router: Router<Configuration, Permanent, Content, Overlay, SwitcherView>,
-    private val dialogToTestOverlay: DialogToTestOverlay
+    private val dialogToTestOverlay: DialogToTestOverlay,
+    private val portal: PortalFeature
 ) : Interactor<Configuration, Content, Overlay, SwitcherView>(
     savedInstanceState = savedInstanceState,
     router = router,
-    disposables = null
+    disposables = portal
 ) {
+
     override fun onViewCreated(view: SwitcherView, viewLifecycle: Lifecycle) {
         super.onViewCreated(view, viewLifecycle)
         viewLifecycle.createDestroy {
             bind(view to viewEventConsumer)
             bind(dialogToTestOverlay to dialogEventConsumer)
+            bind(portal.models to view.portalRenderer)
         }
     }
 
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherView.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherView.kt
index 9a18a5cce..78d2bf77c 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherView.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherView.kt
@@ -3,6 +3,8 @@ package com.badoo.ribs.example.rib.switcher
 import android.support.annotation.LayoutRes
 import android.view.ViewGroup
 import android.widget.Button
+import com.badoo.ribs.android.AndroidPortalRenderer
+import com.badoo.ribs.core.Portal
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.view.RibView
 import com.badoo.ribs.core.view.ViewFactory
@@ -35,6 +37,8 @@ interface SwitcherView : RibView,
     interface Dependency {
         fun coffeeMachine(): CoffeeMachine
     }
+
+    val portalRenderer: Portal.Renderer
 }
 
 
@@ -62,6 +66,10 @@ class SwitcherViewImpl private constructor(
     private val showOverlayDialog: Button = androidView.findViewById(R.id.show_overlay_dialog)
     private val showBlocker: Button = androidView.findViewById(R.id.show_blocker)
     private val makeCoffee: Button = androidView.findViewById(R.id.make_coffee)
+    override val portalRenderer: Portal.Renderer = AndroidPortalRenderer(
+            androidView.findViewById(R.id.portal_container),
+            androidView.findViewById(R.id.own_content_container)
+        )
 
     init {
         showOverlayDialog.setOnClickListener { events.accept(Event.ShowOverlayDialogClicked) }
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/builder/SwitcherModule.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/builder/SwitcherModule.kt
index ffa9c4648..7d7e2feae 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/builder/SwitcherModule.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/builder/SwitcherModule.kt
@@ -2,6 +2,7 @@
 package com.badoo.ribs.example.rib.switcher.builder
 
 import android.os.Bundle
+import com.badoo.ribs.core.Portal
 import com.badoo.ribs.dialog.DialogLauncher
 import com.badoo.ribs.example.rib.blocker.Blocker
 import com.badoo.ribs.example.rib.blocker.builder.BlockerBuilder
@@ -18,6 +19,7 @@ import com.badoo.ribs.example.rib.switcher.SwitcherNode
 import com.badoo.ribs.example.rib.switcher.SwitcherRouter
 import com.badoo.ribs.example.rib.switcher.SwitcherView
 import com.badoo.ribs.example.rib.switcher.dialog.DialogToTestOverlay
+import com.badoo.ribs.example.rib.switcher.feature.PortalFeature
 import com.badoo.ribs.example.util.CoffeeMachine
 import dagger.Provides
 import io.reactivex.Observable
@@ -27,6 +29,20 @@ import io.reactivex.functions.Consumer
 @dagger.Module
 internal object SwitcherModule {
 
+    @SwitcherScope
+    @Provides
+    @JvmStatic
+    internal fun portalFeature(): PortalFeature =
+        PortalFeature()
+
+    @SwitcherScope
+    @Provides
+    @JvmStatic
+    internal fun portal(
+        portalFeature: PortalFeature
+    ): Portal.Sink =
+        portalFeature
+
     @SwitcherScope
     @Provides
     @JvmStatic
@@ -59,12 +75,14 @@ internal object SwitcherModule {
     internal fun interactor(
         savedInstanceState: Bundle?,
         router: SwitcherRouter,
-        dialogToTestOverlay: DialogToTestOverlay
+        dialogToTestOverlay: DialogToTestOverlay,
+        portalFeature: PortalFeature
     ): SwitcherInteractor =
         SwitcherInteractor(
             savedInstanceState = savedInstanceState,
             router = router,
-            dialogToTestOverlay = dialogToTestOverlay
+            dialogToTestOverlay = dialogToTestOverlay,
+            portal = portalFeature
         )
 
     @Provides
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/feature/PortalFeature.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/feature/PortalFeature.kt
new file mode 100644
index 000000000..dcc2c3fe9
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/feature/PortalFeature.kt
@@ -0,0 +1,62 @@
+package com.badoo.ribs.example.rib.switcher.feature
+
+import com.badoo.mvicore.element.Actor
+import com.badoo.mvicore.element.Reducer
+import com.badoo.mvicore.feature.ActorReducerFeature
+import com.badoo.ribs.core.Node
+import com.badoo.ribs.core.Portal
+import com.badoo.ribs.core.Portal.Sink.Command
+import com.badoo.ribs.core.Portal.Sink.Command.Add
+import com.badoo.ribs.core.Portal.Sink.Command.Remove
+import com.badoo.ribs.core.Portal.Source.Model
+import com.badoo.ribs.core.Portal.Source.Model.Showing
+import com.badoo.ribs.example.rib.switcher.feature.PortalFeature.Effect
+import com.badoo.ribs.example.rib.switcher.feature.PortalFeature.Effect.Added
+import com.badoo.ribs.example.rib.switcher.feature.PortalFeature.Effect.Removed
+import com.badoo.ribs.example.rib.switcher.feature.PortalFeature.State
+import io.reactivex.Observable
+import io.reactivex.Observable.empty
+import io.reactivex.Observable.just
+import io.reactivex.ObservableSource
+
+class PortalFeature : ActorReducerFeature<Command, Effect, State, Nothing>(
+    initialState = State(),
+    actor = ActorImpl(),
+    reducer = ReducerImpl()
+), Portal.Sink, Portal.Source {
+
+    data class State(
+        val nodes: List<Node<*>> = emptyList()
+    )
+
+    sealed class Effect {
+        data class Added(val node: Node<*>) : Effect()
+        data class Removed(val node: Node<*>) : Effect()
+    }
+
+    class ActorImpl : Actor<State, Command, Effect> {
+        override fun invoke(state: State, command: Command): Observable<out Effect> = when (command) {
+            is Add -> if (!state.nodes.contains(command.node)) just(Added(command.node)).doOnNext {
+                state.nodes.lastOrNull()?.detachFromView()
+            } else empty()
+            is Remove -> if (state.nodes.contains(command.node)) just(Removed(command.node)).doOnNext {
+                it.node.detachFromView()
+            } else empty()
+        }
+    }
+
+    class ReducerImpl : Reducer<State, Effect> {
+        override fun invoke(state: State, effect: Effect): State = when (effect) {
+            is Added -> state.copy(nodes = state.nodes + effect.node)
+            is Removed -> state.copy(nodes = state.nodes - effect.node)
+        }
+    }
+
+    override val models: ObservableSource<Model>
+        get() = Observable.wrap(this).map {
+            when {
+                it.nodes.isEmpty() -> Model.Empty
+                else -> Showing(it.nodes.last())
+            }
+        }
+}
diff --git a/android/app-example/src/main/res/layout/rib_big.xml b/android/app-example/src/main/res/layout/rib_big.xml
new file mode 100644
index 000000000..cdb41caec
--- /dev/null
+++ b/android/app-example/src/main/res/layout/rib_big.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rib_big"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:layout_gravity="center"
+    android:gravity="center">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="This should be displayed full screen" />
+
+    <TextView
+        android:id="@+id/big_id"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <FrameLayout
+        android:id="@+id/small_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp" />
+
+</LinearLayout>
diff --git a/android/app-example/src/main/res/layout/rib_hello_world.xml b/android/app-example/src/main/res/layout/rib_hello_world.xml
index a38a4e6bc..fef9ab86c 100644
--- a/android/app-example/src/main/res/layout/rib_hello_world.xml
+++ b/android/app-example/src/main/res/layout/rib_hello_world.xml
@@ -36,8 +36,18 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/launch_other_activity"
-        android:layout_marginTop="24dp"
+        android:layout_margin="24dp"
         app:layout_constraintTop_toBottomOf="@id/hello_debug"
+        app:layout_constraintBottom_toTopOf="@id/small_container"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <FrameLayout
+        android:id="@+id/small_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        app:layout_constraintTop_toBottomOf="@id/hello_button_launch"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
diff --git a/android/app-example/src/main/res/layout/rib_small.xml b/android/app-example/src/main/res/layout/rib_small.xml
new file mode 100644
index 000000000..588a9f55b
--- /dev/null
+++ b/android/app-example/src/main/res/layout/rib_small.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rib_small"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#999"
+    android:padding="24dp"
+    android:orientation="vertical"
+    android:layout_gravity="center"
+    android:gravity="center">
+
+    <TextView
+        android:id="@+id/small_id"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <Button
+        android:id="@+id/open_big"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Open Big"/>
+
+</LinearLayout>
diff --git a/android/app-example/src/main/res/layout/rib_switcher.xml b/android/app-example/src/main/res/layout/rib_switcher.xml
index 1d9483db5..0272949aa 100644
--- a/android/app-example/src/main/res/layout/rib_switcher.xml
+++ b/android/app-example/src/main/res/layout/rib_switcher.xml
@@ -9,6 +9,7 @@
     tools:context=".app.RootActivity">
 
     <android.support.constraint.ConstraintLayout
+        android:id="@+id/own_content_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -66,6 +67,12 @@
 
     </android.support.constraint.ConstraintLayout>
 
+
+    <FrameLayout
+        android:id="@+id/portal_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
     <FrameLayout
         android:id="@+id/blocker_container"
         android:layout_width="match_parent"
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/android/AndroidPortalRenderer.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/android/AndroidPortalRenderer.kt
new file mode 100644
index 000000000..1b9977c9b
--- /dev/null
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/android/AndroidPortalRenderer.kt
@@ -0,0 +1,23 @@
+package com.badoo.ribs.android
+
+import android.view.View
+import android.view.ViewGroup
+import com.badoo.ribs.core.Portal
+import com.badoo.ribs.core.Portal.Source.Model.Showing
+
+class AndroidPortalRenderer(
+    private val portalContainer: ViewGroup,
+    private val regularContentContainer: ViewGroup
+) : Portal.Renderer {
+
+    override fun accept(portalVm: Portal.Source.Model) {
+        regularContentContainer.visibility = when (portalVm) {
+            is Showing -> View.GONE
+            else -> View.VISIBLE
+        }
+
+        if (portalVm is Showing) {
+            portalVm.node.attachToView(portalContainer)
+        }
+    }
+}
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/android/ViewStack.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/android/ViewStack.kt
new file mode 100644
index 000000000..57b9ee517
--- /dev/null
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/android/ViewStack.kt
@@ -0,0 +1,30 @@
+package com.badoo.ribs.android
+
+import android.view.View
+import android.view.ViewGroup
+
+class ViewStackImpl(
+    private val container: ViewGroup
+) {
+//    private val cache = mutableMapOf<Int, View>()
+
+    private val views = mutableListOf<View>()
+
+//    private fun findView(id: Int) =
+//        cache[id] ?: container.findViewById<View>(id).also { cache[id] = it }
+
+
+    fun push(view: View) {
+        views.lastOrNull()?.visibility = View.GONE
+        view.let {
+            it.visibility = View.VISIBLE
+            views.add(it)
+            container.addView(it)
+        }
+    }
+
+    fun pop() {
+        views.dropLast(1)
+        views.lastOrNull()?.visibility = View.VISIBLE
+    }
+}
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
index 3fd036f07..88fc1c11e 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
@@ -124,6 +124,7 @@ open class Node<V : RibView>(
     }
 
     open fun attachToView(parentViewGroup: ViewGroup) {
+        detachFromView()
         this.parentViewGroup = parentViewGroup
         isAttachedToView = true
 
@@ -327,12 +328,19 @@ open class Node<V : RibView>(
     open fun handleBackPress(): Boolean {
         ribRefWatcher.logBreadcrumb("BACKPRESS", null, null)
         return children
-            .filter { it.isAttachedToView }
+            .filter { it.shouldPropagateBackPress }
             .any { it.handleBackPress() }
             || interactor.handleBackPress()
             || router.popBackStack()
     }
 
+    /**
+     * Valid use-case: RIB is detached from view, but a descendant of it is visible through a [Portal]
+     * In this case it should still propagate back press
+     */
+    private val shouldPropagateBackPress: Boolean
+        get() = isAttachedToView || children.any { it.shouldPropagateBackPress }
+
 
     internal fun saveViewState() {
         view?.let {
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Portal.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Portal.kt
new file mode 100644
index 000000000..82f7c2854
--- /dev/null
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Portal.kt
@@ -0,0 +1,26 @@
+package com.badoo.ribs.core
+
+import io.reactivex.ObservableSource
+import io.reactivex.functions.Consumer
+
+interface Portal {
+
+    interface Sink : Consumer<Sink.Command> {
+
+        sealed class Command {
+            data class Add(val node: Node<*>) : Command()
+            data class Remove(val node: Node<*>) : Command()
+        }
+    }
+
+    interface Source {
+        val models: ObservableSource<Model>
+
+        sealed class Model {
+            object Empty : Model()
+            data class Showing(val node: Node<*>) : Model()
+        }
+    }
+
+    interface Renderer : Consumer<Source.Model>
+}
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/CompositeRoutingAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/CompositeRoutingAction.kt
index cc3d944aa..e4c6c07cb 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/CompositeRoutingAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/CompositeRoutingAction.kt
@@ -17,15 +17,15 @@ class CompositeRoutingAction< V : RibView>(
             )
         }.flatten()
 
-    override fun execute() {
+    override fun execute(nodes: List<Node.Descriptor>) {
         routingActions.forEach {
-            it.execute()
+            it.execute(nodes)
         }
     }
 
-    override fun cleanup() {
+    override fun cleanup(nodes: List<Node.Descriptor>) {
         routingActions.forEach {
-            it.cleanup()
+            it.cleanup(nodes)
         }
     }
 
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/DialogRoutingAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/DialogRoutingAction.kt
index 0c02c44f4..b70466de8 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/DialogRoutingAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/DialogRoutingAction.kt
@@ -19,13 +19,13 @@ class DialogRoutingAction<V : RibView, Event : Any>(
             Node.Descriptor(it, ViewAttachMode.EXTERNAL)
         }
 
-    override fun execute() {
+    override fun execute(nodes: List<Node.Descriptor>) {
         dialogLauncher.show(dialog, onClose = {
             router.popBackStack()
         })
     }
 
-    override fun cleanup() {
+    override fun cleanup(nodes: List<Node.Descriptor>) {
         dialogLauncher.hide(dialog)
     }
 
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/FullScreenRoutingAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/FullScreenRoutingAction.kt
new file mode 100644
index 000000000..a039de3fa
--- /dev/null
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/FullScreenRoutingAction.kt
@@ -0,0 +1,37 @@
+package com.badoo.ribs.core.routing.action
+
+import android.os.Bundle
+import com.badoo.ribs.core.Node
+import com.badoo.ribs.core.Portal
+import com.badoo.ribs.core.Portal.Sink.Command.Add
+import com.badoo.ribs.core.Portal.Sink.Command.Remove
+import com.badoo.ribs.core.view.RibView
+
+class FullScreenRoutingAction<V : RibView>(
+    private val portal: Portal.Sink,
+    private val builder: (Bundle?) -> Node<*>
+) : RoutingAction<V> {
+
+    override fun buildNodes(bundles: List<Bundle?>): List<Node.Descriptor> =
+        listOf(
+            Node.Descriptor(
+                node = builder.invoke(bundles.firstOrNull()),
+                viewAttachMode = Node.ViewAttachMode.EXTERNAL
+            )
+        )
+
+    override fun execute(nodes: List<Node.Descriptor>) {
+        super.execute(nodes)
+        portal.accept(Add(nodes.first().node))
+    }
+
+    override fun cleanup(nodes: List<Node.Descriptor>) {
+        super.cleanup(nodes)
+        portal.accept(Remove(nodes.first().node))
+    }
+
+    companion object {
+        fun <V : RibView> fullScreen(portal: Portal.Sink, builder: (Bundle?) -> Node<*>): RoutingAction<V> =
+            FullScreenRoutingAction(portal, builder)
+    }
+}
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/InvokeOnCleanUp.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/InvokeOnCleanUp.kt
index f4ffa6dfb..2993b00b8 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/InvokeOnCleanUp.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/InvokeOnCleanUp.kt
@@ -1,12 +1,13 @@
 package com.badoo.ribs.core.routing.action
 
+import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.view.RibView
 
 class InvokeOnCleanup< V : RibView>(
     private val f: () -> Unit
 ) : RoutingAction<V> {
 
-    override fun cleanup() {
+    override fun cleanup(nodes: List<Node.Descriptor>) {
         f()
     }
 
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/InvokeOnExecute.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/InvokeOnExecute.kt
index 6be6408d6..942e7cfd4 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/InvokeOnExecute.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/InvokeOnExecute.kt
@@ -1,12 +1,13 @@
 package com.badoo.ribs.core.routing.action
 
+import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.view.RibView
 
 class InvokeOnExecute< V : RibView>(
     private val onInvoke: () -> Unit
 ) : RoutingAction<V> {
 
-    override fun execute() {
+    override fun execute(nodes: List<Node.Descriptor>) {
         onInvoke()
     }
 
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/RoutingAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/RoutingAction.kt
index d651bc358..7eb21b0ba 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/RoutingAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/RoutingAction.kt
@@ -9,11 +9,11 @@ interface RoutingAction<V : RibView> {
     fun buildNodes(bundles: List<Bundle?>) : List<Node.Descriptor> =
         emptyList()
 
-    fun execute() {
+    fun execute(nodes: List<Node.Descriptor>) {
 
     }
 
-    fun cleanup()  {
+    fun cleanup(nodes: List<Node.Descriptor>) {
     }
 
     companion object {
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/ActivateAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/ActivateAction.kt
index 6292c4cd8..348263fa2 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/ActivateAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/ActivateAction.kt
@@ -37,7 +37,7 @@ internal object ActivateAction : ResolvedSingleConfigurationAction() {
         }
 
         parentNode.attachParentedViews(item.nodes)
-        item.routingAction.execute()
+        item.routingAction.execute(item.nodes)
         return item.withActivationState(globalActivationLevel)
     }
 
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/DeactivateAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/DeactivateAction.kt
index 868f7bccf..4306a50d4 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/DeactivateAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/DeactivateAction.kt
@@ -16,7 +16,7 @@ internal object DeactivateAction : ResolvedSingleConfigurationAction() {
 
     override fun <C : Parcelable> execute(item: Resolved<C>, params: ActionExecutionParams<C>): Resolved<C> {
         val (_, parentNode, _) = params
-        item.routingAction.cleanup()
+        item.routingAction.cleanup(item.nodes)
         item.nodes.saveViewState()
         parentNode.detachChildViews(item.nodes)
 
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/customisation/CanProvidePortal.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/customisation/CanProvidePortal.kt
new file mode 100644
index 000000000..4c4297424
--- /dev/null
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/customisation/CanProvidePortal.kt
@@ -0,0 +1,8 @@
+package com.badoo.ribs.customisation
+
+import com.badoo.ribs.core.Portal
+
+
+interface CanProvidePortal {
+    fun portal(): Portal.Sink
+}
diff --git a/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/routing/configuration/ConfigurationFeatureTest.kt b/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/routing/configuration/ConfigurationFeatureTest.kt
index aa2c4568e..a578b4985 100644
--- a/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/routing/configuration/ConfigurationFeatureTest.kt
+++ b/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/routing/configuration/ConfigurationFeatureTest.kt
@@ -225,8 +225,8 @@ class ConfigurationFeatureTest {
     fun `On first WakeUp after init, ALL initial configuration are activated - associated RoutingActions are executed`() {
         createEmptyFeature()
         feature.accept(WakeUp())
-        verify(helperPermanent1.routingAction).execute()
-        verify(helperPermanent2.routingAction).execute()
+        verify(helperPermanent1.routingAction).execute(item.nodes)
+        verify(helperPermanent2.routingAction).execute(item.nodes)
     }
 
     @Test
@@ -289,11 +289,11 @@ class ConfigurationFeatureTest {
     fun `On WakeUp after init from TimeCapsule, ALL previously ACTIVE configurations are activated - associated RoutingActions are executed`() {
         createRestoredFeature()
         feature.accept(WakeUp())
-        verify(helperPermanent1.routingAction).execute()
-        verify(helperPermanent2.routingAction).execute()
-        verify(helperContentViewParented1.routingAction).execute()
-        verify(helperContentViewParented2.routingAction).execute()
-        verify(helperContentExternal1.routingAction).execute()
+        verify(helperPermanent1.routingAction).execute(item.nodes)
+        verify(helperPermanent2.routingAction).execute(item.nodes)
+        verify(helperContentViewParented1.routingAction).execute(item.nodes)
+        verify(helperContentViewParented2.routingAction).execute(item.nodes)
+        verify(helperContentExternal1.routingAction).execute(item.nodes)
     }
 
     @Test
@@ -336,8 +336,8 @@ class ConfigurationFeatureTest {
     fun `On WakeUp after init from TimeCapsule, ALL previously INACTIVE configurations are NOT activated - associated RoutingActions are NOT executed`() {
         createRestoredFeature()
         feature.accept(WakeUp())
-        verify(helperContentViewParented3.routingAction, never()).execute()
-        verify(helperContentExternal2.routingAction, never()).execute()
+        verify(helperContentViewParented3.routingAction, never()).execute(item.nodes)
+        verify(helperContentExternal2.routingAction, never()).execute(item.nodes)
     }
 
     @Test
@@ -400,7 +400,7 @@ class ConfigurationFeatureTest {
     fun `On Add, associated RoutingAction is not yet executed`() {
         createEmptyFeature()
         feature.accept(Add(Content(0), ContentViewParented1))
-        verify(helperContentViewParented1.routingAction, never()).execute()
+        verify(helperContentViewParented1.routingAction, never()).execute(item.nodes)
     }
     // endregion
 
@@ -410,7 +410,7 @@ class ConfigurationFeatureTest {
         createEmptyFeature()
         feature.accept(Add(Content(0), ContentViewParented1))
         feature.accept(Activate(Content(0)))
-        verify(helperContentViewParented1.routingAction, never()).execute()
+        verify(helperContentViewParented1.routingAction, never()).execute(item.nodes)
     }
 
     @Test
@@ -429,7 +429,7 @@ class ConfigurationFeatureTest {
         feature.accept(Add(Content(0), ContentViewParented1))
         feature.accept(Activate(Content(0)))
         feature.accept(WakeUp())
-        verify(helperContentViewParented1.routingAction).execute()
+        verify(helperContentViewParented1.routingAction).execute(item.nodes)
     }
 
     @Test
@@ -449,7 +449,7 @@ class ConfigurationFeatureTest {
         feature.accept(WakeUp())
         feature.accept(Add(Content(0), ContentViewParented1))
         feature.accept(Activate(Content(0)))
-        verify(helperContentViewParented1.routingAction).execute()
+        verify(helperContentViewParented1.routingAction).execute(item.nodes)
     }
 
     @Test
@@ -481,7 +481,7 @@ class ConfigurationFeatureTest {
         feature.accept(Add(Content(0), ContentViewParented1))
         feature.accept(Activate(Content(0)))
         feature.accept(Activate(Content(0)))
-        verify(helperContentViewParented1.routingAction, times(1)).execute()
+        verify(helperContentViewParented1.routingAction, times(1)).execute(item.nodes)
     }
 
     @Test
@@ -503,7 +503,7 @@ class ConfigurationFeatureTest {
         createEmptyFeature()
         feature.accept(Add(Content(0), ContentViewParented1))
         feature.accept(Deactivate(Content(0)))
-        verify(helperContentViewParented1.routingAction).cleanup()
+        verify(helperContentViewParented1.routingAction).cleanup(item.nodes)
     }
 
     @Test
@@ -595,7 +595,7 @@ class ConfigurationFeatureTest {
         clearInvocations(parentNode)
         feature.accept(Sleep())
 
-        verify(helperContentViewParented1.routingAction).cleanup()
+        verify(helperContentViewParented1.routingAction).cleanup(item.nodes)
     }
 
     @Test
@@ -641,7 +641,7 @@ class ConfigurationFeatureTest {
         clearInvocations(helperContentViewParented1.routingAction)
         feature.accept(WakeUp())
 
-        verify(helperContentViewParented1.routingAction).execute()
+        verify(helperContentViewParented1.routingAction).execute(item.nodes)
     }
 
     @Test

From 9594715411aab4cc596f196086cf8172a24c3aac Mon Sep 17 00:00:00 2001
From: Zsolt Kocsi <zsolt.kocsi@corp.badoo.com>
Date: Fri, 23 Aug 2019 20:22:59 +0100
Subject: [PATCH 02/17] WIP

---
 .../badoo/ribs/example/rib/root/RootTest.kt   |  30 ++++++
 .../badoo/ribs/example/app/RootActivity.kt    | 101 +++++++++---------
 .../com/badoo/ribs/example/rib/root/Root.kt   |  29 +++++
 .../ribs/example/rib/root/RootInteractor.kt   |  45 ++++++++
 .../badoo/ribs/example/rib/root/RootNode.kt   |  27 +++++
 .../badoo/ribs/example/rib/root/RootRouter.kt |  38 +++++++
 .../badoo/ribs/example/rib/root/RootView.kt   |  61 +++++++++++
 .../example/rib/root/builder/RootBuilder.kt   |  27 +++++
 .../example/rib/root/builder/RootComponent.kt |  26 +++++
 .../example/rib/root/builder/RootModule.kt    |  83 ++++++++++++++
 .../example/rib/root/builder/RootScope.kt     |   7 ++
 .../ribs/example/rib/switcher/Switcher.kt     |   4 +-
 .../rib/switcher/SwitcherInteractor.kt        |  18 +++-
 .../ribs/example/rib/switcher/SwitcherView.kt |   8 --
 .../rib/switcher/builder/SwitcherModule.kt    |  20 +---
 .../rib/switcher/feature/PortalFeature.kt     |  33 ++++--
 .../src/main/res/layout/rib_root.xml          |   6 ++
 .../src/main/res/layout/rib_switcher.xml      |   6 --
 .../example/rib/root/RootInteractorTest.kt    |  41 +++++++
 .../ribs/example/rib/root/RootRouterTest.kt   |  35 ++++++
 .../ribs/example/rib/root/RootWorkflowTest.kt |  56 ++++++++++
 .../com/badoo/ribs/core/LifecycleParent.kt    |  13 +++
 .../src/main/java/com/badoo/ribs/core/Node.kt |  65 ++++++++---
 .../routing/action/AttachRibRoutingAction.kt  |   2 +-
 .../routing/action/DialogRoutingAction.kt     |   4 +-
 .../routing/action/FullScreenRoutingAction.kt |   2 +-
 .../action/single/ActivateAction.kt           |   2 +-
 .../configuration/action/single/AddAction.kt  |   2 +-
 .../action/single/DeactivateAction.kt         |   2 +-
 .../java/com/badoo/ribs/core/RouterTest.kt    |   4 +-
 .../configuration/ConfigurationFeatureTest.kt |  18 ++--
 31 files changed, 686 insertions(+), 129 deletions(-)
 create mode 100644 android/app-example/src/androidTest/java/com/badoo/ribs/example/rib/root/RootTest.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/root/Root.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootInteractor.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootNode.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootView.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootBuilder.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootComponent.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootModule.kt
 create mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootScope.kt
 create mode 100644 android/app-example/src/main/res/layout/rib_root.xml
 create mode 100644 android/app-example/src/test/java/com/badoo/ribs/example/rib/root/RootInteractorTest.kt
 create mode 100644 android/app-example/src/test/java/com/badoo/ribs/example/rib/root/RootRouterTest.kt
 create mode 100644 android/app-example/src/test/java/com/badoo/ribs/example/rib/root/RootWorkflowTest.kt
 create mode 100644 android/libraries/rib-base/src/main/java/com/badoo/ribs/core/LifecycleParent.kt

diff --git a/android/app-example/src/androidTest/java/com/badoo/ribs/example/rib/root/RootTest.kt b/android/app-example/src/androidTest/java/com/badoo/ribs/example/rib/root/RootTest.kt
new file mode 100644
index 000000000..2fe38a0ac
--- /dev/null
+++ b/android/app-example/src/androidTest/java/com/badoo/ribs/example/rib/root/RootTest.kt
@@ -0,0 +1,30 @@
+package com.badoo.ribs.example.rib.root
+
+import android.os.Bundle
+import com.badoo.common.ribs.RibsRule
+import com.badoo.ribs.RibTestActivity
+import com.badoo.ribs.customisation.RibCustomisationDirectory
+import com.badoo.ribs.example.rib.root.builder.RootBuilder
+import io.reactivex.Observable.empty
+import io.reactivex.ObservableSource
+import io.reactivex.functions.Consumer
+import org.junit.Rule
+import org.junit.Test
+
+class RootTest {
+
+    @get:Rule
+    val ribsRule = RibsRule { activity, savedInstanceState -> buildRib(activity, savedInstanceState) }
+
+    private fun buildRib(ribTestActivity: RibTestActivity, savedInstanceState: Bundle?) =
+        RootBuilder(object : Root.Dependency {
+            override fun rootInput(): ObservableSource<Root.Input> = empty()
+            override fun rootOutput(): Consumer<Root.Output> = Consumer {}
+            override fun ribCustomisation(): RibCustomisationDirectory = TODO()
+        }).build(savedInstanceState)
+
+    @Test
+    fun testTextDisplayed() {
+        TODO("Write UI tests")
+    }
+}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/app/RootActivity.kt b/android/app-example/src/main/java/com/badoo/ribs/example/app/RootActivity.kt
index 41ed51d6f..6adacd365 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/app/RootActivity.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/app/RootActivity.kt
@@ -11,6 +11,9 @@ import com.badoo.ribs.customisation.RibCustomisationDirectory
 import com.badoo.ribs.dialog.DialogLauncher
 import com.badoo.ribs.example.R
 import com.badoo.ribs.example.rib.hello_world.HelloWorld
+import com.badoo.ribs.example.rib.root.Root
+import com.badoo.ribs.example.rib.root.RootNode
+import com.badoo.ribs.example.rib.root.builder.RootBuilder
 import com.badoo.ribs.example.rib.switcher.Switcher
 import com.badoo.ribs.example.rib.switcher.SwitcherNode
 import com.badoo.ribs.example.rib.switcher.builder.SwitcherBuilder
@@ -31,63 +34,63 @@ class RootActivity : RibActivity() {
     override val rootViewGroup: ViewGroup
         get() = findViewById(R.id.root)
 
-    private lateinit var workflowRoot: Switcher.Workflow
+    private lateinit var workflowRoot: Root.Workflow
 
-    override fun createRib(savedInstanceState: Bundle?): SwitcherNode =
-        SwitcherBuilder(
-            object : Switcher.Dependency {
+    override fun createRib(savedInstanceState: Bundle?): RootNode =
+        RootBuilder(
+            object : Root.Dependency {
                 override fun ribCustomisation(): RibCustomisationDirectory = AppRibCustomisations
                 override fun activityStarter(): ActivityStarter = activityStarter
                 override fun permissionRequester(): PermissionRequester = permissionRequester
                 override fun dialogLauncher(): DialogLauncher = this@RootActivity
-                override fun coffeeMachine(): CoffeeMachine = StupidCoffeeMachine()
             }
         ).build(savedInstanceState).also {
             workflowRoot = it
         }
 
-    override val workflowFactory: (Intent) -> Disposable? = {
-        when {
-            // adb shell am start -a "android.intent.action.VIEW" -d "app-example://workflow1"
-            (it.data?.host == "workflow1") -> executeWorkflow1()
-
-            // adb shell am start -a "android.intent.action.VIEW" -d "app-example://workflow2"
-            (it.data?.host == "workflow2") -> executeWorkflow2()
-
-            // adb shell am start -a "android.intent.action.VIEW" -d "app-example://testcrash"
-            (it.data?.host == "testcrash") -> executeTestCrash()
-            else -> null
-        }
-    }
-
-    private fun executeWorkflow1(): Disposable? =
-        workflowRoot
-            .attachHelloWorld()
-            .subscribe { workflow: HelloWorld.Workflow ->
-                Log.d("WORKFLOW", "Success")
-            }
-
-    @SuppressWarnings("OptionalUnit")
-    private fun executeWorkflow2(): Disposable? =
-        Observable.combineLatest(
-            workflowRoot
-                .doSomethingAndStayOnThisNode()
-                .toObservable(),
-
-            workflowRoot
-                .waitForHelloWorld()
-                .flatMap { it.somethingSomethingDarkSide() }
-                .toObservable(),
-
-            BiFunction<Switcher.Workflow, HelloWorld.Workflow, Unit> { _, _ -> Unit }
-        ).subscribe {
-            Log.d("WORKFLOW", "Success")
-        }
-
-    private fun executeTestCrash(): Disposable? =
-        (rootNode as Switcher.Workflow)
-            .testCrash()
-            .subscribe { workflow: HelloWorld.Workflow ->
-                Log.d("WORKFLOW", "This should crash before here")
-            }
+//    override val workflowFactory: (Intent) -> Disposable? = {
+//        when {
+//            // adb shell am start -a "android.intent.action.VIEW" -d "app-example://workflow1"
+//            (it.data?.host == "workflow1") -> executeWorkflow1()
+//
+//            // adb shell am start -a "android.intent.action.VIEW" -d "app-example://workflow2"
+//            (it.data?.host == "workflow2") -> executeWorkflow2()
+//
+//            // adb shell am start -a "android.intent.action.VIEW" -d "app-example://testcrash"
+//            (it.data?.host == "testcrash") -> executeTestCrash()
+//            else -> null
+//        }
+//    }
+//
+//    private fun executeWorkflow1(): Disposable? =
+//        workflowRoot
+//            .goToSwitcher()
+//            .flatMap { it.attachHelloWorld() }
+//            .subscribe { workflow: HelloWorld.Workflow ->
+//                Log.d("WORKFLOW", "Success")
+//            }
+//
+//    @SuppressWarnings("OptionalUnit")
+//    private fun executeWorkflow2(): Disposable? =
+//        workflowRoot
+//            .goToSwitcher()
+//            .flatMap {
+//                Observable.combineLatest(
+//                    it.doSomethingAndStayOnThisNode(),
+//                    it.waitForHelloWorld()
+//                        .flatMap { it.somethingSomethingDarkSide() },
+//                    BiFunction<Switcher.Workflow, HelloWorld.Workflow, Unit> { _, _ -> Unit }
+//            }
+//            .toObservable()
+//
+//        ).subscribe {
+//            Log.d("WORKFLOW", "Success")
+//        }
+//
+//    private fun executeTestCrash(): Disposable? =
+//        (rootNode as Switcher.Workflow)
+//            .testCrash()
+//            .subscribe { workflow: HelloWorld.Workflow ->
+//                Log.d("WORKFLOW", "This should crash before here")
+//            }
 }
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/Root.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/Root.kt
new file mode 100644
index 000000000..858752356
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/Root.kt
@@ -0,0 +1,29 @@
+package com.badoo.ribs.example.rib.root
+
+import com.badoo.ribs.android.CanProvideActivityStarter
+import com.badoo.ribs.android.CanProvidePermissionRequester
+import com.badoo.ribs.core.Rib
+import com.badoo.ribs.customisation.CanProvideRibCustomisation
+import com.badoo.ribs.customisation.RibCustomisation
+import com.badoo.ribs.dialog.CanProvideDialogLauncher
+import com.badoo.ribs.example.rib.switcher.Switcher
+import io.reactivex.ObservableSource
+import io.reactivex.Single
+import io.reactivex.functions.Consumer
+
+interface Root : Rib {
+
+    interface Dependency :
+        CanProvideActivityStarter,
+        CanProvidePermissionRequester,
+        CanProvideDialogLauncher,
+        CanProvideRibCustomisation
+
+    class Customisation(
+        val viewFactory: RootView.Factory = RootViewImpl.Factory()
+    ) : RibCustomisation
+
+    interface Workflow {
+        fun goToSwitcher(): Single<Switcher.Workflow>
+    }
+}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootInteractor.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootInteractor.kt
new file mode 100644
index 000000000..04c5d6774
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootInteractor.kt
@@ -0,0 +1,45 @@
+package com.badoo.ribs.example.rib.root
+
+import android.arch.lifecycle.Lifecycle
+import android.os.Bundle
+import com.badoo.mvicore.android.lifecycle.createDestroy
+import com.badoo.ribs.core.Interactor
+import com.badoo.ribs.core.Portal
+import com.badoo.ribs.core.Portal.Source.Model.*
+import com.badoo.ribs.core.Router
+import com.badoo.ribs.example.rib.root.RootRouter.Configuration
+import com.badoo.ribs.example.rib.root.RootRouter.Configuration.Content
+import com.badoo.ribs.example.rib.root.RootRouter.Configuration.Overlay
+import com.badoo.ribs.example.rib.switcher.feature.PortalFeature
+import io.reactivex.functions.Consumer
+
+class RootInteractor(
+    savedInstanceState: Bundle?,
+    router: Router<Configuration, *, Content, Overlay, RootView>,
+    private val portal: PortalFeature
+) : Interactor<Configuration, Content, Overlay, RootView>(
+    savedInstanceState = savedInstanceState,
+    router = router,
+    disposables = portal
+) {
+
+    override fun onAttach(ribLifecycle: Lifecycle, savedInstanceState: Bundle?) {
+        ribLifecycle.createDestroy {
+            bind(portal.models to portalModelConsumer)
+        }
+    }
+
+    override fun onViewCreated(view: RootView, viewLifecycle: Lifecycle) {
+        viewLifecycle.createDestroy {
+//            bind(portal.models to view.portalRenderer)
+            bind(portal.models to view)
+        }
+    }
+
+    private val portalModelConsumer: Consumer<Portal.Source.Model> = Consumer {
+        when (it) {
+            is Empty -> router.newRoot(Content.Default) // TODO pop should work just fine, but this is safer for now
+            is Showing -> router.push(Content.Portal)
+        }
+    }
+}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootNode.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootNode.kt
new file mode 100644
index 000000000..a623fa3e8
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootNode.kt
@@ -0,0 +1,27 @@
+package com.badoo.ribs.example.rib.root
+
+import android.os.Bundle
+import android.view.ViewGroup
+import com.badoo.ribs.core.Node
+import com.badoo.ribs.example.rib.root.RootRouter.Configuration.Content
+import com.badoo.ribs.example.rib.switcher.Switcher
+import io.reactivex.Single
+
+class RootNode(
+    savedInstanceState: Bundle?,
+    viewFactory: ((ViewGroup) -> RootView?)?,
+    private val router: RootRouter,
+    private val interactor: RootInteractor
+) : Node<RootView>(
+    savedInstanceState = savedInstanceState,
+    identifier = object : Root {},
+    viewFactory = viewFactory,
+    router = router,
+    interactor = interactor
+), Root.Workflow {
+
+    override fun goToSwitcher(): Single<Switcher.Workflow> =
+        attachWorkflow {
+            router.newRoot(Content.Default) // TODO consider this
+        }
+}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt
new file mode 100644
index 000000000..1df5a6dbd
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt
@@ -0,0 +1,38 @@
+package com.badoo.ribs.example.rib.root
+
+import android.os.Bundle
+import android.os.Parcelable
+import com.badoo.ribs.core.Router
+import com.badoo.ribs.core.routing.action.AttachRibRoutingAction
+import com.badoo.ribs.core.routing.action.RoutingAction
+import com.badoo.ribs.core.routing.action.RoutingAction.Companion.noop
+import com.badoo.ribs.example.rib.root.RootRouter.Configuration
+import com.badoo.ribs.example.rib.root.RootRouter.Configuration.Content
+import com.badoo.ribs.example.rib.root.RootRouter.Configuration.Overlay
+import com.badoo.ribs.example.rib.root.RootRouter.Configuration.Permanent
+import com.badoo.ribs.example.rib.switcher.builder.SwitcherBuilder
+import kotlinx.android.parcel.Parcelize
+
+class RootRouter(
+    savedInstanceState: Bundle?,
+    private val switcherBuilder: SwitcherBuilder
+): Router<Configuration, Permanent, Content, Overlay, RootView>(
+    savedInstanceState = savedInstanceState,
+    initialConfiguration = Content.Default,
+    permanentParts = emptyList()
+) {
+    sealed class Configuration : Parcelable {
+        sealed class Permanent : Configuration()
+        sealed class Content : Configuration() {
+            @Parcelize object Default : Content()
+            @Parcelize object Portal : Content()
+        }
+        sealed class Overlay : Configuration()
+    }
+
+    override fun resolveConfiguration(configuration: Configuration): RoutingAction<RootView> =
+        when (configuration) {
+            Content.Default -> AttachRibRoutingAction.attach { switcherBuilder.build(it) }
+            Content.Portal -> noop()
+        }
+}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootView.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootView.kt
new file mode 100644
index 000000000..470677add
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootView.kt
@@ -0,0 +1,61 @@
+package com.badoo.ribs.example.rib.root
+
+import android.support.annotation.LayoutRes
+import android.view.ViewGroup
+import com.badoo.ribs.android.AndroidPortalRenderer
+import com.badoo.ribs.core.Portal
+import com.badoo.ribs.core.view.RibView
+import com.badoo.ribs.core.view.ViewFactory
+import com.badoo.ribs.example.R
+import com.badoo.ribs.example.rib.root.RootView.Event
+import com.jakewharton.rxrelay2.PublishRelay
+import io.reactivex.ObservableSource
+import io.reactivex.functions.Consumer
+
+interface RootView : RibView,
+    ObservableSource<Event>,
+    Portal.Renderer {
+//    ,
+//    Consumer<ViewModel> {
+
+    sealed class Event
+
+//    data class ViewModel(
+//        val i: Int = 0
+//    )
+
+    interface Factory : ViewFactory<Nothing?, RootView>
+
+//    val portalRenderer: Portal.Renderer
+}
+
+
+class RootViewImpl private constructor(
+    override val androidView: ViewGroup,
+    private val events: PublishRelay<Event> = PublishRelay.create()
+) : RootView,
+    ObservableSource<Event> by events,
+    Portal.Renderer {
+//    Consumer<ViewModel> {
+
+    class Factory(
+        @LayoutRes private val layoutRes: Int = R.layout.rib_root
+    ) : RootView.Factory {
+        override fun invoke(deps: Nothing?): (ViewGroup) -> RootView = {
+            RootViewImpl(
+                com.badoo.ribs.customisation.inflate(it, layoutRes)
+            )
+        }
+    }
+
+//    override val portalRenderer: Portal.Renderer = object : Portal.Renderer {
+        override fun accept(model: Portal.Source.Model) {
+            if (model is Portal.Source.Model.Showing) {
+                model.node.attachToView(androidView)
+            }
+        }
+//    }
+
+//    override fun accept(vm: RootView.ViewModel) {
+//    }
+}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootBuilder.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootBuilder.kt
new file mode 100644
index 000000000..c47530491
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootBuilder.kt
@@ -0,0 +1,27 @@
+package com.badoo.ribs.example.rib.root.builder
+
+import android.os.Bundle
+import com.badoo.ribs.core.Builder
+import com.badoo.ribs.customisation.customisationsBranchFor
+import com.badoo.ribs.customisation.getOrDefault
+import com.badoo.ribs.example.rib.root.Root
+import com.badoo.ribs.example.rib.root.RootNode
+
+class RootBuilder(
+    dependency: Root.Dependency
+) : Builder<Root.Dependency>() {
+
+    override val dependency : Root.Dependency = object : Root.Dependency by dependency {
+        override fun ribCustomisation() = dependency.customisationsBranchFor(Root::class)
+    }
+
+    fun build(savedInstanceState: Bundle?): RootNode =
+        DaggerRootComponent
+            .factory()
+            .create(
+                dependency = dependency,
+                customisation = dependency.getOrDefault(Root.Customisation()),
+                savedInstanceState = savedInstanceState
+            )
+            .node()
+}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootComponent.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootComponent.kt
new file mode 100644
index 000000000..7dfa92a65
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootComponent.kt
@@ -0,0 +1,26 @@
+package com.badoo.ribs.example.rib.root.builder
+
+import android.os.Bundle
+import com.badoo.ribs.example.rib.root.Root
+import com.badoo.ribs.example.rib.root.RootNode
+import com.badoo.ribs.example.rib.switcher.Switcher
+import dagger.BindsInstance
+
+@RootScope
+@dagger.Component(
+    modules = [RootModule::class],
+    dependencies = [Root.Dependency::class]
+)
+internal interface RootComponent : Switcher.Dependency {
+
+    @dagger.Component.Factory
+    interface Factory {
+        fun create(
+            dependency: Root.Dependency,
+            @BindsInstance customisation: Root.Customisation,
+            @BindsInstance savedInstanceState: Bundle?
+        ): RootComponent
+    }
+
+    fun node(): RootNode
+}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootModule.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootModule.kt
new file mode 100644
index 000000000..0adf036b1
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootModule.kt
@@ -0,0 +1,83 @@
+@file:SuppressWarnings("LongParameterList", "LongMethod")
+package com.badoo.ribs.example.rib.root.builder
+
+import android.os.Bundle
+import com.badoo.ribs.core.Portal
+import com.badoo.ribs.example.rib.root.Root
+import com.badoo.ribs.example.rib.root.RootInteractor
+import com.badoo.ribs.example.rib.root.RootNode
+import com.badoo.ribs.example.rib.root.RootRouter
+import com.badoo.ribs.example.rib.switcher.builder.SwitcherBuilder
+import com.badoo.ribs.example.rib.switcher.feature.PortalFeature
+import com.badoo.ribs.example.util.CoffeeMachine
+import com.badoo.ribs.example.util.StupidCoffeeMachine
+import dagger.Provides
+import javax.inject.Provider
+
+@dagger.Module
+internal object RootModule {
+
+    @RootScope
+    @Provides
+    @JvmStatic
+    internal fun portalFeature(
+        node: Provider<RootNode>
+    ): PortalFeature =
+        PortalFeature(node)
+
+    @RootScope
+    @Provides
+    @JvmStatic
+    internal fun portal(
+        portalFeature: PortalFeature
+    ): Portal.Sink =
+        portalFeature
+
+    @RootScope
+    @Provides
+    @JvmStatic
+    internal fun router(
+        // pass component to child rib builders, or remove if there are none
+        component: RootComponent,
+        savedInstanceState: Bundle?
+    ): RootRouter =
+        RootRouter(
+            savedInstanceState = savedInstanceState,
+            switcherBuilder = SwitcherBuilder(component)
+        )
+
+    @RootScope
+    @Provides
+    @JvmStatic
+    internal fun interactor(
+        savedInstanceState: Bundle?,
+        router: RootRouter,
+        portalFeature: PortalFeature
+    ): RootInteractor =
+        RootInteractor(
+            savedInstanceState = savedInstanceState,
+            router = router,
+            portal = portalFeature
+        )
+
+    @RootScope
+    @Provides
+    @JvmStatic
+    internal fun node(
+        savedInstanceState: Bundle?,
+        customisation: Root.Customisation,
+        router: RootRouter,
+        interactor: RootInteractor
+    ) : RootNode = RootNode(
+        savedInstanceState = savedInstanceState,
+        viewFactory = customisation.viewFactory(null),
+        router = router,
+        interactor = interactor
+    )
+
+    @RootScope
+    @Provides
+    @JvmStatic
+    internal fun coffeeMachine(): CoffeeMachine =
+        StupidCoffeeMachine()
+}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootScope.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootScope.kt
new file mode 100644
index 000000000..5902bf030
--- /dev/null
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootScope.kt
@@ -0,0 +1,7 @@
+package com.badoo.ribs.example.rib.root.builder
+
+import javax.inject.Scope
+
+@Scope
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class RootScope
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/Switcher.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/Switcher.kt
index de2a96241..16bcb9d79 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/Switcher.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/Switcher.kt
@@ -3,6 +3,7 @@ package com.badoo.ribs.example.rib.switcher
 import com.badoo.ribs.android.CanProvideActivityStarter
 import com.badoo.ribs.android.CanProvidePermissionRequester
 import com.badoo.ribs.core.Rib
+import com.badoo.ribs.customisation.CanProvidePortal
 import com.badoo.ribs.customisation.CanProvideRibCustomisation
 import com.badoo.ribs.customisation.RibCustomisation
 import com.badoo.ribs.dialog.CanProvideDialogLauncher
@@ -16,7 +17,8 @@ interface Switcher : Rib {
         CanProvideActivityStarter,
         CanProvidePermissionRequester,
         CanProvideDialogLauncher,
-        CanProvideRibCustomisation {
+        CanProvideRibCustomisation,
+        CanProvidePortal {
 
         fun coffeeMachine(): CoffeeMachine
     }
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherInteractor.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherInteractor.kt
index 5395fd034..ad0d6de7b 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherInteractor.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherInteractor.kt
@@ -20,12 +20,14 @@ import com.badoo.ribs.example.rib.switcher.feature.PortalFeature
 class SwitcherInteractor(
     savedInstanceState: Bundle?,
     router: Router<Configuration, Permanent, Content, Overlay, SwitcherView>,
-    private val dialogToTestOverlay: DialogToTestOverlay,
-    private val portal: PortalFeature
+    private val dialogToTestOverlay: DialogToTestOverlay
+//    ,
+//    private val portal: PortalFeature
 ) : Interactor<Configuration, Content, Overlay, SwitcherView>(
     savedInstanceState = savedInstanceState,
     router = router,
-    disposables = portal
+//    disposables = portal
+    disposables = null
 ) {
 
     override fun onViewCreated(view: SwitcherView, viewLifecycle: Lifecycle) {
@@ -33,10 +35,18 @@ class SwitcherInteractor(
         viewLifecycle.createDestroy {
             bind(view to viewEventConsumer)
             bind(dialogToTestOverlay to dialogEventConsumer)
-            bind(portal.models to view.portalRenderer)
+//            bind(portal.models to view.portalRenderer)
+//            bind(portal.news to portalNewsConsumer)
         }
     }
 
+//    private val portalNewsConsumer: Consumer<PortalFeature.News> = Consumer {
+//        when (it) {
+//            is PortalFeature.News.Activated -> TODO() // bind lifecycle to Node
+//            is PortalFeature.News.Deactivated -> TODO() // bind lifecycle to Node
+//        }
+//    }
+
     internal inner class MenuListener : Consumer<Menu.Output> {
         override fun accept(output: Menu.Output) = when (output) {
             is Menu.Output.MenuItemSelected -> when (output.menuItem) {
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherView.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherView.kt
index 78d2bf77c..9a18a5cce 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherView.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherView.kt
@@ -3,8 +3,6 @@ package com.badoo.ribs.example.rib.switcher
 import android.support.annotation.LayoutRes
 import android.view.ViewGroup
 import android.widget.Button
-import com.badoo.ribs.android.AndroidPortalRenderer
-import com.badoo.ribs.core.Portal
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.view.RibView
 import com.badoo.ribs.core.view.ViewFactory
@@ -37,8 +35,6 @@ interface SwitcherView : RibView,
     interface Dependency {
         fun coffeeMachine(): CoffeeMachine
     }
-
-    val portalRenderer: Portal.Renderer
 }
 
 
@@ -66,10 +62,6 @@ class SwitcherViewImpl private constructor(
     private val showOverlayDialog: Button = androidView.findViewById(R.id.show_overlay_dialog)
     private val showBlocker: Button = androidView.findViewById(R.id.show_blocker)
     private val makeCoffee: Button = androidView.findViewById(R.id.make_coffee)
-    override val portalRenderer: Portal.Renderer = AndroidPortalRenderer(
-            androidView.findViewById(R.id.portal_container),
-            androidView.findViewById(R.id.own_content_container)
-        )
 
     init {
         showOverlayDialog.setOnClickListener { events.accept(Event.ShowOverlayDialogClicked) }
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/builder/SwitcherModule.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/builder/SwitcherModule.kt
index 7d7e2feae..9d3c888a0 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/builder/SwitcherModule.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/builder/SwitcherModule.kt
@@ -29,20 +29,6 @@ import io.reactivex.functions.Consumer
 @dagger.Module
 internal object SwitcherModule {
 
-    @SwitcherScope
-    @Provides
-    @JvmStatic
-    internal fun portalFeature(): PortalFeature =
-        PortalFeature()
-
-    @SwitcherScope
-    @Provides
-    @JvmStatic
-    internal fun portal(
-        portalFeature: PortalFeature
-    ): Portal.Sink =
-        portalFeature
-
     @SwitcherScope
     @Provides
     @JvmStatic
@@ -75,14 +61,12 @@ internal object SwitcherModule {
     internal fun interactor(
         savedInstanceState: Bundle?,
         router: SwitcherRouter,
-        dialogToTestOverlay: DialogToTestOverlay,
-        portalFeature: PortalFeature
+        dialogToTestOverlay: DialogToTestOverlay
     ): SwitcherInteractor =
         SwitcherInteractor(
             savedInstanceState = savedInstanceState,
             router = router,
-            dialogToTestOverlay = dialogToTestOverlay,
-            portal = portalFeature
+            dialogToTestOverlay = dialogToTestOverlay
         )
 
     @Provides
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/feature/PortalFeature.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/feature/PortalFeature.kt
index dcc2c3fe9..3a8c0e88b 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/feature/PortalFeature.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/feature/PortalFeature.kt
@@ -3,6 +3,7 @@ package com.badoo.ribs.example.rib.switcher.feature
 import com.badoo.mvicore.element.Actor
 import com.badoo.mvicore.element.Reducer
 import com.badoo.mvicore.feature.ActorReducerFeature
+import com.badoo.ribs.core.LifecycleParent
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.Portal
 import com.badoo.ribs.core.Portal.Sink.Command
@@ -18,10 +19,14 @@ import io.reactivex.Observable
 import io.reactivex.Observable.empty
 import io.reactivex.Observable.just
 import io.reactivex.ObservableSource
+import javax.inject.Provider
 
-class PortalFeature : ActorReducerFeature<Command, Effect, State, Nothing>(
+// FIXME move somewhere else
+class PortalFeature(
+    lifecycleParent: Provider<out LifecycleParent>
+): ActorReducerFeature<Command, Effect, State, Nothing>(
     initialState = State(),
-    actor = ActorImpl(),
+    actor = ActorImpl(lifecycleParent),
     reducer = ReducerImpl()
 ), Portal.Sink, Portal.Source {
 
@@ -34,14 +39,24 @@ class PortalFeature : ActorReducerFeature<Command, Effect, State, Nothing>(
         data class Removed(val node: Node<*>) : Effect()
     }
 
-    class ActorImpl : Actor<State, Command, Effect> {
+    class ActorImpl(
+        private val lifecycleParent: Provider<out LifecycleParent>
+    ) : Actor<State, Command, Effect> {
         override fun invoke(state: State, command: Command): Observable<out Effect> = when (command) {
-            is Add -> if (!state.nodes.contains(command.node)) just(Added(command.node)).doOnNext {
-                state.nodes.lastOrNull()?.detachFromView()
-            } else empty()
-            is Remove -> if (state.nodes.contains(command.node)) just(Removed(command.node)).doOnNext {
-                it.node.detachFromView()
-            } else empty()
+            is Add -> if (state.nodes.contains(command.node)) empty() else
+                just(Added(command.node)).doOnNext {
+                    state.nodes.lastOrNull()?.let {
+                        it.detachFromView()
+                        lifecycleParent.get().removeParented(it)
+                    }
+                    lifecycleParent.get().addParented(it.node)
+                }
+
+            is Remove -> if (!state.nodes.contains(command.node)) empty() else
+                just(Removed(command.node)).doOnNext {
+                    it.node.detachFromView()
+                    lifecycleParent.get().removeParented(it.node)
+                }
         }
     }
 
diff --git a/android/app-example/src/main/res/layout/rib_root.xml b/android/app-example/src/main/res/layout/rib_root.xml
new file mode 100644
index 000000000..8b96ef115
--- /dev/null
+++ b/android/app-example/src/main/res/layout/rib_root.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rib_root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
diff --git a/android/app-example/src/main/res/layout/rib_switcher.xml b/android/app-example/src/main/res/layout/rib_switcher.xml
index 0272949aa..9733392d0 100644
--- a/android/app-example/src/main/res/layout/rib_switcher.xml
+++ b/android/app-example/src/main/res/layout/rib_switcher.xml
@@ -67,12 +67,6 @@
 
     </android.support.constraint.ConstraintLayout>
 
-
-    <FrameLayout
-        android:id="@+id/portal_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
     <FrameLayout
         android:id="@+id/blocker_container"
         android:layout_width="match_parent"
diff --git a/android/app-example/src/test/java/com/badoo/ribs/example/rib/root/RootInteractorTest.kt b/android/app-example/src/test/java/com/badoo/ribs/example/rib/root/RootInteractorTest.kt
new file mode 100644
index 000000000..68f9b3151
--- /dev/null
+++ b/android/app-example/src/test/java/com/badoo/ribs/example/rib/root/RootInteractorTest.kt
@@ -0,0 +1,41 @@
+package com.badoo.ribs.example.rib.root
+
+import com.badoo.ribs.example.rib.root.feature.RootFeature
+import com.nhaarman.mockitokotlin2.mock
+import io.reactivex.ObservableSource
+import io.reactivex.functions.Consumer
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+
+class RootInteractorTest {
+
+    private val input: ObservableSource<Root.Input> = mock()
+    private val output: Consumer<Root.Output> = mock()
+    private val feature: RootFeature = mock()
+    private val router: RootRouter = mock()
+    private lateinit var interactor: RootInteractor
+
+    @Before
+    fun setup() {
+        interactor = RootInteractor(
+            savedInstanceState = null,
+            input = input,
+            output = output,
+            feature = feature,
+            router = router
+        )
+    }
+
+    @After
+    fun tearDown() {
+    }
+
+    /**
+     * TODO: Add real tests.
+     */
+    @Test
+    fun `an example test with some conditions should pass`() {
+        throw RuntimeException("Add real tests.")
+    }
+}
diff --git a/android/app-example/src/test/java/com/badoo/ribs/example/rib/root/RootRouterTest.kt b/android/app-example/src/test/java/com/badoo/ribs/example/rib/root/RootRouterTest.kt
new file mode 100644
index 000000000..0e43e316f
--- /dev/null
+++ b/android/app-example/src/test/java/com/badoo/ribs/example/rib/root/RootRouterTest.kt
@@ -0,0 +1,35 @@
+package com.badoo.ribs.example.rib.root
+
+import com.nhaarman.mockitokotlin2.mock
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+
+@RunWith(RobolectricTestRunner::class)
+class RootRouterTest {
+
+    private var interactor: RootInteractor = mock()
+    private var router: RootRouter? = null
+
+    @Before
+    fun setup() {
+        router = RootRouter(
+            savedInstanceState = null
+        )
+    }
+
+    @After
+    fun tearDown() {
+    }
+
+    /**
+     * TODO: Add real tests.
+     */
+    @Test
+    fun `an example test with some conditions should pass`() {
+        throw RuntimeException("Add real tests.")
+    }
+}
diff --git a/android/app-example/src/test/java/com/badoo/ribs/example/rib/root/RootWorkflowTest.kt b/android/app-example/src/test/java/com/badoo/ribs/example/rib/root/RootWorkflowTest.kt
new file mode 100644
index 000000000..6a21db413
--- /dev/null
+++ b/android/app-example/src/test/java/com/badoo/ribs/example/rib/root/RootWorkflowTest.kt
@@ -0,0 +1,56 @@
+package com.badoo.ribs.example.rib.root
+
+import com.badoo.ribs.customisation.RibCustomisationDirectory
+import com.badoo.ribs.example.rib.root.builder.RootBuilder
+import com.nhaarman.mockitokotlin2.mock
+import io.reactivex.ObservableSource
+import io.reactivex.functions.Consumer
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+
+class RootWorkflowTest {
+
+    private lateinit var workflow: Root.Workflow
+
+    @Before
+    fun setup() {
+        workflow = RootBuilder(object : Root.Dependency {
+            override fun rootInput(): ObservableSource<Root.Input> = mock()
+            override fun rootOutput(): Consumer<Root.Output> = mock()
+            override fun ribCustomisation(): RibCustomisationDirectory = mock()
+        }).build(null).also {
+            it.onAttach()
+        }
+    }
+
+    @After
+    fun tearDown() {
+    }
+
+    /**
+     * TODO: Add tests for every workflow action that operates on the node
+     */
+    @Test
+    fun `business logic operation test`() {
+        workflow.businessLogicOperation()
+        // verify(feature).accept(Wish)
+
+        throw RuntimeException("Add real tests.")
+    }
+
+    /**
+     * TODO: Add tests for every workflow action that attaches a child to ensure workflow step can be fulfilled
+     */
+    @Test
+    fun `attach child workflow step is fulfillable`() {
+        // val testObserver = TestObserver<Child.Workflow>()
+
+        // workflow.attachChild1().subscribe(testObserver)
+
+        // testObserver.assertValueCount(1)
+        // testObserver.assertComplete()
+
+        throw RuntimeException("Add real tests.")
+    }
+}
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/LifecycleParent.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/LifecycleParent.kt
new file mode 100644
index 000000000..2fb6cd4b6
--- /dev/null
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/LifecycleParent.kt
@@ -0,0 +1,13 @@
+package com.badoo.ribs.core
+
+interface LifecycleParent {
+    fun addParented(child: LifecycleChild)
+    fun removeParented(child: LifecycleChild)
+}
+
+interface LifecycleChild {
+    fun onStart()
+    fun onResume()
+    fun onPause()
+    fun onStop()
+}
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
index 88fc1c11e..73fd85d05 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
@@ -32,6 +32,7 @@ import android.os.Parcelable
 import android.support.annotation.CallSuper
 import android.support.annotation.MainThread
 import android.support.annotation.VisibleForTesting
+import android.util.Log
 import android.util.SparseArray
 import android.view.ViewGroup
 import com.badoo.ribs.core.view.RibView
@@ -55,13 +56,23 @@ open class Node<V : RibView>(
     private val router: Router<*, *, *, *, V>,
     private val interactor: Interactor<*, *, *, V>,
     private val ribRefWatcher: RibRefWatcher = RibRefWatcher.getInstance()
-) : LifecycleOwner {
+) : LifecycleOwner, LifecycleParent, LifecycleChild {
+
+    override fun addParented(child: LifecycleChild) {
+        Log.d("CHECK", "addParented - $this ---> $child")
+        lifecycleChildren.add(child)
+    }
+
+    override fun removeParented(child: LifecycleChild) {
+        Log.d("CHECK", "removeParented - $this -x-> $child")
+        lifecycleChildren.remove(child)
+    }
 
     private val savedInstanceState = savedInstanceState?.getBundle(BUNDLE_KEY)
 
-    enum class ViewAttachMode {
+    enum class AttachMode {
         /**
-         * The node's view attach/detach is managed by its parent.
+         * The node's view attach/detach and lifecycle is managed by its parent.
          */
         PARENT,
 
@@ -77,7 +88,7 @@ open class Node<V : RibView>(
 
     data class Descriptor(
         val node: Node<*>,
-        val viewAttachMode: ViewAttachMode
+        val viewAttachMode: AttachMode
     )
 
     companion object {
@@ -92,6 +103,7 @@ open class Node<V : RibView>(
 
     val tag: String = this::class.java.name
     val children = CopyOnWriteArrayList<Node<*>>()
+    private val lifecycleChildren = CopyOnWriteArrayList<LifecycleChild>()
     private val childrenAttachesRelay: PublishRelay<Node<*>> = PublishRelay.create()
     val childrenAttaches: Observable<Node<*>> = childrenAttachesRelay.hide()
 
@@ -124,6 +136,7 @@ open class Node<V : RibView>(
     }
 
     open fun attachToView(parentViewGroup: ViewGroup) {
+        Log.d("CHECK", "attachToView - $this")
         detachFromView()
         this.parentViewGroup = parentViewGroup
         isAttachedToView = true
@@ -148,6 +161,7 @@ open class Node<V : RibView>(
 
     open fun detachFromView() {
         if (isAttachedToView) {
+            Log.d("CHECK", "detachFromView - $this")
             onPauseInternal()
             onStopInternal()
             router.onDetachView()
@@ -166,6 +180,7 @@ open class Node<V : RibView>(
     }
 
     open fun onDetach() {
+        Log.d("CHECK", "onDetach - $this")
         if (isAttachedToView) {
             RIBs.errorHandler.handleNonFatalError(
                 "View was not detached before node detach!",
@@ -192,13 +207,19 @@ open class Node<V : RibView>(
      * @param childNode the [Node] to be attached.
      */
     @MainThread
-    internal fun attachChildNode(childNode: Node<*>) {
+    internal fun attachChildNode(childDescriptor: Descriptor) {
+        Log.d("CHECK", "attachChildNode - $this, $childDescriptor")
+        val (childNode, viewAttachMode) = childDescriptor
         children.add(childNode)
         ribRefWatcher.logBreadcrumb(
             "ATTACHED", childNode.javaClass.simpleName, this.javaClass.simpleName
         )
 
-        childNode.inheritExternalLifecycle(externalLifecycleRegistry)
+        if (viewAttachMode == AttachMode.PARENT) {
+            addParented(childNode)
+            childNode.inheritExternalLifecycle(externalLifecycleRegistry)
+        }
+
         childNode.onAttach()
         childrenAttachesRelay.accept(childNode)
     }
@@ -235,6 +256,7 @@ open class Node<V : RibView>(
     @MainThread
     internal fun detachChildNode(childNode: Node<*>) {
         children.remove(childNode)
+        lifecycleChildren.remove(childNode)
 
         ribRefWatcher.watchDeletedObject(childNode)
         ribRefWatcher.logBreadcrumb(
@@ -249,7 +271,7 @@ open class Node<V : RibView>(
      *
      * For internal usage call onStartInternal() directly
      */
-    fun onStart() {
+    override fun onStart() {
         externalLifecycleRegistry.handleLifecycleEvent(ON_START)
         onStartInternal { it.onStart() }
     }
@@ -259,7 +281,7 @@ open class Node<V : RibView>(
      *
      * For internal usage call onStopInternal() directly
      */
-    fun onStop() {
+    override fun onStop() {
         externalLifecycleRegistry.handleLifecycleEvent(ON_STOP)
         onStopInternal { it.onStop() }
     }
@@ -269,7 +291,7 @@ open class Node<V : RibView>(
      *
      * For internal usage call onResumeInternal() directly
      */
-    fun onResume() {
+    override fun onResume() {
         externalLifecycleRegistry.handleLifecycleEvent(ON_RESUME)
         onResumeInternal { it.onResume() }
     }
@@ -279,35 +301,39 @@ open class Node<V : RibView>(
      *
      * For internal usage call onPauseInternal() directly
      */
-    fun onPause() {
+    override fun onPause() {
         externalLifecycleRegistry.handleLifecycleEvent(ON_PAUSE)
         onPauseInternal { it.onPause() }
     }
 
     internal fun onStartInternal(callOnChildren: (Node<*>) -> Unit = { it.onStartInternal() }) {
+        Log.d("CHECK", "onStartInternal - $this")
         // The lifecycle cannot go higher than that of the hosting environment (e.g. Activity)
         updateToStateIfViewAttached(externalLifecycleRegistry.currentState)
-        children.forEach { callOnChildren.invoke(it) }
+        lifecycleChildren.forEach { callOnChildren.invoke(it as Node<*>) } // TODO cast is safe, but make it correct
     }
 
     // TODO call this when overlay is removed
     internal fun onResumeInternal(callOnChildren: (Node<*>) -> Unit = { it.onResumeInternal() }) {
+        Log.d("CHECK", "onResumeInternal - $this")
         // The lifecycle cannot go higher than that of the hosting environment (e.g. Activity)
         updateToStateIfViewAttached(externalLifecycleRegistry.currentState)
-        children.forEach { callOnChildren.invoke(it) }
+        lifecycleChildren.forEach { callOnChildren.invoke(it as Node<*>) } // TODO cast is safe, but make it correct
     }
 
     // TODO call this when overlay hides content AND current rib is not in dialog
     internal fun onPauseInternal(callOnChildren: (Node<*>) -> Unit = { it.onPauseInternal() }) {
+        Log.d("CHECK", "onPauseInternal - $this")
         // The lifecycle cannot go higher than that of the hosting environment (e.g. Activity)
         val targetState = if (externalLifecycleRegistry.currentState == CREATED) CREATED else STARTED
         updateToStateIfViewAttached(targetState)
-        children.forEach { callOnChildren.invoke(it) }
+        lifecycleChildren.forEach { callOnChildren.invoke(it as Node<*>) } // TODO cast is safe, but make it correct
     }
 
     internal fun onStopInternal(callOnChildren: (Node<*>) -> Unit = { it.onStopInternal() }) {
+        Log.d("CHECK", "onStopInternal - $this")
         updateToStateIfViewAttached(CREATED)
-        children.forEach { callOnChildren.invoke(it) }
+        lifecycleChildren.forEach { callOnChildren.invoke(it as Node<*>) } // TODO cast is safe, but make it correct
     }
 
     private fun updateToStateIfViewAttached(state: Lifecycle.State) {
@@ -316,6 +342,8 @@ open class Node<V : RibView>(
             if (!isViewless) {
                 view!!.let { viewLifecycleRegistry.markState(state) }
             }
+        } else {
+            Log.d("CHECK", "SKIPPED updating lifecycle to state: $state - $this, as not attached to view, current state is: ${ribLifecycleRegistry.currentState}")
         }
     }
 
@@ -326,6 +354,7 @@ open class Node<V : RibView>(
      */
     @CallSuper
     open fun handleBackPress(): Boolean {
+        Log.d("CHECK", "handleBackPress - $this")
         ribRefWatcher.logBreadcrumb("BACKPRESS", null, null)
         return children
             .filter { it.shouldPropagateBackPress }
@@ -366,7 +395,13 @@ open class Node<V : RibView>(
         ribLifecycleRegistry
 
     override fun toString(): String =
-        "Node@${hashCode()} ($identifier)"
+        identifier.toString()
+            .substring(
+                identifier.toString().lastIndexOf(".")
+            )
+//                ,
+//                identifier.toString().indexOf("$"))
+//            .replace(".", "")
 
     /**
      * Executes an action and remains on the same hierarchical level
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/AttachRibRoutingAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/AttachRibRoutingAction.kt
index 26713c0de..8e5c12229 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/AttachRibRoutingAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/AttachRibRoutingAction.kt
@@ -12,7 +12,7 @@ class AttachRibRoutingAction<V : RibView>(
         listOf(
             Node.Descriptor(
                 node = builder.invoke(bundles.firstOrNull()),
-                viewAttachMode = Node.ViewAttachMode.PARENT
+                viewAttachMode = Node.AttachMode.PARENT
             )
         )
 
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/DialogRoutingAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/DialogRoutingAction.kt
index b70466de8..10e656b36 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/DialogRoutingAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/DialogRoutingAction.kt
@@ -2,7 +2,7 @@ package com.badoo.ribs.core.routing.action
 
 import android.os.Bundle
 import com.badoo.ribs.core.Node
-import com.badoo.ribs.core.Node.ViewAttachMode
+import com.badoo.ribs.core.Node.AttachMode
 import com.badoo.ribs.core.Router
 import com.badoo.ribs.core.view.RibView
 import com.badoo.ribs.dialog.Dialog
@@ -16,7 +16,7 @@ class DialogRoutingAction<V : RibView, Event : Any>(
 
     override fun buildNodes(bundles: List<Bundle?>) : List<Node.Descriptor> =
         dialog.buildNodes(bundles).map {
-            Node.Descriptor(it, ViewAttachMode.EXTERNAL)
+            Node.Descriptor(it, AttachMode.EXTERNAL)
         }
 
     override fun execute(nodes: List<Node.Descriptor>) {
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/FullScreenRoutingAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/FullScreenRoutingAction.kt
index a039de3fa..d3b00061b 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/FullScreenRoutingAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/FullScreenRoutingAction.kt
@@ -16,7 +16,7 @@ class FullScreenRoutingAction<V : RibView>(
         listOf(
             Node.Descriptor(
                 node = builder.invoke(bundles.firstOrNull()),
-                viewAttachMode = Node.ViewAttachMode.EXTERNAL
+                viewAttachMode = Node.AttachMode.EXTERNAL
             )
         )
 
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/ActivateAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/ActivateAction.kt
index 348263fa2..b5a79feea 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/ActivateAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/ActivateAction.kt
@@ -43,7 +43,7 @@ internal object ActivateAction : ResolvedSingleConfigurationAction() {
 
     private fun Node<*>.attachParentedViews(nodes: List<Node.Descriptor>) {
         nodes.forEach {
-            if (it.viewAttachMode == Node.ViewAttachMode.PARENT && !it.node.isAttachedToView) {
+            if (it.viewAttachMode == Node.AttachMode.PARENT && !it.node.isAttachedToView) {
                 attachChildView(it.node)
             }
         }
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/AddAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/AddAction.kt
index 98dca3117..d013417a9 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/AddAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/AddAction.kt
@@ -26,7 +26,7 @@ internal object AddAction : ResolvedSingleConfigurationAction() {
 
     private fun Node<*>.attachNodes(nodes: List<Node.Descriptor>) {
         nodes.forEach {
-            attachChildNode(it.node)
+            attachChildNode(it)
         }
     }
 }
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/DeactivateAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/DeactivateAction.kt
index 4306a50d4..ee9faa3c6 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/DeactivateAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/DeactivateAction.kt
@@ -31,7 +31,7 @@ internal object DeactivateAction : ResolvedSingleConfigurationAction() {
 
     private fun Node<*>.detachChildViews(nodes: List<Node.Descriptor>) {
         nodes.forEach {
-            if (it.viewAttachMode == Node.ViewAttachMode.PARENT) {
+            if (it.viewAttachMode == Node.AttachMode.PARENT) {
                 detachChildView(it.node)
             }
         }
diff --git a/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/RouterTest.kt b/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/RouterTest.kt
index a115dc2f0..1fcc6cb0b 100644
--- a/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/RouterTest.kt
+++ b/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/RouterTest.kt
@@ -1,6 +1,5 @@
 package com.badoo.ribs.core
 
-import android.os.Bundle
 import com.badoo.ribs.core.helper.TestRouter
 import com.badoo.ribs.core.helper.TestView
 import com.badoo.ribs.core.routing.action.RoutingAction
@@ -9,7 +8,6 @@ import com.nhaarman.mockitokotlin2.anyOrNull
 import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.verify
-import org.junit.Assert
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
@@ -39,7 +37,7 @@ class RouterTest {
 
         val nodeDescriptorsC2 =
             listOf(childNodeC2_1, childNodeC2_2).map {
-                Node.Descriptor(it, Node.ViewAttachMode.PARENT)
+                Node.Descriptor(it, Node.AttachMode.PARENT)
             }
 
         routingActionForC2 = mock { on { buildNodes(anyOrNull())} doReturn nodeDescriptorsC2 }
diff --git a/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/routing/configuration/ConfigurationFeatureTest.kt b/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/routing/configuration/ConfigurationFeatureTest.kt
index a578b4985..2469af7f3 100644
--- a/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/routing/configuration/ConfigurationFeatureTest.kt
+++ b/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/routing/configuration/ConfigurationFeatureTest.kt
@@ -5,7 +5,7 @@ import android.os.Parcelable
 import com.badoo.mvicore.element.TimeCapsule
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.Node.Descriptor
-import com.badoo.ribs.core.Node.ViewAttachMode
+import com.badoo.ribs.core.Node.AttachMode
 import com.badoo.ribs.core.routing.action.RoutingAction
 import com.badoo.ribs.core.routing.configuration.ConfigurationCommand.MultiConfigurationCommand.Sleep
 import com.badoo.ribs.core.routing.configuration.ConfigurationCommand.MultiConfigurationCommand.WakeUp
@@ -79,7 +79,7 @@ class ConfigurationFeatureTest {
         val routingAction: RoutingAction<*>
     ) {
         companion object {
-            fun create(configuration: Configuration, nbNodes: Int, viewAttachMode: ViewAttachMode): ConfigurationTestHelper {
+            fun create(configuration: Configuration, nbNodes: Int, viewAttachMode: AttachMode): ConfigurationTestHelper {
                 val nodes = MutableList(nbNodes) { i ->
                     Descriptor(
                         mock { on { toString() } doReturn "Node #$i of $configuration" },
@@ -120,25 +120,25 @@ class ConfigurationFeatureTest {
     @Before
     fun setUp() {
         helperPermanent1 =
-            ConfigurationTestHelper.create(Permanent1,2, ViewAttachMode.PARENT)
+            ConfigurationTestHelper.create(Permanent1,2, AttachMode.PARENT)
 
         helperPermanent2 =
-            ConfigurationTestHelper.create(Permanent2,3, ViewAttachMode.PARENT)
+            ConfigurationTestHelper.create(Permanent2,3, AttachMode.PARENT)
 
         helperContentViewParented1 =
-            ConfigurationTestHelper.create(ContentViewParented1,2, ViewAttachMode.PARENT)
+            ConfigurationTestHelper.create(ContentViewParented1,2, AttachMode.PARENT)
 
         helperContentViewParented2 =
-            ConfigurationTestHelper.create(ContentViewParented2,3, ViewAttachMode.PARENT)
+            ConfigurationTestHelper.create(ContentViewParented2,3, AttachMode.PARENT)
 
         helperContentViewParented3 =
-            ConfigurationTestHelper.create(ContentViewParented3,2, ViewAttachMode.PARENT)
+            ConfigurationTestHelper.create(ContentViewParented3,2, AttachMode.PARENT)
 
         helperContentExternal1 =
-            ConfigurationTestHelper.create(ContentExternal1,2, ViewAttachMode.EXTERNAL)
+            ConfigurationTestHelper.create(ContentExternal1,2, AttachMode.EXTERNAL)
 
         helperContentExternal2 =
-            ConfigurationTestHelper.create(ContentExternal2,3, ViewAttachMode.EXTERNAL)
+            ConfigurationTestHelper.create(ContentExternal2,3, AttachMode.EXTERNAL)
 
         val helpers = listOf(
             helperPermanent1,

From 9e86f32d50d523cf465f156e31f5fb27b78b9336 Mon Sep 17 00:00:00 2001
From: Zsolt Kocsi <zsolt.kocsi@corp.badoo.com>
Date: Wed, 28 Aug 2019 20:49:13 +0100
Subject: [PATCH 03/17] WIP

---
 .../com/badoo/ribs/example/rib/root/Root.kt   |   2 +-
 .../ribs/example/rib/root/RootInteractor.kt   |  52 ++++----
 .../badoo/ribs/example/rib/root/RootNode.kt   |   8 +-
 .../badoo/ribs/example/rib/root/RootRouter.kt | 102 +++++++++++++--
 .../badoo/ribs/example/rib/root/RootView.kt   | 100 +++++++--------
 .../example/rib/root/builder/RootModule.kt    |  30 +++--
 .../ribs/example/rib/small/SmallInteractor.kt |   4 +-
 .../ribs/example/rib/small/SmallRouter.kt     |   3 +-
 .../rib/switcher/SwitcherInteractor.kt        |   2 +-
 .../ribs/example/rib/switcher/SwitcherNode.kt |   4 +
 .../rib/switcher/builder/SwitcherModule.kt    |   1 -
 .../rib/switcher/feature/PortalFeature.kt     | 116 +++++++++---------
 .../com/badoo/ribs/core/LifecycleParent.kt    |  22 ++--
 .../src/main/java/com/badoo/ribs/core/Node.kt |  83 +++++++++----
 .../main/java/com/badoo/ribs/core/Portal.kt   |   8 +-
 .../main/java/com/badoo/ribs/core/Router.kt   |   2 +-
 .../routing/action/FullScreenRoutingAction.kt |   4 +-
 .../ribs/core/routing/action/RoutingAction.kt |  11 ++
 .../action/single/ActivateAction.kt           |   6 +-
 .../configuration/action/single/AddAction.kt  |   1 +
 .../action/single/DeactivateAction.kt         |   3 +-
 .../action/single/RemoveAction.kt             |   1 +
 22 files changed, 359 insertions(+), 206 deletions(-)

diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/Root.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/Root.kt
index 858752356..aa20ea7ac 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/Root.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/Root.kt
@@ -20,7 +20,7 @@ interface Root : Rib {
         CanProvideRibCustomisation
 
     class Customisation(
-        val viewFactory: RootView.Factory = RootViewImpl.Factory()
+//        val viewFactory: RootView.Factory = RootViewImpl.Factory()
     ) : RibCustomisation
 
     interface Workflow {
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootInteractor.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootInteractor.kt
index 04c5d6774..f50eb4641 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootInteractor.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootInteractor.kt
@@ -9,37 +9,43 @@ import com.badoo.ribs.core.Portal.Source.Model.*
 import com.badoo.ribs.core.Router
 import com.badoo.ribs.example.rib.root.RootRouter.Configuration
 import com.badoo.ribs.example.rib.root.RootRouter.Configuration.Content
-import com.badoo.ribs.example.rib.root.RootRouter.Configuration.Overlay
-import com.badoo.ribs.example.rib.switcher.feature.PortalFeature
 import io.reactivex.functions.Consumer
 
 class RootInteractor(
     savedInstanceState: Bundle?,
-    router: Router<Configuration, *, Content, Overlay, RootView>,
-    private val portal: PortalFeature
-) : Interactor<Configuration, Content, Overlay, RootView>(
+    router: Router<Configuration, *, Content, Nothing, Nothing>
+//    private val portal: PortalFeature
+) : Interactor<Configuration, Content, Nothing, Nothing>(
     savedInstanceState = savedInstanceState,
     router = router,
-    disposables = portal
+    disposables = null
+//), Portal.Sink {
 ) {
 
-    override fun onAttach(ribLifecycle: Lifecycle, savedInstanceState: Bundle?) {
-        ribLifecycle.createDestroy {
-            bind(portal.models to portalModelConsumer)
-        }
-    }
+//    override fun accept(command: Portal.Sink.Command) {
+//        when (command) {
+//            is Portal.Sink.Command.Add -> router.push(Content.Portal(command.node))
+//            is Portal.Sink.Command.Remove -> router.popBackStack()
+//        }
+//    }
 
-    override fun onViewCreated(view: RootView, viewLifecycle: Lifecycle) {
-        viewLifecycle.createDestroy {
-//            bind(portal.models to view.portalRenderer)
-            bind(portal.models to view)
-        }
-    }
+//    override fun onAttach(ribLifecycle: Lifecycle, savedInstanceState: Bundle?) {
+//        ribLifecycle.createDestroy {
+//            bind(portal.models to portalModelConsumer)
+//        }
+//    }
 
-    private val portalModelConsumer: Consumer<Portal.Source.Model> = Consumer {
-        when (it) {
-            is Empty -> router.newRoot(Content.Default) // TODO pop should work just fine, but this is safer for now
-            is Showing -> router.push(Content.Portal)
-        }
-    }
+//    override fun onViewCreated(view: RootView, viewLifecycle: Lifecycle) {
+//        viewLifecycle.createDestroy {
+////            bind(portal.models to view.portalRenderer)
+//            bind(portal.models to view)
+//        }
+//    }
+
+//    private val portalModelConsumer: Consumer<Portal.Source.Model> = Consumer {
+//        when (it) {
+//            is Empty -> router.newRoot(Content.Default) // TODO pop should work just fine, but this is safer for now
+//            is Showing -> router.push(Content.Portal)
+//        }
+//    }
 }
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootNode.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootNode.kt
index a623fa3e8..feb138ca8 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootNode.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootNode.kt
@@ -9,10 +9,10 @@ import io.reactivex.Single
 
 class RootNode(
     savedInstanceState: Bundle?,
-    viewFactory: ((ViewGroup) -> RootView?)?,
+    viewFactory: ((ViewGroup) -> Nothing?)?,
     private val router: RootRouter,
     private val interactor: RootInteractor
-) : Node<RootView>(
+) : Node<Nothing>(
     savedInstanceState = savedInstanceState,
     identifier = object : Root {},
     viewFactory = viewFactory,
@@ -20,6 +20,10 @@ class RootNode(
     interactor = interactor
 ), Root.Workflow {
 
+    override fun detachFromView() {
+        super.detachFromView()
+    }
+
     override fun goToSwitcher(): Single<Switcher.Workflow> =
         attachWorkflow {
             router.newRoot(Content.Default) // TODO consider this
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt
index 1df5a6dbd..83434548d 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt
@@ -2,37 +2,113 @@ package com.badoo.ribs.example.rib.root
 
 import android.os.Bundle
 import android.os.Parcelable
+import com.badoo.ribs.core.Node
+import com.badoo.ribs.core.Portal
 import com.badoo.ribs.core.Router
-import com.badoo.ribs.core.routing.action.AttachRibRoutingAction
+import com.badoo.ribs.core.routing.action.AttachRibRoutingAction.Companion.attach
 import com.badoo.ribs.core.routing.action.RoutingAction
-import com.badoo.ribs.core.routing.action.RoutingAction.Companion.noop
+import com.badoo.ribs.core.view.RibView
 import com.badoo.ribs.example.rib.root.RootRouter.Configuration
 import com.badoo.ribs.example.rib.root.RootRouter.Configuration.Content
-import com.badoo.ribs.example.rib.root.RootRouter.Configuration.Overlay
-import com.badoo.ribs.example.rib.root.RootRouter.Configuration.Permanent
+//import com.badoo.ribs.example.rib.root.RootRouter.ShowInPortalRoutingAction.Companion.showInPortal
 import com.badoo.ribs.example.rib.switcher.builder.SwitcherBuilder
 import kotlinx.android.parcel.Parcelize
 
 class RootRouter(
     savedInstanceState: Bundle?,
     private val switcherBuilder: SwitcherBuilder
-): Router<Configuration, Permanent, Content, Overlay, RootView>(
+): Router<Configuration, Nothing, Content, Nothing, Nothing>(
     savedInstanceState = savedInstanceState,
     initialConfiguration = Content.Default,
     permanentParts = emptyList()
-) {
-    sealed class Configuration : Parcelable {
-        sealed class Permanent : Configuration()
+), Portal.Sink {
+
+    interface ResolverChain {
+        val next: ResolverChain?
+    }
+
+
+    sealed class Configuration() : Parcelable {
         sealed class Content : Configuration() {
             @Parcelize object Default : Content()
-            @Parcelize object Portal : Content()
+//            @Parcelize data class Portal(val resolverChain: ResolverChain) : Content()
         }
-        sealed class Overlay : Configuration()
+
+//        constructor(parcel: Parcel) : this() {}
+//        override fun writeToParcel(parcel: Parcel, flags: Int) {}
+//        override fun describeContents(): Int = 0
+//        @SuppressLint("ParcelCreator")
+//        companion object CREATOR : Parcelable.Creator<Configuration> {
+//            override fun createFromParcel(parcel: Parcel): Configuration = Content.Default
+//            override fun newArray(size: Int): Array<Configuration?> = arrayOfNulls(size)
+//        }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        newRoot(Content.Default)
+        super.onSaveInstanceState(outState)
+    }
+
+//    override fun accept(command: Portal.Sink.Command) {
+//        when (command) {
+//            is Portal.Sink.Command.Add -> push(Content.Portal(command.node))
+//            is Portal.Sink.Command.Remove -> popBackStack()
+//        }
+//    }
+
+    override val remoteRoutingAction: ((Bundle?) -> Node<*>) -> RoutingAction<out RibView> = {
+        ShowInPortalRoutingAction(it)
     }
 
-    override fun resolveConfiguration(configuration: Configuration): RoutingAction<RootView> =
+    override fun resolveConfiguration(configuration: Configuration): RoutingAction<Nothing> =
         when (configuration) {
-            Content.Default -> AttachRibRoutingAction.attach { switcherBuilder.build(it) }
-            Content.Portal -> noop()
+            is Content.Default -> attach { switcherBuilder.build(it) }
+//            is Content.Portal -> RoutingAction.noop()
+//                showInPortal(node, configuration.node)
         }
+
+    private inner class ShowInPortalRoutingAction<V : RibView>(
+        private val childBuilder: (Bundle?) -> Node<*>
+    ) : RoutingAction<V> {
+
+        override fun parentNode(): Node<*>? {
+            return node
+        }
+
+        override fun buildNodes(bundles: List<Bundle?>): List<Node.Descriptor> =
+            listOf(
+                Node.Descriptor(
+                    node = childBuilder.invoke(bundles.firstOrNull()),
+                    viewAttachMode = Node.AttachMode.PARENT // this works because this node will be the parent
+                )
+            )
+
+        override fun onAttach(nodes: List<Node.Descriptor>) {
+            node.addManaged(nodes.first().node)
+        }
+
+        override fun onDetach(nodes: List<Node.Descriptor>) {
+            node.removeManaged(nodes.first().node)
+        }
+//
+//        override fun execute(nodes: List<Node.Descriptor>) {
+////            push(Content.Portal(nodes.first().node))
+//            node.addManaged(nodes.first().node)
+////            node.attachChildView(nodes.first().node)
+//        }
+//
+//        override fun cleanup(nodes: List<Node.Descriptor>) {
+////            node.detachChildView(nodes.first().node)
+//            node.removeManaged(nodes.first().node)
+////            popBackStack()
+//        }
+
+//        companion object {
+//            fun <V : RibView> showInPortal(
+//                parentNode: Node<*>,
+//                childBuilder: (Bundle?) -> Node<*>
+//            ): RoutingAction<V> =
+//                ShowInPortalRoutingAction(parentNode, childBuilder)
+//        }
+    }
 }
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootView.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootView.kt
index 470677add..2ee8b9136 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootView.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootView.kt
@@ -7,55 +7,59 @@ import com.badoo.ribs.core.Portal
 import com.badoo.ribs.core.view.RibView
 import com.badoo.ribs.core.view.ViewFactory
 import com.badoo.ribs.example.R
-import com.badoo.ribs.example.rib.root.RootView.Event
+//import com.badoo.ribs.example.rib.root.RootView.Event
 import com.jakewharton.rxrelay2.PublishRelay
 import io.reactivex.ObservableSource
 import io.reactivex.functions.Consumer
 
-interface RootView : RibView,
-    ObservableSource<Event>,
-    Portal.Renderer {
-//    ,
-//    Consumer<ViewModel> {
-
-    sealed class Event
-
-//    data class ViewModel(
-//        val i: Int = 0
-//    )
-
-    interface Factory : ViewFactory<Nothing?, RootView>
-
-//    val portalRenderer: Portal.Renderer
-}
-
-
-class RootViewImpl private constructor(
-    override val androidView: ViewGroup,
-    private val events: PublishRelay<Event> = PublishRelay.create()
-) : RootView,
-    ObservableSource<Event> by events,
-    Portal.Renderer {
-//    Consumer<ViewModel> {
-
-    class Factory(
-        @LayoutRes private val layoutRes: Int = R.layout.rib_root
-    ) : RootView.Factory {
-        override fun invoke(deps: Nothing?): (ViewGroup) -> RootView = {
-            RootViewImpl(
-                com.badoo.ribs.customisation.inflate(it, layoutRes)
-            )
-        }
-    }
-
-//    override val portalRenderer: Portal.Renderer = object : Portal.Renderer {
-        override fun accept(model: Portal.Source.Model) {
-            if (model is Portal.Source.Model.Showing) {
-                model.node.attachToView(androidView)
-            }
-        }
-//    }
-
-//    override fun accept(vm: RootView.ViewModel) {
-//    }
-}
+//interface RootView : RibView,
+//    ObservableSource<Event>
+////    ,
+////    Portal.Renderer
+//{
+////    ,
+////    Consumer<ViewModel> {
+//
+//    sealed class Event
+//
+////    data class ViewModel(
+////        val i: Int = 0
+////    )
+//
+//    interface Factory : ViewFactory<Nothing?, RootView>
+//
+////    val portalRenderer: Portal.Renderer
+//}
+//
+//
+//class RootViewImpl private constructor(
+//    override val androidView: ViewGroup,
+//    private val events: PublishRelay<Event> = PublishRelay.create()
+//) : RootView,
+//    ObservableSource<Event> by events
+////    ,
+////    Portal.Renderer
+//{
+////    Consumer<ViewModel> {
+//
+////    class Factory(
+////        @LayoutRes private val layoutRes: Int = R.layout.rib_root
+////    ) : RootView.Factory {
+////        override fun invoke(deps: Nothing?): (ViewGroup) -> Nothing = {
+////            RootViewImpl(
+////                com.badoo.ribs.customisation.inflate(it, layoutRes)
+////            )
+////        }
+////    }
+//
+////    override val portalRenderer: Portal.Renderer = object : Portal.Renderer {
+////        override fun accept(model: Portal.Source.Model) {
+////            if (model is Portal.Source.Model.Showing) {
+////                model.node.attachToView(androidView)
+////            }
+////        }
+////    }
+//
+////    override fun accept(vm: RootView.ViewModel) {
+////    }
+//}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootModule.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootModule.kt
index 0adf036b1..5ed6a74ac 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootModule.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootModule.kt
@@ -8,7 +8,6 @@ import com.badoo.ribs.example.rib.root.RootInteractor
 import com.badoo.ribs.example.rib.root.RootNode
 import com.badoo.ribs.example.rib.root.RootRouter
 import com.badoo.ribs.example.rib.switcher.builder.SwitcherBuilder
-import com.badoo.ribs.example.rib.switcher.feature.PortalFeature
 import com.badoo.ribs.example.util.CoffeeMachine
 import com.badoo.ribs.example.util.StupidCoffeeMachine
 import dagger.Provides
@@ -17,21 +16,22 @@ import javax.inject.Provider
 @dagger.Module
 internal object RootModule {
 
-    @RootScope
-    @Provides
-    @JvmStatic
-    internal fun portalFeature(
-        node: Provider<RootNode>
-    ): PortalFeature =
-        PortalFeature(node)
+//    @RootScope
+//    @Provides
+//    @JvmStatic
+//    internal fun portalFeature(
+//        node: Provider<RootNode>
+//    ): PortalFeature =
+//        PortalFeature(node)
 
     @RootScope
     @Provides
     @JvmStatic
     internal fun portal(
-        portalFeature: PortalFeature
+//        interactor: RootInteractor
+        router: RootRouter
     ): Portal.Sink =
-        portalFeature
+        router
 
     @RootScope
     @Provides
@@ -51,13 +51,11 @@ internal object RootModule {
     @JvmStatic
     internal fun interactor(
         savedInstanceState: Bundle?,
-        router: RootRouter,
-        portalFeature: PortalFeature
+        router: RootRouter
     ): RootInteractor =
         RootInteractor(
             savedInstanceState = savedInstanceState,
-            router = router,
-            portal = portalFeature
+            router = router
         )
 
     @RootScope
@@ -65,12 +63,12 @@ internal object RootModule {
     @JvmStatic
     internal fun node(
         savedInstanceState: Bundle?,
-        customisation: Root.Customisation,
+//        customisation: Root.Customisation,
         router: RootRouter,
         interactor: RootInteractor
     ) : RootNode = RootNode(
         savedInstanceState = savedInstanceState,
-        viewFactory = customisation.viewFactory(null),
+        viewFactory = null, // customisation.viewFactory(null),
         router = router,
         interactor = interactor
     )
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt
index de25cb612..1d7985662 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt
@@ -4,7 +4,9 @@ import android.arch.lifecycle.Lifecycle
 import android.os.Bundle
 import com.badoo.mvicore.android.lifecycle.createDestroy
 import com.badoo.ribs.core.Interactor
+import com.badoo.ribs.core.Portal
 import com.badoo.ribs.core.Router
+import com.badoo.ribs.example.rib.root.RootRouter
 import com.badoo.ribs.example.rib.small.SmallRouter.Configuration
 import com.badoo.ribs.example.rib.small.SmallRouter.Configuration.Content
 import com.badoo.ribs.example.rib.small.SmallView.Event
@@ -14,7 +16,7 @@ import io.reactivex.functions.Consumer
 class SmallInteractor(
     savedInstanceState: Bundle?,
     router: Router<Configuration, *, Content, Nothing, SmallView>
-) : Interactor<Configuration, Content, Nothing, SmallView>(
+    ) : Interactor<Configuration, Content, Nothing, SmallView>(
     savedInstanceState = savedInstanceState,
     router = router,
     disposables = null
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallRouter.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallRouter.kt
index df3958869..52cf55792 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallRouter.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallRouter.kt
@@ -31,6 +31,7 @@ class SmallRouter(
     override fun resolveConfiguration(configuration: Configuration): RoutingAction<SmallView> =
         when (configuration) {
             Content.Default -> noop()
-            Content.ShowBig -> fullScreen(portal) { bigBuilder.build(it) }
+//            Content.ShowBig -> fullScreen(portal) { bigBuilder.build(it) }
+            Content.ShowBig -> portal.remoteRoutingAction { bigBuilder.build(it) } as RoutingAction<SmallView>
         }
 }
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherInteractor.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherInteractor.kt
index ad0d6de7b..69e220b02 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherInteractor.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherInteractor.kt
@@ -15,7 +15,7 @@ import com.badoo.ribs.example.rib.switcher.SwitcherView.Event
 import com.badoo.ribs.example.rib.switcher.dialog.DialogToTestOverlay
 import io.reactivex.functions.Consumer
 import android.os.Bundle
-import com.badoo.ribs.example.rib.switcher.feature.PortalFeature
+//import com.badoo.ribs.example.rib.switcher.feature.PortalFeature
 
 class SwitcherInteractor(
     savedInstanceState: Bundle?,
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherNode.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherNode.kt
index 92b9a8e3e..a7c7159de 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherNode.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherNode.kt
@@ -46,4 +46,8 @@ class SwitcherNode(
             // push wish to feature
             Log.d("WORKFLOW", "Switcher / doSomethingAndStayOnThisNode")
         }
+
+    override fun detachFromView() {
+        super.detachFromView()
+    }
 }
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/builder/SwitcherModule.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/builder/SwitcherModule.kt
index 9d3c888a0..7aaf6aaba 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/builder/SwitcherModule.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/builder/SwitcherModule.kt
@@ -19,7 +19,6 @@ import com.badoo.ribs.example.rib.switcher.SwitcherNode
 import com.badoo.ribs.example.rib.switcher.SwitcherRouter
 import com.badoo.ribs.example.rib.switcher.SwitcherView
 import com.badoo.ribs.example.rib.switcher.dialog.DialogToTestOverlay
-import com.badoo.ribs.example.rib.switcher.feature.PortalFeature
 import com.badoo.ribs.example.util.CoffeeMachine
 import dagger.Provides
 import io.reactivex.Observable
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/feature/PortalFeature.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/feature/PortalFeature.kt
index 3a8c0e88b..39473c8cf 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/feature/PortalFeature.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/feature/PortalFeature.kt
@@ -3,7 +3,7 @@ package com.badoo.ribs.example.rib.switcher.feature
 import com.badoo.mvicore.element.Actor
 import com.badoo.mvicore.element.Reducer
 import com.badoo.mvicore.feature.ActorReducerFeature
-import com.badoo.ribs.core.LifecycleParent
+//import com.badoo.ribs.core.LifecycleParent
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.Portal
 import com.badoo.ribs.core.Portal.Sink.Command
@@ -11,10 +11,10 @@ import com.badoo.ribs.core.Portal.Sink.Command.Add
 import com.badoo.ribs.core.Portal.Sink.Command.Remove
 import com.badoo.ribs.core.Portal.Source.Model
 import com.badoo.ribs.core.Portal.Source.Model.Showing
-import com.badoo.ribs.example.rib.switcher.feature.PortalFeature.Effect
-import com.badoo.ribs.example.rib.switcher.feature.PortalFeature.Effect.Added
-import com.badoo.ribs.example.rib.switcher.feature.PortalFeature.Effect.Removed
-import com.badoo.ribs.example.rib.switcher.feature.PortalFeature.State
+//import com.badoo.ribs.example.rib.switcher.feature.PortalFeature.Effect
+//import com.badoo.ribs.example.rib.switcher.feature.PortalFeature.Effect.Added
+//import com.badoo.ribs.example.rib.switcher.feature.PortalFeature.Effect.Removed
+//import com.badoo.ribs.example.rib.switcher.feature.PortalFeature.State
 import io.reactivex.Observable
 import io.reactivex.Observable.empty
 import io.reactivex.Observable.just
@@ -22,56 +22,56 @@ import io.reactivex.ObservableSource
 import javax.inject.Provider
 
 // FIXME move somewhere else
-class PortalFeature(
-    lifecycleParent: Provider<out LifecycleParent>
-): ActorReducerFeature<Command, Effect, State, Nothing>(
-    initialState = State(),
-    actor = ActorImpl(lifecycleParent),
-    reducer = ReducerImpl()
-), Portal.Sink, Portal.Source {
-
-    data class State(
-        val nodes: List<Node<*>> = emptyList()
-    )
-
-    sealed class Effect {
-        data class Added(val node: Node<*>) : Effect()
-        data class Removed(val node: Node<*>) : Effect()
-    }
-
-    class ActorImpl(
-        private val lifecycleParent: Provider<out LifecycleParent>
-    ) : Actor<State, Command, Effect> {
-        override fun invoke(state: State, command: Command): Observable<out Effect> = when (command) {
-            is Add -> if (state.nodes.contains(command.node)) empty() else
-                just(Added(command.node)).doOnNext {
-                    state.nodes.lastOrNull()?.let {
-                        it.detachFromView()
-                        lifecycleParent.get().removeParented(it)
-                    }
-                    lifecycleParent.get().addParented(it.node)
-                }
-
-            is Remove -> if (!state.nodes.contains(command.node)) empty() else
-                just(Removed(command.node)).doOnNext {
-                    it.node.detachFromView()
-                    lifecycleParent.get().removeParented(it.node)
-                }
-        }
-    }
-
-    class ReducerImpl : Reducer<State, Effect> {
-        override fun invoke(state: State, effect: Effect): State = when (effect) {
-            is Added -> state.copy(nodes = state.nodes + effect.node)
-            is Removed -> state.copy(nodes = state.nodes - effect.node)
-        }
-    }
-
-    override val models: ObservableSource<Model>
-        get() = Observable.wrap(this).map {
-            when {
-                it.nodes.isEmpty() -> Model.Empty
-                else -> Showing(it.nodes.last())
-            }
-        }
-}
+//class PortalFeature(
+//    lifecycleParent: Provider<out LifecycleParent>
+//): ActorReducerFeature<Command, Effect, State, Nothing>(
+//    initialState = State(),
+//    actor = ActorImpl(lifecycleParent),
+//    reducer = ReducerImpl()
+//), Portal.Sink, Portal.Source {
+//
+//    data class State(
+//        val nodes: List<Node<*>> = emptyList()
+//    )
+//
+//    sealed class Effect {
+//        data class Added(val node: Node<*>) : Effect()
+//        data class Removed(val node: Node<*>) : Effect()
+//    }
+//
+//    class ActorImpl(
+//        private val lifecycleParent: Provider<out LifecycleParent>
+//    ) : Actor<State, Command, Effect> {
+//        override fun invoke(state: State, command: Command): Observable<out Effect> = when (command) {
+//            is Add -> if (state.nodes.contains(command.node)) empty() else
+//                just(Added(command.node)).doOnNext {
+//                    state.nodes.lastOrNull()?.let {
+//                        it.detachFromView()
+//                        lifecycleParent.get().removeManaged(it)
+//                    }
+//                    lifecycleParent.get().addManaged(it.node)
+//                }
+//
+//            is Remove -> if (!state.nodes.contains(command.node)) empty() else
+//                just(Removed(command.node)).doOnNext {
+//                    it.node.detachFromView()
+//                    lifecycleParent.get().removeManaged(it.node)
+//                }
+//        }
+//    }
+//
+//    class ReducerImpl : Reducer<State, Effect> {
+//        override fun invoke(state: State, effect: Effect): State = when (effect) {
+//            is Added -> state.copy(nodes = state.nodes + effect.node)
+//            is Removed -> state.copy(nodes = state.nodes - effect.node)
+//        }
+//    }
+//
+//    override val models: ObservableSource<Model>
+//        get() = Observable.wrap(this).map {
+//            when {
+//                it.nodes.isEmpty() -> Model.Empty
+//                else -> Showing(it.nodes.last())
+//            }
+//        }
+//}
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/LifecycleParent.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/LifecycleParent.kt
index 2fb6cd4b6..06ad3e44c 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/LifecycleParent.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/LifecycleParent.kt
@@ -1,13 +1,13 @@
 package com.badoo.ribs.core
 
-interface LifecycleParent {
-    fun addParented(child: LifecycleChild)
-    fun removeParented(child: LifecycleChild)
-}
-
-interface LifecycleChild {
-    fun onStart()
-    fun onResume()
-    fun onPause()
-    fun onStop()
-}
+//interface LifecycleParent {
+//    fun addManaged(child: LifecycleChild)
+//    fun removeManaged(child: LifecycleChild)
+//}
+//
+//interface LifecycleChild {
+//    fun onStart()
+//    fun onResume()
+//    fun onPause()
+//    fun onStop()
+//}
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
index 73fd85d05..e6fae85ee 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
@@ -28,6 +28,7 @@ import android.arch.lifecycle.Lifecycle.State.STARTED
 import android.arch.lifecycle.LifecycleOwner
 import android.arch.lifecycle.LifecycleRegistry
 import android.os.Bundle
+import android.os.Handler
 import android.os.Parcelable
 import android.support.annotation.CallSuper
 import android.support.annotation.MainThread
@@ -42,7 +43,6 @@ import com.jakewharton.rxrelay2.PublishRelay
 import com.uber.rib.util.RibRefWatcher
 import io.reactivex.Observable
 import io.reactivex.Single
-import java.lang.IllegalStateException
 import java.util.concurrent.CopyOnWriteArrayList
 
 /**
@@ -56,16 +56,43 @@ open class Node<V : RibView>(
     private val router: Router<*, *, *, *, V>,
     private val interactor: Interactor<*, *, *, V>,
     private val ribRefWatcher: RibRefWatcher = RibRefWatcher.getInstance()
-) : LifecycleOwner, LifecycleParent, LifecycleChild {
+//) : LifecycleOwner, LifecycleParent, LifecycleChild {
+) : LifecycleOwner {
 
-    override fun addParented(child: LifecycleChild) {
-        Log.d("CHECK", "addParented - $this ---> $child")
-        lifecycleChildren.add(child)
+    fun addManaged(child: Node<*>) {
+        Log.d("CHECK", "addManaged - $this ---> $child")
+        if (managedChildren.size == 1) {
+            router.onDetachView()
+            managedChildren.last().forEach { // FIXME this is a hack
+                detachChildView(it)
+            }
+
+        } else {
+            managedChildren.last().forEach {
+                detachChildView(it)
+            }
+        }
+        managedChildren.add(
+            mutableListOf(child)
+        )
+        attachChildView(child)
     }
 
-    override fun removeParented(child: LifecycleChild) {
-        Log.d("CHECK", "removeParented - $this -x-> $child")
-        lifecycleChildren.remove(child)
+    fun removeManaged(child: Node<*>) {
+        Log.d("CHECK", "removeManaged - $this -x-> $child")
+        if (managedChildren.size <= 1) throw RuntimeException("This should never happen")
+        val target = managedChildren.find { it == mutableListOf(child) } ?: throw RuntimeException("This should never happen")
+        managedChildren.last().forEach {
+            detachChildView(it)
+        }
+        managedChildren.remove(target)
+        if (managedChildren.size > 1) {
+            managedChildren.last().forEach {
+                attachChildView(it)
+            }
+        } else {
+            router.onAttachView() // FIXME
+        }
     }
 
     private val savedInstanceState = savedInstanceState?.getBundle(BUNDLE_KEY)
@@ -103,7 +130,7 @@ open class Node<V : RibView>(
 
     val tag: String = this::class.java.name
     val children = CopyOnWriteArrayList<Node<*>>()
-    private val lifecycleChildren = CopyOnWriteArrayList<LifecycleChild>()
+    private val managedChildren = mutableListOf<MutableList<Node<*>>>(mutableListOf())
     private val childrenAttachesRelay: PublishRelay<Node<*>> = PublishRelay.create()
     val childrenAttaches: Observable<Node<*>> = childrenAttachesRelay.hide()
 
@@ -151,7 +178,11 @@ open class Node<V : RibView>(
             }
         }
 
-        router.onAttachView()
+        if (managedChildren.size > 1) {
+            attachChildView(managedChildren.last().first())
+        } else {
+            router.onAttachView()
+        }
         onStartInternal()
         onResumeInternal()
     }
@@ -164,7 +195,11 @@ open class Node<V : RibView>(
             Log.d("CHECK", "detachFromView - $this")
             onPauseInternal()
             onStopInternal()
-            router.onDetachView()
+            if (managedChildren.size > 1) {
+                detachChildView(managedChildren.last().first())
+            } else {
+                router.onDetachView()
+            }
 
             if (!isViewless) {
                 view!!.let {
@@ -216,7 +251,7 @@ open class Node<V : RibView>(
         )
 
         if (viewAttachMode == AttachMode.PARENT) {
-            addParented(childNode)
+            managedChildren.first().add(childNode)
             childNode.inheritExternalLifecycle(externalLifecycleRegistry)
         }
 
@@ -228,7 +263,8 @@ open class Node<V : RibView>(
         externalLifecycleRegistry.markState(lifecycleRegistry.currentState)
     }
 
-    internal fun attachChildView(child: Node<*>) {
+    // FIXME internal + protected?
+    fun attachChildView(child: Node<*>) {
         if (isAttachedToView) {
             val target = when {
                 // parentViewGroup is guaranteed to be non-null if and only if view is attached
@@ -240,7 +276,8 @@ open class Node<V : RibView>(
         }
     }
 
-    internal fun detachChildView(child: Node<*>) {
+    // FIXME internal + protected?
+    fun detachChildView(child: Node<*>) {
         parentViewGroup?.let {
             child.detachFromView()
         }
@@ -256,7 +293,7 @@ open class Node<V : RibView>(
     @MainThread
     internal fun detachChildNode(childNode: Node<*>) {
         children.remove(childNode)
-        lifecycleChildren.remove(childNode)
+        managedChildren.first().remove(childNode)
 
         ribRefWatcher.watchDeletedObject(childNode)
         ribRefWatcher.logBreadcrumb(
@@ -271,7 +308,7 @@ open class Node<V : RibView>(
      *
      * For internal usage call onStartInternal() directly
      */
-    override fun onStart() {
+    fun onStart() {
         externalLifecycleRegistry.handleLifecycleEvent(ON_START)
         onStartInternal { it.onStart() }
     }
@@ -281,7 +318,7 @@ open class Node<V : RibView>(
      *
      * For internal usage call onStopInternal() directly
      */
-    override fun onStop() {
+    fun onStop() {
         externalLifecycleRegistry.handleLifecycleEvent(ON_STOP)
         onStopInternal { it.onStop() }
     }
@@ -291,7 +328,7 @@ open class Node<V : RibView>(
      *
      * For internal usage call onResumeInternal() directly
      */
-    override fun onResume() {
+    fun onResume() {
         externalLifecycleRegistry.handleLifecycleEvent(ON_RESUME)
         onResumeInternal { it.onResume() }
     }
@@ -301,7 +338,7 @@ open class Node<V : RibView>(
      *
      * For internal usage call onPauseInternal() directly
      */
-    override fun onPause() {
+    fun onPause() {
         externalLifecycleRegistry.handleLifecycleEvent(ON_PAUSE)
         onPauseInternal { it.onPause() }
     }
@@ -310,7 +347,7 @@ open class Node<V : RibView>(
         Log.d("CHECK", "onStartInternal - $this")
         // The lifecycle cannot go higher than that of the hosting environment (e.g. Activity)
         updateToStateIfViewAttached(externalLifecycleRegistry.currentState)
-        lifecycleChildren.forEach { callOnChildren.invoke(it as Node<*>) } // TODO cast is safe, but make it correct
+        managedChildren.last().forEach { callOnChildren.invoke(it) }
     }
 
     // TODO call this when overlay is removed
@@ -318,7 +355,7 @@ open class Node<V : RibView>(
         Log.d("CHECK", "onResumeInternal - $this")
         // The lifecycle cannot go higher than that of the hosting environment (e.g. Activity)
         updateToStateIfViewAttached(externalLifecycleRegistry.currentState)
-        lifecycleChildren.forEach { callOnChildren.invoke(it as Node<*>) } // TODO cast is safe, but make it correct
+        managedChildren.last().forEach { callOnChildren.invoke(it) }
     }
 
     // TODO call this when overlay hides content AND current rib is not in dialog
@@ -327,13 +364,13 @@ open class Node<V : RibView>(
         // The lifecycle cannot go higher than that of the hosting environment (e.g. Activity)
         val targetState = if (externalLifecycleRegistry.currentState == CREATED) CREATED else STARTED
         updateToStateIfViewAttached(targetState)
-        lifecycleChildren.forEach { callOnChildren.invoke(it as Node<*>) } // TODO cast is safe, but make it correct
+        managedChildren.last().forEach { callOnChildren.invoke(it) }
     }
 
     internal fun onStopInternal(callOnChildren: (Node<*>) -> Unit = { it.onStopInternal() }) {
         Log.d("CHECK", "onStopInternal - $this")
         updateToStateIfViewAttached(CREATED)
-        lifecycleChildren.forEach { callOnChildren.invoke(it as Node<*>) } // TODO cast is safe, but make it correct
+        managedChildren.last().forEach { callOnChildren.invoke(it) }
     }
 
     private fun updateToStateIfViewAttached(state: Lifecycle.State) {
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Portal.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Portal.kt
index 82f7c2854..4914fcc59 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Portal.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Portal.kt
@@ -1,11 +1,17 @@
 package com.badoo.ribs.core
 
+import android.os.Bundle
+import com.badoo.ribs.core.routing.action.RoutingAction
+import com.badoo.ribs.core.view.RibView
 import io.reactivex.ObservableSource
 import io.reactivex.functions.Consumer
 
 interface Portal {
 
-    interface Sink : Consumer<Sink.Command> {
+//    interface Sink : Consumer<Sink.Command> {
+    interface Sink {
+
+        val remoteRoutingAction: ((Bundle?) -> Node<*>) -> RoutingAction<out RibView>
 
         sealed class Command {
             data class Add(val node: Node<*>) : Command()
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Router.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Router.kt
index 65d53d959..f2e42e518 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Router.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Router.kt
@@ -56,7 +56,7 @@ abstract class Router<C : Parcelable, Permanent : C, Content : C, Overlay : C, V
 
     abstract fun resolveConfiguration(configuration: C): RoutingAction<V>
 
-    fun onSaveInstanceState(outState: Bundle) {
+    open fun onSaveInstanceState(outState: Bundle) {
         configurationFeature.accept(SaveInstanceState())
         val bundle = Bundle()
         timeCapsule.saveState(bundle)
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/FullScreenRoutingAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/FullScreenRoutingAction.kt
index d3b00061b..1e9948d31 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/FullScreenRoutingAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/FullScreenRoutingAction.kt
@@ -22,12 +22,12 @@ class FullScreenRoutingAction<V : RibView>(
 
     override fun execute(nodes: List<Node.Descriptor>) {
         super.execute(nodes)
-        portal.accept(Add(nodes.first().node))
+//        portal.accept(Add(nodes.first().node))
     }
 
     override fun cleanup(nodes: List<Node.Descriptor>) {
         super.cleanup(nodes)
-        portal.accept(Remove(nodes.first().node))
+//        portal.accept(Remove(nodes.first().node))
     }
 
     companion object {
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/RoutingAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/RoutingAction.kt
index 7eb21b0ba..8aa66fb2f 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/RoutingAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/RoutingAction.kt
@@ -9,6 +9,14 @@ interface RoutingAction<V : RibView> {
     fun buildNodes(bundles: List<Bundle?>) : List<Node.Descriptor> =
         emptyList()
 
+    fun onAttach(nodes: List<Node.Descriptor>) {
+
+    }
+
+    fun onDetach(nodes: List<Node.Descriptor>) {
+
+    }
+
     fun execute(nodes: List<Node.Descriptor>) {
 
     }
@@ -16,6 +24,9 @@ interface RoutingAction<V : RibView> {
     fun cleanup(nodes: List<Node.Descriptor>) {
     }
 
+    fun parentNode(): Node<*>? =
+        null
+
     companion object {
         fun <V : RibView> noop(): RoutingAction<V> = object :
             RoutingAction<V> {}
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/ActivateAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/ActivateAction.kt
index b5a79feea..c04e30d8d 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/ActivateAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/ActivateAction.kt
@@ -8,6 +8,7 @@ import com.badoo.ribs.core.routing.configuration.ConfigurationContext.Activation
 import com.badoo.ribs.core.routing.configuration.ConfigurationContext.Resolved
 import com.badoo.ribs.core.routing.configuration.action.ActionExecutionParams
 import com.badoo.ribs.core.routing.configuration.feature.WorkingState
+import com.badoo.ribs.core.view.RibView
 
 /**
  * Attaches views of associated [Node]s to a parentNode, and executes the associated [RoutingAction].
@@ -25,7 +26,7 @@ internal object ActivateAction : ResolvedSingleConfigurationAction() {
         val (_, parentNode, globalActivationLevel) = params
 
         // If there's no view available (i.e. globalActivationLevel == SLEEPING) we must not execute
-        // routing actions or try to attach view. That will be done on next WakeUp. For not, let's
+        // routing actions or try to attach view. That will be done on next WakeUp. For now, let's
         // just mark the element to the same value.
         if (globalActivationLevel != ACTIVE) {
             return item.withActivationState(globalActivationLevel)
@@ -36,7 +37,8 @@ internal object ActivateAction : ResolvedSingleConfigurationAction() {
             return item
         }
 
-        parentNode.attachParentedViews(item.nodes)
+        val targetNode = item.routingAction.parentNode() ?: parentNode
+        targetNode.attachParentedViews(item.nodes)
         item.routingAction.execute(item.nodes)
         return item.withActivationState(globalActivationLevel)
     }
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/AddAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/AddAction.kt
index d013417a9..ccedd7ad0 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/AddAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/AddAction.kt
@@ -20,6 +20,7 @@ internal object AddAction : ResolvedSingleConfigurationAction() {
      */
     fun <C : Parcelable> execute(item: Resolved<C>, parentNode: Node<*>): Resolved<C> {
         parentNode.attachNodes(item.nodes)
+        item.routingAction.onAttach(item.nodes)
 
         return item
     }
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/DeactivateAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/DeactivateAction.kt
index ee9faa3c6..89cdcbad9 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/DeactivateAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/DeactivateAction.kt
@@ -18,7 +18,8 @@ internal object DeactivateAction : ResolvedSingleConfigurationAction() {
         val (_, parentNode, _) = params
         item.routingAction.cleanup(item.nodes)
         item.nodes.saveViewState()
-        parentNode.detachChildViews(item.nodes)
+        val targetNode = item.routingAction.parentNode() ?: parentNode
+        targetNode.detachChildViews(item.nodes)
 
         return item.withActivationState(INACTIVE)
     }
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/RemoveAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/RemoveAction.kt
index d951c7903..1e97a1a6b 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/RemoveAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/RemoveAction.kt
@@ -12,6 +12,7 @@ internal object RemoveAction : ResolvedSingleConfigurationAction() {
 
     override fun <C : Parcelable> execute(item: Resolved<C>, params: ActionExecutionParams<C>): Resolved<C> {
         val (_, parentNode, _) = params
+        item.routingAction.onDetach(item.nodes)
         item.nodes.forEach {
             parentNode.detachChildView(it.node)
             parentNode.detachChildNode(it.node)

From dfa2036a0b70f835a14192a5f8e46ecfc88598ee Mon Sep 17 00:00:00 2001
From: Zsolt Kocsi <zsolt.kocsi@corp.badoo.com>
Date: Wed, 28 Aug 2019 22:00:25 +0100
Subject: [PATCH 04/17] WIP

---
 .../ribs/example/rib/root/RootInteractor.kt   |  2 +-
 .../badoo/ribs/example/rib/root/RootRouter.kt | 93 +++++--------------
 .../badoo/ribs/example/rib/root/RootView.kt   |  2 +-
 .../example/rib/root/builder/RootModule.kt    |  2 +-
 .../ribs/example/rib/small/SmallInteractor.kt |  3 +-
 .../ribs/example/rib/small/SmallRouter.kt     |  7 +-
 .../example/rib/small/builder/SmallModule.kt  | 12 ++-
 .../rib/switcher/feature/PortalFeature.kt     | 10 +-
 .../ribs/android/AndroidPortalRenderer.kt     | 42 ++++-----
 .../src/main/java/com/badoo/ribs/core/Node.kt | 86 +++++------------
 .../main/java/com/badoo/ribs/core/Portal.kt   | 43 +++++----
 .../main/java/com/badoo/ribs/core/Router.kt   |  8 +-
 .../routing/action/FullScreenRoutingAction.kt | 12 ++-
 .../configuration/ConfigurationContext.kt     |  7 +-
 .../ribs/customisation/CanProvidePortal.kt    |  2 +-
 15 files changed, 128 insertions(+), 203 deletions(-)

diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootInteractor.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootInteractor.kt
index f50eb4641..78f6f4177 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootInteractor.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootInteractor.kt
@@ -5,7 +5,7 @@ import android.os.Bundle
 import com.badoo.mvicore.android.lifecycle.createDestroy
 import com.badoo.ribs.core.Interactor
 import com.badoo.ribs.core.Portal
-import com.badoo.ribs.core.Portal.Source.Model.*
+//import com.badoo.ribs.core.Portal.Source.Model.*
 import com.badoo.ribs.core.Router
 import com.badoo.ribs.example.rib.root.RootRouter.Configuration
 import com.badoo.ribs.example.rib.root.RootRouter.Configuration.Content
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt
index 83434548d..349c60682 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt
@@ -4,13 +4,13 @@ import android.os.Bundle
 import android.os.Parcelable
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.Portal
+import com.badoo.ribs.core.Resolver
 import com.badoo.ribs.core.Router
 import com.badoo.ribs.core.routing.action.AttachRibRoutingAction.Companion.attach
 import com.badoo.ribs.core.routing.action.RoutingAction
 import com.badoo.ribs.core.view.RibView
 import com.badoo.ribs.example.rib.root.RootRouter.Configuration
 import com.badoo.ribs.example.rib.root.RootRouter.Configuration.Content
-//import com.badoo.ribs.example.rib.root.RootRouter.ShowInPortalRoutingAction.Companion.showInPortal
 import com.badoo.ribs.example.rib.switcher.builder.SwitcherBuilder
 import kotlinx.android.parcel.Parcelize
 
@@ -21,27 +21,17 @@ class RootRouter(
     savedInstanceState = savedInstanceState,
     initialConfiguration = Content.Default,
     permanentParts = emptyList()
-), Portal.Sink {
+), Portal {
 
-    interface ResolverChain {
-        val next: ResolverChain?
-    }
-
-
-    sealed class Configuration() : Parcelable {
+    sealed class Configuration : Parcelable {
         sealed class Content : Configuration() {
             @Parcelize object Default : Content()
-//            @Parcelize data class Portal(val resolverChain: ResolverChain) : Content()
+            @Parcelize data class Portal(val resolverChain: List<Parcelable>) : Content()
         }
+    }
 
-//        constructor(parcel: Parcel) : this() {}
-//        override fun writeToParcel(parcel: Parcel, flags: Int) {}
-//        override fun describeContents(): Int = 0
-//        @SuppressLint("ParcelCreator")
-//        companion object CREATOR : Parcelable.Creator<Configuration> {
-//            override fun createFromParcel(parcel: Parcel): Configuration = Content.Default
-//            override fun newArray(size: Int): Array<Configuration?> = arrayOfNulls(size)
-//        }
+    override fun push(resolverChain: List<Parcelable>) {
+        push(Content.Portal(resolverChain))
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -49,66 +39,27 @@ class RootRouter(
         super.onSaveInstanceState(outState)
     }
 
-//    override fun accept(command: Portal.Sink.Command) {
-//        when (command) {
-//            is Portal.Sink.Command.Add -> push(Content.Portal(command.node))
-//            is Portal.Sink.Command.Remove -> popBackStack()
-//        }
-//    }
-
-    override val remoteRoutingAction: ((Bundle?) -> Node<*>) -> RoutingAction<out RibView> = {
-        ShowInPortalRoutingAction(it)
-    }
-
     override fun resolveConfiguration(configuration: Configuration): RoutingAction<Nothing> =
         when (configuration) {
             is Content.Default -> attach { switcherBuilder.build(it) }
-//            is Content.Portal -> RoutingAction.noop()
-//                showInPortal(node, configuration.node)
+            is Content.Portal -> configuration.resolverChain.resolve() as RoutingAction<Nothing>
         }
 
-    private inner class ShowInPortalRoutingAction<V : RibView>(
-        private val childBuilder: (Bundle?) -> Node<*>
-    ) : RoutingAction<V> {
-
-        override fun parentNode(): Node<*>? {
-            return node
+    private fun <E : Parcelable> List<E>.resolve(): RoutingAction<out RibView> {
+        // FIXME grab first from real root somehow (makeRoot method called by RibActivity?):
+        var targetRouter: Resolver<Parcelable, *> = this@RootRouter as Resolver<Parcelable, *>
+        var routingAction: RoutingAction<out RibView> = targetRouter.resolveConfiguration(Content.Default) // FIXME this is set to Content.Default
+
+        drop(1).forEach { element ->
+            // FIXME don't build it again if already available as child
+            val nodes = routingAction.buildNodes(emptyList()) // FIXME bundle
+            val node = nodes.first() // FIXME if 0 or more than 1
+            targetRouter = node.node.resolver as Resolver<Parcelable, *>
+            routingAction = targetRouter.resolveConfiguration(element)
         }
 
-        override fun buildNodes(bundles: List<Bundle?>): List<Node.Descriptor> =
-            listOf(
-                Node.Descriptor(
-                    node = childBuilder.invoke(bundles.firstOrNull()),
-                    viewAttachMode = Node.AttachMode.PARENT // this works because this node will be the parent
-                )
-            )
-
-        override fun onAttach(nodes: List<Node.Descriptor>) {
-            node.addManaged(nodes.first().node)
-        }
-
-        override fun onDetach(nodes: List<Node.Descriptor>) {
-            node.removeManaged(nodes.first().node)
-        }
-//
-//        override fun execute(nodes: List<Node.Descriptor>) {
-////            push(Content.Portal(nodes.first().node))
-//            node.addManaged(nodes.first().node)
-////            node.attachChildView(nodes.first().node)
-//        }
-//
-//        override fun cleanup(nodes: List<Node.Descriptor>) {
-////            node.detachChildView(nodes.first().node)
-//            node.removeManaged(nodes.first().node)
-////            popBackStack()
-//        }
-
-//        companion object {
-//            fun <V : RibView> showInPortal(
-//                parentNode: Node<*>,
-//                childBuilder: (Bundle?) -> Node<*>
-//            ): RoutingAction<V> =
-//                ShowInPortalRoutingAction(parentNode, childBuilder)
-//        }
+        return routingAction
     }
+
 }
+
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootView.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootView.kt
index 2ee8b9136..c9e2434a4 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootView.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootView.kt
@@ -2,7 +2,7 @@ package com.badoo.ribs.example.rib.root
 
 import android.support.annotation.LayoutRes
 import android.view.ViewGroup
-import com.badoo.ribs.android.AndroidPortalRenderer
+//import com.badoo.ribs.android.AndroidPortalRenderer
 import com.badoo.ribs.core.Portal
 import com.badoo.ribs.core.view.RibView
 import com.badoo.ribs.core.view.ViewFactory
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootModule.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootModule.kt
index 5ed6a74ac..3c6a4c12f 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootModule.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootModule.kt
@@ -30,7 +30,7 @@ internal object RootModule {
     internal fun portal(
 //        interactor: RootInteractor
         router: RootRouter
-    ): Portal.Sink =
+    ): Portal =
         router
 
     @RootScope
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt
index 1d7985662..694c51b74 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt
@@ -14,6 +14,7 @@ import com.badoo.ribs.example.rib.small.SmallView.ViewModel
 import io.reactivex.functions.Consumer
 
 class SmallInteractor(
+    portal: Portal,
     savedInstanceState: Bundle?,
     router: Router<Configuration, *, Content, Nothing, SmallView>
     ) : Interactor<Configuration, Content, Nothing, SmallView>(
@@ -30,7 +31,7 @@ class SmallInteractor(
 
     private val viewEventConsumer: Consumer<Event> = Consumer {
         when (it) {
-            Event.OpenBigClicked -> router.push(Content.ShowBig)
+            Event.OpenBigClicked -> portal.push(router.node.resolverChain() + Content.ShowBig)
         }
     }
 }
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallRouter.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallRouter.kt
index 52cf55792..6c084e255 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallRouter.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallRouter.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.os.Parcelable
 import com.badoo.ribs.core.Portal
 import com.badoo.ribs.core.Router
+import com.badoo.ribs.core.routing.action.AttachRibRoutingAction.Companion.attach
 import com.badoo.ribs.core.routing.action.FullScreenRoutingAction.Companion.fullScreen
 import com.badoo.ribs.core.routing.action.RoutingAction
 import com.badoo.ribs.core.routing.action.RoutingAction.Companion.noop
@@ -14,7 +15,7 @@ import kotlinx.android.parcel.Parcelize
 
 class SmallRouter(
     savedInstanceState: Bundle?,
-    private val portal: Portal.Sink,
+//    private val portal: Portal.Sink,
     private val bigBuilder: BigBuilder
 ): Router<Configuration, Nothing, Content, Nothing, SmallView>(
     savedInstanceState = savedInstanceState,
@@ -31,7 +32,7 @@ class SmallRouter(
     override fun resolveConfiguration(configuration: Configuration): RoutingAction<SmallView> =
         when (configuration) {
             Content.Default -> noop()
-//            Content.ShowBig -> fullScreen(portal) { bigBuilder.build(it) }
-            Content.ShowBig -> portal.remoteRoutingAction { bigBuilder.build(it) } as RoutingAction<SmallView>
+            Content.ShowBig -> attach { bigBuilder.build(it) }
+//            Content.ShowBig -> portal.remoteRoutingAction { bigBuilder.build(it) } as RoutingAction<SmallView>
         }
 }
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallModule.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallModule.kt
index 9f412df8f..d0a9d75e6 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallModule.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallModule.kt
@@ -19,12 +19,12 @@ internal object SmallModule {
     internal fun router(
         // pass component to child rib builders, or remove if there are none
         component: SmallComponent,
-        savedInstanceState: Bundle?,
-        portal: Portal.Sink
+        savedInstanceState: Bundle?
+//        portal: Portal.Sink
     ): SmallRouter =
         SmallRouter(
             savedInstanceState = savedInstanceState,
-            portal = portal,
+//            portal = portal,
             bigBuilder = BigBuilder(component)
         )
 
@@ -33,11 +33,13 @@ internal object SmallModule {
     @JvmStatic
     internal fun interactor(
         savedInstanceState: Bundle?,
-        router: SmallRouter
+        router: SmallRouter,
+        portal: Portal
     ): SmallInteractor =
         SmallInteractor(
             savedInstanceState = savedInstanceState,
-            router = router
+            router = router,
+            portal = portal
         )
 
     @SmallScope
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/feature/PortalFeature.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/feature/PortalFeature.kt
index 39473c8cf..96f4b7f1f 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/feature/PortalFeature.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/feature/PortalFeature.kt
@@ -6,11 +6,11 @@ import com.badoo.mvicore.feature.ActorReducerFeature
 //import com.badoo.ribs.core.LifecycleParent
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.Portal
-import com.badoo.ribs.core.Portal.Sink.Command
-import com.badoo.ribs.core.Portal.Sink.Command.Add
-import com.badoo.ribs.core.Portal.Sink.Command.Remove
-import com.badoo.ribs.core.Portal.Source.Model
-import com.badoo.ribs.core.Portal.Source.Model.Showing
+//import com.badoo.ribs.core.Portal.Sink.Command
+//import com.badoo.ribs.core.Portal.Sink.Command.Add
+//import com.badoo.ribs.core.Portal.Sink.Command.Remove
+//import com.badoo.ribs.core.Portal.Source.Model
+//import com.badoo.ribs.core.Portal.Source.Model.Showing
 //import com.badoo.ribs.example.rib.switcher.feature.PortalFeature.Effect
 //import com.badoo.ribs.example.rib.switcher.feature.PortalFeature.Effect.Added
 //import com.badoo.ribs.example.rib.switcher.feature.PortalFeature.Effect.Removed
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/android/AndroidPortalRenderer.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/android/AndroidPortalRenderer.kt
index 1b9977c9b..32b8f2f25 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/android/AndroidPortalRenderer.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/android/AndroidPortalRenderer.kt
@@ -1,23 +1,23 @@
 package com.badoo.ribs.android
 
-import android.view.View
-import android.view.ViewGroup
-import com.badoo.ribs.core.Portal
-import com.badoo.ribs.core.Portal.Source.Model.Showing
-
-class AndroidPortalRenderer(
-    private val portalContainer: ViewGroup,
-    private val regularContentContainer: ViewGroup
-) : Portal.Renderer {
-
-    override fun accept(portalVm: Portal.Source.Model) {
-        regularContentContainer.visibility = when (portalVm) {
-            is Showing -> View.GONE
-            else -> View.VISIBLE
-        }
-
-        if (portalVm is Showing) {
-            portalVm.node.attachToView(portalContainer)
-        }
-    }
-}
+//import android.view.View
+//import android.view.ViewGroup
+//import com.badoo.ribs.core.Portal
+//import com.badoo.ribs.core.Portal.Source.Model.Showing
+//
+//class AndroidPortalRenderer(
+//    private val portalContainer: ViewGroup,
+//    private val regularContentContainer: ViewGroup
+//) : Portal.Renderer {
+//
+//    override fun accept(portalVm: Portal.Source.Model) {
+//        regularContentContainer.visibility = when (portalVm) {
+//            is Showing -> View.GONE
+//            else -> View.VISIBLE
+//        }
+//
+//        if (portalVm is Showing) {
+//            portalVm.node.attachToView(portalContainer)
+//        }
+//    }
+//}
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
index e6fae85ee..a659071b7 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
@@ -28,7 +28,6 @@ import android.arch.lifecycle.Lifecycle.State.STARTED
 import android.arch.lifecycle.LifecycleOwner
 import android.arch.lifecycle.LifecycleRegistry
 import android.os.Bundle
-import android.os.Handler
 import android.os.Parcelable
 import android.support.annotation.CallSuper
 import android.support.annotation.MainThread
@@ -56,44 +55,23 @@ open class Node<V : RibView>(
     private val router: Router<*, *, *, *, V>,
     private val interactor: Interactor<*, *, *, V>,
     private val ribRefWatcher: RibRefWatcher = RibRefWatcher.getInstance()
-//) : LifecycleOwner, LifecycleParent, LifecycleChild {
 ) : LifecycleOwner {
 
-    fun addManaged(child: Node<*>) {
-        Log.d("CHECK", "addManaged - $this ---> $child")
-        if (managedChildren.size == 1) {
-            router.onDetachView()
-            managedChildren.last().forEach { // FIXME this is a hack
-                detachChildView(it)
-            }
+    var parent: Node<*>? = null
 
-        } else {
-            managedChildren.last().forEach {
-                detachChildView(it)
-            }
-        }
-        managedChildren.add(
-            mutableListOf(child)
-        )
-        attachChildView(child)
-    }
+    fun resolverChain(): List<Parcelable> =
+        (parent?.resolverChain() ?: emptyList()) + ownResolver
 
-    fun removeManaged(child: Node<*>) {
-        Log.d("CHECK", "removeManaged - $this -x-> $child")
-        if (managedChildren.size <= 1) throw RuntimeException("This should never happen")
-        val target = managedChildren.find { it == mutableListOf(child) } ?: throw RuntimeException("This should never happen")
-        managedChildren.last().forEach {
-            detachChildView(it)
-        }
-        managedChildren.remove(target)
-        if (managedChildren.size > 1) {
-            managedChildren.last().forEach {
-                attachChildView(it)
-            }
-        } else {
-            router.onAttachView() // FIXME
-        }
-    }
+    var ownResolver = listOf<Parcelable>()
+        internal set
+
+//    var parentResolverChain = listOf<Parcelable>()
+//        internal set(value) {
+//            field = value
+//        }
+
+    val resolver: Resolver<*, V> =
+        router
 
     private val savedInstanceState = savedInstanceState?.getBundle(BUNDLE_KEY)
 
@@ -130,7 +108,6 @@ open class Node<V : RibView>(
 
     val tag: String = this::class.java.name
     val children = CopyOnWriteArrayList<Node<*>>()
-    private val managedChildren = mutableListOf<MutableList<Node<*>>>(mutableListOf())
     private val childrenAttachesRelay: PublishRelay<Node<*>> = PublishRelay.create()
     val childrenAttaches: Observable<Node<*>> = childrenAttachesRelay.hide()
 
@@ -178,11 +155,7 @@ open class Node<V : RibView>(
             }
         }
 
-        if (managedChildren.size > 1) {
-            attachChildView(managedChildren.last().first())
-        } else {
-            router.onAttachView()
-        }
+        router.onAttachView()
         onStartInternal()
         onResumeInternal()
     }
@@ -195,11 +168,7 @@ open class Node<V : RibView>(
             Log.d("CHECK", "detachFromView - $this")
             onPauseInternal()
             onStopInternal()
-            if (managedChildren.size > 1) {
-                detachChildView(managedChildren.last().first())
-            } else {
-                router.onDetachView()
-            }
+            router.onDetachView()
 
             if (!isViewless) {
                 view!!.let {
@@ -245,16 +214,13 @@ open class Node<V : RibView>(
     internal fun attachChildNode(childDescriptor: Descriptor) {
         Log.d("CHECK", "attachChildNode - $this, $childDescriptor")
         val (childNode, viewAttachMode) = childDescriptor
+        childNode.parent = this
         children.add(childNode)
         ribRefWatcher.logBreadcrumb(
             "ATTACHED", childNode.javaClass.simpleName, this.javaClass.simpleName
         )
 
-        if (viewAttachMode == AttachMode.PARENT) {
-            managedChildren.first().add(childNode)
-            childNode.inheritExternalLifecycle(externalLifecycleRegistry)
-        }
-
+        childNode.inheritExternalLifecycle(externalLifecycleRegistry)
         childNode.onAttach()
         childrenAttachesRelay.accept(childNode)
     }
@@ -293,7 +259,6 @@ open class Node<V : RibView>(
     @MainThread
     internal fun detachChildNode(childNode: Node<*>) {
         children.remove(childNode)
-        managedChildren.first().remove(childNode)
 
         ribRefWatcher.watchDeletedObject(childNode)
         ribRefWatcher.logBreadcrumb(
@@ -347,7 +312,7 @@ open class Node<V : RibView>(
         Log.d("CHECK", "onStartInternal - $this")
         // The lifecycle cannot go higher than that of the hosting environment (e.g. Activity)
         updateToStateIfViewAttached(externalLifecycleRegistry.currentState)
-        managedChildren.last().forEach { callOnChildren.invoke(it) }
+        children.forEach { callOnChildren.invoke(it) }
     }
 
     // TODO call this when overlay is removed
@@ -355,7 +320,7 @@ open class Node<V : RibView>(
         Log.d("CHECK", "onResumeInternal - $this")
         // The lifecycle cannot go higher than that of the hosting environment (e.g. Activity)
         updateToStateIfViewAttached(externalLifecycleRegistry.currentState)
-        managedChildren.last().forEach { callOnChildren.invoke(it) }
+        children.forEach { callOnChildren.invoke(it) }
     }
 
     // TODO call this when overlay hides content AND current rib is not in dialog
@@ -364,13 +329,13 @@ open class Node<V : RibView>(
         // The lifecycle cannot go higher than that of the hosting environment (e.g. Activity)
         val targetState = if (externalLifecycleRegistry.currentState == CREATED) CREATED else STARTED
         updateToStateIfViewAttached(targetState)
-        managedChildren.last().forEach { callOnChildren.invoke(it) }
+        children.forEach { callOnChildren.invoke(it) }
     }
 
     internal fun onStopInternal(callOnChildren: (Node<*>) -> Unit = { it.onStopInternal() }) {
         Log.d("CHECK", "onStopInternal - $this")
         updateToStateIfViewAttached(CREATED)
-        managedChildren.last().forEach { callOnChildren.invoke(it) }
+        children.forEach { callOnChildren.invoke(it) }
     }
 
     private fun updateToStateIfViewAttached(state: Lifecycle.State) {
@@ -394,19 +359,12 @@ open class Node<V : RibView>(
         Log.d("CHECK", "handleBackPress - $this")
         ribRefWatcher.logBreadcrumb("BACKPRESS", null, null)
         return children
-            .filter { it.shouldPropagateBackPress }
+            .filter { it.isAttachedToView }
             .any { it.handleBackPress() }
             || interactor.handleBackPress()
             || router.popBackStack()
     }
 
-    /**
-     * Valid use-case: RIB is detached from view, but a descendant of it is visible through a [Portal]
-     * In this case it should still propagate back press
-     */
-    private val shouldPropagateBackPress: Boolean
-        get() = isAttachedToView || children.any { it.shouldPropagateBackPress }
-
 
     internal fun saveViewState() {
         view?.let {
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Portal.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Portal.kt
index 4914fcc59..7bd929866 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Portal.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Portal.kt
@@ -1,6 +1,7 @@
 package com.badoo.ribs.core
 
 import android.os.Bundle
+import android.os.Parcelable
 import com.badoo.ribs.core.routing.action.RoutingAction
 import com.badoo.ribs.core.view.RibView
 import io.reactivex.ObservableSource
@@ -8,25 +9,27 @@ import io.reactivex.functions.Consumer
 
 interface Portal {
 
-//    interface Sink : Consumer<Sink.Command> {
-    interface Sink {
-
-        val remoteRoutingAction: ((Bundle?) -> Node<*>) -> RoutingAction<out RibView>
-
-        sealed class Command {
-            data class Add(val node: Node<*>) : Command()
-            data class Remove(val node: Node<*>) : Command()
-        }
-    }
+    fun push(resolverChain: List<Parcelable>)
 
-    interface Source {
-        val models: ObservableSource<Model>
-
-        sealed class Model {
-            object Empty : Model()
-            data class Showing(val node: Node<*>) : Model()
-        }
-    }
-
-    interface Renderer : Consumer<Source.Model>
+//    interface Sink : Consumer<Sink.Command> {
+//    interface Sink {
+
+//        val remoteRoutingAction: ((Bundle?) -> Node<*>) -> RoutingAction<out RibView>
+
+//        sealed class Command {
+//            data class Add(val node: Node<*>) : Command()
+//            data class Remove(val node: Node<*>) : Command()
+//        }
+//    }
+
+//    interface Source {
+//        val models: ObservableSource<Model>
+//
+//        sealed class Model {
+//            object Empty : Model()
+//            data class Showing(val node: Node<*>) : Model()
+//        }
+//    }
+//
+//    interface Renderer : Consumer<Source.Model>
 }
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Router.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Router.kt
index f2e42e518..760a9be92 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Router.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Router.kt
@@ -18,11 +18,15 @@ import com.badoo.ribs.core.routing.configuration.feature.ConfigurationFeature
 import com.badoo.ribs.core.routing.configuration.toCommands
 import com.badoo.ribs.core.view.RibView
 
+interface Resolver<C : Parcelable, V : RibView> {
+    fun resolveConfiguration(configuration: C): RoutingAction<V>
+}
+
 abstract class Router<C : Parcelable, Permanent : C, Content : C, Overlay : C, V : RibView>(
     savedInstanceState: Bundle?,
     private val initialConfiguration: Content,
     private val permanentParts: List<Permanent> = emptyList()
-) {
+) : Resolver<C, V> {
     companion object {
         internal const val BUNDLE_KEY = "Router"
     }
@@ -54,8 +58,6 @@ abstract class Router<C : Parcelable, Permanent : C, Content : C, Overlay : C, V
         )
     }
 
-    abstract fun resolveConfiguration(configuration: C): RoutingAction<V>
-
     open fun onSaveInstanceState(outState: Bundle) {
         configurationFeature.accept(SaveInstanceState())
         val bundle = Bundle()
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/FullScreenRoutingAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/FullScreenRoutingAction.kt
index 1e9948d31..4bb6f3192 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/FullScreenRoutingAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/FullScreenRoutingAction.kt
@@ -3,12 +3,10 @@ package com.badoo.ribs.core.routing.action
 import android.os.Bundle
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.Portal
-import com.badoo.ribs.core.Portal.Sink.Command.Add
-import com.badoo.ribs.core.Portal.Sink.Command.Remove
 import com.badoo.ribs.core.view.RibView
 
 class FullScreenRoutingAction<V : RibView>(
-    private val portal: Portal.Sink,
+//    private val portal: Portal.Sink,
     private val builder: (Bundle?) -> Node<*>
 ) : RoutingAction<V> {
 
@@ -31,7 +29,11 @@ class FullScreenRoutingAction<V : RibView>(
     }
 
     companion object {
-        fun <V : RibView> fullScreen(portal: Portal.Sink, builder: (Bundle?) -> Node<*>): RoutingAction<V> =
-            FullScreenRoutingAction(portal, builder)
+        fun <V : RibView> fullScreen(
+//            portal: Portal.Sink,
+            builder: (Bundle?) -> Node<*>): RoutingAction<V> =
+            FullScreenRoutingAction(
+//                portal,
+                builder)
     }
 }
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/ConfigurationContext.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/ConfigurationContext.kt
index 7f24b2713..cfc5cac40 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/ConfigurationContext.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/ConfigurationContext.kt
@@ -107,7 +107,12 @@ internal sealed class ConfigurationContext<C : Parcelable> {
                     configuration = configuration,
                     bundles = bundles,
                     routingAction = routingAction,
-                    nodes = routingAction.buildNodes(bundles)
+                    nodes = routingAction.buildNodes(bundles).also {
+                        it.forEach {
+//                            it.node.parent = parentNode
+                            it.node.ownResolver = listOf(configuration)
+                        }
+                    }
                 )
             )
         }
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/customisation/CanProvidePortal.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/customisation/CanProvidePortal.kt
index 4c4297424..7aed63ae3 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/customisation/CanProvidePortal.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/customisation/CanProvidePortal.kt
@@ -4,5 +4,5 @@ import com.badoo.ribs.core.Portal
 
 
 interface CanProvidePortal {
-    fun portal(): Portal.Sink
+    fun portal(): Portal
 }

From bd9d9ad483e7748dd8feb503eb7ba068927a9281 Mon Sep 17 00:00:00 2001
From: Zsolt Kocsi <zsolt.kocsi@corp.badoo.com>
Date: Wed, 28 Aug 2019 22:57:30 +0100
Subject: [PATCH 05/17] WIP

---
 .../badoo/ribs/example/rib/root/RootRouter.kt |  7 +---
 .../ribs/example/rib/small/SmallInteractor.kt |  4 +-
 .../ribs/example/rib/small/SmallRouter.kt     | 13 +++----
 .../src/main/java/com/badoo/ribs/core/Node.kt |  3 +-
 .../action/AnchoredAttachRoutingAction.kt     | 26 +++++++++++++
 .../routing/action/AttachRibRoutingAction.kt  |  2 +-
 .../routing/action/FullScreenRoutingAction.kt | 39 -------------------
 .../ribs/core/routing/action/RoutingAction.kt |  3 ++
 .../configuration/ConfigurationContext.kt     |  8 ++--
 .../action/single/ActivateAction.kt           |  4 +-
 .../configuration/action/single/AddAction.kt  |  4 ++
 .../action/single/DeactivateAction.kt         |  4 +-
 12 files changed, 54 insertions(+), 63 deletions(-)
 create mode 100644 android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/AnchoredAttachRoutingAction.kt
 delete mode 100644 android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/FullScreenRoutingAction.kt

diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt
index 349c60682..76165d983 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt
@@ -34,11 +34,6 @@ class RootRouter(
         push(Content.Portal(resolverChain))
     }
 
-    override fun onSaveInstanceState(outState: Bundle) {
-        newRoot(Content.Default)
-        super.onSaveInstanceState(outState)
-    }
-
     override fun resolveConfiguration(configuration: Configuration): RoutingAction<Nothing> =
         when (configuration) {
             is Content.Default -> attach { switcherBuilder.build(it) }
@@ -48,7 +43,7 @@ class RootRouter(
     private fun <E : Parcelable> List<E>.resolve(): RoutingAction<out RibView> {
         // FIXME grab first from real root somehow (makeRoot method called by RibActivity?):
         var targetRouter: Resolver<Parcelable, *> = this@RootRouter as Resolver<Parcelable, *>
-        var routingAction: RoutingAction<out RibView> = targetRouter.resolveConfiguration(Content.Default) // FIXME this is set to Content.Default
+        var routingAction: RoutingAction<out RibView> = targetRouter.resolveConfiguration(first()) // FIXME make first() safe to call
 
         drop(1).forEach { element ->
             // FIXME don't build it again if already available as child
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt
index 694c51b74..e5830dbbd 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt
@@ -6,9 +6,9 @@ import com.badoo.mvicore.android.lifecycle.createDestroy
 import com.badoo.ribs.core.Interactor
 import com.badoo.ribs.core.Portal
 import com.badoo.ribs.core.Router
-import com.badoo.ribs.example.rib.root.RootRouter
 import com.badoo.ribs.example.rib.small.SmallRouter.Configuration
 import com.badoo.ribs.example.rib.small.SmallRouter.Configuration.Content
+import com.badoo.ribs.example.rib.small.SmallRouter.Configuration.FullScreen
 import com.badoo.ribs.example.rib.small.SmallView.Event
 import com.badoo.ribs.example.rib.small.SmallView.ViewModel
 import io.reactivex.functions.Consumer
@@ -31,7 +31,7 @@ class SmallInteractor(
 
     private val viewEventConsumer: Consumer<Event> = Consumer {
         when (it) {
-            Event.OpenBigClicked -> portal.push(router.node.resolverChain() + Content.ShowBig)
+            Event.OpenBigClicked -> portal.push(router.node.resolverChain() + FullScreen.ShowBig)
         }
     }
 }
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallRouter.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallRouter.kt
index 6c084e255..3f3f0cb83 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallRouter.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallRouter.kt
@@ -2,20 +2,18 @@ package com.badoo.ribs.example.rib.small
 
 import android.os.Bundle
 import android.os.Parcelable
-import com.badoo.ribs.core.Portal
 import com.badoo.ribs.core.Router
-import com.badoo.ribs.core.routing.action.AttachRibRoutingAction.Companion.attach
-import com.badoo.ribs.core.routing.action.FullScreenRoutingAction.Companion.fullScreen
+import com.badoo.ribs.core.routing.action.AnchoredAttachRoutingAction.Companion.anchor
 import com.badoo.ribs.core.routing.action.RoutingAction
 import com.badoo.ribs.core.routing.action.RoutingAction.Companion.noop
 import com.badoo.ribs.example.rib.big.builder.BigBuilder
 import com.badoo.ribs.example.rib.small.SmallRouter.Configuration
 import com.badoo.ribs.example.rib.small.SmallRouter.Configuration.Content
+import com.badoo.ribs.example.rib.small.SmallRouter.Configuration.FullScreen
 import kotlinx.android.parcel.Parcelize
 
 class SmallRouter(
     savedInstanceState: Bundle?,
-//    private val portal: Portal.Sink,
     private val bigBuilder: BigBuilder
 ): Router<Configuration, Nothing, Content, Nothing, SmallView>(
     savedInstanceState = savedInstanceState,
@@ -25,14 +23,15 @@ class SmallRouter(
     sealed class Configuration : Parcelable {
         sealed class Content : Configuration() {
             @Parcelize object Default : Content()
-            @Parcelize object ShowBig : Content()
+        }
+        sealed class FullScreen : Configuration() {
+            @Parcelize object ShowBig : FullScreen()
         }
     }
 
     override fun resolveConfiguration(configuration: Configuration): RoutingAction<SmallView> =
         when (configuration) {
             Content.Default -> noop()
-            Content.ShowBig -> attach { bigBuilder.build(it) }
-//            Content.ShowBig -> portal.remoteRoutingAction { bigBuilder.build(it) } as RoutingAction<SmallView>
+            FullScreen.ShowBig -> anchor(node) { bigBuilder.build(it) }
         }
 }
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
index a659071b7..675b792c4 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
@@ -57,6 +57,7 @@ open class Node<V : RibView>(
     private val ribRefWatcher: RibRefWatcher = RibRefWatcher.getInstance()
 ) : LifecycleOwner {
 
+    // FIXME this is virtual parent, not necessarily actual
     var parent: Node<*>? = null
 
     fun resolverChain(): List<Parcelable> =
@@ -214,7 +215,7 @@ open class Node<V : RibView>(
     internal fun attachChildNode(childDescriptor: Descriptor) {
         Log.d("CHECK", "attachChildNode - $this, $childDescriptor")
         val (childNode, viewAttachMode) = childDescriptor
-        childNode.parent = this
+//        childNode.parent = this
         children.add(childNode)
         ribRefWatcher.logBreadcrumb(
             "ATTACHED", childNode.javaClass.simpleName, this.javaClass.simpleName
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/AnchoredAttachRoutingAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/AnchoredAttachRoutingAction.kt
new file mode 100644
index 000000000..c80985ee2
--- /dev/null
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/AnchoredAttachRoutingAction.kt
@@ -0,0 +1,26 @@
+package com.badoo.ribs.core.routing.action
+
+import android.os.Bundle
+import com.badoo.ribs.core.Node
+import com.badoo.ribs.core.view.RibView
+
+class AnchoredAttachRoutingAction<V : RibView>(
+    private val virtualParent: Node<*>,
+    builder: (Bundle?) -> Node<*>
+) : AttachRibRoutingAction<V>(
+    builder = builder
+) {
+
+    override fun virtualParentNode(): Node<*>? =
+        virtualParent
+
+    companion object {
+        fun <V : RibView> anchor(
+            virtualParent: Node<*>,
+            builder: (Bundle?) -> Node<*>): RoutingAction<V> =
+            AnchoredAttachRoutingAction(
+                virtualParent,
+                builder
+            )
+    }
+}
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/AttachRibRoutingAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/AttachRibRoutingAction.kt
index 8e5c12229..e542ad0e8 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/AttachRibRoutingAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/AttachRibRoutingAction.kt
@@ -4,7 +4,7 @@ import android.os.Bundle
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.view.RibView
 
-class AttachRibRoutingAction<V : RibView>(
+open class AttachRibRoutingAction<V : RibView>(
     private val builder: (Bundle?) -> Node<*>
 ) : RoutingAction<V> {
 
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/FullScreenRoutingAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/FullScreenRoutingAction.kt
deleted file mode 100644
index 4bb6f3192..000000000
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/FullScreenRoutingAction.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.badoo.ribs.core.routing.action
-
-import android.os.Bundle
-import com.badoo.ribs.core.Node
-import com.badoo.ribs.core.Portal
-import com.badoo.ribs.core.view.RibView
-
-class FullScreenRoutingAction<V : RibView>(
-//    private val portal: Portal.Sink,
-    private val builder: (Bundle?) -> Node<*>
-) : RoutingAction<V> {
-
-    override fun buildNodes(bundles: List<Bundle?>): List<Node.Descriptor> =
-        listOf(
-            Node.Descriptor(
-                node = builder.invoke(bundles.firstOrNull()),
-                viewAttachMode = Node.AttachMode.EXTERNAL
-            )
-        )
-
-    override fun execute(nodes: List<Node.Descriptor>) {
-        super.execute(nodes)
-//        portal.accept(Add(nodes.first().node))
-    }
-
-    override fun cleanup(nodes: List<Node.Descriptor>) {
-        super.cleanup(nodes)
-//        portal.accept(Remove(nodes.first().node))
-    }
-
-    companion object {
-        fun <V : RibView> fullScreen(
-//            portal: Portal.Sink,
-            builder: (Bundle?) -> Node<*>): RoutingAction<V> =
-            FullScreenRoutingAction(
-//                portal,
-                builder)
-    }
-}
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/RoutingAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/RoutingAction.kt
index 8aa66fb2f..79ab8570a 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/RoutingAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/RoutingAction.kt
@@ -27,6 +27,9 @@ interface RoutingAction<V : RibView> {
     fun parentNode(): Node<*>? =
         null
 
+    fun virtualParentNode(): Node<*>? =
+        null
+
     companion object {
         fun <V : RibView> noop(): RoutingAction<V> = object :
             RoutingAction<V> {}
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/ConfigurationContext.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/ConfigurationContext.kt
index cfc5cac40..d239c80b7 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/ConfigurationContext.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/ConfigurationContext.kt
@@ -87,8 +87,9 @@ internal sealed class ConfigurationContext<C : Parcelable> {
         }
 
         /**
-         * Resolves and sets the associated [RoutingAction], builds associated [Node]s, and adds
-         * them to the [parentNode]
+         * Resolves and sets the associated [RoutingAction], builds associated [Node]s
+         * FIXME outdated:
+         * , and adds them to the [parentNode]
          */
         override fun resolve(
             resolver: (C) -> RoutingAction<*>,
@@ -109,7 +110,8 @@ internal sealed class ConfigurationContext<C : Parcelable> {
                     routingAction = routingAction,
                     nodes = routingAction.buildNodes(bundles).also {
                         it.forEach {
-//                            it.node.parent = parentNode
+                            val anchor = routingAction.virtualParentNode()
+                            it.node.parent = anchor ?: parentNode
                             it.node.ownResolver = listOf(configuration)
                         }
                     }
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/ActivateAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/ActivateAction.kt
index c04e30d8d..6af414bbd 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/ActivateAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/ActivateAction.kt
@@ -37,8 +37,8 @@ internal object ActivateAction : ResolvedSingleConfigurationAction() {
             return item
         }
 
-        val targetNode = item.routingAction.parentNode() ?: parentNode
-        targetNode.attachParentedViews(item.nodes)
+//        val targetNode = item.routingAction.parentNode() ?: parentNode
+        parentNode.attachParentedViews(item.nodes)
         item.routingAction.execute(item.nodes)
         return item.withActivationState(globalActivationLevel)
     }
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/AddAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/AddAction.kt
index ccedd7ad0..a189eb1c0 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/AddAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/AddAction.kt
@@ -19,6 +19,10 @@ internal object AddAction : ResolvedSingleConfigurationAction() {
      * Convenience method so that Add can be called only with only the knowledge of parentNode too
      */
     fun <C : Parcelable> execute(item: Resolved<C>, parentNode: Node<*>): Resolved<C> {
+//        item.nodes.forEach {
+//            it.node.parent = item.routingAction.virtualParentNode() ?: parentNode
+//            it.node.ownResolver = listOf(item.configuration)
+//        }
         parentNode.attachNodes(item.nodes)
         item.routingAction.onAttach(item.nodes)
 
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/DeactivateAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/DeactivateAction.kt
index 89cdcbad9..f0e61d0d6 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/DeactivateAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/DeactivateAction.kt
@@ -18,8 +18,8 @@ internal object DeactivateAction : ResolvedSingleConfigurationAction() {
         val (_, parentNode, _) = params
         item.routingAction.cleanup(item.nodes)
         item.nodes.saveViewState()
-        val targetNode = item.routingAction.parentNode() ?: parentNode
-        targetNode.detachChildViews(item.nodes)
+//        val targetNode = item.routingAction.parentNode() ?: parentNode
+        parentNode.detachChildViews(item.nodes)
 
         return item.withActivationState(INACTIVE)
     }

From e30418d641dc1c904e309086aa85a7f1e0c41bfe Mon Sep 17 00:00:00 2001
From: Zsolt Kocsi <zsolt.kocsi@corp.badoo.com>
Date: Thu, 29 Aug 2019 12:49:54 +0100
Subject: [PATCH 06/17] Cleanup

---
 .../ribs/example/rib/root/RootInteractor.kt   |  6 +--
 .../badoo/ribs/example/rib/root/RootRouter.kt | 13 +++---
 .../badoo/ribs/example/rib/root/RootView.kt   |  9 ----
 .../example/rib/root/builder/RootModule.kt    |  4 +-
 .../ribs/example/rib/small/SmallInteractor.kt |  6 +--
 .../example/rib/small/builder/SmallModule.kt  |  2 +-
 .../rib/switcher/builder/SwitcherModule.kt    |  1 -
 .../rib/switcher/feature/PortalFeature.kt     | 20 +++------
 .../ribs/android/AndroidPortalRenderer.kt     |  4 +-
 .../src/main/java/com/badoo/ribs/core/Node.kt | 24 +++--------
 .../main/java/com/badoo/ribs/core/Portal.kt   | 35 ----------------
 .../main/java/com/badoo/ribs/core/Router.kt   |  8 +---
 .../action/AnchoredAttachRoutingAction.kt     | 10 ++---
 .../ribs/core/routing/action/RoutingAction.kt |  2 +-
 .../configuration/ConfigurationContext.kt     |  8 ++--
 .../configuration/ConfigurationResolver.kt    |  9 ++++
 .../configuration/action/single/AddAction.kt  |  5 +--
 .../ribs/core/routing/portal/AncestryInfo.kt  | 42 +++++++++++++++++++
 .../badoo/ribs/core/routing/portal/Portal.kt  |  8 ++++
 .../ribs/customisation/CanProvidePortal.kt    |  2 +-
 20 files changed, 98 insertions(+), 120 deletions(-)
 delete mode 100644 android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Portal.kt
 create mode 100644 android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/ConfigurationResolver.kt
 create mode 100644 android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/AncestryInfo.kt
 create mode 100644 android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/Portal.kt

diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootInteractor.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootInteractor.kt
index 78f6f4177..1c638665d 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootInteractor.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootInteractor.kt
@@ -1,15 +1,11 @@
 package com.badoo.ribs.example.rib.root
 
-import android.arch.lifecycle.Lifecycle
 import android.os.Bundle
-import com.badoo.mvicore.android.lifecycle.createDestroy
 import com.badoo.ribs.core.Interactor
-import com.badoo.ribs.core.Portal
-//import com.badoo.ribs.core.Portal.Source.Model.*
+//import com.badoo.ribs.core.routing.portal.Portal.Source.Model.*
 import com.badoo.ribs.core.Router
 import com.badoo.ribs.example.rib.root.RootRouter.Configuration
 import com.badoo.ribs.example.rib.root.RootRouter.Configuration.Content
-import io.reactivex.functions.Consumer
 
 class RootInteractor(
     savedInstanceState: Bundle?,
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt
index 76165d983..ca01f5189 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt
@@ -2,9 +2,8 @@ package com.badoo.ribs.example.rib.root
 
 import android.os.Bundle
 import android.os.Parcelable
-import com.badoo.ribs.core.Node
-import com.badoo.ribs.core.Portal
-import com.badoo.ribs.core.Resolver
+import com.badoo.ribs.core.routing.portal.Portal
+import com.badoo.ribs.core.routing.configuration.ConfigurationResolver
 import com.badoo.ribs.core.Router
 import com.badoo.ribs.core.routing.action.AttachRibRoutingAction.Companion.attach
 import com.badoo.ribs.core.routing.action.RoutingAction
@@ -30,8 +29,8 @@ class RootRouter(
         }
     }
 
-    override fun push(resolverChain: List<Parcelable>) {
-        push(Content.Portal(resolverChain))
+    override fun push(configurationChain: List<Parcelable>) {
+        push(Content.Portal(configurationChain))
     }
 
     override fun resolveConfiguration(configuration: Configuration): RoutingAction<Nothing> =
@@ -42,14 +41,14 @@ class RootRouter(
 
     private fun <E : Parcelable> List<E>.resolve(): RoutingAction<out RibView> {
         // FIXME grab first from real root somehow (makeRoot method called by RibActivity?):
-        var targetRouter: Resolver<Parcelable, *> = this@RootRouter as Resolver<Parcelable, *>
+        var targetRouter: ConfigurationResolver<Parcelable, *> = this@RootRouter as ConfigurationResolver<Parcelable, *>
         var routingAction: RoutingAction<out RibView> = targetRouter.resolveConfiguration(first()) // FIXME make first() safe to call
 
         drop(1).forEach { element ->
             // FIXME don't build it again if already available as child
             val nodes = routingAction.buildNodes(emptyList()) // FIXME bundle
             val node = nodes.first() // FIXME if 0 or more than 1
-            targetRouter = node.node.resolver as Resolver<Parcelable, *>
+            targetRouter = node.node.resolver as ConfigurationResolver<Parcelable, *>
             routingAction = targetRouter.resolveConfiguration(element)
         }
 
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootView.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootView.kt
index c9e2434a4..e767c99a3 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootView.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootView.kt
@@ -1,16 +1,7 @@
 package com.badoo.ribs.example.rib.root
 
-import android.support.annotation.LayoutRes
-import android.view.ViewGroup
 //import com.badoo.ribs.android.AndroidPortalRenderer
-import com.badoo.ribs.core.Portal
-import com.badoo.ribs.core.view.RibView
-import com.badoo.ribs.core.view.ViewFactory
-import com.badoo.ribs.example.R
 //import com.badoo.ribs.example.rib.root.RootView.Event
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.ObservableSource
-import io.reactivex.functions.Consumer
 
 //interface RootView : RibView,
 //    ObservableSource<Event>
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootModule.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootModule.kt
index 3c6a4c12f..3f3c8576e 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootModule.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootModule.kt
@@ -2,8 +2,7 @@
 package com.badoo.ribs.example.rib.root.builder
 
 import android.os.Bundle
-import com.badoo.ribs.core.Portal
-import com.badoo.ribs.example.rib.root.Root
+import com.badoo.ribs.core.routing.portal.Portal
 import com.badoo.ribs.example.rib.root.RootInteractor
 import com.badoo.ribs.example.rib.root.RootNode
 import com.badoo.ribs.example.rib.root.RootRouter
@@ -11,7 +10,6 @@ import com.badoo.ribs.example.rib.switcher.builder.SwitcherBuilder
 import com.badoo.ribs.example.util.CoffeeMachine
 import com.badoo.ribs.example.util.StupidCoffeeMachine
 import dagger.Provides
-import javax.inject.Provider
 
 @dagger.Module
 internal object RootModule {
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt
index e5830dbbd..945128349 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt
@@ -4,7 +4,7 @@ import android.arch.lifecycle.Lifecycle
 import android.os.Bundle
 import com.badoo.mvicore.android.lifecycle.createDestroy
 import com.badoo.ribs.core.Interactor
-import com.badoo.ribs.core.Portal
+import com.badoo.ribs.core.routing.portal.Portal
 import com.badoo.ribs.core.Router
 import com.badoo.ribs.example.rib.small.SmallRouter.Configuration
 import com.badoo.ribs.example.rib.small.SmallRouter.Configuration.Content
@@ -17,7 +17,7 @@ class SmallInteractor(
     portal: Portal,
     savedInstanceState: Bundle?,
     router: Router<Configuration, *, Content, Nothing, SmallView>
-    ) : Interactor<Configuration, Content, Nothing, SmallView>(
+) : Interactor<Configuration, Content, Nothing, SmallView>(
     savedInstanceState = savedInstanceState,
     router = router,
     disposables = null
@@ -31,7 +31,7 @@ class SmallInteractor(
 
     private val viewEventConsumer: Consumer<Event> = Consumer {
         when (it) {
-            Event.OpenBigClicked -> portal.push(router.node.resolverChain() + FullScreen.ShowBig)
+            Event.OpenBigClicked -> portal.push(router.node.ancestryInfo.configurationChain + FullScreen.ShowBig)
         }
     }
 }
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallModule.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallModule.kt
index d0a9d75e6..4d1e62249 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallModule.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallModule.kt
@@ -2,7 +2,7 @@
 package com.badoo.ribs.example.rib.small.builder
 
 import android.os.Bundle
-import com.badoo.ribs.core.Portal
+import com.badoo.ribs.core.routing.portal.Portal
 import com.badoo.ribs.example.rib.big.builder.BigBuilder
 import com.badoo.ribs.example.rib.small.Small
 import com.badoo.ribs.example.rib.small.SmallInteractor
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/builder/SwitcherModule.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/builder/SwitcherModule.kt
index 7aaf6aaba..ffa9c4648 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/builder/SwitcherModule.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/builder/SwitcherModule.kt
@@ -2,7 +2,6 @@
 package com.badoo.ribs.example.rib.switcher.builder
 
 import android.os.Bundle
-import com.badoo.ribs.core.Portal
 import com.badoo.ribs.dialog.DialogLauncher
 import com.badoo.ribs.example.rib.blocker.Blocker
 import com.badoo.ribs.example.rib.blocker.builder.BlockerBuilder
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/feature/PortalFeature.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/feature/PortalFeature.kt
index 96f4b7f1f..e90ae4ba2 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/feature/PortalFeature.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/feature/PortalFeature.kt
@@ -1,25 +1,15 @@
 package com.badoo.ribs.example.rib.switcher.feature
 
-import com.badoo.mvicore.element.Actor
-import com.badoo.mvicore.element.Reducer
-import com.badoo.mvicore.feature.ActorReducerFeature
 //import com.badoo.ribs.core.LifecycleParent
-import com.badoo.ribs.core.Node
-import com.badoo.ribs.core.Portal
-//import com.badoo.ribs.core.Portal.Sink.Command
-//import com.badoo.ribs.core.Portal.Sink.Command.Add
-//import com.badoo.ribs.core.Portal.Sink.Command.Remove
-//import com.badoo.ribs.core.Portal.Source.Model
-//import com.badoo.ribs.core.Portal.Source.Model.Showing
+//import com.badoo.ribs.core.routing.portal.Portal.Sink.Command
+//import com.badoo.ribs.core.routing.portal.Portal.Sink.Command.Add
+//import com.badoo.ribs.core.routing.portal.Portal.Sink.Command.Remove
+//import com.badoo.ribs.core.routing.portal.Portal.Source.Model
+//import com.badoo.ribs.core.routing.portal.Portal.Source.Model.Showing
 //import com.badoo.ribs.example.rib.switcher.feature.PortalFeature.Effect
 //import com.badoo.ribs.example.rib.switcher.feature.PortalFeature.Effect.Added
 //import com.badoo.ribs.example.rib.switcher.feature.PortalFeature.Effect.Removed
 //import com.badoo.ribs.example.rib.switcher.feature.PortalFeature.State
-import io.reactivex.Observable
-import io.reactivex.Observable.empty
-import io.reactivex.Observable.just
-import io.reactivex.ObservableSource
-import javax.inject.Provider
 
 // FIXME move somewhere else
 //class PortalFeature(
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/android/AndroidPortalRenderer.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/android/AndroidPortalRenderer.kt
index 32b8f2f25..e6a0a6a6f 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/android/AndroidPortalRenderer.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/android/AndroidPortalRenderer.kt
@@ -2,8 +2,8 @@ package com.badoo.ribs.android
 
 //import android.view.View
 //import android.view.ViewGroup
-//import com.badoo.ribs.core.Portal
-//import com.badoo.ribs.core.Portal.Source.Model.Showing
+//import com.badoo.ribs.core.routing.portal.Portal
+//import com.badoo.ribs.core.routing.portal.Portal.Source.Model.Showing
 //
 //class AndroidPortalRenderer(
 //    private val portalContainer: ViewGroup,
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
index 675b792c4..8f38194a7 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
@@ -35,6 +35,8 @@ import android.support.annotation.VisibleForTesting
 import android.util.Log
 import android.util.SparseArray
 import android.view.ViewGroup
+import com.badoo.ribs.core.routing.configuration.ConfigurationResolver
+import com.badoo.ribs.core.routing.portal.AncestryInfo
 import com.badoo.ribs.core.view.RibView
 import com.badoo.ribs.util.RIBs
 import com.jakewharton.rxrelay2.BehaviorRelay
@@ -57,25 +59,6 @@ open class Node<V : RibView>(
     private val ribRefWatcher: RibRefWatcher = RibRefWatcher.getInstance()
 ) : LifecycleOwner {
 
-    // FIXME this is virtual parent, not necessarily actual
-    var parent: Node<*>? = null
-
-    fun resolverChain(): List<Parcelable> =
-        (parent?.resolverChain() ?: emptyList()) + ownResolver
-
-    var ownResolver = listOf<Parcelable>()
-        internal set
-
-//    var parentResolverChain = listOf<Parcelable>()
-//        internal set(value) {
-//            field = value
-//        }
-
-    val resolver: Resolver<*, V> =
-        router
-
-    private val savedInstanceState = savedInstanceState?.getBundle(BUNDLE_KEY)
-
     enum class AttachMode {
         /**
          * The node's view attach/detach and lifecycle is managed by its parent.
@@ -102,6 +85,9 @@ open class Node<V : RibView>(
         internal const val KEY_VIEW_STATE = "view.state"
     }
 
+    var ancestryInfo: AncestryInfo = AncestryInfo.Root
+    val resolver: ConfigurationResolver<*, V> = router
+    private val savedInstanceState = savedInstanceState?.getBundle(BUNDLE_KEY)
     private val externalLifecycleRegistry = LifecycleRegistry(this)
     internal val ribLifecycleRegistry = LifecycleRegistry(this)
     internal val viewLifecycleRegistry = LifecycleRegistry(this)
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Portal.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Portal.kt
deleted file mode 100644
index 7bd929866..000000000
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Portal.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.badoo.ribs.core
-
-import android.os.Bundle
-import android.os.Parcelable
-import com.badoo.ribs.core.routing.action.RoutingAction
-import com.badoo.ribs.core.view.RibView
-import io.reactivex.ObservableSource
-import io.reactivex.functions.Consumer
-
-interface Portal {
-
-    fun push(resolverChain: List<Parcelable>)
-
-//    interface Sink : Consumer<Sink.Command> {
-//    interface Sink {
-
-//        val remoteRoutingAction: ((Bundle?) -> Node<*>) -> RoutingAction<out RibView>
-
-//        sealed class Command {
-//            data class Add(val node: Node<*>) : Command()
-//            data class Remove(val node: Node<*>) : Command()
-//        }
-//    }
-
-//    interface Source {
-//        val models: ObservableSource<Model>
-//
-//        sealed class Model {
-//            object Empty : Model()
-//            data class Showing(val node: Node<*>) : Model()
-//        }
-//    }
-//
-//    interface Renderer : Consumer<Source.Model>
-}
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Router.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Router.kt
index 760a9be92..e28462d3a 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Router.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Router.kt
@@ -4,10 +4,10 @@ import android.os.Bundle
 import android.os.Parcelable
 import com.badoo.mvicore.android.AndroidTimeCapsule
 import com.badoo.mvicore.binder.Binder
-import com.badoo.ribs.core.routing.action.RoutingAction
 import com.badoo.ribs.core.routing.configuration.ConfigurationCommand.MultiConfigurationCommand.SaveInstanceState
 import com.badoo.ribs.core.routing.configuration.ConfigurationCommand.MultiConfigurationCommand.Sleep
 import com.badoo.ribs.core.routing.configuration.ConfigurationCommand.MultiConfigurationCommand.WakeUp
+import com.badoo.ribs.core.routing.configuration.ConfigurationResolver
 import com.badoo.ribs.core.routing.configuration.feature.BackStackFeature
 import com.badoo.ribs.core.routing.configuration.feature.BackStackFeature.Operation.NewRoot
 import com.badoo.ribs.core.routing.configuration.feature.BackStackFeature.Operation.Pop
@@ -18,15 +18,11 @@ import com.badoo.ribs.core.routing.configuration.feature.ConfigurationFeature
 import com.badoo.ribs.core.routing.configuration.toCommands
 import com.badoo.ribs.core.view.RibView
 
-interface Resolver<C : Parcelable, V : RibView> {
-    fun resolveConfiguration(configuration: C): RoutingAction<V>
-}
-
 abstract class Router<C : Parcelable, Permanent : C, Content : C, Overlay : C, V : RibView>(
     savedInstanceState: Bundle?,
     private val initialConfiguration: Content,
     private val permanentParts: List<Permanent> = emptyList()
-) : Resolver<C, V> {
+) : ConfigurationResolver<C, V> {
     companion object {
         internal const val BUNDLE_KEY = "Router"
     }
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/AnchoredAttachRoutingAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/AnchoredAttachRoutingAction.kt
index c80985ee2..7f727573a 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/AnchoredAttachRoutingAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/AnchoredAttachRoutingAction.kt
@@ -5,21 +5,21 @@ import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.view.RibView
 
 class AnchoredAttachRoutingAction<V : RibView>(
-    private val virtualParent: Node<*>,
+    private val anchor: Node<*>,
     builder: (Bundle?) -> Node<*>
 ) : AttachRibRoutingAction<V>(
     builder = builder
 ) {
 
-    override fun virtualParentNode(): Node<*>? =
-        virtualParent
+    override fun anchor(): Node<*>? =
+        anchor
 
     companion object {
         fun <V : RibView> anchor(
-            virtualParent: Node<*>,
+            anchor: Node<*>,
             builder: (Bundle?) -> Node<*>): RoutingAction<V> =
             AnchoredAttachRoutingAction(
-                virtualParent,
+                anchor,
                 builder
             )
     }
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/RoutingAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/RoutingAction.kt
index 79ab8570a..1c9c7ccb7 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/RoutingAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/RoutingAction.kt
@@ -27,7 +27,7 @@ interface RoutingAction<V : RibView> {
     fun parentNode(): Node<*>? =
         null
 
-    fun virtualParentNode(): Node<*>? =
+    fun anchor(): Node<*>? =
         null
 
     companion object {
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/ConfigurationContext.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/ConfigurationContext.kt
index d239c80b7..d70701fb8 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/ConfigurationContext.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/ConfigurationContext.kt
@@ -5,6 +5,7 @@ import android.os.Parcelable
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.routing.action.RoutingAction
 import com.badoo.ribs.core.routing.configuration.ConfigurationContext.ActivationState.ACTIVE
+import com.badoo.ribs.core.routing.portal.AncestryInfo
 import kotlinx.android.parcel.Parcelize
 
 /**
@@ -110,9 +111,10 @@ internal sealed class ConfigurationContext<C : Parcelable> {
                     routingAction = routingAction,
                     nodes = routingAction.buildNodes(bundles).also {
                         it.forEach {
-                            val anchor = routingAction.virtualParentNode()
-                            it.node.parent = anchor ?: parentNode
-                            it.node.ownResolver = listOf(configuration)
+                            it.node.ancestryInfo = AncestryInfo.Child(
+                                anchor = routingAction.anchor() ?: parentNode,
+                                creatorConfiguration = configuration
+                            )
                         }
                     }
                 )
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/ConfigurationResolver.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/ConfigurationResolver.kt
new file mode 100644
index 000000000..2f61192af
--- /dev/null
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/ConfigurationResolver.kt
@@ -0,0 +1,9 @@
+package com.badoo.ribs.core.routing.configuration
+
+import android.os.Parcelable
+import com.badoo.ribs.core.routing.action.RoutingAction
+import com.badoo.ribs.core.view.RibView
+
+interface ConfigurationResolver<C : Parcelable, V : RibView> {
+    fun resolveConfiguration(configuration: C): RoutingAction<V>
+}
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/AddAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/AddAction.kt
index a189eb1c0..9dd3fad5e 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/AddAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/AddAction.kt
@@ -19,10 +19,7 @@ internal object AddAction : ResolvedSingleConfigurationAction() {
      * Convenience method so that Add can be called only with only the knowledge of parentNode too
      */
     fun <C : Parcelable> execute(item: Resolved<C>, parentNode: Node<*>): Resolved<C> {
-//        item.nodes.forEach {
-//            it.node.parent = item.routingAction.virtualParentNode() ?: parentNode
-//            it.node.ownResolver = listOf(item.configuration)
-//        }
+
         parentNode.attachNodes(item.nodes)
         item.routingAction.onAttach(item.nodes)
 
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/AncestryInfo.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/AncestryInfo.kt
new file mode 100644
index 000000000..b46d11558
--- /dev/null
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/AncestryInfo.kt
@@ -0,0 +1,42 @@
+package com.badoo.ribs.core.routing.portal
+
+import android.os.Parcelable
+import com.badoo.ribs.core.Node
+
+sealed class AncestryInfo {
+
+    /**
+     * The whole chain of Configurations that can be used to reach this [Node]
+     */
+    abstract val configurationChain: List<Parcelable>
+
+    /**
+     * Represents ancestry info of a [Node] that is a root of a tree and doesn't have any parents
+     */
+    object Root : AncestryInfo() {
+        override val configurationChain: List<Parcelable> = emptyList()
+    }
+
+    /**
+     * Represents ancestry info of a [Node] that is attached to a parent
+     */
+    data class Child(
+        /**
+         * The virtual parent of the current [Node]. In most cases it is the same as the actual parent,
+         * however, it is different in the case of full screen [Portal]s: the actual parent is the
+         * portal host [Node], while the [anchor] refers to the [Node] that initiated building and adding
+         * the current one to the [Portal].
+         */
+        val anchor: Node<*>,
+
+        /**
+         * The Configuration the parent [Node] was set to that resulted in the creation of this [Node].
+         * Used in [configurationChain] for [Portal] resolution.
+         */
+        val creatorConfiguration: Parcelable
+    ) : AncestryInfo() {
+
+        override val configurationChain: List<Parcelable>
+            get() = anchor.ancestryInfo.configurationChain + creatorConfiguration
+    }
+}
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/Portal.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/Portal.kt
new file mode 100644
index 000000000..307e196ca
--- /dev/null
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/Portal.kt
@@ -0,0 +1,8 @@
+package com.badoo.ribs.core.routing.portal
+
+import android.os.Parcelable
+
+interface Portal {
+
+    fun push(configurationChain: List<Parcelable>)
+}
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/customisation/CanProvidePortal.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/customisation/CanProvidePortal.kt
index 7aed63ae3..faf832b38 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/customisation/CanProvidePortal.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/customisation/CanProvidePortal.kt
@@ -1,6 +1,6 @@
 package com.badoo.ribs.customisation
 
-import com.badoo.ribs.core.Portal
+import com.badoo.ribs.core.routing.portal.Portal
 
 
 interface CanProvidePortal {

From 85fcbc117462bd1b9222c535c69e714b6e99c8ea Mon Sep 17 00:00:00 2001
From: Zsolt Kocsi <zsolt.kocsi@corp.badoo.com>
Date: Thu, 29 Aug 2019 16:14:26 +0100
Subject: [PATCH 07/17] Cleanup

---
 .../badoo/ribs/example/app/RootActivity.kt    | 42 ++++++++------
 .../com/badoo/ribs/example/rib/root/Root.kt   |  4 +-
 .../badoo/ribs/example/rib/root/RootRouter.kt |  9 +--
 .../example/rib/root/builder/RootModule.kt    | 16 +++---
 .../ribs/example/rib/small/SmallInteractor.kt |  4 +-
 .../example/rib/small/builder/SmallModule.kt  |  2 +-
 .../src/main/java/com/badoo/ribs/core/Node.kt |  8 +++
 .../ribs/core/routing/portal/AncestryInfo.kt  | 15 ++++-
 .../badoo/ribs/core/routing/portal/Portal.kt  | 20 ++++++-
 .../ribs/core/routing/portal/PortalBuilder.kt | 28 +++++++++
 .../core/routing/portal/PortalInteractor.kt   | 16 ++++++
 .../ribs/core/routing/portal/PortalNode.kt    | 29 ++++++++++
 .../ribs/core/routing/portal/PortalRouter.kt  | 57 +++++++++++++++++++
 .../ribs/customisation/CanProvidePortal.kt    |  2 +-
 14 files changed, 211 insertions(+), 41 deletions(-)
 create mode 100644 android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/PortalBuilder.kt
 create mode 100644 android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/PortalInteractor.kt
 create mode 100644 android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/PortalNode.kt
 create mode 100644 android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/PortalRouter.kt

diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/app/RootActivity.kt b/android/app-example/src/main/java/com/badoo/ribs/example/app/RootActivity.kt
index 6adacd365..01fdf7976 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/app/RootActivity.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/app/RootActivity.kt
@@ -1,27 +1,22 @@
 package com.badoo.ribs.example.app
 
-import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import android.view.ViewGroup
 import com.badoo.ribs.android.ActivityStarter
 import com.badoo.ribs.android.PermissionRequester
 import com.badoo.ribs.android.RibActivity
+import com.badoo.ribs.core.routing.action.AttachRibRoutingAction.Companion.attach
+import com.badoo.ribs.core.routing.action.RoutingAction
+import com.badoo.ribs.core.routing.portal.Portal
+import com.badoo.ribs.core.routing.portal.PortalBuilder
+import com.badoo.ribs.core.routing.portal.PortalNode
 import com.badoo.ribs.customisation.RibCustomisationDirectory
 import com.badoo.ribs.dialog.DialogLauncher
 import com.badoo.ribs.example.R
-import com.badoo.ribs.example.rib.hello_world.HelloWorld
-import com.badoo.ribs.example.rib.root.Root
-import com.badoo.ribs.example.rib.root.RootNode
-import com.badoo.ribs.example.rib.root.builder.RootBuilder
 import com.badoo.ribs.example.rib.switcher.Switcher
-import com.badoo.ribs.example.rib.switcher.SwitcherNode
 import com.badoo.ribs.example.rib.switcher.builder.SwitcherBuilder
 import com.badoo.ribs.example.util.CoffeeMachine
 import com.badoo.ribs.example.util.StupidCoffeeMachine
-import io.reactivex.Observable
-import io.reactivex.disposables.Disposable
-import io.reactivex.functions.BiFunction
 
 /** The sample app's single activity */
 class RootActivity : RibActivity() {
@@ -34,16 +29,27 @@ class RootActivity : RibActivity() {
     override val rootViewGroup: ViewGroup
         get() = findViewById(R.id.root)
 
-    private lateinit var workflowRoot: Root.Workflow
+    private lateinit var workflowRoot: Portal.Workflow
 
-    override fun createRib(savedInstanceState: Bundle?): RootNode =
-        RootBuilder(
-            object : Root.Dependency {
-                override fun ribCustomisation(): RibCustomisationDirectory = AppRibCustomisations
-                override fun activityStarter(): ActivityStarter = activityStarter
-                override fun permissionRequester(): PermissionRequester = permissionRequester
-                override fun dialogLauncher(): DialogLauncher = this@RootActivity
+    override fun createRib(savedInstanceState: Bundle?): PortalNode =
+        PortalBuilder(
+            object : Portal.Dependency {
+                override fun defaultRoutingAction(): (Portal.Sink) -> RoutingAction<Nothing> = { portal ->
+                    attach {
+                        SwitcherBuilder(
+                            object : Switcher.Dependency {
+                                override fun ribCustomisation(): RibCustomisationDirectory = AppRibCustomisations
+                                override fun activityStarter(): ActivityStarter = activityStarter
+                                override fun permissionRequester(): PermissionRequester = permissionRequester
+                                override fun dialogLauncher(): DialogLauncher = this@RootActivity
+                                override fun coffeeMachine(): CoffeeMachine = StupidCoffeeMachine()
+                                override fun portal(): Portal.Sink = portal
+                            }
+                        ).build(it)
+                    }
+                }
             }
+
         ).build(savedInstanceState).also {
             workflowRoot = it
         }
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/Root.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/Root.kt
index aa20ea7ac..5e170da0d 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/Root.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/Root.kt
@@ -3,6 +3,7 @@ package com.badoo.ribs.example.rib.root
 import com.badoo.ribs.android.CanProvideActivityStarter
 import com.badoo.ribs.android.CanProvidePermissionRequester
 import com.badoo.ribs.core.Rib
+import com.badoo.ribs.customisation.CanProvidePortal
 import com.badoo.ribs.customisation.CanProvideRibCustomisation
 import com.badoo.ribs.customisation.RibCustomisation
 import com.badoo.ribs.dialog.CanProvideDialogLauncher
@@ -17,7 +18,8 @@ interface Root : Rib {
         CanProvideActivityStarter,
         CanProvidePermissionRequester,
         CanProvideDialogLauncher,
-        CanProvideRibCustomisation
+        CanProvideRibCustomisation,
+        CanProvidePortal
 
     class Customisation(
 //        val viewFactory: RootView.Factory = RootViewImpl.Factory()
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt
index ca01f5189..85bed1399 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt
@@ -7,6 +7,7 @@ import com.badoo.ribs.core.routing.configuration.ConfigurationResolver
 import com.badoo.ribs.core.Router
 import com.badoo.ribs.core.routing.action.AttachRibRoutingAction.Companion.attach
 import com.badoo.ribs.core.routing.action.RoutingAction
+import com.badoo.ribs.core.routing.portal.AncestryInfo
 import com.badoo.ribs.core.view.RibView
 import com.badoo.ribs.example.rib.root.RootRouter.Configuration
 import com.badoo.ribs.example.rib.root.RootRouter.Configuration.Content
@@ -20,7 +21,7 @@ class RootRouter(
     savedInstanceState = savedInstanceState,
     initialConfiguration = Content.Default,
     permanentParts = emptyList()
-), Portal {
+) {
 
     sealed class Configuration : Parcelable {
         sealed class Content : Configuration() {
@@ -29,9 +30,9 @@ class RootRouter(
         }
     }
 
-    override fun push(configurationChain: List<Parcelable>) {
-        push(Content.Portal(configurationChain))
-    }
+//    override fun showRemote(ancestryInfo: AncestryInfo) {
+//        push(Content.Portal(ancestryInfo))
+//    }
 
     override fun resolveConfiguration(configuration: Configuration): RoutingAction<Nothing> =
         when (configuration) {
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootModule.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootModule.kt
index 3f3c8576e..a0280250a 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootModule.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootModule.kt
@@ -22,14 +22,14 @@ internal object RootModule {
 //    ): PortalFeature =
 //        PortalFeature(node)
 
-    @RootScope
-    @Provides
-    @JvmStatic
-    internal fun portal(
-//        interactor: RootInteractor
-        router: RootRouter
-    ): Portal =
-        router
+//    @RootScope
+//    @Provides
+//    @JvmStatic
+//    internal fun portal(
+////        interactor: RootInteractor
+//        router: RootRouter
+//    ): Portal =
+//        router
 
     @RootScope
     @Provides
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt
index 945128349..3756dd74d 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt
@@ -14,7 +14,7 @@ import com.badoo.ribs.example.rib.small.SmallView.ViewModel
 import io.reactivex.functions.Consumer
 
 class SmallInteractor(
-    portal: Portal,
+    portal: Portal.Sink,
     savedInstanceState: Bundle?,
     router: Router<Configuration, *, Content, Nothing, SmallView>
 ) : Interactor<Configuration, Content, Nothing, SmallView>(
@@ -31,7 +31,7 @@ class SmallInteractor(
 
     private val viewEventConsumer: Consumer<Event> = Consumer {
         when (it) {
-            Event.OpenBigClicked -> portal.push(router.node.ancestryInfo.configurationChain + FullScreen.ShowBig)
+            Event.OpenBigClicked -> portal.showRemote(router.node.ancestryInfo + FullScreen.ShowBig)
         }
     }
 }
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallModule.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallModule.kt
index 4d1e62249..e7f0e031f 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallModule.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallModule.kt
@@ -34,7 +34,7 @@ internal object SmallModule {
     internal fun interactor(
         savedInstanceState: Bundle?,
         router: SmallRouter,
-        portal: Portal
+        portal: Portal.Sink
     ): SmallInteractor =
         SmallInteractor(
             savedInstanceState = savedInstanceState,
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
index 8f38194a7..937fed190 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
@@ -85,6 +85,14 @@ open class Node<V : RibView>(
         internal const val KEY_VIEW_STATE = "view.state"
     }
 
+    /**
+     * FIXME the proper solution is to set this in constructor (pack it with savedInstanceState)
+     * If left like this, it's not guaranteed to be set correctly, and can lead to problems
+     * Proposed solution would mean passing Root only at integration point, Child is used automatically
+     * by building mechanism.
+     * Also PortalRouter.Configuration.Portal can then work directly with a @Parcelize AncestryInfo,
+     * which is not currently possible.
+     */
     var ancestryInfo: AncestryInfo = AncestryInfo.Root
     val resolver: ConfigurationResolver<*, V> = router
     private val savedInstanceState = savedInstanceState?.getBundle(BUNDLE_KEY)
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/AncestryInfo.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/AncestryInfo.kt
index b46d11558..133d42f42 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/AncestryInfo.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/AncestryInfo.kt
@@ -14,7 +14,7 @@ sealed class AncestryInfo {
      * Represents ancestry info of a [Node] that is a root of a tree and doesn't have any parents
      */
     object Root : AncestryInfo() {
-        override val configurationChain: List<Parcelable> = emptyList()
+        override var configurationChain: List<Parcelable> = emptyList()
     }
 
     /**
@@ -23,8 +23,8 @@ sealed class AncestryInfo {
     data class Child(
         /**
          * The virtual parent of the current [Node]. In most cases it is the same as the actual parent,
-         * however, it is different in the case of full screen [Portal]s: the actual parent is the
-         * portal host [Node], while the [anchor] refers to the [Node] that initiated building and adding
+         * however, it is different e.g. in the case of full screen [Portal]s: the actual parent is the
+         * portal host Node, while the anchor refers to the [Node] that initiated building and adding
          * the current one to the [Portal].
          */
         val anchor: Node<*>,
@@ -39,4 +39,13 @@ sealed class AncestryInfo {
         override val configurationChain: List<Parcelable>
             get() = anchor.ancestryInfo.configurationChain + creatorConfiguration
     }
+
+    class Derived(
+        override val configurationChain: List<Parcelable>
+    ) : AncestryInfo()
+
+    infix operator fun plus(configuration: Parcelable): AncestryInfo =
+        Derived(
+            this.configurationChain + configuration
+        )
 }
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/Portal.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/Portal.kt
index 307e196ca..a8cf166e6 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/Portal.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/Portal.kt
@@ -1,8 +1,22 @@
 package com.badoo.ribs.core.routing.portal
 
-import android.os.Parcelable
+import com.badoo.ribs.core.Node
+import com.badoo.ribs.core.Rib
+import com.badoo.ribs.core.routing.action.RoutingAction
+import io.reactivex.Single
 
-interface Portal {
+interface Portal : Rib {
 
-    fun push(configurationChain: List<Parcelable>)
+    interface Sink {
+        fun showRemote(ancestryInfo: AncestryInfo)
+    }
+
+    interface Dependency {
+        fun defaultRoutingAction(): (Portal.Sink) -> RoutingAction<Nothing>
+    }
+
+    interface Workflow {
+        fun showDefault(): Single<Node<*>>
+        fun showInPortal(ancestryInfo: AncestryInfo): Single<Node<*>>
+    }
 }
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/PortalBuilder.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/PortalBuilder.kt
new file mode 100644
index 000000000..2b64589e1
--- /dev/null
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/PortalBuilder.kt
@@ -0,0 +1,28 @@
+package com.badoo.ribs.core.routing.portal
+
+import android.os.Bundle
+import com.badoo.ribs.core.Builder
+
+class PortalBuilder(
+    override val dependency: Portal.Dependency
+) : Builder<Portal.Dependency>() {
+
+    fun build(savedInstanceState: Bundle?): PortalNode {
+        val router = PortalRouter(
+            savedInstanceState = savedInstanceState
+        )
+
+        router.defaultRoutingAction = dependency.defaultRoutingAction().invoke(router)
+
+        val interactor = PortalInteractor(
+            savedInstanceState = savedInstanceState,
+            router = router
+        )
+
+        return PortalNode(
+            savedInstanceState = savedInstanceState,
+            router = router,
+            interactor = interactor
+        )
+    }
+}
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/PortalInteractor.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/PortalInteractor.kt
new file mode 100644
index 000000000..87b4d0f89
--- /dev/null
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/PortalInteractor.kt
@@ -0,0 +1,16 @@
+package com.badoo.ribs.core.routing.portal
+
+import android.os.Bundle
+import com.badoo.ribs.core.Interactor
+import com.badoo.ribs.core.Router
+import com.badoo.ribs.core.routing.portal.PortalRouter.Configuration
+import com.badoo.ribs.core.routing.portal.PortalRouter.Configuration.Content
+
+internal class PortalInteractor(
+    savedInstanceState: Bundle?,
+    router: Router<Configuration, *, Content, Nothing, Nothing>
+) : Interactor<Configuration, Content, Nothing, Nothing>(
+    savedInstanceState = savedInstanceState,
+    router = router,
+    disposables = null
+)
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/PortalNode.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/PortalNode.kt
new file mode 100644
index 000000000..b47048dcd
--- /dev/null
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/PortalNode.kt
@@ -0,0 +1,29 @@
+package com.badoo.ribs.core.routing.portal
+
+import android.os.Bundle
+import com.badoo.ribs.core.Node
+import com.badoo.ribs.core.routing.portal.PortalRouter.Configuration.Content
+import io.reactivex.Single
+
+class PortalNode internal constructor(
+    savedInstanceState: Bundle?,
+    private val router: PortalRouter,
+    interactor: PortalInteractor
+) : Node<Nothing>(
+    savedInstanceState = savedInstanceState,
+    identifier = object : Portal {},
+    viewFactory = null,
+    router = router,
+    interactor = interactor
+), Portal.Workflow {
+
+    override fun showDefault(): Single<Node<*>> =
+        attachWorkflow {
+            router.push(Content.Default)
+        }
+
+    override fun showInPortal(ancestryInfo: AncestryInfo): Single<Node<*>> =
+        attachWorkflow {
+            router.push(Content.Portal(ancestryInfo.configurationChain))
+        }
+}
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/PortalRouter.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/PortalRouter.kt
new file mode 100644
index 000000000..b5c7ba7a8
--- /dev/null
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/PortalRouter.kt
@@ -0,0 +1,57 @@
+package com.badoo.ribs.core.routing.portal
+
+import android.os.Bundle
+import android.os.Parcelable
+import com.badoo.ribs.core.Router
+import com.badoo.ribs.core.routing.action.RoutingAction
+import com.badoo.ribs.core.routing.configuration.ConfigurationResolver
+import com.badoo.ribs.core.routing.portal.PortalRouter.Configuration
+import com.badoo.ribs.core.routing.portal.PortalRouter.Configuration.Content
+import com.badoo.ribs.core.view.RibView
+import kotlinx.android.parcel.Parcelize
+
+class PortalRouter(
+    savedInstanceState: Bundle?
+): Router<Configuration, Nothing, Content, Nothing, Nothing>(
+    savedInstanceState = savedInstanceState,
+    initialConfiguration = Content.Default,
+    permanentParts = emptyList()
+), Portal.Sink {
+
+    internal lateinit var defaultRoutingAction: RoutingAction<Nothing>
+
+    sealed class Configuration : Parcelable {
+        sealed class Content : Configuration() {
+            @Parcelize object Default : Content()
+            @Parcelize data class Portal(val configurationChain: List<Parcelable>) : Content()
+        }
+    }
+
+    override fun showRemote(ancestryInfo: AncestryInfo) {
+        push(Content.Portal(ancestryInfo.configurationChain))
+    }
+
+    override fun resolveConfiguration(configuration: Configuration): RoutingAction<Nothing> =
+        when (configuration) {
+            is Content.Default -> defaultRoutingAction
+            is Content.Portal -> configuration.configurationChain.resolve() as RoutingAction<Nothing>
+        }
+
+    private fun List<Parcelable>.resolve(): RoutingAction<out RibView> {
+        // FIXME grab first from real root somehow (makeRoot method called by RibActivity?):
+        var targetRouter: ConfigurationResolver<Parcelable, *> =
+            this@PortalRouter as ConfigurationResolver<Parcelable, *>
+        var routingAction: RoutingAction<out RibView> =
+            targetRouter.resolveConfiguration(first())
+
+        drop(1).forEach { element ->
+            // FIXME don't build it again if already available as child
+            val nodes = routingAction.buildNodes(emptyList()) // FIXME bundle
+            val node = nodes.first() // FIXME if 0 or more than 1
+            targetRouter = node.node.resolver as ConfigurationResolver<Parcelable, *>
+            routingAction = targetRouter.resolveConfiguration(element)
+        }
+
+        return routingAction
+    }
+}
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/customisation/CanProvidePortal.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/customisation/CanProvidePortal.kt
index faf832b38..33cfeb24c 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/customisation/CanProvidePortal.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/customisation/CanProvidePortal.kt
@@ -4,5 +4,5 @@ import com.badoo.ribs.core.routing.portal.Portal
 
 
 interface CanProvidePortal {
-    fun portal(): Portal
+    fun portal(): Portal.Sink
 }

From a0544519fcab95abe03f7c00b091cbd4faed64f7 Mon Sep 17 00:00:00 2001
From: Zsolt Kocsi <zsolt.kocsi@corp.badoo.com>
Date: Thu, 29 Aug 2019 16:14:52 +0100
Subject: [PATCH 08/17] Cleanup

---
 .../com/badoo/ribs/example/rib/root/Root.kt   | 31 --------
 .../ribs/example/rib/root/RootInteractor.kt   | 47 -----------
 .../badoo/ribs/example/rib/root/RootNode.kt   | 31 --------
 .../badoo/ribs/example/rib/root/RootRouter.kt | 60 --------------
 .../badoo/ribs/example/rib/root/RootView.kt   | 56 -------------
 .../example/rib/root/builder/RootBuilder.kt   | 27 -------
 .../example/rib/root/builder/RootComponent.kt | 26 ------
 .../example/rib/root/builder/RootModule.kt    | 79 -------------------
 .../example/rib/root/builder/RootScope.kt     |  7 --
 9 files changed, 364 deletions(-)
 delete mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/root/Root.kt
 delete mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootInteractor.kt
 delete mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootNode.kt
 delete mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt
 delete mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootView.kt
 delete mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootBuilder.kt
 delete mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootComponent.kt
 delete mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootModule.kt
 delete mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootScope.kt

diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/Root.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/Root.kt
deleted file mode 100644
index 5e170da0d..000000000
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/Root.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.badoo.ribs.example.rib.root
-
-import com.badoo.ribs.android.CanProvideActivityStarter
-import com.badoo.ribs.android.CanProvidePermissionRequester
-import com.badoo.ribs.core.Rib
-import com.badoo.ribs.customisation.CanProvidePortal
-import com.badoo.ribs.customisation.CanProvideRibCustomisation
-import com.badoo.ribs.customisation.RibCustomisation
-import com.badoo.ribs.dialog.CanProvideDialogLauncher
-import com.badoo.ribs.example.rib.switcher.Switcher
-import io.reactivex.ObservableSource
-import io.reactivex.Single
-import io.reactivex.functions.Consumer
-
-interface Root : Rib {
-
-    interface Dependency :
-        CanProvideActivityStarter,
-        CanProvidePermissionRequester,
-        CanProvideDialogLauncher,
-        CanProvideRibCustomisation,
-        CanProvidePortal
-
-    class Customisation(
-//        val viewFactory: RootView.Factory = RootViewImpl.Factory()
-    ) : RibCustomisation
-
-    interface Workflow {
-        fun goToSwitcher(): Single<Switcher.Workflow>
-    }
-}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootInteractor.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootInteractor.kt
deleted file mode 100644
index 1c638665d..000000000
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootInteractor.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.badoo.ribs.example.rib.root
-
-import android.os.Bundle
-import com.badoo.ribs.core.Interactor
-//import com.badoo.ribs.core.routing.portal.Portal.Source.Model.*
-import com.badoo.ribs.core.Router
-import com.badoo.ribs.example.rib.root.RootRouter.Configuration
-import com.badoo.ribs.example.rib.root.RootRouter.Configuration.Content
-
-class RootInteractor(
-    savedInstanceState: Bundle?,
-    router: Router<Configuration, *, Content, Nothing, Nothing>
-//    private val portal: PortalFeature
-) : Interactor<Configuration, Content, Nothing, Nothing>(
-    savedInstanceState = savedInstanceState,
-    router = router,
-    disposables = null
-//), Portal.Sink {
-) {
-
-//    override fun accept(command: Portal.Sink.Command) {
-//        when (command) {
-//            is Portal.Sink.Command.Add -> router.push(Content.Portal(command.node))
-//            is Portal.Sink.Command.Remove -> router.popBackStack()
-//        }
-//    }
-
-//    override fun onAttach(ribLifecycle: Lifecycle, savedInstanceState: Bundle?) {
-//        ribLifecycle.createDestroy {
-//            bind(portal.models to portalModelConsumer)
-//        }
-//    }
-
-//    override fun onViewCreated(view: RootView, viewLifecycle: Lifecycle) {
-//        viewLifecycle.createDestroy {
-////            bind(portal.models to view.portalRenderer)
-//            bind(portal.models to view)
-//        }
-//    }
-
-//    private val portalModelConsumer: Consumer<Portal.Source.Model> = Consumer {
-//        when (it) {
-//            is Empty -> router.newRoot(Content.Default) // TODO pop should work just fine, but this is safer for now
-//            is Showing -> router.push(Content.Portal)
-//        }
-//    }
-}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootNode.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootNode.kt
deleted file mode 100644
index feb138ca8..000000000
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootNode.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.badoo.ribs.example.rib.root
-
-import android.os.Bundle
-import android.view.ViewGroup
-import com.badoo.ribs.core.Node
-import com.badoo.ribs.example.rib.root.RootRouter.Configuration.Content
-import com.badoo.ribs.example.rib.switcher.Switcher
-import io.reactivex.Single
-
-class RootNode(
-    savedInstanceState: Bundle?,
-    viewFactory: ((ViewGroup) -> Nothing?)?,
-    private val router: RootRouter,
-    private val interactor: RootInteractor
-) : Node<Nothing>(
-    savedInstanceState = savedInstanceState,
-    identifier = object : Root {},
-    viewFactory = viewFactory,
-    router = router,
-    interactor = interactor
-), Root.Workflow {
-
-    override fun detachFromView() {
-        super.detachFromView()
-    }
-
-    override fun goToSwitcher(): Single<Switcher.Workflow> =
-        attachWorkflow {
-            router.newRoot(Content.Default) // TODO consider this
-        }
-}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt
deleted file mode 100644
index 85bed1399..000000000
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootRouter.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.badoo.ribs.example.rib.root
-
-import android.os.Bundle
-import android.os.Parcelable
-import com.badoo.ribs.core.routing.portal.Portal
-import com.badoo.ribs.core.routing.configuration.ConfigurationResolver
-import com.badoo.ribs.core.Router
-import com.badoo.ribs.core.routing.action.AttachRibRoutingAction.Companion.attach
-import com.badoo.ribs.core.routing.action.RoutingAction
-import com.badoo.ribs.core.routing.portal.AncestryInfo
-import com.badoo.ribs.core.view.RibView
-import com.badoo.ribs.example.rib.root.RootRouter.Configuration
-import com.badoo.ribs.example.rib.root.RootRouter.Configuration.Content
-import com.badoo.ribs.example.rib.switcher.builder.SwitcherBuilder
-import kotlinx.android.parcel.Parcelize
-
-class RootRouter(
-    savedInstanceState: Bundle?,
-    private val switcherBuilder: SwitcherBuilder
-): Router<Configuration, Nothing, Content, Nothing, Nothing>(
-    savedInstanceState = savedInstanceState,
-    initialConfiguration = Content.Default,
-    permanentParts = emptyList()
-) {
-
-    sealed class Configuration : Parcelable {
-        sealed class Content : Configuration() {
-            @Parcelize object Default : Content()
-            @Parcelize data class Portal(val resolverChain: List<Parcelable>) : Content()
-        }
-    }
-
-//    override fun showRemote(ancestryInfo: AncestryInfo) {
-//        push(Content.Portal(ancestryInfo))
-//    }
-
-    override fun resolveConfiguration(configuration: Configuration): RoutingAction<Nothing> =
-        when (configuration) {
-            is Content.Default -> attach { switcherBuilder.build(it) }
-            is Content.Portal -> configuration.resolverChain.resolve() as RoutingAction<Nothing>
-        }
-
-    private fun <E : Parcelable> List<E>.resolve(): RoutingAction<out RibView> {
-        // FIXME grab first from real root somehow (makeRoot method called by RibActivity?):
-        var targetRouter: ConfigurationResolver<Parcelable, *> = this@RootRouter as ConfigurationResolver<Parcelable, *>
-        var routingAction: RoutingAction<out RibView> = targetRouter.resolveConfiguration(first()) // FIXME make first() safe to call
-
-        drop(1).forEach { element ->
-            // FIXME don't build it again if already available as child
-            val nodes = routingAction.buildNodes(emptyList()) // FIXME bundle
-            val node = nodes.first() // FIXME if 0 or more than 1
-            targetRouter = node.node.resolver as ConfigurationResolver<Parcelable, *>
-            routingAction = targetRouter.resolveConfiguration(element)
-        }
-
-        return routingAction
-    }
-
-}
-
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootView.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootView.kt
deleted file mode 100644
index e767c99a3..000000000
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/RootView.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.badoo.ribs.example.rib.root
-
-//import com.badoo.ribs.android.AndroidPortalRenderer
-//import com.badoo.ribs.example.rib.root.RootView.Event
-
-//interface RootView : RibView,
-//    ObservableSource<Event>
-////    ,
-////    Portal.Renderer
-//{
-////    ,
-////    Consumer<ViewModel> {
-//
-//    sealed class Event
-//
-////    data class ViewModel(
-////        val i: Int = 0
-////    )
-//
-//    interface Factory : ViewFactory<Nothing?, RootView>
-//
-////    val portalRenderer: Portal.Renderer
-//}
-//
-//
-//class RootViewImpl private constructor(
-//    override val androidView: ViewGroup,
-//    private val events: PublishRelay<Event> = PublishRelay.create()
-//) : RootView,
-//    ObservableSource<Event> by events
-////    ,
-////    Portal.Renderer
-//{
-////    Consumer<ViewModel> {
-//
-////    class Factory(
-////        @LayoutRes private val layoutRes: Int = R.layout.rib_root
-////    ) : RootView.Factory {
-////        override fun invoke(deps: Nothing?): (ViewGroup) -> Nothing = {
-////            RootViewImpl(
-////                com.badoo.ribs.customisation.inflate(it, layoutRes)
-////            )
-////        }
-////    }
-//
-////    override val portalRenderer: Portal.Renderer = object : Portal.Renderer {
-////        override fun accept(model: Portal.Source.Model) {
-////            if (model is Portal.Source.Model.Showing) {
-////                model.node.attachToView(androidView)
-////            }
-////        }
-////    }
-//
-////    override fun accept(vm: RootView.ViewModel) {
-////    }
-//}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootBuilder.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootBuilder.kt
deleted file mode 100644
index c47530491..000000000
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootBuilder.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.badoo.ribs.example.rib.root.builder
-
-import android.os.Bundle
-import com.badoo.ribs.core.Builder
-import com.badoo.ribs.customisation.customisationsBranchFor
-import com.badoo.ribs.customisation.getOrDefault
-import com.badoo.ribs.example.rib.root.Root
-import com.badoo.ribs.example.rib.root.RootNode
-
-class RootBuilder(
-    dependency: Root.Dependency
-) : Builder<Root.Dependency>() {
-
-    override val dependency : Root.Dependency = object : Root.Dependency by dependency {
-        override fun ribCustomisation() = dependency.customisationsBranchFor(Root::class)
-    }
-
-    fun build(savedInstanceState: Bundle?): RootNode =
-        DaggerRootComponent
-            .factory()
-            .create(
-                dependency = dependency,
-                customisation = dependency.getOrDefault(Root.Customisation()),
-                savedInstanceState = savedInstanceState
-            )
-            .node()
-}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootComponent.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootComponent.kt
deleted file mode 100644
index 7dfa92a65..000000000
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootComponent.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.badoo.ribs.example.rib.root.builder
-
-import android.os.Bundle
-import com.badoo.ribs.example.rib.root.Root
-import com.badoo.ribs.example.rib.root.RootNode
-import com.badoo.ribs.example.rib.switcher.Switcher
-import dagger.BindsInstance
-
-@RootScope
-@dagger.Component(
-    modules = [RootModule::class],
-    dependencies = [Root.Dependency::class]
-)
-internal interface RootComponent : Switcher.Dependency {
-
-    @dagger.Component.Factory
-    interface Factory {
-        fun create(
-            dependency: Root.Dependency,
-            @BindsInstance customisation: Root.Customisation,
-            @BindsInstance savedInstanceState: Bundle?
-        ): RootComponent
-    }
-
-    fun node(): RootNode
-}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootModule.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootModule.kt
deleted file mode 100644
index a0280250a..000000000
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootModule.kt
+++ /dev/null
@@ -1,79 +0,0 @@
-@file:SuppressWarnings("LongParameterList", "LongMethod")
-package com.badoo.ribs.example.rib.root.builder
-
-import android.os.Bundle
-import com.badoo.ribs.core.routing.portal.Portal
-import com.badoo.ribs.example.rib.root.RootInteractor
-import com.badoo.ribs.example.rib.root.RootNode
-import com.badoo.ribs.example.rib.root.RootRouter
-import com.badoo.ribs.example.rib.switcher.builder.SwitcherBuilder
-import com.badoo.ribs.example.util.CoffeeMachine
-import com.badoo.ribs.example.util.StupidCoffeeMachine
-import dagger.Provides
-
-@dagger.Module
-internal object RootModule {
-
-//    @RootScope
-//    @Provides
-//    @JvmStatic
-//    internal fun portalFeature(
-//        node: Provider<RootNode>
-//    ): PortalFeature =
-//        PortalFeature(node)
-
-//    @RootScope
-//    @Provides
-//    @JvmStatic
-//    internal fun portal(
-////        interactor: RootInteractor
-//        router: RootRouter
-//    ): Portal =
-//        router
-
-    @RootScope
-    @Provides
-    @JvmStatic
-    internal fun router(
-        // pass component to child rib builders, or remove if there are none
-        component: RootComponent,
-        savedInstanceState: Bundle?
-    ): RootRouter =
-        RootRouter(
-            savedInstanceState = savedInstanceState,
-            switcherBuilder = SwitcherBuilder(component)
-        )
-
-    @RootScope
-    @Provides
-    @JvmStatic
-    internal fun interactor(
-        savedInstanceState: Bundle?,
-        router: RootRouter
-    ): RootInteractor =
-        RootInteractor(
-            savedInstanceState = savedInstanceState,
-            router = router
-        )
-
-    @RootScope
-    @Provides
-    @JvmStatic
-    internal fun node(
-        savedInstanceState: Bundle?,
-//        customisation: Root.Customisation,
-        router: RootRouter,
-        interactor: RootInteractor
-    ) : RootNode = RootNode(
-        savedInstanceState = savedInstanceState,
-        viewFactory = null, // customisation.viewFactory(null),
-        router = router,
-        interactor = interactor
-    )
-
-    @RootScope
-    @Provides
-    @JvmStatic
-    internal fun coffeeMachine(): CoffeeMachine =
-        StupidCoffeeMachine()
-}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootScope.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootScope.kt
deleted file mode 100644
index 5902bf030..000000000
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/root/builder/RootScope.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.badoo.ribs.example.rib.root.builder
-
-import javax.inject.Scope
-
-@Scope
-@Retention(AnnotationRetention.RUNTIME)
-internal annotation class RootScope

From 721b838ec598274b679cd4cf572cd024ce3f45b4 Mon Sep 17 00:00:00 2001
From: Zsolt Kocsi <zsolt.kocsi@corp.badoo.com>
Date: Thu, 29 Aug 2019 16:48:31 +0100
Subject: [PATCH 09/17] Cleanup

---
 .../badoo/ribs/example/rib/root/RootTest.kt   | 30 ---------
 .../badoo/ribs/example/app/RootActivity.kt    | 33 +++++----
 .../com/badoo/ribs/example/rib/big/Big.kt     |  3 -
 .../ribs/example/rib/small/SmallInteractor.kt |  4 +-
 .../example/rib/small/builder/SmallModule.kt  |  4 +-
 .../rib/switcher/SwitcherInteractor.kt        | 13 ----
 .../ribs/example/rib/switcher/SwitcherNode.kt |  4 --
 .../rib/switcher/feature/PortalFeature.kt     | 67 -------------------
 .../src/main/res/layout/rib_root.xml          |  6 --
 .../src/main/res/layout/rib_switcher.xml      |  1 -
 .../example/rib/root/RootInteractorTest.kt    | 41 ------------
 .../ribs/example/rib/root/RootRouterTest.kt   | 35 ----------
 .../ribs/example/rib/root/RootWorkflowTest.kt | 56 ----------------
 .../ribs/android/AndroidPortalRenderer.kt     | 23 -------
 .../java/com/badoo/ribs/android/ViewStack.kt  | 30 ---------
 .../com/badoo/ribs/core/LifecycleParent.kt    | 13 ----
 .../src/main/java/com/badoo/ribs/core/Node.kt |  5 +-
 .../main/java/com/badoo/ribs/core/Router.kt   |  2 +-
 .../routing/action/CompositeRoutingAction.kt  |  8 +--
 .../routing/action/DialogRoutingAction.kt     |  4 +-
 .../core/routing/action/InvokeOnCleanUp.kt    |  3 +-
 .../core/routing/action/InvokeOnExecute.kt    |  3 +-
 .../ribs/core/routing/action/RoutingAction.kt | 15 +----
 .../configuration/ConfigurationContext.kt     |  2 -
 .../action/single/ActivateAction.kt           |  3 +-
 .../configuration/action/single/AddAction.kt  |  2 -
 .../action/single/DeactivateAction.kt         |  3 +-
 .../action/single/RemoveAction.kt             |  1 -
 .../ribs/core/routing/portal/AncestryInfo.kt  |  9 ---
 .../badoo/ribs/core/routing/portal/Portal.kt  |  8 ++-
 .../ribs/core/routing/portal/PortalRouter.kt  | 14 ++--
 .../ribs/customisation/CanProvidePortal.kt    |  2 +-
 .../configuration/ConfigurationFeatureTest.kt | 34 +++++-----
 33 files changed, 67 insertions(+), 414 deletions(-)
 delete mode 100644 android/app-example/src/androidTest/java/com/badoo/ribs/example/rib/root/RootTest.kt
 delete mode 100644 android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/feature/PortalFeature.kt
 delete mode 100644 android/app-example/src/main/res/layout/rib_root.xml
 delete mode 100644 android/app-example/src/test/java/com/badoo/ribs/example/rib/root/RootInteractorTest.kt
 delete mode 100644 android/app-example/src/test/java/com/badoo/ribs/example/rib/root/RootRouterTest.kt
 delete mode 100644 android/app-example/src/test/java/com/badoo/ribs/example/rib/root/RootWorkflowTest.kt
 delete mode 100644 android/libraries/rib-base/src/main/java/com/badoo/ribs/android/AndroidPortalRenderer.kt
 delete mode 100644 android/libraries/rib-base/src/main/java/com/badoo/ribs/android/ViewStack.kt
 delete mode 100644 android/libraries/rib-base/src/main/java/com/badoo/ribs/core/LifecycleParent.kt

diff --git a/android/app-example/src/androidTest/java/com/badoo/ribs/example/rib/root/RootTest.kt b/android/app-example/src/androidTest/java/com/badoo/ribs/example/rib/root/RootTest.kt
deleted file mode 100644
index 2fe38a0ac..000000000
--- a/android/app-example/src/androidTest/java/com/badoo/ribs/example/rib/root/RootTest.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.badoo.ribs.example.rib.root
-
-import android.os.Bundle
-import com.badoo.common.ribs.RibsRule
-import com.badoo.ribs.RibTestActivity
-import com.badoo.ribs.customisation.RibCustomisationDirectory
-import com.badoo.ribs.example.rib.root.builder.RootBuilder
-import io.reactivex.Observable.empty
-import io.reactivex.ObservableSource
-import io.reactivex.functions.Consumer
-import org.junit.Rule
-import org.junit.Test
-
-class RootTest {
-
-    @get:Rule
-    val ribsRule = RibsRule { activity, savedInstanceState -> buildRib(activity, savedInstanceState) }
-
-    private fun buildRib(ribTestActivity: RibTestActivity, savedInstanceState: Bundle?) =
-        RootBuilder(object : Root.Dependency {
-            override fun rootInput(): ObservableSource<Root.Input> = empty()
-            override fun rootOutput(): Consumer<Root.Output> = Consumer {}
-            override fun ribCustomisation(): RibCustomisationDirectory = TODO()
-        }).build(savedInstanceState)
-
-    @Test
-    fun testTextDisplayed() {
-        TODO("Write UI tests")
-    }
-}
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/app/RootActivity.kt b/android/app-example/src/main/java/com/badoo/ribs/example/app/RootActivity.kt
index 01fdf7976..780ea50a1 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/app/RootActivity.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/app/RootActivity.kt
@@ -14,6 +14,7 @@ import com.badoo.ribs.customisation.RibCustomisationDirectory
 import com.badoo.ribs.dialog.DialogLauncher
 import com.badoo.ribs.example.R
 import com.badoo.ribs.example.rib.switcher.Switcher
+import com.badoo.ribs.example.rib.switcher.SwitcherNode
 import com.badoo.ribs.example.rib.switcher.builder.SwitcherBuilder
 import com.badoo.ribs.example.util.CoffeeMachine
 import com.badoo.ribs.example.util.StupidCoffeeMachine
@@ -34,19 +35,25 @@ class RootActivity : RibActivity() {
     override fun createRib(savedInstanceState: Bundle?): PortalNode =
         PortalBuilder(
             object : Portal.Dependency {
-                override fun defaultRoutingAction(): (Portal.Sink) -> RoutingAction<Nothing> = { portal ->
-                    attach {
-                        SwitcherBuilder(
-                            object : Switcher.Dependency {
-                                override fun ribCustomisation(): RibCustomisationDirectory = AppRibCustomisations
-                                override fun activityStarter(): ActivityStarter = activityStarter
-                                override fun permissionRequester(): PermissionRequester = permissionRequester
-                                override fun dialogLauncher(): DialogLauncher = this@RootActivity
-                                override fun coffeeMachine(): CoffeeMachine = StupidCoffeeMachine()
-                                override fun portal(): Portal.Sink = portal
-                            }
-                        ).build(it)
-                    }
+                override fun defaultRoutingAction(): (Portal.OtherSide) -> RoutingAction<Nothing> = { portal ->
+                    attach { buildSwitcherNode(portal, it) }
+                }
+
+                private fun buildSwitcherNode(portal: Portal.OtherSide, savedInstanceState: Bundle?): SwitcherNode {
+                    return SwitcherBuilder(
+                        object : Switcher.Dependency {
+                            override fun ribCustomisation(): RibCustomisationDirectory =
+                                AppRibCustomisations
+
+                            override fun activityStarter(): ActivityStarter = activityStarter
+                            override fun permissionRequester(): PermissionRequester =
+                                permissionRequester
+
+                            override fun dialogLauncher(): DialogLauncher = this@RootActivity
+                            override fun coffeeMachine(): CoffeeMachine = StupidCoffeeMachine()
+                            override fun portal(): Portal.OtherSide = portal
+                        }
+                    ).build(savedInstanceState)
                 }
             }
 
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/Big.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/Big.kt
index 59762c804..6edf1bcac 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/Big.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/Big.kt
@@ -4,9 +4,6 @@ import com.badoo.ribs.core.Rib
 import com.badoo.ribs.customisation.CanProvidePortal
 import com.badoo.ribs.customisation.CanProvideRibCustomisation
 import com.badoo.ribs.customisation.RibCustomisation
-import io.reactivex.ObservableSource
-import io.reactivex.Single
-import io.reactivex.functions.Consumer
 
 interface Big : Rib {
 
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt
index 3756dd74d..69a2839b8 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt
@@ -14,7 +14,7 @@ import com.badoo.ribs.example.rib.small.SmallView.ViewModel
 import io.reactivex.functions.Consumer
 
 class SmallInteractor(
-    portal: Portal.Sink,
+    portal: Portal.OtherSide,
     savedInstanceState: Bundle?,
     router: Router<Configuration, *, Content, Nothing, SmallView>
 ) : Interactor<Configuration, Content, Nothing, SmallView>(
@@ -31,7 +31,7 @@ class SmallInteractor(
 
     private val viewEventConsumer: Consumer<Event> = Consumer {
         when (it) {
-            Event.OpenBigClicked -> portal.showRemote(router.node.ancestryInfo + FullScreen.ShowBig)
+            Event.OpenBigClicked -> portal.showRemote(router, FullScreen.ShowBig)
         }
     }
 }
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallModule.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallModule.kt
index e7f0e031f..adec185b1 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallModule.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/builder/SmallModule.kt
@@ -20,11 +20,9 @@ internal object SmallModule {
         // pass component to child rib builders, or remove if there are none
         component: SmallComponent,
         savedInstanceState: Bundle?
-//        portal: Portal.Sink
     ): SmallRouter =
         SmallRouter(
             savedInstanceState = savedInstanceState,
-//            portal = portal,
             bigBuilder = BigBuilder(component)
         )
 
@@ -34,7 +32,7 @@ internal object SmallModule {
     internal fun interactor(
         savedInstanceState: Bundle?,
         router: SmallRouter,
-        portal: Portal.Sink
+        portal: Portal.OtherSide
     ): SmallInteractor =
         SmallInteractor(
             savedInstanceState = savedInstanceState,
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherInteractor.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherInteractor.kt
index 69e220b02..e64d0a460 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherInteractor.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherInteractor.kt
@@ -15,18 +15,14 @@ import com.badoo.ribs.example.rib.switcher.SwitcherView.Event
 import com.badoo.ribs.example.rib.switcher.dialog.DialogToTestOverlay
 import io.reactivex.functions.Consumer
 import android.os.Bundle
-//import com.badoo.ribs.example.rib.switcher.feature.PortalFeature
 
 class SwitcherInteractor(
     savedInstanceState: Bundle?,
     router: Router<Configuration, Permanent, Content, Overlay, SwitcherView>,
     private val dialogToTestOverlay: DialogToTestOverlay
-//    ,
-//    private val portal: PortalFeature
 ) : Interactor<Configuration, Content, Overlay, SwitcherView>(
     savedInstanceState = savedInstanceState,
     router = router,
-//    disposables = portal
     disposables = null
 ) {
 
@@ -35,18 +31,9 @@ class SwitcherInteractor(
         viewLifecycle.createDestroy {
             bind(view to viewEventConsumer)
             bind(dialogToTestOverlay to dialogEventConsumer)
-//            bind(portal.models to view.portalRenderer)
-//            bind(portal.news to portalNewsConsumer)
         }
     }
 
-//    private val portalNewsConsumer: Consumer<PortalFeature.News> = Consumer {
-//        when (it) {
-//            is PortalFeature.News.Activated -> TODO() // bind lifecycle to Node
-//            is PortalFeature.News.Deactivated -> TODO() // bind lifecycle to Node
-//        }
-//    }
-
     internal inner class MenuListener : Consumer<Menu.Output> {
         override fun accept(output: Menu.Output) = when (output) {
             is Menu.Output.MenuItemSelected -> when (output.menuItem) {
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherNode.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherNode.kt
index a7c7159de..92b9a8e3e 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherNode.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/SwitcherNode.kt
@@ -46,8 +46,4 @@ class SwitcherNode(
             // push wish to feature
             Log.d("WORKFLOW", "Switcher / doSomethingAndStayOnThisNode")
         }
-
-    override fun detachFromView() {
-        super.detachFromView()
-    }
 }
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/feature/PortalFeature.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/feature/PortalFeature.kt
deleted file mode 100644
index e90ae4ba2..000000000
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/switcher/feature/PortalFeature.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.badoo.ribs.example.rib.switcher.feature
-
-//import com.badoo.ribs.core.LifecycleParent
-//import com.badoo.ribs.core.routing.portal.Portal.Sink.Command
-//import com.badoo.ribs.core.routing.portal.Portal.Sink.Command.Add
-//import com.badoo.ribs.core.routing.portal.Portal.Sink.Command.Remove
-//import com.badoo.ribs.core.routing.portal.Portal.Source.Model
-//import com.badoo.ribs.core.routing.portal.Portal.Source.Model.Showing
-//import com.badoo.ribs.example.rib.switcher.feature.PortalFeature.Effect
-//import com.badoo.ribs.example.rib.switcher.feature.PortalFeature.Effect.Added
-//import com.badoo.ribs.example.rib.switcher.feature.PortalFeature.Effect.Removed
-//import com.badoo.ribs.example.rib.switcher.feature.PortalFeature.State
-
-// FIXME move somewhere else
-//class PortalFeature(
-//    lifecycleParent: Provider<out LifecycleParent>
-//): ActorReducerFeature<Command, Effect, State, Nothing>(
-//    initialState = State(),
-//    actor = ActorImpl(lifecycleParent),
-//    reducer = ReducerImpl()
-//), Portal.Sink, Portal.Source {
-//
-//    data class State(
-//        val nodes: List<Node<*>> = emptyList()
-//    )
-//
-//    sealed class Effect {
-//        data class Added(val node: Node<*>) : Effect()
-//        data class Removed(val node: Node<*>) : Effect()
-//    }
-//
-//    class ActorImpl(
-//        private val lifecycleParent: Provider<out LifecycleParent>
-//    ) : Actor<State, Command, Effect> {
-//        override fun invoke(state: State, command: Command): Observable<out Effect> = when (command) {
-//            is Add -> if (state.nodes.contains(command.node)) empty() else
-//                just(Added(command.node)).doOnNext {
-//                    state.nodes.lastOrNull()?.let {
-//                        it.detachFromView()
-//                        lifecycleParent.get().removeManaged(it)
-//                    }
-//                    lifecycleParent.get().addManaged(it.node)
-//                }
-//
-//            is Remove -> if (!state.nodes.contains(command.node)) empty() else
-//                just(Removed(command.node)).doOnNext {
-//                    it.node.detachFromView()
-//                    lifecycleParent.get().removeManaged(it.node)
-//                }
-//        }
-//    }
-//
-//    class ReducerImpl : Reducer<State, Effect> {
-//        override fun invoke(state: State, effect: Effect): State = when (effect) {
-//            is Added -> state.copy(nodes = state.nodes + effect.node)
-//            is Removed -> state.copy(nodes = state.nodes - effect.node)
-//        }
-//    }
-//
-//    override val models: ObservableSource<Model>
-//        get() = Observable.wrap(this).map {
-//            when {
-//                it.nodes.isEmpty() -> Model.Empty
-//                else -> Showing(it.nodes.last())
-//            }
-//        }
-//}
diff --git a/android/app-example/src/main/res/layout/rib_root.xml b/android/app-example/src/main/res/layout/rib_root.xml
deleted file mode 100644
index 8b96ef115..000000000
--- a/android/app-example/src/main/res/layout/rib_root.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/rib_root"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
diff --git a/android/app-example/src/main/res/layout/rib_switcher.xml b/android/app-example/src/main/res/layout/rib_switcher.xml
index 9733392d0..1d9483db5 100644
--- a/android/app-example/src/main/res/layout/rib_switcher.xml
+++ b/android/app-example/src/main/res/layout/rib_switcher.xml
@@ -9,7 +9,6 @@
     tools:context=".app.RootActivity">
 
     <android.support.constraint.ConstraintLayout
-        android:id="@+id/own_content_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
diff --git a/android/app-example/src/test/java/com/badoo/ribs/example/rib/root/RootInteractorTest.kt b/android/app-example/src/test/java/com/badoo/ribs/example/rib/root/RootInteractorTest.kt
deleted file mode 100644
index 68f9b3151..000000000
--- a/android/app-example/src/test/java/com/badoo/ribs/example/rib/root/RootInteractorTest.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.badoo.ribs.example.rib.root
-
-import com.badoo.ribs.example.rib.root.feature.RootFeature
-import com.nhaarman.mockitokotlin2.mock
-import io.reactivex.ObservableSource
-import io.reactivex.functions.Consumer
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-
-class RootInteractorTest {
-
-    private val input: ObservableSource<Root.Input> = mock()
-    private val output: Consumer<Root.Output> = mock()
-    private val feature: RootFeature = mock()
-    private val router: RootRouter = mock()
-    private lateinit var interactor: RootInteractor
-
-    @Before
-    fun setup() {
-        interactor = RootInteractor(
-            savedInstanceState = null,
-            input = input,
-            output = output,
-            feature = feature,
-            router = router
-        )
-    }
-
-    @After
-    fun tearDown() {
-    }
-
-    /**
-     * TODO: Add real tests.
-     */
-    @Test
-    fun `an example test with some conditions should pass`() {
-        throw RuntimeException("Add real tests.")
-    }
-}
diff --git a/android/app-example/src/test/java/com/badoo/ribs/example/rib/root/RootRouterTest.kt b/android/app-example/src/test/java/com/badoo/ribs/example/rib/root/RootRouterTest.kt
deleted file mode 100644
index 0e43e316f..000000000
--- a/android/app-example/src/test/java/com/badoo/ribs/example/rib/root/RootRouterTest.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.badoo.ribs.example.rib.root
-
-import com.nhaarman.mockitokotlin2.mock
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-
-
-@RunWith(RobolectricTestRunner::class)
-class RootRouterTest {
-
-    private var interactor: RootInteractor = mock()
-    private var router: RootRouter? = null
-
-    @Before
-    fun setup() {
-        router = RootRouter(
-            savedInstanceState = null
-        )
-    }
-
-    @After
-    fun tearDown() {
-    }
-
-    /**
-     * TODO: Add real tests.
-     */
-    @Test
-    fun `an example test with some conditions should pass`() {
-        throw RuntimeException("Add real tests.")
-    }
-}
diff --git a/android/app-example/src/test/java/com/badoo/ribs/example/rib/root/RootWorkflowTest.kt b/android/app-example/src/test/java/com/badoo/ribs/example/rib/root/RootWorkflowTest.kt
deleted file mode 100644
index 6a21db413..000000000
--- a/android/app-example/src/test/java/com/badoo/ribs/example/rib/root/RootWorkflowTest.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.badoo.ribs.example.rib.root
-
-import com.badoo.ribs.customisation.RibCustomisationDirectory
-import com.badoo.ribs.example.rib.root.builder.RootBuilder
-import com.nhaarman.mockitokotlin2.mock
-import io.reactivex.ObservableSource
-import io.reactivex.functions.Consumer
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-
-class RootWorkflowTest {
-
-    private lateinit var workflow: Root.Workflow
-
-    @Before
-    fun setup() {
-        workflow = RootBuilder(object : Root.Dependency {
-            override fun rootInput(): ObservableSource<Root.Input> = mock()
-            override fun rootOutput(): Consumer<Root.Output> = mock()
-            override fun ribCustomisation(): RibCustomisationDirectory = mock()
-        }).build(null).also {
-            it.onAttach()
-        }
-    }
-
-    @After
-    fun tearDown() {
-    }
-
-    /**
-     * TODO: Add tests for every workflow action that operates on the node
-     */
-    @Test
-    fun `business logic operation test`() {
-        workflow.businessLogicOperation()
-        // verify(feature).accept(Wish)
-
-        throw RuntimeException("Add real tests.")
-    }
-
-    /**
-     * TODO: Add tests for every workflow action that attaches a child to ensure workflow step can be fulfilled
-     */
-    @Test
-    fun `attach child workflow step is fulfillable`() {
-        // val testObserver = TestObserver<Child.Workflow>()
-
-        // workflow.attachChild1().subscribe(testObserver)
-
-        // testObserver.assertValueCount(1)
-        // testObserver.assertComplete()
-
-        throw RuntimeException("Add real tests.")
-    }
-}
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/android/AndroidPortalRenderer.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/android/AndroidPortalRenderer.kt
deleted file mode 100644
index e6a0a6a6f..000000000
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/android/AndroidPortalRenderer.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.badoo.ribs.android
-
-//import android.view.View
-//import android.view.ViewGroup
-//import com.badoo.ribs.core.routing.portal.Portal
-//import com.badoo.ribs.core.routing.portal.Portal.Source.Model.Showing
-//
-//class AndroidPortalRenderer(
-//    private val portalContainer: ViewGroup,
-//    private val regularContentContainer: ViewGroup
-//) : Portal.Renderer {
-//
-//    override fun accept(portalVm: Portal.Source.Model) {
-//        regularContentContainer.visibility = when (portalVm) {
-//            is Showing -> View.GONE
-//            else -> View.VISIBLE
-//        }
-//
-//        if (portalVm is Showing) {
-//            portalVm.node.attachToView(portalContainer)
-//        }
-//    }
-//}
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/android/ViewStack.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/android/ViewStack.kt
deleted file mode 100644
index 57b9ee517..000000000
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/android/ViewStack.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.badoo.ribs.android
-
-import android.view.View
-import android.view.ViewGroup
-
-class ViewStackImpl(
-    private val container: ViewGroup
-) {
-//    private val cache = mutableMapOf<Int, View>()
-
-    private val views = mutableListOf<View>()
-
-//    private fun findView(id: Int) =
-//        cache[id] ?: container.findViewById<View>(id).also { cache[id] = it }
-
-
-    fun push(view: View) {
-        views.lastOrNull()?.visibility = View.GONE
-        view.let {
-            it.visibility = View.VISIBLE
-            views.add(it)
-            container.addView(it)
-        }
-    }
-
-    fun pop() {
-        views.dropLast(1)
-        views.lastOrNull()?.visibility = View.VISIBLE
-    }
-}
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/LifecycleParent.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/LifecycleParent.kt
deleted file mode 100644
index 06ad3e44c..000000000
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/LifecycleParent.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.badoo.ribs.core
-
-//interface LifecycleParent {
-//    fun addManaged(child: LifecycleChild)
-//    fun removeManaged(child: LifecycleChild)
-//}
-//
-//interface LifecycleChild {
-//    fun onStart()
-//    fun onResume()
-//    fun onPause()
-//    fun onStop()
-//}
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
index 937fed190..9eab63f73 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
@@ -61,7 +61,7 @@ open class Node<V : RibView>(
 
     enum class AttachMode {
         /**
-         * The node's view attach/detach and lifecycle is managed by its parent.
+         * The node's view attach/detach is managed by its parent.
          */
         PARENT,
 
@@ -389,9 +389,6 @@ open class Node<V : RibView>(
             .substring(
                 identifier.toString().lastIndexOf(".")
             )
-//                ,
-//                identifier.toString().indexOf("$"))
-//            .replace(".", "")
 
     /**
      * Executes an action and remains on the same hierarchical level
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Router.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Router.kt
index e28462d3a..e587a7312 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Router.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Router.kt
@@ -54,7 +54,7 @@ abstract class Router<C : Parcelable, Permanent : C, Content : C, Overlay : C, V
         )
     }
 
-    open fun onSaveInstanceState(outState: Bundle) {
+    fun onSaveInstanceState(outState: Bundle) {
         configurationFeature.accept(SaveInstanceState())
         val bundle = Bundle()
         timeCapsule.saveState(bundle)
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/CompositeRoutingAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/CompositeRoutingAction.kt
index e4c6c07cb..cc3d944aa 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/CompositeRoutingAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/CompositeRoutingAction.kt
@@ -17,15 +17,15 @@ class CompositeRoutingAction< V : RibView>(
             )
         }.flatten()
 
-    override fun execute(nodes: List<Node.Descriptor>) {
+    override fun execute() {
         routingActions.forEach {
-            it.execute(nodes)
+            it.execute()
         }
     }
 
-    override fun cleanup(nodes: List<Node.Descriptor>) {
+    override fun cleanup() {
         routingActions.forEach {
-            it.cleanup(nodes)
+            it.cleanup()
         }
     }
 
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/DialogRoutingAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/DialogRoutingAction.kt
index 10e656b36..5e8bae1a4 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/DialogRoutingAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/DialogRoutingAction.kt
@@ -19,13 +19,13 @@ class DialogRoutingAction<V : RibView, Event : Any>(
             Node.Descriptor(it, AttachMode.EXTERNAL)
         }
 
-    override fun execute(nodes: List<Node.Descriptor>) {
+    override fun execute() {
         dialogLauncher.show(dialog, onClose = {
             router.popBackStack()
         })
     }
 
-    override fun cleanup(nodes: List<Node.Descriptor>) {
+    override fun cleanup() {
         dialogLauncher.hide(dialog)
     }
 
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/InvokeOnCleanUp.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/InvokeOnCleanUp.kt
index 2993b00b8..f4ffa6dfb 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/InvokeOnCleanUp.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/InvokeOnCleanUp.kt
@@ -1,13 +1,12 @@
 package com.badoo.ribs.core.routing.action
 
-import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.view.RibView
 
 class InvokeOnCleanup< V : RibView>(
     private val f: () -> Unit
 ) : RoutingAction<V> {
 
-    override fun cleanup(nodes: List<Node.Descriptor>) {
+    override fun cleanup() {
         f()
     }
 
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/InvokeOnExecute.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/InvokeOnExecute.kt
index 942e7cfd4..6be6408d6 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/InvokeOnExecute.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/InvokeOnExecute.kt
@@ -1,13 +1,12 @@
 package com.badoo.ribs.core.routing.action
 
-import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.view.RibView
 
 class InvokeOnExecute< V : RibView>(
     private val onInvoke: () -> Unit
 ) : RoutingAction<V> {
 
-    override fun execute(nodes: List<Node.Descriptor>) {
+    override fun execute() {
         onInvoke()
     }
 
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/RoutingAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/RoutingAction.kt
index 1c9c7ccb7..0fd53435c 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/RoutingAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/action/RoutingAction.kt
@@ -9,24 +9,13 @@ interface RoutingAction<V : RibView> {
     fun buildNodes(bundles: List<Bundle?>) : List<Node.Descriptor> =
         emptyList()
 
-    fun onAttach(nodes: List<Node.Descriptor>) {
+    fun execute() {
 
     }
 
-    fun onDetach(nodes: List<Node.Descriptor>) {
-
-    }
-
-    fun execute(nodes: List<Node.Descriptor>) {
-
+    fun cleanup() {
     }
 
-    fun cleanup(nodes: List<Node.Descriptor>) {
-    }
-
-    fun parentNode(): Node<*>? =
-        null
-
     fun anchor(): Node<*>? =
         null
 
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/ConfigurationContext.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/ConfigurationContext.kt
index d70701fb8..9e6af6507 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/ConfigurationContext.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/ConfigurationContext.kt
@@ -89,8 +89,6 @@ internal sealed class ConfigurationContext<C : Parcelable> {
 
         /**
          * Resolves and sets the associated [RoutingAction], builds associated [Node]s
-         * FIXME outdated:
-         * , and adds them to the [parentNode]
          */
         override fun resolve(
             resolver: (C) -> RoutingAction<*>,
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/ActivateAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/ActivateAction.kt
index 6af414bbd..6e939aa0c 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/ActivateAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/ActivateAction.kt
@@ -8,7 +8,6 @@ import com.badoo.ribs.core.routing.configuration.ConfigurationContext.Activation
 import com.badoo.ribs.core.routing.configuration.ConfigurationContext.Resolved
 import com.badoo.ribs.core.routing.configuration.action.ActionExecutionParams
 import com.badoo.ribs.core.routing.configuration.feature.WorkingState
-import com.badoo.ribs.core.view.RibView
 
 /**
  * Attaches views of associated [Node]s to a parentNode, and executes the associated [RoutingAction].
@@ -39,7 +38,7 @@ internal object ActivateAction : ResolvedSingleConfigurationAction() {
 
 //        val targetNode = item.routingAction.parentNode() ?: parentNode
         parentNode.attachParentedViews(item.nodes)
-        item.routingAction.execute(item.nodes)
+        item.routingAction.execute()
         return item.withActivationState(globalActivationLevel)
     }
 
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/AddAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/AddAction.kt
index 9dd3fad5e..d013417a9 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/AddAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/AddAction.kt
@@ -19,9 +19,7 @@ internal object AddAction : ResolvedSingleConfigurationAction() {
      * Convenience method so that Add can be called only with only the knowledge of parentNode too
      */
     fun <C : Parcelable> execute(item: Resolved<C>, parentNode: Node<*>): Resolved<C> {
-
         parentNode.attachNodes(item.nodes)
-        item.routingAction.onAttach(item.nodes)
 
         return item
     }
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/DeactivateAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/DeactivateAction.kt
index f0e61d0d6..66094e7ba 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/DeactivateAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/DeactivateAction.kt
@@ -16,9 +16,8 @@ internal object DeactivateAction : ResolvedSingleConfigurationAction() {
 
     override fun <C : Parcelable> execute(item: Resolved<C>, params: ActionExecutionParams<C>): Resolved<C> {
         val (_, parentNode, _) = params
-        item.routingAction.cleanup(item.nodes)
+        item.routingAction.cleanup()
         item.nodes.saveViewState()
-//        val targetNode = item.routingAction.parentNode() ?: parentNode
         parentNode.detachChildViews(item.nodes)
 
         return item.withActivationState(INACTIVE)
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/RemoveAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/RemoveAction.kt
index 1e97a1a6b..d951c7903 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/RemoveAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/RemoveAction.kt
@@ -12,7 +12,6 @@ internal object RemoveAction : ResolvedSingleConfigurationAction() {
 
     override fun <C : Parcelable> execute(item: Resolved<C>, params: ActionExecutionParams<C>): Resolved<C> {
         val (_, parentNode, _) = params
-        item.routingAction.onDetach(item.nodes)
         item.nodes.forEach {
             parentNode.detachChildView(it.node)
             parentNode.detachChildNode(it.node)
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/AncestryInfo.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/AncestryInfo.kt
index 133d42f42..62c969b8b 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/AncestryInfo.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/AncestryInfo.kt
@@ -39,13 +39,4 @@ sealed class AncestryInfo {
         override val configurationChain: List<Parcelable>
             get() = anchor.ancestryInfo.configurationChain + creatorConfiguration
     }
-
-    class Derived(
-        override val configurationChain: List<Parcelable>
-    ) : AncestryInfo()
-
-    infix operator fun plus(configuration: Parcelable): AncestryInfo =
-        Derived(
-            this.configurationChain + configuration
-        )
 }
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/Portal.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/Portal.kt
index a8cf166e6..bb657b3f1 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/Portal.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/Portal.kt
@@ -1,18 +1,20 @@
 package com.badoo.ribs.core.routing.portal
 
+import android.os.Parcelable
 import com.badoo.ribs.core.Node
 import com.badoo.ribs.core.Rib
+import com.badoo.ribs.core.Router
 import com.badoo.ribs.core.routing.action.RoutingAction
 import io.reactivex.Single
 
 interface Portal : Rib {
 
-    interface Sink {
-        fun showRemote(ancestryInfo: AncestryInfo)
+    interface OtherSide {
+        fun showRemote(remoteRouter: Router<*, *, *, *, *>, remoteConfiguration: Parcelable)
     }
 
     interface Dependency {
-        fun defaultRoutingAction(): (Portal.Sink) -> RoutingAction<Nothing>
+        fun defaultRoutingAction(): (Portal.OtherSide) -> RoutingAction<Nothing>
     }
 
     interface Workflow {
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/PortalRouter.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/PortalRouter.kt
index b5c7ba7a8..a2295b4b8 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/PortalRouter.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/PortalRouter.kt
@@ -16,7 +16,7 @@ class PortalRouter(
     savedInstanceState = savedInstanceState,
     initialConfiguration = Content.Default,
     permanentParts = emptyList()
-), Portal.Sink {
+), Portal.OtherSide {
 
     internal lateinit var defaultRoutingAction: RoutingAction<Nothing>
 
@@ -27,8 +27,8 @@ class PortalRouter(
         }
     }
 
-    override fun showRemote(ancestryInfo: AncestryInfo) {
-        push(Content.Portal(ancestryInfo.configurationChain))
+    override fun showRemote(remoteRouter: Router<*, *, *, *, *>, remoteConfiguration: Parcelable) {
+        push(Content.Portal(remoteRouter.node.ancestryInfo.configurationChain + remoteConfiguration))
     }
 
     override fun resolveConfiguration(configuration: Configuration): RoutingAction<Nothing> =
@@ -38,16 +38,16 @@ class PortalRouter(
         }
 
     private fun List<Parcelable>.resolve(): RoutingAction<out RibView> {
-        // FIXME grab first from real root somehow (makeRoot method called by RibActivity?):
+        // TODO grab first from real root somehow -- currently works only if PortalRouter is in the root rib
         var targetRouter: ConfigurationResolver<Parcelable, *> =
             this@PortalRouter as ConfigurationResolver<Parcelable, *>
         var routingAction: RoutingAction<out RibView> =
             targetRouter.resolveConfiguration(first())
 
         drop(1).forEach { element ->
-            // FIXME don't build it again if already available as child
-            val nodes = routingAction.buildNodes(emptyList()) // FIXME bundle
-            val node = nodes.first() // FIXME if 0 or more than 1
+            // TODO don't build it again if already available as child
+            val nodes = routingAction.buildNodes(emptyList()) // TODO add bundle
+            val node = nodes.first() // TODO handle if 0 or more than 1
             targetRouter = node.node.resolver as ConfigurationResolver<Parcelable, *>
             routingAction = targetRouter.resolveConfiguration(element)
         }
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/customisation/CanProvidePortal.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/customisation/CanProvidePortal.kt
index 33cfeb24c..f97e8a158 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/customisation/CanProvidePortal.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/customisation/CanProvidePortal.kt
@@ -4,5 +4,5 @@ import com.badoo.ribs.core.routing.portal.Portal
 
 
 interface CanProvidePortal {
-    fun portal(): Portal.Sink
+    fun portal(): Portal.OtherSide
 }
diff --git a/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/routing/configuration/ConfigurationFeatureTest.kt b/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/routing/configuration/ConfigurationFeatureTest.kt
index 2469af7f3..5ea87ce5f 100644
--- a/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/routing/configuration/ConfigurationFeatureTest.kt
+++ b/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/routing/configuration/ConfigurationFeatureTest.kt
@@ -225,8 +225,8 @@ class ConfigurationFeatureTest {
     fun `On first WakeUp after init, ALL initial configuration are activated - associated RoutingActions are executed`() {
         createEmptyFeature()
         feature.accept(WakeUp())
-        verify(helperPermanent1.routingAction).execute(item.nodes)
-        verify(helperPermanent2.routingAction).execute(item.nodes)
+        verify(helperPermanent1.routingAction).execute()
+        verify(helperPermanent2.routingAction).execute()
     }
 
     @Test
@@ -289,11 +289,11 @@ class ConfigurationFeatureTest {
     fun `On WakeUp after init from TimeCapsule, ALL previously ACTIVE configurations are activated - associated RoutingActions are executed`() {
         createRestoredFeature()
         feature.accept(WakeUp())
-        verify(helperPermanent1.routingAction).execute(item.nodes)
-        verify(helperPermanent2.routingAction).execute(item.nodes)
-        verify(helperContentViewParented1.routingAction).execute(item.nodes)
-        verify(helperContentViewParented2.routingAction).execute(item.nodes)
-        verify(helperContentExternal1.routingAction).execute(item.nodes)
+        verify(helperPermanent1.routingAction).execute()
+        verify(helperPermanent2.routingAction).execute()
+        verify(helperContentViewParented1.routingAction).execute()
+        verify(helperContentViewParented2.routingAction).execute()
+        verify(helperContentExternal1.routingAction).execute()
     }
 
     @Test
@@ -336,8 +336,8 @@ class ConfigurationFeatureTest {
     fun `On WakeUp after init from TimeCapsule, ALL previously INACTIVE configurations are NOT activated - associated RoutingActions are NOT executed`() {
         createRestoredFeature()
         feature.accept(WakeUp())
-        verify(helperContentViewParented3.routingAction, never()).execute(item.nodes)
-        verify(helperContentExternal2.routingAction, never()).execute(item.nodes)
+        verify(helperContentViewParented3.routingAction, never()).execute()
+        verify(helperContentExternal2.routingAction, never()).execute()
     }
 
     @Test
@@ -400,7 +400,7 @@ class ConfigurationFeatureTest {
     fun `On Add, associated RoutingAction is not yet executed`() {
         createEmptyFeature()
         feature.accept(Add(Content(0), ContentViewParented1))
-        verify(helperContentViewParented1.routingAction, never()).execute(item.nodes)
+        verify(helperContentViewParented1.routingAction, never()).execute()
     }
     // endregion
 
@@ -410,7 +410,7 @@ class ConfigurationFeatureTest {
         createEmptyFeature()
         feature.accept(Add(Content(0), ContentViewParented1))
         feature.accept(Activate(Content(0)))
-        verify(helperContentViewParented1.routingAction, never()).execute(item.nodes)
+        verify(helperContentViewParented1.routingAction, never()).execute()
     }
 
     @Test
@@ -429,7 +429,7 @@ class ConfigurationFeatureTest {
         feature.accept(Add(Content(0), ContentViewParented1))
         feature.accept(Activate(Content(0)))
         feature.accept(WakeUp())
-        verify(helperContentViewParented1.routingAction).execute(item.nodes)
+        verify(helperContentViewParented1.routingAction).execute()
     }
 
     @Test
@@ -449,7 +449,7 @@ class ConfigurationFeatureTest {
         feature.accept(WakeUp())
         feature.accept(Add(Content(0), ContentViewParented1))
         feature.accept(Activate(Content(0)))
-        verify(helperContentViewParented1.routingAction).execute(item.nodes)
+        verify(helperContentViewParented1.routingAction).execute()
     }
 
     @Test
@@ -481,7 +481,7 @@ class ConfigurationFeatureTest {
         feature.accept(Add(Content(0), ContentViewParented1))
         feature.accept(Activate(Content(0)))
         feature.accept(Activate(Content(0)))
-        verify(helperContentViewParented1.routingAction, times(1)).execute(item.nodes)
+        verify(helperContentViewParented1.routingAction, times(1)).execute()
     }
 
     @Test
@@ -503,7 +503,7 @@ class ConfigurationFeatureTest {
         createEmptyFeature()
         feature.accept(Add(Content(0), ContentViewParented1))
         feature.accept(Deactivate(Content(0)))
-        verify(helperContentViewParented1.routingAction).cleanup(item.nodes)
+        verify(helperContentViewParented1.routingAction).cleanup()
     }
 
     @Test
@@ -595,7 +595,7 @@ class ConfigurationFeatureTest {
         clearInvocations(parentNode)
         feature.accept(Sleep())
 
-        verify(helperContentViewParented1.routingAction).cleanup(item.nodes)
+        verify(helperContentViewParented1.routingAction).cleanup()
     }
 
     @Test
@@ -641,7 +641,7 @@ class ConfigurationFeatureTest {
         clearInvocations(helperContentViewParented1.routingAction)
         feature.accept(WakeUp())
 
-        verify(helperContentViewParented1.routingAction).execute(item.nodes)
+        verify(helperContentViewParented1.routingAction).execute()
     }
 
     @Test

From c5eb1567e340a12d4f7f0c8ca26778f3ed32298d Mon Sep 17 00:00:00 2001
From: Zsolt Kocsi <zsolt.kocsi@corp.badoo.com>
Date: Thu, 29 Aug 2019 17:23:46 +0100
Subject: [PATCH 10/17] Cleanup

---
 .../rib/hello_world/HelloWorldInteractor.kt   |  3 +-
 .../rib/hello_world/HelloWorldRouter.kt       |  9 +++---
 .../ribs/example/rib/test/MainScreenTest.kt   |  4 ++-
 .../rib/util/TestDefaultDependencies.kt       |  6 +++-
 .../src/main/java/com/badoo/ribs/core/Node.kt | 31 +++++--------------
 .../configuration/ConfigurationContext.kt     | 26 +++++++++-------
 .../configuration/action/single/AddAction.kt  |  2 +-
 7 files changed, 38 insertions(+), 43 deletions(-)

diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/HelloWorldInteractor.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/HelloWorldInteractor.kt
index 7a8d68d79..5243dac99 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/HelloWorldInteractor.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/HelloWorldInteractor.kt
@@ -12,7 +12,8 @@ import com.badoo.ribs.core.Interactor
 import com.badoo.ribs.core.Router
 import com.badoo.ribs.example.app.OtherActivity
 import com.badoo.ribs.example.rib.hello_world.HelloWorldRouter.Configuration
-import com.badoo.ribs.example.rib.hello_world.HelloWorldRouter.Configuration.*
+import com.badoo.ribs.example.rib.hello_world.HelloWorldRouter.Configuration.Content
+import com.badoo.ribs.example.rib.hello_world.HelloWorldRouter.Configuration.Permanent
 import com.badoo.ribs.example.rib.hello_world.HelloWorldView.ViewModel
 import com.badoo.ribs.example.rib.hello_world.analytics.HelloWorldAnalytics
 import com.badoo.ribs.example.rib.hello_world.feature.HelloWorldFeature
diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/HelloWorldRouter.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/HelloWorldRouter.kt
index 9fc7badf3..8f286ba85 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/HelloWorldRouter.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/hello_world/HelloWorldRouter.kt
@@ -1,15 +1,16 @@
 package com.badoo.ribs.example.rib.hello_world
 
+import android.os.Bundle
 import android.os.Parcelable
 import com.badoo.ribs.core.Router
+import com.badoo.ribs.core.routing.action.AttachRibRoutingAction.Companion.attach
 import com.badoo.ribs.core.routing.action.RoutingAction
 import com.badoo.ribs.core.routing.action.RoutingAction.Companion.noop
 import com.badoo.ribs.example.rib.hello_world.HelloWorldRouter.Configuration
-import kotlinx.android.parcel.Parcelize
-import android.os.Bundle
-import com.badoo.ribs.core.routing.action.AttachRibRoutingAction.Companion.attach
-import com.badoo.ribs.example.rib.hello_world.HelloWorldRouter.Configuration.*
+import com.badoo.ribs.example.rib.hello_world.HelloWorldRouter.Configuration.Content
+import com.badoo.ribs.example.rib.hello_world.HelloWorldRouter.Configuration.Permanent
 import com.badoo.ribs.example.rib.small.builder.SmallBuilder
+import kotlinx.android.parcel.Parcelize
 
 class HelloWorldRouter(
     savedInstanceState: Bundle?,
diff --git a/android/app-example/src/test/java/com/badoo/ribs/example/rib/test/MainScreenTest.kt b/android/app-example/src/test/java/com/badoo/ribs/example/rib/test/MainScreenTest.kt
index f1908a841..4d52499c0 100644
--- a/android/app-example/src/test/java/com/badoo/ribs/example/rib/test/MainScreenTest.kt
+++ b/android/app-example/src/test/java/com/badoo/ribs/example/rib/test/MainScreenTest.kt
@@ -7,6 +7,7 @@ import android.view.ViewGroup
 import com.badoo.ribs.android.CanProvideActivityStarter
 import com.badoo.ribs.android.CanProvidePermissionRequester
 import com.badoo.ribs.core.Node
+import com.badoo.ribs.customisation.CanProvidePortal
 import com.badoo.ribs.customisation.RibCustomisationDirectory
 import com.badoo.ribs.customisation.RibCustomisationDirectoryImpl
 import com.badoo.ribs.dialog.CanProvideDialogLauncher
@@ -93,7 +94,8 @@ class MainScreenTest {
         SwitcherBuilder(object : Switcher.Dependency,
             CanProvideActivityStarter by dependencies,
             CanProvidePermissionRequester by dependencies,
-            CanProvideDialogLauncher by dependencies {
+            CanProvideDialogLauncher by dependencies,
+            CanProvidePortal by dependencies {
 
             override fun coffeeMachine(): CoffeeMachine =
                 mock()
diff --git a/android/app-example/src/test/java/com/badoo/ribs/example/rib/util/TestDefaultDependencies.kt b/android/app-example/src/test/java/com/badoo/ribs/example/rib/util/TestDefaultDependencies.kt
index 76d53fe98..e486255af 100644
--- a/android/app-example/src/test/java/com/badoo/ribs/example/rib/util/TestDefaultDependencies.kt
+++ b/android/app-example/src/test/java/com/badoo/ribs/example/rib/util/TestDefaultDependencies.kt
@@ -3,6 +3,8 @@ package com.badoo.ribs.example.rib.util
 import com.badoo.ribs.android.ActivityStarter
 import com.badoo.ribs.android.CanProvideActivityStarter
 import com.badoo.ribs.android.CanProvidePermissionRequester
+import com.badoo.ribs.core.routing.portal.Portal
+import com.badoo.ribs.customisation.CanProvidePortal
 import com.badoo.ribs.customisation.CanProvideRibCustomisation
 import com.badoo.ribs.customisation.RibCustomisationDirectory
 import com.badoo.ribs.customisation.RibCustomisationDirectoryImpl
@@ -14,7 +16,8 @@ class TestDefaultDependencies :
     CanProvideActivityStarter,
     CanProvidePermissionRequester,
     CanProvideDialogLauncher,
-    CanProvideRibCustomisation {
+    CanProvideRibCustomisation,
+    CanProvidePortal {
 
     val permissionRequester = TestPermissionRequester()
     val activityStarter = TestActivityStarter()
@@ -23,4 +26,5 @@ class TestDefaultDependencies :
     override fun permissionRequester() = permissionRequester
     override fun activityStarter(): ActivityStarter = activityStarter
     override fun dialogLauncher(): DialogLauncher = mock()
+    override fun portal(): Portal.OtherSide = mock()
 }
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
index 9eab63f73..2577b0e37 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
@@ -32,7 +32,6 @@ import android.os.Parcelable
 import android.support.annotation.CallSuper
 import android.support.annotation.MainThread
 import android.support.annotation.VisibleForTesting
-import android.util.Log
 import android.util.SparseArray
 import android.view.ViewGroup
 import com.badoo.ribs.core.routing.configuration.ConfigurationResolver
@@ -55,7 +54,7 @@ open class Node<V : RibView>(
     internal open val identifier: Rib,
     private val viewFactory: ((ViewGroup) -> V?)?,
     private val router: Router<*, *, *, *, V>,
-    private val interactor: Interactor<*, *, *, V>,
+    private val interactor: Interactor<*, *, *, V>
     private val ribRefWatcher: RibRefWatcher = RibRefWatcher.getInstance()
 ) : LifecycleOwner {
 
@@ -135,7 +134,6 @@ open class Node<V : RibView>(
     }
 
     open fun attachToView(parentViewGroup: ViewGroup) {
-        Log.d("CHECK", "attachToView - $this")
         detachFromView()
         this.parentViewGroup = parentViewGroup
         isAttachedToView = true
@@ -160,7 +158,6 @@ open class Node<V : RibView>(
 
     open fun detachFromView() {
         if (isAttachedToView) {
-            Log.d("CHECK", "detachFromView - $this")
             onPauseInternal()
             onStopInternal()
             router.onDetachView()
@@ -179,7 +176,6 @@ open class Node<V : RibView>(
     }
 
     open fun onDetach() {
-        Log.d("CHECK", "onDetach - $this")
         if (isAttachedToView) {
             RIBs.errorHandler.handleNonFatalError(
                 "View was not detached before node detach!",
@@ -206,18 +202,15 @@ open class Node<V : RibView>(
      * @param childNode the [Node] to be attached.
      */
     @MainThread
-    internal fun attachChildNode(childDescriptor: Descriptor) {
-        Log.d("CHECK", "attachChildNode - $this, $childDescriptor")
-        val (childNode, viewAttachMode) = childDescriptor
-//        childNode.parent = this
-        children.add(childNode)
+    internal fun attachChildNode(child: Node<*>) {
+        children.add(child)
         ribRefWatcher.logBreadcrumb(
-            "ATTACHED", childNode.javaClass.simpleName, this.javaClass.simpleName
+            "ATTACHED", child.javaClass.simpleName, this.javaClass.simpleName
         )
 
-        childNode.inheritExternalLifecycle(externalLifecycleRegistry)
-        childNode.onAttach()
-        childrenAttachesRelay.accept(childNode)
+        child.inheritExternalLifecycle(externalLifecycleRegistry)
+        child.onAttach()
+        childrenAttachesRelay.accept(child)
     }
 
     private fun inheritExternalLifecycle(lifecycleRegistry: LifecycleRegistry) {
@@ -304,7 +297,6 @@ open class Node<V : RibView>(
     }
 
     internal fun onStartInternal(callOnChildren: (Node<*>) -> Unit = { it.onStartInternal() }) {
-        Log.d("CHECK", "onStartInternal - $this")
         // The lifecycle cannot go higher than that of the hosting environment (e.g. Activity)
         updateToStateIfViewAttached(externalLifecycleRegistry.currentState)
         children.forEach { callOnChildren.invoke(it) }
@@ -312,7 +304,6 @@ open class Node<V : RibView>(
 
     // TODO call this when overlay is removed
     internal fun onResumeInternal(callOnChildren: (Node<*>) -> Unit = { it.onResumeInternal() }) {
-        Log.d("CHECK", "onResumeInternal - $this")
         // The lifecycle cannot go higher than that of the hosting environment (e.g. Activity)
         updateToStateIfViewAttached(externalLifecycleRegistry.currentState)
         children.forEach { callOnChildren.invoke(it) }
@@ -320,7 +311,6 @@ open class Node<V : RibView>(
 
     // TODO call this when overlay hides content AND current rib is not in dialog
     internal fun onPauseInternal(callOnChildren: (Node<*>) -> Unit = { it.onPauseInternal() }) {
-        Log.d("CHECK", "onPauseInternal - $this")
         // The lifecycle cannot go higher than that of the hosting environment (e.g. Activity)
         val targetState = if (externalLifecycleRegistry.currentState == CREATED) CREATED else STARTED
         updateToStateIfViewAttached(targetState)
@@ -328,7 +318,6 @@ open class Node<V : RibView>(
     }
 
     internal fun onStopInternal(callOnChildren: (Node<*>) -> Unit = { it.onStopInternal() }) {
-        Log.d("CHECK", "onStopInternal - $this")
         updateToStateIfViewAttached(CREATED)
         children.forEach { callOnChildren.invoke(it) }
     }
@@ -339,8 +328,6 @@ open class Node<V : RibView>(
             if (!isViewless) {
                 view!!.let { viewLifecycleRegistry.markState(state) }
             }
-        } else {
-            Log.d("CHECK", "SKIPPED updating lifecycle to state: $state - $this, as not attached to view, current state is: ${ribLifecycleRegistry.currentState}")
         }
     }
 
@@ -351,7 +338,6 @@ open class Node<V : RibView>(
      */
     @CallSuper
     open fun handleBackPress(): Boolean {
-        Log.d("CHECK", "handleBackPress - $this")
         ribRefWatcher.logBreadcrumb("BACKPRESS", null, null)
         return children
             .filter { it.isAttachedToView }
@@ -386,9 +372,6 @@ open class Node<V : RibView>(
 
     override fun toString(): String =
         identifier.toString()
-            .substring(
-                identifier.toString().lastIndexOf(".")
-            )
 
     /**
      * Executes an action and remains on the same hierarchical level
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/ConfigurationContext.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/ConfigurationContext.kt
index 9e6af6507..3df4e5dba 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/ConfigurationContext.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/ConfigurationContext.kt
@@ -95,12 +95,8 @@ internal sealed class ConfigurationContext<C : Parcelable> {
             parentNode: Node<*>,
             onResolution: (Resolved<C>) -> Resolved<C>
         ): Resolved<C> {
-            bundles.forEach {
-                it.classLoader = ConfigurationContext::class.java.classLoader
-            }
-
+            bundles.forEach { it.classLoader = ConfigurationContext::class.java.classLoader }
             val routingAction = resolver.invoke(configuration)
-
             return onResolution.invoke(
                 Resolved(
                     activationState = activationState,
@@ -108,17 +104,25 @@ internal sealed class ConfigurationContext<C : Parcelable> {
                     bundles = bundles,
                     routingAction = routingAction,
                     nodes = routingAction.buildNodes(bundles).also {
-                        it.forEach {
-                            it.node.ancestryInfo = AncestryInfo.Child(
-                                anchor = routingAction.anchor() ?: parentNode,
-                                creatorConfiguration = configuration
-                            )
-                        }
+                        setAncestryInfo(it, routingAction, parentNode)
                     }
                 )
             )
         }
 
+        private fun setAncestryInfo(
+            descriptors: List<Node.Descriptor>,
+            routingAction: RoutingAction<*>,
+            parentNode: Node<*>
+        ) {
+            descriptors.forEach {
+                it.node.ancestryInfo = AncestryInfo.Child(
+                    anchor = routingAction.anchor() ?: parentNode,
+                    creatorConfiguration = configuration
+                )
+            }
+        }
+
         override fun sleep(): Unresolved<C> = copy(
             activationState = activationState.sleep()
         )
diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/AddAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/AddAction.kt
index d013417a9..98dca3117 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/AddAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/AddAction.kt
@@ -26,7 +26,7 @@ internal object AddAction : ResolvedSingleConfigurationAction() {
 
     private fun Node<*>.attachNodes(nodes: List<Node.Descriptor>) {
         nodes.forEach {
-            attachChildNode(it)
+            attachChildNode(it.node)
         }
     }
 }

From dd0b4442689ddc75db2d174d320308dd25ebfb41 Mon Sep 17 00:00:00 2001
From: Zsolt Kocsi <zsolt.kocsi@corp.badoo.com>
Date: Thu, 29 Aug 2019 21:37:27 +0100
Subject: [PATCH 11/17] Add test

---
 .../configuration/ConfigurationContextTest.kt | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/routing/configuration/ConfigurationContextTest.kt b/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/routing/configuration/ConfigurationContextTest.kt
index 0eb9cbaec..ad55f94e9 100644
--- a/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/routing/configuration/ConfigurationContextTest.kt
+++ b/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/routing/configuration/ConfigurationContextTest.kt
@@ -9,6 +9,7 @@ import com.badoo.ribs.core.routing.configuration.ConfigurationContext.Activation
 import com.badoo.ribs.core.routing.configuration.ConfigurationContext.ActivationState.SLEEPING
 import com.badoo.ribs.core.routing.configuration.ConfigurationContext.Resolved
 import com.badoo.ribs.core.routing.configuration.ConfigurationContext.Unresolved
+import com.badoo.ribs.core.routing.portal.AncestryInfo
 import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.anyOrNull
 import com.nhaarman.mockitokotlin2.doReturn
@@ -27,6 +28,16 @@ class ConfigurationContextTest {
     private val resolver = mock<(Parcelable) -> RoutingAction<*>> {
         on { invoke(any()) } doReturn routingAction
     }
+
+    private val mockAnchor: Node<*> = mock()
+    private val routingActionWithAnchor = mock<RoutingAction<*>> {
+        on { buildNodes(anyOrNull()) } doReturn nodeDescriptors
+        on { anchor() } doReturn mockAnchor
+    }
+    private val resolverWithAnchor = mock<(Parcelable) -> RoutingAction<*>> {
+        on { invoke(any()) } doReturn routingActionWithAnchor
+    }
+
     private val onResolution = { resolved: Resolved<Parcelable> ->
         resolved
     }
@@ -96,6 +107,39 @@ class ConfigurationContextTest {
         assertEquals(nodeDescriptors, resolved.nodes)
     }
 
+    @Test
+    fun `Unresolved resolve() sets AncestryInfo on built Nodes with parent as default anchor `() {
+        val configuration = mock<Parcelable>()
+        val unresolved = Unresolved(mock(), configuration)
+        val targetResolver = resolver
+        val parentNode = mock<Node<*>>()
+        val resolved = unresolved.resolve(targetResolver, parentNode, onResolution)
+        resolved.nodes.forEach {
+            val expected = AncestryInfo.Child(
+                parentNode,
+                configuration
+            )
+
+            verify(it.node).ancestryInfo = expected
+        }
+    }
+
+    @Test
+    fun `Unresolved resolve() sets AncestryInfo on built Nodes with expected anchor `() {
+        val configuration = mock<Parcelable>()
+        val unresolved = Unresolved(mock(), configuration)
+        val targetResolver = resolverWithAnchor
+        val resolved = unresolved.resolve(targetResolver, mock(), onResolution)
+        resolved.nodes.forEach {
+            val expected = AncestryInfo.Child(
+                mockAnchor,
+                configuration
+            )
+
+            verify(it.node).ancestryInfo = expected
+        }
+    }
+
     @Test
     fun `Resolved sleep() keeps INACTIVE`() {
         val resolved = Resolved<Parcelable>(INACTIVE, mock(), mock(), mock(), mock())

From 3152187bfe7e03d9b41e61babc8d16d97d94197d Mon Sep 17 00:00:00 2001
From: Zsolt Kocsi <zsolt.kocsi@corp.badoo.com>
Date: Tue, 3 Sep 2019 13:25:14 +0100
Subject: [PATCH 12/17] Cover resolution of remote Node with test

---
 .../ribs/example/rib/small/SmallInteractor.kt |  2 +-
 .../com/badoo/ribs/core/helper/TestNode.kt    | 10 ++--
 .../com/badoo/ribs/core/helper/TestRouter.kt  | 23 ++++----
 .../core/routing/portal/PortalRouterTest.kt   | 54 +++++++++++++++++++
 4 files changed, 73 insertions(+), 16 deletions(-)
 create mode 100644 android/libraries/rib-base/src/test/java/com/badoo/ribs/core/routing/portal/PortalRouterTest.kt

diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt
index 69a2839b8..92ddcc4d6 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/small/SmallInteractor.kt
@@ -4,8 +4,8 @@ import android.arch.lifecycle.Lifecycle
 import android.os.Bundle
 import com.badoo.mvicore.android.lifecycle.createDestroy
 import com.badoo.ribs.core.Interactor
-import com.badoo.ribs.core.routing.portal.Portal
 import com.badoo.ribs.core.Router
+import com.badoo.ribs.core.routing.portal.Portal
 import com.badoo.ribs.example.rib.small.SmallRouter.Configuration
 import com.badoo.ribs.example.rib.small.SmallRouter.Configuration.Content
 import com.badoo.ribs.example.rib.small.SmallRouter.Configuration.FullScreen
diff --git a/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/TestNode.kt b/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/TestNode.kt
index 3a6ccec74..1c24c5249 100644
--- a/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/TestNode.kt
+++ b/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/TestNode.kt
@@ -3,18 +3,20 @@ package com.badoo.ribs.core.helper
 import android.os.Bundle
 import android.view.ViewGroup
 import com.badoo.ribs.core.Node
+import com.badoo.ribs.core.Router
 import com.badoo.ribs.core.Rib
 import com.nhaarman.mockitokotlin2.mock
 
 open class TestNode(
-    savedInstanceState: Bundle?,
-    identifier: Rib,
-    viewFactory: ((ViewGroup) -> TestView?)? = mock()
+    savedInstanceState: Bundle? = null,
+    identifier: Rib = mock(),
+    viewFactory: ((ViewGroup) -> TestView?)? = mock(),
+    router: Router<*, *, *, *, TestView> = mock()
 ) : Node<TestView>(
     savedInstanceState = savedInstanceState,
     identifier = identifier,
     viewFactory = viewFactory,
-    router = mock(),
+    router = router,
     interactor = mock()
 ) {
     var handleBackPress: Boolean =
diff --git a/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/TestRouter.kt b/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/TestRouter.kt
index 1d4888268..79f4f05d2 100644
--- a/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/TestRouter.kt
+++ b/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/helper/TestRouter.kt
@@ -4,20 +4,21 @@ import android.os.Bundle
 import android.os.Parcelable
 import com.badoo.ribs.core.Router
 import com.badoo.ribs.core.routing.action.RoutingAction
+import com.nhaarman.mockitokotlin2.mock
 import kotlinx.android.parcel.Parcelize
 
 class TestRouter(
-    savedInstanceState: Bundle?,
-    initialConfiguration: Configuration,
-    permanentParts: List<Nothing>,
-    private val routingActionForC1: RoutingAction<TestView>,
-    private val routingActionForC2: RoutingAction<TestView>,
-    private val routingActionForC3: RoutingAction<TestView>,
-    private val routingActionForC4: RoutingAction<TestView>,
-    private val routingActionForC5: RoutingAction<TestView>,
-    private val routingActionForO1: RoutingAction<TestView>,
-    private val routingActionForO2: RoutingAction<TestView>,
-    private val routingActionForO3: RoutingAction<TestView>
+    savedInstanceState: Bundle? = null,
+    initialConfiguration: Configuration = Configuration.C1,
+    permanentParts: List<Nothing> = emptyList(),
+    private val routingActionForC1: RoutingAction<TestView> = mock(),
+    private val routingActionForC2: RoutingAction<TestView> = mock(),
+    private val routingActionForC3: RoutingAction<TestView> = mock(),
+    private val routingActionForC4: RoutingAction<TestView> = mock(),
+    private val routingActionForC5: RoutingAction<TestView> = mock(),
+    private val routingActionForO1: RoutingAction<TestView> = mock(),
+    private val routingActionForO2: RoutingAction<TestView> = mock(),
+    private val routingActionForO3: RoutingAction<TestView> = mock()
 ) : Router<TestRouter.Configuration, Nothing, TestRouter.Configuration, Nothing, TestView>(
     savedInstanceState = savedInstanceState,
     initialConfiguration = initialConfiguration,
diff --git a/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/routing/portal/PortalRouterTest.kt b/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/routing/portal/PortalRouterTest.kt
new file mode 100644
index 000000000..331d2b2a5
--- /dev/null
+++ b/android/libraries/rib-base/src/test/java/com/badoo/ribs/core/routing/portal/PortalRouterTest.kt
@@ -0,0 +1,54 @@
+package com.badoo.ribs.core.routing.portal
+
+import android.os.Parcelable
+import com.badoo.ribs.core.helper.TestNode
+import com.badoo.ribs.core.helper.TestRouter
+import com.badoo.ribs.core.Node
+import com.badoo.ribs.core.routing.action.AttachRibRoutingAction
+import com.badoo.ribs.core.routing.action.AttachRibRoutingAction.Companion.attach
+import com.badoo.ribs.core.routing.portal.PortalRouter.Configuration.Content.Portal
+import com.badoo.ribs.core.routing.portal.PortalRouter.Configuration.Content.Default
+import com.nhaarman.mockitokotlin2.mock
+import org.junit.Assert.*
+import org.junit.Before
+import org.junit.Test
+
+class PortalRouterTest {
+
+    lateinit var router: PortalRouter
+    lateinit var node1: Node<*>
+    lateinit var node2: Node<*>
+    lateinit var node3: Node<*>
+
+
+    @Before
+    fun setUp() {
+        node3 = TestNode()
+        node2 = TestNode(router = TestRouter(routingActionForC3 = attach { node3 }))
+        node1 = TestNode(router = TestRouter(routingActionForC2 = attach { node2 }))
+
+
+
+        router = PortalRouter(
+            savedInstanceState = null
+        ).apply {
+            defaultRoutingAction = attach { node1 }
+        }
+    }
+
+    @Test
+    fun `Resolving Portal configuration builds expected remote Node`() {
+        val remoteRoutingAction = router.resolveConfiguration(
+            Portal(
+                listOf(
+                    Default,
+                    TestRouter.Configuration.C2,
+                    TestRouter.Configuration.C3
+                )
+            )
+        )
+
+        val builtNodes = remoteRoutingAction.buildNodes(emptyList()).map { it.node }
+        assertEquals(listOf(node3), builtNodes)
+    }
+}

From 7c7b21a4e0b5ab307ce271d2141247d3b6095ec4 Mon Sep 17 00:00:00 2001
From: Zsolt Kocsi <zsolt.kocsi@corp.badoo.com>
Date: Tue, 3 Sep 2019 13:58:43 +0100
Subject: [PATCH 13/17] Add TODOs for future improvements

---
 .../ribs/core/routing/portal/PortalRouter.kt     | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/PortalRouter.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/PortalRouter.kt
index a2295b4b8..86939b926 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/PortalRouter.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/portal/PortalRouter.kt
@@ -37,6 +37,8 @@ class PortalRouter(
             is Content.Portal -> configuration.configurationChain.resolve() as RoutingAction<Nothing>
         }
 
+    // TODO probably needs to change from List<Parcelable> to List<AncestryInfo>,
+    //  so that extra info can be added too. See below for details.
     private fun List<Parcelable>.resolve(): RoutingAction<out RibView> {
         // TODO grab first from real root somehow -- currently works only if PortalRouter is in the root rib
         var targetRouter: ConfigurationResolver<Parcelable, *> =
@@ -45,9 +47,17 @@ class PortalRouter(
             targetRouter.resolveConfiguration(first())
 
         drop(1).forEach { element ->
-            // TODO don't build it again if already available as child
-            val nodes = routingAction.buildNodes(emptyList()) // TODO add bundle
-            val node = nodes.first() // TODO handle if 0 or more than 1
+            // TODO for maximum correctness, original List<> should also contain Bundles,
+            //  as that might change how dependencies are built.
+            val bundles = emptyList<Bundle?>()
+
+            // TODO don't build it again if already available as child.
+            //  This probably means storing Node identifier in addition to (Parcelable) configuration.
+            val nodes = routingAction.buildNodes(bundles)
+
+            // TODO having 0 nodes is an impossible scenario, but having more than 1 can be valid.
+            //  Solution is again to store Node identifiers & Bundles that help picking the correct one.
+            val node = nodes.first()
             targetRouter = node.node.resolver as ConfigurationResolver<Parcelable, *>
             routingAction = targetRouter.resolveConfiguration(element)
         }

From 8c99d97a94555737a5295525cabdc18a4c407e02 Mon Sep 17 00:00:00 2001
From: Zsolt Kocsi <zsolt.kocsi@corp.badoo.com>
Date: Tue, 3 Sep 2019 14:31:12 +0100
Subject: [PATCH 14/17] Include portal step in workflows

---
 .../badoo/ribs/example/app/RootActivity.kt    | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/app/RootActivity.kt b/android/app-example/src/main/java/com/badoo/ribs/example/app/RootActivity.kt
index 2997f6a45..cc443f959 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/app/RootActivity.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/app/RootActivity.kt
@@ -1,5 +1,6 @@
 package com.badoo.ribs.example.app
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.ViewGroup
 import com.badoo.ribs.android.ActivityStarter
@@ -13,12 +14,14 @@ import com.badoo.ribs.core.routing.portal.PortalNode
 import com.badoo.ribs.customisation.RibCustomisationDirectory
 import com.badoo.ribs.dialog.DialogLauncher
 import com.badoo.ribs.example.R
+import com.badoo.ribs.example.rib.hello_world.HelloWorld
 import com.badoo.ribs.example.rib.switcher.Switcher
 import com.badoo.ribs.example.rib.switcher.SwitcherNode
 import com.badoo.ribs.example.rib.switcher.builder.SwitcherBuilder
 import com.badoo.ribs.example.util.CoffeeMachine
 import com.badoo.ribs.example.util.StupidCoffeeMachine
 import io.reactivex.Observable
+import io.reactivex.Single
 import io.reactivex.functions.BiFunction
 
 /** The sample app's single activity */
@@ -77,19 +80,19 @@ class RootActivity : RibActivity() {
     }
 
     private fun executeWorkflow1(): Observable<*> =
-        workflowRoot
-            .attachHelloWorld()
+        switcher()
+            .flatMap { it.attachHelloWorld()}
             .toObservable()
 
     @SuppressWarnings("OptionalUnit")
     private fun executeWorkflow2(): Observable<*> =
         Observable.combineLatest(
-            workflowRoot
-                .doSomethingAndStayOnThisNode()
+            switcher()
+                .flatMap { it.doSomethingAndStayOnThisNode() }
                 .toObservable(),
 
-            workflowRoot
-                .waitForHelloWorld()
+            switcher()
+                .flatMap { it.waitForHelloWorld() }
                 .flatMap { it.somethingSomethingDarkSide() }
                 .toObservable(),
 
@@ -97,7 +100,13 @@ class RootActivity : RibActivity() {
         )
 
     private fun executeTestCrash(): Observable<*> =
-        (rootNode as Switcher.Workflow)
-            .testCrash()
+        switcher()
+            .flatMap { it.testCrash() }
             .toObservable()
+
+    @Suppress("UNCHECKED_CAST")
+    private fun switcher() =
+        Single
+            .just(workflowRoot)
+            .flatMap { it.showDefault() as Single<Switcher.Workflow> }
 }

From c840772c3dc3174eaeafa54e27b877759925eb09 Mon Sep 17 00:00:00 2001
From: Zsolt Kocsi <zsolt.kocsi@corp.badoo.com>
Date: Tue, 3 Sep 2019 14:38:48 +0100
Subject: [PATCH 15/17] Fix comma

---
 .../rib-base/src/main/java/com/badoo/ribs/core/Node.kt          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
index 2577b0e37..9be65798f 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/Node.kt
@@ -54,7 +54,7 @@ open class Node<V : RibView>(
     internal open val identifier: Rib,
     private val viewFactory: ((ViewGroup) -> V?)?,
     private val router: Router<*, *, *, *, V>,
-    private val interactor: Interactor<*, *, *, V>
+    private val interactor: Interactor<*, *, *, V>,
     private val ribRefWatcher: RibRefWatcher = RibRefWatcher.getInstance()
 ) : LifecycleOwner {
 

From 63812d662b9aad93c86b5c790026926a90552781 Mon Sep 17 00:00:00 2001
From: Zsolt Kocsi <zsolt.kocsi@corp.badoo.com>
Date: Tue, 10 Sep 2019 14:21:47 +0100
Subject: [PATCH 16/17] Import utility method

---
 .../src/main/java/com/badoo/ribs/example/rib/big/BigView.kt    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/BigView.kt b/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/BigView.kt
index 93b5292f1..4d3b7c166 100644
--- a/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/BigView.kt
+++ b/android/app-example/src/main/java/com/badoo/ribs/example/rib/big/BigView.kt
@@ -6,6 +6,7 @@ import android.widget.TextView
 import com.badoo.ribs.core.Rib
 import com.badoo.ribs.core.view.RibView
 import com.badoo.ribs.core.view.ViewFactory
+import com.badoo.ribs.customisation.inflate
 import com.badoo.ribs.example.R
 import com.badoo.ribs.example.rib.big.BigView.Event
 import com.badoo.ribs.example.rib.big.BigView.ViewModel
@@ -40,7 +41,7 @@ class BigViewImpl private constructor(
     ) : BigView.Factory {
         override fun invoke(deps: Nothing?): (ViewGroup) -> BigView = {
             BigViewImpl(
-                com.badoo.ribs.customisation.inflate(it, layoutRes)
+                inflate(it, layoutRes)
             )
         }
     }

From 870c29da40b743300c9fe8ae719d493228cec5fc Mon Sep 17 00:00:00 2001
From: Zsolt Kocsi <zsolt.kocsi@corp.badoo.com>
Date: Tue, 10 Sep 2019 14:21:56 +0100
Subject: [PATCH 17/17] Remove commented out line

---
 .../core/routing/configuration/action/single/ActivateAction.kt   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/ActivateAction.kt b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/ActivateAction.kt
index 6e939aa0c..fe18f93a2 100644
--- a/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/ActivateAction.kt
+++ b/android/libraries/rib-base/src/main/java/com/badoo/ribs/core/routing/configuration/action/single/ActivateAction.kt
@@ -36,7 +36,6 @@ internal object ActivateAction : ResolvedSingleConfigurationAction() {
             return item
         }
 
-//        val targetNode = item.routingAction.parentNode() ?: parentNode
         parentNode.attachParentedViews(item.nodes)
         item.routingAction.execute()
         return item.withActivationState(globalActivationLevel)