Version bump for 3.1.0 release

Includes required lifecycle and saved state owners

.buildscript/deploy_snapshot.sh

@@ -1,26 +0,0 @@
-#!/bin/bash
-#
-# Deploy a jar, source jar, and javadoc jar to Sonatype's snapshot repo.
-#
-# Adapted from https://coderwall.com/p/9b_lfq and
-# http://benlimmer.com/2013/12/26/automatically-publish-javadoc-to-gh-pages-with-travis-ci/
-
-SLUG="bluelinelabs/Conductor"
-JDK="oraclejdk8"
-BRANCH="develop"
-
-set -e
-
-if [ "$TRAVIS_REPO_SLUG" != "$SLUG" ]; then
-  echo "Skipping snapshot deployment: wrong repository. Expected '$SLUG' but was '$TRAVIS_REPO_SLUG'."
-elif [ "$TRAVIS_JDK_VERSION" != "$JDK" ]; then
-  echo "Skipping snapshot deployment: wrong JDK. Expected '$JDK' but was '$TRAVIS_JDK_VERSION'."
-elif [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
-  echo "Skipping snapshot deployment: was pull request."
-elif [ "$TRAVIS_BRANCH" != "$BRANCH" ]; then
-  echo "Skipping snapshot deployment: wrong branch. Expected '$BRANCH' but was '$TRAVIS_BRANCH'."
-else
-  echo "Deploying snapshot..."
-  ./gradlew clean uploadArchives
-  echo "Snapshot deployed!"
-fi

.github/workflows/main.yml

@@ -0,0 +1,38 @@
+name: Test & Publish
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        distribution: 'adopt'
+        java-version: '11'
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Test with Gradle
+      run: ./gradlew test
+  publish:
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/develop'
+    needs: test
+ 
+    steps:
+    - uses: actions/checkout@v2
+    - name: set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        distribution: 'adopt'
+        java-version: '11'
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Test with Gradle
+      run: ./gradlew clean uploadArchives
+      env:
+        ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
+        ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}

.gitignore

@@ -5,10 +5,10 @@
 .checkstyle
 
 # IntelliJ IDEA
-.idea
 *.iml
 *.ipr
 *.iws
+*.idea/dictionaries
 classes
 gen-external-apklibs
 
@@ -35,6 +35,4 @@ pom.xml.*
 local.properties
 
 *.prefs
-
-# The keystore file
-app/spothero-release.keystore
+.DS_Store

.idea/.gitignore

@@ -0,0 +1,9 @@
+/libraries
+/runConfigurations.xml
+/misc.xml
+/vcs.xml
+/workspace.xml
+/caches
+/gradle.xml
+/modules.xml
+/compiler.xml

.idea/codeStyles/Project.xml

@@ -0,0 +1,137 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CALL_PARAMETERS_WRAP" value="5" />
+      <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+      <option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
+      <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+      <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+      <option name="EXTENDS_LIST_WRAP" value="1" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+      <option name="ASSIGNMENT_WRAP" value="1" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,6 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" />
+  </state>
+</component>

.idea/encodings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>

.travis.yml

@@ -1,35 +0,0 @@
-language: android
-
-android:
-  components:
-    - tools
-    - build-tools-25.0.3
-    - android-25
-    - extra-android-m2repository
-  licenses:
-    - '.+'
-
-script:
-  - ./gradlew test
-
-jdk:
-  - oraclejdk8
-
-branches:
-  only:
-    - develop
-    - master
-
-after_success:
-  - .buildscript/deploy_snapshot.sh
-
-cache:
-  directories:
-    - $HOME/.gradle
-
-sudo: false
-
-env:
-  global:
-    - secure: SoRbxmNTxnGY9qPR5Z8HraRLhHrq7eJ2UaHMuiXDSxpLwUI0IMw+8+l59PNdy/C5ZXXrr6jo6cj+sn/4u6VNg74e2h9i//O+kYGvbGJUnBx8uo1INOrVenpzSnIgxbRLxyN3ZDp8YgwJMl8MSCLM1nj2OMzjNRY5EBnEw5h3qNXBs4Hyhpp2FxVk7dA2yLMUZdOpFKJIsqhH1ZHnCEnYrLlx5cVM9yoefFmJ3PptgumtV8ciBnp0lgDGy5nTykPh6zJBz4rAXgOr95WHvoqpyBRAUZIUEgw/vB5aF8/g+CX2gvTlJYF2N9LgJTNHMEwd+zJtmjM8JzkuCfTT3uMDD3JK5O8eNU03a/+9AkbKpK2+Pt829ZPdkObavXi+oJykCmD5IirukVXE9ushR2J+fM4VOvJinsANSI0zjzFpjZMplX63lfhNu/4lj3AWV2G4rkZd3vZQU+4AuhGQ469RA9BFqUJDIsiQQJwHEAWIqo9WNi6H4H8OhferACd2T3d5Y0O3s0EG5JfdADBPh9YDIkB2zEtGc3gGdxFzxVmH48BJViubAHlH4SgJn7gn69T9wyKmJ1M8F9ph/CdhSHT3kADRDELPEEVXCcANG/verCbyxMlAMXvLNKIGgHD+A0/z9QS1WduOOZwWd1mAuNuEg/rq2OB8SoDTv/BseHrXOpc=
-    - secure: WpqrbdAvNUFn5cM/Iu3zJOaDvT3jWGHCRwvxQCzX9F8iJeTggB5dB2rjgUDCx8LJ8UAt0VCeOcGtR1RT3EHyaHorN3NWeLcBFAHSz2sXv+2xGkspsXwjfygghZTCdYEzhhvmWlz9Ln4s4QJ2fBFZA07pG0jw4Cp1hSQiJ1WlKfDQezldj8D3pPwg1oOq4b5+HVucQ6+PPVwzGk2c3etwb5205L8H8flRjZrP95mFa5n/H3b/HFIsKX5p+CPNIKCrjBEmX0nHXiV0+g6lBQBV1iCwT56vfmN8Urm4KLId71iMpmvstDxlBBRQx3sz41vxIWGFn/oN7iXJI6XfzVFkyvrd9XAQLQFffq4KpN0REy1L3rjO46sYRXu1ycCP5VFVAAwKZn+o1q6xRjCuma2Qj4tqY754pwPNyzXnndFLO7hoN8KjOgV2nk75+XlRG8LhP356CHET62QBZgJ+sl+aFM3hhknsaEuDQywo8Uz4WZL0lPmYqm5BImQT9sTEF6uQNofg4gMy/uqgGhpLtseQW3PoJXB6dmD5JdNxlOalkGSQ+aI/q5QvR6ruIiuap66o4Bu+YTvHiS2hVzmldvMmLFsU1/zECSI6Fs/vkwRN55R9mbPROWi8SzvftYk9shkFMC5QC1FXA/CHqX1W5nl/HpMrs8R9uPhdZ1lifCiW8Rk=

CONTRIBUTING.md

@@ -0,0 +1,70 @@
+# Community Contribution Guidelines
+
+As the creators and maintainers of this project, we want to ensure that the project lives and continues to grow. Not blocked by any singular person's computer time. One of the simplest ways of doing this is by encouraging a larger set of shallow contributors. Through this, we hope to mitigate the problems of a project that needs updates, but there is no-one who has the power to do so.
+
+#### Development Process
+
+We maintain two permanent, protected branches: `master` and `development`.
+
+`master` is for the current release. It has already been distributed to jcenter and can't be modified at this point (except for docs that may be incorrect for the current release!).
+
+`development` is where we stage work for the *next* release. Pull requests should be directed to this branch.
+
+When working on a new feature or fix that may span multiple commits, please do so in a feature branch (ex: `feature/my_cool_thing`). Please clean up these feature branches once merged into `development`.
+
+When a new version is ready to be released, please create a pull request to merge `development` into `master`, named something like "Release 10.0". Then we can have some final discussion before we merge it into `master` and push the release out to the public.
+
+Since `development` is a *shared* branch, it is important not to ever rebase this branch onto `master`. If a bug fix is applied to `master` it can be merged into `development` using good old simple `git checkout development && git merge master`. Yes this will clutter the history a little bit, but it also provides important context to know how/when a patch was applied. Merge commits can be considered necessary historical data, not warts on an idealized history graph.
+
+#### Testing
+
+To run tests locally, just run `./gradlew test`. Tests should always be run before pushing anything to the repo.
+
+#### Ownership
+
+If you get a merged pull-request of substance (ie not just a typo fix), then you are eligible for push access to this repo. Simply request access via a new GitHub issue.
+
+Offhand, it is easy to imagine that this would make code quality suffer, but in reality it offers fresh perspectives to the codebase and encourages ownership from people who are depending on the project. If you are building a project that relies on this codebase, then you probably have the skills to improve it and offer valuable feedback. At the end of the day, there isn't too much risk in this, as the `master` branch is still locked, and jcenter access is still being restricted.
+
+Everyone comes in with their own perspective on what a project could/should look like, and encouraging discussion can help expose good ideas sooner.
+
+#### Why do we give out push access?
+
+It can be overwhelming to be offered the chance to wipe the source code for a project. Do not worry, we do not let you push to master. All code is peer-reviewed, and we have the convention that someone other than the submitter should merge non-trivial pull requests.
+
+As a contributor, you can merge other people's pull requests, or other contributors can merge yours. You will not be assigned a pull request, but you are welcome to jump in and take a code review on topics that interest you.
+
+This project is not continuously deployed, there is space for debate after review too. Offering everyone the chance to revert, or make an amending pull request. If it feels right, merge.
+
+#### How can we help you get comfortable contributing?
+
+It is normal for a first pull request to be a potential fix for a problem, and moving on from there to helping the project's direction can be difficult. We will try to help contributors cross that barrier by offering good first step issues. These issues can be fixed without feeling like you are stepping on toes. Ideally, these are non-critical issues that are well defined. They will be purposely avoided by mature contributors to the project, to make space for others.
+
+We aim to keep all project discussion inside GitHub issues. This is to make sure valuable discussion is accessible via search. If you have questions about how to use the library, or how the project is running - GitHub issues are the goto tool for this project.
+
+#### Our expectations on you as a contributor
+
+To quote [@alloy](https://github.com/alloy) from [this issue](https://github.com/Moya/Moya/issues/135):
+
+> Do not ever feel bad for not contributing to open source.
+
+We want contributors to provide ideas, keep the ship shipping and to take some of the load from others. It is non-obligatory; we’re here to get things done in an enjoyable way. :trophy:
+
+The fact that you will have push access will allow you to:
+
+- Avoid having to fork the project if you want to submit other pull requests, as you will be able to create branches directly on the project.
+- Help triage issues and merge pull requests.
+- Pick up the project if other maintainers move their focus elsewhere.
+
+It is up to you to use those superpowers or not though 😉
+
+If someone submits a pull request that is not perfect, and you are reviewing, it is better to think about the PR's motivation rather than the specific implementation. Having braces on the wrong line should not be a blocker. Though we do want to keep test coverage high, we will work with you to figure that out together.
+
+#### What about if you have problems that cannot be discussed in a public issue?
+
+[Eric Kuck](https://github.com/erickuck) has a contactable email on his GitHub profile, and is happy to talk about any problems.
+
+#### This is a different way to handle open source! Where did it come from?
+
+The original source of this document can be found at [https://github.com/moya/contributors](https://github.com/moya/contributors).
+

README.md

@@ -1,4 +1,4 @@
-[![Travis Build](https://travis-ci.org/bluelinelabs/Conductor.svg)](https://travis-ci.org/bluelinelabs/Conductor) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-Conductor-brightgreen.svg?style=flat)](http://android-arsenal.com/details/1/3361) [![Javadocs](http://javadoc.io/badge/com.bluelinelabs/conductor.svg)](http://javadoc.io/doc/com.bluelinelabs/conductor)
+[![Travis Build](https://travis-ci.com/bluelinelabs/Conductor.svg)](https://travis-ci.com/bluelinelabs/Conductor) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-Conductor-brightgreen.svg?style=flat)](http://android-arsenal.com/details/1/3361) [![Javadocs](http://javadoc.io/badge/com.bluelinelabs/conductor.svg)](http://javadoc.io/doc/com.bluelinelabs/conductor)
 
 # Conductor
 
@@ -13,42 +13,43 @@ A small, yet full-featured framework that allows building View-based Android app
 :twisted_rightwards_arrows: | Beautiful transitions between views
 :floppy_disk: | State persistence
 :phone: | Callbacks for onActivityResult, onRequestPermissionsResult, etc
-:european_post_office: | MVP / MVVM / VIPER / MVC ready
+:european_post_office: | MVP / MVVM / MVI / VIPER / MVC ready
 
 Conductor is architecture-agnostic and does not try to force any design decisions on the developer. We here at BlueLine Labs tend to use either MVP or MVVM, but it would work equally well with standard MVC or whatever else you want to throw at it.
 
 ## Installation
 
 ```gradle
-compile 'com.bluelinelabs:conductor:2.1.4'
+implementation 'com.bluelinelabs:conductor:3.1.0'
 
-// If you want the components that go along with
-// Android's support libraries (currently just a PagerAdapter):
-compile 'com.bluelinelabs:conductor-support:2.1.4'
+// AndroidX Transition change handlers:
+implementation 'com.bluelinelabs:conductor-androidx-transition:3.1.0'
 
-// If you want RxJava lifecycle support:
-compile 'com.bluelinelabs:conductor-rxlifecycle:2.1.4'
+// ViewPager PagerAdapter:
+implementation 'com.bluelinelabs:conductor-viewpager:3.1.0'
 
-// If you want RxJava2 lifecycle support:
-compile 'com.bluelinelabs:conductor-rxlifecycle2:2.1.4'
+// ViewPager2 Adapter:
+implementation 'com.bluelinelabs:conductor-viewpager2:3.1.0'
 
-// If you want RxJava2 Autodispose support:
-compile 'com.bluelinelabs:conductor-autodispose:2.1.4'
+// RxJava2 lifecycle support:
+implementation 'com.bluelinelabs:conductor-rxlifecycle2:3.1.0'
 
-// If you want Controllers that are Lifecycle-aware (architecture components):
-compile 'com.bluelinelabs:conductor-arch-components-lifecycle:0.1.1'
+// RxJava2 Autodispose support:
+implementation 'com.bluelinelabs:conductor-autodispose:3.1.0'
+
+// Lifecycle-aware Controllers (architecture components):
+implementation 'com.bluelinelabs:conductor-archlifecycle:3.1.0'
 ```
 
-SNAPSHOT:
+**SNAPSHOT**
 
-Just use `2.1.5-SNAPSHOT` as your version number in any of the above dependencies and add the url to the snapshot repository:
+Just use `3.1.1-SNAPSHOT` as your version number in any of the dependencies above and add the url to the snapshot repository:
 
 ```gradle
 allprojects {
   repositories {
-    ...
-
     maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+  }
 }
 ```
 
@@ -59,7 +60,7 @@ allprojects {
 __Controller__ | The Controller is the View wrapper that will give you all of your lifecycle management features. Think of it as a lighter-weight and more predictable Fragment alternative with an easier to manage lifecycle.
 __Router__ | A Router implements navigation and backstack handling for Controllers. Router objects are attached to Activity/containing ViewGroup pairs. Routers do not directly render or push Views to the container ViewGroup, but instead defer this responsibility to the ControllerChangeHandler specified in a given transaction.
 __ControllerChangeHandler__ | ControllerChangeHandlers are responsible for swapping the View for one Controller to the View of another. They can be useful for performing animations and transitions between Controllers. Several default ControllerChangeHandlers are included.
-__ControllerTransaction__ | Transactions are used to define data about adding Controllers. RouterControllerTransactions are used to push a Controller to a Router with specified ControllerChangeHandlers, while ChildControllerTransactions are used to add child Controllers.
+__RouterTransaction__ | Transactions are used to define data about adding Controllers. RouterTransactions are used to push a Controller to a Router with specified ControllerChangeHandlers, while ChildControllerTransactions are used to add child Controllers.
 
 ## Getting Started
 
@@ -76,7 +77,7 @@ public class MainActivity extends Activity {
 
         setContentView(R.layout.activity_main);
 
-        ViewGroup container = (ViewGroup)findViewById(R.id.controller_container);
+        ViewGroup container = (ViewGroup) findViewById(R.id.controller_container);
 
         router = Conductor.attachRouter(this, container, savedInstanceState);
         if (!router.hasRootController()) {
@@ -100,9 +101,9 @@ public class MainActivity extends Activity {
 public class HomeController extends Controller {
 
     @Override
-    protected View onCreateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container) {
+    protected View onCreateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container, @Nullable Bundle savedViewState) {
         View view = inflater.inflate(R.layout.controller_home, container, false);
-        ((TextView)view.findViewById(R.id.tv_title)).setText("Hello World");
+        ((TextView) view.findViewById(R.id.tv_title)).setText("Hello World");
         return view;
     }
 
@@ -131,11 +132,19 @@ The lifecycle of a Controller is significantly simpler to understand than that o
 `getChildRouter` can be called on a `Controller` in order to get a nested `Router` into which child `Controller`s can be pushed. This enables creating advanced layouts, such as Master/Detail.
 
 ### RxJava Lifecycle
-If the RxLifecycle dependency has been added, there is an `RxController` available that can be used along with the standard [RxLifecycle library](https://github.com/trello/RxLifecycle). There is also a `ControllerLifecycleProvider` available if you do not wish to use this subclass.
+If the AutoDispose dependency has been added, there is a `ControllerScopeProvider` available that can be used along with the standard [AutoDispose library](https://github.com/uber/AutoDispose).
+
+## Community Projects
+The community has provided several helpful modules to make developing apps with Conductor even easier. Here's a collection of helpful libraries:
+
+* [ConductorGlide](https://github.com/MkhytarMkhoian/ConductorGlide) - Adds Glide lifecycle support to Controllers
+* [ConductorDialog](https://github.com/MkhytarMkhoian/ConductorDialog) - Adds a helpful DialogController (a Conductor version of DialogFragment)
+* [Mosby-Conductor](https://github.com/sockeqwe/mosby-conductor) - A plugin to integrate Mosby, an MVP/MVI library
+
 
 ## License
 ```
-Copyright 2016 BlueLine Labs, Inc.
+Copyright 2020 BlueLine Labs, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

build.gradle

@@ -1,17 +1,22 @@
 buildscript {
+    apply from: rootProject.file('dependencies.gradle')
+
     repositories {
-        jcenter()
+        mavenCentral()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath "com.android.tools.build:gradle:$agpVersion"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        classpath "com.vanniktech:gradle-maven-publish-plugin:$mvnPublishVersion"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokkaVersion"
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
         mavenCentral()
-        maven { url 'https://maven.google.com' }
+        google()
     }
 }
 

conductor-lint/build.gradle

@@ -1,25 +1,21 @@
-apply plugin: 'java'
-
-targetCompatibility = JavaVersion.VERSION_1_7
-sourceCompatibility = JavaVersion.VERSION_1_7
+apply plugin: 'java-library'
 
 configurations {
     lintChecks
 }
 
 dependencies {
-    compile rootProject.ext.lintapi
-    compile rootProject.ext.lintchecks
+    compileOnly rootProject.ext.lintapi
+    compileOnly rootProject.ext.lintchecks
 
-    testCompile rootProject.ext.lint
-    testCompile rootProject.ext.lintTests
-
-    lintChecks files(jar)
+    testImplementation rootProject.ext.junit
+    testImplementation rootProject.ext.lint
+    testImplementation rootProject.ext.lintTests
 }
 
 jar {
     manifest {
-        attributes('Lint-Registry': 'com.bluelinelabs.conductor.lint.IssueRegistry')
+        attributes('Lint-Registry-v2': 'com.bluelinelabs.conductor.lint.IssueRegistry')
     }
 }
 

conductor-lint/src/main/java/com/bluelinelabs/conductor/lint/ControllerChangeHandlerIssueDetector.java

@@ -1,6 +1,7 @@
 package com.bluelinelabs.conductor.lint;
 
 import com.android.tools.lint.client.api.JavaEvaluator;
+import com.android.tools.lint.client.api.UElementHandler;
 import com.android.tools.lint.detector.api.Category;
 import com.android.tools.lint.detector.api.Detector;
 import com.android.tools.lint.detector.api.Implementation;
@@ -8,62 +9,80 @@ import com.android.tools.lint.detector.api.Issue;
 import com.android.tools.lint.detector.api.JavaContext;
 import com.android.tools.lint.detector.api.Scope;
 import com.android.tools.lint.detector.api.Severity;
-import com.intellij.psi.PsiClass;
-import com.intellij.psi.PsiMethod;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.uast.UClass;
+import org.jetbrains.uast.UElement;
+import org.jetbrains.uast.UMethod;
 
 import java.util.Collections;
 import java.util.List;
 
-public final class ControllerChangeHandlerIssueDetector extends Detector implements Detector.JavaPsiScanner {
+@SuppressWarnings("UnstableApiUsage")
+public final class ControllerChangeHandlerIssueDetector extends Detector implements Detector.UastScanner {
 
-    public static final Issue ISSUE =
+    static final Issue ISSUE =
             Issue.create("ValidControllerChangeHandler", "ControllerChangeHandler not instantiatable",
                     "Non-abstract ControllerChangeHandler instances must have a default constructor for the"
                             + " system to re-create them in the case of the process being killed.",
                     Category.CORRECTNESS, 6, Severity.FATAL,
                     new Implementation(ControllerChangeHandlerIssueDetector.class, Scope.JAVA_FILE_SCOPE));
 
-    public ControllerChangeHandlerIssueDetector() { }
+    private static final String CLASS_NAME = "com.bluelinelabs.conductor.ControllerChangeHandler";
 
     @Override
-    public List<String> applicableSuperClasses() {
-        return Collections.singletonList("com.bluelinelabs.conductor.ControllerChangeHandler");
+    public List<Class<? extends UElement>> getApplicableUastTypes() {
+        return Collections.<Class<? extends UElement>>singletonList(UClass.class);
     }
 
     @Override
-    public void checkClass(JavaContext context, PsiClass declaration) {
+    public UElementHandler createUastHandler(final JavaContext context) {
         final JavaEvaluator evaluator = context.getEvaluator();
-        if (evaluator.isAbstract(declaration)) {
-            return;
-        }
 
-        if (!evaluator.isPublic(declaration)) {
-            String message = String.format("This ControllerChangeHandler class should be public (%1$s)", declaration.getQualifiedName());
-            context.report(ISSUE, declaration, context.getLocation(declaration), message);
-            return;
-        }
+        return new UElementHandler() {
 
-        if (declaration.getContainingClass() != null && !evaluator.isStatic(declaration)) {
-            String message = String.format("This ControllerChangeHandler inner class should be static (%1$s)", declaration.getQualifiedName());
-            context.report(ISSUE, declaration, context.getLocation(declaration), message);
-            return;
-        }
+            @Override
+            public void visitClass(@NotNull UClass node) {
+                if (evaluator.isAbstract(node)) {
+                    return;
+                }
 
-        boolean hasDefaultConstructor = false;
-        PsiMethod[] constructors = declaration.getConstructors();
-        for (PsiMethod constructor : constructors) {
-            if (evaluator.isPublic(constructor)) {
-                if (constructor.getParameterList().getParametersCount() == 0) {
-                    hasDefaultConstructor = true;
-                    break;
+                final boolean hasSuperType = evaluator.extendsClass(node.getPsi(), CLASS_NAME, true);
+                if (!hasSuperType) {
+                    return;
+                }
+
+                if (!evaluator.isPublic(node)) {
+                    String message = String.format("This ControllerChangeHandler class should be public (%1$s)", node.getQualifiedName());
+                    context.report(ISSUE, node, context.getLocation((UElement) node), message);
+                    return;
+                }
+
+                if (node.getContainingClass() != null && !evaluator.isStatic(node)) {
+                    String message = String.format("This ControllerChangeHandler inner class should be static (%1$s)", node.getQualifiedName());
+                    context.report(ISSUE, node, context.getLocation((UElement) node), message);
+                    return;
+                }
+
+                boolean hasConstructor = false;
+                boolean hasDefaultConstructor = false;
+                for (UMethod method : node.getMethods()) {
+                    if (method.isConstructor()) {
+                        hasConstructor = true;
+                        if (evaluator.isPublic(method) && method.getUastParameters().size() == 0) {
+                            hasDefaultConstructor = true;
+                            break;
+                        }
+                    }
+                }
+
+                if (hasConstructor && !hasDefaultConstructor) {
+                    String message = String.format(
+                            "This ControllerChangeHandler needs to have a public default constructor (`%1$s`)", node.getQualifiedName());
+                    context.report(ISSUE, node, context.getLocation((UElement) node), message);
                 }
             }
-        }
-
-        if (constructors.length > 0 && !hasDefaultConstructor) {
-            String message = String.format(
-                    "This ControllerChangeHandler needs to have a public default constructor (`%1$s`)", declaration.getQualifiedName());
-            context.report(ISSUE, declaration, context.getLocation(declaration), message);
-        }
+        };
     }
+
 }

conductor-lint/src/main/java/com/bluelinelabs/conductor/lint/ControllerIssueDetector.java

@@ -2,6 +2,7 @@ package com.bluelinelabs.conductor.lint;
 
 import com.android.SdkConstants;
 import com.android.tools.lint.client.api.JavaEvaluator;
+import com.android.tools.lint.client.api.UElementHandler;
 import com.android.tools.lint.detector.api.Category;
 import com.android.tools.lint.detector.api.Detector;
 import com.android.tools.lint.detector.api.Implementation;
@@ -9,74 +10,90 @@ import com.android.tools.lint.detector.api.Issue;
 import com.android.tools.lint.detector.api.JavaContext;
 import com.android.tools.lint.detector.api.Scope;
 import com.android.tools.lint.detector.api.Severity;
-import com.intellij.psi.PsiClass;
-import com.intellij.psi.PsiMethod;
-import com.intellij.psi.PsiParameter;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.uast.UClass;
+import org.jetbrains.uast.UElement;
+import org.jetbrains.uast.UMethod;
+import org.jetbrains.uast.UParameter;
 
 import java.util.Collections;
 import java.util.List;
 
-public final class ControllerIssueDetector extends Detector implements Detector.JavaPsiScanner {
+@SuppressWarnings("UnstableApiUsage")
+public final class ControllerIssueDetector extends Detector implements Detector.UastScanner {
 
-    public static final Issue ISSUE =
+    static final Issue ISSUE =
             Issue.create("ValidController", "Controller not instantiatable",
                     "Non-abstract Controller instances must have a default or single-argument constructor"
                             + " that takes a Bundle in order for the system to re-create them in the"
                             + " case of the process being killed.", Category.CORRECTNESS, 6, Severity.FATAL,
                     new Implementation(ControllerIssueDetector.class, Scope.JAVA_FILE_SCOPE));
 
-    public ControllerIssueDetector() { }
+    private static final String CLASS_NAME = "com.bluelinelabs.conductor.Controller";
 
     @Override
-    public List<String> applicableSuperClasses() {
-        return Collections.singletonList("com.bluelinelabs.conductor.Controller");
+    public List<Class<? extends UElement>> getApplicableUastTypes() {
+        return Collections.singletonList(UClass.class);
     }
 
     @Override
-    public void checkClass(JavaContext context, PsiClass declaration) {
+    public UElementHandler createUastHandler(final JavaContext context) {
         final JavaEvaluator evaluator = context.getEvaluator();
-        if (evaluator.isAbstract(declaration)) {
-            return;
-        }
 
-        if (!evaluator.isPublic(declaration)) {
-            String message = String.format("This Controller class should be public (%1$s)", declaration.getQualifiedName());
-            context.report(ISSUE, declaration, context.getLocation(declaration), message);
-            return;
-        }
+        return new UElementHandler() {
+            @Override
+            public void visitClass(@NotNull UClass node) {
+                if (evaluator.isAbstract(node)) {
+                    return;
+                }
 
-        if (declaration.getContainingClass() != null && !evaluator.isStatic(declaration)) {
-            String message = String.format("This Controller inner class should be static (%1$s)", declaration.getQualifiedName());
-            context.report(ISSUE, declaration, context.getLocation(declaration), message);
-            return;
-        }
+                final boolean hasSuperType = evaluator.extendsClass(node.getPsi(), CLASS_NAME, true);
+                if (!hasSuperType) {
+                    return;
+                }
 
+                if (!evaluator.isPublic(node)) {
+                    String message = String.format("This Controller class should be public (%1$s)", node.getQualifiedName());
+                    context.report(ISSUE, node, context.getLocation((UElement) node), message);
+                    return;
+                }
 
-        boolean hasDefaultConstructor = false;
-        boolean hasBundleConstructor = false;
-        PsiMethod[] constructors = declaration.getConstructors();
-        for (PsiMethod constructor : constructors) {
-            if (evaluator.isPublic(constructor)) {
-                PsiParameter[] parameters = constructor.getParameterList().getParameters();
+                if (node.getContainingClass() != null && !evaluator.isStatic(node)) {
+                    String message = String.format("This Controller inner class should be static (%1$s)", node.getQualifiedName());
+                    context.report(ISSUE, node, context.getLocation((UElement) node), message);
+                    return;
+                }
 
-                if (parameters.length == 0) {
-                    hasDefaultConstructor = true;
-                    break;
-                } else if (parameters.length == 1 &&
-                        parameters[0].getType().equalsToText(SdkConstants.CLASS_BUNDLE) ||
-                        parameters[0].getType().equalsToText("Bundle")) {
-                    hasBundleConstructor = true;
-                    break;
+                boolean hasConstructor = false;
+                boolean hasDefaultConstructor = false;
+                boolean hasBundleConstructor = false;
+                for (UMethod method : node.getMethods()) {
+                    if (method.isConstructor()) {
+                        hasConstructor = true;
+                        if (evaluator.isPublic(method)) {
+                            List<UParameter> parameters = method.getUastParameters();
+                            if (parameters.size() == 0) {
+                                hasDefaultConstructor = true;
+                                break;
+                            } else if (parameters.size() == 1 &&
+                                    (parameters.get(0).getType().equalsToText(SdkConstants.CLASS_BUNDLE)) ||
+                                    parameters.get(0).getType().equalsToText("Bundle")) {
+                                hasBundleConstructor = true;
+                            }
+                        }
+                    }
+                }
+
+                if (hasConstructor && !hasDefaultConstructor && !hasBundleConstructor) {
+                    String message = String.format(
+                            "This Controller needs to have either a public default constructor or a" +
+                                    " public single-argument constructor that takes a Bundle. (`%1$s`)",
+                            node.getQualifiedName());
+                    context.report(ISSUE, node, context.getLocation((UElement) node), message);
                 }
             }
-        }
-
-        if (constructors.length > 0 && !hasDefaultConstructor && !hasBundleConstructor) {
-            String message = String.format(
-                    "This Controller needs to have either a public default constructor or a" +
-                            " public single-argument constructor that takes a Bundle. (`%1$s`)",
-                    declaration.getQualifiedName());
-            context.report(ISSUE, declaration, context.getLocation(declaration), message);
-        }
+        };
     }
+
 }

conductor-lint/src/main/java/com/bluelinelabs/conductor/lint/IssueRegistry.java

@@ -1,14 +0,0 @@
-package com.bluelinelabs.conductor.lint;
-
-import com.android.tools.lint.detector.api.Issue;
-
-import java.util.Arrays;
-import java.util.List;
-
-public final class IssueRegistry extends com.android.tools.lint.client.api.IssueRegistry {
-    @Override public List<Issue> getIssues() {
-        return Arrays.asList(
-                ControllerIssueDetector.ISSUE,
-                ControllerChangeHandlerIssueDetector.ISSUE);
-    }
-}

conductor-lint/src/main/java/com/bluelinelabs/conductor/lint/IssueRegistry.kt

@@ -0,0 +1,24 @@
+package com.bluelinelabs.conductor.lint
+
+import com.android.tools.lint.client.api.Vendor
+import com.android.tools.lint.detector.api.CURRENT_API
+import com.android.tools.lint.client.api.IssueRegistry as LintIssueRegistry
+
+@Suppress("UnstableApiUsage", "unused")
+class IssueRegistry : LintIssueRegistry() {
+
+  override val issues = listOf(
+    ControllerIssueDetector.ISSUE,
+    ControllerChangeHandlerIssueDetector.ISSUE
+  )
+
+  override val api: Int = CURRENT_API
+
+  private val githubIssueLink = "https://github.com/bluelinelabs/Conductor/issues/new"
+
+  override val vendor = Vendor(
+    vendorName = "Conductor",
+    feedbackUrl = githubIssueLink,
+    contact = githubIssueLink
+  )
+}

conductor-lint/src/test/java/com/bluelinelabs/conductor/lint/ControllerChangeHandlerDetectorTest.java

@@ -1,96 +1,137 @@
 package com.bluelinelabs.conductor.lint;
 
-import com.android.tools.lint.checks.infrastructure.LintDetectorTest;
-import com.android.tools.lint.detector.api.Detector;
-import com.android.tools.lint.detector.api.Issue;
+import static com.android.tools.lint.checks.infrastructure.TestFiles.java;
+import static com.android.tools.lint.checks.infrastructure.TestLintTask.lint;
+
+import com.android.tools.lint.checks.infrastructure.TestFile;
 
 import org.intellij.lang.annotations.Language;
+import org.junit.Test;
 
-import java.util.Collections;
-import java.util.List;
+@SuppressWarnings("UnstableApiUsage")
+public class ControllerChangeHandlerDetectorTest {
 
-import static com.google.common.truth.Truth.assertThat;
-
-public class ControllerChangeHandlerDetectorTest extends LintDetectorTest {
-
-    private static final String NO_WARNINGS = "No warnings.";
     private static final String CONSTRUCTOR =
             "src/test/SampleHandler.java:2: Error: This ControllerChangeHandler needs to have a public default constructor (test.SampleHandler) [ValidControllerChangeHandler]\n"
-            + "public class SampleHandler extends com.bluelinelabs.conductor.ControllerChangeHandler {\n"
-            + "^\n"
-            + "1 errors, 0 warnings\n";
-    private static final String PRIVATE_CLASS_ERROR =
-            "src/test/SampleHandler.java:2: Error: This ControllerChangeHandler class should be public (test.SampleHandler) [ValidControllerChangeHandler]\n"
-                    + "private class SampleHandler extends com.bluelinelabs.conductor.ControllerChangeHandler {\n"
+                    + "public class SampleHandler extends com.bluelinelabs.conductor.ControllerChangeHandler {\n"
                     + "^\n"
                     + "1 errors, 0 warnings\n";
 
-    public void testWithNoConstructor() throws Exception {
+    private final TestFile controllerChangeHandlerStub = java(
+            "package com.bluelinelabs.conductor;\n"
+                    + "abstract class ControllerChangeHandler {}"
+    );
+
+    @Test
+    public void testWithNoConstructor() {
         @Language("JAVA") String source = ""
                 + "package test;\n"
                 + "public class SampleHandler extends com.bluelinelabs.conductor.ControllerChangeHandler {\n"
                 + "}";
-        assertThat(lintProject(java(source))).isEqualTo(NO_WARNINGS);
+
+        lint()
+                .files(controllerChangeHandlerStub, java(source))
+                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
+                .run()
+                .expectClean();
     }
 
-    public void testWithEmptyConstructor() throws Exception {
+    @Test
+    public void testWithEmptyConstructor() {
         @Language("JAVA") String source = ""
                 + "package test;\n"
                 + "public class SampleHandler extends com.bluelinelabs.conductor.ControllerChangeHandler {\n"
                 + "    public SampleHandler() { }\n"
                 + "}";
-        assertThat(lintProject(java(source))).isEqualTo(NO_WARNINGS);
+
+        lint()
+                .files(controllerChangeHandlerStub, java(source))
+                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
+                .run()
+                .expectClean();
     }
 
-    public void testWithInvalidConstructor() throws Exception {
+    @Test
+    public void testWithInvalidConstructor() {
         @Language("JAVA") String source = ""
                 + "package test;\n"
                 + "public class SampleHandler extends com.bluelinelabs.conductor.ControllerChangeHandler {\n"
                 + "    public SampleHandler(int number) { }\n"
                 + "}";
-        assertThat(lintProject(java(source))).isEqualTo(CONSTRUCTOR);
+
+        lint()
+                .files(controllerChangeHandlerStub, java(source))
+                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
+                .run()
+                .expect(CONSTRUCTOR);
     }
 
-    public void testWithEmptyAndInvalidConstructor() throws Exception {
+    @Test
+    public void testWithEmptyAndInvalidConstructor() {
         @Language("JAVA") String source = ""
                 + "package test;\n"
                 + "public class SampleHandler extends com.bluelinelabs.conductor.ControllerChangeHandler {\n"
                 + "    public SampleHandler() { }\n"
                 + "    public SampleHandler(int number) { }\n"
                 + "}";
-        assertThat(lintProject(java(source))).isEqualTo(NO_WARNINGS);
+
+        lint()
+                .files(controllerChangeHandlerStub, java(source))
+                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
+                .run()
+                .expectClean();
     }
 
-    public void testWithPrivateConstructor() throws Exception {
+    @Test
+    public void testWithPrivateConstructor() {
         @Language("JAVA") String source = ""
                 + "package test;\n"
                 + "public class SampleHandler extends com.bluelinelabs.conductor.ControllerChangeHandler {\n"
                 + "    private SampleHandler() { }\n"
                 + "}";
-        assertThat(lintProject(java(source))).isEqualTo(CONSTRUCTOR);
+
+        lint()
+                .files(controllerChangeHandlerStub, java(source))
+                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
+                .run()
+                .expect(CONSTRUCTOR);
     }
 
-    public void testWithPrivateClass() throws Exception {
+    @Test
+    public void testWithPrivateClass() {
         @Language("JAVA") String source = ""
                 + "package test;\n"
                 + "private class SampleHandler extends com.bluelinelabs.conductor.ControllerChangeHandler {\n"
                 + "    public SampleHandler() { }\n"
                 + "}";
-        assertThat(lintProject(java(source))).isEqualTo(PRIVATE_CLASS_ERROR);
+
+        lint()
+                .files(controllerChangeHandlerStub, java(source))
+                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
+                .run()
+                .expect("src/test/SampleHandler.java:2: Error: This ControllerChangeHandler class should be public (test.SampleHandler) [ValidControllerChangeHandler]\n"
+                        + "private class SampleHandler extends com.bluelinelabs.conductor.ControllerChangeHandler {\n"
+                        + "^\n"
+                        + "1 errors, 0 warnings\n");
     }
 
-    @Override
-    protected Detector getDetector() {
-        return new ControllerChangeHandlerIssueDetector();
-    }
+    @Test
+    public void testWithPrivateClassOfBaseClass() {
+        @Language("JAVA") String baseClass = ""
+                + "package test;\n"
+                + "abstract class BaseChangeHandler extends com.bluelinelabs.conductor.ControllerChangeHandler {}";
 
-    @Override
-    protected List<Issue> getIssues() {
-        return Collections.singletonList(ControllerChangeHandlerIssueDetector.ISSUE);
-    }
+        @Language("JAVA") String source = ""
+                + "package test;\n"
+                + "private class SampleHandler extends test.BaseChangeHandler {}";
 
-    @Override
-    protected boolean allowCompilationErrors() {
-        return true;
+        lint()
+                .files(controllerChangeHandlerStub, java(baseClass), java(source))
+                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
+                .run()
+                .expect("src/test/SampleHandler.java:2: Error: This ControllerChangeHandler class should be public (test.SampleHandler) [ValidControllerChangeHandler]\n" +
+                        "private class SampleHandler extends test.BaseChangeHandler {}\n" +
+                        "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" +
+                        "1 errors, 0 warnings");
     }
 }

conductor-lint/src/test/java/com/bluelinelabs/conductor/lint/ControllerDetectorTest.java

@@ -1,96 +1,147 @@
 package com.bluelinelabs.conductor.lint;
 
-import com.android.tools.lint.checks.infrastructure.LintDetectorTest;
-import com.android.tools.lint.detector.api.Detector;
-import com.android.tools.lint.detector.api.Issue;
+import static com.android.tools.lint.checks.infrastructure.TestFiles.java;
+import static com.android.tools.lint.checks.infrastructure.TestLintTask.lint;
+
+import com.android.tools.lint.checks.infrastructure.TestFile;
 
 import org.intellij.lang.annotations.Language;
+import org.junit.Test;
 
-import java.util.Collections;
-import java.util.List;
+@SuppressWarnings("UnstableApiUsage")
+public class ControllerDetectorTest {
 
-import static com.google.common.truth.Truth.assertThat;
-
-public class ControllerDetectorTest extends LintDetectorTest {
-
-    private static final String NO_WARNINGS = "No warnings.";
     private static final String CONSTRUCTOR_ERROR =
             "src/test/SampleController.java:2: Error: This Controller needs to have either a public default constructor or a public single-argument constructor that takes a Bundle. (test.SampleController) [ValidController]\n"
-            + "public class SampleController extends com.bluelinelabs.conductor.Controller {\n"
-            + "^\n"
-            + "1 errors, 0 warnings\n";
+                    + "public class SampleController extends com.bluelinelabs.conductor.Controller {\n"
+                    + "^\n"
+                    + "1 errors, 0 warnings\n";
     private static final String CLASS_ERROR =
             "src/test/SampleController.java:2: Error: This Controller class should be public (test.SampleController) [ValidController]\n"
                     + "private class SampleController extends com.bluelinelabs.conductor.Controller {\n"
                     + "^\n"
                     + "1 errors, 0 warnings\n";
 
-    public void testWithNoConstructor() throws Exception {
+    private final TestFile controllerStub = java(
+            "package com.bluelinelabs.conductor;\n"
+                    + "abstract class Controller {}"
+    );
+
+
+    @Test
+    public void testWithNoConstructor() {
         @Language("JAVA") String source = ""
                 + "package test;\n"
                 + "public class SampleController extends com.bluelinelabs.conductor.Controller {\n"
                 + "}";
-        assertThat(lintProject(java(source))).isEqualTo(NO_WARNINGS);
+
+        lint()
+                .files(controllerStub, java(source))
+                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
+                .run()
+                .expectClean();
     }
 
-    public void testWithEmptyConstructor() throws Exception {
+    @Test
+    public void testWithEmptyConstructor() {
         @Language("JAVA") String source = ""
                 + "package test;\n"
                 + "public class SampleController extends com.bluelinelabs.conductor.Controller {\n"
                 + "    public SampleController() { }\n"
                 + "}";
-        assertThat(lintProject(java(source))).isEqualTo(NO_WARNINGS);
+
+        lint()
+                .files(controllerStub, java(source))
+                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
+                .run()
+                .expectClean();
     }
 
-    public void testWithInvalidConstructor() throws Exception {
+    @Test
+    public void testWithInvalidConstructor() {
         @Language("JAVA") String source = ""
                 + "package test;\n"
                 + "public class SampleController extends com.bluelinelabs.conductor.Controller {\n"
                 + "    public SampleController(int number) { }\n"
                 + "}";
-        assertThat(lintProject(java(source))).isEqualTo(CONSTRUCTOR_ERROR);
+
+        lint()
+                .files(controllerStub, java(source))
+                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
+                .run()
+                .expect(CONSTRUCTOR_ERROR);
     }
 
-    public void testWithEmptyAndInvalidConstructor() throws Exception {
+    @Test
+    public void testWithEmptyAndInvalidConstructor() {
         @Language("JAVA") String source = ""
                 + "package test;\n"
                 + "public class SampleController extends com.bluelinelabs.conductor.Controller {\n"
                 + "    public SampleController() { }\n"
                 + "    public SampleController(int number) { }\n"
                 + "}";
-        assertThat(lintProject(java(source))).isEqualTo(NO_WARNINGS);
+
+        lint()
+                .files(controllerStub, java(source))
+                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
+                .run()
+                .expectClean();
     }
 
-    public void testWithPrivateConstructor() throws Exception {
+    @Test
+    public void testWithBaseClassAndPrivateConstructor() {
+        @Language("JAVA")
+        String baseClass = ""
+                + "package test;\n"
+                + "public class BaseController extends com.bluelinelabs.conductor.Controller {}";
+
+        @Language("JAVA")
+        String source = ""
+                + "package test;\n"
+                + "public class SampleController extends BaseController {\n"
+                + "    private SampleController() { }\n"
+                + "}";
+
+        lint()
+                .files(controllerStub, java(baseClass), java(source))
+                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
+                .run()
+                .expect(
+                        "src/test/SampleController.java:2: Error: This Controller needs to have either a public default constructor or a public single-argument constructor that takes a Bundle. (test.SampleController) [ValidController]\n" +
+                                "public class SampleController extends BaseController {\n" +
+                                "^\n" +
+                                "1 errors, 0 warnings"
+                );
+    }
+
+    @Test
+    public void testWithPrivateConstructor() {
         @Language("JAVA") String source = ""
                 + "package test;\n"
                 + "public class SampleController extends com.bluelinelabs.conductor.Controller {\n"
                 + "    private SampleController() { }\n"
                 + "}";
-        assertThat(lintProject(java(source))).isEqualTo(CONSTRUCTOR_ERROR);
+
+        lint()
+                .files(controllerStub, java(source))
+                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
+                .run()
+                .expect(CONSTRUCTOR_ERROR);
     }
 
-    public void testWithPrivateClass() throws Exception {
+    @Test
+    public void testWithPrivateClass() {
         @Language("JAVA") String source = ""
                 + "package test;\n"
                 + "private class SampleController extends com.bluelinelabs.conductor.Controller {\n"
                 + "    public SampleController() { }\n"
                 + "}";
-        assertThat(lintProject(java(source))).isEqualTo(CLASS_ERROR);
+
+        lint()
+                .files(controllerStub, java(source))
+                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
+                .run()
+                .expect(CLASS_ERROR);
     }
 
-    @Override
-    protected Detector getDetector() {
-        return new ControllerIssueDetector();
-    }
-
-    @Override
-    protected List<Issue> getIssues() {
-        return Collections.singletonList(ControllerIssueDetector.ISSUE);
-    }
-
-    @Override
-    protected boolean allowCompilationErrors() {
-        return true;
-    }
 }

conductor-modules/androidx-transition/build.gradle

@@ -0,0 +1,24 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+
+    defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode Integer.parseInt(project.VERSION_CODE)
+        versionName project.VERSION_NAME
+    }
+}
+
+dependencies {
+    implementation rootProject.ext.androidxAppCompat
+    implementation rootProject.ext.androidxCollection
+    api rootProject.ext.androidxTransition
+    implementation project(':conductor')
+}
+
+ext.artifactId = 'conductor-androidx-transition'
+
+apply from: rootProject.file('dependencies.gradle')
+apply plugin: "com.vanniktech.maven.publish"

conductor-modules/androidx-transition/gradle.properties

@@ -0,0 +1,3 @@
+POM_NAME=Conductor AndroidX Transition Extensions
+POM_ARTIFACT_ID=conductor-androidx-transition
+POM_PACKAGING=aar

conductor-modules/androidx-transition/src/main/AndroidManifest.xml

@@ -0,0 +1,3 @@
+<manifest package="com.bluelinelabs.conductor.androidxtransition">
+    <application />
+</manifest>

conductor-modules/androidx-transition/src/main/java/com/bluelinelabs/conductor/changehandler/androidxtransition/SharedElementTransitionChangeHandler.java

@@ -0,0 +1,656 @@
+package com.bluelinelabs.conductor.changehandler.androidxtransition;
+
+import android.graphics.Rect;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.view.ViewTreeObserver.OnPreDrawListener;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.collection.ArrayMap;
+import androidx.core.app.SharedElementCallback;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.ViewGroupCompat;
+import androidx.transition.Transition;
+import androidx.transition.TransitionSet;
+
+import com.bluelinelabs.conductor.Controller;
+import com.bluelinelabs.conductor.ControllerChangeHandler;
+import com.bluelinelabs.conductor.internal.TransitionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A TransitionChangeHandler that facilitates using different Transitions for the entering view, the exiting view,
+ * and shared elements between the two.
+ * <p/>
+ * Note that this class uses the <b>androidx</b> {@link Transition}. If you're using Android's platform transitions,
+ * consider using the {@code SharedElementTransitionChangeHandler} provided by the {@code android-transitions} Conductor module.
+ */
+// Much of this class is based on FragmentTransition.java and FragmentTransitionCompat21.java from the Android support library
+public abstract class SharedElementTransitionChangeHandler extends TransitionChangeHandler {
+
+    // A map of from -> to names. Generally these will be the same.
+    @NonNull  final ArrayMap<String, String> sharedElementNames = new ArrayMap<>();
+
+    @NonNull  final List<String> waitForTransitionNames = new ArrayList<>();
+    @NonNull  final List<ViewParentPair> removedViews = new ArrayList<>();
+
+    @Nullable Transition exitTransition;
+    @Nullable Transition enterTransition;
+    @Nullable Transition sharedElementTransition;
+    @Nullable private SharedElementCallback exitTransitionCallback;
+    @Nullable private SharedElementCallback enterTransitionCallback;
+
+    @NonNull
+    @Override
+    protected final Transition getTransition(@NonNull ViewGroup container, @Nullable View from, @Nullable View to, boolean isPush) {
+        exitTransition = getExitTransition(container, from, to, isPush);
+        enterTransition = getEnterTransition(container, from, to, isPush);
+        sharedElementTransition = getSharedElementTransition(container, from, to, isPush);
+        exitTransitionCallback = getExitTransitionCallback(container, from, to, isPush);
+        enterTransitionCallback = getEnterTransitionCallback(container, from, to, isPush);
+
+        if (enterTransition == null && sharedElementTransition == null && exitTransition == null) {
+            throw new IllegalStateException("SharedElementTransitionChangeHandler must have at least one transaction.");
+        }
+
+        return mergeTransitions(isPush);
+    }
+
+    @Override
+    public void prepareForTransition(@NonNull final ViewGroup container, @Nullable final View from, @Nullable final View to, @NonNull final Transition transition, final boolean isPush, @NonNull final OnTransitionPreparedListener onTransitionPreparedListener) {
+        OnTransitionPreparedListener listener = new OnTransitionPreparedListener() {
+            @Override
+            public void onPrepared() {
+                configureTransition(container, from, to, transition, isPush);
+                onTransitionPreparedListener.onPrepared();
+            }
+        };
+
+        configureSharedElements(container, from, to, isPush);
+
+        if (to != null && to.getParent() == null && waitForTransitionNames.size() > 0) {
+            waitOnAllTransitionNames(to, listener);
+            container.addView(to);
+        } else {
+            listener.onPrepared();
+        }
+    }
+
+    @Override
+    public final void executePropertyChanges(@NonNull ViewGroup container, @Nullable View from, @Nullable View to, @Nullable Transition transition, boolean isPush) {
+        if (to != null && removedViews.size() > 0) {
+            to.setVisibility(View.VISIBLE);
+
+            for (ViewParentPair removedView : removedViews) {
+                removedView.parent.addView(removedView.view);
+            }
+
+            removedViews.clear();
+        }
+
+        super.executePropertyChanges(container, from, to, transition, isPush);
+    }
+
+    @Override
+    public void onAbortPush(@NonNull ControllerChangeHandler newHandler, @Nullable Controller newTop) {
+        super.onAbortPush(newHandler, newTop);
+
+        removedViews.clear();
+    }
+
+    void configureTransition(@NonNull final ViewGroup container, @Nullable View from, @Nullable View to, @NonNull final Transition transition, boolean isPush) {
+        final View nonExistentView = new View(container.getContext());
+
+        List<View> fromSharedElements = new ArrayList<>();
+        List<View> toSharedElements = new ArrayList<>();
+
+        configureSharedElements(container, nonExistentView, to, from, isPush, fromSharedElements, toSharedElements);
+
+        List<View> exitingViews = exitTransition != null ? configureEnteringExitingViews(exitTransition, from, fromSharedElements, nonExistentView) : null;
+        if (exitingViews == null || exitingViews.isEmpty()) {
+            exitTransition = null;
+        }
+
+        if (enterTransition != null) {
+            enterTransition.addTarget(nonExistentView);
+        }
+
+        final List<View> enteringViews = new ArrayList<>();
+        scheduleRemoveTargets(transition, enterTransition, enteringViews, exitTransition, exitingViews, sharedElementTransition, toSharedElements);
+        scheduleTargetChange(container, to, nonExistentView, toSharedElements, enteringViews, exitingViews);
+
+        setNameOverrides(container, toSharedElements);
+        scheduleNameReset(container, toSharedElements);
+    }
+
+    private void waitOnAllTransitionNames(@NonNull final View to, @NonNull final OnTransitionPreparedListener onTransitionPreparedListener) {
+        OnPreDrawListener onPreDrawListener = new OnPreDrawListener() {
+            boolean addedSubviewListeners;
+
+            @Override
+            public boolean onPreDraw() {
+                List<View> foundViews = new ArrayList<>();
+                boolean allViewsFound = true;
+                for (String transitionName : waitForTransitionNames) {
+                    View namedView = TransitionUtils.findNamedView(to, transitionName);
+                    if (namedView != null) {
+                        foundViews.add(TransitionUtils.findNamedView(to, transitionName));
+                    } else {
+                        allViewsFound = false;
+                        break;
+                    }
+                }
+
+                if (allViewsFound && !addedSubviewListeners) {
+                    addedSubviewListeners = true;
+                    waitOnChildTransitionNames(to, foundViews, this, onTransitionPreparedListener);
+                }
+
+                return false;
+            }
+        };
+
+        to.getViewTreeObserver().addOnPreDrawListener(onPreDrawListener);
+    }
+
+    void waitOnChildTransitionNames(@NonNull final View to, @NonNull List<View> foundViews, @NonNull final OnPreDrawListener parentPreDrawListener, @NonNull final OnTransitionPreparedListener onTransitionPreparedListener) {
+        for (final View view : foundViews) {
+            OneShotPreDrawListener.add(true, view, new Runnable() {
+                @Override
+                public void run() {
+                    waitForTransitionNames.remove(ViewCompat.getTransitionName(view));
+
+                    removedViews.add(new ViewParentPair(view, (ViewGroup)view.getParent()));
+                    ((ViewGroup)view.getParent()).removeView(view);
+
+                    if (waitForTransitionNames.size() == 0) {
+                        to.getViewTreeObserver().removeOnPreDrawListener(parentPreDrawListener);
+                        to.setVisibility(View.INVISIBLE);
+                        onTransitionPreparedListener.onPrepared();
+                    }
+                }
+            });
+        }
+    }
+
+    private void scheduleTargetChange(@NonNull final ViewGroup container, @Nullable final View to, @NonNull final View nonExistentView,
+                                      @NonNull final List<View> toSharedElements, @NonNull final List<View> enteringViews, @Nullable final List<View> exitingViews) {
+        OneShotPreDrawListener.add(true, container, new Runnable() {
+            @Override
+            public void run() {
+                if (enterTransition != null) {
+                    enterTransition.removeTarget(nonExistentView);
+                    List<View> views = configureEnteringExitingViews(enterTransition, to, toSharedElements, nonExistentView);
+                    enteringViews.addAll(views);
+                }
+
+                if (exitingViews != null) {
+                    if (exitTransition != null) {
+                        List<View> tempExiting = new ArrayList<>();
+                        tempExiting.add(nonExistentView);
+                        TransitionUtils.replaceTargets(exitTransition, exitingViews, tempExiting);
+                    }
+                    exitingViews.clear();
+                    exitingViews.add(nonExistentView);
+                }
+            }
+        });
+    }
+
+    private Transition mergeTransitions(boolean isPush) {
+        boolean overlap = enterTransition == null || exitTransition == null || allowTransitionOverlap(isPush);
+
+        if (overlap) {
+            return TransitionUtils.mergeTransitions(TransitionSet.ORDERING_TOGETHER, exitTransition, enterTransition, sharedElementTransition);
+        } else {
+            Transition staggered = TransitionUtils.mergeTransitions(TransitionSet.ORDERING_SEQUENTIAL, exitTransition, enterTransition);
+            return TransitionUtils.mergeTransitions(TransitionSet.ORDERING_TOGETHER, staggered, sharedElementTransition);
+        }
+    }
+
+    @NonNull List<View> configureEnteringExitingViews(@NonNull Transition transition, @Nullable View view, @NonNull List<View> sharedElements, @NonNull View nonExistentView) {
+        List<View> viewList = new ArrayList<>();
+        if (view != null) {
+            captureTransitioningViews(viewList, view);
+        }
+        viewList.removeAll(sharedElements);
+        if (!viewList.isEmpty()) {
+            viewList.add(nonExistentView);
+            TransitionUtils.addTargets(transition, viewList);
+        }
+        return viewList;
+    }
+
+    private void configureSharedElements(@NonNull ViewGroup container, @NonNull final View nonExistentView, @Nullable final View to, @Nullable View from,
+                                         final boolean isPush, @NonNull final List<View> fromSharedElements, @NonNull final List<View> toSharedElements) {
+
+        if (to == null || from == null) {
+            return;
+        }
+
+        ArrayMap<String, View> capturedFromSharedElements = captureFromSharedElements(from);
+
+        if (sharedElementNames.isEmpty()) {
+            sharedElementTransition = null;
+        } else if (capturedFromSharedElements != null) {
+            fromSharedElements.addAll(capturedFromSharedElements.values());
+        }
+
+        if (enterTransition == null && exitTransition == null && sharedElementTransition == null) {
+            return;
+        }
+
+        callSharedElementStartEnd(capturedFromSharedElements, true);
+
+        final Rect toEpicenter;
+        if (sharedElementTransition != null) {
+            toEpicenter = new Rect();
+            TransitionUtils.setTargets(sharedElementTransition, nonExistentView, fromSharedElements);
+            setFromEpicenter(capturedFromSharedElements);
+            if (enterTransition != null) {
+                enterTransition.setEpicenterCallback(new Transition.EpicenterCallback() {
+                    @Override
+                    public Rect onGetEpicenter(Transition transition) {
+                        if (toEpicenter.isEmpty()) {
+                            return null;
+                        }
+                        return toEpicenter;
+                    }
+                });
+            }
+        } else {
+            toEpicenter = null;
+        }
+
+        OneShotPreDrawListener.add(true, container, new Runnable() {
+            @Override
+            public void run() {
+                ArrayMap<String, View> capturedToSharedElements = captureToSharedElements(to, isPush);
+
+                if (capturedToSharedElements != null) {
+                    toSharedElements.addAll(capturedToSharedElements.values());
+                    toSharedElements.add(nonExistentView);
+                }
+
+                callSharedElementStartEnd(capturedToSharedElements, false);
+                if (sharedElementTransition != null) {
+                    sharedElementTransition.getTargets().clear();
+                    sharedElementTransition.getTargets().addAll(toSharedElements);
+                    TransitionUtils.replaceTargets(sharedElementTransition, fromSharedElements, toSharedElements);
+
+                    final View toEpicenterView = getToEpicenterView(capturedToSharedElements);
+                    if (toEpicenterView != null && toEpicenter != null) {
+                        TransitionUtils.getBoundsOnScreen(toEpicenterView, toEpicenter);
+                    }
+                }
+            }
+        });
+    }
+
+    @Nullable View getToEpicenterView(@Nullable ArrayMap<String, View> toSharedElements) {
+        if (enterTransition != null && sharedElementNames.size() > 0 && toSharedElements != null) {
+            return toSharedElements.get(sharedElementNames.valueAt(0));
+        }
+        return null;
+    }
+
+    private void setFromEpicenter(@Nullable ArrayMap<String, View> fromSharedElements) {
+        if (sharedElementNames.size() > 0 && fromSharedElements != null) {
+            final View fromEpicenterView = fromSharedElements.get(sharedElementNames.keyAt(0));
+
+            if (sharedElementTransition != null) {
+                TransitionUtils.setEpicenter(sharedElementTransition, fromEpicenterView);
+            }
+
+            if (exitTransition != null) {
+                TransitionUtils.setEpicenter(exitTransition, fromEpicenterView);
+            }
+        }
+    }
+
+    @Nullable ArrayMap<String, View> captureToSharedElements(@Nullable final View to, boolean isPush) {
+        if (sharedElementNames.isEmpty() || sharedElementTransition == null || to == null) {
+            sharedElementNames.clear();
+            return null;
+        }
+
+        final ArrayMap<String, View> toSharedElements = new ArrayMap<>();
+        TransitionUtils.findNamedViews(toSharedElements, to);
+        for (ViewParentPair removedView : removedViews) {
+            toSharedElements.put(ViewCompat.getTransitionName(removedView.view), removedView.view);
+        }
+
+        final List<String> names = new ArrayList<>(sharedElementNames.values());
+
+        toSharedElements.retainAll(names);
+        if (enterTransitionCallback != null) {
+            enterTransitionCallback.onMapSharedElements(names, toSharedElements);
+            for (int i = names.size() - 1; i >= 0; i--) {
+                String name = names.get(i);
+                View view = toSharedElements.get(name);
+                if (view == null) {
+                    String key = findKeyForValue(sharedElementNames, name);
+                    if (key != null) {
+                        sharedElementNames.remove(key);
+                    }
+                } else if (!name.equals(ViewCompat.getTransitionName(view))) {
+                    String key = findKeyForValue(sharedElementNames, name);
+                    if (key != null) {
+                        sharedElementNames.put(key, ViewCompat.getTransitionName(view));
+                    }
+                }
+            }
+        } else {
+            for (int i = sharedElementNames.size() - 1; i >= 0; i--) {
+                final String targetName = sharedElementNames.valueAt(i);
+                if (!toSharedElements.containsKey(targetName)) {
+                    sharedElementNames.removeAt(i);
+                }
+            }
+        }
+        return toSharedElements;
+    }
+
+    @Nullable String findKeyForValue(@NonNull ArrayMap<String, String> map, @NonNull String value) {
+        final int numElements = map.size();
+        for (int i = 0; i < numElements; i++) {
+            if (value.equals(map.valueAt(i))) {
+                return map.keyAt(i);
+            }
+        }
+        return null;
+    }
+
+    @Nullable
+    private ArrayMap<String, View> captureFromSharedElements(@NonNull View from) {
+        if (sharedElementNames.isEmpty() || sharedElementTransition == null) {
+            sharedElementNames.clear();
+            return null;
+        }
+
+        final ArrayMap<String, View> fromSharedElements = new ArrayMap<>();
+        TransitionUtils.findNamedViews(fromSharedElements, from);
+
+        final List<String> names = new ArrayList<>(sharedElementNames.keySet());
+
+        fromSharedElements.retainAll(names);
+        if (exitTransitionCallback != null) {
+            exitTransitionCallback.onMapSharedElements(names, fromSharedElements);
+            for (int i = names.size() - 1; i >= 0; i--) {
+                String name = names.get(i);
+                View view = fromSharedElements.get(name);
+                if (view == null) {
+                    sharedElementNames.remove(name);
+                } else if (!name.equals(ViewCompat.getTransitionName(view))) {
+                    String targetValue = sharedElementNames.remove(name);
+                    sharedElementNames.put(ViewCompat.getTransitionName(view), targetValue);
+                }
+            }
+        } else {
+            sharedElementNames.retainAll(fromSharedElements.keySet());
+        }
+        return fromSharedElements;
+    }
+
+    void callSharedElementStartEnd(@Nullable ArrayMap<String, View> sharedElements, boolean isStart) {
+        if (enterTransitionCallback != null) {
+            final int count = sharedElements == null ? 0 : sharedElements.size();
+            List<View> views = new ArrayList<>(count);
+            List<String> names = new ArrayList<>(count);
+            for (int i = 0; i < count; i++) {
+                names.add(sharedElements.keyAt(i));
+                views.add(sharedElements.valueAt(i));
+            }
+            if (isStart) {
+                enterTransitionCallback.onSharedElementStart(names, views, null);
+            } else {
+                enterTransitionCallback.onSharedElementEnd(names, views, null);
+            }
+        }
+    }
+
+    private void captureTransitioningViews(@NonNull List<View> transitioningViews, @NonNull View view) {
+        if (view.getVisibility() == View.VISIBLE) {
+            if (view instanceof ViewGroup) {
+                ViewGroup viewGroup = (ViewGroup) view;
+                if (ViewGroupCompat.isTransitionGroup(viewGroup)) {
+                    transitioningViews.add(viewGroup);
+                } else {
+                    int count = viewGroup.getChildCount();
+                    for (int i = 0; i < count; i++) {
+                        View child = viewGroup.getChildAt(i);
+                        captureTransitioningViews(transitioningViews, child);
+                    }
+                }
+            } else {
+                transitioningViews.add(view);
+            }
+        }
+    }
+
+    private void scheduleRemoveTargets(@NonNull final Transition overallTransition,
+                                       @Nullable final Transition enterTransition, @Nullable final List<View> enteringViews,
+                                       @Nullable final Transition exitTransition, @Nullable final List<View> exitingViews,
+                                       @Nullable final Transition sharedElementTransition, @Nullable final List<View> toSharedElements) {
+        overallTransition.addListener(new Transition.TransitionListener() {
+            @Override
+            public void onTransitionStart(Transition transition) {
+                if (enterTransition != null && enteringViews != null) {
+                    TransitionUtils.replaceTargets(enterTransition, enteringViews, null);
+                }
+                if (exitTransition != null && exitingViews != null) {
+                    TransitionUtils.replaceTargets(exitTransition, exitingViews, null);
+                }
+                if (sharedElementTransition != null && toSharedElements != null) {
+                    TransitionUtils.replaceTargets(sharedElementTransition, toSharedElements, null);
+                }
+            }
+
+            @Override
+            public void onTransitionEnd(Transition transition) { }
+
+            @Override
+            public void onTransitionCancel(Transition transition) { }
+
+            @Override
+            public void onTransitionPause(Transition transition) { }
+
+            @Override
+            public void onTransitionResume(Transition transition) { }
+        });
+    }
+
+    private void setNameOverrides(@NonNull final View container, @NonNull final List<View> toSharedElements) {
+        OneShotPreDrawListener.add(true, container, new Runnable() {
+            @Override
+            public void run() {
+                final int numSharedElements = toSharedElements.size();
+                for (int i = 0; i < numSharedElements; i++) {
+                    View view = toSharedElements.get(i);
+                    String name = ViewCompat.getTransitionName(view);
+                    if (name != null) {
+                        String inName = findKeyForValue(sharedElementNames, name);
+                        ViewCompat.setTransitionName(view, inName);
+                    }
+                }
+            }
+        });
+    }
+
+    private void scheduleNameReset(@NonNull final ViewGroup container, @NonNull final List<View> toSharedElements) {
+        OneShotPreDrawListener.add(true, container, new Runnable() {
+            @Override
+            public void run() {
+                final int numSharedElements = toSharedElements.size();
+                for (int i = 0; i < numSharedElements; i++) {
+                    final View view = toSharedElements.get(i);
+                    final String name = ViewCompat.getTransitionName(view);
+                    final String inName = sharedElementNames.get(name);
+                    ViewCompat.setTransitionName(view, inName);
+                }
+            }
+        });
+    }
+
+    /**
+     * Will be called when views are ready to have their shared elements configured. Within this method one of the addSharedElement methods
+     * should be called for each shared element that will be used. If one or more of these shared elements will not instantly be available in
+     * the incoming view (for ex, in a RecyclerView), waitOnSharedElementNamed can be called to delay the transition until everything is available.
+     */
+    public abstract void configureSharedElements(@NonNull ViewGroup container, @Nullable View from, @Nullable View to, boolean isPush);
+
+    /**
+     * Should return the transition that will be used on the exiting ("from") view, if one is desired.
+     */
+    @Nullable
+    public abstract Transition getExitTransition(@NonNull ViewGroup container, @Nullable View from, @Nullable View to, boolean isPush);
+
+    /**
+     * Should return the transition that will be used on shared elements between the from and to views.
+     */
+    @Nullable
+    public abstract Transition getSharedElementTransition(@NonNull ViewGroup container, @Nullable View from, @Nullable View to, boolean isPush);
+
+    /**
+     * Should return the transition that will be used on the entering ("to") view, if one is desired.
+     */
+    @Nullable
+    public abstract Transition getEnterTransition(@NonNull ViewGroup container, @Nullable View from, @Nullable View to, boolean isPush);
+
+    /**
+     * Should return a callback that can be used to customize transition behavior of the shared element transition for the "from" view.
+     */
+    @Nullable
+    public SharedElementCallback getExitTransitionCallback(@NonNull ViewGroup container, @Nullable View from, @Nullable View to, boolean isPush) {
+        return null;
+    }
+
+    /**
+     * Should return a callback that can be used to customize transition behavior of the shared element transition for the "to" view.
+     */
+    @Nullable
+    public SharedElementCallback getEnterTransitionCallback(@NonNull ViewGroup container, @Nullable View from, @Nullable View to, boolean isPush) {
+        return null;
+    }
+
+    /**
+     * Should return whether or not the the exit transition and enter transition should overlap. If true,
+     * the enter transition will start as soon as possible. Otherwise, the enter transition will wait until the
+     * completion of the exit transition. Defaults to true.
+     */
+    public boolean allowTransitionOverlap(boolean isPush) {
+        return true;
+    }
+
+    /**
+     * Used to register an element that will take part in the shared element transition.
+     *
+     * @param name The transition name that is used for both the entering and exiting views.
+     */
+    protected final void addSharedElement(@NonNull String name) {
+        sharedElementNames.put(name, name);
+    }
+
+    /**
+     * Used to register an element that will take part in the shared element transition. Maps the name used in the
+     * "from" view to the name used in the "to" view if they are not the same.
+     *
+     * @param fromName The transition name used in the "from" view
+     * @param toName The transition name used in the "to" view
+     */
+    protected final void addSharedElement(@NonNull String fromName, @NonNull String toName) {
+        sharedElementNames.put(fromName, toName);
+    }
+
+    /**
+     * Used to register an element that will take part in the shared element transition. Maps the name used in the
+     * "from" view to the name used in the "to" view if they are not the same.
+     *
+     * @param sharedElement The view from the "from" view that will take part in the shared element transition
+     * @param toName The transition name used in the "to" view
+     */
+    protected final void addSharedElement(@NonNull View sharedElement, @NonNull String toName) {
+        String transitionName = ViewCompat.getTransitionName(sharedElement);
+        if (transitionName == null) {
+            throw new IllegalArgumentException("Unique transitionNames are required for all sharedElements");
+        }
+        sharedElementNames.put(transitionName, toName);
+    }
+
+    /**
+     * The transition will be delayed until the view with the name passed in is available in the "to" hierarchy. This is
+     * particularly useful for views that don't load instantly, like RecyclerViews. Note that using this method can
+     * potentially lock up your app indefinitely if the view never loads!
+     */
+    protected final void waitOnSharedElementNamed(@NonNull String name) {
+        if (!sharedElementNames.values().contains(name)) {
+            throw new IllegalStateException("Can't wait on a shared element that hasn't been registered using addSharedElement");
+        }
+        waitForTransitionNames.add(name);
+    }
+
+    private static class OneShotPreDrawListener implements OnPreDrawListener, View.OnAttachStateChangeListener {
+
+        private final View view;
+        private ViewTreeObserver viewTreeObserver;
+        private final Runnable runnable;
+        private final boolean preDrawReturnValue;
+
+        private OneShotPreDrawListener(boolean preDrawReturnValue, @NonNull View view, @NonNull Runnable runnable) {
+            this.preDrawReturnValue = preDrawReturnValue;
+            this.view = view;
+            viewTreeObserver = view.getViewTreeObserver();
+            this.runnable = runnable;
+        }
+
+        @NonNull
+        public static OneShotPreDrawListener add(boolean preDrawReturnValue, @NonNull View view, @NonNull Runnable runnable) {
+            OneShotPreDrawListener listener = new OneShotPreDrawListener(preDrawReturnValue, view, runnable);
+            view.getViewTreeObserver().addOnPreDrawListener(listener);
+            view.addOnAttachStateChangeListener(listener);
+            return listener;
+        }
+
+        @Override
+        public boolean onPreDraw() {
+            removeListener();
+            runnable.run();
+            return preDrawReturnValue;
+        }
+
+        private void removeListener() {
+            if (viewTreeObserver.isAlive()) {
+                viewTreeObserver.removeOnPreDrawListener(this);
+            } else {
+                view.getViewTreeObserver().removeOnPreDrawListener(this);
+            }
+            view.removeOnAttachStateChangeListener(this);
+        }
+
+        @Override
+        public void onViewAttachedToWindow(View v) {
+            viewTreeObserver = v.getViewTreeObserver();
+        }
+
+        @Override
+        public void onViewDetachedFromWindow(View v) {
+            removeListener();
+        }
+
+    }
+
+    private static class ViewParentPair {
+        @NonNull final View view;
+        @NonNull final ViewGroup parent;
+
+        ViewParentPair(@NonNull View view, ViewGroup parent) {
+            this.view = view;
+            this.parent = parent;
+        }
+    }
+
+}

conductor-modules/androidx-transition/src/main/java/com/bluelinelabs/conductor/changehandler/androidxtransition/TransitionChangeHandler.java

@@ -1,29 +1,29 @@
-package com.bluelinelabs.conductor.changehandler;
+package com.bluelinelabs.conductor.changehandler.androidxtransition;
 
-import android.annotation.TargetApi;
-import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.transition.Transition;
-import android.transition.Transition.TransitionListener;
-import android.transition.TransitionManager;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.transition.Transition;
+import androidx.transition.TransitionManager;
+
 import com.bluelinelabs.conductor.Controller;
 import com.bluelinelabs.conductor.ControllerChangeHandler;
 
 /**
- * A base {@link ControllerChangeHandler} that facilitates using {@link android.transition.Transition}s to replace Controller Views.
+ * A base {@link ControllerChangeHandler} that facilitates using {@link Transition}s to replace Controller Views.
+ * <p/>
+ * Note that this class uses the <b>androidx</b> {@link Transition}. If you're using Android's platform transitions,
+ * consider using the {@code TransitionChangeHandler} provided by the {@code android-transitions} Conductor module.
  */
-@TargetApi(Build.VERSION_CODES.LOLLIPOP)
 public abstract class TransitionChangeHandler extends ControllerChangeHandler {
 
     public interface OnTransitionPreparedListener {
         void onPrepared();
     }
 
-    private boolean canceled;
+    boolean canceled;
     private boolean needsImmediateCompletion;
 
     /**
@@ -51,8 +51,12 @@ public abstract class TransitionChangeHandler extends ControllerChangeHandler {
         needsImmediateCompletion = true;
     }
 
+    @Nullable
+    private ControllerChangeCompletedListener listener;
+
     @Override
     public void performChange(@NonNull final ViewGroup container, @Nullable final View from, @Nullable final View to, final boolean isPush, @NonNull final ControllerChangeCompletedListener changeListener) {
+        listener = changeListener;
         if (canceled) {
             changeListener.onChangeCompleted();
             return;
@@ -63,19 +67,30 @@ public abstract class TransitionChangeHandler extends ControllerChangeHandler {
             return;
         }
 
-        final Transition transition = getTransition(container, from, to, isPush);
-        transition.addListener(new TransitionListener() {
+        final Runnable onTransitionNotStarted = new Runnable() {
             @Override
-            public void onTransitionStart(Transition transition) { }
+            public void run() {
+                changeListener.onChangeCompleted();
+            }
+        };
+
+        final Transition transition = getTransition(container, from, to, isPush);
+        transition.addListener(new Transition.TransitionListener() {
+            @Override
+            public void onTransitionStart(Transition transition) {
+                container.removeCallbacks(onTransitionNotStarted);
+            }
 
             @Override
             public void onTransitionEnd(Transition transition) {
-                changeListener.onChangeCompleted();
+                listener.onChangeCompleted();
+                listener = null;
             }
 
             @Override
             public void onTransitionCancel(Transition transition) {
-                changeListener.onChangeCompleted();
+                listener.onChangeCompleted();
+                listener = null;
             }
 
             @Override
@@ -91,6 +106,7 @@ public abstract class TransitionChangeHandler extends ControllerChangeHandler {
                 if (!canceled) {
                     TransitionManager.beginDelayedTransition(container, transition);
                     executePropertyChanges(container, from, to, transition, isPush);
+                    container.post(onTransitionNotStarted);
                 }
             }
         });

conductor-modules/androidx-transition/src/main/java/com/bluelinelabs/conductor/internal/TransitionUtils.java

@@ -0,0 +1,184 @@
+package com.bluelinelabs.conductor.internal;
+
+import android.graphics.Rect;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
+import androidx.transition.Transition;
+import androidx.transition.TransitionSet;
+
+import java.util.List;
+import java.util.Map;
+
+public class TransitionUtils {
+
+    public static void findNamedViews(@NonNull Map<String, View> namedViews, View view) {
+        if (view.getVisibility() == View.VISIBLE) {
+            String transitionName = ViewCompat.getTransitionName(view);
+            if (transitionName != null) {
+                namedViews.put(transitionName, view);
+            }
+
+            if (view instanceof ViewGroup) {
+                ViewGroup viewGroup = (ViewGroup) view;
+                int childCount = viewGroup.getChildCount();
+                for (int i = 0; i < childCount; i++) {
+                    View child = viewGroup.getChildAt(i);
+                    findNamedViews(namedViews, child);
+                }
+            }
+        }
+    }
+
+    @Nullable
+    public static View findNamedView(@NonNull View view, @NonNull String transitionName) {
+        if (transitionName.equals(ViewCompat.getTransitionName(view))) {
+            return view;
+        }
+
+        if (view instanceof ViewGroup) {
+            ViewGroup viewGroup = (ViewGroup) view;
+            int childCount = viewGroup.getChildCount();
+            for (int i = 0; i < childCount; i++) {
+                View viewWithTransitionName = findNamedView(viewGroup.getChildAt(i), transitionName);
+                if (viewWithTransitionName != null) {
+                    return viewWithTransitionName;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    public static void setEpicenter(@NonNull Transition transition, @Nullable View view) {
+        if (view != null) {
+            final Rect epicenter = new Rect();
+            getBoundsOnScreen(view, epicenter);
+            transition.setEpicenterCallback(new Transition.EpicenterCallback() {
+                @Override
+                public Rect onGetEpicenter(Transition transition) {
+                    return epicenter;
+                }
+            });
+        }
+    }
+
+    public static void getBoundsOnScreen(@NonNull View view, @NonNull Rect epicenter) {
+        int[] loc = new int[2];
+        view.getLocationOnScreen(loc);
+        epicenter.set(loc[0], loc[1], loc[0] + view.getWidth(), loc[1] + view.getHeight());
+    }
+
+    public static void setTargets(@NonNull Transition transition, @NonNull View nonExistentView, @NonNull List<View> sharedViews) {
+        final List<View> views = transition.getTargets();
+        views.clear();
+        final int count = sharedViews.size();
+        for (int i = 0; i < count; i++) {
+            final View view = sharedViews.get(i);
+            bfsAddViewChildren(views, view);
+        }
+        views.add(nonExistentView);
+        sharedViews.add(nonExistentView);
+        addTargets(transition, sharedViews);
+    }
+
+    public static void addTargets(@Nullable Transition transition, @NonNull List<View> views) {
+        if (transition == null) {
+            return;
+        }
+        if (transition instanceof TransitionSet) {
+            TransitionSet set = (TransitionSet) transition;
+            int numTransitions = set.getTransitionCount();
+            for (int i = 0; i < numTransitions; i++) {
+                Transition child = set.getTransitionAt(i);
+                addTargets(child, views);
+            }
+        } else if (!hasSimpleTarget(transition)) {
+            List<View> targets = transition.getTargets();
+            if (isNullOrEmpty(targets)) {
+                int numViews = views.size();
+                for (int i = 0; i < numViews; i++) {
+                    transition.addTarget(views.get(i));
+                }
+            }
+        }
+    }
+
+    public static void replaceTargets(@NonNull Transition transition, @NonNull List<View> oldTargets, @Nullable List<View> newTargets) {
+        if (transition instanceof TransitionSet) {
+            TransitionSet set = (TransitionSet) transition;
+            int numTransitions = set.getTransitionCount();
+            for (int i = 0; i < numTransitions; i++) {
+                Transition child = set.getTransitionAt(i);
+                replaceTargets(child, oldTargets, newTargets);
+            }
+        } else if (!TransitionUtils.hasSimpleTarget(transition)) {
+            List<View> targets = transition.getTargets();
+            if (targets != null && targets.size() == oldTargets.size() && targets.containsAll(oldTargets)) {
+                final int targetCount = newTargets == null ? 0 : newTargets.size();
+                for (int i = 0; i < targetCount; i++) {
+                    transition.addTarget(newTargets.get(i));
+                }
+                for (int i = oldTargets.size() - 1; i >= 0; i--) {
+                    transition.removeTarget(oldTargets.get(i));
+                }
+            }
+        }
+    }
+
+    private static void bfsAddViewChildren(@NonNull final List<View> views, @NonNull final View startView) {
+        final int startIndex = views.size();
+        if (containedBeforeIndex(views, startView, startIndex)) {
+            return; // This child is already in the list, so all its children are also.
+        }
+        views.add(startView);
+        for (int index = startIndex; index < views.size(); index++) {
+            final View view = views.get(index);
+            if (view instanceof ViewGroup) {
+                ViewGroup viewGroup = (ViewGroup) view;
+                final int childCount = viewGroup.getChildCount();
+                for (int childIndex = 0; childIndex < childCount; childIndex++) {
+                    final View child = viewGroup.getChildAt(childIndex);
+                    if (!containedBeforeIndex(views, child, startIndex)) {
+                        views.add(child);
+                    }
+                }
+            }
+        }
+    }
+
+    private static boolean containedBeforeIndex(@NonNull List<View> views, View view, int maxIndex) {
+        for (int i = 0; i < maxIndex; i++) {
+            if (views.get(i) == view) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean hasSimpleTarget(@NonNull Transition transition) {
+        return !isNullOrEmpty(transition.getTargetIds())
+                || !isNullOrEmpty(transition.getTargetNames())
+                || !isNullOrEmpty(transition.getTargetTypes());
+    }
+
+    private static boolean isNullOrEmpty(@Nullable List list) {
+        return list == null || list.isEmpty();
+    }
+
+    @NonNull
+    public static TransitionSet mergeTransitions(int ordering, Transition... transitions) {
+        TransitionSet transitionSet = new TransitionSet();
+        for (Transition transition : transitions) {
+            if (transition != null) {
+                transitionSet.addTransition(transition);
+            }
+        }
+        transitionSet.setOrdering(ordering);
+        return transitionSet;
+    }
+
+}

conductor-modules/arch-components-lifecycle/build.gradle

@@ -1,16 +1,7 @@
-apply from: rootProject.file('dependencies.gradle')
-apply from: rootProject.file('gradle-mvn-push.gradle')
-
 apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
@@ -21,9 +12,12 @@ android {
 }
 
 dependencies {
-    compile rootProject.ext.archComopnentsLifecycle
+    api rootProject.ext.archComponentsLifecycle
 
-    compile project(':conductor')
+    implementation project(':conductor')
 }
 
 ext.artifactId = 'conductor-arch-components-lifecycle'
+
+apply from: rootProject.file('dependencies.gradle')
+apply plugin: "com.vanniktech.maven.publish"

conductor-modules/arch-components-lifecycle/gradle.properties

@@ -1,4 +1,3 @@
 POM_NAME=Conductor Architecture Components Lifecycle Extensions
 POM_ARTIFACT_ID=conductor-archlifecycle
 POM_PACKAGING=aar
-VERSION_NAME=0.1.2-SNAPSHOT

conductor-modules/arch-components-lifecycle/src/main/java/com/bluelinelabs/conductor/archlifecycle/ControllerLifecycleOwner.java

@@ -0,0 +1,65 @@
+package com.bluelinelabs.conductor.archlifecycle;
+
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.Lifecycle.Event;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LifecycleRegistry;
+import android.content.Context;
+import androidx.annotation.NonNull;
+import android.view.View;
+
+import com.bluelinelabs.conductor.Controller;
+import com.bluelinelabs.conductor.Controller.LifecycleListener;
+
+public class ControllerLifecycleOwner implements LifecycleOwner {
+
+    private final LifecycleRegistry lifecycleRegistry;
+
+    public <T extends Controller & LifecycleOwner> ControllerLifecycleOwner(@NonNull T lifecycleController) {
+        lifecycleRegistry = new LifecycleRegistry(lifecycleController); // --> State.INITIALIZED
+
+        lifecycleController.addLifecycleListener(new LifecycleListener() {
+            @Override
+            public void postContextAvailable(@NonNull Controller controller, @NonNull Context context) {
+                lifecycleRegistry.handleLifecycleEvent(Event.ON_CREATE); // --> State.CREATED;
+            }
+
+            @Override
+            public void postCreateView(@NonNull Controller controller, @NonNull View view) {
+                lifecycleRegistry.handleLifecycleEvent(Event.ON_START); // --> State.STARTED;
+            }
+
+            @Override
+            public void postAttach(@NonNull Controller controller, @NonNull View view) {
+                lifecycleRegistry.handleLifecycleEvent(Event.ON_RESUME); // --> State.RESUMED;
+            }
+
+            @Override
+            public void preDetach(@NonNull Controller controller, @NonNull View view) {
+                lifecycleRegistry.handleLifecycleEvent(Event.ON_PAUSE); // --> State.STARTED;
+            }
+
+            @Override
+            public void preDestroyView(@NonNull Controller controller, @NonNull View view) {
+                lifecycleRegistry.handleLifecycleEvent(Event.ON_STOP); // --> State.CREATED;
+            }
+
+            @Override
+            public void preContextUnavailable(@NonNull Controller controller, @NonNull Context context) {
+                // do nothing
+            }
+
+            @Override
+            public void preDestroy(@NonNull Controller controller) {
+                lifecycleRegistry.handleLifecycleEvent(Event.ON_DESTROY); // --> State.DESTROYED;
+            }
+
+        });
+    }
+
+    @Override @NonNull
+    public Lifecycle getLifecycle() {
+        return lifecycleRegistry;
+    }
+
+}

conductor-modules/arch-components-lifecycle/src/main/java/com/bluelinelabs/conductor/archlifecycle/ControllerLifecycleRegistryOwner.java

@@ -1,79 +0,0 @@
-package com.bluelinelabs.conductor.archlifecycle;
-
-import android.arch.lifecycle.Lifecycle.Event;
-import android.arch.lifecycle.Lifecycle.State;
-import android.arch.lifecycle.LifecycleRegistry;
-import android.arch.lifecycle.LifecycleRegistryOwner;
-import android.support.annotation.NonNull;
-import android.view.View;
-
-import com.bluelinelabs.conductor.Controller;
-import com.bluelinelabs.conductor.Controller.LifecycleListener;
-
-public class ControllerLifecycleRegistryOwner extends LifecycleListener implements LifecycleRegistryOwner {
-
-    private final LifecycleRegistry lifecycleRegistry = new LifecycleRegistry(this);
-
-    public ControllerLifecycleRegistryOwner(Controller controller) {
-        lifecycleRegistry.handleLifecycleEvent(Event.ON_CREATE);
-        lifecycleRegistry.markState(State.CREATED);
-
-        controller.addLifecycleListener(new LifecycleListener() {
-            @Override
-            public void preCreateView(@NonNull Controller controller) {
-                lifecycleRegistry.handleLifecycleEvent(Event.ON_START);
-            }
-
-            @Override
-            public void postCreateView(@NonNull Controller controller, @NonNull View view) {
-                lifecycleRegistry.markState(State.STARTED);
-            }
-
-            @Override
-            public void preAttach(@NonNull Controller controller, @NonNull View view) {
-                lifecycleRegistry.handleLifecycleEvent(Event.ON_RESUME);
-            }
-
-            @Override
-            public void postAttach(@NonNull Controller controller, @NonNull View view) {
-                lifecycleRegistry.markState(State.RESUMED);
-            }
-
-            @Override
-            public void preDetach(@NonNull Controller controller, @NonNull View view) {
-                lifecycleRegistry.handleLifecycleEvent(Event.ON_PAUSE);
-            }
-
-            @Override
-            public void postDetach(@NonNull Controller controller, @NonNull View view) {
-                lifecycleRegistry.markState(State.STARTED);
-            }
-
-            @Override
-            public void preDestroyView(@NonNull Controller controller, @NonNull View view) {
-                lifecycleRegistry.handleLifecycleEvent(Event.ON_STOP);
-            }
-
-            @Override
-            public void postDestroyView(@NonNull Controller controller) {
-                lifecycleRegistry.markState(State.CREATED);
-            }
-
-            @Override
-            public void preDestroy(@NonNull Controller controller) {
-                lifecycleRegistry.handleLifecycleEvent(Event.ON_DESTROY);
-            }
-
-            @Override
-            public void postDestroy(@NonNull Controller controller) {
-                lifecycleRegistry.markState(State.DESTROYED);
-            }
-        });
-    }
-
-    @Override
-    public LifecycleRegistry getLifecycle() {
-        return lifecycleRegistry;
-    }
-
-}

conductor-modules/arch-components-lifecycle/src/main/java/com/bluelinelabs/conductor/archlifecycle/LifecycleController.java

@@ -1,17 +1,28 @@
 package com.bluelinelabs.conductor.archlifecycle;
 
-import android.arch.lifecycle.LifecycleRegistry;
-import android.arch.lifecycle.LifecycleRegistryOwner;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
+import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.bluelinelabs.conductor.Controller;
 
-public abstract class LifecycleController extends Controller implements LifecycleRegistryOwner {
+public abstract class LifecycleController extends Controller implements LifecycleOwner {
 
-    private final ControllerLifecycleRegistryOwner lifecycleRegistryOwner = new ControllerLifecycleRegistryOwner(this);
+    private final ControllerLifecycleOwner lifecycleOwner = new ControllerLifecycleOwner(this);
 
-    @Override
-    public LifecycleRegistry getLifecycle() {
-        return lifecycleRegistryOwner.getLifecycle();
+    public LifecycleController() {
+        super();
+    }
+
+    public LifecycleController(@Nullable Bundle args) {
+        super(args);
+    }
+
+    @Override @NonNull
+    public Lifecycle getLifecycle() {
+        return lifecycleOwner.getLifecycle();
     }
 
 }

conductor-modules/arch-components-lifecycle/src/main/java/com/bluelinelabs/conductor/archlifecycle/LifecycleRestoreViewOnCreateController.java

@@ -1,17 +0,0 @@
-package com.bluelinelabs.conductor.archlifecycle;
-
-import android.arch.lifecycle.LifecycleRegistry;
-import android.arch.lifecycle.LifecycleRegistryOwner;
-
-import com.bluelinelabs.conductor.RestoreViewOnCreateController;
-
-public abstract class LifecycleRestoreViewOnCreateController extends RestoreViewOnCreateController implements LifecycleRegistryOwner {
-
-    private final ControllerLifecycleRegistryOwner lifecycleRegistryOwner = new ControllerLifecycleRegistryOwner(this);
-
-    @Override
-    public LifecycleRegistry getLifecycle() {
-        return lifecycleRegistryOwner.getLifecycle();
-    }
-
-}

conductor-modules/autodispose/build.gradle

@@ -1,16 +1,10 @@
 apply from: rootProject.file('dependencies.gradle')
-apply from: rootProject.file('gradle-mvn-push.gradle')
 
 apply plugin: 'com.android.library'
+apply plugin: "com.vanniktech.maven.publish"
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
@@ -21,10 +15,11 @@ android {
 }
 
 dependencies {
-    compile rootProject.ext.rxJava2
-    compile rootProject.ext.autodispose
+    api rootProject.ext.rxJava2
+    api rootProject.ext.autodispose
+    api rootProject.ext.autodisposeLifecycle
 
-    compile project(':conductor')
+    implementation project(':conductor')
 }
 
 ext.artifactId = 'conductor-autodispose'

conductor-modules/autodispose/src/main/java/com/bluelinelabs/conductor/autodispose/ControllerLifecycleSubjectHelper.java

@@ -1,11 +1,11 @@
 package com.bluelinelabs.conductor.autodispose;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.View;
 
 import com.bluelinelabs.conductor.Controller;
-import com.uber.autodispose.OutsideLifecycleException;
+import com.uber.autodispose.OutsideScopeException;
 
 import io.reactivex.subjects.BehaviorSubject;
 
@@ -13,10 +13,10 @@ public class ControllerLifecycleSubjectHelper {
     private ControllerLifecycleSubjectHelper() { }
 
     @NonNull
-    public static BehaviorSubject<ControllerEvent> create(Controller controller) {
+    public static BehaviorSubject<ControllerEvent> create(@NonNull Controller controller) {
         ControllerEvent initialState;
         if (controller.isBeingDestroyed() || controller.isDestroyed()) {
-            throw new OutsideLifecycleException("Cannot bind to Controller lifecycle when outside of it.");
+            throw new OutsideScopeException("Cannot bind to Controller lifecycle when outside of it.");
         } else if (controller.isAttached()) {
             initialState = ControllerEvent.ATTACH;
         } else if (controller.getView() != null) {

conductor-modules/autodispose/src/main/java/com/bluelinelabs/conductor/autodispose/ControllerScopeProvider.java

@@ -1,20 +1,22 @@
 package com.bluelinelabs.conductor.autodispose;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bluelinelabs.conductor.Controller;
-import com.uber.autodispose.LifecycleScopeProvider;
-import com.uber.autodispose.OutsideLifecycleException;
+import com.uber.autodispose.OutsideScopeException;
+import com.uber.autodispose.lifecycle.LifecycleScopeProvider;
+import com.uber.autodispose.lifecycle.LifecycleScopes;
+import com.uber.autodispose.lifecycle.CorrespondingEventsFunction;
 
+import io.reactivex.CompletableSource;
 import io.reactivex.Observable;
-import io.reactivex.functions.Function;
 import io.reactivex.subjects.BehaviorSubject;
 
 public class ControllerScopeProvider implements LifecycleScopeProvider<ControllerEvent> {
-    private static final Function<ControllerEvent, ControllerEvent> CORRESPONDING_EVENTS =
-            new Function<ControllerEvent, ControllerEvent>() {
+    private static final CorrespondingEventsFunction<ControllerEvent> CORRESPONDING_EVENTS =
+            new CorrespondingEventsFunction<ControllerEvent>() {
                 @Override
-                public ControllerEvent apply(ControllerEvent lastEvent) throws Exception {
+                public ControllerEvent apply(ControllerEvent lastEvent) throws OutsideScopeException {
                     switch (lastEvent) {
                         case CREATE:
                             return ControllerEvent.DESTROY;
@@ -27,19 +29,34 @@ public class ControllerScopeProvider implements LifecycleScopeProvider<Controlle
                         case DETACH:
                             return ControllerEvent.DESTROY;
                         default:
-                            throw new OutsideLifecycleException("Cannot bind to Controller lifecycle when outside of it.");
+                            throw new OutsideScopeException("Cannot bind to Controller lifecycle when outside of it.");
                     }
                 }
             };
 
     @NonNull private final BehaviorSubject<ControllerEvent> lifecycleSubject;
+    @NonNull private final CorrespondingEventsFunction<ControllerEvent> correspondingEventsFunction;
 
     public static ControllerScopeProvider from(@NonNull Controller controller) {
-        return new ControllerScopeProvider(controller);
+        return new ControllerScopeProvider(controller, CORRESPONDING_EVENTS);
     }
 
-    private ControllerScopeProvider(@NonNull Controller controller) {
+    public static ControllerScopeProvider from(@NonNull Controller controller, @NonNull final ControllerEvent untilEvent) {
+        return new ControllerScopeProvider(controller, new CorrespondingEventsFunction<ControllerEvent>() {
+            @Override
+            public ControllerEvent apply(ControllerEvent controllerEvent) {
+                return untilEvent;
+            }
+        });
+    }
+
+    public static ControllerScopeProvider from(@NonNull Controller controller, @NonNull final CorrespondingEventsFunction<ControllerEvent> correspondingEventsFunction) {
+        return new ControllerScopeProvider(controller, correspondingEventsFunction);
+    }
+
+    private ControllerScopeProvider(@NonNull Controller controller, @NonNull CorrespondingEventsFunction<ControllerEvent> correspondingEventsFunction) {
         lifecycleSubject = ControllerLifecycleSubjectHelper.create(controller);
+        this.correspondingEventsFunction = correspondingEventsFunction;
     }
 
     @Override
@@ -48,12 +65,17 @@ public class ControllerScopeProvider implements LifecycleScopeProvider<Controlle
     }
 
     @Override
-    public Function<ControllerEvent, ControllerEvent> correspondingEvents() {
-        return CORRESPONDING_EVENTS;
+    public CorrespondingEventsFunction<ControllerEvent> correspondingEvents() {
+        return correspondingEventsFunction;
     }
 
     @Override
     public ControllerEvent peekLifecycle() {
         return lifecycleSubject.getValue();
     }
+
+    @Override
+    public CompletableSource requestScope() throws Exception {
+        return LifecycleScopes.resolveScopeFromLifecycle(this);
+    }
 }

conductor-modules/rxlifecycle/build.gradle

@@ -1,31 +0,0 @@
-apply from: rootProject.file('dependencies.gradle')
-apply from: rootProject.file('gradle-mvn-push.gradle')
-
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-
-    defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode Integer.parseInt(project.VERSION_CODE)
-        versionName project.VERSION_NAME
-    }
-}
-
-dependencies {
-    compile rootProject.ext.rxJava
-    compile rootProject.ext.rxLifecycle
-    compile rootProject.ext.rxLifecycleAndroid
-
-    compile project(':conductor')
-}
-
-ext.artifactId = 'conductor-rxlifecycle'

conductor-modules/rxlifecycle/gradle.properties

@@ -1,3 +0,0 @@
-POM_NAME=Conductor RxLifecycle Extensions
-POM_ARTIFACT_ID=conductor-rxlifecycle
-POM_PACKAGING=aar

conductor-modules/rxlifecycle/src/main/AndroidManifest.xml

@@ -1,3 +0,0 @@
-<manifest package="com.bluelinelabs.conductor.rxlifecycle">
-    <application />
-</manifest>

conductor-modules/rxlifecycle/src/main/java/com/bluelinelabs/conductor/rxlifecycle/ControllerEvent.java

@@ -1,14 +0,0 @@
-package com.bluelinelabs.conductor.rxlifecycle;
-
-public enum ControllerEvent {
-
-    CREATE,
-    CONTEXT_AVAILABLE,
-    CREATE_VIEW,
-    ATTACH,
-    DETACH,
-    DESTROY_VIEW,
-    CONTEXT_UNAVAILABLE,
-    DESTROY
-
-}

conductor-modules/rxlifecycle/src/main/java/com/bluelinelabs/conductor/rxlifecycle/ControllerLifecycleSubjectHelper.java

@@ -1,77 +0,0 @@
-package com.bluelinelabs.conductor.rxlifecycle;
-
-import android.content.Context;
-import android.support.annotation.NonNull;
-import android.view.View;
-
-import com.bluelinelabs.conductor.Controller;
-import com.bluelinelabs.conductor.Controller.LifecycleListener;
-import com.trello.rxlifecycle.OutsideLifecycleException;
-
-import rx.subjects.BehaviorSubject;
-
-/**
- * A simple utility class that will create a {@link BehaviorSubject} that calls onNext when events
- * occur in your {@link Controller}
- */
-public class ControllerLifecycleSubjectHelper {
-
-    private ControllerLifecycleSubjectHelper() { }
-
-    public static BehaviorSubject<ControllerEvent> create(Controller controller) {
-        ControllerEvent initialState;
-        if (controller.isBeingDestroyed() || controller.isDestroyed()) {
-            throw new OutsideLifecycleException("Cannot bind to Controller lifecycle when outside of it.");
-        } else if (controller.isAttached()) {
-            initialState = ControllerEvent.ATTACH;
-        } else if (controller.getView() != null) {
-            initialState = ControllerEvent.CREATE_VIEW;
-        } else if (controller.getActivity() != null) {
-            initialState = ControllerEvent.CONTEXT_AVAILABLE;
-        } else {
-            initialState = ControllerEvent.CREATE;
-        }
-
-        final BehaviorSubject<ControllerEvent> subject = BehaviorSubject.create(initialState);
-
-        controller.addLifecycleListener(new LifecycleListener() {
-            @Override
-            public void preContextAvailable(@NonNull Controller controller) {
-                subject.onNext(ControllerEvent.CONTEXT_AVAILABLE);
-            }
-
-            @Override
-            public void preCreateView(@NonNull Controller controller) {
-                subject.onNext(ControllerEvent.CREATE_VIEW);
-            }
-
-            @Override
-            public void preAttach(@NonNull Controller controller, @NonNull View view) {
-                subject.onNext(ControllerEvent.ATTACH);
-            }
-
-            @Override
-            public void preDetach(@NonNull Controller controller, @NonNull View view) {
-                subject.onNext(ControllerEvent.DETACH);
-            }
-
-            @Override
-            public void preDestroyView(@NonNull Controller controller, @NonNull View view) {
-                subject.onNext(ControllerEvent.DESTROY_VIEW);
-            }
-
-            @Override
-            public void preContextUnavailable(@NonNull Controller controller, @NonNull Context context) {
-                subject.onNext(ControllerEvent.CONTEXT_UNAVAILABLE);
-            }
-
-            @Override
-            public void preDestroy(@NonNull Controller controller) {
-                subject.onNext(ControllerEvent.DESTROY);
-            }
-        });
-
-        return subject;
-    }
-
-}

conductor-modules/rxlifecycle/src/main/java/com/bluelinelabs/conductor/rxlifecycle/RxController.java

@@ -1,52 +0,0 @@
-package com.bluelinelabs.conductor.rxlifecycle;
-
-import android.os.Bundle;
-import android.support.annotation.CheckResult;
-import android.support.annotation.NonNull;
-
-import com.bluelinelabs.conductor.Controller;
-import com.trello.rxlifecycle.LifecycleProvider;
-import com.trello.rxlifecycle.LifecycleTransformer;
-import com.trello.rxlifecycle.RxLifecycle;
-
-import rx.Observable;
-import rx.subjects.BehaviorSubject;
-
-/**
- * A base {@link Controller} that can be used to expose lifecycle events using RxJava
- */
-public abstract class RxController extends Controller implements LifecycleProvider<ControllerEvent> {
-
-    private final BehaviorSubject<ControllerEvent> lifecycleSubject;
-
-    public RxController() {
-        this(null);
-    }
-
-    public RxController(Bundle args) {
-        super(args);
-        lifecycleSubject = ControllerLifecycleSubjectHelper.create(this);
-    }
-
-    @Override
-    @NonNull
-    @CheckResult
-    public final Observable<ControllerEvent> lifecycle() {
-        return lifecycleSubject.asObservable();
-    }
-
-    @Override
-    @NonNull
-    @CheckResult
-    public final <T> LifecycleTransformer<T> bindUntilEvent(@NonNull ControllerEvent event) {
-        return RxLifecycle.bindUntilEvent(lifecycleSubject, event);
-    }
-
-    @Override
-    @NonNull
-    @CheckResult
-    public final <T> LifecycleTransformer<T> bindToLifecycle() {
-        return RxControllerLifecycle.bindController(lifecycleSubject);
-    }
-
-}

conductor-modules/rxlifecycle/src/main/java/com/bluelinelabs/conductor/rxlifecycle/RxControllerLifecycle.java

@@ -1,48 +0,0 @@
-package com.bluelinelabs.conductor.rxlifecycle;
-
-import android.support.annotation.CheckResult;
-import android.support.annotation.NonNull;
-
-import com.trello.rxlifecycle.LifecycleTransformer;
-import com.trello.rxlifecycle.OutsideLifecycleException;
-import com.trello.rxlifecycle.RxLifecycle;
-
-import rx.Observable;
-import rx.functions.Func1;
-
-public class RxControllerLifecycle {
-
-    /**
-     * Binds the given source to a Controller lifecycle. This is the Controller version of
-     * {@link com.trello.rxlifecycle.android.RxLifecycleAndroid#bindFragment(Observable)}.
-     *
-     * @param lifecycle the lifecycle sequence of a Controller
-     * @return a reusable {@link rx.Observable.Transformer} that unsubscribes the source during the Controller lifecycle
-     */
-    @NonNull
-    @CheckResult
-    public static <T> LifecycleTransformer<T> bindController(@NonNull final Observable<ControllerEvent> lifecycle) {
-        return RxLifecycle.bind(lifecycle, CONTROLLER_LIFECYCLE);
-    }
-
-    private static final Func1<ControllerEvent, ControllerEvent> CONTROLLER_LIFECYCLE =
-            new Func1<ControllerEvent, ControllerEvent>() {
-                @Override
-                public ControllerEvent call(ControllerEvent lastEvent) {
-                    switch (lastEvent) {
-                        case CREATE:
-                            return ControllerEvent.DESTROY;
-                        case CONTEXT_AVAILABLE:
-                            return ControllerEvent.CONTEXT_UNAVAILABLE;
-                        case ATTACH:
-                            return ControllerEvent.DETACH;
-                        case CREATE_VIEW:
-                            return ControllerEvent.DESTROY_VIEW;
-                        case DETACH:
-                            return ControllerEvent.DESTROY;
-                        default:
-                            throw new OutsideLifecycleException("Cannot bind to Controller lifecycle when outside of it.");
-                    }
-                }
-            };
-}

conductor-modules/rxlifecycle/src/main/java/com/bluelinelabs/conductor/rxlifecycle/RxRestoreViewOnCreateController.java

@@ -1,52 +0,0 @@
-package com.bluelinelabs.conductor.rxlifecycle;
-
-import android.os.Bundle;
-import android.support.annotation.CheckResult;
-import android.support.annotation.NonNull;
-
-import com.bluelinelabs.conductor.RestoreViewOnCreateController;
-import com.trello.rxlifecycle.LifecycleProvider;
-import com.trello.rxlifecycle.LifecycleTransformer;
-import com.trello.rxlifecycle.RxLifecycle;
-
-import rx.Observable;
-import rx.subjects.BehaviorSubject;
-
-/**
- * A base {@link RestoreViewOnCreateController} that can be used to expose lifecycle events using RxJava
- */
-public abstract class RxRestoreViewOnCreateController extends RestoreViewOnCreateController implements LifecycleProvider<ControllerEvent> {
-
-    private final BehaviorSubject<ControllerEvent> lifecycleSubject;
-
-    public RxRestoreViewOnCreateController() {
-        this(null);
-    }
-
-    public RxRestoreViewOnCreateController(Bundle args) {
-        super(args);
-        lifecycleSubject = ControllerLifecycleSubjectHelper.create(this);
-    }
-
-    @Override
-    @NonNull
-    @CheckResult
-    public final Observable<ControllerEvent> lifecycle() {
-        return lifecycleSubject.asObservable();
-    }
-
-    @Override
-    @NonNull
-    @CheckResult
-    public final <T> LifecycleTransformer<T> bindUntilEvent(@NonNull ControllerEvent event) {
-        return RxLifecycle.bindUntilEvent(lifecycleSubject, event);
-    }
-
-    @Override
-    @NonNull
-    @CheckResult
-    public final <T> LifecycleTransformer<T> bindToLifecycle() {
-        return RxControllerLifecycle.bindController(lifecycleSubject);
-    }
-
-}

conductor-modules/rxlifecycle2/build.gradle

@@ -1,16 +1,10 @@
 apply from: rootProject.file('dependencies.gradle')
-apply from: rootProject.file('gradle-mvn-push.gradle')
 
 apply plugin: 'com.android.library'
+apply plugin: "com.vanniktech.maven.publish"
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
@@ -21,11 +15,11 @@ android {
 }
 
 dependencies {
-    compile rootProject.ext.rxJava2
-    compile rootProject.ext.rxLifecycle2
-    compile rootProject.ext.rxLifecycleAndroid2
+    api rootProject.ext.rxJava2
+    api rootProject.ext.rxLifecycle2
+    api rootProject.ext.rxLifecycleAndroid2
 
-    compile project(':conductor')
+    implementation project(':conductor')
 }
 
 ext.artifactId = 'conductor-rxlifecycle2'

conductor-modules/rxlifecycle2/src/main/java/com/bluelinelabs/conductor/rxlifecycle2/ControllerLifecycleSubjectHelper.java

@@ -1,7 +1,7 @@
 package com.bluelinelabs.conductor.rxlifecycle2;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.View;
 
 import com.bluelinelabs.conductor.Controller;

conductor-modules/rxlifecycle2/src/main/java/com/bluelinelabs/conductor/rxlifecycle2/RxController.java

@@ -1,9 +1,9 @@
 package com.bluelinelabs.conductor.rxlifecycle2;
 
 import android.os.Bundle;
-import android.support.annotation.CheckResult;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.CheckResult;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.bluelinelabs.conductor.Controller;
 import com.trello.rxlifecycle2.LifecycleProvider;
 import com.trello.rxlifecycle2.LifecycleTransformer;

conductor-modules/rxlifecycle2/src/main/java/com/bluelinelabs/conductor/rxlifecycle2/RxControllerLifecycle.java

@@ -1,6 +1,6 @@
 package com.bluelinelabs.conductor.rxlifecycle2;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.trello.rxlifecycle2.LifecycleTransformer;
 import com.trello.rxlifecycle2.OutsideLifecycleException;
 import com.trello.rxlifecycle2.RxLifecycle;

conductor-modules/rxlifecycle2/src/main/java/com/bluelinelabs/conductor/rxlifecycle2/RxRestoreViewOnCreateController.java

@@ -1,45 +0,0 @@
-package com.bluelinelabs.conductor.rxlifecycle2;
-
-import android.os.Bundle;
-import android.support.annotation.CheckResult;
-import android.support.annotation.NonNull;
-import com.bluelinelabs.conductor.RestoreViewOnCreateController;
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.LifecycleTransformer;
-import com.trello.rxlifecycle2.RxLifecycle;
-import io.reactivex.Observable;
-import io.reactivex.subjects.BehaviorSubject;
-
-public abstract class RxRestoreViewOnCreateController extends RestoreViewOnCreateController implements LifecycleProvider<ControllerEvent> {
-    private final BehaviorSubject<ControllerEvent> lifecycleSubject;
-
-    public RxRestoreViewOnCreateController() {
-        this(null);
-    }
-
-    public RxRestoreViewOnCreateController(Bundle args) {
-        super(args);
-        lifecycleSubject = ControllerLifecycleSubjectHelper.create(this);
-    }
-
-    @Override
-    @NonNull
-    @CheckResult
-    public final Observable<ControllerEvent> lifecycle() {
-        return lifecycleSubject.hide();
-    }
-
-    @Override
-    @NonNull
-    @CheckResult
-    public final <T> LifecycleTransformer<T> bindUntilEvent(@NonNull ControllerEvent event) {
-        return RxLifecycle.bindUntilEvent(lifecycleSubject, event);
-    }
-
-    @Override
-    @NonNull
-    @CheckResult
-    public final <T> LifecycleTransformer<T> bindToLifecycle() {
-        return RxControllerLifecycle.bindController(lifecycleSubject);
-    }
-}

conductor-modules/support/build.gradle

@@ -1,48 +0,0 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'de.mobilej.unmock:UnMockPlugin:0.6.0'
-    }
-}
-
-apply plugin: 'com.android.library'
-apply plugin: 'de.mobilej.unmock'
-
-android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-
-    defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode Integer.parseInt(project.VERSION_CODE)
-        versionName project.VERSION_NAME
-    }
-}
-
-dependencies {
-    testCompile rootProject.ext.junit
-    testCompile rootProject.ext.roboelectric
-
-    compile rootProject.ext.supportAppCompat
-    compile project(':conductor')
-
-    unmock 'org.robolectric:android-all:4.3_r2-robolectric-0'
-}
-
-unMock {
-    keep "android.os.Bundle"
-    keep "android.os.BaseBundle"
-}
-
-ext.artifactId = 'conductor-support'
-
-apply from: rootProject.file('dependencies.gradle')
-apply from: rootProject.file('gradle-mvn-push.gradle')

conductor-modules/support/gradle.properties

@@ -1,3 +0,0 @@
-POM_NAME=Conductor Support Extensions
-POM_ARTIFACT_ID=conductor-support
-POM_PACKAGING=aar

conductor-modules/support/src/main/AndroidManifest.xml

@@ -1,3 +0,0 @@
-<manifest package="com.bluelinelabs.conductor.support">
-    <application />
-</manifest>

conductor-modules/support/src/main/java/com/bluelinelabs/conductor/support/ControllerPagerAdapter.java

@@ -1,154 +0,0 @@
-package com.bluelinelabs.conductor.support;
-
-import android.os.Bundle;
-import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.PagerAdapter;
-import android.util.SparseArray;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.bluelinelabs.conductor.Controller;
-import com.bluelinelabs.conductor.Router;
-import com.bluelinelabs.conductor.RouterTransaction;
-
-/**
- * @deprecated Use RouterPagerAdapter instead! This implementation was too limited and had too many
- * gotchas associated with it.
- *
- * An adapter for ViewPagers that will handle adding and removing Controllers
- */
-@Deprecated
-public abstract class ControllerPagerAdapter extends PagerAdapter {
-
-    private static final String KEY_SAVED_PAGES = "ControllerPagerAdapter.savedStates";
-    private static final String KEY_SAVES_STATE = "ControllerPagerAdapter.savesState";
-    private static final String KEY_VISIBLE_PAGE_IDS_KEYS = "ControllerPagerAdapter.visiblePageIds.keys";
-    private static final String KEY_VISIBLE_PAGE_IDS_VALUES = "ControllerPagerAdapter.visiblePageIds.values";
-
-    private final Controller host;
-    private boolean savesState;
-    private SparseArray<Bundle> savedPages = new SparseArray<>();
-    private SparseArray<String> visiblePageIds = new SparseArray<>();
-
-    /**
-     * Creates a new ControllerPagerAdapter using the passed host.
-     */
-    public ControllerPagerAdapter(@NonNull Controller host, boolean saveControllerState) {
-        this.host = host;
-        savesState = saveControllerState;
-    }
-
-    /**
-     * Return the Controller associated with a specified position.
-     */
-    @NonNull
-    public abstract Controller getItem(int position);
-
-    @Override
-    public Object instantiateItem(ViewGroup container, int position) {
-        final String name = makeControllerName(container.getId(), getItemId(position));
-
-        Router router = host.getChildRouter(container, name);
-        if (savesState && !router.hasRootController()) {
-            Bundle routerSavedState = savedPages.get(position);
-
-            if (routerSavedState != null) {
-                router.restoreInstanceState(routerSavedState);
-            }
-        }
-
-        final Controller controller;
-        if (!router.hasRootController()) {
-            controller = getItem(position);
-            router.setRoot(RouterTransaction.with(controller).tag(name));
-        } else {
-            router.rebindIfNeeded();
-            controller = router.getControllerWithTag(name);
-        }
-
-        if (controller != null) {
-            visiblePageIds.put(position, controller.getInstanceId());
-        }
-
-        return router.getControllerWithTag(name);
-    }
-
-    @Override
-    public void destroyItem(ViewGroup container, int position, Object object) {
-        Router router = ((Controller)object).getRouter();
-
-        if (savesState) {
-            Bundle savedState = new Bundle();
-            router.saveInstanceState(savedState);
-            savedPages.put(position, savedState);
-        }
-
-        visiblePageIds.remove(position);
-
-        host.removeChildRouter(router);
-    }
-
-    @Override
-    public boolean isViewFromObject(View view, Object object) {
-        return ((Controller)object).getView() == view;
-    }
-
-    @Override
-    public Parcelable saveState() {
-        Bundle bundle = new Bundle();
-        bundle.putBoolean(KEY_SAVES_STATE, savesState);
-        bundle.putSparseParcelableArray(KEY_SAVED_PAGES, savedPages);
-
-        int[] visiblePageIdsKeys = new int[visiblePageIds.size()];
-        String[] visiblePageIdsValues = new String[visiblePageIds.size()];
-        for (int i = 0; i < visiblePageIds.size(); i++) {
-            visiblePageIdsKeys[i] = visiblePageIds.keyAt(i);
-            visiblePageIdsValues[i] = visiblePageIds.valueAt(i);
-        }
-        bundle.putIntArray(KEY_VISIBLE_PAGE_IDS_KEYS, visiblePageIdsKeys);
-        bundle.putStringArray(KEY_VISIBLE_PAGE_IDS_VALUES, visiblePageIdsValues);
-
-        return bundle;
-    }
-
-    @Override
-    public void restoreState(Parcelable state, ClassLoader loader) {
-        Bundle bundle = (Bundle)state;
-        if (state != null) {
-            savesState = bundle.getBoolean(KEY_SAVES_STATE, false);
-            savedPages = bundle.getSparseParcelableArray(KEY_SAVED_PAGES);
-
-            int[] visiblePageIdsKeys = bundle.getIntArray(KEY_VISIBLE_PAGE_IDS_KEYS);
-            String[] visiblePageIdsValues = bundle.getStringArray(KEY_VISIBLE_PAGE_IDS_VALUES);
-            visiblePageIds = new SparseArray<>(visiblePageIdsKeys.length);
-            for (int i = 0; i < visiblePageIdsKeys.length; i++) {
-                visiblePageIds.put(visiblePageIdsKeys[i], visiblePageIdsValues[i]);
-            }
-        }
-    }
-
-    /**
-     * Returns the already instantiated Controller in the specified position or {@code null} if
-     * this position does not yet have a controller.
-     */
-    @Nullable
-    public Controller getController(int position) {
-        String instanceId = visiblePageIds.get(position);
-        if (instanceId != null) {
-            return host.getRouter().getControllerWithInstanceId(instanceId);
-        } else {
-            return null;
-        }
-    }
-
-    public long getItemId(int position) {
-        return position;
-    }
-
-    private static String makeControllerName(int viewId, long id) {
-        return viewId + ":" + id;
-    }
-
-}

conductor-modules/support/src/test/java/com/bluelinelabs/conductor/support/StateSaveTests.java

@@ -1,113 +0,0 @@
-package com.bluelinelabs.conductor.support;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.util.SparseArray;
-import android.widget.FrameLayout;
-
-import com.bluelinelabs.conductor.Conductor;
-import com.bluelinelabs.conductor.Router;
-import com.bluelinelabs.conductor.RouterTransaction;
-import com.bluelinelabs.conductor.support.util.FakePager;
-import com.bluelinelabs.conductor.support.util.TestController;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ActivityController;
-
-import static org.junit.Assert.assertEquals;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(manifest = Config.NONE)
-public class StateSaveTests {
-
-    private FakePager pager;
-    private RouterPagerAdapter pagerAdapter;
-
-    public void createActivityController(Bundle savedInstanceState) {
-        ActivityController<Activity> activityController = Robolectric.buildActivity(Activity.class).create().start().resume();
-        Router router = Conductor.attachRouter(activityController.get(), new FrameLayout(activityController.get()), savedInstanceState);
-        TestController controller = new TestController();
-        router.setRoot(RouterTransaction.with(controller));
-
-        pager = new FakePager(new FrameLayout(activityController.get()));
-        pager.setOffscreenPageLimit(1);
-
-        pagerAdapter = new RouterPagerAdapter(controller) {
-            @Override
-            public void configureRouter(@NonNull Router router, int position) {
-                if (!router.hasRootController()) {
-                    router.setRoot(RouterTransaction.with(new TestController()));
-                }
-            }
-
-            @Override
-            public int getCount() {
-                return 20;
-            }
-        };
-
-        pager.setAdapter(pagerAdapter);
-    }
-
-    @Before
-    public void setup() {
-        createActivityController(null);
-    }
-
-    @Test
-    public void testNoMaxSaves() {
-        // Load all pages
-        for (int i = 0; i < pagerAdapter.getCount(); i++) {
-            pager.pageTo(i);
-        }
-
-        pager.pageTo(pagerAdapter.getCount() / 2);
-
-        // Ensure all non-visible pages are saved
-        assertEquals(pagerAdapter.getCount() - 1 - pager.getOffscreenPageLimit() * 2, pagerAdapter.getSavedPages().size());
-    }
-
-    @Test
-    public void testMaxSavedSet() {
-        final int maxPages = 3;
-        pagerAdapter.setMaxPagesToStateSave(maxPages);
-
-        // Load all pages
-        for (int i = 0; i < pagerAdapter.getCount(); i++) {
-            pager.pageTo(i);
-        }
-
-        final int firstSelectedItem = pagerAdapter.getCount() / 2;
-        pager.pageTo(firstSelectedItem);
-
-        SparseArray<Bundle> savedPages = pagerAdapter.getSavedPages();
-
-        // Ensure correct number of pages are saved
-        assertEquals(maxPages, savedPages.size());
-
-        // Ensure correct pages are saved
-        assertEquals(pagerAdapter.getCount() - 3, savedPages.keyAt(0));
-        assertEquals(pagerAdapter.getCount() - 2, savedPages.keyAt(1));
-        assertEquals(pagerAdapter.getCount() - 1, savedPages.keyAt(2));
-
-        final int secondSelectedItem = 1;
-        pager.pageTo(secondSelectedItem);
-
-        savedPages = pagerAdapter.getSavedPages();
-
-        // Ensure correct number of pages are saved
-        assertEquals(maxPages, savedPages.size());
-
-        // Ensure correct pages are saved
-        assertEquals(firstSelectedItem - 1, savedPages.keyAt(0));
-        assertEquals(firstSelectedItem, savedPages.keyAt(1));
-        assertEquals(firstSelectedItem + 1, savedPages.keyAt(2));
-    }
-
-}

conductor-modules/support/src/test/java/com/bluelinelabs/conductor/support/util/FakePager.java

@@ -1,61 +0,0 @@
-package com.bluelinelabs.conductor.support.util;
-
-import android.util.SparseArray;
-import android.view.ViewGroup;
-
-import com.bluelinelabs.conductor.support.RouterPagerAdapter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class FakePager {
-
-    private ViewGroup container;
-    private int offscreenPageLimit;
-    private final SparseArray<Object> pages = new SparseArray<>();
-
-    private RouterPagerAdapter adapter;
-
-    public FakePager(ViewGroup container) {
-        this.container = container;
-    }
-
-    public void setAdapter(RouterPagerAdapter adapter) {
-        this.adapter = adapter;
-    }
-
-    public void pageTo(int page) {
-        int firstPage = Math.max(0, page - offscreenPageLimit);
-        int lastPage = Math.min(adapter.getCount() - 1, page + offscreenPageLimit);
-
-        List<Integer> pagesI = new ArrayList<>();
-        for (int i = 0; i < pages.size(); i++) {
-            pagesI.add(pages.keyAt(i));
-        }
-
-        for (int i = pages.size() - 1; i >= 0; i--) {
-            int key = pages.keyAt(i);
-
-            if (key < firstPage || key > lastPage) {
-                adapter.destroyItem(container, key, pages.get(key));
-                pages.remove(key);
-            }
-        }
-
-        for (int key = firstPage; key <= lastPage; key++) {
-            if (pages.get(key) == null) {
-                pages.put(key, adapter.instantiateItem(container, key));
-            }
-        }
-
-        adapter.setPrimaryItem(container, page, pages.get(page));
-    }
-
-    public int getOffscreenPageLimit() {
-        return offscreenPageLimit;
-    }
-
-    public void setOffscreenPageLimit(int offscreenPageLimit) {
-        this.offscreenPageLimit = offscreenPageLimit;
-    }
-}

conductor-modules/viewpager/build.gradle

@@ -0,0 +1,26 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+
+    defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode Integer.parseInt(project.VERSION_CODE)
+        versionName project.VERSION_NAME
+    }
+}
+
+dependencies {
+    testImplementation rootProject.ext.junit
+    testImplementation rootProject.ext.robolectric
+
+    implementation rootProject.ext.androidxAppCompat
+    implementation project(':conductor')
+}
+
+ext.artifactId = 'conductor-viewpager'
+
+apply from: rootProject.file('dependencies.gradle')
+apply plugin: "com.vanniktech.maven.publish"

conductor-modules/viewpager/gradle.properties

@@ -0,0 +1,3 @@
+POM_NAME=Conductor PagerAdapter
+POM_ARTIFACT_ID=conductor-viewpager
+POM_PACKAGING=aar

conductor-modules/viewpager/src/main/AndroidManifest.xml

@@ -0,0 +1,3 @@
+<manifest package="com.bluelinelabs.conductor.viewpager">
+    <application />
+</manifest>

conductor-modules/viewpager/src/main/java/com/bluelinelabs/conductor/viewpager/RouterPagerAdapter.java

@@ -1,35 +1,42 @@
-package com.bluelinelabs.conductor.support;
+package com.bluelinelabs.conductor.viewpager;
 
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.PagerAdapter;
 import android.util.SparseArray;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.PagerAdapter;
+
 import com.bluelinelabs.conductor.Controller;
 import com.bluelinelabs.conductor.Router;
 import com.bluelinelabs.conductor.RouterTransaction;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
- * An adapter for ViewPagers that uses Routers as pages
+ * An ViewPager adapter that uses Routers as pages
  */
 public abstract class RouterPagerAdapter extends PagerAdapter {
 
     private static final String KEY_SAVED_PAGES = "RouterPagerAdapter.savedStates";
+    private static final String KEY_TAGS_KEYS = "RouterPagerAdapter.tags.keys";
+    private static final String KEY_TAGS_VALUES = "RouterPagerAdapter.tags.values";
     private static final String KEY_MAX_PAGES_TO_STATE_SAVE = "RouterPagerAdapter.maxPagesToStateSave";
     private static final String KEY_SAVE_PAGE_HISTORY = "RouterPagerAdapter.savedPageHistory";
 
     private final Controller host;
     private int maxPagesToStateSave = Integer.MAX_VALUE;
+    private final Map<Integer, String> tags = new HashMap<>();
     private SparseArray<Bundle> savedPages = new SparseArray<>();
-    private SparseArray<Router> visibleRouters = new SparseArray<>();
+    private final SparseArray<Router> visibleRouters = new SparseArray<>();
     private ArrayList<Integer> savedPageHistory = new ArrayList<>();
+    private Router currentPrimaryRouter;
 
     /**
      * Creates a new RouterPagerAdapter using the passed host.
@@ -64,6 +71,12 @@ public abstract class RouterPagerAdapter extends PagerAdapter {
     public Object instantiateItem(ViewGroup container, int position) {
         final String name = makeRouterName(container.getId(), getItemId(position));
 
+        // Ensure we don't try to restore state for a router with a different ID just because
+        // the position was reused. Fixes https://github.com/bluelinelabs/Conductor/issues/582
+        if (tags.get(position) != null && !tags.get(position).equals(name)) {
+            savedPages.remove(position);
+        }
+
         Router router = host.getChildRouter(container, name);
         if (!router.hasRootController()) {
             Bundle routerSavedState = savedPages.get(position);
@@ -71,25 +84,33 @@ public abstract class RouterPagerAdapter extends PagerAdapter {
             if (routerSavedState != null) {
                 router.restoreInstanceState(routerSavedState);
                 savedPages.remove(position);
+                savedPageHistory.remove((Integer) position);
             }
         }
 
         router.rebindIfNeeded();
         configureRouter(router, position);
 
+        if (router != currentPrimaryRouter) {
+            for (RouterTransaction transaction : router.getBackstack()) {
+                transaction.controller().setOptionsMenuHidden(true);
+            }
+        }
+
+        tags.put(position, name);
         visibleRouters.put(position, router);
         return router;
     }
 
     @Override
-    public void destroyItem(ViewGroup container, int position, Object object) {
+    public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
         Router router = (Router)object;
 
         Bundle savedState = new Bundle();
         router.saveInstanceState(savedState);
         savedPages.put(position, savedState);
 
-        savedPageHistory.remove((Integer)position);
+        savedPageHistory.remove((Integer) position);
         savedPageHistory.add(position);
 
         ensurePagesSaved();
@@ -100,7 +121,25 @@ public abstract class RouterPagerAdapter extends PagerAdapter {
     }
 
     @Override
-    public boolean isViewFromObject(View view, Object object) {
+    public void setPrimaryItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
+        Router router = (Router) object;
+        if (router != currentPrimaryRouter) {
+            if (currentPrimaryRouter != null) {
+                for (RouterTransaction transaction : currentPrimaryRouter.getBackstack()) {
+                    transaction.controller().setOptionsMenuHidden(true);
+                }
+            }
+            if (router != null) {
+                for (RouterTransaction transaction : router.getBackstack()) {
+                    transaction.controller().setOptionsMenuHidden(false);
+                }
+            }
+            currentPrimaryRouter = router;
+        }
+    }
+
+    @Override
+    public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
         Router router = (Router)object;
         final List<RouterTransaction> backstack = router.getBackstack();
         for (RouterTransaction transaction : backstack) {
@@ -115,6 +154,8 @@ public abstract class RouterPagerAdapter extends PagerAdapter {
     public Parcelable saveState() {
         Bundle bundle = new Bundle();
         bundle.putSparseParcelableArray(KEY_SAVED_PAGES, savedPages);
+        bundle.putIntegerArrayList(KEY_TAGS_KEYS, new ArrayList<>(tags.keySet()));
+        bundle.putStringArrayList(KEY_TAGS_VALUES, new ArrayList<>(tags.values()));
         bundle.putInt(KEY_MAX_PAGES_TO_STATE_SAVE, maxPagesToStateSave);
         bundle.putIntegerArrayList(KEY_SAVE_PAGE_HISTORY, savedPageHistory);
         return bundle;
@@ -127,6 +168,14 @@ public abstract class RouterPagerAdapter extends PagerAdapter {
             savedPages = bundle.getSparseParcelableArray(KEY_SAVED_PAGES);
             maxPagesToStateSave = bundle.getInt(KEY_MAX_PAGES_TO_STATE_SAVE);
             savedPageHistory = bundle.getIntegerArrayList(KEY_SAVE_PAGE_HISTORY);
+
+            List<Integer> tagsKeys = bundle.getIntegerArrayList(KEY_TAGS_KEYS);
+            List<String> tagsValues = bundle.getStringArrayList(KEY_TAGS_VALUES);
+            if (tagsKeys != null && tagsValues != null && tagsKeys.size() == tagsValues.size()) {
+                for (int i = 0; i < tagsKeys.size(); i++) {
+                    tags.put(tagsKeys.get(i), tagsValues.get(i));
+                }
+            }
         }
     }
 

conductor-modules/viewpager/src/test/java/com/bluelinelabs/conductor/viewpager/StateSaveTests.kt

@@ -0,0 +1,78 @@
+package com.bluelinelabs.conductor.viewpager
+
+import com.bluelinelabs.conductor.viewpager.util.TestActivity
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.Robolectric
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+
+@RunWith(RobolectricTestRunner::class)
+@Config(manifest = Config.NONE)
+class StateSaveTests {
+
+  private val testController = Robolectric.buildActivity(TestActivity::class.java)
+    .setup()
+    .get()
+    .testController()
+
+  private val pagerAdapter = testController.pagerAdapter
+  private val pager = testController.pager
+  private val destroyedItems = testController.destroyedItems
+
+  @Test
+  fun testNoMaxSaves() {
+    // Load all pages
+    for (i in 0 until pagerAdapter.count) {
+      pager.currentItem = i
+    }
+
+    // Ensure all non-visible pages are saved
+    assertEquals(
+      destroyedItems.size,
+      pagerAdapter.savedPages.size()
+    )
+  }
+
+  @Test
+  fun testMaxSavedSet() {
+    val maxPages = 3
+    pagerAdapter.setMaxPagesToStateSave(maxPages)
+
+    // Load all pages
+    for (i in 0 until pagerAdapter.count) {
+      pager.currentItem = i
+    }
+
+    val firstSelectedItem = pagerAdapter.count / 2
+    for (i in pagerAdapter.count downTo firstSelectedItem) {
+      pager.currentItem = i
+    }
+
+    var savedPages = pagerAdapter.savedPages
+
+    // Ensure correct number of pages are saved
+    assertEquals(maxPages, savedPages.size())
+
+    // Ensure correct pages are saved
+    assertEquals(destroyedItems[destroyedItems.lastIndex], savedPages.keyAt(0))
+    assertEquals(destroyedItems[destroyedItems.lastIndex - 1], savedPages.keyAt(1))
+    assertEquals(destroyedItems[destroyedItems.lastIndex - 2], savedPages.keyAt(2))
+
+    val secondSelectedItem = 1
+    for (i in firstSelectedItem downTo secondSelectedItem) {
+      pager.currentItem = i
+    }
+
+    savedPages = pagerAdapter.savedPages
+
+    // Ensure correct number of pages are saved
+    assertEquals(maxPages, savedPages.size())
+
+    // Ensure correct pages are saved
+    assertEquals(destroyedItems[destroyedItems.lastIndex], savedPages.keyAt(0))
+    assertEquals(destroyedItems[destroyedItems.lastIndex - 1], savedPages.keyAt(1))
+    assertEquals(destroyedItems[destroyedItems.lastIndex - 2], savedPages.keyAt(2))
+  }
+}

conductor-modules/viewpager/src/test/java/com/bluelinelabs/conductor/viewpager/util/TestActivity.kt

@@ -0,0 +1,85 @@
+package com.bluelinelabs.conductor.viewpager.util
+
+import android.app.Activity
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import androidx.core.view.ViewCompat
+import androidx.viewpager.widget.ViewPager
+import com.bluelinelabs.conductor.Conductor
+import com.bluelinelabs.conductor.Controller
+import com.bluelinelabs.conductor.Router
+import com.bluelinelabs.conductor.RouterTransaction
+import com.bluelinelabs.conductor.asTransaction
+import com.bluelinelabs.conductor.viewpager.RouterPagerAdapter
+
+class TestActivity : Activity() {
+
+  private lateinit var router: Router
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+
+    router = Conductor.attachRouter(
+      this,
+      findViewById(android.R.id.content),
+      savedInstanceState
+    )
+    if (!router.hasRootController()) {
+      router.setRoot(TestController().asTransaction())
+    }
+  }
+
+  fun testController(): TestController {
+    return router.backstack.single().controller as TestController
+  }
+}
+
+class TestController : Controller() {
+
+  val destroyedItems = mutableListOf<Int>()
+  lateinit var pagerAdapter: RouterPagerAdapter
+  lateinit var pager: ViewPager
+
+  override fun onCreateView(
+    inflater: LayoutInflater,
+    container: ViewGroup,
+    savedViewState: Bundle?
+  ): View {
+    pager = ViewPager(container.context).also {
+      it.id = ViewCompat.generateViewId()
+    }
+    pager.offscreenPageLimit = 1
+    pagerAdapter = object : RouterPagerAdapter(this) {
+
+      override fun configureRouter(router: Router, position: Int) {
+        if (!router.hasRootController()) {
+          router.setRoot(RouterTransaction.with(PageController()))
+        }
+      }
+
+      override fun getCount(): Int {
+        return 20
+      }
+
+      override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) {
+        super.destroyItem(container, position, `object`)
+        destroyedItems.add(position)
+      }
+    }
+    pager.adapter = pagerAdapter
+    return pager
+  }
+}
+
+class PageController : Controller() {
+  override fun onCreateView(
+    inflater: LayoutInflater,
+    container: ViewGroup,
+    savedViewState: Bundle?
+  ): View {
+    return FrameLayout(container.context)
+  }
+}

conductor-modules/viewpager2/build.gradle

@@ -0,0 +1,34 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+
+    defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode Integer.parseInt(project.VERSION_CODE)
+        versionName project.VERSION_NAME
+    }
+
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
+}
+
+dependencies {
+    testImplementation rootProject.ext.junit
+    testImplementation rootProject.ext.robolectric
+
+    implementation rootProject.ext.androidxAppCompat
+    implementation rootProject.ext.androidxViewPager2
+    implementation project(':conductor')
+}
+
+ext.artifactId = 'conductor-viewpager2'
+
+apply from: rootProject.file('dependencies.gradle')
+apply plugin: "com.vanniktech.maven.publish"

conductor-modules/viewpager2/gradle.properties

@@ -0,0 +1,3 @@
+POM_NAME=Conductor ViewPager2 Adapter
+POM_ARTIFACT_ID=conductor-viewpager2
+POM_PACKAGING=aar

conductor-modules/viewpager2/src/main/AndroidManifest.xml

@@ -0,0 +1,3 @@
+<manifest package="com.bluelinelabs.conductor.viewpager2">
+    <application />
+</manifest>

conductor-modules/viewpager2/src/main/java/com/bluelinelabs/conductor/viewpager2/RouterStateAdapter.kt

@@ -0,0 +1,253 @@
+package com.bluelinelabs.conductor.viewpager2
+
+import android.os.Bundle
+import android.os.Parcelable
+import android.util.LongSparseArray
+import android.util.SparseArray
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import androidx.viewpager2.adapter.StatefulAdapter
+import androidx.viewpager2.widget.ViewPager2
+import com.bluelinelabs.conductor.Controller
+import com.bluelinelabs.conductor.Router
+import kotlinx.android.parcel.Parcelize
+
+/**
+ * An ViewPager2 adapter that uses Routers as pages
+ */
+abstract class RouterStateAdapter(private val host: Controller) :
+  RecyclerView.Adapter<RouterViewHolder>(), StatefulAdapter {
+
+  private var savedPages = LongSparseArray<Bundle>()
+  internal var savedPageHistory = mutableListOf<Long>()
+  private var maxPagesToStateSave = Int.MAX_VALUE
+  private val visibleRouters = SparseArray<Router>()
+  private var currentPrimaryRouterPosition = 0
+  private var primaryItemCallback: PrimaryItemCallback? = null
+
+  init {
+    super.setHasStableIds(true)
+  }
+
+  /**
+   * Called when a router is instantiated. Here the router's root should be set if needed.
+   *
+   * @param router   The router used for the page
+   * @param position The page position to be instantiated.
+   */
+  abstract fun configureRouter(router: Router, position: Int)
+
+  /**
+   * Sets the maximum number of pages that will have their states saved. When this number is exceeded,
+   * the page that was state saved least recently will have its state removed from the save data.
+   */
+  open fun setMaxPagesToStateSave(maxPagesToStateSave: Int) {
+    require(maxPagesToStateSave >= 0) { "Only positive integers may be passed for maxPagesToStateSave." }
+    this.maxPagesToStateSave = maxPagesToStateSave
+    ensurePagesSaved()
+  }
+
+  private fun inferViewPager(recyclerView: RecyclerView): ViewPager2 {
+    return recyclerView.parent as? ViewPager2 ?: error("Expected ViewPager2 instance. Got: ${recyclerView.parent}")
+  }
+
+  override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
+    val viewPager = inferViewPager(recyclerView)
+    primaryItemCallback = PrimaryItemCallback().also {
+      viewPager.registerOnPageChangeCallback(it)
+    }
+  }
+
+  override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
+    val viewPager = inferViewPager(recyclerView)
+    primaryItemCallback?.let {
+      viewPager.unregisterOnPageChangeCallback(it)
+    }
+    primaryItemCallback = null
+  }
+
+  override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RouterViewHolder {
+    return RouterViewHolder(parent)
+  }
+
+  override fun onBindViewHolder(holder: RouterViewHolder, position: Int) {
+    holder.currentItemPosition = position
+
+    attachRouter(holder, position)
+  }
+
+  override fun onViewAttachedToWindow(holder: RouterViewHolder) {
+    super.onViewAttachedToWindow(holder)
+
+    if (!holder.attached) {
+      attachRouter(holder, holder.currentItemPosition)
+    }
+  }
+
+  override fun onViewDetachedFromWindow(holder: RouterViewHolder) {
+    super.onViewDetachedFromWindow(holder)
+
+    detachRouter(holder)
+
+    // Controller has fully detached and destroyed its view reference by now. Remove the leftover
+    // view from the container.
+    holder.container.removeAllViews()
+  }
+
+  override fun onViewRecycled(holder: RouterViewHolder) {
+    super.onViewRecycled(holder)
+
+    detachRouter(holder)
+
+    holder.currentRouter?.let { router ->
+      host.removeChildRouter(router)
+      holder.currentRouter = null
+    }
+  }
+
+  override fun onFailedToRecycleView(holder: RouterViewHolder): Boolean {
+    return true
+  }
+
+  override fun getItemId(position: Int): Long {
+    return position.toLong()
+  }
+
+  override fun setHasStableIds(hasStableIds: Boolean) {
+    throw UnsupportedOperationException("Stable Ids are required for the adapter to function properly")
+  }
+
+  override fun saveState(): Parcelable {
+    // Ensure all visible pages are saved, starting at the outermost pages and working our way in
+    val visiblePositions = (0 until visibleRouters.size()).map { visibleRouters.keyAt(it) }.toMutableList()
+    while (visiblePositions.isNotEmpty()) {
+      val lastPosition = visiblePositions.removeAt(visiblePositions.lastIndex)
+      savePage(getItemId(lastPosition), visibleRouters[lastPosition])
+
+      if (visiblePositions.isNotEmpty()) {
+        val firstPosition = visiblePositions.removeAt(0)
+        savePage(getItemId(firstPosition), visibleRouters[firstPosition])
+      }
+    }
+
+    return SavedState(
+      savedPagesKeys = (0 until savedPages.size()).map { savedPages.keyAt(it) },
+      savedPagesValues = (0 until savedPages.size()).map { savedPages.valueAt(it) },
+      savedPageHistory = savedPageHistory,
+      maxPagesToStateSave = maxPagesToStateSave
+    )
+  }
+
+  override fun restoreState(state: Parcelable) {
+    if (state !is SavedState) return
+
+    savedPages = LongSparseArray()
+    state.savedPagesKeys.indices.forEach { index ->
+      savedPages.put(state.savedPagesKeys[index], state.savedPagesValues[index])
+    }
+
+    savedPageHistory = state.savedPageHistory.toMutableList()
+    maxPagesToStateSave = state.maxPagesToStateSave
+  }
+
+  private fun attachRouter(holder: RouterViewHolder, position: Int) {
+    val itemId = getItemId(position)
+    val router = host.getChildRouter(holder.container, "$itemId")
+
+    // This should have already been handled by onViewRecycled, but it seems like this wasn't
+    // always reliably called
+    if (router != holder.currentRouter) {
+      holder.currentRouter?.let { host.removeChildRouter(it) }
+    }
+
+    holder.currentRouter = router
+    holder.currentItemId = itemId
+
+    if (!router.hasRootController()) {
+      val routerSavedState = savedPages[itemId]
+      if (routerSavedState != null) {
+        router.restoreInstanceState(routerSavedState)
+        savedPages.remove(itemId)
+        savedPageHistory.remove(itemId)
+      }
+    }
+
+    router.rebindIfNeeded()
+    configureRouter(router, position)
+
+    if (position != currentPrimaryRouterPosition) {
+      for (transaction in router.backstack) {
+        transaction.controller.setOptionsMenuHidden(true)
+      }
+    }
+
+    visibleRouters.put(position, router)
+
+    holder.attached = true
+  }
+
+  private fun detachRouter(holder: RouterViewHolder) {
+    if (!holder.attached) {
+      return
+    }
+
+    holder.currentRouter?.let { router ->
+      router.prepareForHostDetach()
+
+      savePage(holder.currentItemId, router)
+
+      if (visibleRouters[holder.currentItemPosition] == router) {
+        visibleRouters.remove(holder.currentItemPosition)
+      }
+    }
+
+    holder.attached = false
+  }
+
+  private fun savePage(itemId: Long, router: Router) {
+    val savedState = Bundle()
+    router.saveInstanceState(savedState)
+    savedPages.put(itemId, savedState)
+
+    savedPageHistory.remove(itemId)
+    savedPageHistory.add(itemId)
+
+    ensurePagesSaved()
+  }
+
+  private fun ensurePagesSaved() {
+    while (savedPages.size() > maxPagesToStateSave) {
+      val routerIdToRemove = savedPageHistory.removeAt(0)
+      savedPages.remove(routerIdToRemove)
+    }
+  }
+
+  /**
+   * Returns the already instantiated Router in the specified position or `null` if there
+   * is no router associated with this position.
+   */
+  fun getRouter(position: Int): Router? {
+    return visibleRouters[position]
+  }
+
+  inner class PrimaryItemCallback : ViewPager2.OnPageChangeCallback() {
+    override fun onPageSelected(position: Int) {
+      val router = visibleRouters[position]
+      if (position != currentPrimaryRouterPosition) {
+        val previousRouter = visibleRouters[currentPrimaryRouterPosition]
+
+        previousRouter?.backstack?.forEach { it.controller.setOptionsMenuHidden(true) }
+        router?.backstack?.forEach { it.controller.setOptionsMenuHidden(false) }
+        currentPrimaryRouterPosition = position
+      }
+    }
+  }
+
+  @Parcelize
+  private data class SavedState(
+    val savedPagesKeys: List<Long>,
+    val savedPagesValues: List<Bundle>,
+    val savedPageHistory: List<Long>,
+    val maxPagesToStateSave: Int
+  ) : Parcelable
+}

conductor-modules/viewpager2/src/main/java/com/bluelinelabs/conductor/viewpager2/RouterViewHolder.kt

@@ -0,0 +1,27 @@
+package com.bluelinelabs.conductor.viewpager2
+
+import android.view.ViewGroup
+import androidx.core.view.ViewCompat
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import com.bluelinelabs.conductor.ChangeHandlerFrameLayout
+import com.bluelinelabs.conductor.Router
+
+class RouterViewHolder private constructor(val container: ChangeHandlerFrameLayout) : ViewHolder(container) {
+  var currentRouter: Router? = null
+  var currentItemPosition = 0
+  var currentItemId = 0L
+  var attached = false
+
+  companion object {
+    operator fun invoke(parent: ViewGroup): RouterViewHolder {
+      val container = ChangeHandlerFrameLayout(parent.context)
+      container.id = ViewCompat.generateViewId()
+      container.layoutParams = ViewGroup.LayoutParams(
+        ViewGroup.LayoutParams.MATCH_PARENT,
+        ViewGroup.LayoutParams.MATCH_PARENT
+      )
+      container.isSaveEnabled = false
+      return RouterViewHolder(container)
+    }
+  }
+}

conductor-modules/viewpager2/src/test/java/com/bluelinelabs/conductor/viewpager2/StateSaveTests.kt

@@ -0,0 +1,119 @@
+package com.bluelinelabs.conductor.viewpager2
+
+import android.app.Activity
+import android.os.Looper.getMainLooper
+import android.widget.FrameLayout
+import androidx.core.view.ViewCompat
+import androidx.viewpager2.widget.ViewPager2
+import com.bluelinelabs.conductor.Conductor
+import com.bluelinelabs.conductor.Router
+import com.bluelinelabs.conductor.RouterTransaction.Companion.with
+import com.bluelinelabs.conductor.viewpager2.util.TestController
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.Robolectric
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.Shadows.shadowOf
+import org.robolectric.annotation.Config
+
+@RunWith(RobolectricTestRunner::class)
+@Config(manifest = Config.NONE)
+class StateSaveTests {
+
+  private val pager: ViewPager2
+  private val adapter: RouterStateAdapter
+  private val destroyedItems = mutableListOf<Int>()
+
+  init {
+    val activityController = Robolectric.buildActivity(Activity::class.java).setup()
+    val layout = FrameLayout(activityController.get())
+    activityController.get().setContentView(layout)
+    val router = Conductor.attachRouter(activityController.get(), FrameLayout(activityController.get()), null)
+    val controller = TestController()
+    router.setRoot(with(controller))
+    pager = ViewPager2(activityController.get()).also {
+      it.id = ViewCompat.generateViewId()
+    }
+    layout.addView(pager)
+    pager.offscreenPageLimit = 1
+    adapter = object : RouterStateAdapter(controller) {
+      override fun configureRouter(router: Router, position: Int) {
+        if (!router.hasRootController()) {
+          router.setRoot(with(TestController()))
+        }
+      }
+
+      override fun getItemCount(): Int {
+        return 20
+      }
+
+      override fun onViewDetachedFromWindow(holder: RouterViewHolder) {
+        super.onViewDetachedFromWindow(holder)
+
+        destroyedItems.add(holder.currentItemPosition)
+      }
+    }
+    pager.adapter = adapter
+    shadowOf(getMainLooper()).idle()
+  }
+
+  @Test
+  fun testNoMaxSaves() {
+    // Load all pages
+    for (i in 0 until adapter.itemCount) {
+      pager.setCurrentItem(i, false)
+      shadowOf(getMainLooper()).idle()
+    }
+
+    // Ensure all non-visible pages are saved
+    assertEquals(
+      destroyedItems.size,
+      adapter.savedPageHistory.size
+    )
+  }
+
+  @Test
+  fun testMaxSavedSet() {
+    val maxPages = 3
+    adapter.setMaxPagesToStateSave(maxPages)
+
+    // Load all pages
+    for (i in 0 until adapter.itemCount) {
+      pager.setCurrentItem(i, false)
+      shadowOf(getMainLooper()).idle()
+    }
+
+    val firstSelectedItem = adapter.itemCount / 2
+    for (i in adapter.itemCount downTo firstSelectedItem) {
+      pager.setCurrentItem(i, false)
+      shadowOf(getMainLooper()).idle()
+    }
+
+    var savedPages = adapter.savedPageHistory
+
+    // Ensure correct number of pages are saved
+    assertEquals(maxPages, savedPages.size)
+
+    // Ensure correct pages are saved
+    assertEquals(destroyedItems[destroyedItems.lastIndex], savedPages[savedPages.lastIndex].toInt())
+    assertEquals(destroyedItems[destroyedItems.lastIndex - 1], savedPages[savedPages.lastIndex - 1].toInt())
+    assertEquals(destroyedItems[destroyedItems.lastIndex - 2], savedPages[savedPages.lastIndex - 2].toInt())
+
+    val secondSelectedItem = 1
+    for (i in adapter.itemCount downTo secondSelectedItem) {
+      pager.setCurrentItem(i, false)
+      shadowOf(getMainLooper()).idle()
+    }
+
+    savedPages = adapter.savedPageHistory
+
+    // Ensure correct number of pages are saved
+    assertEquals(maxPages, savedPages.size)
+
+    // Ensure correct pages are saved
+    assertEquals(destroyedItems[destroyedItems.lastIndex], savedPages[savedPages.lastIndex].toInt())
+    assertEquals(destroyedItems[destroyedItems.lastIndex - 1], savedPages[savedPages.lastIndex - 1].toInt())
+    assertEquals(destroyedItems[destroyedItems.lastIndex - 2], savedPages[savedPages.lastIndex - 2].toInt())
+  }
+}

conductor-modules/viewpager2/src/test/java/com/bluelinelabs/conductor/viewpager2/util/TestController.java

@@ -1,17 +1,20 @@
-package com.bluelinelabs.conductor.support.util;
+package com.bluelinelabs.conductor.viewpager2.util;
 
-import android.support.annotation.NonNull;
+import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.bluelinelabs.conductor.Controller;
 
 public class TestController extends Controller {
 
-    @NonNull @Override
-    protected View onCreateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container) {
+    @Override @NonNull
+    protected View onCreateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container, @Nullable Bundle savedViewState) {
         return new FrameLayout(inflater.getContext());
     }
 

conductor/build.gradle

@@ -1,23 +1,8 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'de.mobilej.unmock:UnMockPlugin:0.6.0'
-    }
-}
-
 apply plugin: 'com.android.library'
-apply plugin: 'de.mobilej.unmock'
+apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
@@ -28,40 +13,20 @@ android {
     }
 }
 
-configurations {
-    lintChecks
-}
-
 dependencies {
-    testCompile rootProject.ext.junit
-    testCompile rootProject.ext.roboelectric
+    implementation savedState
+    testImplementation rootProject.ext.junit
+    testImplementation rootProject.ext.robolectric
 
-    compile rootProject.ext.supportAnnotations
+    implementation archComponentsLifecycle
 
-    lintChecks project(path: ':conductor-lint', configuration: 'lintChecks')
+    api rootProject.ext.androidxAnnotations
+    api kotlinStd
 
-    unmock 'org.robolectric:android-all:4.3_r2-robolectric-0'
-}
-
-unMock {
-    keep "android.os.Bundle"
-    keep "android.os.BaseBundle"
-    keep "android.text.TextUtils"
-}
-
-task copyLintJar(type: Copy) {
-    from(configurations.lintChecks) {
-        rename { 'lint.jar' }
-    }
-    into 'build/intermediates/lint/'
-}
-
-project.afterEvaluate {
-    def compileLintTask = project.tasks.find { it.name == 'compileLint' }
-    compileLintTask.dependsOn(copyLintJar)
+    lintPublish project(':conductor-lint')
 }
 
 ext.artifactId = 'conductor'
 
 apply from: rootProject.file('dependencies.gradle')
-apply from: rootProject.file('gradle-mvn-push.gradle')
+apply plugin: "com.vanniktech.maven.publish"

conductor/proguard-rules.txt

@@ -3,3 +3,6 @@
    public <init>();
    public <init>(android.os.Bundle);
 }
+-keepclassmembers public class * extends com.bluelinelabs.conductor.ControllerChangeHandler {
+   public <init>();
+}

conductor/src/main/java/com/bluelinelabs/conductor/ActivityHostedRouter.java

@@ -5,10 +5,11 @@ import android.content.Intent;
 import android.content.IntentSender;
 import android.content.IntentSender.SendIntentException;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.bluelinelabs.conductor.ControllerChangeHandler.ControllerChangeListener;
 import com.bluelinelabs.conductor.internal.LifecycleHandler;
 import com.bluelinelabs.conductor.internal.TransactionIndexer;
@@ -57,9 +58,12 @@ public class ActivityHostedRouter extends Router {
     }
 
     @Override
-    public void onActivityDestroyed(@NonNull Activity activity) {
-        super.onActivityDestroyed(activity);
-        lifecycleHandler = null;
+    public void onActivityDestroyed(@NonNull Activity activity, boolean isConfigurationChange) {
+        super.onActivityDestroyed(activity, isConfigurationChange);
+
+        if (!isConfigurationChange) {
+            lifecycleHandler = null;
+        }
     }
 
     @Override
@@ -125,7 +129,7 @@ public class ActivityHostedRouter extends Router {
         return this;
     }
 
-    @Override @Nullable
+    @Override @NonNull
     TransactionIndexer getTransactionIndexer() {
         return transactionIndexer;
     }

conductor/src/main/java/com/bluelinelabs/conductor/Backstack.java

@@ -1,8 +1,9 @@
 package com.bluelinelabs.conductor;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -58,7 +59,7 @@ class Backstack implements Iterable<RouterTransaction> {
     @NonNull
     RouterTransaction pop() {
         RouterTransaction popped = backstack.pop();
-        popped.controller.destroy();
+        popped.controller().destroy();
         return popped;
     }
 
@@ -67,10 +68,6 @@ class Backstack implements Iterable<RouterTransaction> {
         return backstack.peek();
     }
 
-    void remove(@NonNull RouterTransaction transaction) {
-        backstack.removeFirstOccurrence(transaction);
-    }
-
     void push(@NonNull RouterTransaction transaction) {
         backstack.push(transaction);
     }
@@ -85,28 +82,19 @@ class Backstack implements Iterable<RouterTransaction> {
     }
 
     void setBackstack(@NonNull List<RouterTransaction> backstack) {
-        for (RouterTransaction existingTransaction : this.backstack) {
-            boolean contains = false;
-            for (RouterTransaction newTransaction : backstack) {
-                if (existingTransaction.controller == newTransaction.controller) {
-                    contains = true;
-                    break;
-                }
-            }
-
-            if (!contains) {
-                existingTransaction.controller.destroy();
-            }
-        }
-
         this.backstack.clear();
         for (RouterTransaction transaction : backstack) {
             this.backstack.push(transaction);
         }
     }
 
-    boolean contains(@NonNull RouterTransaction transaction) {
-        return backstack.contains(transaction);
+    boolean contains(@NonNull Controller controller) {
+        for (RouterTransaction transaction : backstack) {
+            if (controller == transaction.controller()) {
+                return true;
+            }
+        }
+        return false;
     }
 
     void saveInstanceState(@NonNull Bundle outState) {

conductor/src/main/java/com/bluelinelabs/conductor/ChangeHandlerFrameLayout.java

@@ -1,56 +0,0 @@
-package com.bluelinelabs.conductor;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-
-import com.bluelinelabs.conductor.ControllerChangeHandler.ControllerChangeListener;
-
-/**
- * A FrameLayout implementation that can be used to block user interactions while
- * {@link ControllerChangeHandler}s are performing changes. It is not required to use this
- * ViewGroup, but it can be helpful.
- */
-public class ChangeHandlerFrameLayout extends FrameLayout implements ControllerChangeListener {
-
-    private int inProgressTransactionCount;
-
-    public ChangeHandlerFrameLayout(Context context) {
-        super(context);
-    }
-
-    public ChangeHandlerFrameLayout(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public ChangeHandlerFrameLayout(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    public ChangeHandlerFrameLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-    }
-
-    @Override
-    public boolean onInterceptTouchEvent(MotionEvent ev) {
-        return (inProgressTransactionCount > 0) || super.onInterceptTouchEvent(ev);
-    }
-
-    @Override
-    public void onChangeStarted(@Nullable Controller to, @Nullable Controller from, boolean isPush, @NonNull ViewGroup container, @NonNull ControllerChangeHandler handler) {
-        inProgressTransactionCount++;
-    }
-
-    @Override
-    public void onChangeCompleted(@Nullable Controller to, @Nullable Controller from, boolean isPush, @NonNull ViewGroup container, @NonNull ControllerChangeHandler handler) {
-        inProgressTransactionCount--;
-    }
-
-}

conductor/src/main/java/com/bluelinelabs/conductor/ChangeHandlerFrameLayout.kt

@@ -0,0 +1,60 @@
+package com.bluelinelabs.conductor
+
+import android.annotation.TargetApi
+import android.content.Context
+import android.os.Build
+import android.util.AttributeSet
+import android.view.MotionEvent
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import com.bluelinelabs.conductor.ControllerChangeHandler.ControllerChangeListener
+
+/**
+ * A FrameLayout implementation that can be used to block user interactions while
+ * [ControllerChangeHandler]s are performing changes. It is not required to use this
+ * ViewGroup, but it can be helpful.
+ */
+open class ChangeHandlerFrameLayout : FrameLayout, ControllerChangeListener {
+
+  private var inProgressTransactionCount = 0
+
+  constructor(context: Context) : super(context)
+  constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
+  constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+    context,
+    attrs,
+    defStyleAttr
+  )
+
+  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+  constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(
+    context,
+    attrs,
+    defStyleAttr,
+    defStyleRes
+  )
+
+  override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {
+    return inProgressTransactionCount > 0 || super.onInterceptTouchEvent(ev)
+  }
+
+  override fun onChangeStarted(
+    to: Controller?,
+    from: Controller?,
+    isPush: Boolean,
+    container: ViewGroup,
+    handler: ControllerChangeHandler
+  ) {
+    inProgressTransactionCount++
+  }
+
+  override fun onChangeCompleted(
+    to: Controller?,
+    from: Controller?,
+    isPush: Boolean,
+    container: ViewGroup,
+    handler: ControllerChangeHandler
+  ) {
+    inProgressTransactionCount--
+  }
+}

conductor/src/main/java/com/bluelinelabs/conductor/Conductor.java

@@ -1,44 +0,0 @@
-package com.bluelinelabs.conductor;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
-import android.view.ViewGroup;
-
-import com.bluelinelabs.conductor.internal.LifecycleHandler;
-import com.bluelinelabs.conductor.internal.ThreadUtils;
-
-/**
- * Point of initial interaction with Conductor. Used to attach a {@link Router} to your Activity.
- */
-public final class Conductor {
-
-    private Conductor() {}
-
-    /**
-     * Conductor will create a {@link Router} that has been initialized for your Activity and containing ViewGroup.
-     * If an existing {@link Router} is already associated with this Activity/ViewGroup pair, either in memory
-     * or in the savedInstanceState, that router will be used and rebound instead of creating a new one with
-     * an empty backstack.
-     *
-     * @param activity The Activity that will host the {@link Router} being attached.
-     * @param container The ViewGroup in which the {@link Router}'s {@link Controller} views will be hosted
-     * @param savedInstanceState The savedInstanceState passed into the hosting Activity's onCreate method. Used
-     *                           for restoring the Router's state if possible.
-     * @return A fully configured {@link Router} instance for use with this Activity/ViewGroup pair.
-     */
-    @NonNull @UiThread
-    public static Router attachRouter(@NonNull Activity activity, @NonNull ViewGroup container, @Nullable Bundle savedInstanceState) {
-        ThreadUtils.ensureMainThread();
-
-        LifecycleHandler lifecycleHandler = LifecycleHandler.install(activity);
-
-        Router router = lifecycleHandler.getRouter(container, savedInstanceState);
-        router.rebindIfNeeded();
-
-        return router;
-    }
-
-}

conductor/src/main/java/com/bluelinelabs/conductor/Conductor.kt

@@ -0,0 +1,32 @@
+package com.bluelinelabs.conductor
+
+import android.app.Activity
+import android.os.Bundle
+import android.view.ViewGroup
+import androidx.annotation.UiThread
+import com.bluelinelabs.conductor.internal.LifecycleHandler
+import com.bluelinelabs.conductor.internal.ensureMainThread
+
+/**
+ * Conductor will create a [Router] that has been initialized for your Activity and containing ViewGroup.
+ * If an existing [Router] is already associated with this Activity/ViewGroup pair, either in memory
+ * or in the savedInstanceState, that router will be used and rebound instead of creating a new one with
+ * an empty backstack.
+ *
+ * @param activity The Activity that will host the [Router] being attached.
+ * @param container The ViewGroup in which the [Router]'s [Controller] views will be hosted
+ * @param savedInstanceState The savedInstanceState passed into the hosting Activity's onCreate method. Used
+ * for restoring the Router's state if possible.
+ * @return A fully configured [Router] instance for use with this Activity/ViewGroup pair.
+ */
+@UiThread
+object Conductor {
+  
+  @JvmStatic
+  fun attachRouter(activity: Activity, container: ViewGroup, savedInstanceState: Bundle?): Router {
+    ensureMainThread()
+    return LifecycleHandler.install(activity)
+      .getRouter(container, savedInstanceState)
+      .also { it.rebindIfNeeded() }
+  }
+}

conductor/src/main/java/com/bluelinelabs/conductor/Controller.java

@@ -9,9 +9,6 @@ import android.content.res.Resources;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
@@ -21,7 +18,12 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.bluelinelabs.conductor.internal.ClassUtils;
+import com.bluelinelabs.conductor.internal.OwnViewTreeLifecycleAndRegistry;
 import com.bluelinelabs.conductor.internal.RouterRequiringFunc;
 import com.bluelinelabs.conductor.internal.ViewAttachHandler;
 import com.bluelinelabs.conductor.internal.ViewAttachHandler.ViewAttachListener;
@@ -62,22 +64,23 @@ public abstract class Controller {
 
     Bundle viewState;
     private Bundle savedInstanceState;
-    private boolean isBeingDestroyed;
+    boolean isBeingDestroyed;
     private boolean destroyed;
     private boolean attached;
     private boolean hasOptionsMenu;
     private boolean optionsMenuHidden;
-    private boolean viewIsAttached;
-    private boolean viewWasDetached;
-    private Router router;
-    private View view;
+    boolean viewIsAttached;
+    boolean viewWasDetached;
+    Router router;
+    View view;
     private Controller parentController;
-    private String instanceId;
+    String instanceId;
     private String targetInstanceId;
     private boolean needsAttach;
     private boolean attachedToUnownedParent;
+    private boolean awaitingParentAttach;
     private boolean hasSavedViewState;
-    private boolean isDetachFrozen;
+    boolean isDetachFrozen;
     private ControllerChangeHandler overriddenPushHandler;
     private ControllerChangeHandler overriddenPopHandler;
     private RetainViewMode retainViewMode = RetainViewMode.RELEASE_DETACH;
@@ -106,10 +109,10 @@ public abstract class Controller {
         Controller controller;
         try {
             if (bundleConstructor != null) {
-                controller = (Controller)bundleConstructor.newInstance(args);
+                controller = (Controller) bundleConstructor.newInstance(args);
             } else {
                 //noinspection ConstantConditions
-                controller = (Controller)getDefaultConstructor(constructors).newInstance();
+                controller = (Controller) getDefaultConstructor(constructors).newInstance();
 
                 // Restore the args that existed before the last process death
                 if (args != null) {
@@ -140,6 +143,7 @@ public abstract class Controller {
         this.args = args != null ? args : new Bundle(getClass().getClassLoader());
         instanceId = UUID.randomUUID().toString();
         ensureRequiredConstructor();
+        OwnViewTreeLifecycleAndRegistry.Companion.own(this);
     }
 
     /**
@@ -147,13 +151,15 @@ public abstract class Controller {
      * for this method will be {@code return inflater.inflate(R.layout.my_layout, container, false);}, plus
      * any binding code.
      *
-     * @param inflater  The LayoutInflater that should be used to inflate views
-     * @param container The parent view that this Controller's view will eventually be attached to.
-     *                  This Controller's view should NOT be added in this method. It is simply passed in
-     *                  so that valid LayoutParams can be used during inflation.
+     * @param inflater       The LayoutInflater that should be used to inflate views
+     * @param container      The parent view that this Controller's view will eventually be attached to.
+     *                       This Controller's view should NOT be added in this method. It is simply passed in
+     *                       so that valid LayoutParams can be used during inflation.
+     * @param savedViewState A bundle for the view's state, which would have been created in {@link #onSaveViewState(View, Bundle)},
+     *                       or {@code null} if no saved state exists.
      */
     @NonNull
-    protected abstract View onCreateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container);
+    protected abstract View onCreateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container, @Nullable Bundle savedViewState);
 
     /**
      * Returns the {@link Router} object that can be used for pushing or popping other Controllers
@@ -188,7 +194,7 @@ public abstract class Controller {
      * the same container unless you have a great reason to do so (ex: ViewPagers).
      *
      * @param container The ViewGroup that hosts the child Router
-     * @param tag The router's tag or {@code null} if none is needed
+     * @param tag       The router's tag or {@code null} if none is needed
      */
     @NonNull
     public final Router getChildRouter(@NonNull ViewGroup container, @Nullable String tag) {
@@ -203,13 +209,16 @@ public abstract class Controller {
      * The only time this method will return {@code null} is when the child router does not exist prior
      * to calling this method and the createIfNeeded parameter is set to false.
      *
-     * @param container The ViewGroup that hosts the child Router
-     * @param tag The router's tag or {@code null} if none is needed
+     * @param container      The ViewGroup that hosts the child Router
+     * @param tag            The router's tag or {@code null} if none is needed
      * @param createIfNeeded If true, a router will be created if one does not yet exist. Else {@code null} will be returned in this case.
      */
     @Nullable
     public final Router getChildRouter(@NonNull ViewGroup container, @Nullable String tag, boolean createIfNeeded) {
         @IdRes final int containerId = container.getId();
+        if (containerId == View.NO_ID) {
+            throw new IllegalStateException("You must set an id on your container.");
+        }
 
         ControllerHostedRouter childRouter = null;
         for (ControllerHostedRouter router : childRouters) {
@@ -222,7 +231,7 @@ public abstract class Controller {
         if (childRouter == null) {
             if (createIfNeeded) {
                 childRouter = new ControllerHostedRouter(container.getId(), tag);
-                childRouter.setHost(this, container);
+                childRouter.setHostContainer(this, container);
                 childRouters.add(childRouter);
 
                 if (isPerformingExitTransition) {
@@ -230,7 +239,7 @@ public abstract class Controller {
                 }
             }
         } else if (!childRouter.hasHost()) {
-            childRouter.setHost(this, container);
+            childRouter.setHostContainer(this, container);
             childRouter.rebindIfNeeded();
         }
 
@@ -352,10 +361,8 @@ public abstract class Controller {
      */
     @NonNull
     public final List<Router> getChildRouters() {
-        List<Router> routers = new ArrayList<>();
-        for (Router router : childRouters) {
-            routers.add(router);
-        }
+        List<Router> routers = new ArrayList<>(childRouters.size());
+        routers.addAll(childRouters);
         return routers;
     }
 
@@ -394,7 +401,8 @@ public abstract class Controller {
      *
      * @param view The View to which this Controller should be bound.
      */
-    protected void onDestroyView(@NonNull View view) { }
+    protected void onDestroyView(@NonNull View view) {
+    }
 
     /**
      * Called when this Controller begins the process of being swapped in or out of the host view.
@@ -402,7 +410,8 @@ public abstract class Controller {
      * @param changeHandler The {@link ControllerChangeHandler} that's managing the swap
      * @param changeType    The type of change that's occurring
      */
-    protected void onChangeStarted(@NonNull ControllerChangeHandler changeHandler, @NonNull ControllerChangeType changeType) { }
+    protected void onChangeStarted(@NonNull ControllerChangeHandler changeHandler, @NonNull ControllerChangeType changeType) {
+    }
 
     /**
      * Called when this Controller completes the process of being swapped in or out of the host view.
@@ -410,59 +419,69 @@ public abstract class Controller {
      * @param changeHandler The {@link ControllerChangeHandler} that's managing the swap
      * @param changeType    The type of change that occurred
      */
-    protected void onChangeEnded(@NonNull ControllerChangeHandler changeHandler, @NonNull ControllerChangeType changeType) { }
+    protected void onChangeEnded(@NonNull ControllerChangeHandler changeHandler, @NonNull ControllerChangeType changeType) {
+    }
 
     /**
      * Called when this Controller has a Context available to it. This will happen very early on in the lifecycle
      * (before a view is created). If the host activity is re-created (ex: for orientation change), this will be
      * called again when the new context is available.
      */
-    protected void onContextAvailable(@NonNull Context context) { }
+    protected void onContextAvailable(@NonNull Context context) {
+    }
 
     /**
      * Called when this Controller's Context is no longer available. This can happen when the Controller is
      * destroyed or when the host Activity is destroyed.
      */
-    protected void onContextUnavailable() { }
+    protected void onContextUnavailable() {
+    }
 
     /**
      * Called when this Controller is attached to its host ViewGroup
      *
      * @param view The View for this Controller (passed for convenience)
      */
-    protected void onAttach(@NonNull View view) { }
+    protected void onAttach(@NonNull View view) {
+    }
 
     /**
      * Called when this Controller is detached from its host ViewGroup
      *
      * @param view The View for this Controller (passed for convenience)
      */
-    protected void onDetach(@NonNull View view) { }
+    protected void onDetach(@NonNull View view) {
+    }
 
     /**
      * Called when this Controller has been destroyed.
      */
-    protected void onDestroy() { }
+    protected void onDestroy() {
+    }
 
     /**
      * Called when this Controller's host Activity is started
      */
-    protected void onActivityStarted(@NonNull Activity activity) { }
+    protected void onActivityStarted(@NonNull Activity activity) {
+    }
 
     /**
      * Called when this Controller's host Activity is resumed
      */
-    protected void onActivityResumed(@NonNull Activity activity) { }
+    protected void onActivityResumed(@NonNull Activity activity) {
+    }
 
     /**
      * Called when this Controller's host Activity is paused
      */
-    protected void onActivityPaused(@NonNull Activity activity) { }
+    protected void onActivityPaused(@NonNull Activity activity) {
+    }
 
     /**
      * Called when this Controller's host Activity is stopped
      */
-    protected void onActivityStopped(@NonNull Activity activity) { }
+    protected void onActivityStopped(@NonNull Activity activity) {
+    }
 
     /**
      * Called to save this Controller's View state. As Views can be detached and destroyed as part of the
@@ -472,7 +491,8 @@ public abstract class Controller {
      * @param view     This Controller's View, passed for convenience
      * @param outState The Bundle into which the View state should be saved
      */
-    protected void onSaveViewState(@NonNull View view, @NonNull Bundle outState) { }
+    protected void onSaveViewState(@NonNull View view, @NonNull Bundle outState) {
+    }
 
     /**
      * Restores data that was saved in the {@link #onSaveViewState(View, Bundle)} method. This should be overridden
@@ -481,14 +501,16 @@ public abstract class Controller {
      * @param view           This Controller's View, passed for convenience
      * @param savedViewState The bundle that has data to be restored
      */
-    protected void onRestoreViewState(@NonNull View view, @NonNull Bundle savedViewState) { }
+    protected void onRestoreViewState(@NonNull View view, @NonNull Bundle savedViewState) {
+    }
 
     /**
      * Called to save this Controller's state in the event that its host Activity is destroyed.
      *
      * @param outState The Bundle into which data should be saved
      */
-    protected void onSaveInstanceState(@NonNull Bundle outState) { }
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
+    }
 
     /**
      * Restores data that was saved in the {@link #onSaveInstanceState(Bundle)} method. This should be overridden
@@ -496,14 +518,18 @@ public abstract class Controller {
      *
      * @param savedInstanceState The bundle that has data to be restored
      */
-    protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) { }
+    protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
+    }
 
     /**
      * Calls startActivity(Intent) from this Controller's host Activity.
      */
     public final void startActivity(@NonNull final Intent intent) {
         executeWithRouter(new RouterRequiringFunc() {
-            @Override public void execute() { router.startActivity(intent); }
+            @Override
+            public void execute() {
+                router.startActivity(intent);
+            }
         });
     }
 
@@ -512,7 +538,10 @@ public abstract class Controller {
      */
     public final void startActivityForResult(@NonNull final Intent intent, final int requestCode) {
         executeWithRouter(new RouterRequiringFunc() {
-            @Override public void execute() { router.startActivityForResult(instanceId, intent, requestCode); }
+            @Override
+            public void execute() {
+                router.startActivityForResult(instanceId, intent, requestCode);
+            }
         });
     }
 
@@ -521,7 +550,10 @@ public abstract class Controller {
      */
     public final void startActivityForResult(@NonNull final Intent intent, final int requestCode, @Nullable final Bundle options) {
         executeWithRouter(new RouterRequiringFunc() {
-            @Override public void execute() { router.startActivityForResult(instanceId, intent, requestCode, options); }
+            @Override
+            public void execute() {
+                router.startActivityForResult(instanceId, intent, requestCode, options);
+            }
         });
     }
 
@@ -541,7 +573,10 @@ public abstract class Controller {
      */
     public final void registerForActivityResult(final int requestCode) {
         executeWithRouter(new RouterRequiringFunc() {
-            @Override public void execute() { router.registerForActivityResult(instanceId, requestCode); }
+            @Override
+            public void execute() {
+                router.registerForActivityResult(instanceId, requestCode);
+            }
         });
     }
 
@@ -553,7 +588,8 @@ public abstract class Controller {
      * @param resultCode  The resultCode that was returned to the host Activity's onActivityResult method
      * @param data        The data Intent that was returned to the host Activity's onActivityResult method
      */
-    public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { }
+    public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+    }
 
     /**
      * Calls requestPermission(String[], int) from this Controller's host Activity. Results for this request,
@@ -565,7 +601,10 @@ public abstract class Controller {
         requestedPermissions.addAll(Arrays.asList(permissions));
 
         executeWithRouter(new RouterRequiringFunc() {
-            @Override public void execute() { router.requestPermissions(instanceId, permissions, requestCode); }
+            @Override
+            public void execute() {
+                router.requestPermissions(instanceId, permissions, requestCode);
+            }
         });
     }
 
@@ -586,7 +625,8 @@ public abstract class Controller {
      * @param permissions  The array of permissions requested
      * @param grantResults The results for each permission requested
      */
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { }
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+    }
 
     /**
      * Should be overridden if this Controller needs to handle the back button being pressed.
@@ -603,12 +643,12 @@ public abstract class Controller {
         Collections.sort(childTransactions, new Comparator<RouterTransaction>() {
             @Override
             public int compare(RouterTransaction o1, RouterTransaction o2) {
-                return o2.transactionIndex - o1.transactionIndex;
+                return o2.getTransactionIndex() - o1.getTransactionIndex();
             }
         });
 
         for (RouterTransaction transaction : childTransactions) {
-            Controller childController = transaction.controller;
+            Controller childController = transaction.controller();
 
             if (childController.isAttached() && childController.getRouter().handleBack()) {
                 return true;
@@ -728,10 +768,11 @@ public abstract class Controller {
      * Adds option items to the host Activity's standard options menu. This will only be called if
      * {@link #setHasOptionsMenu(boolean)} has been called.
      *
-     * @param menu The menu into which your options should be placed.
+     * @param menu     The menu into which your options should be placed.
      * @param inflater The inflater that can be used to inflate your menu items.
      */
-    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) { }
+    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
+    }
 
     /**
      * Prepare the screen's options menu to be displayed. This is called directly before showing the
@@ -739,7 +780,8 @@ public abstract class Controller {
      *
      * @param menu The menu that will be displayed
      */
-    public void onPrepareOptionsMenu(@NonNull Menu menu) { }
+    public void onPrepareOptionsMenu(@NonNull Menu menu) {
+    }
 
     /**
      * Called when an option menu item has been selected by the user.
@@ -846,9 +888,16 @@ public abstract class Controller {
     }
 
     final void activityStopped(@NonNull Activity activity) {
+        final boolean attached = this.attached;
+
         if (viewAttachHandler != null) {
             viewAttachHandler.onActivityStopped();
         }
+
+        if (attached && activity.isChangingConfigurations()) {
+            needsAttach = true;
+        }
+
         onActivityStopped(activity);
     }
 
@@ -875,12 +924,19 @@ public abstract class Controller {
         }
     }
 
-    private void attach(@NonNull View view) {
+    void attach(@NonNull View view) {
         attachedToUnownedParent = router == null || view.getParent() != router.container;
-        if (attachedToUnownedParent) {
+        if (attachedToUnownedParent || isBeingDestroyed) {
             return;
         }
 
+        if (parentController != null && !parentController.attached) {
+            awaitingParentAttach = true;
+            return;
+        } else {
+            awaitingParentAttach = false;
+        }
+
         hasSavedViewState = false;
 
         List<LifecycleListener> listeners = new ArrayList<>(lifecycleListeners);
@@ -889,7 +945,7 @@ public abstract class Controller {
         }
 
         attached = true;
-        needsAttach = false;
+        needsAttach = router.isActivityStopped;
 
         onAttach(view);
 
@@ -901,6 +957,18 @@ public abstract class Controller {
         for (LifecycleListener lifecycleListener : listeners) {
             lifecycleListener.postAttach(Controller.this, view);
         }
+
+        for (ControllerHostedRouter childRouter : childRouters) {
+            for (RouterTransaction childTransaction : childRouter.backstack) {
+                if (childTransaction.controller().awaitingParentAttach) {
+                    childTransaction.controller().attach(childTransaction.controller().view);
+                }
+            }
+
+            if (childRouter.hasHost()) {
+                childRouter.rebindIfNeeded();
+            }
+        }
     }
 
     void detach(@NonNull View view, boolean forceViewRefRemoval, boolean blockViewRefRemoval) {
@@ -919,7 +987,10 @@ public abstract class Controller {
             }
 
             attached = false;
-            onDetach(view);
+
+            if (!awaitingParentAttach) {
+                onDetach(view);
+            }
 
             if (hasOptionsMenu && !optionsMenuHidden) {
                 router.invalidateOptionsMenu();
@@ -949,7 +1020,11 @@ public abstract class Controller {
 
             onDestroyView(view);
 
-            viewAttachHandler.unregisterAttachListener(view);
+            // viewAttachHandler may be null iff the controller was popped before we got here
+            if (viewAttachHandler != null) {
+                viewAttachHandler.unregisterAttachListener(view);
+            }
+
             viewAttachHandler = null;
             viewIsAttached = false;
 
@@ -985,7 +1060,8 @@ public abstract class Controller {
                 lifecycleListener.preCreateView(this);
             }
 
-            view = onCreateView(LayoutInflater.from(parent.getContext()), parent);
+            Bundle savedViewState = viewState == null ? null : viewState.getBundle(KEY_VIEW_STATE_BUNDLE);
+            view = onCreateView(LayoutInflater.from(parent.getContext()), parent, savedViewState);
             if (view == parent) {
                 throw new IllegalStateException("Controller's onCreateView method returned the parent ViewGroup. Perhaps you forgot to pass false for LayoutInflater.inflate's attachToRoot parameter?");
             }
@@ -997,33 +1073,35 @@ public abstract class Controller {
 
             restoreViewState(view);
 
-            viewAttachHandler = new ViewAttachHandler(new ViewAttachListener() {
-                @Override
-                public void onAttached() {
-                    viewIsAttached = true;
-                    viewWasDetached = false;
-                    attach(view);
-                }
-
-                @Override
-                public void onDetached(boolean fromActivityStop) {
-                    viewIsAttached = false;
-                    viewWasDetached = true;
-
-                    if (!isDetachFrozen) {
-                        detach(view, false, fromActivityStop);
+            if (!isBeingDestroyed) {
+                viewAttachHandler = new ViewAttachHandler(new ViewAttachListener() {
+                    @Override
+                    public void onAttached() {
+                        viewIsAttached = true;
+                        viewWasDetached = false;
+                        attach(view);
                     }
-                }
 
-                @Override
-                public void onViewDetachAfterStop() {
-                    if (!isDetachFrozen) {
-                        detach(view, false, false);
+                    @Override
+                    public void onDetached(boolean fromActivityStop) {
+                        viewIsAttached = false;
+                        viewWasDetached = true;
+
+                        if (!isDetachFrozen) {
+                            detach(view, false, fromActivityStop);
+                        }
                     }
-                }
-            });
-            viewAttachHandler.listenForAttach(view);
-        } else if (retainViewMode == RetainViewMode.RETAIN_DETACH) {
+
+                    @Override
+                    public void onViewDetachAfterStop() {
+                        if (!isDetachFrozen) {
+                            detach(view, false, false);
+                        }
+                    }
+                });
+                viewAttachHandler.listenForAttach(view);
+            }
+        } else {
             restoreChildControllerHosts();
         }
 
@@ -1035,8 +1113,8 @@ public abstract class Controller {
             if (!childRouter.hasHost()) {
                 View containerView = view.findViewById(childRouter.getHostId());
 
-                if (containerView != null && containerView instanceof ViewGroup) {
-                    childRouter.setHost(this, (ViewGroup)containerView);
+                if (containerView instanceof ViewGroup) {
+                    childRouter.setHostContainer(this, (ViewGroup) containerView);
                     childRouter.rebindIfNeeded();
                 }
             }
@@ -1157,7 +1235,7 @@ public abstract class Controller {
             outState.putBundle(KEY_OVERRIDDEN_POP_HANDLER, overriddenPopHandler.toBundle());
         }
 
-        ArrayList<Bundle> childBundles = new ArrayList<>();
+        ArrayList<Bundle> childBundles = new ArrayList<>(childRouters.size());
         for (ControllerHostedRouter childRouter : childRouters) {
             Bundle routerBundle = new Bundle();
             childRouter.saveInstanceState(routerBundle);
@@ -1195,6 +1273,7 @@ public abstract class Controller {
         List<Bundle> childBundles = savedInstanceState.getParcelableArrayList(KEY_CHILD_ROUTERS);
         for (Bundle childBundle : childBundles) {
             ControllerHostedRouter childRouter = new ControllerHostedRouter();
+            childRouter.setHostController(this);
             childRouter.restoreInstanceState(childBundle);
             childRouters.add(childRouter);
         }
@@ -1257,6 +1336,8 @@ public abstract class Controller {
             }
             destroyedView = null;
         }
+
+        changeHandler.onEnd();
     }
 
     final void setDetachFrozen(boolean frozen) {
@@ -1268,7 +1349,11 @@ public abstract class Controller {
             }
 
             if (!frozen && view != null && viewWasDetached) {
+                View aView = view;
                 detach(view, false, false);
+                if (view == null && aView.getParent() == router.container) {
+                    router.container.removeView(aView); // need to remove the view when this controller is a child controller
+                }
             }
         }
     }
@@ -1320,46 +1405,84 @@ public abstract class Controller {
         return null;
     }
 
-    /** Modes that will influence when the Controller will allow its view to be destroyed */
+    /**
+     * Modes that will influence when the Controller will allow its view to be destroyed
+     */
     public enum RetainViewMode {
-        /** The Controller will release its reference to its view as soon as it is detached. */
+        /**
+         * The Controller will release its reference to its view as soon as it is detached.
+         */
         RELEASE_DETACH,
-        /** The Controller will retain its reference to its view when detached, but will still release the reference when a config change occurs. */
+        /**
+         * The Controller will retain its reference to its view when detached, but will still release the reference when a config change occurs.
+         */
         RETAIN_DETACH
     }
 
-    /** Allows external classes to listen for lifecycle events in a Controller */
+    /**
+     * Allows external classes to listen for lifecycle events in a Controller
+     */
     public static abstract class LifecycleListener {
 
-        public void onChangeStart(@NonNull Controller controller, @NonNull ControllerChangeHandler changeHandler, @NonNull ControllerChangeType changeType) { }
-        public void onChangeEnd(@NonNull Controller controller, @NonNull ControllerChangeHandler changeHandler, @NonNull ControllerChangeType changeType) { }
+        public void onChangeStart(@NonNull Controller controller, @NonNull ControllerChangeHandler changeHandler, @NonNull ControllerChangeType changeType) {
+        }
 
-        public void preCreateView(@NonNull Controller controller) { }
-        public void postCreateView(@NonNull Controller controller, @NonNull View view) { }
+        public void onChangeEnd(@NonNull Controller controller, @NonNull ControllerChangeHandler changeHandler, @NonNull ControllerChangeType changeType) {
+        }
 
-        public void preAttach(@NonNull Controller controller, @NonNull View view) { }
-        public void postAttach(@NonNull Controller controller, @NonNull View view) { }
+        public void preCreateView(@NonNull Controller controller) {
+        }
 
-        public void preDetach(@NonNull Controller controller, @NonNull View view) { }
-        public void postDetach(@NonNull Controller controller, @NonNull View view) { }
+        public void postCreateView(@NonNull Controller controller, @NonNull View view) {
+        }
 
-        public void preDestroyView(@NonNull Controller controller, @NonNull View view) { }
-        public void postDestroyView(@NonNull Controller controller) { }
+        public void preAttach(@NonNull Controller controller, @NonNull View view) {
+        }
 
-        public void preDestroy(@NonNull Controller controller) { }
-        public void postDestroy(@NonNull Controller controller) { }
+        public void postAttach(@NonNull Controller controller, @NonNull View view) {
+        }
 
-        public void preContextAvailable(@NonNull Controller controller) { }
-        public void postContextAvailable(@NonNull Controller controller, @NonNull Context context) { }
+        public void preDetach(@NonNull Controller controller, @NonNull View view) {
+        }
 
-        public void preContextUnavailable(@NonNull Controller controller, @NonNull Context context) { }
-        public void postContextUnavailable(@NonNull Controller controller) { }
+        public void postDetach(@NonNull Controller controller, @NonNull View view) {
+        }
 
-        public void onSaveInstanceState(@NonNull Controller controller, @NonNull Bundle outState) { }
-        public void onRestoreInstanceState(@NonNull Controller controller, @NonNull Bundle savedInstanceState) { }
+        public void preDestroyView(@NonNull Controller controller, @NonNull View view) {
+        }
 
-        public void onSaveViewState(@NonNull Controller controller, @NonNull Bundle outState) { }
-        public void onRestoreViewState(@NonNull Controller controller, @NonNull Bundle savedViewState) { }
+        public void postDestroyView(@NonNull Controller controller) {
+        }
+
+        public void preDestroy(@NonNull Controller controller) {
+        }
+
+        public void postDestroy(@NonNull Controller controller) {
+        }
+
+        public void preContextAvailable(@NonNull Controller controller) {
+        }
+
+        public void postContextAvailable(@NonNull Controller controller, @NonNull Context context) {
+        }
+
+        public void preContextUnavailable(@NonNull Controller controller, @NonNull Context context) {
+        }
+
+        public void postContextUnavailable(@NonNull Controller controller) {
+        }
+
+        public void onSaveInstanceState(@NonNull Controller controller, @NonNull Bundle outState) {
+        }
+
+        public void onRestoreInstanceState(@NonNull Controller controller, @NonNull Bundle savedInstanceState) {
+        }
+
+        public void onSaveViewState(@NonNull Controller controller, @NonNull Bundle outState) {
+        }
+
+        public void onRestoreViewState(@NonNull Controller controller, @NonNull Bundle savedViewState) {
+        }
 
     }
 

conductor/src/main/java/com/bluelinelabs/conductor/ControllerChangeHandler.java

@@ -1,12 +1,13 @@
 package com.bluelinelabs.conductor;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.bluelinelabs.conductor.changehandler.SimpleSwapChangeHandler;
 import com.bluelinelabs.conductor.internal.ClassUtils;
 
@@ -24,9 +25,9 @@ public abstract class ControllerChangeHandler {
     private static final String KEY_CLASS_NAME = "ControllerChangeHandler.className";
     private static final String KEY_SAVED_STATE = "ControllerChangeHandler.savedState";
 
-    private static final Map<String, ChangeHandlerData> inProgressChangeHandlers = new HashMap<>();
+    static final Map<String, ChangeHandlerData> inProgressChangeHandlers = new HashMap<>();
 
-    private boolean forceRemoveViewOnPush;
+    boolean forceRemoveViewOnPush;
     private boolean hasBeenUsed;
 
     /**
@@ -49,14 +50,16 @@ public abstract class ControllerChangeHandler {
      *
      * @param bundle The Bundle into which data should be stored.
      */
-    public void saveToBundle(@NonNull Bundle bundle) { }
+    public void saveToBundle(@NonNull Bundle bundle) {
+    }
 
     /**
      * Restores data that was saved in the {@link #saveToBundle(Bundle bundle)} method.
      *
      * @param bundle The bundle that has data to be restored
      */
-    public void restoreFromBundle(@NonNull Bundle bundle) { }
+    public void restoreFromBundle(@NonNull Bundle bundle) {
+    }
 
     /**
      * Will be called on change handlers that push a controller if the controller being pushed is
@@ -66,13 +69,15 @@ public abstract class ControllerChangeHandler {
      * @param newTop     The Controller that will now be at the top of the backstack or {@code null}
      *                   if there will be no new Controller at the top
      */
-    public void onAbortPush(@NonNull ControllerChangeHandler newHandler, @Nullable Controller newTop) { }
+    public void onAbortPush(@NonNull ControllerChangeHandler newHandler, @Nullable Controller newTop) {
+    }
 
     /**
      * Will be called on change handlers that push a controller if the controller being pushed is
      * needs to be attached immediately, without any animations or transitions.
      */
-    public void completeImmediately() { }
+    public void completeImmediately() {
+    }
 
     /**
      * Returns a copy of this ControllerChangeHandler. This method is internally used by the library, so
@@ -220,7 +225,7 @@ public abstract class ControllerChangeHandler {
                     if (handler.forceRemoveViewOnPush && fromView != null) {
                         ViewParent fromParent = fromView.getParent();
                         if (fromParent != null && fromParent instanceof ViewGroup) {
-                            ((ViewGroup)fromParent).removeView(fromView);
+                            ((ViewGroup) fromParent).removeView(fromView);
                         }
                     }
 
@@ -232,6 +237,9 @@ public abstract class ControllerChangeHandler {
         }
     }
 
+    protected void onEnd() {
+    }
+
     public boolean removesFromViewOnPush() {
         return true;
     }
@@ -240,24 +248,6 @@ public abstract class ControllerChangeHandler {
         forceRemoveViewOnPush = force;
     }
 
-    static class ChangeTransaction {
-        @Nullable final Controller to;
-        @Nullable final Controller from;
-        final boolean isPush;
-        @Nullable final ViewGroup container;
-        @Nullable final ControllerChangeHandler changeHandler;
-        @NonNull final List<ControllerChangeListener> listeners;
-
-        public ChangeTransaction(@Nullable Controller to, @Nullable Controller from, boolean isPush, @Nullable ViewGroup container, @Nullable ControllerChangeHandler changeHandler, @NonNull List<ControllerChangeListener> listeners) {
-            this.to = to;
-            this.from = from;
-            this.isPush = isPush;
-            this.container = container;
-            this.changeHandler = changeHandler;
-            this.listeners = listeners;
-        }
-    }
-
     /**
      * A listener interface useful for allowing external classes to be notified of change events.
      */
@@ -285,6 +275,29 @@ public abstract class ControllerChangeHandler {
         void onChangeCompleted(@Nullable Controller to, @Nullable Controller from, boolean isPush, @NonNull ViewGroup container, @NonNull ControllerChangeHandler handler);
     }
 
+    static class ChangeTransaction {
+        @Nullable
+        final Controller to;
+        @Nullable
+        final Controller from;
+        final boolean isPush;
+        @Nullable
+        final ViewGroup container;
+        @Nullable
+        final ControllerChangeHandler changeHandler;
+        @NonNull
+        final List<ControllerChangeListener> listeners;
+
+        public ChangeTransaction(@Nullable Controller to, @Nullable Controller from, boolean isPush, @Nullable ViewGroup container, @Nullable ControllerChangeHandler changeHandler, @NonNull List<ControllerChangeListener> listeners) {
+            this.to = to;
+            this.from = from;
+            this.isPush = isPush;
+            this.container = container;
+            this.changeHandler = changeHandler;
+            this.listeners = listeners;
+        }
+    }
+
     /**
      * A simplified listener for being notified when the change is complete. This MUST be called by any custom
      * ControllerChangeHandlers in order to ensure that {@link Controller}s will be notified of this change.

conductor/src/main/java/com/bluelinelabs/conductor/ControllerChangeType.java

@@ -1,26 +0,0 @@
-package com.bluelinelabs.conductor;
-
-/**
- * All possible types of {@link Controller} changes to be used in {@link ControllerChangeHandler}s
- */
-public enum ControllerChangeType {
-    /** The Controller is being pushed to the host container */
-    PUSH_ENTER(true, true),
-
-    /** The Controller is being pushed to the backstack as another Controller is pushed to the host container */
-    PUSH_EXIT(true, false),
-
-    /** The Controller is being popped from the backstack and placed in the host container as another Controller is popped */
-    POP_ENTER(false, true),
-
-    /** The Controller is being popped from the host container */
-    POP_EXIT(false, false);
-
-    public boolean isPush;
-    public boolean isEnter;
-
-    ControllerChangeType(boolean isPush, boolean isEnter) {
-        this.isPush = isPush;
-        this.isEnter = isEnter;
-    }
-}

conductor/src/main/java/com/bluelinelabs/conductor/ControllerChangeType.kt

@@ -0,0 +1,18 @@
+package com.bluelinelabs.conductor
+
+/**
+ * All possible types of [Controller] changes to be used in [ControllerChangeHandler]s
+ */
+enum class ControllerChangeType(@JvmField val isPush: Boolean, @JvmField val isEnter: Boolean) {
+  /** The Controller is being pushed to the host container  */
+  PUSH_ENTER(true, true),
+
+  /** The Controller is being pushed to the backstack as another Controller is pushed to the host container  */
+  PUSH_EXIT(true, false),
+
+  /** The Controller is being popped from the backstack and placed in the host container as another Controller is popped  */
+  POP_ENTER(false, true),
+
+  /** The Controller is being popped from the host container  */
+  POP_EXIT(false, false);
+}

conductor/src/main/java/com/bluelinelabs/conductor/ControllerHostedRouter.java

@@ -5,16 +5,18 @@ import android.content.Intent;
 import android.content.IntentSender;
 import android.content.IntentSender.SendIntentException;
 import android.os.Bundle;
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.bluelinelabs.conductor.ControllerChangeHandler.ControllerChangeListener;
 import com.bluelinelabs.conductor.internal.TransactionIndexer;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 class ControllerHostedRouter extends Router {
 
@@ -34,19 +36,25 @@ class ControllerHostedRouter extends Router {
         this.tag = tag;
     }
 
-    final void setHost(@NonNull Controller controller, @NonNull ViewGroup container) {
+    final void setHostController(@NonNull Controller controller) {
+        if (hostController == null) {
+            hostController = controller;
+        }
+    }
+
+    final void setHostContainer(@NonNull Controller controller, @NonNull ViewGroup container) {
         if (hostController != controller || this.container != container) {
             removeHost();
 
             if (container instanceof ControllerChangeListener) {
-                addChangeListener((ControllerChangeListener)container);
+                addChangeListener((ControllerChangeListener) container);
             }
 
             hostController = controller;
             this.container = container;
 
             for (RouterTransaction transaction : backstack) {
-                transaction.controller.setParentController(controller);
+                transaction.controller().setParentController(controller);
             }
 
             watchContainerAttach();
@@ -55,7 +63,7 @@ class ControllerHostedRouter extends Router {
 
     final void removeHost() {
         if (container != null && container instanceof ControllerChangeListener) {
-            removeChangeListener((ControllerChangeListener)container);
+            removeChangeListener((ControllerChangeListener) container);
         }
 
         final List<Controller> controllersToDestroy = new ArrayList<>(destroyingControllers);
@@ -65,20 +73,19 @@ class ControllerHostedRouter extends Router {
             }
         }
         for (RouterTransaction transaction : backstack) {
-            if (transaction.controller.getView() != null) {
-                transaction.controller.detach(transaction.controller.getView(), true, false);
+            if (transaction.controller().getView() != null) {
+                transaction.controller().detach(transaction.controller().getView(), true, false);
             }
         }
 
         prepareForContainerRemoval();
-        hostController = null;
         container = null;
     }
 
     final void setDetachFrozen(boolean frozen) {
         isDetachFrozen = frozen;
         for (RouterTransaction transaction : backstack) {
-            transaction.controller.setDetachFrozen(frozen);
+            transaction.controller().setDetachFrozen(frozen);
         }
     }
 
@@ -91,7 +98,7 @@ class ControllerHostedRouter extends Router {
     @Override
     protected void pushToBackstack(@NonNull RouterTransaction entry) {
         if (isDetachFrozen) {
-            entry.controller.setDetachFrozen(true);
+            entry.controller().setDetachFrozen(true);
         }
         super.pushToBackstack(entry);
     }
@@ -100,20 +107,35 @@ class ControllerHostedRouter extends Router {
     public void setBackstack(@NonNull List<RouterTransaction> newBackstack, @Nullable ControllerChangeHandler changeHandler) {
         if (isDetachFrozen) {
             for (RouterTransaction transaction : newBackstack) {
-                transaction.controller.setDetachFrozen(true);
+                transaction.controller().setDetachFrozen(true);
             }
         }
         super.setBackstack(newBackstack, changeHandler);
     }
 
+    @Override
+    void performControllerChange(@Nullable RouterTransaction to, @Nullable RouterTransaction from, boolean isPush) {
+        super.performControllerChange(to, from, isPush);
+
+        // If we're pushing a transaction that will detach controllers to an unattached child
+        // router, we need mark all other controllers as NOT needing to be reattached.
+        if (to != null && !hostController.isAttached()) {
+            if (to.pushChangeHandler() == null || to.pushChangeHandler().removesFromViewOnPush()) {
+                for (RouterTransaction transaction : backstack) {
+                    transaction.controller().setNeedsAttach(false);
+                }
+            }
+        }
+    }
+
     @Override @Nullable
     public Activity getActivity() {
         return hostController != null ? hostController.getActivity() : null;
     }
 
     @Override
-    public void onActivityDestroyed(@NonNull Activity activity) {
-        super.onActivityDestroyed(activity);
+    public void onActivityDestroyed(@NonNull Activity activity, boolean isConfigurationChange) {
+        super.onActivityDestroyed(activity, isConfigurationChange);
 
         removeHost();
     }
@@ -183,7 +205,7 @@ class ControllerHostedRouter extends Router {
 
     @Override
     boolean hasHost() {
-        return hostController != null;
+        return hostController != null && container != null;
     }
 
     @Override
@@ -203,9 +225,9 @@ class ControllerHostedRouter extends Router {
     }
 
     @Override
-    void setControllerRouter(@NonNull Controller controller) {
-        super.setControllerRouter(controller);
+    void setRouterOnController(@NonNull Controller controller) {
         controller.setParentController(hostController);
+        super.setRouterOnController(controller);
     }
 
     int getHostId() {
@@ -234,8 +256,21 @@ class ControllerHostedRouter extends Router {
         }
     }
 
-    @Override @Nullable
+    @Override @NonNull
     TransactionIndexer getTransactionIndexer() {
-        return getRootRouter().getTransactionIndexer();
+        Router rootRouter = getRootRouter();
+        if (rootRouter == this) {
+            String debugInfo;
+            if (hostController != null) {
+                debugInfo = String.format(Locale.ENGLISH, "%s (attached? %b, destroyed? %b, parent: %s)",
+                        hostController.getClass().getSimpleName(), hostController.isAttached(), hostController.isBeingDestroyed, hostController.getParentController());
+            } else {
+                debugInfo = "null host controller";
+            }
+            throw new IllegalStateException("Unable to retrieve TransactionIndexer from " + debugInfo);
+        } else {
+            return getRootRouter().getTransactionIndexer();
+        }
     }
+
 }

conductor/src/main/java/com/bluelinelabs/conductor/RestoreViewOnCreateController.java

@@ -1,53 +0,0 @@
-package com.bluelinelabs.conductor;
-
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-/**
- * A simple controller subclass that changes the onCreateView signature to include a saved view state parameter.
- * This is necessary for some third party libraries like Google Maps, which require passing in a saved state
- * bundle at the time of creation.
- */
-abstract public class RestoreViewOnCreateController extends Controller {
-
-    /**
-     * Convenience constructor for use when no arguments are needed.
-     */
-    protected RestoreViewOnCreateController() {
-        super(null);
-    }
-
-    /**
-     * Constructor that takes arguments that need to be retained across restarts.
-     *
-     * @param args Any arguments that need to be retained.
-     */
-    protected RestoreViewOnCreateController(@Nullable Bundle args) {
-        super(args);
-    }
-
-    @Override @NonNull
-    protected final View onCreateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container) {
-        return onCreateView(inflater, container, viewState == null ? null : viewState.getBundle(KEY_VIEW_STATE_BUNDLE));
-    }
-
-    /**
-     * Called when the controller is ready to display its view. A valid view must be returned. The standard body
-     * for this method will be {@code return inflater.inflate(R.layout.my_layout, container, false);}, plus
-     * any binding and state restoration code.
-     *
-     * @param inflater       The LayoutInflater that should be used to inflate views
-     * @param container      The parent view that this Controller's view will eventually be attached to.
-     *                       This Controller's view should NOT be added in this method. It is simply passed in
-     *                       so that valid LayoutParams can be used during inflation.
-     * @param savedViewState A bundle for the view's state, which would have been created in {@link #onSaveViewState(View, Bundle)},
-     *                       or {@code null} if no saved state exists.
-     */
-    @NonNull
-    protected abstract View onCreateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container, @Nullable Bundle savedViewState);
-
-}

conductor/src/main/java/com/bluelinelabs/conductor/Router.java

@@ -4,16 +4,16 @@ import android.app.Activity;
 import android.content.Intent;
 import android.content.IntentSender;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.bluelinelabs.conductor.Controller.LifecycleListener;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
+
 import com.bluelinelabs.conductor.ControllerChangeHandler.ChangeTransaction;
 import com.bluelinelabs.conductor.ControllerChangeHandler.ControllerChangeListener;
 import com.bluelinelabs.conductor.changehandler.SimpleSwapChangeHandler;
@@ -43,6 +43,7 @@ public abstract class Router {
 
     private boolean popsLastView = false;
     boolean containerFullyAttached = false;
+    boolean isActivityStopped = false;
 
     ViewGroup container;
 
@@ -91,7 +92,7 @@ public abstract class Router {
 
         if (!backstack.isEmpty()) {
             //noinspection ConstantConditions
-            if (backstack.peek().controller.handleBack()) {
+            if (backstack.peek().controller().handleBack()) {
                 return true;
             } else if (popCurrentController()) {
                 return true;
@@ -115,7 +116,7 @@ public abstract class Router {
         if (transaction == null) {
             throw new IllegalStateException("Trying to pop the current controller when there are none on the backstack.");
         }
-        return popController(transaction.controller);
+        return popController(transaction.controller());
     }
 
     /**
@@ -129,7 +130,7 @@ public abstract class Router {
         ThreadUtils.ensureMainThread();
 
         RouterTransaction topTransaction = backstack.peek();
-        boolean poppingTopController = topTransaction != null && topTransaction.controller == controller;
+        boolean poppingTopController = topTransaction != null && topTransaction.controller() == controller;
 
         if (poppingTopController) {
             trackDestroyingController(backstack.pop());
@@ -137,15 +138,18 @@ public abstract class Router {
         } else {
             RouterTransaction removedTransaction = null;
             RouterTransaction nextTransaction = null;
-            for (RouterTransaction transaction : backstack) {
-                if (transaction.controller == controller) {
-                    if (controller.isAttached()) {
-                        trackDestroyingController(transaction);
-                    }
-                    backstack.remove(transaction);
+            Iterator<RouterTransaction> iterator = backstack.iterator();
+            ControllerChangeHandler topPushHandler = topTransaction != null ? topTransaction.pushChangeHandler() : null;
+            final boolean needsNextTransactionAttach = topPushHandler != null ? !topPushHandler.removesFromViewOnPush() : false;
+
+            while (iterator.hasNext()) {
+                RouterTransaction transaction = iterator.next();
+                if (transaction.controller() == controller) {
+                    trackDestroyingController(transaction);
+                    iterator.remove();
                     removedTransaction = transaction;
                 } else if (removedTransaction != null) {
-                    if (!transaction.controller.isAttached()) {
+                    if (needsNextTransactionAttach && !transaction.controller().isAttached()) {
                         nextTransaction = transaction;
                     }
                     break;
@@ -201,7 +205,7 @@ public abstract class Router {
             final boolean oldHandlerRemovedViews = topTransaction.pushChangeHandler() == null || topTransaction.pushChangeHandler().removesFromViewOnPush();
             final boolean newHandlerRemovesViews = handler == null || handler.removesFromViewOnPush();
             if (!oldHandlerRemovedViews && newHandlerRemovesViews) {
-                for (RouterTransaction visibleTransaction : getVisibleTransactions(backstack.iterator())) {
+                for (RouterTransaction visibleTransaction : getVisibleTransactions(backstack.iterator(), true)) {
                     performControllerChange(null, visibleTransaction, true, handler);
                 }
             }
@@ -222,7 +226,7 @@ public abstract class Router {
 
         if (popViews && poppedControllers.size() > 0) {
             RouterTransaction topTransaction = poppedControllers.get(0);
-            topTransaction.controller().addLifecycleListener(new LifecycleListener() {
+            topTransaction.controller().addLifecycleListener(new Controller.LifecycleListener() {
                 @Override
                 public void onChangeEnd(@NonNull Controller controller, @NonNull ControllerChangeHandler changeHandler, @NonNull ControllerChangeType changeType) {
                     if (changeType == ControllerChangeType.POP_EXIT) {
@@ -342,7 +346,7 @@ public abstract class Router {
     @Nullable
     public Controller getControllerWithInstanceId(@NonNull String instanceId) {
         for (RouterTransaction transaction : backstack) {
-            Controller controllerWithId = transaction.controller.findController(instanceId);
+            Controller controllerWithId = transaction.controller().findController(instanceId);
             if (controllerWithId != null) {
                 return controllerWithId;
             }
@@ -360,7 +364,7 @@ public abstract class Router {
     public Controller getControllerWithTag(@NonNull String tag) {
         for (RouterTransaction transaction : backstack) {
             if (tag.equals(transaction.tag())) {
-                return transaction.controller;
+                return transaction.controller();
             }
         }
         return null;
@@ -379,7 +383,7 @@ public abstract class Router {
      */
     @NonNull
     public List<RouterTransaction> getBackstack() {
-        List<RouterTransaction> list = new ArrayList<>();
+        List<RouterTransaction> list = new ArrayList<>(backstack.size());
         Iterator<RouterTransaction> backstackIterator = backstack.reverseIterator();
         while (backstackIterator.hasNext()) {
             list.add(backstackIterator.next());
@@ -399,22 +403,45 @@ public abstract class Router {
     public void setBackstack(@NonNull List<RouterTransaction> newBackstack, @Nullable ControllerChangeHandler changeHandler) {
         ThreadUtils.ensureMainThread();
 
-        List<RouterTransaction> oldVisibleTransactions = getVisibleTransactions(backstack.iterator());
-
-        boolean newRootRequiresPush = !(newBackstack.size() > 0 && backstack.contains(newBackstack.get(0)));
+        List<RouterTransaction> oldTransactions = getBackstack();
+        List<RouterTransaction> oldVisibleTransactions = getVisibleTransactions(backstack.iterator(), false);
 
         removeAllExceptVisibleAndUnowned();
         ensureOrderedTransactionIndices(newBackstack);
+        ensureNoDuplicateControllers(newBackstack);
 
         backstack.setBackstack(newBackstack);
-        for (RouterTransaction transaction : backstack) {
+
+        List<RouterTransaction> transactionsToBeRemoved = new ArrayList<>();
+        for (RouterTransaction oldTransaction : oldTransactions) {
+            boolean contains = false;
+            for (RouterTransaction newTransaction : newBackstack) {
+                if (oldTransaction.controller() == newTransaction.controller()) {
+                    contains = true;
+                    break;
+                }
+            }
+
+            if (!contains) {
+                // Inform the controller that it will be destroyed soon
+                oldTransaction.controller().isBeingDestroyed = true;
+                transactionsToBeRemoved.add(oldTransaction);
+            }
+        }
+
+        // Ensure all new controllers have a valid router set
+        Iterator<RouterTransaction> backstackIterator = backstack.reverseIterator();
+        while (backstackIterator.hasNext()) {
+            RouterTransaction transaction = backstackIterator.next();
             transaction.onAttachedToRouter();
+            setRouterOnController(transaction.controller());
         }
 
         if (newBackstack.size() > 0) {
             List<RouterTransaction> reverseNewBackstack = new ArrayList<>(newBackstack);
             Collections.reverse(reverseNewBackstack);
-            List<RouterTransaction> newVisibleTransactions = getVisibleTransactions(reverseNewBackstack.iterator());
+            List<RouterTransaction> newVisibleTransactions = getVisibleTransactions(reverseNewBackstack.iterator(), false);
+            boolean newRootRequiresPush = !(newVisibleTransactions.size() > 0 && oldTransactions.contains(newVisibleTransactions.get(0)));
 
             boolean visibleTransactionsChanged = !backstacksAreEqual(newVisibleTransactions, oldVisibleTransactions);
             if (visibleTransactionsChanged) {
@@ -422,10 +449,10 @@ public abstract class Router {
                 RouterTransaction newRootTransaction = newVisibleTransactions.get(0);
 
                 // Replace the old root with the new one
-                if (oldRootTransaction == null || oldRootTransaction.controller != newRootTransaction.controller) {
+                if (oldRootTransaction == null || oldRootTransaction.controller() != newRootTransaction.controller()) {
                     // Ensure the existing root controller is fully pushed to the view hierarchy
                     if (oldRootTransaction != null) {
-                        ControllerChangeHandler.completeHandlerImmediately(oldRootTransaction.controller.getInstanceId());
+                        ControllerChangeHandler.completeHandlerImmediately(oldRootTransaction.controller().getInstanceId());
                     }
                     performControllerChange(newRootTransaction, oldRootTransaction, newRootRequiresPush, changeHandler);
                 }
@@ -436,8 +463,11 @@ public abstract class Router {
                     if (!newVisibleTransactions.contains(transaction)) {
                         ControllerChangeHandler localHandler = changeHandler != null ? changeHandler.copy() : new SimpleSwapChangeHandler();
                         localHandler.setForceRemoveViewOnPush(true);
-                        ControllerChangeHandler.completeHandlerImmediately(transaction.controller.getInstanceId());
-                        performControllerChange(null, transaction, newRootRequiresPush, localHandler);
+                        ControllerChangeHandler.completeHandlerImmediately(transaction.controller().getInstanceId());
+
+                        if (transaction.controller().view != null) {
+                            performControllerChange(null, transaction, newRootRequiresPush, localHandler);
+                        }
                     }
                 }
 
@@ -450,9 +480,31 @@ public abstract class Router {
                 }
             }
 
-            // Ensure all new controllers have a valid router set
-            for (RouterTransaction transaction : newBackstack) {
-                transaction.controller.setRouter(this);
+        } else {
+            // Remove all visible controllers that were previously on the backstack
+            for (int i = oldVisibleTransactions.size() - 1; i >= 0; i--) {
+                RouterTransaction transaction = oldVisibleTransactions.get(i);
+                ControllerChangeHandler localHandler = changeHandler != null ? changeHandler.copy() : new SimpleSwapChangeHandler();
+                ControllerChangeHandler.completeHandlerImmediately(transaction.controller().getInstanceId());
+                performControllerChange(null, transaction, false, localHandler);
+            }
+        }
+
+        // Destroy all old controllers that are no longer on the backstack. We don't do this when we initially
+        // set the backstack to prevent the possibility that they'll be destroyed before the controller
+        // change handler runs.
+        for (RouterTransaction removedTransaction : transactionsToBeRemoved) {
+
+            // Still need to ensure the controller isn't queued up to be removed later on.
+            boolean willBeRemoved = false;
+            for (ChangeTransaction pendingTransaction : pendingControllerChanges) {
+                if (pendingTransaction.from == removedTransaction.controller()) {
+                    willBeRemoved = true;
+                }
+            }
+
+            if (!willBeRemoved) {
+                removedTransaction.controller().destroy();
             }
         }
     }
@@ -497,8 +549,10 @@ public abstract class Router {
         while (backstackIterator.hasNext()) {
             RouterTransaction transaction = backstackIterator.next();
 
-            if (transaction.controller.getNeedsAttach()) {
+            if (transaction.controller().getNeedsAttach()) {
                 performControllerChange(transaction, null, true, new SimpleSwapChangeHandler(false));
+            } else {
+                setRouterOnController(transaction.controller());
             }
         }
     }
@@ -511,10 +565,12 @@ public abstract class Router {
     }
 
     public final void onActivityStarted(@NonNull Activity activity) {
-        for (RouterTransaction transaction : backstack) {
-            transaction.controller.activityStarted(activity);
+        isActivityStopped = false;
 
-            for (Router childRouter : transaction.controller.getChildRouters()) {
+        for (RouterTransaction transaction : backstack) {
+            transaction.controller().activityStarted(activity);
+
+            for (Router childRouter : transaction.controller().getChildRouters()) {
                 childRouter.onActivityStarted(activity);
             }
         }
@@ -522,9 +578,9 @@ public abstract class Router {
 
     public final void onActivityResumed(@NonNull Activity activity) {
         for (RouterTransaction transaction : backstack) {
-            transaction.controller.activityResumed(activity);
+            transaction.controller().activityResumed(activity);
 
-            for (Router childRouter : transaction.controller.getChildRouters()) {
+            for (Router childRouter : transaction.controller().getChildRouters()) {
                 childRouter.onActivityResumed(activity);
             }
         }
@@ -532,9 +588,9 @@ public abstract class Router {
 
     public final void onActivityPaused(@NonNull Activity activity) {
         for (RouterTransaction transaction : backstack) {
-            transaction.controller.activityPaused(activity);
+            transaction.controller().activityPaused(activity);
 
-            for (Router childRouter : transaction.controller.getChildRouters()) {
+            for (Router childRouter : transaction.controller().getChildRouters()) {
                 childRouter.onActivityPaused(activity);
             }
         }
@@ -542,23 +598,25 @@ public abstract class Router {
 
     public final void onActivityStopped(@NonNull Activity activity) {
         for (RouterTransaction transaction : backstack) {
-            transaction.controller.activityStopped(activity);
+            transaction.controller().activityStopped(activity);
 
-            for (Router childRouter : transaction.controller.getChildRouters()) {
+            for (Router childRouter : transaction.controller().getChildRouters()) {
                 childRouter.onActivityStopped(activity);
             }
         }
+
+        isActivityStopped = true;
     }
 
-    public void onActivityDestroyed(@NonNull Activity activity) {
+    public void onActivityDestroyed(@NonNull Activity activity, boolean isConfigurationChange) {
         prepareForContainerRemoval();
         changeListeners.clear();
 
         for (RouterTransaction transaction : backstack) {
-            transaction.controller.activityDestroyed(activity);
+            transaction.controller().activityDestroyed(activity);
 
-            for (Router childRouter : transaction.controller.getChildRouters()) {
-                childRouter.onActivityDestroyed(activity);
+            for (Router childRouter : transaction.controller().getChildRouters()) {
+                childRouter.onActivityDestroyed(activity, isConfigurationChange);
             }
         }
 
@@ -567,25 +625,26 @@ public abstract class Router {
             controller.activityDestroyed(activity);
 
             for (Router childRouter : controller.getChildRouters()) {
-                childRouter.onActivityDestroyed(activity);
+                childRouter.onActivityDestroyed(activity, isConfigurationChange);
             }
         }
 
         container = null;
     }
 
-    void prepareForHostDetach() {
+    public void prepareForHostDetach() {
+        pendingControllerChanges.clear(); // rely on backstack based restoration in rebindIfNeeded
+
         for (RouterTransaction transaction : backstack) {
-            if (ControllerChangeHandler.completeHandlerImmediately(transaction.controller.getInstanceId())) {
-                transaction.controller.setNeedsAttach(true);
+            if (ControllerChangeHandler.completeHandlerImmediately(transaction.controller().getInstanceId())) {
+                transaction.controller().setNeedsAttach(true);
             }
-            transaction.controller.prepareForHostDetach();
+
+            transaction.controller().prepareForHostDetach();
         }
     }
 
     public void saveInstanceState(@NonNull Bundle outState) {
-        prepareForHostDetach();
-
         Bundle backstackState = new Bundle();
         backstack.saveInstanceState(backstackState);
 
@@ -601,15 +660,15 @@ public abstract class Router {
 
         Iterator<RouterTransaction> backstackIterator = backstack.reverseIterator();
         while (backstackIterator.hasNext()) {
-            setControllerRouter(backstackIterator.next().controller);
+            setRouterOnController(backstackIterator.next().controller());
         }
     }
 
     public final void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
         for (RouterTransaction transaction : backstack) {
-            transaction.controller.createOptionsMenu(menu, inflater);
+            transaction.controller().createOptionsMenu(menu, inflater);
 
-            for (Router childRouter : transaction.controller.getChildRouters()) {
+            for (Router childRouter : transaction.controller().getChildRouters()) {
                 childRouter.onCreateOptionsMenu(menu, inflater);
             }
         }
@@ -617,9 +676,9 @@ public abstract class Router {
 
     public final void onPrepareOptionsMenu(@NonNull Menu menu) {
         for (RouterTransaction transaction : backstack) {
-            transaction.controller.prepareOptionsMenu(menu);
+            transaction.controller().prepareOptionsMenu(menu);
 
-            for (Router childRouter : transaction.controller.getChildRouters()) {
+            for (Router childRouter : transaction.controller().getChildRouters()) {
                 childRouter.onPrepareOptionsMenu(menu);
             }
         }
@@ -627,11 +686,11 @@ public abstract class Router {
 
     public final boolean onOptionsItemSelected(@NonNull MenuItem item) {
         for (RouterTransaction transaction : backstack) {
-            if (transaction.controller.optionsItemSelected(item)) {
+            if (transaction.controller().optionsItemSelected(item)) {
                 return true;
             }
 
-            for (Router childRouter : transaction.controller.getChildRouters()) {
+            for (Router childRouter : transaction.controller().getChildRouters()) {
                 if (childRouter.onOptionsItemSelected(item)) {
                     return true;
                 }
@@ -682,17 +741,17 @@ public abstract class Router {
 
     void onContextAvailable() {
         for (RouterTransaction transaction : backstack) {
-            transaction.controller.onContextAvailable();
+            transaction.controller().onContextAvailable();
         }
     }
 
     @NonNull
     final List<Controller> getControllers() {
-        List<Controller> controllers = new ArrayList<>();
+        List<Controller> controllers = new ArrayList<>(backstack.size());
 
         Iterator<RouterTransaction> backstackIterator = backstack.reverseIterator();
         while (backstackIterator.hasNext()) {
-            controllers.add(backstackIterator.next().controller);
+            controllers.add(backstackIterator.next().controller());
         }
 
         return controllers;
@@ -701,14 +760,14 @@ public abstract class Router {
     @Nullable
     public final Boolean handleRequestedPermission(@NonNull String permission) {
         for (RouterTransaction transaction : backstack) {
-            if (transaction.controller.didRequestPermission(permission)) {
-                return transaction.controller.shouldShowRequestPermissionRationale(permission);
+            if (transaction.controller().didRequestPermission(permission)) {
+                return transaction.controller().shouldShowRequestPermissionRationale(permission);
             }
         }
         return null;
     }
 
-    private void performControllerChange(@Nullable RouterTransaction to, @Nullable RouterTransaction from, boolean isPush) {
+    void performControllerChange(@Nullable RouterTransaction to, @Nullable RouterTransaction from, boolean isPush) {
         if (isPush && to != null) {
             to.onAttachedToRouter();
         }
@@ -727,24 +786,32 @@ public abstract class Router {
     }
 
     private void performControllerChange(@Nullable RouterTransaction to, @Nullable RouterTransaction from, boolean isPush, @Nullable ControllerChangeHandler changeHandler) {
-        Controller toController = to != null ? to.controller : null;
-        Controller fromController = from != null ? from.controller : null;
+        Controller toController = to != null ? to.controller() : null;
+        Controller fromController = from != null ? from.controller() : null;
         boolean forceDetachDestroy = false;
 
         if (to != null) {
             to.ensureValidIndex(getTransactionIndexer());
-            setControllerRouter(toController);
+            setRouterOnController(toController);
         } else if (backstack.size() == 0 && !popsLastView) {
             // We're emptying out the backstack. Views get weird if you transition them out, so just no-op it. The host
             // Activity or controller should be handling this by finishing or at least hiding this view.
             changeHandler = new NoOpControllerChangeHandler();
             forceDetachDestroy = true;
+        } else if (!isPush && fromController != null && !fromController.isAttached()) {
+            // We're popping fromController from the middle of the backstack,
+            // need to do it immediately and destroy the controller
+            forceDetachDestroy = true;
         }
 
         performControllerChange(toController, fromController, isPush, changeHandler);
 
-        if (forceDetachDestroy && fromController != null && fromController.getView() != null) {
-            fromController.detach(fromController.getView(), true, false);
+        if (forceDetachDestroy && fromController != null) {
+            if (fromController.getView() != null) {
+                fromController.detach(fromController.getView(), true, false);
+            } else {
+                fromController.destroy();
+            }
         }
     }
 
@@ -753,16 +820,22 @@ public abstract class Router {
             throw new IllegalStateException("Trying to push a controller that has already been destroyed. (" + to.getClass().getSimpleName() + ")");
         }
 
-        final ChangeTransaction transaction = new ChangeTransaction(to, from, isPush, container, changeHandler, changeListeners);
+        final ChangeTransaction transaction = new ChangeTransaction(to, from, isPush, container, changeHandler, new ArrayList<>(changeListeners));
 
         if (pendingControllerChanges.size() > 0) {
             // If we already have changes queued up (awaiting full container attach), queue this one up as well so they don't happen
             // out of order.
+            if (to != null) {
+                to.setNeedsAttach(true);
+            }
             pendingControllerChanges.add(transaction);
         } else if (from != null && (changeHandler == null || changeHandler.removesFromViewOnPush()) && !containerFullyAttached) {
             // If the change handler will remove the from view, we have to make sure the container is fully attached first so we avoid NPEs
             // within ViewGroup (details on issue #287). Post this to the container to ensure the attach is complete before we try to remove
             // anything.
+            if (to != null) {
+                to.setNeedsAttach(true);
+            }
             pendingControllerChanges.add(transaction);
             container.post(new Runnable() {
                 @Override
@@ -785,14 +858,17 @@ public abstract class Router {
     }
 
     protected void pushToBackstack(@NonNull RouterTransaction entry) {
+        if (backstack.contains(entry.controller())) {
+            throw new IllegalStateException("Trying to push a controller that already exists on the backstack.");
+        }
         backstack.push(entry);
     }
 
     private void trackDestroyingController(@NonNull RouterTransaction transaction) {
-        if (!transaction.controller.isDestroyed()) {
-            destroyingControllers.add(transaction.controller);
+        if (!transaction.controller().isDestroyed()) {
+            destroyingControllers.add(transaction.controller());
 
-            transaction.controller.addLifecycleListener(new LifecycleListener() {
+            transaction.controller().addLifecycleListener(new Controller.LifecycleListener() {
                 @Override
                 public void postDestroy(@NonNull Controller controller) {
                     destroyingControllers.remove(controller);
@@ -810,9 +886,9 @@ public abstract class Router {
     private void removeAllExceptVisibleAndUnowned() {
         List<View> views = new ArrayList<>();
 
-        for (RouterTransaction transaction : getVisibleTransactions(backstack.iterator())) {
-            if (transaction.controller.getView() != null) {
-                views.add(transaction.controller.getView());
+        for (RouterTransaction transaction : getVisibleTransactions(backstack.iterator(), false)) {
+            if (transaction.controller().getView() != null) {
+                views.add(transaction.controller().getView());
             }
         }
 
@@ -823,7 +899,7 @@ public abstract class Router {
         }
 
         final int childCount = container.getChildCount();
-        for (int i = 0; i < childCount; i++) {
+        for (int i = childCount - 1; i >= 0; i--) {
             final View child = container.getChildAt(i);
             if (!views.contains(child)) {
                 container.removeView(child);
@@ -831,19 +907,30 @@ public abstract class Router {
         }
     }
 
-    // Swap around transaction indicies to ensure they don't get thrown out of order by the
+    // Swap around transaction indices to ensure they don't get thrown out of order by the
     // developer rearranging the backstack at runtime.
     private void ensureOrderedTransactionIndices(List<RouterTransaction> backstack) {
-        List<Integer> indices = new ArrayList<>();
+        List<Integer> indices = new ArrayList<>(backstack.size());
         for (RouterTransaction transaction : backstack) {
             transaction.ensureValidIndex(getTransactionIndexer());
-            indices.add(transaction.transactionIndex);
+            indices.add(transaction.getTransactionIndex());
         }
 
         Collections.sort(indices);
 
         for (int i = 0; i < backstack.size(); i++) {
-            backstack.get(i).transactionIndex = indices.get(i);
+            backstack.get(i).setTransactionIndex(indices.get(i));
+        }
+    }
+
+    private void ensureNoDuplicateControllers(List<RouterTransaction> backstack) {
+        for (int i = 0; i < backstack.size(); i++) {
+            Controller controller = backstack.get(i).controller();
+            for (int j = i + 1; j < backstack.size(); j++) {
+                if (backstack.get(j).controller() == controller) {
+                    throw new IllegalStateException("Trying to push the same controller to the backstack more than once.");
+                }
+            }
         }
     }
 
@@ -859,14 +946,20 @@ public abstract class Router {
         }
     }
 
-    private List<RouterTransaction> getVisibleTransactions(@NonNull Iterator<RouterTransaction> backstackIterator) {
+    private List<RouterTransaction> getVisibleTransactions(@NonNull Iterator<RouterTransaction> backstackIterator, boolean onlyTop) {
+        boolean visible = true;
+
         List<RouterTransaction> transactions = new ArrayList<>();
         while (backstackIterator.hasNext()) {
             RouterTransaction transaction = backstackIterator.next();
-            transactions.add(transaction);
 
-            //noinspection ConstantConditions
-            if (transaction.pushChangeHandler() == null || transaction.pushChangeHandler().removesFromViewOnPush()) {
+            if (visible) {
+                transactions.add(transaction);
+            }
+
+            visible = transaction.pushChangeHandler() != null && !transaction.pushChangeHandler().removesFromViewOnPush();
+
+            if (onlyTop && !visible) {
                 break;
             }
         }
@@ -889,7 +982,7 @@ public abstract class Router {
         return true;
     }
 
-    void setControllerRouter(@NonNull Controller controller) {
+    void setRouterOnController(@NonNull Controller controller) {
         controller.setRouter(this);
         controller.onContextAvailable();
     }
@@ -906,6 +999,6 @@ public abstract class Router {
     abstract boolean hasHost();
     @NonNull abstract List<Router> getSiblingRouters();
     @NonNull abstract Router getRootRouter();
-    @Nullable abstract TransactionIndexer getTransactionIndexer();
+    @NonNull abstract TransactionIndexer getTransactionIndexer();
 
 }

conductor/src/main/java/com/bluelinelabs/conductor/RouterTransaction.java

@@ -1,143 +0,0 @@
-package com.bluelinelabs.conductor;
-
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
-import com.bluelinelabs.conductor.internal.TransactionIndexer;
-
-/**
- * Metadata used for adding {@link Controller}s to a {@link Router}.
- */
-public class RouterTransaction {
-
-    private static int INVALID_INDEX = -1;
-
-    private static final String KEY_VIEW_CONTROLLER_BUNDLE = "RouterTransaction.controller.bundle";
-    private static final String KEY_PUSH_TRANSITION = "RouterTransaction.pushControllerChangeHandler";
-    private static final String KEY_POP_TRANSITION = "RouterTransaction.popControllerChangeHandler";
-    private static final String KEY_TAG = "RouterTransaction.tag";
-    private static final String KEY_INDEX = "RouterTransaction.transactionIndex";
-    private static final String KEY_ATTACHED_TO_ROUTER = "RouterTransaction.attachedToRouter";
-
-    @NonNull final Controller controller;
-    private String tag;
-
-    private ControllerChangeHandler pushControllerChangeHandler;
-    private ControllerChangeHandler popControllerChangeHandler;
-    private boolean attachedToRouter;
-    int transactionIndex = INVALID_INDEX;
-
-    @NonNull
-    public static RouterTransaction with(@NonNull Controller controller) {
-        return new RouterTransaction(controller);
-    }
-
-    private RouterTransaction(@NonNull Controller controller) {
-        this.controller = controller;
-    }
-
-    RouterTransaction(@NonNull Bundle bundle) {
-        controller = Controller.newInstance(bundle.getBundle(KEY_VIEW_CONTROLLER_BUNDLE));
-        pushControllerChangeHandler = ControllerChangeHandler.fromBundle(bundle.getBundle(KEY_PUSH_TRANSITION));
-        popControllerChangeHandler = ControllerChangeHandler.fromBundle(bundle.getBundle(KEY_POP_TRANSITION));
-        tag = bundle.getString(KEY_TAG);
-        transactionIndex = bundle.getInt(KEY_INDEX);
-        attachedToRouter = bundle.getBoolean(KEY_ATTACHED_TO_ROUTER);
-    }
-
-    void onAttachedToRouter() {
-        attachedToRouter = true;
-    }
-
-    @NonNull
-    public Controller controller() {
-        return controller;
-    }
-
-    @Nullable
-    public String tag() {
-        return tag;
-    }
-
-    @NonNull
-    public RouterTransaction tag(@Nullable String tag) {
-        if (!attachedToRouter) {
-            this.tag = tag;
-            return this;
-        } else {
-            throw new RuntimeException(getClass().getSimpleName() + "s can not be modified after being added to a Router.");
-        }
-    }
-
-    @Nullable
-    public ControllerChangeHandler pushChangeHandler() {
-        ControllerChangeHandler handler = controller.getOverriddenPushHandler();
-        if (handler == null) {
-            handler = pushControllerChangeHandler;
-        }
-        return handler;
-    }
-
-    @NonNull
-    public RouterTransaction pushChangeHandler(@Nullable ControllerChangeHandler handler) {
-        if (!attachedToRouter) {
-            pushControllerChangeHandler = handler;
-            return this;
-        } else {
-            throw new RuntimeException(getClass().getSimpleName() + "s can not be modified after being added to a Router.");
-        }
-    }
-
-    @Nullable
-    public ControllerChangeHandler popChangeHandler() {
-        ControllerChangeHandler handler = controller.getOverriddenPopHandler();
-        if (handler == null) {
-            handler = popControllerChangeHandler;
-        }
-        return handler;
-    }
-
-    @NonNull
-    public RouterTransaction popChangeHandler(@Nullable ControllerChangeHandler handler) {
-        if (!attachedToRouter) {
-            popControllerChangeHandler = handler;
-            return this;
-        } else {
-            throw new RuntimeException(getClass().getSimpleName() + "s can not be modified after being added to a Router.");
-        }
-    }
-
-    void ensureValidIndex(@Nullable TransactionIndexer indexer) {
-        if (indexer == null) {
-            throw new RuntimeException();
-        }
-        if (transactionIndex == INVALID_INDEX && indexer != null) {
-            transactionIndex = indexer.nextIndex();
-        }
-    }
-
-    /**
-     * Used to serialize this transaction into a Bundle
-     */
-    @NonNull
-    public Bundle saveInstanceState() {
-        Bundle bundle = new Bundle();
-
-        bundle.putBundle(KEY_VIEW_CONTROLLER_BUNDLE, controller.saveInstanceState());
-
-        if (pushControllerChangeHandler != null) {
-            bundle.putBundle(KEY_PUSH_TRANSITION, pushControllerChangeHandler.toBundle());
-        }
-        if (popControllerChangeHandler != null) {
-            bundle.putBundle(KEY_POP_TRANSITION, popControllerChangeHandler.toBundle());
-        }
-
-        bundle.putString(KEY_TAG, tag);
-        bundle.putInt(KEY_INDEX, transactionIndex);
-        bundle.putBoolean(KEY_ATTACHED_TO_ROUTER, attachedToRouter);
-
-        return bundle;
-    }
-
-}

conductor/src/main/java/com/bluelinelabs/conductor/RouterTransaction.kt

@@ -0,0 +1,124 @@
+package com.bluelinelabs.conductor
+
+import android.os.Bundle
+import androidx.annotation.RestrictTo
+import androidx.annotation.RestrictTo.Scope.LIBRARY
+import com.bluelinelabs.conductor.internal.TransactionIndexer
+
+private const val INVALID_INDEX = -1
+private const val KEY_VIEW_CONTROLLER_BUNDLE = "RouterTransaction.controller.bundle"
+private const val KEY_PUSH_TRANSITION = "RouterTransaction.pushControllerChangeHandler"
+private const val KEY_POP_TRANSITION = "RouterTransaction.popControllerChangeHandler"
+private const val KEY_TAG = "RouterTransaction.tag"
+private const val KEY_INDEX = "RouterTransaction.transactionIndex"
+private const val KEY_ATTACHED_TO_ROUTER = "RouterTransaction.attachedToRouter"
+
+/**
+ * Metadata used for adding [Controller]s to a [Router].
+ */
+class RouterTransaction
+private constructor(
+  @get:JvmName("controller")
+  val controller: Controller,
+  private var tag: String? = null,
+  private var pushControllerChangeHandler: ControllerChangeHandler? = null,
+  private var popControllerChangeHandler: ControllerChangeHandler? = null,
+  private var attachedToRouter: Boolean = false,
+  @get:RestrictTo(LIBRARY)
+  @set:RestrictTo(LIBRARY)
+  var transactionIndex: Int = INVALID_INDEX
+) {
+
+
+  @RestrictTo(LIBRARY)
+  internal constructor(bundle: Bundle) : this(
+    controller = Controller.newInstance(bundle.getBundle(KEY_VIEW_CONTROLLER_BUNDLE)!!),
+    pushControllerChangeHandler = ControllerChangeHandler.fromBundle(
+      bundle.getBundle(
+        KEY_PUSH_TRANSITION
+      )
+    ),
+    popControllerChangeHandler = ControllerChangeHandler.fromBundle(
+      bundle.getBundle(
+        KEY_POP_TRANSITION
+      )
+    ),
+    tag = bundle.getString(KEY_TAG),
+    transactionIndex = bundle.getInt(KEY_INDEX),
+    attachedToRouter = bundle.getBoolean(KEY_ATTACHED_TO_ROUTER)
+  )
+
+  fun onAttachedToRouter() {
+    attachedToRouter = true
+  }
+
+  fun tag(): String? = tag
+
+  fun tag(tag: String?): RouterTransaction {
+    return if (!attachedToRouter) {
+      this.tag = tag
+      this
+    } else {
+      throw RuntimeException(javaClass.simpleName + "s can not be modified after being added to a Router.")
+    }
+  }
+
+  fun pushChangeHandler(): ControllerChangeHandler? {
+    return controller.overriddenPushHandler ?: pushControllerChangeHandler
+  }
+
+  fun pushChangeHandler(handler: ControllerChangeHandler?): RouterTransaction {
+    return if (!attachedToRouter) {
+      pushControllerChangeHandler = handler
+      this
+    } else {
+      throw RuntimeException("${javaClass.simpleName}s can not be modified after being added to a Router.")
+    }
+  }
+
+  fun popChangeHandler(): ControllerChangeHandler? {
+    return controller.overriddenPopHandler ?: popControllerChangeHandler
+  }
+
+  fun popChangeHandler(handler: ControllerChangeHandler?): RouterTransaction {
+    return if (!attachedToRouter) {
+      popControllerChangeHandler = handler
+      this
+    } else {
+      throw RuntimeException("${javaClass.simpleName}s can not be modified after being added to a Router.")
+    }
+  }
+
+  fun ensureValidIndex(indexer: TransactionIndexer) {
+    if (transactionIndex == INVALID_INDEX) {
+      transactionIndex = indexer.nextIndex()
+    }
+  }
+
+  /**
+   * Used to serialize this transaction into a Bundle
+   */
+  fun saveInstanceState(): Bundle = Bundle().apply {
+    putBundle(KEY_VIEW_CONTROLLER_BUNDLE, controller.saveInstanceState())
+    pushControllerChangeHandler?.let { putBundle(KEY_PUSH_TRANSITION, it.toBundle()) }
+    popControllerChangeHandler?.let { putBundle(KEY_POP_TRANSITION, it.toBundle()) }
+    putString(KEY_TAG, tag)
+    putInt(KEY_INDEX, transactionIndex)
+    putBoolean(KEY_ATTACHED_TO_ROUTER, attachedToRouter)
+  }
+
+  companion object {
+
+    @JvmStatic
+    fun with(controller: Controller): RouterTransaction = RouterTransaction(controller)
+  }
+}
+
+fun Controller.asTransaction(
+  popChangeHandler: ControllerChangeHandler? = null,
+  pushChangeHandler: ControllerChangeHandler? = null
+): RouterTransaction {
+  return RouterTransaction.with(this)
+    .pushChangeHandler(pushChangeHandler)
+    .popChangeHandler(popChangeHandler)
+}

conductor/src/main/java/com/bluelinelabs/conductor/changehandler/AnimatorChangeHandler.java

@@ -4,8 +4,8 @@ import android.animation.Animator;
 import android.animation.Animator.AnimatorListener;
 import android.animation.AnimatorListenerAdapter;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
@@ -25,11 +25,11 @@ public abstract class AnimatorChangeHandler extends ControllerChangeHandler {
     public static final long DEFAULT_ANIMATION_DURATION = -1;
 
     private long animationDuration;
-    private boolean removesFromViewOnPush;
-    private boolean canceled;
-    private boolean needsImmediateCompletion;
+    boolean removesFromViewOnPush;
+    boolean canceled;
+    boolean needsImmediateCompletion;
     private boolean completed;
-    private Animator animator;
+    Animator animator;
     private OnAnimationReadyOrAbortedListener onAnimationReadyOrAbortedListener;
 
     @SuppressWarnings("WeakerAccess")
@@ -140,7 +140,7 @@ public abstract class AnimatorChangeHandler extends ControllerChangeHandler {
         }
     }
 
-    private void complete(@NonNull ControllerChangeCompletedListener changeListener, @Nullable AnimatorListener animatorListener) {
+    void complete(@NonNull ControllerChangeCompletedListener changeListener, @Nullable AnimatorListener animatorListener) {
         if (!completed) {
             completed = true;
             changeListener.onChangeCompleted();
@@ -157,7 +157,7 @@ public abstract class AnimatorChangeHandler extends ControllerChangeHandler {
         onAnimationReadyOrAbortedListener = null;
     }
 
-    private void performAnimation(@NonNull final ViewGroup container, @Nullable final View from, @Nullable final View to, final boolean isPush, final boolean toAddedToContainer, @NonNull final ControllerChangeCompletedListener changeListener) {
+    void performAnimation(@NonNull final ViewGroup container, @Nullable final View from, @Nullable final View to, final boolean isPush, final boolean toAddedToContainer, @NonNull final ControllerChangeCompletedListener changeListener) {
         if (canceled) {
             complete(changeListener, null);
             return;
@@ -182,8 +182,12 @@ public abstract class AnimatorChangeHandler extends ControllerChangeHandler {
         animator.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationCancel(Animator animation) {
-                if (from != null && (!isPush || removesFromViewOnPush) && needsImmediateCompletion) {
-                    container.removeView(from);
+                if (from != null) {
+                    resetFromView(from);
+                }
+
+                if (to != null && to.getParent() == container) {
+                    container.removeView(to);
                 }
 
                 complete(changeListener, this);

conductor/src/main/java/com/bluelinelabs/conductor/changehandler/AutoTransitionChangeHandler.java

@@ -1,30 +0,0 @@
-package com.bluelinelabs.conductor.changehandler;
-
-import android.annotation.TargetApi;
-import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.transition.AutoTransition;
-import android.transition.Transition;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.bluelinelabs.conductor.ControllerChangeHandler;
-
-/**
- * A change handler that will use an AutoTransition.
- */
-@TargetApi(Build.VERSION_CODES.LOLLIPOP)
-public class AutoTransitionChangeHandler extends TransitionChangeHandler {
-
-    @Override @NonNull
-    protected Transition getTransition(@NonNull ViewGroup container, @Nullable View from, @Nullable View to, boolean isPush) {
-        return new AutoTransition();
-    }
-
-    @Override @NonNull
-    public ControllerChangeHandler copy() {
-        return new AutoTransitionChangeHandler();
-    }
-
-}

conductor/src/main/java/com/bluelinelabs/conductor/changehandler/FadeChangeHandler.java

@@ -3,8 +3,8 @@ package com.bluelinelabs.conductor.changehandler;
 import android.animation.Animator;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 

conductor/src/main/java/com/bluelinelabs/conductor/changehandler/HorizontalChangeHandler.java

@@ -3,8 +3,8 @@ package com.bluelinelabs.conductor.changehandler;
 import android.animation.Animator;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 

conductor/src/main/java/com/bluelinelabs/conductor/changehandler/SimpleSwapChangeHandler.java

@@ -1,8 +1,8 @@
 package com.bluelinelabs.conductor.changehandler;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.view.View.OnAttachStateChangeListener;
 import android.view.ViewGroup;

conductor/src/main/java/com/bluelinelabs/conductor/changehandler/TransitionChangeHandlerCompat.java

@@ -1,97 +0,0 @@
-package com.bluelinelabs.conductor.changehandler;
-
-import android.os.Build;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.bluelinelabs.conductor.Controller;
-import com.bluelinelabs.conductor.ControllerChangeHandler;
-import com.bluelinelabs.conductor.internal.ClassUtils;
-
-/**
- * A base {@link ControllerChangeHandler} that facilitates using {@link android.transition.Transition}s to replace Controller Views.
- * If the target device is running on a version of Android that doesn't support transitions, a fallback {@link ControllerChangeHandler} will be used.
- */
-public class TransitionChangeHandlerCompat extends ControllerChangeHandler {
-
-    private static final String KEY_CHANGE_HANDLER_CLASS = "TransitionChangeHandlerCompat.changeHandler.class";
-    private static final String KEY_HANDLER_STATE = "TransitionChangeHandlerCompat.changeHandler.state";
-
-    private ControllerChangeHandler changeHandler;
-
-    public TransitionChangeHandlerCompat() { }
-
-    /**
-     * Constructor that takes a {@link TransitionChangeHandler} for use with compatible devices, as well as a fallback
-     * {@link ControllerChangeHandler} for use with older devices.
-     *
-     * @param transitionChangeHandler The change handler that will be used on API 21 and above
-     * @param fallbackChangeHandler The change handler that will be used on APIs below 21
-     */
-    public TransitionChangeHandlerCompat(@NonNull TransitionChangeHandler transitionChangeHandler, @NonNull ControllerChangeHandler fallbackChangeHandler) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            changeHandler = transitionChangeHandler;
-        } else {
-            changeHandler = fallbackChangeHandler;
-        }
-    }
-
-    @Override
-    public void performChange(@NonNull final ViewGroup container, @Nullable View from, @Nullable View to, boolean isPush, @NonNull final ControllerChangeCompletedListener changeListener) {
-        changeHandler.performChange(container, from, to, isPush, changeListener);
-    }
-
-    @Override
-    public void saveToBundle(@NonNull Bundle bundle) {
-        super.saveToBundle(bundle);
-
-        bundle.putString(KEY_CHANGE_HANDLER_CLASS, changeHandler.getClass().getName());
-
-        Bundle stateBundle = new Bundle();
-        changeHandler.saveToBundle(stateBundle);
-        bundle.putBundle(KEY_HANDLER_STATE, stateBundle);
-    }
-
-    @Override
-    public void restoreFromBundle(@NonNull Bundle bundle) {
-        super.restoreFromBundle(bundle);
-
-        String className = bundle.getString(KEY_CHANGE_HANDLER_CLASS);
-        changeHandler = ClassUtils.newInstance(className);
-        //noinspection ConstantConditions
-        changeHandler.restoreFromBundle(bundle.getBundle(KEY_HANDLER_STATE));
-    }
-
-    @Override
-    public boolean removesFromViewOnPush() {
-        return changeHandler.removesFromViewOnPush();
-    }
-
-    @Override @NonNull
-    public ControllerChangeHandler copy() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            return new TransitionChangeHandlerCompat((TransitionChangeHandler)changeHandler.copy(), null);
-        } else {
-            return new TransitionChangeHandlerCompat(null, changeHandler.copy());
-        }
-    }
-
-    @Override
-    public void onAbortPush(@NonNull ControllerChangeHandler newHandler, @Nullable Controller newTop) {
-        changeHandler.onAbortPush(newHandler, newTop);
-    }
-
-    @Override
-    public void completeImmediately() {
-        changeHandler.completeImmediately();
-    }
-
-    @Override
-    public void setForceRemoveViewOnPush(boolean force) {
-        changeHandler.setForceRemoveViewOnPush(force);
-    }
-
-}

conductor/src/main/java/com/bluelinelabs/conductor/changehandler/VerticalChangeHandler.java

@@ -3,8 +3,8 @@ package com.bluelinelabs.conductor.changehandler;
 import android.animation.Animator;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 

conductor/src/main/java/com/bluelinelabs/conductor/internal/ClassUtils.java

@@ -1,7 +1,7 @@
 package com.bluelinelabs.conductor.internal;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 public class ClassUtils {

conductor/src/main/java/com/bluelinelabs/conductor/internal/LifecycleHandler.java

@@ -11,14 +11,15 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.SparseArray;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.bluelinelabs.conductor.ActivityHostedRouter;
 import com.bluelinelabs.conductor.Router;
 
@@ -40,6 +41,7 @@ public class LifecycleHandler extends Fragment implements ActivityLifecycleCallb
     private boolean hasRegisteredCallbacks;
     private boolean destroyed;
     private boolean attached;
+    private boolean hasPreparedForHostDetach;
 
     private static final Map<Activity, LifecycleHandler> activeLifecycleHandlers = new HashMap<>();
     private SparseArray<String> permissionRequestMap = new SparseArray<>();
@@ -157,14 +159,16 @@ public class LifecycleHandler extends Fragment implements ActivityLifecycleCallb
         if (activity != null) {
             activity.getApplication().unregisterActivityLifecycleCallbacks(this);
             activeLifecycleHandlers.remove(activity);
-            destroyRouters();
+            destroyRouters(false);
             activity = null;
         }
+
+        routerMap.clear();
     }
 
-    @SuppressWarnings("deprecation")
     @Override
     public void onAttach(Activity activity) {
+        this.activity = activity;
         super.onAttach(activity);
         destroyed = false;
         setAttached();
@@ -172,6 +176,10 @@ public class LifecycleHandler extends Fragment implements ActivityLifecycleCallb
 
     @Override
     public void onAttach(Context context) {
+        if (context instanceof Activity) {
+            this.activity = (Activity) context;
+        }
+
         super.onAttach(context);
         destroyed = false;
         setAttached();
@@ -182,7 +190,10 @@ public class LifecycleHandler extends Fragment implements ActivityLifecycleCallb
         super.onDetach();
 
         attached = false;
-        destroyRouters();
+
+        if (activity != null) {
+            destroyRouters(activity.isChangingConfigurations());
+        }
     }
 
     private void setAttached() {
@@ -193,20 +204,20 @@ public class LifecycleHandler extends Fragment implements ActivityLifecycleCallb
                 PendingPermissionRequest request = pendingPermissionRequests.remove(i);
                 requestPermissions(request.instanceId, request.permissions, request.requestCode);
             }
-        }
 
-        for (ActivityHostedRouter router : routerMap.values()) {
-            router.onContextAvailable();
+            for (ActivityHostedRouter router : new ArrayList<>(routerMap.values())) {
+                router.onContextAvailable();
+            }
         }
     }
 
-    private void destroyRouters() {
+    private void destroyRouters(boolean configurationChange) {
         if (!destroyed) {
             destroyed = true;
 
             if (activity != null) {
-                for (Router router : routerMap.values()) {
-                    router.onActivityDestroyed(activity);
+                for (Router router : getRouters()) {
+                    router.onActivityDestroyed(activity, configurationChange);
                 }
             }
         }
@@ -218,7 +229,7 @@ public class LifecycleHandler extends Fragment implements ActivityLifecycleCallb
 
         String instanceId = activityRequestMap.get(requestCode);
         if (instanceId != null) {
-            for (Router router : routerMap.values()) {
+            for (Router router : getRouters()) {
                 router.onActivityResult(instanceId, requestCode, resultCode, data);
             }
         }
@@ -230,7 +241,7 @@ public class LifecycleHandler extends Fragment implements ActivityLifecycleCallb
 
         String instanceId = permissionRequestMap.get(requestCode);
         if (instanceId != null) {
-            for (Router router : routerMap.values()) {
+            for (Router router : getRouters()) {
                 router.onRequestPermissionsResult(instanceId, requestCode, permissions, grantResults);
             }
         }
@@ -238,7 +249,7 @@ public class LifecycleHandler extends Fragment implements ActivityLifecycleCallb
 
     @Override
     public boolean shouldShowRequestPermissionRationale(@NonNull String permission) {
-        for (Router router : routerMap.values()) {
+        for (Router router : getRouters()) {
             Boolean handled = router.handleRequestedPermission(permission);
             if (handled != null) {
                 return handled;
@@ -251,7 +262,7 @@ public class LifecycleHandler extends Fragment implements ActivityLifecycleCallb
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
 
-        for (Router router : routerMap.values()) {
+        for (Router router : getRouters()) {
             router.onCreateOptionsMenu(menu, inflater);
         }
     }
@@ -260,14 +271,14 @@ public class LifecycleHandler extends Fragment implements ActivityLifecycleCallb
     public void onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
 
-        for (Router router : routerMap.values()) {
+        for (Router router : getRouters()) {
             router.onPrepareOptionsMenu(menu);
         }
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        for (Router router : routerMap.values()) {
+        for (Router router : getRouters()) {
             if (router.onOptionsItemSelected(item)) {
                 return true;
             }
@@ -318,10 +329,10 @@ public class LifecycleHandler extends Fragment implements ActivityLifecycleCallb
 
     @Override
     public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
-        if (this.activity == null && findInActivity(activity) == LifecycleHandler.this) {
+        if (findInActivity(activity) == LifecycleHandler.this) {
             this.activity = activity;
 
-            for (ActivityHostedRouter router : routerMap.values()) {
+            for (ActivityHostedRouter router : new ArrayList<>(routerMap.values())) {
                 router.onContextAvailable();
             }
         }
@@ -330,7 +341,9 @@ public class LifecycleHandler extends Fragment implements ActivityLifecycleCallb
     @Override
     public void onActivityStarted(Activity activity) {
         if (this.activity == activity) {
-            for (Router router : routerMap.values()) {
+            hasPreparedForHostDetach = false;
+
+            for (Router router : getRouters()) {
                 router.onActivityStarted(activity);
             }
         }
@@ -339,7 +352,7 @@ public class LifecycleHandler extends Fragment implements ActivityLifecycleCallb
     @Override
     public void onActivityResumed(Activity activity) {
         if (this.activity == activity) {
-            for (Router router : routerMap.values()) {
+            for (Router router : getRouters()) {
                 router.onActivityResumed(activity);
             }
         }
@@ -348,7 +361,7 @@ public class LifecycleHandler extends Fragment implements ActivityLifecycleCallb
     @Override
     public void onActivityPaused(Activity activity) {
         if (this.activity == activity) {
-            for (Router router : routerMap.values()) {
+            for (Router router : getRouters()) {
                 router.onActivityPaused(activity);
             }
         }
@@ -357,7 +370,9 @@ public class LifecycleHandler extends Fragment implements ActivityLifecycleCallb
     @Override
     public void onActivityStopped(Activity activity) {
         if (this.activity == activity) {
-            for (Router router : routerMap.values()) {
+            prepareForHostDetachIfNeeded();
+
+            for (Router router : getRouters()) {
                 router.onActivityStopped(activity);
             }
         }
@@ -366,7 +381,9 @@ public class LifecycleHandler extends Fragment implements ActivityLifecycleCallb
     @Override
     public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
         if (this.activity == activity) {
-            for (Router router : routerMap.values()) {
+            prepareForHostDetachIfNeeded();
+
+            for (Router router : getRouters()) {
                 Bundle bundle = new Bundle();
                 router.saveInstanceState(bundle);
                 outState.putBundle(KEY_ROUTER_STATE_PREFIX + router.getContainerId(), bundle);
@@ -379,6 +396,16 @@ public class LifecycleHandler extends Fragment implements ActivityLifecycleCallb
         activeLifecycleHandlers.remove(activity);
     }
 
+    private void prepareForHostDetachIfNeeded() {
+        if (!hasPreparedForHostDetach) {
+            hasPreparedForHostDetach = true;
+
+            for (Router router : getRouters()) {
+                router.prepareForHostDetach();
+            }
+        }
+    }
+
     private static class PendingPermissionRequest implements Parcelable {
         final String instanceId;
         final String[] permissions;
@@ -390,7 +417,7 @@ public class LifecycleHandler extends Fragment implements ActivityLifecycleCallb
             this.requestCode = requestCode;
         }
 
-        private PendingPermissionRequest(Parcel in) {
+        PendingPermissionRequest(Parcel in) {
             instanceId = in.readString();
             permissions = in.createStringArray();
             requestCode = in.readInt();

conductor/src/main/java/com/bluelinelabs/conductor/internal/NoOpControllerChangeHandler.java

@@ -1,27 +0,0 @@
-package com.bluelinelabs.conductor.internal;
-
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.bluelinelabs.conductor.ControllerChangeHandler;
-
-public class NoOpControllerChangeHandler extends ControllerChangeHandler {
-
-    @Override
-    public void performChange(@NonNull ViewGroup container, @Nullable View from, @Nullable View to, boolean isPush, @NonNull ControllerChangeCompletedListener changeListener) {
-        changeListener.onChangeCompleted();
-    }
-
-    @NonNull
-    @Override
-    public ControllerChangeHandler copy() {
-        return new NoOpControllerChangeHandler();
-    }
-
-    @Override
-    public boolean isReusable() {
-        return true;
-    }
-}

conductor/src/main/java/com/bluelinelabs/conductor/internal/NoOpControllerChangeHandler.kt

@@ -0,0 +1,22 @@
+package com.bluelinelabs.conductor.internal
+
+import android.view.View
+import android.view.ViewGroup
+import com.bluelinelabs.conductor.ControllerChangeHandler
+
+class NoOpControllerChangeHandler : ControllerChangeHandler() {
+
+  override fun performChange(
+    container: ViewGroup,
+    from: View?,
+    to: View?,
+    isPush: Boolean,
+    changeListener: ControllerChangeCompletedListener
+  ) {
+    changeListener.onChangeCompleted()
+  }
+
+  override fun copy(): ControllerChangeHandler = NoOpControllerChangeHandler()
+
+  override fun isReusable() = true
+}

conductor/src/main/java/com/bluelinelabs/conductor/internal/OwnViewTreeLifecycleAndRegistry.kt

@@ -0,0 +1,163 @@
+package com.bluelinelabs.conductor.internal
+
+import android.os.Bundle
+import android.view.View
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import androidx.lifecycle.ViewTreeLifecycleOwner
+import androidx.savedstate.SavedStateRegistryController
+import androidx.savedstate.SavedStateRegistryOwner
+import androidx.savedstate.ViewTreeSavedStateRegistryOwner
+import com.bluelinelabs.conductor.Controller
+import com.bluelinelabs.conductor.ControllerChangeHandler
+import com.bluelinelabs.conductor.ControllerChangeType
+import com.bluelinelabs.conductor.R
+
+/**
+ * This class sets the [ViewTreeLifecycleOwner] and [ViewTreeSavedStateRegistryOwner] which is
+ * necessary for Jetpack Compose. By setting these, the view state restoration and compose lifecycle
+ * play together with the lifecycle of the [Controller].
+ */
+internal class OwnViewTreeLifecycleAndRegistry private constructor(
+  controller: Controller
+) : LifecycleOwner, SavedStateRegistryOwner {
+
+  private lateinit var lifecycleRegistry: LifecycleRegistry
+  private lateinit var savedStateRegistryController: SavedStateRegistryController
+
+  private var hasSavedState = false
+  private var savedRegistryState = Bundle.EMPTY
+
+  init {
+    controller.addLifecycleListener(object : Controller.LifecycleListener() {
+      override fun preCreateView(controller: Controller) {
+        hasSavedState = false
+
+        lifecycleRegistry = LifecycleRegistry(this@OwnViewTreeLifecycleAndRegistry)
+        savedStateRegistryController = SavedStateRegistryController.create(
+          this@OwnViewTreeLifecycleAndRegistry
+        )
+        savedStateRegistryController.performRestore(savedRegistryState)
+
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
+      }
+
+      override fun postCreateView(controller: Controller, view: View) {
+        /**
+         * If the consumer of the library already has its own [ViewTreeLifecycleOwner] or
+         * [ViewTreeSavedStateRegistryOwner] set, don't overwrite it but assume that they're doing
+         * it on purpose.
+         */
+        if (
+          view.getTag(R.id.view_tree_lifecycle_owner) == null &&
+          view.getTag(R.id.view_tree_saved_state_registry_owner) == null
+        ) {
+          ViewTreeLifecycleOwner.set(view, this@OwnViewTreeLifecycleAndRegistry)
+          ViewTreeSavedStateRegistryOwner.set(
+            view,
+            this@OwnViewTreeLifecycleAndRegistry
+          )
+        }
+
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
+      }
+
+      override fun postAttach(controller: Controller, view: View) {
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_RESUME)
+      }
+
+      override fun onChangeEnd(
+        changeController: Controller,
+        changeHandler: ControllerChangeHandler,
+        changeType: ControllerChangeType
+      ) {
+        // Should only happen if pushing another controller over this one was aborted
+        if (
+          controller == changeController &&
+          changeType.isEnter &&
+          changeHandler.removesFromViewOnPush() &&
+          changeController.view?.windowToken != null &&
+          lifecycleRegistry.currentState == Lifecycle.State.STARTED
+        ) {
+          lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_RESUME)
+        }
+      }
+
+      // AbstractComposeView adds its own OnAttachStateChangeListener by default. Since it
+      // does this on init, its detach callbacks get called before ours, which prevents us
+      // from saving state in onDetach. The if statement in here should detect upcoming
+      // detachment.
+      override fun onChangeStart(
+        changeController: Controller,
+        changeHandler: ControllerChangeHandler,
+        changeType: ControllerChangeType
+      ) {
+        if (
+          controller == changeController &&
+          !changeType.isEnter &&
+          changeHandler.removesFromViewOnPush() &&
+          lifecycleRegistry.currentState == Lifecycle.State.RESUMED
+        ) {
+          lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_PAUSE)
+
+          savedRegistryState = Bundle()
+          savedStateRegistryController.performSave(savedRegistryState)
+
+          hasSavedState = true
+        }
+      }
+
+      override fun preDetach(controller: Controller, view: View) {
+        // Should only happen if pushing this controller was aborted
+        if (lifecycleRegistry.currentState == Lifecycle.State.RESUMED) {
+          lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_PAUSE)
+        }
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
+      }
+
+      override fun onSaveInstanceState(controller: Controller, outState: Bundle) {
+        outState.putBundle(KEY_SAVED_STATE, savedRegistryState)
+      }
+
+      override fun onSaveViewState(controller: Controller, outState: Bundle) {
+        if (!hasSavedState) {
+          savedRegistryState = Bundle()
+          savedStateRegistryController.performSave(savedRegistryState)
+        }
+      }
+
+      override fun onRestoreInstanceState(controller: Controller, savedInstanceState: Bundle) {
+        savedRegistryState = savedInstanceState.getBundle(KEY_SAVED_STATE)
+      }
+
+      override fun preDestroyView(controller: Controller, view: View) {
+        if (controller.isBeingDestroyed && controller.router.backstackSize == 0) {
+          val parent = view.parent as? View
+          parent?.addOnAttachStateChangeListener(object :
+            View.OnAttachStateChangeListener {
+            override fun onViewAttachedToWindow(v: View?) = Unit
+            override fun onViewDetachedFromWindow(v: View?) {
+              parent.removeOnAttachStateChangeListener(this)
+              lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+            }
+          })
+        } else {
+          lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+        }
+      }
+    })
+  }
+
+  override fun getLifecycle() = lifecycleRegistry
+
+  override fun getSavedStateRegistry() = savedStateRegistryController.savedStateRegistry
+
+  companion object {
+    private const val KEY_SAVED_STATE = "Registry.savedState"
+
+    fun own(target: Controller) {
+      OwnViewTreeLifecycleAndRegistry(target)
+    }
+  }
+}

conductor/src/main/java/com/bluelinelabs/conductor/internal/RouterRequiringFunc.java

@@ -1,5 +0,0 @@
-package com.bluelinelabs.conductor.internal;
-
-public interface RouterRequiringFunc {
-    void execute();
-}

conductor/src/main/java/com/bluelinelabs/conductor/internal/RouterRequiringFunc.kt

@@ -0,0 +1,9 @@
+package com.bluelinelabs.conductor.internal
+
+import androidx.annotation.RestrictTo
+import androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP
+
+@RestrictTo(LIBRARY_GROUP)
+interface RouterRequiringFunc {
+  fun execute()
+}

conductor/src/main/java/com/bluelinelabs/conductor/internal/StringSparseArrayParceler.java

@@ -2,7 +2,7 @@ package com.bluelinelabs.conductor.internal;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.SparseArray;
 
 public class StringSparseArrayParceler implements Parcelable {
@@ -13,7 +13,7 @@ public class StringSparseArrayParceler implements Parcelable {
         this.stringSparseArray = stringSparseArray;
     }
 
-    private StringSparseArrayParceler(@NonNull Parcel in) {
+    StringSparseArrayParceler(@NonNull Parcel in) {
         stringSparseArray = new SparseArray<>();
 
         final int size = in.readInt();

conductor/src/main/java/com/bluelinelabs/conductor/internal/ThreadUtils.java

@@ -1,20 +0,0 @@
-package com.bluelinelabs.conductor.internal;
-
-import android.os.Looper;
-import android.util.AndroidRuntimeException;
-
-public class ThreadUtils {
-
-    public static void ensureMainThread() {
-        if (Looper.getMainLooper().getThread() != Thread.currentThread()) {
-            throw new CalledFromWrongThreadException("Methods that affect the view hierarchy can can only be called from the main thread.");
-        }
-    }
-
-    private static final class CalledFromWrongThreadException extends AndroidRuntimeException {
-        CalledFromWrongThreadException(String msg) {
-            super(msg);
-        }
-    }
-
-}

conductor/src/main/java/com/bluelinelabs/conductor/internal/ThreadUtils.kt

@@ -0,0 +1,17 @@
+@file:JvmName("ThreadUtils")
+
+package com.bluelinelabs.conductor.internal
+
+import android.os.Looper
+import android.util.AndroidRuntimeException
+import androidx.annotation.RestrictTo
+import androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP
+
+@RestrictTo(LIBRARY_GROUP)
+internal fun ensureMainThread() {
+  if (Looper.getMainLooper().thread !== Thread.currentThread()) {
+    throw CalledFromWrongThreadException("Methods that affect the view hierarchy can can only be called from the main thread.")
+  }
+}
+
+private class CalledFromWrongThreadException(msg: String?) : AndroidRuntimeException(msg)

conductor/src/main/java/com/bluelinelabs/conductor/internal/TransactionIndexer.java

@@ -1,24 +0,0 @@
-package com.bluelinelabs.conductor.internal;
-
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-
-public class TransactionIndexer {
-
-    private static final String KEY_INDEX = "TransactionIndexer.currentIndex";
-
-    private int currentIndex;
-
-    public int nextIndex() {
-        return ++currentIndex;
-    }
-
-    public void saveInstanceState(@NonNull Bundle outState) {
-        outState.putInt(KEY_INDEX, currentIndex);
-    }
-
-    public void restoreInstanceState(@NonNull Bundle savedInstanceState) {
-        currentIndex = savedInstanceState.getInt(KEY_INDEX);
-    }
-
-}