From 2febe557f1db5583099bd849c63217073c96469e Mon Sep 17 00:00:00 2001
From: Ruslan Sharipov <sharipov@surfstudio.ru>
Date: Wed, 10 Feb 2021 16:23:19 +0300
Subject: [PATCH 01/15] initial navigation commit

---
 .../android/navigation/sample/app/App.kt      | 43 +------------------
 .../sample/app/screen/MainActivity.kt         | 11 +----
 .../sample/app/screen/auth/AuthFragment.kt    | 17 +-------
 .../sample/app/screen/main/MainFragment.kt    | 32 +-------------
 .../screen/main/gallery/GalleryTabFragment.kt |  8 ++--
 .../app/screen/main/home/HomeTabFragment.kt   |  7 +--
 .../main/home/nested/HomeNestedFragment.kt    |  2 -
 .../screen/main/profile/ProfileTabFragment.kt | 20 +++------
 .../main/profile/about/AboutActivity.kt       |  9 +---
 .../app/screen/splash/SplashFragment.kt       |  5 +--
 10 files changed, 17 insertions(+), 137 deletions(-)

diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt
index 56c856b006..f8f5fd7ac7 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt
@@ -1,52 +1,11 @@
 package ru.surfstudio.android.navigation.sample.app
 
 import android.app.Application
-import androidx.core.content.ContextCompat
-import ru.surfstudio.android.navigation.animation.DefaultAnimations
-import ru.surfstudio.android.navigation.observer.ScreenResultEmitter
-import ru.surfstudio.android.navigation.observer.ScreenResultObserver
-import ru.surfstudio.android.navigation.observer.bus.ScreenResultBus
-import ru.surfstudio.android.navigation.observer.executor.AppCommandExecutorWithResult
-import ru.surfstudio.android.navigation.observer.navigator.activity.ActivityNavigatorWithResultFactory
-import ru.surfstudio.android.navigation.observer.storage.file.FileScreenResultStorage
-import ru.surfstudio.android.navigation.provider.ActivityNavigationProvider
-import ru.surfstudio.android.navigation.provider.callbacks.ActivityNavigationProviderCallbacks
-import ru.surfstudio.android.navigation.sample.app.utils.animations.FadeAnimations
-import ru.surfstudio.android.navigation.sample.app.utils.animations.SlideAnimations
 
 class App : Application() {
 
-    companion object {
-        lateinit var navigator: AppCommandExecutorWithResult
-        lateinit var provider: ActivityNavigationProvider
-        lateinit var resultObserver: ScreenResultObserver
-    }
-
     override fun onCreate() {
         super.onCreate()
-        initResultObserver()
-        initAnimations()
-    }
-
-    private fun initExecutor(screenResultEmitter: ScreenResultEmitter) {
-        val activityNavigationProvider = ActivityNavigationProviderCallbacks(
-                activityNavigatorFactory = ActivityNavigatorWithResultFactory()
-        )
-        registerActivityLifecycleCallbacks(activityNavigationProvider)
-        provider = activityNavigationProvider
-        navigator = AppCommandExecutorWithResult(screenResultEmitter, activityNavigationProvider)
-    }
-
-    private fun initResultObserver() {
-        val filesDir = ContextCompat.getNoBackupFilesDir(this)!!.absolutePath
-        val storage = FileScreenResultStorage(filesDir)
-        val resultBus = ScreenResultBus(storage)
-        resultObserver = resultBus
-        initExecutor(resultBus)
-    }
-
-    private fun initAnimations() {
-        DefaultAnimations.fragment = SlideAnimations() //animations for all fragment changes
-        DefaultAnimations.tab = FadeAnimations() //animations for tab changes
+        // TODO
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt
index 22ee51ba34..62f9f5e3f9 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt
@@ -2,22 +2,15 @@ package ru.surfstudio.android.navigation.sample.app.screen
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import ru.surfstudio.android.navigation.command.fragment.Add
-import ru.surfstudio.android.navigation.provider.container.FragmentNavigationContainer
 import ru.surfstudio.android.navigation.sample.R
-import ru.surfstudio.android.navigation.sample.app.App
-import ru.surfstudio.android.navigation.sample.app.screen.splash.SplashRoute
-import ru.surfstudio.android.navigation.sample.app.utils.animations.FadeAnimations
 
-class MainActivity : AppCompatActivity(), FragmentNavigationContainer {
-
-    override val containerId: Int = R.id.fragment_container
+class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_single)
         if (savedInstanceState == null) { //Adding fragment only on first create
-            App.navigator.execute(Add(SplashRoute(), FadeAnimations()))
+            // TODO
         }
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/auth/AuthFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/auth/AuthFragment.kt
index 7b966c13a7..7de936774a 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/auth/AuthFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/auth/AuthFragment.kt
@@ -6,13 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import kotlinx.android.synthetic.main.fragment_auth.*
-import ru.surfstudio.android.navigation.command.fragment.Replace
-import ru.surfstudio.android.navigation.command.fragment.ReplaceHard
 import ru.surfstudio.android.navigation.sample.R
-import ru.surfstudio.android.navigation.sample.app.App
-import ru.surfstudio.android.navigation.sample.app.screen.main.MainRoute
-import ru.surfstudio.android.navigation.sample.app.screen.main.gallery.GalleryTabRoute
-import ru.surfstudio.android.navigation.sample.app.screen.main.gallery.image.ImageRoute
 
 class AuthFragment : Fragment() {
 
@@ -21,17 +15,8 @@ class AuthFragment : Fragment() {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        val mainRoute = MainRoute()
-        val galleryRoute = GalleryTabRoute()
         auth_btn.setOnClickListener {
-            App.navigator.execute(
-                    listOf(
-                            ReplaceHard(mainRoute), //opens main screen
-                            Replace(galleryRoute, sourceTag = mainRoute.getId()), //opens gallery tab in main
-                            Replace(ImageRoute(1), sourceTag = galleryRoute.getId()), //opens first nested image in gallery
-                            Replace(ImageRoute(2), sourceTag = galleryRoute.getId()) //opens second nested image in gallery
-                    )
-            )
+
         }
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt
index 762f5ff209..2d7d6b7f47 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt
@@ -6,22 +6,14 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import kotlinx.android.synthetic.main.fragment_main.*
-import ru.surfstudio.android.navigation.command.activity.Finish
-import ru.surfstudio.android.navigation.command.fragment.RemoveAll
-import ru.surfstudio.android.navigation.command.fragment.RemoveLast
-import ru.surfstudio.android.navigation.command.fragment.Replace
-import ru.surfstudio.android.navigation.navigator.fragment.tab.TabFragmentNavigatorInterface
 import ru.surfstudio.android.navigation.provider.container.TabFragmentNavigationContainer
-import ru.surfstudio.android.navigation.provider.holder.FragmentNavigationHolder
 import ru.surfstudio.android.navigation.route.fragment.FragmentRoute
 import ru.surfstudio.android.navigation.sample.R
-import ru.surfstudio.android.navigation.sample.app.App
 import ru.surfstudio.android.navigation.sample.app.screen.main.MainTabType.*
 import ru.surfstudio.android.navigation.sample.app.screen.main.gallery.GalleryTabRoute
 import ru.surfstudio.android.navigation.sample.app.screen.main.home.HomeTabRoute
 import ru.surfstudio.android.navigation.sample.app.screen.main.profile.ProfileTabRoute
 import ru.surfstudio.android.navigation.sample.app.utils.addOnBackPressedListener
-import ru.surfstudio.android.navigation.sample.app.utils.animations.FadeAnimations
 
 class MainFragment : Fragment(), TabFragmentNavigationContainer {
 
@@ -47,18 +39,12 @@ class MainFragment : Fragment(), TabFragmentNavigationContainer {
     }
 
     private fun initActiveTabReopenedListener() {
-        getTabNavigator()
-                .setActiveTabReopenedListener {
-                    App.navigator.execute(RemoveAll(sourceTag = tag!!))
-                }
+
     }
 
     private fun initBackPressedListener() {
         addOnBackPressedListener {
-            when {
-                hasTabsInStack() -> App.navigator.execute(RemoveLast(sourceTag = tag!!))
-                else -> App.navigator.execute(Finish())
-            }
+
         }
     }
 
@@ -68,20 +54,6 @@ class MainFragment : Fragment(), TabFragmentNavigationContainer {
             GALLERY -> GalleryTabRoute()
             PROFILE -> ProfileTabRoute()
         }
-        App.navigator.execute(Replace(route, FadeAnimations(), tag!!))
-    }
-
-    private fun hasTabsInStack(): Boolean {
-        val backStackCount = getTabNavigator()
-                .backStackEntryCount
-        return backStackCount > 1
-    }
 
-    private fun getTabNavigator(): TabFragmentNavigatorInterface {
-        return App.provider
-                .provide()
-                .fragmentNavigationProvider
-                .provide(tag)
-                .fragmentNavigator as TabFragmentNavigatorInterface
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/GalleryTabFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/GalleryTabFragment.kt
index a155d2cf0f..6d918f2a2c 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/GalleryTabFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/GalleryTabFragment.kt
@@ -34,16 +34,14 @@ class GalleryTabFragment : Fragment(), FragmentNavigationContainer {
     }
 
     private fun addPicture() {
-        App.navigator.execute(Replace(ImageRoute(currentPicture), sourceTag = tag!!))
+
     }
 
     private fun removePicture() {
-        App.navigator.execute(RemoveLast(sourceTag = tag!!))
+
     }
 
     private fun subscribeToBackStackChanges() {
-        val provider = App.provider.provide().fragmentNavigationProvider.provide(tag)
-        val backStackEntries = provider.fragmentNavigator.addBackStackChangeListener { currentPicture = it.size + 1 }
-        Log.d("111111 Update pic", "backStacks$backStackEntries, manager=${childFragmentManager}")
+
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/HomeTabFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/HomeTabFragment.kt
index a824ffb54a..5d5008d069 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/HomeTabFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/HomeTabFragment.kt
@@ -5,12 +5,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import kotlinx.android.synthetic.main.fragment_home.*
-import ru.surfstudio.android.navigation.command.fragment.Replace
 import ru.surfstudio.android.navigation.sample.R
-import ru.surfstudio.android.navigation.sample.app.App
-import ru.surfstudio.android.navigation.sample.app.screen.main.home.nested.HomeNestedRoute
-import ru.surfstudio.android.navigation.sample.app.utils.animations.FadeAnimations
 
 class HomeTabFragment : Fragment() {
 
@@ -20,6 +15,6 @@ class HomeTabFragment : Fragment() {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        home_add_btn.setOnClickListener { App.navigator.execute(Replace(HomeNestedRoute(), sourceTag = tag!!)) }
+
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/nested/HomeNestedFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/nested/HomeNestedFragment.kt
index 53bc1874fe..49d5d23612 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/nested/HomeNestedFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/nested/HomeNestedFragment.kt
@@ -20,8 +20,6 @@ class HomeNestedFragment : Fragment() {
         super.onActivityCreated(savedInstanceState)
         val currentOrder = HomeNestedRoute(arguments).order
         home_nested_tv.text = "Home\nNested\nFragment\n#$currentOrder"
-        val nextOrder = currentOrder + 1
-        home_nested_add_btn.setOnClickListener { App.navigator.execute(Replace(HomeNestedRoute(nextOrder), sourceTag = tag!!)) }
     }
 
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/ProfileTabFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/ProfileTabFragment.kt
index 4808e82d3a..8e164b1180 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/ProfileTabFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/ProfileTabFragment.kt
@@ -31,23 +31,13 @@ class ProfileTabFragment : Fragment() {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        profile_settings_btn.setOnClickListener { App.navigator.execute(Start(ApplicationSettingsRoute())) }
-        profile_about_app_btn.setOnClickListener { App.navigator.execute(Start(AboutRoute())) }
-        profile_logout_btn.setOnClickListener { App.navigator.execute(ReplaceHard(AuthRoute(), FadeAnimations())) }
+        profile_settings_btn.setOnClickListener {  }
+        profile_about_app_btn.setOnClickListener {  }
+        profile_logout_btn.setOnClickListener {  }
         profile_attach_photo_btn.setOnClickListener {
-            App.navigator.execute(
-                    StartForResult(
-                            CameraRoute(
-                                    uniqueId = screenId,
-                                    chooserTitle = "Select photo for profile",
-                                    takenPhotoFile = CameraHelper(requireContext()).generatePhotoPath()
-                            )
-                    )
-            )
+
         }
 
-        App.resultObserver.addListener(targetRoute, ::showAppName)
-        App.resultObserver.addListener(cameraRoute, ::showResult)
     }
 
     private fun showAppName(name: String) {
@@ -67,7 +57,7 @@ class ProfileTabFragment : Fragment() {
     }
 
     override fun onDestroyView() {
-        App.resultObserver.removeListener(targetRoute)
+
         super.onDestroyView()
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/about/AboutActivity.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/about/AboutActivity.kt
index 87d0fa9f83..41f51b3b88 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/about/AboutActivity.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/about/AboutActivity.kt
@@ -3,10 +3,7 @@ package ru.surfstudio.android.navigation.sample.app.screen.main.profile.about
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import kotlinx.android.synthetic.main.activity_about.*
-import ru.surfstudio.android.navigation.observer.command.EmitScreenResult
-import ru.surfstudio.android.navigation.command.activity.Finish
 import ru.surfstudio.android.navigation.sample.R
-import ru.surfstudio.android.navigation.sample.app.App
 
 class AboutActivity : AppCompatActivity() {
 
@@ -19,11 +16,7 @@ class AboutActivity : AppCompatActivity() {
             val appName = application.packageName
 
             val targetRoute = AboutRoute()
-
-            App.navigator.execute(listOf(
-                    Finish(),
-                    EmitScreenResult(targetRoute, appName)
-            ))
+            // TODO вернуть результат
         }
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/splash/SplashFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/splash/SplashFragment.kt
index 31ee898d71..871dbe8484 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/splash/SplashFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/splash/SplashFragment.kt
@@ -6,10 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import ru.surfstudio.android.navigation.command.fragment.ReplaceHard
 import ru.surfstudio.android.navigation.sample.R
-import ru.surfstudio.android.navigation.sample.app.App
-import ru.surfstudio.android.navigation.sample.app.screen.auth.AuthRoute
 
 class SplashFragment : Fragment() {
 
@@ -20,7 +17,7 @@ class SplashFragment : Fragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         Handler().postDelayed({
-            App.navigator.execute(ReplaceHard(AuthRoute()))
+            // TODO
         }, 1500L)
     }
 }
\ No newline at end of file

From 908765e4e66ddaa53f62b32b5e23c670bad93d0c Mon Sep 17 00:00:00 2001
From: Ruslan Sharipov <sharipov@surfstudio.ru>
Date: Fri, 19 Feb 2021 16:35:17 +0300
Subject: [PATCH 02/15] nav additions

---
 .../android/navigation/sample/app/App.kt      | 31 ++++++++++++++++++-
 .../sample/app/screen/MainActivity.kt         | 10 ++++--
 .../sample/app/screen/auth/AuthFragment.kt    |  6 +++-
 .../sample/app/screen/main/MainFragment.kt    | 19 +++++++++---
 .../{GalleryTabRoute.kt => GalleryRoute.kt}   |  7 ++++-
 .../app/screen/main/home/HomeTabFragment.kt   |  9 +++++-
 .../screen/main/profile/ProfileTabFragment.kt |  2 +-
 .../app/screen/splash/SplashFragment.kt       |  6 +++-
 .../main/res/anim/slide_in_from_bottom.xml    |  6 ++++
 .../src/main/res/anim/slide_out_to_bottom.xml |  6 ++++
 .../src/main/res/layout/fragment_home.xml     |  4 +--
 .../src/main/res/layout/fragment_profile.xml  |  4 +--
 12 files changed, 94 insertions(+), 16 deletions(-)
 rename navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/{GalleryTabRoute.kt => GalleryRoute.kt} (71%)
 create mode 100644 navigation/sample/src/main/res/anim/slide_in_from_bottom.xml
 create mode 100644 navigation/sample/src/main/res/anim/slide_out_to_bottom.xml

diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt
index f8f5fd7ac7..fe9c739171 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt
@@ -1,11 +1,40 @@
 package ru.surfstudio.android.navigation.sample.app
 
 import android.app.Application
+import androidx.core.content.ContextCompat
+import ru.surfstudio.android.navigation.animation.DefaultAnimations
+import ru.surfstudio.android.navigation.observer.ScreenResultObserver
+import ru.surfstudio.android.navigation.observer.bus.ScreenResultBus
+import ru.surfstudio.android.navigation.observer.executor.AppCommandExecutorWithResult
+import ru.surfstudio.android.navigation.observer.navigator.activity.ActivityNavigatorWithResultFactory
+import ru.surfstudio.android.navigation.observer.storage.file.FileScreenResultStorage
+import ru.surfstudio.android.navigation.provider.ActivityNavigationProvider
+import ru.surfstudio.android.navigation.provider.callbacks.ActivityNavigationProviderCallbacks
+import ru.surfstudio.android.navigation.sample.app.utils.animations.FadeAnimations
+import ru.surfstudio.android.navigation.sample.app.utils.animations.SlideAnimations
 
 class App : Application() {
 
+    companion object {
+        lateinit var executor: AppCommandExecutorWithResult
+        lateinit var provider: ActivityNavigationProvider
+        lateinit var resultObserver: ScreenResultObserver
+    }
+
     override fun onCreate() {
         super.onCreate()
-        // TODO
+        val storage = FileScreenResultStorage(
+                ContextCompat.getNoBackupFilesDir(this)!!.absolutePath
+        )
+        val screenResultEmmiter = ScreenResultBus(storage)
+        val activityNavigationProviderCallbacks = ActivityNavigationProviderCallbacks(
+                activityNavigatorFactory = ActivityNavigatorWithResultFactory()
+        )
+        registerActivityLifecycleCallbacks(activityNavigationProviderCallbacks)
+        provider = activityNavigationProviderCallbacks
+        executor = AppCommandExecutorWithResult(screenResultEmmiter, activityNavigationProviderCallbacks)
+
+        DefaultAnimations.fragment = SlideAnimations()
+        DefaultAnimations.tab = FadeAnimations()
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt
index 62f9f5e3f9..2394b103c4 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt
@@ -2,15 +2,21 @@ package ru.surfstudio.android.navigation.sample.app.screen
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import ru.surfstudio.android.navigation.command.fragment.Add
+import ru.surfstudio.android.navigation.provider.container.FragmentNavigationContainer
 import ru.surfstudio.android.navigation.sample.R
+import ru.surfstudio.android.navigation.sample.app.App
+import ru.surfstudio.android.navigation.sample.app.screen.splash.SplashRoute
 
-class MainActivity : AppCompatActivity() {
+class MainActivity : AppCompatActivity(), FragmentNavigationContainer {
+
+    override val containerId: Int = R.id.fragment_container
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_single)
         if (savedInstanceState == null) { //Adding fragment only on first create
-            // TODO
+            App.executor.execute(Add(SplashRoute()))
         }
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/auth/AuthFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/auth/AuthFragment.kt
index 7de936774a..fe96a2d31d 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/auth/AuthFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/auth/AuthFragment.kt
@@ -6,7 +6,11 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import kotlinx.android.synthetic.main.fragment_auth.*
+import ru.surfstudio.android.navigation.command.fragment.Replace
+import ru.surfstudio.android.navigation.command.fragment.ReplaceHard
 import ru.surfstudio.android.navigation.sample.R
+import ru.surfstudio.android.navigation.sample.app.App
+import ru.surfstudio.android.navigation.sample.app.screen.main.MainRoute
 
 class AuthFragment : Fragment() {
 
@@ -16,7 +20,7 @@ class AuthFragment : Fragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         auth_btn.setOnClickListener {
-
+            App.executor.execute(ReplaceHard(MainRoute()))
         }
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt
index 2d7d6b7f47..a63f3c7186 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt
@@ -6,14 +6,18 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import kotlinx.android.synthetic.main.fragment_main.*
+import ru.surfstudio.android.navigation.command.fragment.RemoveLast
+import ru.surfstudio.android.navigation.command.fragment.Replace
 import ru.surfstudio.android.navigation.provider.container.TabFragmentNavigationContainer
 import ru.surfstudio.android.navigation.route.fragment.FragmentRoute
 import ru.surfstudio.android.navigation.sample.R
+import ru.surfstudio.android.navigation.sample.app.App
 import ru.surfstudio.android.navigation.sample.app.screen.main.MainTabType.*
-import ru.surfstudio.android.navigation.sample.app.screen.main.gallery.GalleryTabRoute
+import ru.surfstudio.android.navigation.sample.app.screen.main.gallery.GalleryRoute
 import ru.surfstudio.android.navigation.sample.app.screen.main.home.HomeTabRoute
 import ru.surfstudio.android.navigation.sample.app.screen.main.profile.ProfileTabRoute
 import ru.surfstudio.android.navigation.sample.app.utils.addOnBackPressedListener
+import ru.surfstudio.android.navigation.sample.app.utils.animations.FadeAnimations
 
 class MainFragment : Fragment(), TabFragmentNavigationContainer {
 
@@ -44,16 +48,23 @@ class MainFragment : Fragment(), TabFragmentNavigationContainer {
 
     private fun initBackPressedListener() {
         addOnBackPressedListener {
-
+            App.executor.execute(
+                    RemoveLast()
+            )
         }
     }
 
     private fun navigateToTab(type: MainTabType) {
         val route: FragmentRoute = when (type) {
             HOME -> HomeTabRoute()
-            GALLERY -> GalleryTabRoute()
+            GALLERY -> GalleryRoute.Tab()
             PROFILE -> ProfileTabRoute()
         }
-
+        App.executor.execute(
+                Replace(route = route,
+                animations = FadeAnimations(),
+                         sourceTag = ""
+                )
+        )
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/GalleryTabRoute.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/GalleryRoute.kt
similarity index 71%
rename from navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/GalleryTabRoute.kt
rename to navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/GalleryRoute.kt
index 2e0949a960..4310fa7e39 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/GalleryTabRoute.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/GalleryRoute.kt
@@ -4,6 +4,11 @@ import androidx.fragment.app.Fragment
 import ru.surfstudio.android.navigation.route.fragment.FragmentRoute
 import ru.surfstudio.android.navigation.route.tab.TabHeadRoute
 
-class GalleryTabRoute : FragmentRoute(), TabHeadRoute {
+sealed class GalleryRoute : FragmentRoute() {
+
     override fun getScreenClass(): Class<out Fragment>? = GalleryTabFragment::class.java
+
+    class Tab : GalleryRoute(), TabHeadRoute
+
+    class FullScreen : GalleryRoute()
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/HomeTabFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/HomeTabFragment.kt
index 5d5008d069..bb92d2da5b 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/HomeTabFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/HomeTabFragment.kt
@@ -5,7 +5,12 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import kotlinx.android.synthetic.main.fragment_home.*
+import ru.surfstudio.android.navigation.command.fragment.Replace
+import ru.surfstudio.android.navigation.command.fragment.base.FragmentNavigationCommand
 import ru.surfstudio.android.navigation.sample.R
+import ru.surfstudio.android.navigation.sample.app.App
+import ru.surfstudio.android.navigation.sample.app.screen.main.gallery.GalleryRoute
 
 class HomeTabFragment : Fragment() {
 
@@ -15,6 +20,8 @@ class HomeTabFragment : Fragment() {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-
+        home_galery_btn.setOnClickListener {
+            App.executor.execute(Replace(GalleryRoute.FullScreen(), sourceTag = ""))
+        }
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/ProfileTabFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/ProfileTabFragment.kt
index 8e164b1180..4857841b8f 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/ProfileTabFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/ProfileTabFragment.kt
@@ -34,7 +34,7 @@ class ProfileTabFragment : Fragment() {
         profile_settings_btn.setOnClickListener {  }
         profile_about_app_btn.setOnClickListener {  }
         profile_logout_btn.setOnClickListener {  }
-        profile_attach_photo_btn.setOnClickListener {
+        profile_custom_stack_btn.setOnClickListener {
 
         }
 
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/splash/SplashFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/splash/SplashFragment.kt
index 871dbe8484..f9dc871107 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/splash/SplashFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/splash/SplashFragment.kt
@@ -6,7 +6,11 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import ru.surfstudio.android.navigation.command.fragment.ReplaceHard
 import ru.surfstudio.android.navigation.sample.R
+import ru.surfstudio.android.navigation.sample.app.App
+import ru.surfstudio.android.navigation.sample.app.screen.auth.AuthRoute
+import ru.surfstudio.android.navigation.sample.app.utils.animations.FadeAnimations
 
 class SplashFragment : Fragment() {
 
@@ -17,7 +21,7 @@ class SplashFragment : Fragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         Handler().postDelayed({
-            // TODO
+            App.executor.execute(ReplaceHard(AuthRoute(), animations = FadeAnimations()))
         }, 1500L)
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/res/anim/slide_in_from_bottom.xml b/navigation/sample/src/main/res/anim/slide_in_from_bottom.xml
new file mode 100644
index 0000000000..48167b4fa5
--- /dev/null
+++ b/navigation/sample/src/main/res/anim/slide_in_from_bottom.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="300"
+    android:fromYDelta="100%"
+    android:interpolator="@android:anim/accelerate_interpolator"
+    android:toYDelta="0%" />
\ No newline at end of file
diff --git a/navigation/sample/src/main/res/anim/slide_out_to_bottom.xml b/navigation/sample/src/main/res/anim/slide_out_to_bottom.xml
new file mode 100644
index 0000000000..7352490789
--- /dev/null
+++ b/navigation/sample/src/main/res/anim/slide_out_to_bottom.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="300"
+    android:fromYDelta="0%"
+    android:interpolator="@android:anim/accelerate_interpolator"
+    android:toYDelta="100%" />
\ No newline at end of file
diff --git a/navigation/sample/src/main/res/layout/fragment_home.xml b/navigation/sample/src/main/res/layout/fragment_home.xml
index 37884d25d9..bde5e9c28f 100644
--- a/navigation/sample/src/main/res/layout/fragment_home.xml
+++ b/navigation/sample/src/main/res/layout/fragment_home.xml
@@ -12,10 +12,10 @@
         android:textSize="24sp" />
 
     <Button
-        android:id="@+id/home_add_btn"
+        android:id="@+id/home_galery_btn"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         android:layout_margin="16dp"
-        android:text="Add" />
+        android:text="Gallery fullscreen" />
 </FrameLayout>
\ No newline at end of file
diff --git a/navigation/sample/src/main/res/layout/fragment_profile.xml b/navigation/sample/src/main/res/layout/fragment_profile.xml
index 4c21f96482..c0e5197a2e 100644
--- a/navigation/sample/src/main/res/layout/fragment_profile.xml
+++ b/navigation/sample/src/main/res/layout/fragment_profile.xml
@@ -19,12 +19,12 @@
         android:orientation="vertical">
 
         <Button
-            android:id="@+id/profile_attach_photo_btn"
+            android:id="@+id/profile_custom_stack_btn"
             android:layout_width="match_parent"
             android:layout_height="56dp"
             android:layout_marginHorizontal="16dp"
             android:layout_marginBottom="16dp"
-            android:text="Attach Photo" />
+            android:text="open custom stack" />
 
         <Button
             android:id="@+id/profile_settings_btn"

From df1394e7353ced875036f4ce323e1cc4b20a0990 Mon Sep 17 00:00:00 2001
From: Ruslan Sharipov <sharipov@surfstudio.ru>
Date: Wed, 24 Feb 2021 14:24:59 +0300
Subject: [PATCH 03/15] ANDDEP-1103 added group command execution

---
 .../command/activity/StartForResult.kt        |  2 +-
 .../navigation/command/activity/Finish.kt     |  2 +
 .../command/activity/FinishAffinity.kt        |  2 +
 .../navigation/command/activity/Replace.kt    |  2 +-
 .../navigation/command/activity/Start.kt      |  2 +-
 .../base/ActivityNavigationCommand.kt         |  4 ++
 .../navigation/executor/AppCommandExecutor.kt | 55 ++++++++++---------
 .../activity/ActivityCommandExecutor.kt       | 14 ++++-
 .../navigator/activity/ActivityNavigator.kt   | 10 ++++
 .../activity/ActivityNavigatorInterface.kt    |  2 +
 .../ActivityNavigationProviderCallbacks.kt    |  2 +-
 .../sample/src/main/AndroidManifest.xml       |  1 +
 .../sample/app/screen/MainActivity.kt         |  8 ++-
 .../app/screen/number/NumberActivity.kt       | 17 ++++++
 .../sample/app/screen/number/NumberRoute.kt   | 25 +++++++++
 .../src/main/res/layout/activity_number.xml   | 13 +++++
 16 files changed, 127 insertions(+), 34 deletions(-)
 create mode 100644 navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/number/NumberActivity.kt
 create mode 100644 navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/number/NumberRoute.kt
 create mode 100644 navigation/sample/src/main/res/layout/activity_number.xml

diff --git a/navigation/lib-navigation-observer/src/main/java/ru/surfstudio/android/navigation/observer/command/activity/StartForResult.kt b/navigation/lib-navigation-observer/src/main/java/ru/surfstudio/android/navigation/observer/command/activity/StartForResult.kt
index f1586842d9..fde4af9149 100644
--- a/navigation/lib-navigation-observer/src/main/java/ru/surfstudio/android/navigation/observer/command/activity/StartForResult.kt
+++ b/navigation/lib-navigation-observer/src/main/java/ru/surfstudio/android/navigation/observer/command/activity/StartForResult.kt
@@ -14,5 +14,5 @@ import java.io.Serializable
 class StartForResult<T : Serializable, R>(
         override val route: R,
         override val animations: Animations = DefaultAnimations.activity,
-        val activityOptions: Bundle? = null
+        override val activityOptions: Bundle? = null
 ) : ActivityNavigationCommand where R : ActivityWithResultRoute<T>
diff --git a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/Finish.kt b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/Finish.kt
index 1a02c0a960..8e6ee21ffc 100644
--- a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/Finish.kt
+++ b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/Finish.kt
@@ -1,5 +1,6 @@
 package ru.surfstudio.android.navigation.command.activity
 
+import android.os.Bundle
 import ru.surfstudio.android.navigation.animation.Animations
 import ru.surfstudio.android.navigation.animation.DefaultAnimations
 import ru.surfstudio.android.navigation.command.activity.base.ActivityNavigationCommand
@@ -14,4 +15,5 @@ data class Finish(
 ) : ActivityNavigationCommand {
 
     override val route: ActivityRoute = StubActivityRoute
+    override val activityOptions: Bundle? = null
 }
\ No newline at end of file
diff --git a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/FinishAffinity.kt b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/FinishAffinity.kt
index 361f06972b..14b38570ba 100644
--- a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/FinishAffinity.kt
+++ b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/FinishAffinity.kt
@@ -1,5 +1,6 @@
 package ru.surfstudio.android.navigation.command.activity
 
+import android.os.Bundle
 import ru.surfstudio.android.navigation.animation.Animations
 import ru.surfstudio.android.navigation.animation.DefaultAnimations
 import ru.surfstudio.android.navigation.command.activity.base.ActivityNavigationCommand
@@ -14,4 +15,5 @@ data class FinishAffinity(
 ) : ActivityNavigationCommand {
 
     override val route: ActivityRoute = StubActivityRoute
+    override val activityOptions: Bundle? = null
 }
\ No newline at end of file
diff --git a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/Replace.kt b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/Replace.kt
index 369ebfee90..0578d6615c 100644
--- a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/Replace.kt
+++ b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/Replace.kt
@@ -12,5 +12,5 @@ import ru.surfstudio.android.navigation.route.activity.ActivityRoute
 data class Replace(
         override val route: ActivityRoute,
         override val animations: Animations = DefaultAnimations.activity,
-        val activityOptions: Bundle? = null
+        override val activityOptions: Bundle? = null
 ) : ActivityNavigationCommand
\ No newline at end of file
diff --git a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/Start.kt b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/Start.kt
index 8e85a73a9b..a330d66afa 100644
--- a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/Start.kt
+++ b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/Start.kt
@@ -12,5 +12,5 @@ import ru.surfstudio.android.navigation.route.activity.ActivityRoute
 data class Start(
         override val route: ActivityRoute,
         override val animations: Animations = DefaultAnimations.activity,
-        val activityOptions: Bundle? = null
+        override val activityOptions: Bundle? = null
 ) : ActivityNavigationCommand
\ No newline at end of file
diff --git a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/base/ActivityNavigationCommand.kt b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/base/ActivityNavigationCommand.kt
index 72f0851ea3..870bc8c27b 100644
--- a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/base/ActivityNavigationCommand.kt
+++ b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/base/ActivityNavigationCommand.kt
@@ -1,5 +1,7 @@
 package ru.surfstudio.android.navigation.command.activity.base
 
+import android.os.Bundle
+import ru.surfstudio.android.navigation.animation.Animations
 import ru.surfstudio.android.navigation.command.NavigationCommand
 import ru.surfstudio.android.navigation.route.activity.ActivityRoute
 
@@ -8,4 +10,6 @@ import ru.surfstudio.android.navigation.route.activity.ActivityRoute
  */
 interface ActivityNavigationCommand: NavigationCommand {
     override val route: ActivityRoute
+    override val animations: Animations
+    val activityOptions: Bundle?
 }
\ No newline at end of file
diff --git a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt
index d8f04fed86..4d9ed2abfd 100644
--- a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt
+++ b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt
@@ -1,7 +1,9 @@
 package ru.surfstudio.android.navigation.executor
 
 import android.os.Handler
+import android.os.Looper
 import ru.surfstudio.android.navigation.command.NavigationCommand
+import ru.surfstudio.android.navigation.command.activity.Start
 import ru.surfstudio.android.navigation.command.activity.base.ActivityNavigationCommand
 import ru.surfstudio.android.navigation.command.dialog.base.DialogNavigationCommand
 import ru.surfstudio.android.navigation.command.fragment.base.FragmentNavigationCommand
@@ -23,6 +25,7 @@ open class AppCommandExecutor(
         protected val dialogCommandExecutor: DialogCommandExecutor = DialogCommandExecutor(activityNavigationProvider)
 ) : NavigationCommandExecutor {
 
+    protected val handler = Handler(Looper.getMainLooper())
     protected val buffer = mutableListOf<NavigationCommand>()
     protected val commandQueue: Queue<NavigationCommand> = LinkedList()
 
@@ -45,11 +48,15 @@ open class AppCommandExecutor(
         if (activityNavigationProvider.hasCurrentHolder()) {
             divideExecution(commands)
         } else {
-            buffer.addAll(commands)
-            activityNavigationProvider.setOnHolderActiveListenerSingle { utilizeBuffer() }
+            executeWithNewNavigator(commands)
         }
     }
 
+    private fun executeWithNewNavigator(commands: List<NavigationCommand>) {
+        buffer.addAll(commands)
+        activityNavigationProvider.setOnHolderActiveListenerSingle { utilizeBuffer() }
+    }
+
     /**
      * Smart execution of a command queue.
      *
@@ -70,35 +77,33 @@ open class AppCommandExecutor(
     protected open fun divideExecution(commands: List<NavigationCommand>) {
         if (commands.isEmpty()) return
 
-        val isStartingWithAsyncCommand = checkCommandAsync(commands.first())
-        val asyncCommands: List<NavigationCommand>
-        val syncCommands: List<NavigationCommand>
+        val firstCommand = commands.first()
+        val isStartingWithAsyncCommand = checkCommandAsync(firstCommand)
 
         if (isStartingWithAsyncCommand) {
-            asyncCommands = commands.takeWhile(::checkCommandAsync)
-            syncCommands = commands.takeLast(commands.size - asyncCommands.size)
-
-            val hasAsyncCommands = asyncCommands.isNotEmpty()
-            val hasSyncCommands = syncCommands.isNotEmpty()
-
-            if (hasAsyncCommands) queueCommands(asyncCommands)
-
-            when {
-                hasAsyncCommands && hasSyncCommands -> postponeExecution(syncCommands)
-                hasSyncCommands -> divideExecution(syncCommands)
+            val firstNotStartIndex = commands.indexOfFirst { command -> command !is Start }
+            if (firstNotStartIndex > 1) {
+                executeWithNewNavigator(commands.subList(firstNotStartIndex, commands.lastIndex))
+                startSeveralActivities(commands.take(firstNotStartIndex))
+            } else {
+                executeWithNewNavigator(commands.drop(1))
+                dispatchCommand(firstCommand)
             }
         } else {
-            syncCommands = commands.takeWhile { !checkCommandAsync(it) }
-            asyncCommands = commands.takeLast(commands.size - syncCommands.size)
-
-            val hasAsyncCommands = asyncCommands.isNotEmpty()
-            val hasSyncCommands = syncCommands.isNotEmpty()
-
-            if (hasSyncCommands) queueCommands(syncCommands)
-            if (hasAsyncCommands) safeExecuteWithBuffer(asyncCommands)
+            val firstAsyncCommandIndex = commands.indexOfFirst { checkCommandAsync(it) }
+            if (firstAsyncCommandIndex >= 1) {
+                safeExecuteWithBuffer(commands.subList(firstAsyncCommandIndex, commands.lastIndex))
+                queueCommands(commands.take(firstAsyncCommandIndex))
+            } else {
+                queueCommands(commands)
+            }
         }
     }
 
+    private fun startSeveralActivities(commands: List<NavigationCommand>) {
+        activityCommandExecutor.execute(commands.map { it as ActivityNavigationCommand })
+    }
+
     /**
      * Puts navigation commands in queue if current [commandQueue] is not empty,
      * i.e if we're currently in process of executing commands.
@@ -143,7 +148,7 @@ open class AppCommandExecutor(
      * Postpones command execution to the end of the Message Queue.
      */
     protected open fun postponeExecution(commands: List<NavigationCommand>) {
-        Handler().post { safeExecuteWithBuffer(commands) }
+        handler.post { safeExecuteWithBuffer(commands) }
     }
 
     /**
diff --git a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/screen/activity/ActivityCommandExecutor.kt b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/screen/activity/ActivityCommandExecutor.kt
index b00ecf2664..a62bdab31a 100644
--- a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/screen/activity/ActivityCommandExecutor.kt
+++ b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/screen/activity/ActivityCommandExecutor.kt
@@ -4,6 +4,7 @@ import ru.surfstudio.android.navigation.command.activity.*
 import ru.surfstudio.android.navigation.command.activity.base.ActivityNavigationCommand
 import ru.surfstudio.android.navigation.provider.ActivityNavigationProvider
 import ru.surfstudio.android.navigation.executor.CommandExecutor
+import ru.surfstudio.android.navigation.navigator.activity.ActivityNavigatorInterface
 
 /**
  * Command executor for [ActivityNavigationCommand]s.
@@ -14,8 +15,10 @@ open class ActivityCommandExecutor(
         private val activityNavigationProvider: ActivityNavigationProvider
 ) : CommandExecutor<ActivityNavigationCommand> {
 
+    private val navigator: ActivityNavigatorInterface
+        get() = activityNavigationProvider.provide().activityNavigator
+
     override fun execute(command: ActivityNavigationCommand) {
-        val navigator = activityNavigationProvider.provide().activityNavigator
         when (command) {
             is Start -> navigator.start(command.route, command.animations, command.activityOptions)
             is Replace -> navigator.replace(command.route, command.animations, command.activityOptions)
@@ -25,6 +28,13 @@ open class ActivityCommandExecutor(
     }
 
     override fun execute(commands: List<ActivityNavigationCommand>) {
-        TODO("Activity navigation command list execution")
+        if (commands.isEmpty()) return
+
+        val lastCommand = commands.first() as Start
+        navigator.start(
+                routes = commands.map { it.route },
+                animations = lastCommand.animations,
+                activityOptions = lastCommand.activityOptions
+        )
     }
 }
\ No newline at end of file
diff --git a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/activity/ActivityNavigator.kt b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/activity/ActivityNavigator.kt
index fde8486645..79d2952731 100644
--- a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/activity/ActivityNavigator.kt
+++ b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/activity/ActivityNavigator.kt
@@ -10,6 +10,16 @@ open class ActivityNavigator(val activity: AppCompatActivity) : ActivityNavigato
 
     protected open val animationSupplier = ActivityAnimationSupplier()
 
+    override fun start(routes: List<ActivityRoute>, animations: Animations, activityOptions: Bundle?) {
+        val intents = Array(routes.size) { index: Int ->
+            val route = routes[index]
+            route.createIntent(activity)
+        }
+        val optionsWithAnimations: Bundle? =
+                animationSupplier.supplyWithAnimations(activity, activityOptions, animations)
+        activity.startActivities(intents, optionsWithAnimations)
+    }
+
     override fun start(route: ActivityRoute, animations: Animations, activityOptions: Bundle?) {
         val optionsWithAnimations =
                 animationSupplier.supplyWithAnimations(activity, activityOptions, animations)
diff --git a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/activity/ActivityNavigatorInterface.kt b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/activity/ActivityNavigatorInterface.kt
index 890c3ba6bb..e78f4f3058 100644
--- a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/activity/ActivityNavigatorInterface.kt
+++ b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/activity/ActivityNavigatorInterface.kt
@@ -9,6 +9,8 @@ import ru.surfstudio.android.navigation.route.activity.ActivityRoute
  */
 interface ActivityNavigatorInterface {
 
+    fun start(routes: List<ActivityRoute>, animations: Animations, activityOptions: Bundle?)
+
     fun start(route: ActivityRoute, animations: Animations, activityOptions: Bundle?)
 
     fun replace(route: ActivityRoute, animations: Animations, activityOptions: Bundle?)
diff --git a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/provider/callbacks/ActivityNavigationProviderCallbacks.kt b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/provider/callbacks/ActivityNavigationProviderCallbacks.kt
index 5fcb6c6e9e..ea57d8e66e 100644
--- a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/provider/callbacks/ActivityNavigationProviderCallbacks.kt
+++ b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/provider/callbacks/ActivityNavigationProviderCallbacks.kt
@@ -80,7 +80,7 @@ open class ActivityNavigationProviderCallbacks(
                 // So, we're just waiting until it executes all actions, and then updating holder status.
                 handler.post { updateCurrentHolder(id) }
             } else {
-                updateCurrentHolder(id)
+                handler.post { updateCurrentHolder(id) }
             }
         }
     }
diff --git a/navigation/sample/src/main/AndroidManifest.xml b/navigation/sample/src/main/AndroidManifest.xml
index b7339cfc23..3ef4cdabac 100644
--- a/navigation/sample/src/main/AndroidManifest.xml
+++ b/navigation/sample/src/main/AndroidManifest.xml
@@ -45,6 +45,7 @@
             </intent-filter>
         </activity>
         <activity android:name=".app.screen.main.profile.about.AboutActivity" />
+        <activity android:name=".app.screen.number.NumberActivity"/>
 
         <provider
             android:name=".app.screen.system.AppFileProvider"
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt
index 2394b103c4..2e94391344 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt
@@ -2,11 +2,13 @@ package ru.surfstudio.android.navigation.sample.app.screen
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import ru.surfstudio.android.navigation.command.fragment.Add
+import ru.surfstudio.android.navigation.command.activity.Replace
+import ru.surfstudio.android.navigation.command.activity.Start
 import ru.surfstudio.android.navigation.provider.container.FragmentNavigationContainer
 import ru.surfstudio.android.navigation.sample.R
 import ru.surfstudio.android.navigation.sample.app.App
-import ru.surfstudio.android.navigation.sample.app.screen.splash.SplashRoute
+import ru.surfstudio.android.navigation.sample.app.screen.number.NumberRoute
+import ru.surfstudio.android.navigation.sample.app.utils.animations.SlideAnimations
 
 class MainActivity : AppCompatActivity(), FragmentNavigationContainer {
 
@@ -16,7 +18,7 @@ class MainActivity : AppCompatActivity(), FragmentNavigationContainer {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_single)
         if (savedInstanceState == null) { //Adding fragment only on first create
-            App.executor.execute(Add(SplashRoute()))
+            App.executor.execute(listOf(Replace(NumberRoute(0),  animations = SlideAnimations()), Start(NumberRoute(1)), Start(NumberRoute(2)), Start(NumberRoute(3))))
         }
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/number/NumberActivity.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/number/NumberActivity.kt
new file mode 100644
index 0000000000..aa1d2ef521
--- /dev/null
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/number/NumberActivity.kt
@@ -0,0 +1,17 @@
+package ru.surfstudio.android.navigation.sample.app.screen.number
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import kotlinx.android.synthetic.main.activity_number.*
+import ru.surfstudio.android.navigation.sample.R
+
+class NumberActivity: AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_number)
+
+        val route = NumberRoute(intent)
+        activity_number_tv.text = route.number.toString()
+    }
+}
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/number/NumberRoute.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/number/NumberRoute.kt
new file mode 100644
index 0000000000..495dc00bf5
--- /dev/null
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/number/NumberRoute.kt
@@ -0,0 +1,25 @@
+package ru.surfstudio.android.navigation.sample.app.screen.number
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.core.os.bundleOf
+import ru.surfstudio.android.navigation.route.Route
+import ru.surfstudio.android.navigation.route.activity.ActivityRoute
+import ru.surfstudio.android.navigation.route.activity.getDataBundle
+
+class NumberRoute(val number: Int): ActivityRoute() {
+
+    constructor(intent: Intent) : this(intent.getDataBundle()?.getInt(Route.EXTRA_FIRST) ?: 0)
+
+    override fun getId(): String {
+        return super.getId() + number
+    }
+
+    override fun prepareData(): Bundle {
+        return bundleOf(Route.EXTRA_FIRST to number)
+    }
+
+    override fun getScreenClassPath(): String {
+        return "ru.surfstudio.android.navigation.sample.app.screen.number.NumberActivity"
+    }
+}
\ No newline at end of file
diff --git a/navigation/sample/src/main/res/layout/activity_number.xml b/navigation/sample/src/main/res/layout/activity_number.xml
new file mode 100644
index 0000000000..4f9d306f3a
--- /dev/null
+++ b/navigation/sample/src/main/res/layout/activity_number.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/activity_number_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:textSize="32sp" />
+
+</FrameLayout>
\ No newline at end of file

From e8c99660c49bce37216a0bb65b27990b6d472dbd Mon Sep 17 00:00:00 2001
From: Ruslan Sharipov <sharipov@surfstudio.ru>
Date: Mon, 1 Mar 2021 11:06:58 +0300
Subject: [PATCH 04/15] ANDDEP-1103 sequent asynchronous command execution
 logic

---
 .../navigation/executor/AppCommandExecutor.kt | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt
index 4d9ed2abfd..8918b11eb4 100644
--- a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt
+++ b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt
@@ -82,12 +82,23 @@ open class AppCommandExecutor(
 
         if (isStartingWithAsyncCommand) {
             val firstNotStartIndex = commands.indexOfFirst { command -> command !is Start }
-            if (firstNotStartIndex > 1) {
-                executeWithNewNavigator(commands.subList(firstNotStartIndex, commands.lastIndex))
-                startSeveralActivities(commands.take(firstNotStartIndex))
-            } else {
-                executeWithNewNavigator(commands.drop(1))
-                dispatchCommand(firstCommand)
+            when {
+                // we have only Start commands, just execute them
+                firstNotStartIndex == -1 -> {
+                    startSeveralActivities(commands)
+                }
+                // we have several start commands and commands of other types right after them, so
+                // we start activities first and execute the rest of commands with a new navigator
+                firstNotStartIndex > 1 -> {
+                    startSeveralActivities(commands.take(firstNotStartIndex))
+                    executeWithNewNavigator(commands.subList(firstNotStartIndex, commands.lastIndex))
+                }
+                // Here are other cases, where we just execute first command and postpone other
+                // commands execution
+                else -> {
+                    executeWithNewNavigator(commands.drop(1))
+                    dispatchCommand(firstCommand)
+                }
             }
         } else {
             val firstAsyncCommandIndex = commands.indexOfFirst { checkCommandAsync(it) }

From c2b90e8f6bf122b4ee49703a2368db94ba87621a Mon Sep 17 00:00:00 2001
From: Ruslan Sharipov <sharipov@surfstudio.ru>
Date: Mon, 1 Mar 2021 12:10:00 +0300
Subject: [PATCH 05/15] ANDDEP-1103 sequent asynchronous command execution
 logic

---
 .../navigation/executor/AppCommandExecutor.kt | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt
index 8918b11eb4..52258b5013 100644
--- a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt
+++ b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt
@@ -48,13 +48,20 @@ open class AppCommandExecutor(
         if (activityNavigationProvider.hasCurrentHolder()) {
             divideExecution(commands)
         } else {
-            executeWithNewNavigator(commands)
+            postponeExecution(commands)
         }
     }
 
-    private fun executeWithNewNavigator(commands: List<NavigationCommand>) {
-        buffer.addAll(commands)
-        activityNavigationProvider.setOnHolderActiveListenerSingle { utilizeBuffer() }
+
+    /**
+     * Postpones command execution to the end of the Message Queue
+     * and executes [commands] with the next available navigator
+     */
+    private fun postponeExecution(commands: List<NavigationCommand>) {
+        handler.post {
+            buffer.addAll(commands)
+            activityNavigationProvider.setOnHolderActiveListenerSingle { utilizeBuffer() }
+        }
     }
 
     /**
@@ -87,17 +94,17 @@ open class AppCommandExecutor(
                 firstNotStartIndex == -1 -> {
                     startSeveralActivities(commands)
                 }
-                // we have several start commands and commands of other types right after them, so
-                // we start activities first and execute the rest of commands with a new navigator
+                // we have several Start commands and commands of other types right after them, so
+                // we start activities first and postpone the execution of the rest of commands
                 firstNotStartIndex > 1 -> {
                     startSeveralActivities(commands.take(firstNotStartIndex))
-                    executeWithNewNavigator(commands.subList(firstNotStartIndex, commands.lastIndex))
+                    postponeExecution(commands.subList(firstNotStartIndex, commands.lastIndex))
                 }
                 // Here are other cases, where we just execute first command and postpone other
                 // commands execution
                 else -> {
-                    executeWithNewNavigator(commands.drop(1))
                     dispatchCommand(firstCommand)
+                    postponeExecution(commands.drop(1))
                 }
             }
         } else {
@@ -155,13 +162,6 @@ open class AppCommandExecutor(
         }
     }
 
-    /**
-     * Postpones command execution to the end of the Message Queue.
-     */
-    protected open fun postponeExecution(commands: List<NavigationCommand>) {
-        handler.post { safeExecuteWithBuffer(commands) }
-    }
-
     /**
      * Checks whether the effect of this command will be shown immediately after execution,
      * or it will take some time to appear.

From 5dfcb90811b58d4d8ee3b7fb85dfed72984b4a4a Mon Sep 17 00:00:00 2001
From: Ruslan Sharipov <sharipov@surfstudio.ru>
Date: Mon, 1 Mar 2021 15:33:32 +0300
Subject: [PATCH 06/15] ANDDEP-1103 async finish execution

---
 .../navigation/executor/AppCommandExecutor.kt | 34 +++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt
index 52258b5013..dc932ef1cd 100644
--- a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt
+++ b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt
@@ -3,6 +3,8 @@ package ru.surfstudio.android.navigation.executor
 import android.os.Handler
 import android.os.Looper
 import ru.surfstudio.android.navigation.command.NavigationCommand
+import ru.surfstudio.android.navigation.command.activity.Finish
+import ru.surfstudio.android.navigation.command.activity.FinishAffinity
 import ru.surfstudio.android.navigation.command.activity.Start
 import ru.surfstudio.android.navigation.command.activity.base.ActivityNavigationCommand
 import ru.surfstudio.android.navigation.command.dialog.base.DialogNavigationCommand
@@ -98,19 +100,32 @@ open class AppCommandExecutor(
                 // we start activities first and postpone the execution of the rest of commands
                 firstNotStartIndex > 1 -> {
                     startSeveralActivities(commands.take(firstNotStartIndex))
-                    postponeExecution(commands.subList(firstNotStartIndex, commands.lastIndex))
+                    postponeExecution(commands.subList(firstNotStartIndex, commands.size))
                 }
-                // Here are other cases, where we just execute first command and postpone other
-                // commands execution
+                /**
+                 * Here are other cases, where we just execute first command.
+                 * If we have to Finish activity or affinity we need to check the next command after
+                 * it. If it's async but not Finish command we can immediately execute it with
+                 * current navigator. Otherwise we postpone execution until the next navigator
+                 * is available.
+                 */
                 else -> {
                     dispatchCommand(firstCommand)
-                    postponeExecution(commands.drop(1))
+                    val restCommands = commands.drop(1)
+                    val canExecuteImmediately: Boolean = restCommands.isNotEmpty()
+                            && checkCommandAsync(restCommands[0])
+                            && !isFinishCommand(restCommands[0])
+                    if (canExecuteImmediately){
+                        divideExecution(restCommands)
+                    } else {
+                        postponeExecution(restCommands)
+                    }
                 }
             }
         } else {
             val firstAsyncCommandIndex = commands.indexOfFirst { checkCommandAsync(it) }
             if (firstAsyncCommandIndex >= 1) {
-                safeExecuteWithBuffer(commands.subList(firstAsyncCommandIndex, commands.lastIndex))
+                safeExecuteWithBuffer(commands.subList(firstAsyncCommandIndex, commands.size))
                 queueCommands(commands.take(firstAsyncCommandIndex))
             } else {
                 queueCommands(commands)
@@ -118,6 +133,10 @@ open class AppCommandExecutor(
         }
     }
 
+    private fun isFinishCommand(command: NavigationCommand): Boolean {
+        return command is Finish || command is FinishAffinity
+    }
+
     private fun startSeveralActivities(commands: List<NavigationCommand>) {
         activityCommandExecutor.execute(commands.map { it as ActivityNavigationCommand })
     }
@@ -173,7 +192,10 @@ open class AppCommandExecutor(
      * Executes everything in buffer and cleans it.
      */
     protected fun utilizeBuffer() {
-        execute(buffer)
+        val commands = ArrayList(buffer)
         buffer.clear()
+        handler.post {
+            execute(commands)
+        }
     }
 }
\ No newline at end of file

From 92e388b284af1a2ab23f1dcfe0cea64e9b7ddb12 Mon Sep 17 00:00:00 2001
From: Ruslan Sharipov <sharipov@surfstudio.ru>
Date: Mon, 1 Mar 2021 17:28:15 +0300
Subject: [PATCH 07/15] ANDDEP-1103 sample adjustments after wrong branch merge

---
 .../sample/src/main/AndroidManifest.xml       |  2 +
 .../android/navigation/sample/app/App.kt      | 32 +++++++++-----
 .../sample/app/screen/MainActivity.kt         | 25 ++++++++---
 .../sample/app/screen/auth/AuthFragment.kt    | 13 +++++-
 .../sample/app/screen/flow/FlowActivity.kt    | 44 +++++++++++++++++++
 .../sample/app/screen/flow/FlowRoute.kt       | 25 +++++++++++
 .../sample/app/screen/main/MainFragment.kt    | 36 ++++++++++++---
 ...lleryTabFragment.kt => GalleryFragment.kt} | 10 +++--
 .../app/screen/main/gallery/GalleryRoute.kt   |  2 +-
 .../app/screen/main/home/HomeTabFragment.kt   |  7 +--
 .../main/home/nested/HomeNestedFragment.kt    |  2 +
 .../screen/main/profile/ProfileTabFragment.kt | 22 +++++++---
 .../main/profile/about/AboutActivity.kt       |  9 +++-
 .../app/screen/number/NumberActivity.kt       |  3 ++
 .../sample/app/screen/number/NumberRoute.kt   |  2 +-
 .../app/utils/animations/ModalAnimations.kt   | 11 +++++
 .../src/main/res/layout/activity_flow.xml     | 24 ++++++++++
 .../src/main/res/layout/fragment_home.xml     |  4 +-
 .../src/main/res/layout/fragment_profile.xml  |  4 +-
 19 files changed, 232 insertions(+), 45 deletions(-)
 create mode 100644 navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/flow/FlowActivity.kt
 create mode 100644 navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/flow/FlowRoute.kt
 rename navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/{GalleryTabFragment.kt => GalleryFragment.kt} (73%)
 create mode 100644 navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/utils/animations/ModalAnimations.kt
 create mode 100644 navigation/sample/src/main/res/layout/activity_flow.xml

diff --git a/navigation/sample/src/main/AndroidManifest.xml b/navigation/sample/src/main/AndroidManifest.xml
index 3ef4cdabac..4f968e93b9 100644
--- a/navigation/sample/src/main/AndroidManifest.xml
+++ b/navigation/sample/src/main/AndroidManifest.xml
@@ -38,6 +38,8 @@
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
 
+        <activity android:name="ru.surfstudio.android.navigation.sample.app.screen.flow.FlowActivity"/>
+
         <activity android:name="ru.surfstudio.android.navigation.sample.app.screen.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt
index fe9c739171..a1c4e52315 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt
@@ -3,6 +3,7 @@ package ru.surfstudio.android.navigation.sample.app
 import android.app.Application
 import androidx.core.content.ContextCompat
 import ru.surfstudio.android.navigation.animation.DefaultAnimations
+import ru.surfstudio.android.navigation.observer.ScreenResultEmitter
 import ru.surfstudio.android.navigation.observer.ScreenResultObserver
 import ru.surfstudio.android.navigation.observer.bus.ScreenResultBus
 import ru.surfstudio.android.navigation.observer.executor.AppCommandExecutorWithResult
@@ -23,18 +24,29 @@ class App : Application() {
 
     override fun onCreate() {
         super.onCreate()
-        val storage = FileScreenResultStorage(
-                ContextCompat.getNoBackupFilesDir(this)!!.absolutePath
-        )
-        val screenResultEmmiter = ScreenResultBus(storage)
-        val activityNavigationProviderCallbacks = ActivityNavigationProviderCallbacks(
+        initResultObserver()
+        initAnimations()
+    }
+
+    private fun initExecutor(screenResultEmitter: ScreenResultEmitter) {
+        val activityNavigationProvider = ActivityNavigationProviderCallbacks(
                 activityNavigatorFactory = ActivityNavigatorWithResultFactory()
         )
-        registerActivityLifecycleCallbacks(activityNavigationProviderCallbacks)
-        provider = activityNavigationProviderCallbacks
-        executor = AppCommandExecutorWithResult(screenResultEmmiter, activityNavigationProviderCallbacks)
+        registerActivityLifecycleCallbacks(activityNavigationProvider)
+        provider = activityNavigationProvider
+        executor = AppCommandExecutorWithResult(screenResultEmitter, activityNavigationProvider)
+    }
+
+    private fun initResultObserver() {
+        val filesDir = ContextCompat.getNoBackupFilesDir(this)!!.absolutePath
+        val storage = FileScreenResultStorage(filesDir)
+        val resultBus = ScreenResultBus(storage)
+        resultObserver = resultBus
+        initExecutor(resultBus)
+    }
 
-        DefaultAnimations.fragment = SlideAnimations()
-        DefaultAnimations.tab = FadeAnimations()
+    private fun initAnimations() {
+        DefaultAnimations.fragment = SlideAnimations() //animations for all fragment changes
+        DefaultAnimations.tab = FadeAnimations() //animations for tab changes
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt
index 2e94391344..ccddff42cb 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt
@@ -2,13 +2,12 @@ package ru.surfstudio.android.navigation.sample.app.screen
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import ru.surfstudio.android.navigation.command.activity.Replace
-import ru.surfstudio.android.navigation.command.activity.Start
+import ru.surfstudio.android.navigation.command.fragment.Add
 import ru.surfstudio.android.navigation.provider.container.FragmentNavigationContainer
 import ru.surfstudio.android.navigation.sample.R
 import ru.surfstudio.android.navigation.sample.app.App
-import ru.surfstudio.android.navigation.sample.app.screen.number.NumberRoute
-import ru.surfstudio.android.navigation.sample.app.utils.animations.SlideAnimations
+import ru.surfstudio.android.navigation.sample.app.screen.splash.SplashRoute
+import ru.surfstudio.android.navigation.sample.app.utils.animations.FadeAnimations
 
 class MainActivity : AppCompatActivity(), FragmentNavigationContainer {
 
@@ -18,7 +17,23 @@ class MainActivity : AppCompatActivity(), FragmentNavigationContainer {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_single)
         if (savedInstanceState == null) { //Adding fragment only on first create
-            App.executor.execute(listOf(Replace(NumberRoute(0),  animations = SlideAnimations()), Start(NumberRoute(1)), Start(NumberRoute(2)), Start(NumberRoute(3))))
+            App.executor.execute(Add(SplashRoute(), FadeAnimations()))
+//            val firstFlow = FlowRoute("first")
+//            val secondFlow = FlowRoute("second")
+//            App.executor.execute(
+//                    listOf(
+//                            Start(firstFlow),
+//                            Replace(ImageRoute(0), sourceTag = firstFlow.getId()),
+//                            Replace(ImageRoute(1), sourceTag = firstFlow.getId()),
+//                            Replace(ImageRoute(2), sourceTag = firstFlow.getId()),
+//                            Start(NumberRoute(0)),
+//                            Start(secondFlow),
+//                            Replace(ImageRoute(0), sourceTag = secondFlow.getId()),
+//                            Replace(ImageRoute(1), sourceTag = secondFlow.getId()),
+//                            Replace(ImageRoute(2), sourceTag = secondFlow.getId()),
+//                            Start(NumberRoute(1))
+//                    )
+//            )
         }
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/auth/AuthFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/auth/AuthFragment.kt
index fe96a2d31d..fc24fe96ac 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/auth/AuthFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/auth/AuthFragment.kt
@@ -11,6 +11,8 @@ import ru.surfstudio.android.navigation.command.fragment.ReplaceHard
 import ru.surfstudio.android.navigation.sample.R
 import ru.surfstudio.android.navigation.sample.app.App
 import ru.surfstudio.android.navigation.sample.app.screen.main.MainRoute
+import ru.surfstudio.android.navigation.sample.app.screen.main.gallery.GalleryRoute
+import ru.surfstudio.android.navigation.sample.app.screen.main.gallery.image.ImageRoute
 
 class AuthFragment : Fragment() {
 
@@ -19,8 +21,17 @@ class AuthFragment : Fragment() {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
+        val mainRoute = MainRoute()
+        val galleryRoute = GalleryRoute.Tab()
         auth_btn.setOnClickListener {
-            App.executor.execute(ReplaceHard(MainRoute()))
+            App.executor.execute(
+                    listOf(
+                            ReplaceHard(mainRoute), //opens main screen
+                            Replace(galleryRoute, sourceTag = mainRoute.getId()), //opens gallery tab in main
+                            Replace(ImageRoute(1), sourceTag = galleryRoute.getId()), //opens first nested image in gallery
+                            Replace(ImageRoute(2), sourceTag = galleryRoute.getId()) //opens second nested image in gallery
+                    )
+            )
         }
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/flow/FlowActivity.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/flow/FlowActivity.kt
new file mode 100644
index 0000000000..daa7c98523
--- /dev/null
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/flow/FlowActivity.kt
@@ -0,0 +1,44 @@
+package ru.surfstudio.android.navigation.sample.app.screen.flow
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import kotlinx.android.synthetic.main.activity_flow.*
+import ru.surfstudio.android.navigation.command.activity.Finish
+import ru.surfstudio.android.navigation.command.fragment.RemoveLast
+import ru.surfstudio.android.navigation.provider.container.FragmentNavigationContainer
+import ru.surfstudio.android.navigation.sample.R
+import ru.surfstudio.android.navigation.sample.app.App
+
+/**
+ * Активити - контейнер для фрагментов с возможностью отображать
+ * [FlowRoute.screenId] в текствью над дочерними фрагментами.
+ */
+class FlowActivity: AppCompatActivity(), FragmentNavigationContainer {
+
+    private lateinit var route: FlowRoute
+
+    override val containerId: Int = R.id.flow_fragment_container
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_flow)
+
+        route = FlowRoute(intent)
+
+        flow_title_tv.text = route.screenId
+    }
+
+    override fun onBackPressed() {
+        val screenId = route.getId()
+        val backStackEntryCount = App.provider.provide()
+                .fragmentNavigationProvider
+                .provide(screenId)
+                .fragmentNavigator.backStackEntryCount
+        val command = if (backStackEntryCount > 1){
+            RemoveLast(sourceTag = screenId)
+        } else {
+            Finish()
+        }
+        App.executor.execute(command)
+    }
+}
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/flow/FlowRoute.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/flow/FlowRoute.kt
new file mode 100644
index 0000000000..07fa4f5987
--- /dev/null
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/flow/FlowRoute.kt
@@ -0,0 +1,25 @@
+package ru.surfstudio.android.navigation.sample.app.screen.flow
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.core.os.bundleOf
+import ru.surfstudio.android.navigation.route.Route
+import ru.surfstudio.android.navigation.route.activity.ActivityRoute
+import ru.surfstudio.android.navigation.route.activity.getDataBundle
+
+class FlowRoute(val screenId: String): ActivityRoute() {
+
+    constructor(intent: Intent) : this(intent.getDataBundle()?.getString(Route.EXTRA_FIRST) ?: "")
+
+    override fun getId(): String {
+        return super.getId() + screenId
+    }
+
+    override fun prepareData(): Bundle {
+        return bundleOf(Route.EXTRA_FIRST to screenId)
+    }
+
+    override fun getScreenClassPath(): String {
+        return "ru.surfstudio.android.navigation.sample.app.screen.flow.FlowActivity"
+    }
+}
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt
index a63f3c7186..b8177c0ad7 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt
@@ -6,8 +6,11 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import kotlinx.android.synthetic.main.fragment_main.*
+import ru.surfstudio.android.navigation.command.activity.Finish
+import ru.surfstudio.android.navigation.command.fragment.RemoveAll
 import ru.surfstudio.android.navigation.command.fragment.RemoveLast
 import ru.surfstudio.android.navigation.command.fragment.Replace
+import ru.surfstudio.android.navigation.navigator.fragment.tab.TabFragmentNavigatorInterface
 import ru.surfstudio.android.navigation.provider.container.TabFragmentNavigationContainer
 import ru.surfstudio.android.navigation.route.fragment.FragmentRoute
 import ru.surfstudio.android.navigation.sample.R
@@ -43,14 +46,18 @@ class MainFragment : Fragment(), TabFragmentNavigationContainer {
     }
 
     private fun initActiveTabReopenedListener() {
-
+        getTabNavigator()
+                .setActiveTabReopenedListener {
+                    App.executor.execute(RemoveAll(sourceTag = tag!!))
+                }
     }
 
     private fun initBackPressedListener() {
         addOnBackPressedListener {
-            App.executor.execute(
-                    RemoveLast()
-            )
+            when {
+                hasTabsInStack() -> App.executor.execute(RemoveLast(sourceTag = tag!!))
+                else -> App.executor.execute(Finish())
+            }
         }
     }
 
@@ -61,10 +68,25 @@ class MainFragment : Fragment(), TabFragmentNavigationContainer {
             PROFILE -> ProfileTabRoute()
         }
         App.executor.execute(
-                Replace(route = route,
-                animations = FadeAnimations(),
-                         sourceTag = ""
+                Replace(
+                        route = route,
+                        animations = FadeAnimations(),
+                        sourceTag = tag!!
                 )
         )
     }
+
+    private fun hasTabsInStack(): Boolean {
+        val backStackCount = getTabNavigator()
+                .backStackEntryCount
+        return backStackCount > 1
+    }
+
+    private fun getTabNavigator(): TabFragmentNavigatorInterface {
+        return App.provider
+                .provide()
+                .fragmentNavigationProvider
+                .provide(tag)
+                .fragmentNavigator as TabFragmentNavigatorInterface
+    }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/GalleryTabFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/GalleryFragment.kt
similarity index 73%
rename from navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/GalleryTabFragment.kt
rename to navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/GalleryFragment.kt
index 6d918f2a2c..042707174c 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/GalleryTabFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/GalleryFragment.kt
@@ -14,7 +14,7 @@ import ru.surfstudio.android.navigation.sample.R
 import ru.surfstudio.android.navigation.sample.app.App
 import ru.surfstudio.android.navigation.sample.app.screen.main.gallery.image.ImageRoute
 
-class GalleryTabFragment : Fragment(), FragmentNavigationContainer {
+class GalleryFragment : Fragment(), FragmentNavigationContainer {
 
     override val containerId: Int = R.id.gallery_fragment_container
 
@@ -34,14 +34,16 @@ class GalleryTabFragment : Fragment(), FragmentNavigationContainer {
     }
 
     private fun addPicture() {
-
+        App.executor.execute(Replace(ImageRoute(currentPicture), sourceTag = tag!!))
     }
 
     private fun removePicture() {
-
+        App.executor.execute(RemoveLast(sourceTag = tag!!))
     }
 
     private fun subscribeToBackStackChanges() {
-
+        val provider = App.provider.provide().fragmentNavigationProvider.provide(tag)
+        val backStackEntries = provider.fragmentNavigator.addBackStackChangeListener { currentPicture = it.size + 1 }
+        Log.d("111111 Update pic", "backStacks$backStackEntries, manager=${childFragmentManager}")
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/GalleryRoute.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/GalleryRoute.kt
index 4310fa7e39..c57ec23d78 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/GalleryRoute.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/GalleryRoute.kt
@@ -6,7 +6,7 @@ import ru.surfstudio.android.navigation.route.tab.TabHeadRoute
 
 sealed class GalleryRoute : FragmentRoute() {
 
-    override fun getScreenClass(): Class<out Fragment>? = GalleryTabFragment::class.java
+    override fun getScreenClass(): Class<out Fragment>? = GalleryFragment::class.java
 
     class Tab : GalleryRoute(), TabHeadRoute
 
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/HomeTabFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/HomeTabFragment.kt
index bb92d2da5b..cea8c5442e 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/HomeTabFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/HomeTabFragment.kt
@@ -7,10 +7,9 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import kotlinx.android.synthetic.main.fragment_home.*
 import ru.surfstudio.android.navigation.command.fragment.Replace
-import ru.surfstudio.android.navigation.command.fragment.base.FragmentNavigationCommand
 import ru.surfstudio.android.navigation.sample.R
 import ru.surfstudio.android.navigation.sample.app.App
-import ru.surfstudio.android.navigation.sample.app.screen.main.gallery.GalleryRoute
+import ru.surfstudio.android.navigation.sample.app.screen.main.home.nested.HomeNestedRoute
 
 class HomeTabFragment : Fragment() {
 
@@ -20,8 +19,6 @@ class HomeTabFragment : Fragment() {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        home_galery_btn.setOnClickListener {
-            App.executor.execute(Replace(GalleryRoute.FullScreen(), sourceTag = ""))
-        }
+        home_add_btn.setOnClickListener { App.executor.execute(Replace(HomeNestedRoute(), sourceTag = tag!!)) }
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/nested/HomeNestedFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/nested/HomeNestedFragment.kt
index 49d5d23612..032143e5db 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/nested/HomeNestedFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/nested/HomeNestedFragment.kt
@@ -20,6 +20,8 @@ class HomeNestedFragment : Fragment() {
         super.onActivityCreated(savedInstanceState)
         val currentOrder = HomeNestedRoute(arguments).order
         home_nested_tv.text = "Home\nNested\nFragment\n#$currentOrder"
+        val nextOrder = currentOrder + 1
+        home_nested_add_btn.setOnClickListener { App.executor.execute(Replace(HomeNestedRoute(nextOrder), sourceTag = tag!!)) }
     }
 
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/ProfileTabFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/ProfileTabFragment.kt
index 4857841b8f..45db51f3b1 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/ProfileTabFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/ProfileTabFragment.kt
@@ -31,13 +31,23 @@ class ProfileTabFragment : Fragment() {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        profile_settings_btn.setOnClickListener {  }
-        profile_about_app_btn.setOnClickListener {  }
-        profile_logout_btn.setOnClickListener {  }
-        profile_custom_stack_btn.setOnClickListener {
-
+        profile_settings_btn.setOnClickListener { App.executor.execute(Start(ApplicationSettingsRoute())) }
+        profile_about_app_btn.setOnClickListener { App.executor.execute(Start(AboutRoute())) }
+        profile_logout_btn.setOnClickListener { App.executor.execute(ReplaceHard(AuthRoute(), FadeAnimations())) }
+        profile_attach_photo_btn.setOnClickListener {
+            App.executor.execute(
+                    StartForResult(
+                            CameraRoute(
+                                    uniqueId = screenId,
+                                    chooserTitle = "Select photo for profile",
+                                    takenPhotoFile = CameraHelper(requireContext()).generatePhotoPath()
+                            )
+                    )
+            )
         }
 
+        App.resultObserver.addListener(targetRoute, ::showAppName)
+        App.resultObserver.addListener(cameraRoute, ::showResult)
     }
 
     private fun showAppName(name: String) {
@@ -57,7 +67,7 @@ class ProfileTabFragment : Fragment() {
     }
 
     override fun onDestroyView() {
-
+        App.resultObserver.removeListener(targetRoute)
         super.onDestroyView()
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/about/AboutActivity.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/about/AboutActivity.kt
index 41f51b3b88..99272361d2 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/about/AboutActivity.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/about/AboutActivity.kt
@@ -3,7 +3,10 @@ package ru.surfstudio.android.navigation.sample.app.screen.main.profile.about
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import kotlinx.android.synthetic.main.activity_about.*
+import ru.surfstudio.android.navigation.observer.command.EmitScreenResult
+import ru.surfstudio.android.navigation.command.activity.Finish
 import ru.surfstudio.android.navigation.sample.R
+import ru.surfstudio.android.navigation.sample.app.App
 
 class AboutActivity : AppCompatActivity() {
 
@@ -16,7 +19,11 @@ class AboutActivity : AppCompatActivity() {
             val appName = application.packageName
 
             val targetRoute = AboutRoute()
-            // TODO вернуть результат
+
+            App.executor.execute(listOf(
+                    Finish(),
+                    EmitScreenResult(targetRoute, appName)
+            ))
         }
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/number/NumberActivity.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/number/NumberActivity.kt
index aa1d2ef521..f244a4d11b 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/number/NumberActivity.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/number/NumberActivity.kt
@@ -5,6 +5,9 @@ import androidx.appcompat.app.AppCompatActivity
 import kotlinx.android.synthetic.main.activity_number.*
 import ru.surfstudio.android.navigation.sample.R
 
+/**
+ * Простая активити, отображающая в TextView номер, переданный в роут
+ */
 class NumberActivity: AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/number/NumberRoute.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/number/NumberRoute.kt
index 495dc00bf5..4ffadf1448 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/number/NumberRoute.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/number/NumberRoute.kt
@@ -12,7 +12,7 @@ class NumberRoute(val number: Int): ActivityRoute() {
     constructor(intent: Intent) : this(intent.getDataBundle()?.getInt(Route.EXTRA_FIRST) ?: 0)
 
     override fun getId(): String {
-        return super.getId() + number
+        return super.getId() + number.toString()
     }
 
     override fun prepareData(): Bundle {
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/utils/animations/ModalAnimations.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/utils/animations/ModalAnimations.kt
new file mode 100644
index 0000000000..88e533ab05
--- /dev/null
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/utils/animations/ModalAnimations.kt
@@ -0,0 +1,11 @@
+package ru.surfstudio.android.navigation.sample.app.utils.animations
+
+import ru.surfstudio.android.navigation.animation.resource.BaseResourceAnimations
+import ru.surfstudio.android.navigation.sample.R
+
+class ModalAnimations: BaseResourceAnimations(
+        enterAnimation = R.anim.slide_in_from_bottom,
+        exitAnimation = R.anim.fade_out_fast,
+        popEnterAnimation = R.anim.fade_in_fast,
+        popExitAnimation = R.anim.slide_out_to_bottom
+)
\ No newline at end of file
diff --git a/navigation/sample/src/main/res/layout/activity_flow.xml b/navigation/sample/src/main/res/layout/activity_flow.xml
new file mode 100644
index 0000000000..6bf952bae4
--- /dev/null
+++ b/navigation/sample/src/main/res/layout/activity_flow.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/flow_title_tv"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:gravity="center"
+        android:textSize="20sp"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="first flow" />
+
+    <FrameLayout
+        android:id="@+id/flow_fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/flow_title_tv" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/navigation/sample/src/main/res/layout/fragment_home.xml b/navigation/sample/src/main/res/layout/fragment_home.xml
index bde5e9c28f..37884d25d9 100644
--- a/navigation/sample/src/main/res/layout/fragment_home.xml
+++ b/navigation/sample/src/main/res/layout/fragment_home.xml
@@ -12,10 +12,10 @@
         android:textSize="24sp" />
 
     <Button
-        android:id="@+id/home_galery_btn"
+        android:id="@+id/home_add_btn"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         android:layout_margin="16dp"
-        android:text="Gallery fullscreen" />
+        android:text="Add" />
 </FrameLayout>
\ No newline at end of file
diff --git a/navigation/sample/src/main/res/layout/fragment_profile.xml b/navigation/sample/src/main/res/layout/fragment_profile.xml
index c0e5197a2e..4c21f96482 100644
--- a/navigation/sample/src/main/res/layout/fragment_profile.xml
+++ b/navigation/sample/src/main/res/layout/fragment_profile.xml
@@ -19,12 +19,12 @@
         android:orientation="vertical">
 
         <Button
-            android:id="@+id/profile_custom_stack_btn"
+            android:id="@+id/profile_attach_photo_btn"
             android:layout_width="match_parent"
             android:layout_height="56dp"
             android:layout_marginHorizontal="16dp"
             android:layout_marginBottom="16dp"
-            android:text="open custom stack" />
+            android:text="Attach Photo" />
 
         <Button
             android:id="@+id/profile_settings_btn"

From 461afcd5bb04e3ddb308b3d756f1324039e56a87 Mon Sep 17 00:00:00 2001
From: Ruslan Sharipov <sharipov@surfstudio.ru>
Date: Mon, 1 Mar 2021 18:07:11 +0300
Subject: [PATCH 08/15] ANDDEP-1103 minor code rearrange, doc adjustement

---
 .../navigation/executor/AppCommandExecutor.kt | 92 ++++++++++---------
 1 file changed, 51 insertions(+), 41 deletions(-)

diff --git a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt
index dc932ef1cd..8de94ffbc7 100644
--- a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt
+++ b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt
@@ -59,7 +59,7 @@ open class AppCommandExecutor(
      * Postpones command execution to the end of the Message Queue
      * and executes [commands] with the next available navigator
      */
-    private fun postponeExecution(commands: List<NavigationCommand>) {
+    protected fun postponeExecution(commands: List<NavigationCommand>) {
         handler.post {
             buffer.addAll(commands)
             activityNavigationProvider.setOnHolderActiveListenerSingle { utilizeBuffer() }
@@ -79,8 +79,7 @@ open class AppCommandExecutor(
      * and then call this method again with remaining commands (returning to step 1)
      *
      * TODO: Dispatch commands in batches, to, for example,
-     * TODO: execute multiple commands in one FragmentTransaction,
-     * TODO: or use Context.startActivities(Intent, Intent...) to launch multiple activities.
+     * TODO: execute multiple commands in one FragmentTransaction
      *
      */
     protected open fun divideExecution(commands: List<NavigationCommand>) {
@@ -90,45 +89,56 @@ open class AppCommandExecutor(
         val isStartingWithAsyncCommand = checkCommandAsync(firstCommand)
 
         if (isStartingWithAsyncCommand) {
-            val firstNotStartIndex = commands.indexOfFirst { command -> command !is Start }
-            when {
-                // we have only Start commands, just execute them
-                firstNotStartIndex == -1 -> {
-                    startSeveralActivities(commands)
-                }
-                // we have several Start commands and commands of other types right after them, so
-                // we start activities first and postpone the execution of the rest of commands
-                firstNotStartIndex > 1 -> {
-                    startSeveralActivities(commands.take(firstNotStartIndex))
-                    postponeExecution(commands.subList(firstNotStartIndex, commands.size))
-                }
-                /**
-                 * Here are other cases, where we just execute first command.
-                 * If we have to Finish activity or affinity we need to check the next command after
-                 * it. If it's async but not Finish command we can immediately execute it with
-                 * current navigator. Otherwise we postpone execution until the next navigator
-                 * is available.
-                 */
-                else -> {
-                    dispatchCommand(firstCommand)
-                    val restCommands = commands.drop(1)
-                    val canExecuteImmediately: Boolean = restCommands.isNotEmpty()
-                            && checkCommandAsync(restCommands[0])
-                            && !isFinishCommand(restCommands[0])
-                    if (canExecuteImmediately){
-                        divideExecution(restCommands)
-                    } else {
-                        postponeExecution(restCommands)
-                    }
-                }
-            }
+            divideStartingFromAsync(commands, firstCommand)
+        } else {
+            divideStartingFromSync(commands)
+        }
+    }
+
+    private fun divideStartingFromSync(commands: List<NavigationCommand>) {
+        val firstAsyncCommandIndex = commands.indexOfFirst { checkCommandAsync(it) }
+        if (firstAsyncCommandIndex >= 1) {
+            queueCommands(commands.take(firstAsyncCommandIndex))
+            safeExecuteWithBuffer(commands.subList(firstAsyncCommandIndex, commands.size))
         } else {
-            val firstAsyncCommandIndex = commands.indexOfFirst { checkCommandAsync(it) }
-            if (firstAsyncCommandIndex >= 1) {
-                safeExecuteWithBuffer(commands.subList(firstAsyncCommandIndex, commands.size))
-                queueCommands(commands.take(firstAsyncCommandIndex))
-            } else {
-                queueCommands(commands)
+            queueCommands(commands)
+        }
+    }
+
+    private fun divideStartingFromAsync(commands: List<NavigationCommand>, firstCommand: NavigationCommand) {
+        val firstNotStartIndex = commands.indexOfFirst { command -> command !is Start }
+        when {
+            /** We have only Start commands, just execute them */
+            firstNotStartIndex == -1 -> {
+                startSeveralActivities(commands)
+            }
+            /**
+             * We have several Start commands and commands of other types right after them, so
+             * we start activities first and postpone the execution of the remaining commands until
+             * new navigation holder become available
+             */
+            firstNotStartIndex > 1 -> {
+                startSeveralActivities(commands.take(firstNotStartIndex))
+                postponeExecution(commands.subList(firstNotStartIndex, commands.size))
+            }
+            /**
+             * Here are other cases, where we just execute first command.
+             * If we have to Finish activity or affinity we need to check the next command after
+             * it. If it's async but not Finish/FinishAffinity command we can immediately execute it
+             * with current navigation holder. Otherwise we postpone execution until new navigation
+             * holder become available.
+             */
+            else -> {
+                dispatchCommand(firstCommand)
+                val restCommands = commands.drop(1)
+                val canExecuteImmediately: Boolean = restCommands.isNotEmpty()
+                        && checkCommandAsync(restCommands[0])
+                        && !isFinishCommand(restCommands[0])
+                if (canExecuteImmediately) {
+                    divideExecution(restCommands)
+                } else {
+                    postponeExecution(restCommands)
+                }
             }
         }
     }

From 115035d5d9052cdd60d4ea3f3200a3b426cbf807 Mon Sep 17 00:00:00 2001
From: Ruslan Sharipov <sharipov@surfstudio.ru>
Date: Mon, 1 Mar 2021 18:08:58 +0300
Subject: [PATCH 09/15] ANDDEP-1103 added sample of complex navigation chain
 including async and sync commands

---
 .../android/navigation/sample/app/App.kt      |  4 +--
 .../sample/app/screen/MainActivity.kt         | 18 +-----------
 .../sample/app/screen/main/MainFragment.kt    |  2 +-
 .../screen/main/profile/ProfileTabFragment.kt | 29 ++++++++++++++++++-
 .../app/screen/splash/SplashFragment.kt       |  2 +-
 .../app/utils/animations/FadeAnimations.kt    |  2 +-
 .../app/utils/animations/ModalAnimations.kt   |  2 +-
 .../app/utils/animations/SlideAnimations.kt   |  2 +-
 .../src/main/res/layout/fragment_profile.xml  |  8 +++++
 9 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt
index a1c4e52315..0b5b5d1842 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt
@@ -46,7 +46,7 @@ class App : Application() {
     }
 
     private fun initAnimations() {
-        DefaultAnimations.fragment = SlideAnimations() //animations for all fragment changes
-        DefaultAnimations.tab = FadeAnimations() //animations for tab changes
+        DefaultAnimations.fragment = SlideAnimations //animations for all fragment changes
+        DefaultAnimations.tab = FadeAnimations //animations for tab changes
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt
index ccddff42cb..e0e565dafa 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt
@@ -17,23 +17,7 @@ class MainActivity : AppCompatActivity(), FragmentNavigationContainer {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_single)
         if (savedInstanceState == null) { //Adding fragment only on first create
-            App.executor.execute(Add(SplashRoute(), FadeAnimations()))
-//            val firstFlow = FlowRoute("first")
-//            val secondFlow = FlowRoute("second")
-//            App.executor.execute(
-//                    listOf(
-//                            Start(firstFlow),
-//                            Replace(ImageRoute(0), sourceTag = firstFlow.getId()),
-//                            Replace(ImageRoute(1), sourceTag = firstFlow.getId()),
-//                            Replace(ImageRoute(2), sourceTag = firstFlow.getId()),
-//                            Start(NumberRoute(0)),
-//                            Start(secondFlow),
-//                            Replace(ImageRoute(0), sourceTag = secondFlow.getId()),
-//                            Replace(ImageRoute(1), sourceTag = secondFlow.getId()),
-//                            Replace(ImageRoute(2), sourceTag = secondFlow.getId()),
-//                            Start(NumberRoute(1))
-//                    )
-//            )
+            App.executor.execute(Add(SplashRoute(), FadeAnimations))
         }
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt
index b8177c0ad7..c4781c3f97 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt
@@ -70,7 +70,7 @@ class MainFragment : Fragment(), TabFragmentNavigationContainer {
         App.executor.execute(
                 Replace(
                         route = route,
-                        animations = FadeAnimations(),
+                        animations = FadeAnimations,
                         sourceTag = tag!!
                 )
         )
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/ProfileTabFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/ProfileTabFragment.kt
index 45db51f3b1..342815c213 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/ProfileTabFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/ProfileTabFragment.kt
@@ -8,16 +8,22 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import kotlinx.android.synthetic.main.fragment_profile.*
 import ru.surfstudio.android.navigation.command.activity.Start
+import ru.surfstudio.android.navigation.command.fragment.Replace
 import ru.surfstudio.android.navigation.command.fragment.ReplaceHard
 import ru.surfstudio.android.navigation.observer.command.activity.StartForResult
 import ru.surfstudio.android.navigation.sample.R
 import ru.surfstudio.android.navigation.sample.app.App
 import ru.surfstudio.android.navigation.sample.app.screen.auth.AuthRoute
+import ru.surfstudio.android.navigation.sample.app.screen.flow.FlowRoute
+import ru.surfstudio.android.navigation.sample.app.screen.main.gallery.image.ImageRoute
 import ru.surfstudio.android.navigation.sample.app.screen.main.profile.about.AboutRoute
 import ru.surfstudio.android.navigation.sample.app.screen.main.profile.settings.ApplicationSettingsRoute
+import ru.surfstudio.android.navigation.sample.app.screen.number.NumberRoute
 import ru.surfstudio.android.navigation.sample.app.screen.system.CameraHelper
 import ru.surfstudio.android.navigation.sample.app.screen.system.CameraRoute
 import ru.surfstudio.android.navigation.sample.app.utils.animations.FadeAnimations
+import ru.surfstudio.android.navigation.sample.app.utils.animations.ModalAnimations
+import ru.surfstudio.android.navigation.sample.app.utils.animations.SlideAnimations
 
 class ProfileTabFragment : Fragment() {
 
@@ -33,7 +39,7 @@ class ProfileTabFragment : Fragment() {
         super.onActivityCreated(savedInstanceState)
         profile_settings_btn.setOnClickListener { App.executor.execute(Start(ApplicationSettingsRoute())) }
         profile_about_app_btn.setOnClickListener { App.executor.execute(Start(AboutRoute())) }
-        profile_logout_btn.setOnClickListener { App.executor.execute(ReplaceHard(AuthRoute(), FadeAnimations())) }
+        profile_logout_btn.setOnClickListener { App.executor.execute(ReplaceHard(AuthRoute(), FadeAnimations)) }
         profile_attach_photo_btn.setOnClickListener {
             App.executor.execute(
                     StartForResult(
@@ -45,6 +51,7 @@ class ProfileTabFragment : Fragment() {
                     )
             )
         }
+        profile_complex_chain_btn.setOnClickListener { executeComplexCommandChain() }
 
         App.resultObserver.addListener(targetRoute, ::showAppName)
         App.resultObserver.addListener(cameraRoute, ::showResult)
@@ -66,6 +73,26 @@ class ProfileTabFragment : Fragment() {
         Toast.makeText(requireActivity(), message, Toast.LENGTH_LONG).show()
     }
 
+    private fun executeComplexCommandChain() {
+        val firstFlow = FlowRoute("First flow")
+        val secondFlow = FlowRoute("Second flow")
+        App.executor.execute(
+                listOf(
+                        Start(NumberRoute(42)),
+                        Start(firstFlow, animations = ModalAnimations),
+                        Replace(ImageRoute(0), sourceTag = firstFlow.getId(), animations = FadeAnimations),
+                        Replace(ImageRoute(1), sourceTag = firstFlow.getId(), animations = SlideAnimations),
+                        Replace(ImageRoute(2), sourceTag = firstFlow.getId(), animations = SlideAnimations),
+                        Start(NumberRoute(0), animations = ModalAnimations),
+                        Start(secondFlow, animations = ModalAnimations),
+                        Replace(ImageRoute(0), sourceTag = secondFlow.getId(), animations = FadeAnimations),
+                        Replace(ImageRoute(1), sourceTag = secondFlow.getId(), animations = SlideAnimations),
+                        Replace(ImageRoute(2), sourceTag = secondFlow.getId(), animations = SlideAnimations),
+                        Start(NumberRoute(1), animations = ModalAnimations)
+                )
+        )
+    }
+
     override fun onDestroyView() {
         App.resultObserver.removeListener(targetRoute)
         super.onDestroyView()
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/splash/SplashFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/splash/SplashFragment.kt
index f9dc871107..99f28fa770 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/splash/SplashFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/splash/SplashFragment.kt
@@ -21,7 +21,7 @@ class SplashFragment : Fragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         Handler().postDelayed({
-            App.executor.execute(ReplaceHard(AuthRoute(), animations = FadeAnimations()))
+            App.executor.execute(ReplaceHard(AuthRoute(), animations = FadeAnimations))
         }, 1500L)
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/utils/animations/FadeAnimations.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/utils/animations/FadeAnimations.kt
index a035267f9d..7a4fb1042c 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/utils/animations/FadeAnimations.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/utils/animations/FadeAnimations.kt
@@ -7,7 +7,7 @@ import ru.surfstudio.android.navigation.sample.R
 /**
  * Набор анимаций Fade In/Out для переключения фрагментов.
  */
-class FadeAnimations : BaseResourceAnimations(
+object FadeAnimations : BaseResourceAnimations(
         enterAnimation = R.anim.fade_in_fast,
         exitAnimation = R.anim.fade_out_fast,
         popEnterAnimation = R.anim.fade_in_fast,
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/utils/animations/ModalAnimations.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/utils/animations/ModalAnimations.kt
index 88e533ab05..3ea92dcac9 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/utils/animations/ModalAnimations.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/utils/animations/ModalAnimations.kt
@@ -3,7 +3,7 @@ package ru.surfstudio.android.navigation.sample.app.utils.animations
 import ru.surfstudio.android.navigation.animation.resource.BaseResourceAnimations
 import ru.surfstudio.android.navigation.sample.R
 
-class ModalAnimations: BaseResourceAnimations(
+object ModalAnimations: BaseResourceAnimations(
         enterAnimation = R.anim.slide_in_from_bottom,
         exitAnimation = R.anim.fade_out_fast,
         popEnterAnimation = R.anim.fade_in_fast,
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/utils/animations/SlideAnimations.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/utils/animations/SlideAnimations.kt
index bf65bd6fa6..7650fc8281 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/utils/animations/SlideAnimations.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/utils/animations/SlideAnimations.kt
@@ -6,7 +6,7 @@ import ru.surfstudio.android.navigation.sample.R
 /**
  * Набор анимаций Slide In/Out для переключения фрагментов.
  */
-class SlideAnimations : BaseResourceAnimations(
+object SlideAnimations : BaseResourceAnimations(
         enterAnimation = R.anim.slide_in_right,
         exitAnimation = R.anim.slide_out_left,
         popEnterAnimation = R.anim.slide_in_left,
diff --git a/navigation/sample/src/main/res/layout/fragment_profile.xml b/navigation/sample/src/main/res/layout/fragment_profile.xml
index 4c21f96482..49e282174b 100644
--- a/navigation/sample/src/main/res/layout/fragment_profile.xml
+++ b/navigation/sample/src/main/res/layout/fragment_profile.xml
@@ -49,6 +49,14 @@
             android:layout_marginHorizontal="16dp"
             android:layout_marginBottom="16dp"
             android:text="Logout" />
+
+        <Button
+            android:id="@+id/profile_complex_chain_btn"
+            android:layout_width="match_parent"
+            android:layout_height="56dp"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginBottom="16dp"
+            android:text="complex chain" />
     </LinearLayout>
 
 </FrameLayout>
\ No newline at end of file

From 47b50648693649f16269534132febf159ee705d9 Mon Sep 17 00:00:00 2001
From: Ruslan Sharipov <sharipov@surfstudio.ru>
Date: Tue, 2 Mar 2021 11:44:56 +0300
Subject: [PATCH 10/15] ANDDEP-1103 added docs and release notes

---
 navigation/RELEASE_NOTES.md         |  3 +-
 navigation/lib-navigation/README.md | 49 ++++++++++++++++++++++++++++-
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/navigation/RELEASE_NOTES.md b/navigation/RELEASE_NOTES.md
index c6a71874d1..86aa3a5e7b 100644
--- a/navigation/RELEASE_NOTES.md
+++ b/navigation/RELEASE_NOTES.md
@@ -9,4 +9,5 @@
 * Fix RemoveUntil command execution for single removal
 * Add methods to listen for changes of tab head in TabFragmentNavigator
 * Update removeUntil and removeAll animations: now they inherit animations from the first fragment of the removing bunch.
-* ANDDEP-1100 Added command StartForResult to open system activities for getting result
\ No newline at end of file
+* ANDDEP-1100 Added command StartForResult to open system activities for getting result
+* ANDDEP-1103 Added sequential async and sync command execution
\ No newline at end of file
diff --git a/navigation/lib-navigation/README.md b/navigation/lib-navigation/README.md
index 8b179c3a8d..6da93795b6 100644
--- a/navigation/lib-navigation/README.md
+++ b/navigation/lib-navigation/README.md
@@ -104,7 +104,7 @@ ACTIVITY_NAVIGATION_TAG.
     * [RemoveUntil][removeuntilcom] - удаление фрагментов вплоть до указанного в команде.
     * [RemoveAll][removeallcom] - очистка бекстека.
     Возможна очистка всех фрагментов с сохранением последнего: необходимо явно указать параметр shouldRemoveLast=false.
-    Чтобы выполнить эту команду для [TabFragmentNavigator][tfnav], необходимо явно указать параметр isTab=true.
+    В случае с [TabFragmentNavigator][tfnav], команда [RemoveAll][removeallcom] очистит стек текущего активного таба.
 - [DialogNavigationCommand][dcom]
     * [Show][showcom] - показ диалога
     * [Dismiss][dismisscom] - скрытие диалога
@@ -198,6 +198,51 @@ noBackupFilesDir.
 1. Вызвать метод NavigationCommandExecutor.execute и передать в него команду Add(routeA, sourceTag),
 где routeA - route, созданный на первом шаге, sourceTag - тег экрана, созданный на 3 шаге.
 
+### Цепочное выполнение команд
+[AppCommandExecutor][appexec] поддерживает выполнение цепочек, состоящих как из синхронных, так и 
+асинхронных команд. 
+В зависимости от того какие команды есть в цепочке логика работы [AppCommandExecutor][appexec] будет
+немного отличаться. Но основной принцип - выполняется асинхронная команда, выполнение команд идущих 
+после нее откладывается до момента, когда будет доступен новый [ActivityNavigationHolder][anavholdercom].
+И как только холдер станет доступен  - срабатывает та же логика. 
+Исключения из этого:
+    * Выполнение цепочки команд [Start][startcom], открывающее несколько активити сразу.
+    * Выполнение асинхронных команд Replace и Start для активити после выполнения команд Finish и FinishAffinity.
+    Replace и Start выполняются сразу после команд Finish и FinishAffinity в том же [ActivityNavigationHolder][anavholdercom], 
+    так как после выполнения команд закрывающих активити или стек активити в стеке может не остаться 
+    активити и последующие команды не выполнятся.
+
+1. Можно запускать несколько активити за один раз, передавая список из команд Start, например
+`listOf(Start(ActivityRoute1()), Start(ActivityRoute2()), Start(ActivityRoute3()))`.
+У [ActivityNavigator][anav] для выполнения этой цепочки команд будет вызван метод `Context.startActivities`.
+1. Можно асинхронно запустить активити-контейнер фрагментов и сразу добавить в него несколько фрагментов, 
+[AppCommandExecutor][appexec] отложит выполнение всех команд, идущих после команды старта активити, 
+дождется пока активити запутится и последовательно выполнит все синхронные команды, идущие после 
+команды запуска активити.
+1. Можно закрыть несколько активити (без использования [FinishAffinity][finishacom]). Для этого нужно
+передать список комманд [Finish][finishcom]. Первая команда [Finish][finishcom] из этого списка 
+выполнится для текущей активити, последующие команды будут выполняться по мере того как будут 
+становиться доступны холдеры [ActivityNavigationHolder][anavholdercom] ранее запущенных активити.
+1. Можно выполнять запуск нескольких активити с добавлением в них фрагментов.
+listOf(
+    Start(FirstActivityRoute()),
+    Replace(FirstFragmentRoute()),
+    Replace(SecondFragmentRoute()),
+    Start(SecondActivityRoute()),
+    Start(ThirdActivityRoute()),
+    Replace(FirstFragmentRoute()),
+    Replace(SecondFragmentRoute())
+)
+1. Закрываем несколько активити из стека с последующим открытием новых активити.
+В этом случае нужно быть очень внимательным, так как если в стеке всего одна активити, а переданы 
+две команды [Finish][finishcom] и после них есть еще какие-то команды - выполнится только первая 
+команда, которая закроет активити и вместе с этим все приложение и все последующие команды не будут
+выполнены.
+listOf(
+    Finish(),
+    Finish(),
+    Start(SomeActivityRoute())
+)
 
 [route]: src/main/java/ru/surfstudio/android/navigation/route/Route.kt
 [baseroute]: src/main/java/ru/surfstudio/android/navigation/route/BaseRoute.kt
@@ -250,3 +295,5 @@ noBackupFilesDir.
 [dcom]: src/main/java/ru/surfstudio/android/navigation/command/dialog/base/DialogNavigationCommand.kt
 [showcom]: src/main/java/ru/surfstudio/android/navigation/command/dialog/Show.kt
 [dismisscom]: src/main/java/ru/surfstudio/android/navigation/command/dialog/Dismiss.kt
+
+[anavholdercom]: src/main/java/ru/surfstudio/android/navigation/provider/holder/ActivityNavigationHolder.kt

From c78f5b7b5dd7770c0b1f861f097ad273008e6dfd Mon Sep 17 00:00:00 2001
From: Ruslan Sharipov <sharipov@surfstudio.ru>
Date: Tue, 2 Mar 2021 12:50:51 +0300
Subject: [PATCH 11/15] ANDDEP-1103 added search request sample screen

---
 .../bottom_nav/profile/ProfileBindModel.kt    |  1 +
 .../bottom_nav/profile/ProfileFragmentView.kt |  1 +
 .../bottom_nav/profile/ProfilePresenter.kt    | 10 +++++
 .../search/request/SearchRequestBindModel.kt  | 17 +++++++
 .../request/SearchRequestFragmentView.kt      | 44 +++++++++++++++++++
 .../search/request/SearchRequestPresenter.kt  | 28 ++++++++++++
 .../search/request/SearchRequestRoute.kt      | 27 ++++++++++++
 .../SearchRequestScreenConfigurator.kt        | 44 +++++++++++++++++++
 .../utils/animations/ModalAnimations.kt       | 11 +++++
 .../main/res/anim/slide_in_from_bottom.xml    |  6 +++
 .../src/main/res/anim/slide_out_to_bottom.xml |  6 +++
 .../src/main/res/layout/fragment_profile.xml  |  8 ++++
 .../res/layout/fragment_search_request.xml    | 30 +++++++++++++
 13 files changed, 233 insertions(+)
 create mode 100644 navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/request/SearchRequestBindModel.kt
 create mode 100644 navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/request/SearchRequestFragmentView.kt
 create mode 100644 navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/request/SearchRequestPresenter.kt
 create mode 100644 navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/request/SearchRequestRoute.kt
 create mode 100644 navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/request/SearchRequestScreenConfigurator.kt
 create mode 100644 navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/utils/animations/ModalAnimations.kt
 create mode 100644 navigation/sample-standard/src/main/res/anim/slide_in_from_bottom.xml
 create mode 100644 navigation/sample-standard/src/main/res/anim/slide_out_to_bottom.xml
 create mode 100644 navigation/sample-standard/src/main/res/layout/fragment_search_request.xml

diff --git a/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/bottom_nav/profile/ProfileBindModel.kt b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/bottom_nav/profile/ProfileBindModel.kt
index d22fc37799..da1f1a7bbe 100644
--- a/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/bottom_nav/profile/ProfileBindModel.kt
+++ b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/bottom_nav/profile/ProfileBindModel.kt
@@ -10,4 +10,5 @@ class ProfileBindModel @Inject constructor() : BindModel {
 
     val openSettings = Action<Unit>()
     val openConfirmLogoutScreen = Action<Unit>()
+    val openSearch = Action<Unit>()
 }
\ No newline at end of file
diff --git a/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/bottom_nav/profile/ProfileFragmentView.kt b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/bottom_nav/profile/ProfileFragmentView.kt
index 139000a3ca..0d2e23ebb0 100644
--- a/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/bottom_nav/profile/ProfileFragmentView.kt
+++ b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/bottom_nav/profile/ProfileFragmentView.kt
@@ -23,5 +23,6 @@ class ProfileFragmentView : BaseRxFragmentView() {
     override fun onActivityCreated(savedInstanceState: Bundle?, viewRecreated: Boolean) {
         profile_settings_btn.setOnClickListener { bm.openSettings.accept() }
         profile_logout_btn.setOnClickListener { bm.openConfirmLogoutScreen.accept() }
+        profile_search_btn.setOnClickListener { bm.openSearch.accept() }
     }
 }
\ No newline at end of file
diff --git a/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/bottom_nav/profile/ProfilePresenter.kt b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/bottom_nav/profile/ProfilePresenter.kt
index 1e22886628..16aeecfef8 100644
--- a/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/bottom_nav/profile/ProfilePresenter.kt
+++ b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/bottom_nav/profile/ProfilePresenter.kt
@@ -6,6 +6,7 @@ import ru.surfstudio.android.dagger.scope.PerScreen
 import ru.surfstudio.android.navigation.command.activity.Start
 import ru.surfstudio.android.navigation.command.dialog.Show
 import ru.surfstudio.android.navigation.command.fragment.RemoveLast
+import ru.surfstudio.android.navigation.command.fragment.Replace
 import ru.surfstudio.android.navigation.command.fragment.base.FragmentNavigationCommand.Companion.ACTIVITY_NAVIGATION_TAG
 import ru.surfstudio.android.navigation.executor.NavigationCommandExecutor
 import ru.surfstudio.android.navigation.observer.ScreenResultObserver
@@ -14,6 +15,8 @@ import ru.surfstudio.android.navigation.sample_standard.screen.base.dialog.simpl
 import ru.surfstudio.android.navigation.sample_standard.screen.base.presenter.CommandExecutionPresenter
 import ru.surfstudio.android.navigation.sample_standard.screen.bottom_nav.profile.logout.LogoutConfirmationRoute
 import ru.surfstudio.android.navigation.sample_standard.screen.bottom_nav.profile.settings.ApplicationSettingsRoute
+import ru.surfstudio.android.navigation.sample_standard.screen.search.request.SearchRequestRoute
+import ru.surfstudio.android.navigation.sample_standard.utils.animations.ModalAnimations
 import javax.inject.Inject
 
 @PerScreen
@@ -29,6 +32,13 @@ class ProfilePresenter @Inject constructor(
         subscribeToLogoutResult(confirmLogoutRoute)
         bm.openConfirmLogoutScreen bindTo { Show(confirmLogoutRoute).execute() }
         bm.openSettings.bindTo { Start(ApplicationSettingsRoute()).execute() }
+        bm.openSearch.bindTo {
+            Replace(
+                    route = SearchRequestRoute(),
+                    animations = ModalAnimations,
+                    sourceTag = ACTIVITY_NAVIGATION_TAG
+            ).execute()
+        }
     }
 
     private fun subscribeToLogoutResult(confirmLogoutRoute: LogoutConfirmationRoute) {
diff --git a/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/request/SearchRequestBindModel.kt b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/request/SearchRequestBindModel.kt
new file mode 100644
index 0000000000..e9cae0097b
--- /dev/null
+++ b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/request/SearchRequestBindModel.kt
@@ -0,0 +1,17 @@
+package ru.surfstudio.android.navigation.sample_standard.screen.search.request
+
+import ru.surfstudio.android.core.mvp.binding.rx.relation.mvp.Action
+import ru.surfstudio.android.core.mvp.binding.rx.relation.mvp.State
+import ru.surfstudio.android.core.mvp.binding.rx.ui.BindModel
+import ru.surfstudio.android.dagger.scope.PerScreen
+import javax.inject.Inject
+
+@PerScreen
+class SearchRequestBindModel @Inject constructor(
+        route: SearchRequestRoute
+) : BindModel {
+    val resultClick = Action<Unit>()
+    val textChanges = Action<String>()
+    val textState = State<String>(route.searchInput)
+    val closeClick = Action<Unit>()
+}
diff --git a/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/request/SearchRequestFragmentView.kt b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/request/SearchRequestFragmentView.kt
new file mode 100644
index 0000000000..4c3268f141
--- /dev/null
+++ b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/request/SearchRequestFragmentView.kt
@@ -0,0 +1,44 @@
+package ru.surfstudio.android.navigation.sample_standard.screen.search.request
+
+import android.os.Bundle
+import android.text.TextUtils
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.core.widget.doAfterTextChanged
+import kotlinx.android.synthetic.main.fragment_search_request.*
+import ru.surfstudio.android.core.mvp.binding.rx.ui.BaseRxFragmentView
+import ru.surfstudio.android.navigation.sample_standard.R
+import ru.surfstudio.android.navigation.sample_standard.utils.addOnBackPressedListener
+import ru.surfstudio.android.utilktx.ktx.text.EMPTY_STRING
+import javax.inject.Inject
+
+/**
+ * Экран ввода поискового запроса. Иммитирует экран поиска с подсказками
+ */
+class SearchRequestFragmentView : BaseRxFragmentView() {
+
+    @Inject
+    lateinit var bm: SearchRequestBindModel
+
+    override fun createConfigurator() = SearchRequestScreenConfigurator(requireArguments())
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_search_request, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?, viewRecreated: Boolean) {
+        addOnBackPressedListener { bm.closeClick.accept() }
+        search_request_close_btn.setOnClickListener { bm.closeClick.accept() }
+        search_request_results_btn.setOnClickListener { bm.resultClick.accept() }
+        search_request_input_et.doAfterTextChanged {
+            bm.textChanges.accept(it?.toString() ?: EMPTY_STRING)
+        }
+
+        bm.textState.bindTo { text: String ->
+            if (!TextUtils.equals(text, search_request_input_et.text))
+                search_request_input_et.setText(text, TextView.BufferType.EDITABLE)
+        }
+    }
+}
\ No newline at end of file
diff --git a/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/request/SearchRequestPresenter.kt b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/request/SearchRequestPresenter.kt
new file mode 100644
index 0000000000..e34ef6cf8b
--- /dev/null
+++ b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/request/SearchRequestPresenter.kt
@@ -0,0 +1,28 @@
+package ru.surfstudio.android.navigation.sample_standard.screen.search.request
+
+import ru.surfstudio.android.core.mvp.binding.rx.ui.BaseRxPresenter
+import ru.surfstudio.android.core.mvp.presenter.BasePresenterDependency
+import ru.surfstudio.android.navigation.command.fragment.RemoveLast
+import ru.surfstudio.android.navigation.executor.NavigationCommandExecutor
+import ru.surfstudio.android.navigation.observer.command.EmitScreenResult
+import ru.surfstudio.android.navigation.sample_standard.screen.base.presenter.CommandExecutionPresenter
+import javax.inject.Inject
+
+class SearchRequestPresenter @Inject constructor(
+        basePresenterDependency: BasePresenterDependency,
+        override val commandExecutor: NavigationCommandExecutor,
+        private val bm: SearchRequestBindModel,
+        private val route: SearchRequestRoute
+) : BaseRxPresenter(basePresenterDependency), CommandExecutionPresenter {
+
+    override fun onFirstLoad() {
+        bm.closeClick.bindTo { RemoveLast().execute() }
+        bm.textChanges.bindTo { bm.textState.accept(it) }
+        bm.resultClick.bindTo {
+            listOf(
+                    RemoveLast(),
+                    EmitScreenResult(route, bm.textState.value.toString())
+            ).execute()
+        }
+    }
+}
\ No newline at end of file
diff --git a/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/request/SearchRequestRoute.kt b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/request/SearchRequestRoute.kt
new file mode 100644
index 0000000000..8dacb384a5
--- /dev/null
+++ b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/request/SearchRequestRoute.kt
@@ -0,0 +1,27 @@
+package ru.surfstudio.android.navigation.sample_standard.screen.search.request
+
+import android.os.Bundle
+import androidx.core.os.bundleOf
+import androidx.fragment.app.Fragment
+import ru.surfstudio.android.navigation.observer.route.ResultRoute
+import ru.surfstudio.android.navigation.route.Route
+import ru.surfstudio.android.navigation.route.fragment.FragmentRoute
+import ru.surfstudio.android.utilktx.ktx.text.EMPTY_STRING
+
+/**
+ * Роут экрана на котором осуществляется поиск
+ *
+ * @param searchInput строка с поисковым запросом, предзаполненная на старте экрана
+ */
+class SearchRequestRoute(val searchInput: String = EMPTY_STRING): FragmentRoute(), ResultRoute<String> {
+
+    constructor(bundle: Bundle): this(bundle.getString(Route.EXTRA_FIRST, EMPTY_STRING))
+
+    override fun prepareData(): Bundle {
+        return bundleOf(Route.EXTRA_FIRST to searchInput)
+    }
+
+    override fun getScreenClass(): Class<out Fragment> {
+        return SearchRequestFragmentView::class.java
+    }
+}
\ No newline at end of file
diff --git a/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/request/SearchRequestScreenConfigurator.kt b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/request/SearchRequestScreenConfigurator.kt
new file mode 100644
index 0000000000..085053e963
--- /dev/null
+++ b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/request/SearchRequestScreenConfigurator.kt
@@ -0,0 +1,44 @@
+package ru.surfstudio.android.navigation.sample_standard.screen.search.request
+
+import android.os.Bundle
+import dagger.Component
+import dagger.Module
+import dagger.Provides
+import ru.surfstudio.android.core.mvp.configurator.BindableScreenComponent
+import ru.surfstudio.android.core.mvp.configurator.ScreenComponent
+import ru.surfstudio.android.dagger.scope.PerScreen
+import ru.surfstudio.android.navigation.sample_standard.di.ui.ActivityComponent
+import ru.surfstudio.android.navigation.sample_standard.di.ui.configurator.FragmentScreenConfigurator
+import ru.surfstudio.android.navigation.sample_standard.di.ui.screen.RouteScreenModule
+import ru.surfstudio.android.sample.dagger.ui.base.dagger.screen.DefaultFragmentScreenModule
+
+class SearchRequestScreenConfigurator(args: Bundle): FragmentScreenConfigurator(args) {
+
+    @PerScreen
+    @Component(dependencies = [ActivityComponent::class],
+            modules = [DefaultFragmentScreenModule::class, SearchRequestScreenModule::class])
+    internal interface SearchRequestFragmentScreenComponent
+        : BindableScreenComponent<SearchRequestFragmentView>
+
+    @Module
+    internal class SearchRequestScreenModule(route: SearchRequestRoute) : RouteScreenModule<SearchRequestRoute>(route) {
+
+        @Provides
+        @PerScreen
+        fun providePresenters(presenter: SearchRequestPresenter): Any = presenter
+    }
+
+
+    @Suppress("DEPRECATION")
+    override fun createScreenComponent(
+            parentComponent: ActivityComponent?,
+            fragmentScreenModule: DefaultFragmentScreenModule?,
+            args: Bundle
+    ): ScreenComponent<*> {
+        return DaggerSearchRequestScreenConfigurator_SearchRequestFragmentScreenComponent.builder()
+                .activityComponent(parentComponent)
+                .defaultFragmentScreenModule(fragmentScreenModule)
+                .searchRequestScreenModule(SearchRequestScreenModule(SearchRequestRoute(args)))
+                .build()
+    }
+}
\ No newline at end of file
diff --git a/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/utils/animations/ModalAnimations.kt b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/utils/animations/ModalAnimations.kt
new file mode 100644
index 0000000000..4616a73577
--- /dev/null
+++ b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/utils/animations/ModalAnimations.kt
@@ -0,0 +1,11 @@
+package ru.surfstudio.android.navigation.sample_standard.utils.animations
+
+import ru.surfstudio.android.navigation.animation.resource.BaseResourceAnimations
+import ru.surfstudio.android.navigation.sample_standard.R
+
+object ModalAnimations: BaseResourceAnimations(
+        enterAnimation = R.anim.slide_in_from_bottom,
+        exitAnimation = R.anim.fade_out_fast,
+        popEnterAnimation = R.anim.fade_in_fast,
+        popExitAnimation = R.anim.slide_out_to_bottom
+)
\ No newline at end of file
diff --git a/navigation/sample-standard/src/main/res/anim/slide_in_from_bottom.xml b/navigation/sample-standard/src/main/res/anim/slide_in_from_bottom.xml
new file mode 100644
index 0000000000..48167b4fa5
--- /dev/null
+++ b/navigation/sample-standard/src/main/res/anim/slide_in_from_bottom.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="300"
+    android:fromYDelta="100%"
+    android:interpolator="@android:anim/accelerate_interpolator"
+    android:toYDelta="0%" />
\ No newline at end of file
diff --git a/navigation/sample-standard/src/main/res/anim/slide_out_to_bottom.xml b/navigation/sample-standard/src/main/res/anim/slide_out_to_bottom.xml
new file mode 100644
index 0000000000..7352490789
--- /dev/null
+++ b/navigation/sample-standard/src/main/res/anim/slide_out_to_bottom.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="300"
+    android:fromYDelta="0%"
+    android:interpolator="@android:anim/accelerate_interpolator"
+    android:toYDelta="100%" />
\ No newline at end of file
diff --git a/navigation/sample-standard/src/main/res/layout/fragment_profile.xml b/navigation/sample-standard/src/main/res/layout/fragment_profile.xml
index 4a457fdce2..1c7f6be89c 100644
--- a/navigation/sample-standard/src/main/res/layout/fragment_profile.xml
+++ b/navigation/sample-standard/src/main/res/layout/fragment_profile.xml
@@ -18,6 +18,14 @@
         android:layout_gravity="bottom"
         android:orientation="vertical">
 
+        <Button
+            android:id="@+id/profile_search_btn"
+            android:layout_width="match_parent"
+            android:layout_height="56dp"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginBottom="16dp"
+            android:text="Search" />
+
         <Button
             android:id="@+id/profile_settings_btn"
             android:layout_width="match_parent"
diff --git a/navigation/sample-standard/src/main/res/layout/fragment_search_request.xml b/navigation/sample-standard/src/main/res/layout/fragment_search_request.xml
new file mode 100644
index 0000000000..6e3381b416
--- /dev/null
+++ b/navigation/sample-standard/src/main/res/layout/fragment_search_request.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <Button
+        android:id="@+id/search_request_close_btn"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_width="wrap_content"
+        android:text="Close"
+        android:layout_height="48dp"/>
+
+    <EditText
+        android:id="@+id/search_request_input_et"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:hint="Type something"
+        app:layout_constraintTop_toBottomOf="@id/search_request_close_btn"/>
+
+    <Button
+        android:id="@+id/search_request_results_btn"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="go to results"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 4a91ce6d6731942a3c2f1860760c881352f1aad4 Mon Sep 17 00:00:00 2001
From: Ruslan Sharipov <sharipov@surfstudio.ru>
Date: Tue, 2 Mar 2021 14:32:00 +0300
Subject: [PATCH 12/15] ANDDEP-1103 added sample search screen result screen

---
 .../android/navigation/sample_standard/App.kt |  1 +
 .../bottom_nav/profile/ProfilePresenter.kt    |  8 ++++
 .../search/request/SearchRequestPresenter.kt  |  2 +
 .../search/results/SearchResultBindModel.kt   | 15 +++++++
 .../results/SearchResultFragmentView.kt       | 32 ++++++++++++++
 .../search/results/SearchResultPresenter.kt   | 37 ++++++++++++++++
 .../search/results/SearchResultRoute.kt       | 26 +++++++++++
 .../results/SearchResultScreenConfigurator.kt | 44 +++++++++++++++++++
 .../res/layout/fragment_search_result.xml     | 25 +++++++++++
 9 files changed, 190 insertions(+)
 create mode 100644 navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/results/SearchResultBindModel.kt
 create mode 100644 navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/results/SearchResultFragmentView.kt
 create mode 100644 navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/results/SearchResultPresenter.kt
 create mode 100644 navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/results/SearchResultRoute.kt
 create mode 100644 navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/results/SearchResultScreenConfigurator.kt
 create mode 100644 navigation/sample-standard/src/main/res/layout/fragment_search_result.xml

diff --git a/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/App.kt b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/App.kt
index 7b17b59890..1d66ac1234 100644
--- a/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/App.kt
+++ b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/App.kt
@@ -3,6 +3,7 @@ package ru.surfstudio.android.navigation.sample_standard
 import android.app.Activity
 import android.app.Application
 import ru.surfstudio.android.activity.holder.ActiveActivityHolder
+import ru.surfstudio.android.logger.Logger
 import ru.surfstudio.android.navigation.animation.DefaultAnimations
 import ru.surfstudio.android.navigation.provider.callbacks.ActivityNavigationProviderCallbacks
 import ru.surfstudio.android.navigation.sample_standard.di.AppComponent
diff --git a/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/bottom_nav/profile/ProfilePresenter.kt b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/bottom_nav/profile/ProfilePresenter.kt
index 16aeecfef8..93559bbce8 100644
--- a/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/bottom_nav/profile/ProfilePresenter.kt
+++ b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/bottom_nav/profile/ProfilePresenter.kt
@@ -16,6 +16,7 @@ import ru.surfstudio.android.navigation.sample_standard.screen.base.presenter.Co
 import ru.surfstudio.android.navigation.sample_standard.screen.bottom_nav.profile.logout.LogoutConfirmationRoute
 import ru.surfstudio.android.navigation.sample_standard.screen.bottom_nav.profile.settings.ApplicationSettingsRoute
 import ru.surfstudio.android.navigation.sample_standard.screen.search.request.SearchRequestRoute
+import ru.surfstudio.android.navigation.sample_standard.screen.search.results.SearchResultRoute
 import ru.surfstudio.android.navigation.sample_standard.utils.animations.ModalAnimations
 import javax.inject.Inject
 
@@ -30,6 +31,7 @@ class ProfilePresenter @Inject constructor(
     override fun onFirstLoad() {
         val confirmLogoutRoute = LogoutConfirmationRoute()
         subscribeToLogoutResult(confirmLogoutRoute)
+        subscribeOnSearchResults()
         bm.openConfirmLogoutScreen bindTo { Show(confirmLogoutRoute).execute() }
         bm.openSettings.bindTo { Start(ApplicationSettingsRoute()).execute() }
         bm.openSearch.bindTo {
@@ -41,6 +43,12 @@ class ProfilePresenter @Inject constructor(
         }
     }
 
+    private fun subscribeOnSearchResults() {
+        subscribe(screenResultObserver.observeScreenResult(SearchRequestRoute())){ result: String ->
+            Replace(SearchResultRoute(result)).execute()
+        }
+    }
+
     private fun subscribeToLogoutResult(confirmLogoutRoute: LogoutConfirmationRoute) {
         subscribe(screenResultObserver.observeScreenResult(confirmLogoutRoute)) { result ->
             if (result == SimpleDialogResult.POSITIVE) {
diff --git a/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/request/SearchRequestPresenter.kt b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/request/SearchRequestPresenter.kt
index e34ef6cf8b..d889823475 100644
--- a/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/request/SearchRequestPresenter.kt
+++ b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/request/SearchRequestPresenter.kt
@@ -2,12 +2,14 @@ package ru.surfstudio.android.navigation.sample_standard.screen.search.request
 
 import ru.surfstudio.android.core.mvp.binding.rx.ui.BaseRxPresenter
 import ru.surfstudio.android.core.mvp.presenter.BasePresenterDependency
+import ru.surfstudio.android.dagger.scope.PerScreen
 import ru.surfstudio.android.navigation.command.fragment.RemoveLast
 import ru.surfstudio.android.navigation.executor.NavigationCommandExecutor
 import ru.surfstudio.android.navigation.observer.command.EmitScreenResult
 import ru.surfstudio.android.navigation.sample_standard.screen.base.presenter.CommandExecutionPresenter
 import javax.inject.Inject
 
+@PerScreen
 class SearchRequestPresenter @Inject constructor(
         basePresenterDependency: BasePresenterDependency,
         override val commandExecutor: NavigationCommandExecutor,
diff --git a/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/results/SearchResultBindModel.kt b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/results/SearchResultBindModel.kt
new file mode 100644
index 0000000000..8a23e73fbc
--- /dev/null
+++ b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/results/SearchResultBindModel.kt
@@ -0,0 +1,15 @@
+package ru.surfstudio.android.navigation.sample_standard.screen.search.results
+
+import ru.surfstudio.android.core.mvp.binding.rx.relation.mvp.Action
+import ru.surfstudio.android.core.mvp.binding.rx.relation.mvp.State
+import ru.surfstudio.android.core.mvp.binding.rx.ui.BindModel
+import ru.surfstudio.android.dagger.scope.PerScreen
+import javax.inject.Inject
+
+@PerScreen
+class SearchResultBindModel @Inject constructor(
+        route: SearchResultRoute
+) : BindModel {
+    val textState = State<String>(route.searchInput)
+    val backClick = Action<Unit>()
+}
diff --git a/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/results/SearchResultFragmentView.kt b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/results/SearchResultFragmentView.kt
new file mode 100644
index 0000000000..cb6937cbd4
--- /dev/null
+++ b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/results/SearchResultFragmentView.kt
@@ -0,0 +1,32 @@
+package ru.surfstudio.android.navigation.sample_standard.screen.search.results
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import kotlinx.android.synthetic.main.fragment_search_result.*
+import ru.surfstudio.android.core.mvp.binding.rx.ui.BaseRxFragmentView
+import ru.surfstudio.android.navigation.sample_standard.R
+import ru.surfstudio.android.navigation.sample_standard.utils.addOnBackPressedListener
+import javax.inject.Inject
+
+class SearchResultFragmentView: BaseRxFragmentView() {
+
+    @Inject
+    lateinit var bm: SearchResultBindModel
+
+    override fun createConfigurator() = SearchResultScreenConfigurator(requireArguments())
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_search_result, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?, viewRecreated: Boolean) {
+        addOnBackPressedListener { bm.backClick.accept() }
+        search_result_back_btn.setOnClickListener { bm.backClick.accept() }
+
+        bm.textState.bindTo { text: String ->
+            search_result_tv.text = text
+        }
+    }
+}
\ No newline at end of file
diff --git a/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/results/SearchResultPresenter.kt b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/results/SearchResultPresenter.kt
new file mode 100644
index 0000000000..46e30e532d
--- /dev/null
+++ b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/results/SearchResultPresenter.kt
@@ -0,0 +1,37 @@
+package ru.surfstudio.android.navigation.sample_standard.screen.search.results
+
+import android.util.Log
+import ru.surfstudio.android.core.mvp.binding.rx.ui.BaseRxPresenter
+import ru.surfstudio.android.core.mvp.presenter.BasePresenterDependency
+import ru.surfstudio.android.dagger.scope.PerScreen
+import ru.surfstudio.android.logger.Logger
+import ru.surfstudio.android.navigation.command.fragment.RemoveAll
+import ru.surfstudio.android.navigation.command.fragment.Replace
+import ru.surfstudio.android.navigation.command.fragment.base.FragmentNavigationCommand.Companion.ACTIVITY_NAVIGATION_TAG
+import ru.surfstudio.android.navigation.executor.NavigationCommandExecutor
+import ru.surfstudio.android.navigation.sample_standard.screen.base.presenter.CommandExecutionPresenter
+import ru.surfstudio.android.navigation.sample_standard.screen.search.request.SearchRequestRoute
+import ru.surfstudio.android.navigation.sample_standard.utils.animations.ModalAnimations
+import javax.inject.Inject
+
+@PerScreen
+class SearchResultPresenter @Inject constructor(
+        basePresenterDependency: BasePresenterDependency,
+        override val commandExecutor: NavigationCommandExecutor,
+        private val bm: SearchResultBindModel,
+        private val route: SearchResultRoute
+) : BaseRxPresenter(basePresenterDependency), CommandExecutionPresenter {
+
+    override fun onFirstLoad() {
+        bm.backClick.bindTo {
+            listOf(
+                    RemoveAll(),
+                    Replace(
+                            route = SearchRequestRoute(bm.textState.value),
+                            animations = ModalAnimations,
+                            sourceTag = ACTIVITY_NAVIGATION_TAG
+                    )
+            ).execute()
+        }
+    }
+}
\ No newline at end of file
diff --git a/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/results/SearchResultRoute.kt b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/results/SearchResultRoute.kt
new file mode 100644
index 0000000000..80f96bb197
--- /dev/null
+++ b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/results/SearchResultRoute.kt
@@ -0,0 +1,26 @@
+package ru.surfstudio.android.navigation.sample_standard.screen.search.results
+
+import android.os.Bundle
+import androidx.core.os.bundleOf
+import androidx.fragment.app.Fragment
+import ru.surfstudio.android.navigation.route.Route
+import ru.surfstudio.android.navigation.route.fragment.FragmentRoute
+import ru.surfstudio.android.utilktx.ktx.text.EMPTY_STRING
+
+class SearchResultRoute(val searchInput: String): FragmentRoute() {
+
+    constructor(bundle: Bundle): this(bundle.getString(Route.EXTRA_FIRST, EMPTY_STRING))
+
+    override fun getId(): String {
+        return super.getId() + searchInput
+    }
+
+    override fun prepareData(): Bundle {
+        return bundleOf(Route.EXTRA_FIRST to searchInput)
+    }
+
+    override fun getScreenClass(): Class<out Fragment> {
+        return SearchResultFragmentView::class.java
+    }
+
+}
diff --git a/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/results/SearchResultScreenConfigurator.kt b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/results/SearchResultScreenConfigurator.kt
new file mode 100644
index 0000000000..b46484dc04
--- /dev/null
+++ b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/results/SearchResultScreenConfigurator.kt
@@ -0,0 +1,44 @@
+package ru.surfstudio.android.navigation.sample_standard.screen.search.results
+
+import android.os.Bundle
+import dagger.Component
+import dagger.Module
+import dagger.Provides
+import ru.surfstudio.android.core.mvp.configurator.BindableScreenComponent
+import ru.surfstudio.android.core.mvp.configurator.ScreenComponent
+import ru.surfstudio.android.dagger.scope.PerScreen
+import ru.surfstudio.android.navigation.sample_standard.di.ui.ActivityComponent
+import ru.surfstudio.android.navigation.sample_standard.di.ui.configurator.FragmentScreenConfigurator
+import ru.surfstudio.android.navigation.sample_standard.di.ui.screen.RouteScreenModule
+import ru.surfstudio.android.sample.dagger.ui.base.dagger.screen.DefaultFragmentScreenModule
+
+class SearchResultScreenConfigurator(args: Bundle): FragmentScreenConfigurator(args) {
+
+    @PerScreen
+    @Component(dependencies = [ActivityComponent::class],
+            modules = [DefaultFragmentScreenModule::class, SearchResultScreenModule::class])
+    internal interface SearchResultFragmentScreenComponent
+        : BindableScreenComponent<SearchResultFragmentView>
+
+    @Module
+    internal class SearchResultScreenModule(route: SearchResultRoute) : RouteScreenModule<SearchResultRoute>(route) {
+
+        @Provides
+        @PerScreen
+        fun providePresenters(presenter: SearchResultPresenter): Any = presenter
+    }
+
+
+    @Suppress("DEPRECATION")
+    override fun createScreenComponent(
+            parentComponent: ActivityComponent?,
+            fragmentScreenModule: DefaultFragmentScreenModule?,
+            args: Bundle
+    ): ScreenComponent<*> {
+        return DaggerSearchResultScreenConfigurator_SearchResultFragmentScreenComponent.builder()
+                .activityComponent(parentComponent)
+                .defaultFragmentScreenModule(fragmentScreenModule)
+                .searchResultScreenModule(SearchResultScreenModule(SearchResultRoute(args)))
+                .build()
+    }
+}
diff --git a/navigation/sample-standard/src/main/res/layout/fragment_search_result.xml b/navigation/sample-standard/src/main/res/layout/fragment_search_result.xml
new file mode 100644
index 0000000000..3b74636ad3
--- /dev/null
+++ b/navigation/sample-standard/src/main/res/layout/fragment_search_result.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <Button
+        android:id="@+id/search_result_back_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="back"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/search_result_tv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/search_result_back_btn"
+        tools:text="qwerty" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 47092396dfb79a02e4820ff185125ae1c86d0eea Mon Sep 17 00:00:00 2001
From: Ruslan Sharipov <sharipov@surfstudio.ru>
Date: Tue, 2 Mar 2021 14:32:46 +0300
Subject: [PATCH 13/15] ANDDEP-1103 deleted unused imports

---
 .../screen/search/results/SearchResultPresenter.kt              | 2 --
 1 file changed, 2 deletions(-)

diff --git a/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/results/SearchResultPresenter.kt b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/results/SearchResultPresenter.kt
index 46e30e532d..5b61c6f04d 100644
--- a/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/results/SearchResultPresenter.kt
+++ b/navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/search/results/SearchResultPresenter.kt
@@ -1,10 +1,8 @@
 package ru.surfstudio.android.navigation.sample_standard.screen.search.results
 
-import android.util.Log
 import ru.surfstudio.android.core.mvp.binding.rx.ui.BaseRxPresenter
 import ru.surfstudio.android.core.mvp.presenter.BasePresenterDependency
 import ru.surfstudio.android.dagger.scope.PerScreen
-import ru.surfstudio.android.logger.Logger
 import ru.surfstudio.android.navigation.command.fragment.RemoveAll
 import ru.surfstudio.android.navigation.command.fragment.Replace
 import ru.surfstudio.android.navigation.command.fragment.base.FragmentNavigationCommand.Companion.ACTIVITY_NAVIGATION_TAG

From c83b5c03035a17b3977ff087b0536df1522b2d7f Mon Sep 17 00:00:00 2001
From: Ruslan Sharipov <sharipov@surfstudio.ru>
Date: Fri, 5 Mar 2021 10:04:38 +0300
Subject: [PATCH 14/15] ANDDEP-1103 fixed namings

---
 .../navigation/executor/AppCommandExecutor.kt    | 16 ++++++++--------
 .../android/navigation/sample/app/App.kt         | 12 ++++++------
 .../navigation/sample/app/screen/MainActivity.kt |  2 +-
 .../sample/app/screen/auth/AuthFragment.kt       |  2 +-
 .../sample/app/screen/flow/FlowActivity.kt       |  4 ++--
 .../sample/app/screen/main/MainFragment.kt       | 10 +++++-----
 .../app/screen/main/gallery/GalleryFragment.kt   |  6 +++---
 .../app/screen/main/home/HomeTabFragment.kt      |  2 +-
 .../main/home/nested/HomeNestedFragment.kt       |  2 +-
 .../screen/main/profile/ProfileTabFragment.kt    | 10 +++++-----
 .../screen/main/profile/about/AboutActivity.kt   |  2 +-
 .../sample/app/screen/splash/SplashFragment.kt   |  2 +-
 12 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt
index 8de94ffbc7..45951539f9 100644
--- a/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt
+++ b/navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt
@@ -48,7 +48,7 @@ open class AppCommandExecutor(
      */
     protected open fun safeExecuteWithBuffer(commands: List<NavigationCommand>) {
         if (activityNavigationProvider.hasCurrentHolder()) {
-            divideExecution(commands)
+            splitExecutionIntoChunks(commands)
         } else {
             postponeExecution(commands)
         }
@@ -82,20 +82,20 @@ open class AppCommandExecutor(
      * TODO: execute multiple commands in one FragmentTransaction
      *
      */
-    protected open fun divideExecution(commands: List<NavigationCommand>) {
+    protected open fun splitExecutionIntoChunks(commands: List<NavigationCommand>) {
         if (commands.isEmpty()) return
 
         val firstCommand = commands.first()
         val isStartingWithAsyncCommand = checkCommandAsync(firstCommand)
 
         if (isStartingWithAsyncCommand) {
-            divideStartingFromAsync(commands, firstCommand)
+            splitStartingFromAsync(commands, firstCommand)
         } else {
-            divideStartingFromSync(commands)
+            splitStartingFromSync(commands)
         }
     }
 
-    private fun divideStartingFromSync(commands: List<NavigationCommand>) {
+    private fun splitStartingFromSync(commands: List<NavigationCommand>) {
         val firstAsyncCommandIndex = commands.indexOfFirst { checkCommandAsync(it) }
         if (firstAsyncCommandIndex >= 1) {
             queueCommands(commands.take(firstAsyncCommandIndex))
@@ -105,7 +105,7 @@ open class AppCommandExecutor(
         }
     }
 
-    private fun divideStartingFromAsync(commands: List<NavigationCommand>, firstCommand: NavigationCommand) {
+    private fun splitStartingFromAsync(commands: List<NavigationCommand>, firstCommand: NavigationCommand) {
         val firstNotStartIndex = commands.indexOfFirst { command -> command !is Start }
         when {
             /** We have only Start commands, just execute them */
@@ -126,7 +126,7 @@ open class AppCommandExecutor(
              * If we have to Finish activity or affinity we need to check the next command after
              * it. If it's async but not Finish/FinishAffinity command we can immediately execute it
              * with current navigation holder. Otherwise we postpone execution until new navigation
-             * holder become available.
+             * holder becomes available.
              */
             else -> {
                 dispatchCommand(firstCommand)
@@ -135,7 +135,7 @@ open class AppCommandExecutor(
                         && checkCommandAsync(restCommands[0])
                         && !isFinishCommand(restCommands[0])
                 if (canExecuteImmediately) {
-                    divideExecution(restCommands)
+                    splitExecutionIntoChunks(restCommands)
                 } else {
                     postponeExecution(restCommands)
                 }
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt
index 0b5b5d1842..ce1e6c3ff1 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt
@@ -17,8 +17,8 @@ import ru.surfstudio.android.navigation.sample.app.utils.animations.SlideAnimati
 class App : Application() {
 
     companion object {
-        lateinit var executor: AppCommandExecutorWithResult
-        lateinit var provider: ActivityNavigationProvider
+        lateinit var navCommandExecutor: AppCommandExecutorWithResult
+        lateinit var activityNavigationProvider: ActivityNavigationProvider
         lateinit var resultObserver: ScreenResultObserver
     }
 
@@ -29,12 +29,12 @@ class App : Application() {
     }
 
     private fun initExecutor(screenResultEmitter: ScreenResultEmitter) {
-        val activityNavigationProvider = ActivityNavigationProviderCallbacks(
+        val activityNavigationProviderCallbacks = ActivityNavigationProviderCallbacks(
                 activityNavigatorFactory = ActivityNavigatorWithResultFactory()
         )
-        registerActivityLifecycleCallbacks(activityNavigationProvider)
-        provider = activityNavigationProvider
-        executor = AppCommandExecutorWithResult(screenResultEmitter, activityNavigationProvider)
+        registerActivityLifecycleCallbacks(activityNavigationProviderCallbacks)
+        activityNavigationProvider = activityNavigationProviderCallbacks
+        navCommandExecutor = AppCommandExecutorWithResult(screenResultEmitter, activityNavigationProvider)
     }
 
     private fun initResultObserver() {
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt
index e0e565dafa..9e22f1ff5c 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt
@@ -17,7 +17,7 @@ class MainActivity : AppCompatActivity(), FragmentNavigationContainer {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_single)
         if (savedInstanceState == null) { //Adding fragment only on first create
-            App.executor.execute(Add(SplashRoute(), FadeAnimations))
+            App.navCommandExecutor.execute(Add(SplashRoute(), FadeAnimations))
         }
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/auth/AuthFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/auth/AuthFragment.kt
index fc24fe96ac..174fde41a6 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/auth/AuthFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/auth/AuthFragment.kt
@@ -24,7 +24,7 @@ class AuthFragment : Fragment() {
         val mainRoute = MainRoute()
         val galleryRoute = GalleryRoute.Tab()
         auth_btn.setOnClickListener {
-            App.executor.execute(
+            App.navCommandExecutor.execute(
                     listOf(
                             ReplaceHard(mainRoute), //opens main screen
                             Replace(galleryRoute, sourceTag = mainRoute.getId()), //opens gallery tab in main
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/flow/FlowActivity.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/flow/FlowActivity.kt
index daa7c98523..388527ddbf 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/flow/FlowActivity.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/flow/FlowActivity.kt
@@ -30,7 +30,7 @@ class FlowActivity: AppCompatActivity(), FragmentNavigationContainer {
 
     override fun onBackPressed() {
         val screenId = route.getId()
-        val backStackEntryCount = App.provider.provide()
+        val backStackEntryCount = App.activityNavigationProvider.provide()
                 .fragmentNavigationProvider
                 .provide(screenId)
                 .fragmentNavigator.backStackEntryCount
@@ -39,6 +39,6 @@ class FlowActivity: AppCompatActivity(), FragmentNavigationContainer {
         } else {
             Finish()
         }
-        App.executor.execute(command)
+        App.navCommandExecutor.execute(command)
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt
index c4781c3f97..ed081e0b59 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt
@@ -48,15 +48,15 @@ class MainFragment : Fragment(), TabFragmentNavigationContainer {
     private fun initActiveTabReopenedListener() {
         getTabNavigator()
                 .setActiveTabReopenedListener {
-                    App.executor.execute(RemoveAll(sourceTag = tag!!))
+                    App.navCommandExecutor.execute(RemoveAll(sourceTag = tag!!))
                 }
     }
 
     private fun initBackPressedListener() {
         addOnBackPressedListener {
             when {
-                hasTabsInStack() -> App.executor.execute(RemoveLast(sourceTag = tag!!))
-                else -> App.executor.execute(Finish())
+                hasTabsInStack() -> App.navCommandExecutor.execute(RemoveLast(sourceTag = tag!!))
+                else -> App.navCommandExecutor.execute(Finish())
             }
         }
     }
@@ -67,7 +67,7 @@ class MainFragment : Fragment(), TabFragmentNavigationContainer {
             GALLERY -> GalleryRoute.Tab()
             PROFILE -> ProfileTabRoute()
         }
-        App.executor.execute(
+        App.navCommandExecutor.execute(
                 Replace(
                         route = route,
                         animations = FadeAnimations,
@@ -83,7 +83,7 @@ class MainFragment : Fragment(), TabFragmentNavigationContainer {
     }
 
     private fun getTabNavigator(): TabFragmentNavigatorInterface {
-        return App.provider
+        return App.activityNavigationProvider
                 .provide()
                 .fragmentNavigationProvider
                 .provide(tag)
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/GalleryFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/GalleryFragment.kt
index 042707174c..a0770127e0 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/GalleryFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/gallery/GalleryFragment.kt
@@ -34,15 +34,15 @@ class GalleryFragment : Fragment(), FragmentNavigationContainer {
     }
 
     private fun addPicture() {
-        App.executor.execute(Replace(ImageRoute(currentPicture), sourceTag = tag!!))
+        App.navCommandExecutor.execute(Replace(ImageRoute(currentPicture), sourceTag = tag!!))
     }
 
     private fun removePicture() {
-        App.executor.execute(RemoveLast(sourceTag = tag!!))
+        App.navCommandExecutor.execute(RemoveLast(sourceTag = tag!!))
     }
 
     private fun subscribeToBackStackChanges() {
-        val provider = App.provider.provide().fragmentNavigationProvider.provide(tag)
+        val provider = App.activityNavigationProvider.provide().fragmentNavigationProvider.provide(tag)
         val backStackEntries = provider.fragmentNavigator.addBackStackChangeListener { currentPicture = it.size + 1 }
         Log.d("111111 Update pic", "backStacks$backStackEntries, manager=${childFragmentManager}")
     }
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/HomeTabFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/HomeTabFragment.kt
index cea8c5442e..5d0d37aa64 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/HomeTabFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/HomeTabFragment.kt
@@ -19,6 +19,6 @@ class HomeTabFragment : Fragment() {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        home_add_btn.setOnClickListener { App.executor.execute(Replace(HomeNestedRoute(), sourceTag = tag!!)) }
+        home_add_btn.setOnClickListener { App.navCommandExecutor.execute(Replace(HomeNestedRoute(), sourceTag = tag!!)) }
     }
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/nested/HomeNestedFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/nested/HomeNestedFragment.kt
index 032143e5db..4e884f7724 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/nested/HomeNestedFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/nested/HomeNestedFragment.kt
@@ -21,7 +21,7 @@ class HomeNestedFragment : Fragment() {
         val currentOrder = HomeNestedRoute(arguments).order
         home_nested_tv.text = "Home\nNested\nFragment\n#$currentOrder"
         val nextOrder = currentOrder + 1
-        home_nested_add_btn.setOnClickListener { App.executor.execute(Replace(HomeNestedRoute(nextOrder), sourceTag = tag!!)) }
+        home_nested_add_btn.setOnClickListener { App.navCommandExecutor.execute(Replace(HomeNestedRoute(nextOrder), sourceTag = tag!!)) }
     }
 
 }
\ No newline at end of file
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/ProfileTabFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/ProfileTabFragment.kt
index 342815c213..978e1a2fd5 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/ProfileTabFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/ProfileTabFragment.kt
@@ -37,11 +37,11 @@ class ProfileTabFragment : Fragment() {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        profile_settings_btn.setOnClickListener { App.executor.execute(Start(ApplicationSettingsRoute())) }
-        profile_about_app_btn.setOnClickListener { App.executor.execute(Start(AboutRoute())) }
-        profile_logout_btn.setOnClickListener { App.executor.execute(ReplaceHard(AuthRoute(), FadeAnimations)) }
+        profile_settings_btn.setOnClickListener { App.navCommandExecutor.execute(Start(ApplicationSettingsRoute())) }
+        profile_about_app_btn.setOnClickListener { App.navCommandExecutor.execute(Start(AboutRoute())) }
+        profile_logout_btn.setOnClickListener { App.navCommandExecutor.execute(ReplaceHard(AuthRoute(), FadeAnimations)) }
         profile_attach_photo_btn.setOnClickListener {
-            App.executor.execute(
+            App.navCommandExecutor.execute(
                     StartForResult(
                             CameraRoute(
                                     uniqueId = screenId,
@@ -76,7 +76,7 @@ class ProfileTabFragment : Fragment() {
     private fun executeComplexCommandChain() {
         val firstFlow = FlowRoute("First flow")
         val secondFlow = FlowRoute("Second flow")
-        App.executor.execute(
+        App.navCommandExecutor.execute(
                 listOf(
                         Start(NumberRoute(42)),
                         Start(firstFlow, animations = ModalAnimations),
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/about/AboutActivity.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/about/AboutActivity.kt
index 99272361d2..c5f2817066 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/about/AboutActivity.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/about/AboutActivity.kt
@@ -20,7 +20,7 @@ class AboutActivity : AppCompatActivity() {
 
             val targetRoute = AboutRoute()
 
-            App.executor.execute(listOf(
+            App.navCommandExecutor.execute(listOf(
                     Finish(),
                     EmitScreenResult(targetRoute, appName)
             ))
diff --git a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/splash/SplashFragment.kt b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/splash/SplashFragment.kt
index 99f28fa770..177380eb13 100644
--- a/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/splash/SplashFragment.kt
+++ b/navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/splash/SplashFragment.kt
@@ -21,7 +21,7 @@ class SplashFragment : Fragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         Handler().postDelayed({
-            App.executor.execute(ReplaceHard(AuthRoute(), animations = FadeAnimations))
+            App.navCommandExecutor.execute(ReplaceHard(AuthRoute(), animations = FadeAnimations))
         }, 1500L)
     }
 }
\ No newline at end of file

From 5f4e4fec1cd36f4647ccfe09215cc717c9031233 Mon Sep 17 00:00:00 2001
From: Sergey Loskutov <40118973+TaigaMoose@users.noreply.github.com>
Date: Wed, 24 Mar 2021 16:04:04 +0300
Subject: [PATCH 15/15] check ci

---
 settings.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 9796546957..fc70aec2b9 100755
--- a/settings.gradle
+++ b/settings.gradle
@@ -108,4 +108,5 @@ parsedJson.forEach { component ->
     }
 }
 
-apply from: 'buildSrc/buildCache.gradle'
\ No newline at end of file
+apply from: 'buildSrc/buildCache.gradle'
+