Bump version to "6.4"

java interop

README.md

@@ -1,20 +1,44 @@
 # Cicerone
-[![jCenter](https://api.bintray.com/packages/terrakok/terramaven/cicerone/images/download.svg)](https://bintray.com/terrakok/terramaven/cicerone/_latestVersion)
+[![jCenter](https://api.bintray.com/packages/terrakok/terramaven/cicerone-kotlin/images/download.svg)](https://bintray.com/terrakok/terramaven/cicerone-kotlin/_latestVersion)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)  
 
 [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-Cicerone-green.svg?style=true)](https://android-arsenal.com/details/1/4700)
 [![Android Weekly](https://img.shields.io/badge/Android%20Weekly-250-green.svg)](http://androidweekly.net/issues/issue-250)
 [![Android Weekly](https://img.shields.io/badge/Android%20Weekly-271-green.svg)](http://androidweekly.net/issues/issue-271)  
 
-![](https://habrastorage.org/files/644/32e/9eb/64432e9eb3664723b3ee438449dab3b0.png)
+<table>
+    <tr>
+        <td>
+            <img src="https://github.com/terrakok/Cicerone/raw/master/media/navigation.gif" width="256"/>
+        </td>
+        <td>
+            <img src="https://github.com/terrakok/Cicerone/raw/master/media/insta_tabs.gif" width="256"/>
+        </td>
+        <td>
+            <img src="https://github.com/terrakok/Cicerone/raw/master/media/animations.gif" width="256"/>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            Power navigation
+        </td>
+        <td>
+            Multibackstack
+        </td>
+        <td>
+            Result listeners
+        </td>
+    </tr>
+</table>
 
-Cicerone (a guide, one who conducts sightseers) is a lightweight library that makes the navigation in an Android app easy.  
+Cicerone (means - a guide, one who conducts sightseers) is a lightweight library that makes the navigation in an Android app easy.  
 It was designed to be used with the MVP/MVVM/MVI patterns but will work great with any architecture.
 
 ## Main advantages
 + is not tied to Fragments
-+ not a framework
++ not a framework (very lightweight)
 + short navigation calls (no builders)
++ static typed checks for screen parameters!
 + lifecycle-safe!
 + functionality is simple to extend
 + suitable for Unit Testing
@@ -56,7 +80,7 @@ class App : Application() {
 ```
 
 ## How it works?
-<img src="https://github.com/terrakok/Cicerone/raw/develop/media/CiceroneDiagram.png" alt="drawing" width="800"/>
+<img src="https://github.com/terrakok/Cicerone/blob/master/media/CiceroneDiagram.png" alt="CiceroneDiagram.png" width="800"/>
 
 Presenter calls navigation method of Router.
 
@@ -109,13 +133,13 @@ override fun onPause() {
 ## Navigation commands
 This commands set will fulfill the needs of the most applications. But if you need something special - just add it!
 + Forward - Opens new screen
-![](https://github.com/terrakok/Cicerone/raw/develop/media/forward_img.png)
+![](https://github.com/terrakok/Cicerone/raw/master/media/forward_img.png)
 + Back - Rolls back the last transition
-![](https://github.com/terrakok/Cicerone/raw/develop/media/back_img.png)
+![](https://github.com/terrakok/Cicerone/raw/master/media/back_img.png)
 + BackTo - Rolls back to the needed screen in the screens chain
-![](https://github.com/terrakok/Cicerone/raw/develop/media/backTo_img.png)
+![](https://github.com/terrakok/Cicerone/raw/master/media/backTo_img.png)
 + Replace - Replaces the current screen
-![](https://github.com/terrakok/Cicerone/raw/develop/media/replace_img.png)
+![](https://github.com/terrakok/Cicerone/raw/master/media/replace_img.png)
 
 ## Predefined navigator
 The library provides predefined navigator for _Fragments_ and _Activity_.
@@ -147,24 +171,56 @@ private val navigator = object : AppNavigator(this, R.id.container) {
 Describe your screens as you like e.g. create Kotlin `object` with all application screens:
 ```kotlin
 object Screens {
-    val Main = FragmentScreen("MainFragment") { MainFragment() }
-    val AddressSearch = FragmentScreen("AddressSearchFragment") { AddressSearchFragment() }
-    fun Profile(userId: Long) = FragmentScreen("ProfileFragment") { ProfileFragment(userId) }
+    fun Main() = FragmentScreen { MainFragment() }
+    fun AddressSearch() = FragmentScreen { AddressSearchFragment() }
+    fun Profile(userId: Long) = FragmentScreen("Profile_$userId") { ProfileFragment(userId) }
 }
 ```
 
 Additional you can use `FragmentFactory` for creating your screens:
 ```kotlin
-val SomeScreen = FragmentScreen("SomeScreenId") { factory: FragmentFactory -> ... }
+fun SomeScreen() = FragmentScreen { factory: FragmentFactory -> ... }
+```
+
+## Screen parameters and result listener
+```kotlin
+//you have to specify screen parameters via new FragmentScreen creation
+fun SelectPhoto(resultKey: String) = FragmentScreen {
+    SelectPhotoFragment.getNewInstance(resultKey)
+}
+```
+
+```kotlin
+//listen result
+fun onSelectPhotoClicked() {
+    router.setResultListener(RESULT_KEY) { data ->
+        view.showPhoto(data as Bitmap)
+    }
+    router.navigateTo(SelectPhoto(RESULT_KEY))
+}
+
+//send result
+fun onPhotoClick(photo: Bitmap) {
+    router.sendResult(resultKey, photoRes)
+    router.exit()
+}
 ```
 
 ## Sample
-To see how to add, initialize and use the library and predefined navigators check out 
-the [GitFox (Android GitLab client)](https://gitlab.com/terrakok/gitlab-client)
+To see how to add, initialize and use the library and predefined navigators see **sample project**  
+(thank you [@Javernaut](https://github.com/Javernaut) for support new library version and migrate sample project to Kotlin!)
 
-![](https://github.com/terrakok/Cicerone/raw/develop/media/navigation.gif)
-![](https://github.com/terrakok/Cicerone/raw/develop/media/insta_tabs.gif)
-![](https://github.com/terrakok/Cicerone/raw/develop/media/animations.gif)
+For more complex use case check out the [GitFox (Android GitLab client)](https://gitlab.com/terrakok/gitlab-client)
+
+## Applications with Cicerone inside
+<a href="https://play.google.com/store/apps/details?id=ru.foodfox.client"><img src="https://play-lh.googleusercontent.com/gWYedIqy8QujCQOn0kzEIBEkGLBSpuKvFm-fMcfkWnJ1Oirtv847xAE4OyhAaohdcp5V=s360" width="64" /> Яндекс.Еда — доставка еды/продуктов. Food delivery</a><br>
+<a href="https://play.google.com/store/apps/details?id=com.foodient.whisk"><img src="https://play-lh.googleusercontent.com/eKotZjJcZOU2_L9t2l34EEY7aGl5zhvKVuEbF0Kc4MRs_pAC2SJgOnWMkMTFjR_e9EY=s360" width="64" /> Whisk: Recipe Saver, Meal Planner & Grocery List</a><br>
+<a href="https://play.google.com/store/apps/details?id=kz.beeline.odp"><img src="https://play-lh.googleusercontent.com/hzgjpQQpy6Z-Byye0aVKSv9P7h8yx58i6pVkQtiM6jB99iWFXjYfKeaPqJ3wm6Rtb38=s360" width="64" /> Мой Beeline (Казахстан)</a><br>
+<a href="https://play.google.com/store/apps/details?id=com.mercuryo.app"><img src="https://play-lh.googleusercontent.com/FKulXdc15r5PWX6hTZi2i3iaJjcQHwd9xParp6YPiQ2KiBqza7jwEt_b_tqLwXpyEHg=s360" width="64" /> Mercuryo Bitcoin Cryptowallet</a><br>
+<a href="https://play.google.com/store/apps/details?id=com.warefly.checkscan"><img src="https://play-lh.googleusercontent.com/2c2uuiSl2vwGgp-vdI-VArQEMdSSXk1neUK5A-Udc0WANPcvp5kBJFEugrFiXnxUc7k=s360" width="64" /> ЧекСкан - кэшбэк за чеки, цены и акции в магазинах</a><br>
+<a href="https://github.com/eduard1abdulmanov123/News"><img src="https://raw.githubusercontent.com/eduard1abdulmanov123/News/dev/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png" width="64" /> RSS Reader для Вести.Ru</a><br>
+<a href="https://play.google.com/store/apps/details?id=com.epam.connect.android"><img src="https://play-lh.googleusercontent.com/aN7R6BiR7yt7b3oEoBI30pVwzsdzaWe3TWpw8c9igqoOj79Pm2xVh4_C4qwjSKwjVio=s360" width="64" /> EPAM Connect</a><br>
+<a href="https://play.google.com/store/apps/details?id=org.consumerreports.ratings"><img src="https://play-lh.googleusercontent.com/dEdOwZOjXAdamytxY1TgY8LS-Hc9FKCcit5HP1RyaKqRAWjDJEyFSQS1XlqQPpeY5UI=s360" width="64" /> Consumer Reports: Product Reviews & Ratings</a><br>
 
 ## Participants
 + idea and code - Konstantin Tskhovrebov (@terrakok)

library/build.gradle

@@ -18,7 +18,7 @@ ext {
     bintrayName = 'cicerone-kotlin'
     publishedGroupId = 'com.github.terrakok'
     artifact = 'cicerone'
-    libraryVersion = '6.0'
+    libraryVersion = '6.4'
     gitUrl = 'https://github.com/terrakok/Cicerone'
     allLicenses = ['MIT']
 }

library/src/main/kotlin/com/github/terrakok/cicerone/BaseRouter.kt

@@ -7,6 +7,23 @@ package com.github.terrakok.cicerone
  */
 abstract class BaseRouter {
     internal val commandBuffer = CommandBuffer()
+    private val resultWire = ResultWire()
+
+    /**
+     * Sets data listener with given key.
+     *
+     * After first call listener will be removed.
+     */
+    fun setResultListener(key: String, listener: ResultListener) {
+        resultWire.setResultListener(key, listener)
+    }
+
+    /**
+     * Sends data to listener with given key.
+     */
+    fun sendResult(key: String, data: Any) {
+        resultWire.sendResult(key, data)
+    }
 
     /**
      * Sends navigation command array to [CommandBuffer].
@@ -15,5 +32,6 @@ abstract class BaseRouter {
      */
     protected fun executeCommands(vararg commands: Command) {
         commandBuffer.executeCommands(commands)
+        resultWire.flush()
     }
 }

library/src/main/kotlin/com/github/terrakok/cicerone/Cicerone.kt

@@ -17,12 +17,14 @@ class Cicerone<T : BaseRouter> private constructor(val router: T) {
         /**
          * Creates the Cicerone instance with the default [Router]
          */
+        @JvmStatic
         fun create() = create(Router())
 
         /**
          * Creates the Cicerone instance with the custom router.
          * @param customRouter the custom router extending [BaseRouter]
          */
+        @JvmStatic
         fun <T : BaseRouter> create(customRouter: T) = Cicerone(customRouter)
     }
 }

library/src/main/kotlin/com/github/terrakok/cicerone/ResultWire.kt

@@ -0,0 +1,30 @@
+package com.github.terrakok.cicerone
+
+import java.lang.ref.WeakReference
+
+/**
+ * Interface definition for a result callback.
+ */
+fun interface ResultListener {
+    fun onResult(data: Any)
+}
+
+internal class ResultWire {
+    private val listeners = mutableMapOf<String, WeakReference<ResultListener>>()
+
+    fun setResultListener(key: String, listener: ResultListener) {
+        listeners[key] = WeakReference(listener)
+    }
+
+    fun sendResult(key: String, data: Any) {
+        listeners.remove(key)?.get()?.let { listener ->
+            listener.onResult(data)
+        }
+    }
+
+    fun flush() {
+        listeners.entries
+            .filter { it.value.get() == null }
+            .forEach { listeners.remove(it.key) }
+    }
+}

library/src/main/kotlin/com/github/terrakok/cicerone/Router.kt

@@ -14,6 +14,7 @@ open class Router : BaseRouter() {
      * @param screen screen
      * @param clearContainer if FALSE then new screen shows over previous
      */
+    @JvmOverloads
     fun navigateTo(screen: Screen, clearContainer: Boolean = true) {
         executeCommands(Forward(screen, clearContainer))
     }
@@ -58,6 +59,7 @@ open class Router : BaseRouter() {
      * @param screens
      * @param showOnlyTopScreenView if FALSE then all screen views show together
      */
+    @JvmOverloads
     fun newChain(vararg screens: Screen, showOnlyTopScreenView: Boolean = true) {
         val commands = screens.map { Forward(it, showOnlyTopScreenView) }
         executeCommands(*commands.toTypedArray())
@@ -69,8 +71,14 @@ open class Router : BaseRouter() {
      * @param screens
      * @param showOnlyTopScreenView if FALSE then all screen views show together
      */
+    @JvmOverloads
     fun newRootChain(vararg screens: Screen, showOnlyTopScreenView: Boolean = true) {
-        val commands = screens.map { Forward(it, showOnlyTopScreenView) }
+        val commands = screens.mapIndexed { index, screen ->
+            if (index == 0)
+                Replace(screen)
+            else
+                Forward(screen, showOnlyTopScreenView)
+        }
         executeCommands(BackTo(null), *commands.toTypedArray())
     }
 

library/src/main/kotlin/com/github/terrakok/cicerone/Screen.kt

@@ -1,8 +1,8 @@
 package com.github.terrakok.cicerone
 
 /**
- * Screen is class for description application screen.
+ * Screen is interface for description application screen.
  */
-abstract class Screen {
-    open val screenKey: String = this::class.qualifiedName!!
+interface Screen {
+    val screenKey: String get() = this::class.java.name
 }

library/src/main/kotlin/com/github/terrakok/cicerone/androidx/AppNavigator.kt

@@ -13,11 +13,11 @@ import com.github.terrakok.cicerone.androidx.TransactionInfo.Type.REPLACE
  *
  * Recommendation: most useful for Single-Activity application.
  */
-open class AppNavigator constructor(
+open class AppNavigator @JvmOverloads constructor(
     protected val activity: FragmentActivity,
     protected val containerId: Int,
     protected val fragmentManager: FragmentManager = activity.supportFragmentManager,
-    protected val fragmentFactory: FragmentFactory = FragmentFactory()
+    protected val fragmentFactory: FragmentFactory = fragmentManager.fragmentFactory
 ) : Navigator {
 
     protected val localStackCopy = mutableListOf<TransactionInfo>()
@@ -109,14 +109,15 @@ open class AppNavigator constructor(
     ) {
         val fragment = screen.createFragment(fragmentFactory)
         val transaction = fragmentManager.beginTransaction()
+        transaction.setReorderingAllowed(true)
         setupFragmentTransaction(
             transaction,
             fragmentManager.findFragmentById(containerId),
             fragment
         )
         when (type) {
-            ADD -> transaction.add(containerId, fragment)
-            REPLACE -> transaction.replace(containerId, fragment)
+            ADD -> transaction.add(containerId, fragment, screen.screenKey)
+            REPLACE -> transaction.replace(containerId, fragment, screen.screenKey)
         }
         if (addToBackStack) {
             val transactionInfo = TransactionInfo(screen.screenKey, type)

library/src/main/kotlin/com/github/terrakok/cicerone/androidx/AppScreen.kt

@@ -7,16 +7,25 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentFactory
 import com.github.terrakok.cicerone.Screen
 
-sealed class AppScreen : Screen()
+sealed class AppScreen : Screen
 
-open class FragmentScreen(
-    override val screenKey: String,
-    val createFragment: (FragmentFactory) -> Fragment
-) : AppScreen()
+fun interface Creator<A, R> {
+    fun create(argument: A): R
+}
 
-open class ActivityScreen(
-    override val screenKey: String,
-    val createIntent: (context: Context) -> Intent
+open class FragmentScreen @JvmOverloads constructor(
+    private val key: String? = null,
+    private val fragmentCreator: Creator<FragmentFactory, Fragment>
 ) : AppScreen() {
+    override val screenKey: String get() = key ?: super.screenKey
+    fun createFragment(factory: FragmentFactory) = fragmentCreator.create(factory)
+}
+
+open class ActivityScreen @JvmOverloads constructor(
+    private val key: String? = null,
+    private val intentCreator: Creator<Context, Intent>
+) : AppScreen() {
+    override val screenKey: String get() = key ?: super.screenKey
     open val startActivityOptions: Bundle? = null
+    fun createIntent(context: Context) = intentCreator.create(context)
 }

library/src/main/kotlin/com/github/terrakok/cicerone/androidx/TransactionInfo.kt

@@ -12,6 +12,7 @@ data class TransactionInfo(
     override fun toString() = screenKey + type.symbol
 
     companion object {
+        @JvmStatic
         fun fromString(str: String) = TransactionInfo(
             str.dropLast(1),
             if (str.last() == Type.ADD.symbol) Type.ADD else Type.REPLACE

library/stub-android/src/main/java/androidx/fragment/app/FragmentManager.java

@@ -36,6 +36,10 @@ public class FragmentManager {
         throw new RuntimeException("Stub!");
     }
 
+    public FragmentFactory getFragmentFactory() {
+        throw new RuntimeException("Stub!");
+    }
+
     public interface BackStackEntry {
         int getId();
 

library/stub-android/src/main/java/androidx/fragment/app/FragmentTransaction.java

@@ -1,32 +1,20 @@
 package androidx.fragment.app;
 
-import android.os.Bundle;
-
 /**
  * Created by Konstantin Tskhovrebov (aka @terrakok)
  * on 11.10.16
  */
 
 public class FragmentTransaction {
-    public FragmentTransaction add(int containerViewId, Fragment fragment) {
+    public FragmentTransaction setReorderingAllowed(boolean reorderingAllowed) {
         throw new RuntimeException("Stub!");
     }
 
-    public final FragmentTransaction add(
-            int containerViewId,
-            Class<? extends Fragment> fragmentClass,
-            Bundle args) {
+    public FragmentTransaction add(int containerViewId, Fragment fragment, String tag) {
         throw new RuntimeException("Stub!");
     }
 
-    public FragmentTransaction replace(int containerViewId, Fragment fragment) {
-        throw new RuntimeException("Stub!");
-    }
-
-    public final FragmentTransaction replace(
-            int containerViewId,
-            Class<? extends Fragment> fragmentClass,
-            Bundle args) {
+    public FragmentTransaction replace(int containerViewId, Fragment fragment, String tag) {
         throw new RuntimeException("Stub!");
     }
 

sample/src/main/java/com/github/terrakok/cicerone/sample/Screens.kt

@@ -20,43 +20,43 @@ import com.github.terrakok.cicerone.sample.ui.start.StartActivity
  */
 object Screens {
 
-    fun sampleScreen(number: Int) = FragmentScreen("SampleScreen_$number") {
+    fun Sample(number: Int) = FragmentScreen("Sample($number)") {
         SampleFragment.getNewInstance(number)
     }
 
-    fun startScreen() = ActivityScreen("StartScreen") {
+    fun Start() = ActivityScreen {
         Intent(it, StartActivity::class.java)
     }
 
-    fun mainScreen() = ActivityScreen("MainScreen") {
+    fun Main() = ActivityScreen {
         Intent(it, MainActivity::class.java)
     }
 
-    fun bottomNavigationScreen() = ActivityScreen("BottomNavigationScreen") {
+    fun BottomNavigation() = ActivityScreen {
         Intent(it, BottomNavigationActivity::class.java)
     }
 
-    fun tabScreen(tabName: String) = FragmentScreen("FragmentScreen") {
+    fun Tab(tabName: String) = FragmentScreen {
         TabContainerFragment.getNewInstance(tabName)
     }
 
-    fun forwardScreen(containerName: String, number: Int) = FragmentScreen("ForwardScreen") {
+    fun Forward(containerName: String, number: Int) = FragmentScreen {
         ForwardFragment.getNewInstance(containerName, number)
     }
 
-    fun githubScreen() = ActivityScreen("GithubScreen") {
+    fun Github() = ActivityScreen {
         Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/terrakok/Cicerone"))
     }
 
-    fun profileScreen() = ActivityScreen("ProfileScreen") {
+    fun Profile() = ActivityScreen {
         Intent(it, ProfileActivity::class.java)
     }
 
-    fun profileInfoScreen() = FragmentScreen("ProfileInfoScreen") {
+    fun ProfileInfo() = FragmentScreen {
         ProfileFragment()
     }
 
-    fun selectPhotoScreen() = FragmentScreen("SelectPhotoScreen") {
-        SelectPhotoFragment()
+    fun SelectPhoto(resultKey: String) = FragmentScreen {
+        SelectPhotoFragment.getNewInstance(resultKey)
     }
 }

sample/src/main/java/com/github/terrakok/cicerone/sample/dagger/AppComponent.kt

@@ -2,7 +2,6 @@ package com.github.terrakok.cicerone.sample.dagger
 
 import com.github.terrakok.cicerone.sample.dagger.module.LocalNavigationModule
 import com.github.terrakok.cicerone.sample.dagger.module.NavigationModule
-import com.github.terrakok.cicerone.sample.dagger.module.PhotoSelectionModule
 import com.github.terrakok.cicerone.sample.ui.animations.ProfileActivity
 import com.github.terrakok.cicerone.sample.ui.animations.photos.SelectPhotoFragment
 import com.github.terrakok.cicerone.sample.ui.animations.profile.ProfileFragment
@@ -20,8 +19,7 @@ import javax.inject.Singleton
 @Singleton
 @Component(modules = [
     NavigationModule::class,
-    LocalNavigationModule::class,
-    PhotoSelectionModule::class]
+    LocalNavigationModule::class]
 )
 interface AppComponent {
     fun inject(activity: StartActivity)

sample/src/main/java/com/github/terrakok/cicerone/sample/dagger/module/PhotoSelectionModule.kt

@@ -1,20 +0,0 @@
-package com.github.terrakok.cicerone.sample.dagger.module
-
-import com.github.terrakok.cicerone.sample.R
-import com.github.terrakok.cicerone.sample.mvp.animation.PhotoSelection
-import dagger.Module
-import dagger.Provides
-import javax.inject.Singleton
-
-/**
- * Created by terrakok 24.11.16
- */
-@Module
-object PhotoSelectionModule {
-
-    private val photoSelection = PhotoSelection(R.drawable.ava_1)
-
-    @Provides
-    @Singleton
-    fun providePhotoSelection() = photoSelection
-}

sample/src/main/java/com/github/terrakok/cicerone/sample/mvp/animation/PhotoSelection.kt

@@ -1,26 +0,0 @@
-package com.github.terrakok.cicerone.sample.mvp.animation
-
-/**
- * Created by Konstantin Tskhovrebov (aka @terrakok) on 22.09.18.
- */
-class PhotoSelection(private var selectedPhoto: Int) {
-
-    private var listener: Listener? = null
-
-    fun getSelectedPhoto(): Int {
-        return selectedPhoto
-    }
-
-    fun setSelectedPhoto(selectedPhoto: Int) {
-        this.selectedPhoto = selectedPhoto
-        listener?.onChange(selectedPhoto)
-    }
-
-    fun setListener(listener: Listener?) {
-        this.listener = listener
-    }
-
-    interface Listener {
-        fun onChange(selectedPhoto: Int)
-    }
-}

sample/src/main/java/com/github/terrakok/cicerone/sample/mvp/animation/photos/SelectPhotoPresenter.kt

@@ -2,7 +2,6 @@ package com.github.terrakok.cicerone.sample.mvp.animation.photos
 
 import com.github.terrakok.cicerone.Router
 import com.github.terrakok.cicerone.sample.R
-import com.github.terrakok.cicerone.sample.mvp.animation.PhotoSelection
 import moxy.InjectViewState
 import moxy.MvpPresenter
 
@@ -11,7 +10,7 @@ import moxy.MvpPresenter
  */
 @InjectViewState
 class SelectPhotoPresenter(
-        private val photoSelection: PhotoSelection,
+        private val resultKey: String,
         private val router: Router
 ) : MvpPresenter<SelectPhotoView>() {
 
@@ -26,7 +25,7 @@ class SelectPhotoPresenter(
     }
 
     fun onPhotoClick(photoRes: Int) {
-        photoSelection.setSelectedPhoto(photoRes)
+        router.sendResult(resultKey, photoRes)
         router.exit()
     }
 

sample/src/main/java/com/github/terrakok/cicerone/sample/mvp/animation/profile/ProfilePresenter.kt

@@ -1,8 +1,8 @@
 package com.github.terrakok.cicerone.sample.mvp.animation.profile
 
 import com.github.terrakok.cicerone.Router
-import com.github.terrakok.cicerone.sample.Screens.selectPhotoScreen
-import com.github.terrakok.cicerone.sample.mvp.animation.PhotoSelection
+import com.github.terrakok.cicerone.sample.R
+import com.github.terrakok.cicerone.sample.Screens.SelectPhoto
 import moxy.InjectViewState
 import moxy.MvpPresenter
 
@@ -11,37 +11,27 @@ import moxy.MvpPresenter
  */
 @InjectViewState
 class ProfilePresenter(
-        private val photoSelection: PhotoSelection,
         private val router: Router
 ) : MvpPresenter<ProfileView>() {
 
+    companion object {
+        private const val RESULT_KEY = "photo_result"
+        private const val DEFAULT_PHOTO = R.drawable.ava_1
+    }
+
     override fun onFirstViewAttach() {
         super.onFirstViewAttach()
-        updatePhoto()
-    }
-
-    override fun onDestroy() {
-        photoSelection.setListener(null)
-        super.onDestroy()
-    }
-
-    private fun updatePhoto() {
-        viewState!!.showPhoto(photoSelection.getSelectedPhoto())
+        viewState!!.showPhoto(DEFAULT_PHOTO)
     }
 
     fun onPhotoClicked() {
-        router.navigateTo(selectPhotoScreen())
+        router.setResultListener(RESULT_KEY) { data ->
+            viewState!!.showPhoto(data as Int)
+        }
+        router.navigateTo(SelectPhoto(RESULT_KEY))
     }
 
     fun onBackPressed() {
         router.exit()
     }
-
-    init {
-        photoSelection.setListener(object : PhotoSelection.Listener {
-            override fun onChange(selectedPhoto: Int) {
-                updatePhoto()
-            }
-        })
-    }
 }

sample/src/main/java/com/github/terrakok/cicerone/sample/mvp/bottom/forward/ForwardPresenter.kt

@@ -1,8 +1,8 @@
 package com.github.terrakok.cicerone.sample.mvp.bottom.forward
 
 import com.github.terrakok.cicerone.Router
-import com.github.terrakok.cicerone.sample.Screens.forwardScreen
-import com.github.terrakok.cicerone.sample.Screens.githubScreen
+import com.github.terrakok.cicerone.sample.Screens.Forward
+import com.github.terrakok.cicerone.sample.Screens.Github
 import moxy.InjectViewState
 import moxy.MvpPresenter
 
@@ -25,11 +25,11 @@ class ForwardPresenter(
     }
 
     fun onForwardPressed() {
-        router.navigateTo(forwardScreen(container, number + 1))
+        router.navigateTo(Forward(container, number + 1))
     }
 
     fun onGithubPressed() {
-        router.navigateTo(githubScreen())
+        router.navigateTo(Github())
     }
 
     fun onBackPressed() {

sample/src/main/java/com/github/terrakok/cicerone/sample/mvp/main/SamplePresenter.kt

@@ -3,7 +3,7 @@ package com.github.terrakok.cicerone.sample.mvp.main
 import android.os.Handler
 import android.os.Looper
 import com.github.terrakok.cicerone.Router
-import com.github.terrakok.cicerone.sample.Screens.sampleScreen
+import com.github.terrakok.cicerone.sample.Screens.Sample
 import moxy.InjectViewState
 import moxy.MvpPresenter
 import java.util.concurrent.Executors
@@ -29,18 +29,26 @@ class SamplePresenter(
     }
 
     fun onForwardCommandClick() {
-        router.navigateTo(sampleScreen(screenNumber + 1))
+        router.navigateTo(Sample(screenNumber + 1))
     }
 
     fun onReplaceCommandClick() {
-        router.replaceScreen(sampleScreen(screenNumber + 1))
+        router.replaceScreen(Sample(screenNumber + 1))
     }
 
     fun onNewChainCommandClick() {
         router.newChain(
-                sampleScreen(screenNumber + 1),
-                sampleScreen(screenNumber + 2),
-                sampleScreen(screenNumber + 3)
+                Sample(screenNumber + 1),
+                Sample(screenNumber + 2),
+                Sample(screenNumber + 3)
+        )
+    }
+
+    fun onNewRootChainCommandClick() {
+        router.newRootChain(
+                Sample(screenNumber + 1),
+                Sample(screenNumber + 2),
+                Sample(screenNumber + 3)
         )
     }
 
@@ -49,20 +57,20 @@ class SamplePresenter(
     }
 
     fun onNewRootCommandClick() {
-        router.newRootScreen(sampleScreen(screenNumber + 1))
+        router.newRootScreen(Sample(screenNumber + 1))
     }
 
     fun onForwardWithDelayCommandClick() {
         future?.cancel(true)
         future = executorService.schedule({ //WARNING! Navigation must be only in UI thread.
             Handler(Looper.getMainLooper()).post {
-                router.navigateTo(sampleScreen(screenNumber + 1))
+                router.navigateTo(Sample(screenNumber + 1))
             }
         }, 5, TimeUnit.SECONDS)
     }
 
     fun onBackToCommandClick() {
-        router.backTo(sampleScreen(3))
+        router.backTo(Sample(3))
     }
 
     init {

sample/src/main/java/com/github/terrakok/cicerone/sample/mvp/start/StartActivityPresenter.kt

@@ -1,9 +1,9 @@
 package com.github.terrakok.cicerone.sample.mvp.start
 
 import com.github.terrakok.cicerone.Router
-import com.github.terrakok.cicerone.sample.Screens.bottomNavigationScreen
-import com.github.terrakok.cicerone.sample.Screens.mainScreen
-import com.github.terrakok.cicerone.sample.Screens.profileScreen
+import com.github.terrakok.cicerone.sample.Screens.BottomNavigation
+import com.github.terrakok.cicerone.sample.Screens.Main
+import com.github.terrakok.cicerone.sample.Screens.Profile
 import moxy.MvpPresenter
 
 /**
@@ -12,15 +12,15 @@ import moxy.MvpPresenter
 class StartActivityPresenter(private val router: Router) : MvpPresenter<StartActivityView>() {
 
     fun onOrdinaryPressed() {
-        router.navigateTo(mainScreen())
+        router.navigateTo(Main())
     }
 
     fun onMultiPressed() {
-        router.navigateTo(bottomNavigationScreen())
+        router.navigateTo(BottomNavigation())
     }
 
     fun onResultWithAnimationPressed() {
-        router.navigateTo(profileScreen())
+        router.navigateTo(Profile())
     }
 
     fun onBackPressed() {

sample/src/main/java/com/github/terrakok/cicerone/sample/ui/animations/ProfileActivity.kt

@@ -12,7 +12,7 @@ import com.github.terrakok.cicerone.Replace
 import com.github.terrakok.cicerone.androidx.AppNavigator
 import com.github.terrakok.cicerone.sample.R
 import com.github.terrakok.cicerone.sample.SampleApplication
-import com.github.terrakok.cicerone.sample.Screens.profileInfoScreen
+import com.github.terrakok.cicerone.sample.Screens.ProfileInfo
 import com.github.terrakok.cicerone.sample.ui.animations.photos.SelectPhotoFragment
 import com.github.terrakok.cicerone.sample.ui.animations.profile.ProfileFragment
 import com.github.terrakok.cicerone.sample.ui.common.BackButtonListener
@@ -32,7 +32,7 @@ class ProfileActivity : AppCompatActivity() {
 
         setContentView(R.layout.activity_container)
         if (savedInstanceState == null) {
-            navigator.applyCommands(arrayOf<Command>(Replace(profileInfoScreen())))
+            navigator.applyCommands(arrayOf<Command>(Replace(ProfileInfo())))
         }
     }
 
@@ -46,7 +46,7 @@ class ProfileActivity : AppCompatActivity() {
         super.onPause()
     }
 
-    private val navigator: Navigator = object : AppNavigator(this, R.id.container, supportFragmentManager, supportFragmentManager.fragmentFactory) {
+    private val navigator: Navigator = object : AppNavigator(this, R.id.container) {
 
         override fun setupFragmentTransaction(fragmentTransaction: FragmentTransaction, currentFragment: Fragment?, nextFragment: Fragment?) {
             if (currentFragment is ProfileFragment

sample/src/main/java/com/github/terrakok/cicerone/sample/ui/animations/photos/SelectPhotoFragment.kt

@@ -8,7 +8,6 @@ import android.widget.ImageView
 import com.github.terrakok.cicerone.Router
 import com.github.terrakok.cicerone.sample.SampleApplication
 import com.github.terrakok.cicerone.sample.databinding.FragmentSelectPhotoBinding
-import com.github.terrakok.cicerone.sample.mvp.animation.PhotoSelection
 import com.github.terrakok.cicerone.sample.mvp.animation.photos.SelectPhotoPresenter
 import com.github.terrakok.cicerone.sample.mvp.animation.photos.SelectPhotoView
 import com.github.terrakok.cicerone.sample.ui.animations.ProfileActivity
@@ -29,9 +28,6 @@ class SelectPhotoFragment : MvpAppCompatFragment(), SelectPhotoView, BackButtonL
     @Inject
     lateinit var router: Router
 
-    @Inject
-    lateinit var photoSelection: PhotoSelection
-
     @InjectPresenter
     lateinit var presenter: SelectPhotoPresenter
 
@@ -45,8 +41,11 @@ class SelectPhotoFragment : MvpAppCompatFragment(), SelectPhotoView, BackButtonL
     private val animationDestionationId: Int
         get() = arguments!!.getInt(ARG_ANIM_DESTINATION)
 
+    private val resultKey: String
+        get() = arguments!!.getString(EXTRA_RESULT_KEY)!!
+
     @ProvidePresenter
-    fun providePresenter() = SelectPhotoPresenter(photoSelection, router)
+    fun providePresenter() = SelectPhotoPresenter(resultKey, router)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         SampleApplication.INSTANCE.appComponent.inject(this)
@@ -100,5 +99,14 @@ class SelectPhotoFragment : MvpAppCompatFragment(), SelectPhotoView, BackButtonL
 
     companion object {
         private const val ARG_ANIM_DESTINATION = "arg_anim_dest"
+        private const val EXTRA_RESULT_KEY = "extra_result_key"
+
+        fun getNewInstance(resultKey: String): SelectPhotoFragment {
+            return SelectPhotoFragment().apply {
+                arguments = Bundle().apply {
+                    putString(EXTRA_RESULT_KEY, resultKey)
+                }
+            }
+        }
     }
 }

sample/src/main/java/com/github/terrakok/cicerone/sample/ui/animations/profile/ProfileFragment.kt

@@ -8,7 +8,6 @@ import android.widget.ImageView
 import com.github.terrakok.cicerone.Router
 import com.github.terrakok.cicerone.sample.R
 import com.github.terrakok.cicerone.sample.SampleApplication
-import com.github.terrakok.cicerone.sample.mvp.animation.PhotoSelection
 import com.github.terrakok.cicerone.sample.mvp.animation.profile.ProfilePresenter
 import com.github.terrakok.cicerone.sample.mvp.animation.profile.ProfileView
 import com.github.terrakok.cicerone.sample.ui.animations.ProfileActivity
@@ -31,11 +30,8 @@ class ProfileFragment : MvpAppCompatFragment(), ProfileView, BackButtonListener
     @InjectPresenter
     lateinit var presenter: ProfilePresenter
 
-    @Inject
-    lateinit var photoSelection: PhotoSelection
-
     @ProvidePresenter
-    fun providePresenter() = ProfilePresenter(photoSelection, router)
+    fun providePresenter() = ProfilePresenter(router)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         SampleApplication.INSTANCE.appComponent.inject(this)

sample/src/main/java/com/github/terrakok/cicerone/sample/ui/bottom/BottomNavigationActivity.kt

@@ -8,7 +8,7 @@ import com.ashokvarma.bottomnavigation.BottomNavigationItem
 import com.github.terrakok.cicerone.Router
 import com.github.terrakok.cicerone.sample.R
 import com.github.terrakok.cicerone.sample.SampleApplication
-import com.github.terrakok.cicerone.sample.Screens.tabScreen
+import com.github.terrakok.cicerone.sample.Screens.Tab
 import com.github.terrakok.cicerone.sample.mvp.bottom.BottomNavigationPresenter
 import com.github.terrakok.cicerone.sample.mvp.bottom.BottomNavigationView
 import com.github.terrakok.cicerone.sample.ui.common.BackButtonListener
@@ -87,7 +87,7 @@ class BottomNavigationActivity : MvpAppCompatActivity(), BottomNavigationView, R
         if (newFragment == null) {
             transaction.add(
                     R.id.ab_container,
-                    tabScreen(tab).createFragment.invoke(fm.fragmentFactory), tab
+                    Tab(tab).createFragment(fm.fragmentFactory), tab
             )
         }
         if (currentFragment != null) {

sample/src/main/java/com/github/terrakok/cicerone/sample/ui/bottom/TabContainerFragment.kt

@@ -11,7 +11,7 @@ import com.github.terrakok.cicerone.Router
 import com.github.terrakok.cicerone.androidx.AppNavigator
 import com.github.terrakok.cicerone.sample.R
 import com.github.terrakok.cicerone.sample.SampleApplication
-import com.github.terrakok.cicerone.sample.Screens.forwardScreen
+import com.github.terrakok.cicerone.sample.Screens.Forward
 import com.github.terrakok.cicerone.sample.subnavigation.LocalCiceroneHolder
 import com.github.terrakok.cicerone.sample.ui.common.BackButtonListener
 import com.github.terrakok.cicerone.sample.ui.common.RouterProvider
@@ -23,7 +23,7 @@ import javax.inject.Inject
 class TabContainerFragment : Fragment(), RouterProvider, BackButtonListener {
 
     private val navigator: Navigator by lazy {
-        AppNavigator(activity!!, R.id.ftc_container, childFragmentManager, childFragmentManager.fragmentFactory)
+        AppNavigator(activity!!, R.id.ftc_container, childFragmentManager)
     }
 
     @Inject
@@ -47,7 +47,7 @@ class TabContainerFragment : Fragment(), RouterProvider, BackButtonListener {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         if (childFragmentManager.findFragmentById(R.id.ftc_container) == null) {
-            cicerone.router.replaceScreen(forwardScreen(containerName, 0))
+            cicerone.router.replaceScreen(Forward(containerName, 0))
         }
     }
 

sample/src/main/java/com/github/terrakok/cicerone/sample/ui/main/MainActivity.kt

@@ -11,7 +11,7 @@ import com.github.terrakok.cicerone.Replace
 import com.github.terrakok.cicerone.androidx.AppNavigator
 import com.github.terrakok.cicerone.sample.R
 import com.github.terrakok.cicerone.sample.SampleApplication
-import com.github.terrakok.cicerone.sample.Screens.sampleScreen
+import com.github.terrakok.cicerone.sample.Screens.Sample
 import com.github.terrakok.cicerone.sample.ui.common.BackButtonListener
 import moxy.MvpAppCompatActivity
 import java.lang.ref.WeakReference
@@ -31,7 +31,7 @@ class MainActivity : MvpAppCompatActivity(), ChainHolder {
     @Inject
     lateinit var navigatorHolder: NavigatorHolder
 
-    private val navigator: Navigator = object : AppNavigator(this, R.id.main_container, supportFragmentManager, supportFragmentManager.fragmentFactory) {
+    private val navigator: Navigator = object : AppNavigator(this, R.id.main_container) {
 
         override fun applyCommands(commands: Array<out Command>) {
             super.applyCommands(commands)
@@ -48,7 +48,7 @@ class MainActivity : MvpAppCompatActivity(), ChainHolder {
         screensSchemeTV = findViewById<View>(R.id.screens_scheme) as TextView
 
         if (savedInstanceState == null) {
-            navigator.applyCommands(arrayOf<Command>(Replace(sampleScreen(1))))
+            navigator.applyCommands(arrayOf<Command>(Replace(Sample(1))))
         } else {
             printScreensScheme()
         }

sample/src/main/java/com/github/terrakok/cicerone/sample/ui/main/SampleFragment.kt

@@ -54,6 +54,7 @@ class SampleFragment : BaseFragment(), SampleView, BackButtonListener {
         binding.forwardCommand.setOnClickListener { presenter.onForwardCommandClick() }
         binding.replaceCommand.setOnClickListener { presenter.onReplaceCommandClick() }
         binding.newChainCommand.setOnClickListener { presenter.onNewChainCommandClick() }
+        binding.newRootChainCommand.setOnClickListener { presenter.onNewRootChainCommandClick() }
         binding.newRootCommand.setOnClickListener { presenter.onNewRootCommandClick() }
         binding.forwardDelayCommand.setOnClickListener { presenter.onForwardWithDelayCommandClick() }
         binding.backToCommand.setOnClickListener { presenter.onBackToCommandClick() }

sample/src/main/java/com/github/terrakok/cicerone/sample/ui/start/StartActivity.kt

@@ -29,7 +29,7 @@ class StartActivity : MvpAppCompatActivity(), StartActivityView {
     @InjectPresenter
     lateinit var presenter: StartActivityPresenter
 
-    private val navigator: Navigator = AppNavigator(this, -1, supportFragmentManager, supportFragmentManager.fragmentFactory)
+    private val navigator: Navigator = AppNavigator(this, -1)
 
     @ProvidePresenter
     fun createStartActivityPresenter() = StartActivityPresenter(router)

sample/src/main/res/layout/fragment_sample.xml

@@ -66,6 +66,18 @@
             android:text="New chain"
             android:textSize="28sp"/>
 
+        <TextView
+            android:id="@+id/new_root_chain_command"
+            android:layout_width="0dp"
+            android:layout_columnWeight="1"
+            android:layout_margin="4dp"
+            android:layout_height="0dp"
+            android:layout_rowWeight="1"
+            android:background="@color/purple"
+            android:gravity="center"
+            android:text="New root chain"
+            android:textSize="28sp"/>
+
         <TextView
             android:id="@+id/new_root_command"
             android:layout_width="0dp"
@@ -109,6 +121,7 @@
             android:layout_margin="4dp"
             android:layout_height="0dp"
             android:layout_rowWeight="1"
+            android:layout_columnSpan="2"
             android:background="@color/greensea"
             android:gravity="center"
             android:text="Finish chain"

sample/src/main/res/values/colors.xml

@@ -11,4 +11,5 @@
     <color name="greensea">#16a085</color>
     <color name="nephritis">#27ae60</color>
     <color name="belizehole">#2980b9</color>
+    <color name="purple">#9329B9</color>
 </resources>