Version bump for 3.1.1 release

Revert maven-publish plugin migration
Provide a bit more safety around pushing controllers outside of normal lifecycle events
2021-07-19 17:42:43 -05:00 · 2021-07-19 17:41:17 -05:00 · 2021-07-19 17:20:32 -05:00 · 2021-07-19 13:08:34 -05:00 · 2021-07-03 22:09:39 +02:00 · 2021-07-03 22:08:18 +02:00
233 changed files with 7741 additions and 8474 deletions
@@ -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
@@ -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 }}
@@ -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
@@ -0,0 +1,9 @@
+/libraries
+/runConfigurations.xml
+/misc.xml
+/vcs.xml
+/workspace.xml
+/caches
+/gradle.xml
+/modules.xml
+/compiler.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>
@@ -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>
@@ -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>
@@ -1,35 +0,0 @@
-language: android
-
-android:
-  components:
-    - tools
-    - build-tools-27.0.3
-    - android-27
-    - 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: Px0uj7aMtKUVZVBnoEjHrEHh4cwO2qKJrHHPvwBiDqhwLBaWQIVXYOy0njaYc5o8p96Fv7bMu7NZx/72vMu1+nmTKxgzrMIxvMW6kczBvJUpv6xd1NuC34x+5Xq5gBNOFvb8JarWStcKgIvnFqvBsRUeI1Hsz7Olb8HF+fEo1kShuP18ezSsBkXruw8JuGiU9x0kq4YhZ7vRvFnc3sJX2FL6heuvQsnUWrolUOsKRadNkCibo+Euuls7ExvbbAXN4LEO3rs0G2eBUBbi2wXvTMG9symtItEHTMPO7K+aQfNQnHsY91TYveH/IJM1u5p6OldsUSOUigzpDmpVYW94aLuJaYqc6Ibq3eUws+tv2didOHXZW5zOCFjldDFBIQFPA3fih/wK/JP0taQ0uIu1+2eifvuERarMkGsYlOFe5tJd10ipi+kK5vNxoRwS9kGv5WwP5fVPX2m5XbD2y1LnugCCcAumfNX7NyNBIRqTy7BP34O3EMLZpMxjwSLnUBnYd4V/0LEvoVmbYmrLhWwpojBJmdwe2QknrPuvRErxNujRA1uEVupbU5A6RW1BmrtzSahJYoROI+ayG7UTOSbFN8+DorER1SUXsrOFlawak8yWsoi6OIynTKucrFM3YcBdJ3Su5AIhfBAOASZa6CUa6sn6Zo8mHmDVGKeckvXnLCU=
-    - secure: 3Dj6roVTO2a9Z8lwlTGzJJ+QGeyIYSuQ/Z6YsYnW3wB9Mw36uWqw9rOmMNIGjjyAlER8bKgalHr90Pus87oaNaIlbEyvq+L+I0FVAwognViFjo/a2apCcq81THoKjT1l0sgGRzvLNDynQe1q2L0tOu21wtBhMLb7FKQYB9+oD3H+rcU63xD2tv3ToJz+j+dccZ9nrtgk0MQ1xAeMtEb4tdq3flKATKhIuDkp9chaDxx/ZGwyhdE0UP29UUyP5Np1QvpFAlAJIZloZPvde2e05fwxTh4rwUCetkfJknDK6WrGiq97WGRXJpfORNuwGn7jxDCtgxcAm9nGF8qmI/v78BhjJ857CfJBTLGv4QI0RszlhXyezJqqRYjCn9S4yx8UAOixVJfJfFNHLqD4MFn41b7j8J3HDJPxNt0t/qYhUMrgrZVosNOUqhwCyQTKDqtrpvmSUbhHpk2+fxZF1GEL5N540rA0OjLmFUUEDSvRQVaa/waeqXrRefOhsXIx20dHs93C6XDffjnxVMKlqtPab2MlHV/23QCuSa6eW+lKyOZ6ZkWLwwDsLbnuD0WJfJpiL1xaTdPJNIDb6kB/Bno4V1O4xrYncEOaA4Vr4amO8le9Q33/QeNrUZSXs/eye5t0f02wCzubuiEDVEeoR/qj5+5CNWv3AWr/f8AgXp80Pzw=
@@ -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,35 +13,34 @@ 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
-implementation 'com.bluelinelabs:conductor:2.1.5'
+implementation 'com.bluelinelabs:conductor:3.1.1'

-// If you want the components that go along with
-// Android's support libraries (currently just a PagerAdapter):
-implementation 'com.bluelinelabs:conductor-support:2.1.5'
+// AndroidX Transition change handlers:
+implementation 'com.bluelinelabs:conductor-androidx-transition:3.1.1'

-// If you want RxJava lifecycle support:
-implementation 'com.bluelinelabs:conductor-rxlifecycle:2.1.5'
+// ViewPager PagerAdapter:
+implementation 'com.bluelinelabs:conductor-viewpager:3.1.1'

-// If you want RxJava2 lifecycle support:
-implementation 'com.bluelinelabs:conductor-rxlifecycle2:2.1.5'
+// ViewPager2 Adapter:
+implementation 'com.bluelinelabs:conductor-viewpager2:3.1.1'

-// If you want RxJava2 Autodispose support:
-implementation 'com.bluelinelabs:conductor-autodispose:2.1.5'
+// RxJava2 Autodispose support:
+implementation 'com.bluelinelabs:conductor-autodispose:3.1.1'

-// If you want Controllers that are Lifecycle-aware (architecture components):
-implementation 'com.bluelinelabs:conductor-archlifecycle:2.1.5'
+// Lifecycle-aware Controllers (architecture components):
+implementation 'com.bluelinelabs:conductor-archlifecycle:3.1.1'
 ```

 **SNAPSHOT**

-Just use `2.1.6-SNAPSHOT` as your version number in any of the dependencies above and add the url to the snapshot repository:
+Just use `3.1.2-SNAPSHOT` as your version number in any of the dependencies above and add the url to the snapshot repository:

 ```gradle
 allprojects {
@@ -58,7 +57,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

@@ -99,7 +98,7 @@ 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");
        return view;
@@ -132,9 +131,17 @@ The lifecycle of a Controller is significantly simpler to understand than that o
 ### RxJava Lifecycle
 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.
@@ -1,18 +1,22 @@
 buildscript {
+    apply from: rootProject.file('dependencies.gradle')
+
    repositories {
-        jcenter()
+        mavenCentral()
        google()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        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 {
        mavenCentral()
-        maven { url 'https://maven.google.com' }
-        jcenter()
+        google()
    }
 }

@@ -1,25 +1,22 @@
-apply plugin: 'java'
-
-targetCompatibility = JavaVersion.VERSION_1_7
-sourceCompatibility = JavaVersion.VERSION_1_7
+apply plugin: 'kotlin'

 configurations {
    lintChecks
 }

 dependencies {
-    implementation rootProject.ext.lintapi
-    implementation rootProject.ext.lintchecks
+    compileOnly rootProject.ext.lintapi
+    compileOnly rootProject.ext.lintchecks
+    compileOnly rootProject.ext.kotlinStd

+    testImplementation rootProject.ext.junit
    testImplementation rootProject.ext.lint
    testImplementation rootProject.ext.lintTests
-
-    lintChecks files(jar)
 }

 jar {
    manifest {
-        attributes('Lint-Registry': 'com.bluelinelabs.conductor.lint.IssueRegistry')
+        attributes('Lint-Registry-v2': 'com.bluelinelabs.conductor.lint.IssueRegistry')
    }
 }

@@ -10,17 +10,18 @@ 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 org.jetbrains.annotations.NotNull;
 import org.jetbrains.uast.UClass;
 import org.jetbrains.uast.UElement;
 import org.jetbrains.uast.UMethod;
-import org.jetbrains.uast.UTypeReferenceExpression;

 import java.util.Collections;
 import java.util.List;

+@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.",
@@ -41,18 +42,12 @@ public final class ControllerChangeHandlerIssueDetector extends Detector impleme
        return new UElementHandler() {

            @Override
-            public void visitClass(UClass node) {
+            public void visitClass(@NotNull UClass node) {
                if (evaluator.isAbstract(node)) {
                    return;
                }

-                boolean hasSuperType = false;
-                for (UTypeReferenceExpression superType : node.getUastSuperTypes()) {
-                    if (CLASS_NAME.equals(superType.asRenderString())) {
-                        hasSuperType = true;
-                        break;
-                    }
-                }
+                final boolean hasSuperType = evaluator.extendsClass(node.getPsi(), CLASS_NAME, true);
                if (!hasSuperType) {
                    return;
                }
@@ -11,18 +11,19 @@ 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 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 org.jetbrains.uast.UTypeReferenceExpression;

 import java.util.Collections;
 import java.util.List;

+@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"
@@ -33,7 +34,7 @@ public final class ControllerIssueDetector extends Detector implements Detector.

    @Override
    public List<Class<? extends UElement>> getApplicableUastTypes() {
-        return Collections.<Class<? extends UElement>>singletonList(UClass.class);
+        return Collections.singletonList(UClass.class);
    }

    @Override
@@ -42,18 +43,12 @@ public final class ControllerIssueDetector extends Detector implements Detector.

        return new UElementHandler() {
            @Override
-            public void visitClass(UClass node) {
+            public void visitClass(@NotNull UClass node) {
                if (evaluator.isAbstract(node)) {
                    return;
                }

-                boolean hasSuperType = false;
-                for (UTypeReferenceExpression superType : node.getUastSuperTypes()) {
-                    if (CLASS_NAME.equals(superType.asRenderString())) {
-                        hasSuperType = true;
-                        break;
-                    }
-                }
+                final boolean hasSuperType = evaluator.extendsClass(node.getPsi(), CLASS_NAME, true);
                if (!hasSuperType) {
                    return;
                }
@@ -100,5 +95,5 @@ public final class ControllerIssueDetector extends Detector implements Detector.
            }
        };
    }
-    
+
 }
@@ -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);
-    }
-}
@@ -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
+  )
+}
@@ -1,24 +1,27 @@
 package com.bluelinelabs.conductor.lint;

-import org.intellij.lang.annotations.Language;
-import org.junit.Test;
-
 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;
+
+@SuppressWarnings("UnstableApiUsage")
 public class ControllerChangeHandlerDetectorTest {

    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";

+    private final TestFile controllerChangeHandlerStub = java(
+            "package com.bluelinelabs.conductor;\n"
+                    + "abstract class ControllerChangeHandler {}"
+    );
+
    @Test
    public void testWithNoConstructor() {
        @Language("JAVA") String source = ""
@@ -27,7 +30,7 @@ public class ControllerChangeHandlerDetectorTest {
                + "}";

        lint()
-                .files(java(source))
+                .files(controllerChangeHandlerStub, java(source))
                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
                .run()
                .expectClean();
@@ -42,7 +45,7 @@ public class ControllerChangeHandlerDetectorTest {
                + "}";

        lint()
-                .files(java(source))
+                .files(controllerChangeHandlerStub, java(source))
                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
                .run()
                .expectClean();
@@ -57,7 +60,7 @@ public class ControllerChangeHandlerDetectorTest {
                + "}";

        lint()
-                .files(java(source))
+                .files(controllerChangeHandlerStub, java(source))
                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
                .run()
                .expect(CONSTRUCTOR);
@@ -73,7 +76,7 @@ public class ControllerChangeHandlerDetectorTest {
                + "}";

        lint()
-                .files(java(source))
+                .files(controllerChangeHandlerStub, java(source))
                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
                .run()
                .expectClean();
@@ -88,7 +91,7 @@ public class ControllerChangeHandlerDetectorTest {
                + "}";

        lint()
-                .files(java(source))
+                .files(controllerChangeHandlerStub, java(source))
                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
                .run()
                .expect(CONSTRUCTOR);
@@ -103,10 +106,32 @@ public class ControllerChangeHandlerDetectorTest {
                + "}";

        lint()
-                .files(java(source))
+                .files(controllerChangeHandlerStub, java(source))
                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
                .run()
-                .expect(PRIVATE_CLASS_ERROR);
+                .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");
    }

+    @Test
+    public void testWithPrivateClassOfBaseClass() {
+        @Language("JAVA") String baseClass = ""
+                + "package test;\n"
+                + "abstract class BaseChangeHandler extends com.bluelinelabs.conductor.ControllerChangeHandler {}";
+
+        @Language("JAVA") String source = ""
+                + "package test;\n"
+                + "private class SampleHandler extends test.BaseChangeHandler {}";
+
+        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");
+    }
 }
@@ -1,24 +1,33 @@
 package com.bluelinelabs.conductor.lint;

-import org.intellij.lang.annotations.Language;
-import org.junit.Test;
-
 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;
+
+@SuppressWarnings("UnstableApiUsage")
 public class ControllerDetectorTest {

    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";

+    private final TestFile controllerStub = java(
+            "package com.bluelinelabs.conductor;\n"
+                    + "abstract class Controller {}"
+    );
+
+
    @Test
    public void testWithNoConstructor() {
        @Language("JAVA") String source = ""
@@ -27,7 +36,7 @@ public class ControllerDetectorTest {
                + "}";

        lint()
-                .files(java(source))
+                .files(controllerStub, java(source))
                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
                .run()
                .expectClean();
@@ -42,7 +51,7 @@ public class ControllerDetectorTest {
                + "}";

        lint()
-                .files(java(source))
+                .files(controllerStub, java(source))
                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
                .run()
                .expectClean();
@@ -57,7 +66,7 @@ public class ControllerDetectorTest {
                + "}";

        lint()
-                .files(java(source))
+                .files(controllerStub, java(source))
                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
                .run()
                .expect(CONSTRUCTOR_ERROR);
@@ -73,12 +82,38 @@ public class ControllerDetectorTest {
                + "}";

        lint()
-                .files(java(source))
+                .files(controllerStub, java(source))
                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
                .run()
                .expectClean();
    }

+    @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 = ""
@@ -88,7 +123,7 @@ public class ControllerDetectorTest {
                + "}";

        lint()
-                .files(java(source))
+                .files(controllerStub, java(source))
                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
                .run()
                .expect(CONSTRUCTOR_ERROR);
@@ -103,7 +138,7 @@ public class ControllerDetectorTest {
                + "}";

        lint()
-                .files(java(source))
+                .files(controllerStub, java(source))
                .issues(ControllerIssueDetector.ISSUE, ControllerChangeHandlerIssueDetector.ISSUE)
                .run()
                .expect(CLASS_ERROR);
@@ -1,16 +1,8 @@
-apply from: rootProject.file('dependencies.gradle')
-apply from: rootProject.file('gradle-mvn-push.gradle')
-
 apply plugin: 'com.android.library'

 android {
    compileSdkVersion rootProject.ext.compileSdkVersion

-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-
    defaultConfig {
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
@@ -20,11 +12,13 @@ android {
 }

 dependencies {
-    api rootProject.ext.rxJava2
-    api rootProject.ext.rxLifecycle2
-    api rootProject.ext.rxLifecycleAndroid2
-
+    implementation rootProject.ext.androidxAppCompat
+    implementation rootProject.ext.androidxCollection
+    api rootProject.ext.androidxTransition
    implementation project(':conductor')
 }

-ext.artifactId = 'conductor-rxlifecycle2'
+ext.artifactId = 'conductor-androidx-transition'
+
+apply from: rootProject.file('dependencies.gradle')
+apply plugin: "com.vanniktech.maven.publish"
@@ -0,0 +1,3 @@
+POM_NAME=Conductor AndroidX Transition Extensions
+POM_ARTIFACT_ID=conductor-androidx-transition
+POM_PACKAGING=aar
@@ -0,0 +1,3 @@
+<manifest package="com.bluelinelabs.conductor.androidxtransition">
+    <application />
+</manifest>
@@ -1,20 +1,20 @@
-package com.bluelinelabs.conductor.changehandler;
+package com.bluelinelabs.conductor.changehandler.androidxtransition;

-import android.annotation.TargetApi;
-import android.app.SharedElementCallback;
 import android.graphics.Rect;
-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.TransitionSet;
-import android.util.ArrayMap;
 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;
@@ -25,9 +25,11 @@ 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
-@TargetApi(Build.VERSION_CODES.LOLLIPOP)
 public abstract class SharedElementTransitionChangeHandler extends TransitionChangeHandler {

    // A map of from -> to names. Generally these will be the same.
@@ -160,7 +162,7 @@ public abstract class SharedElementTransitionChangeHandler extends TransitionCha
            OneShotPreDrawListener.add(true, view, new Runnable() {
                @Override
                public void run() {
-                    waitForTransitionNames.remove(view.getTransitionName());
+                    waitForTransitionNames.remove(ViewCompat.getTransitionName(view));

                    removedViews.add(new ViewParentPair(view, (ViewGroup)view.getParent()));
                    ((ViewGroup)view.getParent()).removeView(view);
@@ -319,7 +321,7 @@ public abstract class SharedElementTransitionChangeHandler extends TransitionCha
        final ArrayMap<String, View> toSharedElements = new ArrayMap<>();
        TransitionUtils.findNamedViews(toSharedElements, to);
        for (ViewParentPair removedView : removedViews) {
-            toSharedElements.put(removedView.view.getTransitionName(), removedView.view);
+            toSharedElements.put(ViewCompat.getTransitionName(removedView.view), removedView.view);
        }

        final List<String> names = new ArrayList<>(sharedElementNames.values());
@@ -335,10 +337,10 @@ public abstract class SharedElementTransitionChangeHandler extends TransitionCha
                    if (key != null) {
                        sharedElementNames.remove(key);
                    }
-                } else if (!name.equals(view.getTransitionName())) {
+                } else if (!name.equals(ViewCompat.getTransitionName(view))) {
                    String key = findKeyForValue(sharedElementNames, name);
                    if (key != null) {
-                        sharedElementNames.put(key, view.getTransitionName());
+                        sharedElementNames.put(key, ViewCompat.getTransitionName(view));
                    }
                }
            }
@@ -383,9 +385,9 @@ public abstract class SharedElementTransitionChangeHandler extends TransitionCha
                View view = fromSharedElements.get(name);
                if (view == null) {
                    sharedElementNames.remove(name);
-                } else if (!name.equals(view.getTransitionName())) {
+                } else if (!name.equals(ViewCompat.getTransitionName(view))) {
                    String targetValue = sharedElementNames.remove(name);
-                    sharedElementNames.put(view.getTransitionName(), targetValue);
+                    sharedElementNames.put(ViewCompat.getTransitionName(view), targetValue);
                }
            }
        } else {
@@ -415,7 +417,7 @@ public abstract class SharedElementTransitionChangeHandler extends TransitionCha
        if (view.getVisibility() == View.VISIBLE) {
            if (view instanceof ViewGroup) {
                ViewGroup viewGroup = (ViewGroup) view;
-                if (viewGroup.isTransitionGroup()) {
+                if (ViewGroupCompat.isTransitionGroup(viewGroup)) {
                    transitioningViews.add(viewGroup);
                } else {
                    int count = viewGroup.getChildCount();
@@ -434,7 +436,7 @@ public abstract class SharedElementTransitionChangeHandler extends TransitionCha
                                       @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 TransitionListener() {
+        overallTransition.addListener(new Transition.TransitionListener() {
            @Override
            public void onTransitionStart(Transition transition) {
                if (enterTransition != null && enteringViews != null) {
@@ -469,10 +471,10 @@ public abstract class SharedElementTransitionChangeHandler extends TransitionCha
                final int numSharedElements = toSharedElements.size();
                for (int i = 0; i < numSharedElements; i++) {
                    View view = toSharedElements.get(i);
-                    String name = view.getTransitionName();
+                    String name = ViewCompat.getTransitionName(view);
                    if (name != null) {
                        String inName = findKeyForValue(sharedElementNames, name);
-                        view.setTransitionName(inName);
+                        ViewCompat.setTransitionName(view, inName);
                    }
                }
            }
@@ -486,9 +488,9 @@ public abstract class SharedElementTransitionChangeHandler extends TransitionCha
                final int numSharedElements = toSharedElements.size();
                for (int i = 0; i < numSharedElements; i++) {
                    final View view = toSharedElements.get(i);
-                    final String name = view.getTransitionName();
+                    final String name = ViewCompat.getTransitionName(view);
                    final String inName = sharedElementNames.get(name);
-                    view.setTransitionName(inName);
+                    ViewCompat.setTransitionName(view, inName);
                }
            }
        });
@@ -572,7 +574,7 @@ public abstract class SharedElementTransitionChangeHandler extends TransitionCha
     * @param toName The transition name used in the "to" view
     */
    protected final void addSharedElement(@NonNull View sharedElement, @NonNull String toName) {
-        String transitionName = sharedElement.getTransitionName();
+        String transitionName = ViewCompat.getTransitionName(sharedElement);
        if (transitionName == null) {
            throw new IllegalArgumentException("Unique transitionNames are required for all sharedElements");
        }
@@ -1,22 +1,22 @@
-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 {
@@ -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);
                }
            }
        });
@@ -1,24 +1,23 @@
 package com.bluelinelabs.conductor.internal;

-import android.annotation.TargetApi;
 import android.graphics.Rect;
-import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.transition.Transition;
-import android.transition.TransitionSet;
 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;

-@TargetApi(Build.VERSION_CODES.LOLLIPOP)
 public class TransitionUtils {

    public static void findNamedViews(@NonNull Map<String, View> namedViews, View view) {
        if (view.getVisibility() == View.VISIBLE) {
-            String transitionName = view.getTransitionName();
+            String transitionName = ViewCompat.getTransitionName(view);
            if (transitionName != null) {
                namedViews.put(transitionName, view);
            }
@@ -36,7 +35,7 @@ public class TransitionUtils {

    @Nullable
    public static View findNamedView(@NonNull View view, @NonNull String transitionName) {
-        if (transitionName.equals(view.getTransitionName())) {
+        if (transitionName.equals(ViewCompat.getTransitionName(view))) {
            return view;
        }

@@ -1,16 +1,8 @@
-apply from: rootProject.file('dependencies.gradle')
-apply from: rootProject.file('gradle-mvn-push.gradle')
-
 apply plugin: 'com.android.library'

 android {
    compileSdkVersion rootProject.ext.compileSdkVersion

-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-
    defaultConfig {
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
@@ -26,3 +18,6 @@ dependencies {
 }

 ext.artifactId = 'conductor-arch-components-lifecycle'
+
+apply from: rootProject.file('dependencies.gradle')
+apply plugin: "com.vanniktech.maven.publish"
@@ -1,11 +1,11 @@
 package com.bluelinelabs.conductor.archlifecycle;

-import android.arch.lifecycle.Lifecycle;
-import android.arch.lifecycle.Lifecycle.Event;
-import android.arch.lifecycle.LifecycleOwner;
-import android.arch.lifecycle.LifecycleRegistry;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.Lifecycle.Event;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LifecycleRegistry;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.View;

 import com.bluelinelabs.conductor.Controller;
@@ -1,10 +1,10 @@
 package com.bluelinelabs.conductor.archlifecycle;

-import android.arch.lifecycle.Lifecycle;
-import android.arch.lifecycle.LifecycleOwner;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import com.bluelinelabs.conductor.Controller;

@@ -1,28 +0,0 @@
-package com.bluelinelabs.conductor.archlifecycle;
-
-import android.arch.lifecycle.Lifecycle;
-import android.arch.lifecycle.LifecycleOwner;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
-import com.bluelinelabs.conductor.RestoreViewOnCreateController;
-
-public abstract class LifecycleRestoreViewOnCreateController extends RestoreViewOnCreateController implements LifecycleOwner {
-
-    private final ControllerLifecycleOwner mLifecycleOwner = new ControllerLifecycleOwner(this);
-
-    public LifecycleRestoreViewOnCreateController() {
-        super();
-    }
-
-    public LifecycleRestoreViewOnCreateController(@Nullable Bundle args) {
-        super(args);
-    }
-
-    @Override @NonNull
-    public Lifecycle getLifecycle() {
-        return mLifecycleOwner.getLifecycle();
-    }
-
-}
@@ -1,16 +1,11 @@
 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

-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-
    defaultConfig {
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
@@ -22,6 +17,7 @@ android {
 dependencies {
    api rootProject.ext.rxJava2
    api rootProject.ext.autodispose
+    api rootProject.ext.autodisposeLifecycle

    implementation project(':conductor')
 }
@@ -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;

@@ -16,7 +16,7 @@ public class ControllerLifecycleSubjectHelper {
    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) {
@@ -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 CorrespondingEventsFunction CORRESPONDING_EVENTS =
-            new CorrespondingEventsFunction() {
+    private static final CorrespondingEventsFunction<ControllerEvent> CORRESPONDING_EVENTS =
+            new CorrespondingEventsFunction<ControllerEvent>() {
                @Override
-                public ControllerEvent apply(ControllerEvent lastEvent) throws OutsideLifecycleException {
+                public ControllerEvent apply(ControllerEvent lastEvent) throws OutsideScopeException {
                    switch (lastEvent) {
                        case CREATE:
                            return ControllerEvent.DESTROY;
@@ -27,20 +29,20 @@ 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 Function<ControllerEvent, ControllerEvent> correspondingEventsFunction;
+    @NonNull private final CorrespondingEventsFunction<ControllerEvent> correspondingEventsFunction;

    public static ControllerScopeProvider from(@NonNull Controller controller) {
        return new ControllerScopeProvider(controller, CORRESPONDING_EVENTS);
    }

    public static ControllerScopeProvider from(@NonNull Controller controller, @NonNull final ControllerEvent untilEvent) {
-        return new ControllerScopeProvider(controller, new CorrespondingEventsFunction() {
+        return new ControllerScopeProvider(controller, new CorrespondingEventsFunction<ControllerEvent>() {
            @Override
            public ControllerEvent apply(ControllerEvent controllerEvent) {
                return untilEvent;
@@ -48,11 +50,11 @@ public class ControllerScopeProvider implements LifecycleScopeProvider<Controlle
        });
    }

-    public static ControllerScopeProvider from(@NonNull Controller controller, @NonNull final CorrespondingEventsFunction correspondingEventsFunction) {
+    public static ControllerScopeProvider from(@NonNull Controller controller, @NonNull final CorrespondingEventsFunction<ControllerEvent> correspondingEventsFunction) {
        return new ControllerScopeProvider(controller, correspondingEventsFunction);
    }

-    private ControllerScopeProvider(@NonNull Controller controller, @NonNull CorrespondingEventsFunction correspondingEventsFunction) {
+    private ControllerScopeProvider(@NonNull Controller controller, @NonNull CorrespondingEventsFunction<ControllerEvent> correspondingEventsFunction) {
        lifecycleSubject = ControllerLifecycleSubjectHelper.create(controller);
        this.correspondingEventsFunction = correspondingEventsFunction;
    }
@@ -63,7 +65,7 @@ public class ControllerScopeProvider implements LifecycleScopeProvider<Controlle
    }

    @Override
-    public Function<ControllerEvent, ControllerEvent> correspondingEvents() {
+    public CorrespondingEventsFunction<ControllerEvent> correspondingEvents() {
        return correspondingEventsFunction;
    }

@@ -71,4 +73,9 @@ public class ControllerScopeProvider implements LifecycleScopeProvider<Controlle
    public ControllerEvent peekLifecycle() {
        return lifecycleSubject.getValue();
    }
+
+    @Override
+    public CompletableSource requestScope() throws Exception {
+        return LifecycleScopes.resolveScopeFromLifecycle(this);
+    }
 }
@@ -1,24 +0,0 @@
-package com.bluelinelabs.conductor.autodispose;
-
-import com.uber.autodispose.OutsideLifecycleException;
-
-import io.reactivex.functions.Function;
-
-/**
- * Based on https://github.com/uber/AutoDispose/blob/master/lifecycle/autodispose-lifecycle/src/main/java/com/uber/autodispose/lifecycle/CorrespondingEventsFunction.java
- *
- * A corresponding events function that acts as a normal {@link Function} but ensures ControllerEvent event
- * types are used in the generic and tightens the possible exception thrown to {@link OutsideLifecycleException}.
- */
-public interface CorrespondingEventsFunction extends Function<ControllerEvent, ControllerEvent> {
-
-    /**
-     * Given an event {@code event}, returns the next corresponding event that this lifecycle should
-     * dispose on.
-     *
-     * @param event the source or start event.
-     * @return the target event that should signal disposal.
-     * @throws OutsideLifecycleException if the lifecycle exceeds its scope boundaries.
-     */
-    @Override ControllerEvent apply(ControllerEvent event) throws OutsideLifecycleException;
-}
@@ -1,3 +0,0 @@
-POM_NAME=Conductor RxLifecycle Extensions
-POM_ARTIFACT_ID=conductor-rxlifecycle
-POM_PACKAGING=aar
@@ -1,3 +0,0 @@
-<manifest package="com.bluelinelabs.conductor.rxlifecycle">
-    <application />
-</manifest>
@@ -1,14 +0,0 @@
-package com.bluelinelabs.conductor.rxlifecycle;
-
-public enum ControllerEvent {
-
-    CREATE,
-    CONTEXT_AVAILABLE,
-    CREATE_VIEW,
-    ATTACH,
-    DETACH,
-    DESTROY_VIEW,
-    CONTEXT_UNAVAILABLE,
-    DESTROY
-
-}
@@ -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;
-    }
-
-}
@@ -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);
-    }
-
-}
@@ -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.");
-                    }
-                }
-            };
-}
@@ -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);
-    }
-
-}
@@ -1,3 +0,0 @@
-POM_NAME=Conductor RxLifecycle2 Extensions
-POM_ARTIFACT_ID=conductor-rxlifecycle2
-POM_PACKAGING=aar
@@ -1,3 +0,0 @@
-<manifest package="com.bluelinelabs.conductor.rxlifecycle2">
-    <application />
-</manifest>
@@ -1,14 +0,0 @@
-package com.bluelinelabs.conductor.rxlifecycle2;
-
-public enum ControllerEvent {
-
-    CREATE,
-    CONTEXT_AVAILABLE,
-    CREATE_VIEW,
-    ATTACH,
-    DETACH,
-    DESTROY_VIEW,
-    CONTEXT_UNAVAILABLE,
-    DESTROY
-
-}
@@ -1,71 +0,0 @@
-package com.bluelinelabs.conductor.rxlifecycle2;
-
-import android.content.Context;
-import android.support.annotation.NonNull;
-import android.view.View;
-
-import com.bluelinelabs.conductor.Controller;
-import com.trello.rxlifecycle2.OutsideLifecycleException;
-
-import io.reactivex.subjects.BehaviorSubject;
-
-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.createDefault(initialState);
-
-        controller.addLifecycleListener(new Controller.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;
-    }
-}
@@ -1,49 +0,0 @@
-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 com.bluelinelabs.conductor.Controller;
-import com.trello.rxlifecycle2.LifecycleProvider;
-import com.trello.rxlifecycle2.LifecycleTransformer;
-import com.trello.rxlifecycle2.RxLifecycle;
-import io.reactivex.Observable;
-import io.reactivex.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(@Nullable 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);
-    }
-}
@@ -1,43 +0,0 @@
-package com.bluelinelabs.conductor.rxlifecycle2;
-
-import android.support.annotation.NonNull;
-import com.trello.rxlifecycle2.LifecycleTransformer;
-import com.trello.rxlifecycle2.OutsideLifecycleException;
-import com.trello.rxlifecycle2.RxLifecycle;
-import io.reactivex.Observable;
-import io.reactivex.functions.Function;
-
-public class RxControllerLifecycle {
-
-    /**
-     * Binds the given source to a Controller lifecycle. This is the Controller version of
-     * {@link com.trello.rxlifecycle2.android.RxLifecycleAndroid#bindFragment(Observable)}.
-     *
-     * @param lifecycle the lifecycle sequence of a Controller
-     * @return a reusable {@link io.reactivex.ObservableTransformer} that unsubscribes the source during the Controller lifecycle
-     */
-    public static <T> LifecycleTransformer<T> bindController(@NonNull final Observable<ControllerEvent> lifecycle) {
-        return RxLifecycle.bind(lifecycle, CONTROLLER_LIFECYCLE);
-    }
-
-    private static final Function<ControllerEvent, ControllerEvent> CONTROLLER_LIFECYCLE =
-        new Function<ControllerEvent, ControllerEvent>() {
-            @Override
-            public ControllerEvent apply(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.");
-                }
-            }
-        };
-}
@@ -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);
-    }
-}
@@ -1,3 +0,0 @@
-POM_NAME=Conductor Support Extensions
-POM_ARTIFACT_ID=conductor-support
-POM_PACKAGING=aar
@@ -1,3 +0,0 @@
-<manifest package="com.bluelinelabs.conductor.support">
-    <application />
-</manifest>
@@ -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;
-    }
-
-}
@@ -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.android.controller.ActivityController;
-import org.robolectric.annotation.Config;
-
-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));
-    }
-
-}
@@ -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;
-    }
-}
@@ -1,16 +1,9 @@
-apply from: rootProject.file('dependencies.gradle')
-apply from: rootProject.file('gradle-mvn-push.gradle')
-
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'

 android {
    compileSdkVersion rootProject.ext.compileSdkVersion

-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-
    defaultConfig {
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
@@ -20,11 +13,14 @@ android {
 }

 dependencies {
-    api rootProject.ext.rxJava
-    api rootProject.ext.rxLifecycle
-    api rootProject.ext.rxLifecycleAndroid
+    testImplementation rootProject.ext.junit
+    testImplementation rootProject.ext.robolectric

+    implementation rootProject.ext.androidxAppCompat
    implementation project(':conductor')
 }

-ext.artifactId = 'conductor-rxlifecycle'
+apply from: rootProject.file('dependencies.gradle')
+
+ext.artifactId = 'conductor-viewpager'
+apply plugin: "com.vanniktech.maven.publish"
@@ -0,0 +1,3 @@
+POM_NAME=Conductor PagerAdapter
+POM_ARTIFACT_ID=conductor-viewpager
+POM_PACKAGING=aar
@@ -0,0 +1,3 @@
+<manifest package="com.bluelinelabs.conductor.viewpager">
+    <application />
+</manifest>
@@ -1,34 +1,40 @@
-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;

@@ -65,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);
@@ -85,12 +97,13 @@ public abstract class RouterPagerAdapter extends PagerAdapter {
            }
        }

+        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();
@@ -108,8 +121,8 @@ public abstract class RouterPagerAdapter extends PagerAdapter {
    }

    @Override
-    public void setPrimaryItem(ViewGroup container, int position, Object object) {
-        Router router = (Router)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()) {
@@ -126,7 +139,7 @@ public abstract class RouterPagerAdapter extends PagerAdapter {
    }

    @Override
-    public boolean isViewFromObject(View view, Object object) {
+    public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
        Router router = (Router)object;
        final List<RouterTransaction> backstack = router.getBackstack();
        for (RouterTransaction transaction : backstack) {
@@ -141,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;
@@ -153,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));
+                }
+            }
        }
    }

@@ -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))
+  }
+}
@@ -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)
+  }
+}
@@ -1,40 +1,34 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'de.mobilej.unmock:UnMockPlugin:0.6.5'
-    }
-}
-
 apply plugin: 'com.android.library'
-apply plugin: 'de.mobilej.unmock'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-parcelize'

 android {
    compileSdkVersion rootProject.ext.compileSdkVersion

-    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
    }
+
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
 }

 dependencies {
    testImplementation rootProject.ext.junit
-    testImplementation rootProject.ext.roboelectric
+    testImplementation rootProject.ext.robolectric

-    implementation rootProject.ext.supportV4
+    implementation rootProject.ext.androidxAppCompat
+    implementation rootProject.ext.androidxViewPager2
    implementation project(':conductor')
 }

-ext.artifactId = 'conductor-support'
-
 apply from: rootProject.file('dependencies.gradle')
-apply from: rootProject.file('gradle-mvn-push.gradle')
+
+ext.artifactId = 'conductor-viewpager2'
+apply plugin: "com.vanniktech.maven.publish"
@@ -0,0 +1,3 @@
+POM_NAME=Conductor ViewPager2 Adapter
+POM_ARTIFACT_ID=conductor-viewpager2
+POM_PACKAGING=aar
@@ -0,0 +1,3 @@
+<manifest package="com.bluelinelabs.conductor.viewpager2">
+    <application />
+</manifest>
@@ -0,0 +1,255 @@
+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.parcelize.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
+}
@@ -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)
+    }
+  }
+}
@@ -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())
+  }
+}
@@ -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 {

    @Override @NonNull
-    protected View onCreateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container) {
+    protected View onCreateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container, @Nullable Bundle savedViewState) {
        return new FrameLayout(inflater.getContext());
    }

@@ -1,23 +1,9 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'de.mobilej.unmock:UnMockPlugin:0.6.5'
-    }
-}
-
 apply plugin: 'com.android.library'
-apply plugin: 'de.mobilej.unmock'
+apply plugin: 'kotlin-android'

 android {
    compileSdkVersion rootProject.ext.compileSdkVersion

-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-
    defaultConfig {
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
@@ -27,32 +13,21 @@ android {
    }
 }

-configurations {
-    lintChecks
-}
-
 dependencies {
+    implementation savedState
    testImplementation rootProject.ext.junit
-    testImplementation rootProject.ext.roboelectric
+    testImplementation rootProject.ext.robolectric
+    testImplementation kotestAssertions

-    api rootProject.ext.supportAnnotations
+    implementation archComponentsLifecycle

-    lintChecks project(path: ':conductor-lint', configuration: 'lintChecks')
+    api rootProject.ext.androidxAnnotations
+    api kotlinStd
+
+    lintPublish project(':conductor-lint')
 }

-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)
-}
-
-ext.artifactId = 'conductor'
-
 apply from: rootProject.file('dependencies.gradle')
-apply from: rootProject.file('gradle-mvn-push.gradle')
+
+ext.artifactId = 'conductor'
+apply plugin: "com.vanniktech.maven.publish"
@@ -3,3 +3,6 @@
   public <init>();
   public <init>(android.os.Bundle);
 }
+-keepclassmembers public class * extends com.bluelinelabs.conductor.ControllerChangeHandler {
+   public <init>();
+}
@@ -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
@@ -1,117 +0,0 @@
-package com.bluelinelabs.conductor;
-
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Deque;
-import java.util.Iterator;
-import java.util.List;
-
-class Backstack implements Iterable<RouterTransaction> {
-
-    private static final String KEY_ENTRIES = "Backstack.entries";
-
-    private final Deque<RouterTransaction> backstack = new ArrayDeque<>();
-
-    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
-    boolean isEmpty() {
-        return backstack.isEmpty();
-    }
-
-    int size() {
-        return backstack.size();
-    }
-
-    @Nullable
-    RouterTransaction root() {
-        return backstack.size() > 0 ? backstack.getLast() : null;
-    }
-
-    @Override @NonNull
-    public Iterator<RouterTransaction> iterator() {
-        return backstack.iterator();
-    }
-
-    @NonNull
-    Iterator<RouterTransaction> reverseIterator() {
-        return backstack.descendingIterator();
-    }
-
-    @NonNull
-    List<RouterTransaction> popTo(@NonNull RouterTransaction transaction) {
-        List<RouterTransaction> popped = new ArrayList<>();
-        if (backstack.contains(transaction)) {
-            while (backstack.peek() != transaction) {
-                RouterTransaction poppedTransaction = pop();
-                popped.add(poppedTransaction);
-            }
-        } else {
-            throw new RuntimeException("Tried to pop to a transaction that was not on the back stack");
-        }
-        return popped;
-    }
-
-    @NonNull
-    RouterTransaction pop() {
-        RouterTransaction popped = backstack.pop();
-        popped.controller.destroy();
-        return popped;
-    }
-
-    @Nullable
-    RouterTransaction peek() {
-        return backstack.peek();
-    }
-
-    void push(@NonNull RouterTransaction transaction) {
-        backstack.push(transaction);
-    }
-
-    @NonNull
-    List<RouterTransaction> popAll() {
-        List<RouterTransaction> list = new ArrayList<>();
-        while (!isEmpty()) {
-            list.add(pop());
-        }
-        return list;
-    }
-
-    void setBackstack(@NonNull List<RouterTransaction> backstack) {
-        this.backstack.clear();
-        for (RouterTransaction transaction : backstack) {
-            this.backstack.push(transaction);
-        }
-    }
-
-    boolean contains(@NonNull Controller controller) {
-        for (RouterTransaction transaction : backstack) {
-            if (controller == transaction.controller) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    void saveInstanceState(@NonNull Bundle outState) {
-        ArrayList<Bundle> entryBundles = new ArrayList<>(backstack.size());
-        for (RouterTransaction entry : backstack) {
-            entryBundles.add(entry.saveInstanceState());
-        }
-
-        outState.putParcelableArrayList(KEY_ENTRIES, entryBundles);
-    }
-
-    void restoreInstanceState(@NonNull Bundle savedInstanceState) {
-        ArrayList<Bundle> entryBundles = savedInstanceState.getParcelableArrayList(KEY_ENTRIES);
-        if (entryBundles != null) {
-            Collections.reverse(entryBundles);
-            for (Bundle transactionBundle : entryBundles) {
-                backstack.push(new RouterTransaction(transactionBundle));
-            }
-        }
-    }
-}
@@ -0,0 +1,89 @@
+package com.bluelinelabs.conductor
+
+import android.os.Bundle
+import java.util.*
+
+internal class Backstack : Iterable<RouterTransaction> {
+
+  private val backstack: Deque<RouterTransaction> = ArrayDeque()
+
+  val isEmpty: Boolean get() = backstack.isEmpty()
+
+  val size: Int get() = backstack.size
+
+  fun root(): RouterTransaction? = backstack.lastOrNull()
+
+  override fun iterator(): MutableIterator<RouterTransaction> {
+    return backstack.iterator()
+  }
+
+  fun reverseIterator(): Iterator<RouterTransaction> = backstack.descendingIterator()
+
+  fun popTo(transaction: RouterTransaction): List<RouterTransaction> {
+    if (transaction in backstack) {
+      val popped: MutableList<RouterTransaction> = ArrayList()
+      while (backstack.peek() != transaction) {
+        val poppedTransaction = pop()
+        popped.add(poppedTransaction)
+      }
+      return popped
+    } else {
+      throw RuntimeException("Tried to pop to a transaction that was not on the back stack")
+    }
+  }
+
+  fun pop(): RouterTransaction {
+    return backstack.pop().also {
+      it.controller.destroy()
+    }
+  }
+
+  fun peek(): RouterTransaction? = backstack.peek()
+
+  fun push(transaction: RouterTransaction) {
+    backstack.push(transaction)
+  }
+
+  fun popAll(): List<RouterTransaction> {
+    val list: MutableList<RouterTransaction> = ArrayList()
+    while (!isEmpty) {
+      list.add(pop())
+    }
+    return list
+  }
+
+  fun setBackstack(backstack: List<RouterTransaction>) {
+    this.backstack.clear()
+    backstack.forEach { transaction ->
+      this.backstack.push(transaction)
+    }
+  }
+
+  operator fun contains(controller: Controller): Boolean {
+    return backstack.any {
+      it.controller == controller
+    }
+  }
+
+  fun saveInstanceState(outState: Bundle) {
+    val entryBundles = ArrayList<Bundle>(backstack.size)
+    backstack.mapTo(entryBundles) {
+      it.saveInstanceState()
+    }
+    outState.putParcelableArrayList(KEY_ENTRIES, entryBundles)
+  }
+
+  fun restoreInstanceState(savedInstanceState: Bundle) {
+    val entryBundles = savedInstanceState.getParcelableArrayList<Bundle?>(KEY_ENTRIES)
+    if (entryBundles != null) {
+      entryBundles.reverse()
+      for (transactionBundle in entryBundles) {
+        backstack.push(RouterTransaction(transactionBundle!!))
+      }
+    }
+  }
+
+  companion object {
+    private const val KEY_ENTRIES = "Backstack.entries"
+  }
+}
@@ -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--;
-    }
-
-}
@@ -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--
+  }
+}
@@ -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;
-    }
-
-}
@@ -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() }
+  }
+}
@@ -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;
@@ -107,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) {
@@ -141,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);
    }

    /**
@@ -148,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
@@ -189,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) {
@@ -204,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) {
@@ -223,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) {
@@ -231,7 +239,7 @@ public abstract class Controller {
                }
            }
        } else if (!childRouter.hasHost()) {
-            childRouter.setHost(this, container);
+            childRouter.setHostContainer(this, container);
            childRouter.rebindIfNeeded();
        }

@@ -393,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.
@@ -401,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.
@@ -409,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
@@ -471,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
@@ -480,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
@@ -495,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);
+            }
        });
    }

@@ -511,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);
+            }
        });
    }

@@ -520,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);
+            }
        });
    }

@@ -540,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);
+            }
        });
    }

@@ -552,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,
@@ -564,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);
+            }
        });
    }

@@ -585,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.
@@ -602,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;
@@ -727,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
@@ -738,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,7 +889,7 @@ public abstract class Controller {

    final void activityStopped(@NonNull Activity activity) {
        final boolean attached = this.attached;
-        
+
        if (viewAttachHandler != null) {
            viewAttachHandler.onActivityStopped();
        }
@@ -883,7 +926,7 @@ public abstract class Controller {

    void attach(@NonNull View view) {
        attachedToUnownedParent = router == null || view.getParent() != router.container;
-        if (attachedToUnownedParent) {
+        if (attachedToUnownedParent || isBeingDestroyed) {
            return;
        }

@@ -917,10 +960,14 @@ public abstract class Controller {

        for (ControllerHostedRouter childRouter : childRouters) {
            for (RouterTransaction childTransaction : childRouter.backstack) {
-                if (childTransaction.controller.awaitingParentAttach) {
-                    childTransaction.controller.attach(childTransaction.controller.view);
+                if (childTransaction.controller().awaitingParentAttach) {
+                    childTransaction.controller().attach(childTransaction.controller().view);
                }
            }
+
+            if (childRouter.hasHost()) {
+                childRouter.rebindIfNeeded();
+            }
        }
    }

@@ -973,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;

@@ -1009,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?");
            }
@@ -1021,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();
        }

@@ -1059,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();
                }
            }
@@ -1219,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);
        }
@@ -1281,6 +1336,8 @@ public abstract class Controller {
            }
            destroyedView = null;
        }
+
+        changeHandler.onEnd();
    }

    final void setDetachFrozen(boolean frozen) {
@@ -1292,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
+                }
            }
        }
    }
@@ -1344,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) {
+        }

    }

@@ -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;

@@ -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.
@@ -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;
-    }
-}
@@ -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);
+}
@@ -5,11 +5,12 @@ 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;

@@ -35,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();
@@ -56,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);
@@ -66,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);
        }
    }

@@ -92,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);
    }
@@ -101,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();
    }
@@ -184,7 +205,7 @@ class ControllerHostedRouter extends Router {

    @Override
    boolean hasHost() {
-        return hostController != null;
+        return hostController != null && container != null;
    }

    @Override
@@ -204,9 +225,9 @@ class ControllerHostedRouter extends Router {
    }

    @Override
-    void setControllerRouter(@NonNull Controller controller) {
+    void setRouterOnController(@NonNull Controller controller) {
        controller.setParentController(hostController);
-        super.setControllerRouter(controller);
+        super.setRouterOnController(controller);
    }

    int getHostId() {
@@ -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);
-
-}
@@ -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;
@@ -92,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;
@@ -116,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());
    }

    /**
@@ -130,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());
@@ -139,16 +139,17 @@ public abstract class Router {
            RouterTransaction removedTransaction = null;
            RouterTransaction nextTransaction = null;
            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) {
-                    if (controller.isAttached()) {
-                        trackDestroyingController(transaction);
-                    }
+                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;
@@ -204,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);
                }
            }
@@ -225,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) {
@@ -279,7 +280,7 @@ public abstract class Router {
    public boolean popToRoot(@Nullable ControllerChangeHandler changeHandler) {
        ThreadUtils.ensureMainThread();

-        if (backstack.size() > 1) {
+        if (backstack.getSize() > 1) {
            //noinspection ConstantConditions
            popToTransaction(backstack.root(), changeHandler);
            return true;
@@ -345,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;
            }
@@ -363,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;
@@ -374,7 +375,7 @@ public abstract class Router {
     */
    @SuppressWarnings("WeakerAccess")
    public int getBackstackSize() {
-        return backstack.size();
+        return backstack.getSize();
    }

    /**
@@ -382,7 +383,7 @@ public abstract class Router {
     */
    @NonNull
    public List<RouterTransaction> getBackstack() {
-        List<RouterTransaction> list = new ArrayList<>(backstack.size());
+        List<RouterTransaction> list = new ArrayList<>(backstack.getSize());
        Iterator<RouterTransaction> backstackIterator = backstack.reverseIterator();
        while (backstackIterator.hasNext()) {
            list.add(backstackIterator.next());
@@ -403,7 +404,7 @@ public abstract class Router {
        ThreadUtils.ensureMainThread();

        List<RouterTransaction> oldTransactions = getBackstack();
-        List<RouterTransaction> oldVisibleTransactions = getVisibleTransactions(backstack.iterator());
+        List<RouterTransaction> oldVisibleTransactions = getVisibleTransactions(backstack.iterator(), false);

        removeAllExceptVisibleAndUnowned();
        ensureOrderedTransactionIndices(newBackstack);
@@ -415,7 +416,7 @@ public abstract class Router {
        for (RouterTransaction oldTransaction : oldTransactions) {
            boolean contains = false;
            for (RouterTransaction newTransaction : newBackstack) {
-                if (oldTransaction.controller == newTransaction.controller) {
+                if (oldTransaction.controller() == newTransaction.controller()) {
                    contains = true;
                    break;
                }
@@ -423,7 +424,7 @@ public abstract class Router {

            if (!contains) {
                // Inform the controller that it will be destroyed soon
-                oldTransaction.controller.isBeingDestroyed = true;
+                oldTransaction.controller().isBeingDestroyed = true;
                transactionsToBeRemoved.add(oldTransaction);
            }
        }
@@ -433,13 +434,13 @@ public abstract class Router {
        while (backstackIterator.hasNext()) {
            RouterTransaction transaction = backstackIterator.next();
            transaction.onAttachedToRouter();
-            setControllerRouter(transaction.controller);
+            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);
@@ -448,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);
                }
@@ -462,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);
+                        }
                    }
                }

@@ -481,7 +485,7 @@ public abstract class Router {
            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());
+                ControllerChangeHandler.completeHandlerImmediately(transaction.controller().getInstanceId());
                performControllerChange(null, transaction, false, localHandler);
            }
        }
@@ -490,7 +494,18 @@ public abstract class Router {
        // set the backstack to prevent the possibility that they'll be destroyed before the controller
        // change handler runs.
        for (RouterTransaction removedTransaction : transactionsToBeRemoved) {
-            removedTransaction.controller.destroy();
+
+            // 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();
+            }
        }
    }

@@ -534,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());
            }
        }
    }
@@ -551,9 +568,9 @@ public abstract class Router {
        isActivityStopped = false;

        for (RouterTransaction transaction : backstack) {
-            transaction.controller.activityStarted(activity);
+            transaction.controller().activityStarted(activity);

-            for (Router childRouter : transaction.controller.getChildRouters()) {
+            for (Router childRouter : transaction.controller().getChildRouters()) {
                childRouter.onActivityStarted(activity);
            }
        }
@@ -561,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);
            }
        }
@@ -571,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);
            }
        }
@@ -581,9 +598,9 @@ 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);
            }
        }
@@ -591,15 +608,15 @@ public abstract class Router {
        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);
            }
        }

@@ -608,7 +625,7 @@ public abstract class Router {
            controller.activityDestroyed(activity);

            for (Router childRouter : controller.getChildRouters()) {
-                childRouter.onActivityDestroyed(activity);
+                childRouter.onActivityDestroyed(activity, isConfigurationChange);
            }
        }

@@ -616,11 +633,14 @@ public abstract class Router {
    }

    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();
        }
    }

@@ -640,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);
            }
        }
@@ -656,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);
            }
        }
@@ -666,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;
                }
@@ -680,7 +700,7 @@ public abstract class Router {
    }

    private void popToTransaction(@NonNull RouterTransaction transaction, @Nullable ControllerChangeHandler changeHandler) {
-        if (backstack.size() > 0) {
+        if (backstack.getSize() > 0) {
            RouterTransaction topTransaction = backstack.peek();

            List<RouterTransaction> updatedBackstack = new ArrayList<>();
@@ -721,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<>(backstack.size());
+        List<Controller> controllers = new ArrayList<>(backstack.getSize());

        Iterator<RouterTransaction> backstackIterator = backstack.reverseIterator();
        while (backstackIterator.hasNext()) {
-            controllers.add(backstackIterator.next().controller);
+            controllers.add(backstackIterator.next().controller());
        }

        return controllers;
@@ -740,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();
        }
@@ -765,25 +785,33 @@ public abstract class Router {
        performControllerChange(to, from, isPush, changeHandler);
    }

-    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;
+    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;
        boolean forceDetachDestroy = false;

        if (to != null) {
            to.ensureValidIndex(getTransactionIndexer());
-            setControllerRouter(toController);
-        } else if (backstack.size() == 0 && !popsLastView) {
+            setRouterOnController(toController);
+        } else if (backstack.getSize() == 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();
+            }
        }
    }

@@ -797,11 +825,17 @@ public abstract class Router {
        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
@@ -824,17 +858,17 @@ public abstract class Router {
    }

    protected void pushToBackstack(@NonNull RouterTransaction entry) {
-        if (backstack.contains(entry.controller)) {
+        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);
@@ -852,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());
            }
        }

@@ -879,21 +913,21 @@ public abstract class Router {
        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;
+            Controller controller = backstack.get(i).controller();
            for (int j = i + 1; j < backstack.size(); j++) {
-                if (backstack.get(j).controller == controller) {
+                if (backstack.get(j).controller() == controller) {
                    throw new IllegalStateException("Trying to push the same controller to the backstack more than once.");
                }
            }
@@ -912,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;
            }
        }
@@ -942,7 +982,7 @@ public abstract class Router {
        return true;
    }

-    void setControllerRouter(@NonNull Controller controller) {
+    void setRouterOnController(@NonNull Controller controller) {
        controller.setRouter(this);
        controller.onContextAvailable();
    }
@@ -1,140 +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(@NonNull TransactionIndexer indexer) {
-        if (transactionIndex == INVALID_INDEX) {
-            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;
-    }
-
-}
@@ -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)
+}
@@ -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;
@@ -1,33 +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;
-
-/**
- * @deprecated It's very rare that a simple AutoTransition is what you want when changing controllers. This class
- * is deprecated simply because it was often a red herring for people trying to make nice transitions.
- *
- * 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();
-    }
-
-}
@@ -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;

@@ -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;

@@ -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;
@@ -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);
-    }
-
-}
@@ -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;

@@ -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 {
@@ -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;

@@ -158,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();
@@ -173,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();
@@ -183,7 +190,10 @@ public class LifecycleHandler extends Fragment implements ActivityLifecycleCallb
        super.onDetach();

        attached = false;
-        destroyRouters();
+
+        if (activity != null) {
+            destroyRouters(activity.isChangingConfigurations());
+        }
    }

    private void setAttached() {
@@ -194,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 : new ArrayList<>(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 : getRouters()) {
-                    router.onActivityDestroyed(activity);
+                    router.onActivityDestroyed(activity, configurationChange);
                }
            }
        }
@@ -319,7 +329,7 @@ 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 : new ArrayList<>(routerMap.values())) {
@@ -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;
-    }
-}
@@ -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
+}
@@ -0,0 +1,164 @@
+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() &&
+          changeController.view != null &&
+          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)
+    }
+  }
+}
@@ -1,5 +0,0 @@
-package com.bluelinelabs.conductor.internal;
-
-public interface RouterRequiringFunc {
-    void execute();
-}
@@ -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()
+}
@@ -1,62 +0,0 @@
-package com.bluelinelabs.conductor.internal;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.util.SparseArray;
-
-public class StringSparseArrayParceler implements Parcelable {
-
-    private final SparseArray<String> stringSparseArray;
-
-    public StringSparseArrayParceler(@NonNull SparseArray<String> stringSparseArray) {
-        this.stringSparseArray = stringSparseArray;
-    }
-
-    StringSparseArrayParceler(@NonNull Parcel in) {
-        stringSparseArray = new SparseArray<>();
-
-        final int size = in.readInt();
-
-        for (int i = 0; i < size; i++) {
-            stringSparseArray.put(in.readInt(), in.readString());
-        }
-    }
-
-    @NonNull
-    public SparseArray<String> getStringSparseArray() {
-        return stringSparseArray;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel out, int flags) {
-        final int size = stringSparseArray.size();
-
-        out.writeInt(size);
-
-        for (int i = 0; i < size; i++) {
-            int key = stringSparseArray.keyAt(i);
-
-            out.writeInt(key);
-            out.writeString(stringSparseArray.get(key));
-        }
-    }
-
-    public static final Parcelable.Creator<StringSparseArrayParceler> CREATOR = new Parcelable.Creator<StringSparseArrayParceler>() {
-        @Override
-        public StringSparseArrayParceler createFromParcel(Parcel in) {
-            return new StringSparseArrayParceler(in);
-        }
-
-        @Override
-        public StringSparseArrayParceler[] newArray(int size) {
-            return new StringSparseArrayParceler[size];
-        }
-    };
-
-}
@@ -0,0 +1,39 @@
+package com.bluelinelabs.conductor.internal
+
+import android.os.Parcel
+import android.os.Parcelable
+import android.util.SparseArray
+
+internal class StringSparseArrayParceler(val stringSparseArray: SparseArray<String>) : Parcelable {
+
+  override fun describeContents(): Int = 0
+
+  override fun writeToParcel(out: Parcel, flags: Int) {
+    val size = stringSparseArray.size()
+    out.writeInt(size)
+    for (i in 0 until size) {
+      val key = stringSparseArray.keyAt(i)
+      out.writeInt(key)
+      out.writeString(stringSparseArray[key])
+    }
+  }
+
+  companion object {
+
+    @Suppress("unused")
+    @JvmField
+    val CREATOR: Parcelable.Creator<StringSparseArrayParceler> =
+      object : Parcelable.Creator<StringSparseArrayParceler> {
+        override fun createFromParcel(parcel: Parcel): StringSparseArrayParceler {
+          val stringSparseArray = SparseArray<String>()
+          val size = parcel.readInt()
+          for (i in 0 until size) {
+            stringSparseArray.put(parcel.readInt(), parcel.readString())
+          }
+          return StringSparseArrayParceler(stringSparseArray)
+        }
+
+        override fun newArray(size: Int): Array<StringSparseArrayParceler?> = arrayOfNulls(size)
+      }
+  }
+}
@@ -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);
-        }
-    }
-
-}
@@ -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)
@@ -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);
-    }
-
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
EricKuck	211da8b2ea	Version bump for 3.1.1 release	2021-07-19 17:42:43 -05:00
EricKuck	26db962168	Revert maven-publish plugin migration	2021-07-19 17:41:17 -05:00
EricKuck	f4c1c6ccf5	Provide a bit more safety around pushing controllers outside of normal lifecycle events	2021-07-19 17:20:32 -05:00
Mario	c89caa87e0	Apply the kotlin plugin to lint module (#653 ) Fixes missing IssueRegistry from lint.jar	2021-07-19 13:08:34 -05:00
Paul Woitaschek	2748566437	Make the StringSparseArrayParceler internal.	2021-07-03 22:09:39 +02:00
Paul Woitaschek	506c99ed41	Convert the StringSparseArrayParceler to kotlin.	2021-07-03 22:08:18 +02:00
Paul Woitaschek	4fe0ec5f51	Rename .java to .kt	2021-07-03 22:08:18 +02:00
Paul Woitaschek	afa93f2cc1	Unit-test the StringSparseArrayParceler.	2021-07-03 22:02:08 +02:00
Paul Woitaschek	836f92b615	Update the publish task name.	2021-07-03 21:41:21 +02:00
Paul Woitaschek	94c817bbd9	Remove support for rxLifecycle2.	2021-07-03 21:40:43 +02:00
Paul Woitaschek	fc1fee3e17	Kotlin backstack (#652 ) Migrate the Backstack to kotlin	2021-07-03 21:32:11 +02:00
Paul Woitaschek	76b7572a01	Migrate to the maven-publish plugin. (#651 )	2021-07-03 21:31:24 +02:00
Paul Woitaschek	3fc63b7f5f	Remove the deprecated kotlin-android-extensions plugin and use the kotlin-parcelize plugin replacement instead.	2021-07-03 14:37:40 +02:00
Paul Woitaschek	0ef52211a2	Update LeakCanary to 2.7. (#650 ) Also simplify the usage by extracting the leak watching logic into a lifecycle listener.	2021-07-03 14:31:04 +02:00
Paul Woitaschek	7574131940	Remove the unused rxJavaVersion declaration.	2021-07-02 22:40:01 +02:00
Paul Woitaschek	1ab9a4c4f6	Remove the unused rxLifecycleVersion declaration.	2021-07-02 22:35:52 +02:00
Paul Woitaschek	3bc23bd5cd	Update to agp 7.0.0-beta05	2021-07-02 22:31:53 +02:00
EricKuck	5f138e5d43	Version bump for 3.1.0 release	2021-07-02 11:18:50 -05:00
Paul Woitaschek	03701d05a9	Add basic support for compose (#644 ) Includes required lifecycle and saved state owners	2021-07-02 10:23:00 -05:00
Paul Woitaschek	a19968e0c9	Update dokka	2021-06-18 08:19:31 +02:00
Paul Woitaschek	5501ab2ac8	Remove the deprecated jcenter repo.	2021-06-17 21:48:52 +02:00
Paul Woitaschek	804fdb615e	Update Gradle to 7.1	2021-06-16 12:29:18 +02:00
EricKuck	c01b2a74d6	Version bump	2021-02-05 15:33:01 -06:00
EricKuck	8a8622c261	Fixed issue with VP2 routers potentially restoring incorrectly	2021-02-05 13:04:37 -06:00
Eric Kuck	6820aa7d6a	Convert demo app to Kotlin w/ ViewBinding (#635 )	2020-12-22 13:09:57 -06:00
EricKuck	9ce27e4dee	Added proguard rules to keep empty constructors	2020-12-22 11:49:40 -06:00
Eric Kuck	3c8ad0a833	Switch to GitHub Actions for CI	2020-12-21 14:53:11 -06:00
EricKuck	a720ac57e8	Move env vars out of travis config	2020-12-21 11:28:31 -06:00
EricKuck	7d6901389b	Always attempt to restore child controllers, even if the views might not exist anymore Likely fixes #631, #632	2020-11-30 22:43:19 -06:00
EricKuck	e54e88bf0d	Ensure VP2 adapter saves visible controller instance states Fixes #634	2020-11-30 22:37:00 -06:00
EricKuck	010117603c	Ensure all views are removed when VP2 pages are detached	2020-11-06 10:25:49 -06:00
EricKuck	cd11ac9d6b	Version bump for 3.0.0 release	2020-11-05 14:40:15 -06:00
EricKuck	e78347709b	Revert to Java 7 - we'll be kotlinizing soon anyway	2020-11-05 14:12:34 -06:00
EricKuck	341debc5b9	Bump back kotlin version	2020-11-04 16:59:35 -06:00
EricKuck	2346e48154	Fix errant onAttach calls for children whose parents were popped on attach Fixes #481 Fixes #426 Fixes #407	2020-11-04 16:58:04 -06:00
EricKuck	4174e12958	Fix bug where old views could remain in the hierarchy after being popped Fixes #608	2020-11-04 16:06:55 -06:00
EricKuck	c0abed0813	Fix popping a controller during view creation Fixes #348	2020-11-04 12:58:50 -06:00
Eric Kuck	6fdb1d6ed3	Adds ViewPager2 Adapter (#594 )	2020-11-03 16:17:30 -06:00
Eric Kuck	3334b8e21f	Don't remove host references on configuration changes (#629 ) Should fix #567	2020-11-03 16:13:17 -06:00
Paul Woitaschek	240424dc63	Lint changehandler subclass fix (#627 ) * Updated gradle to 6.7 * Updated AGP to 4.1.0 and infer lint from the agp version. * Suppress the UnstableApiUsage on the lint tests. * Added a test case where private change handler extends a base class that extends from the ControllerChangeHandler. * Fixed the test case by checking the all super classes. * Added a controller stub for the controleller detector tests. * Added a testcase for when a controller has a base class. * Added a testcase for when a controller has a base class. * Accept licenses before installing for travis. * Attempt to not add the android components. * Removed the licenses command. * Added the preview license too.	2020-10-27 08:23:55 +01:00
Eric Kuck	f768e9ab00	Pushing to child router while unattached fixed. Closes #606 (#607 )	2020-05-13 14:24:41 -05:00
Islom Matnazarov	4c89124683	Update CircularRevealChangeHandler to not ignore removesFromViewOnPush (#600 )	2020-05-11 11:17:09 -05:00
Eric Kuck	e0bbd48935	Remove platform transition module	2020-05-04 20:14:33 -05:00
Eric Kuck	76074d1e3d	Update mvn publish plugin, version bump	2020-05-04 18:07:12 -05:00
Eric Kuck	623ed03df8	Revert transition module package name change	2020-05-04 17:56:53 -05:00
Eric Kuck	28b8810e56	Fixes tests	2020-05-04 17:55:11 -05:00
Eric Kuck	5c397404ce	ChangeHandlerFrameLayout now open	2020-05-04 17:05:48 -05:00
Eric Kuck	3b81a962b1	Revert attachRouter as an extension	2020-05-04 17:05:07 -05:00
Eric Kuck	4f3662bbf6	Fixes a potential state restoration NPE Could occur if backing containers for child controllers are not immediately available when the app is restored after being killed.	2020-04-27 15:59:31 -05:00
Paul Woitaschek	c53b8d9d49	Migrated the StateSaveTests to kotlin and set an id on the frame layout.	2020-04-12 08:58:15 +02:00
Paul Woitaschek	c8f6e552e4	Require setting an id in getChildRouter. Fixes #515	2020-04-12 08:43:53 +02:00
Paul Woitaschek	c1cc2e2bca	Updated robolectric.	2020-04-12 08:22:41 +02:00
Paul Woitaschek	9ace20b88b	Updated AGP	2020-04-12 08:22:31 +02:00
Paul Woitaschek	d8606498b0	For rotating, change the requested orientation.	2020-04-12 08:21:31 +02:00
Paul Woitaschek	f35768393d	Migrated the AcitvityProxy to kotlin.	2020-04-12 08:11:51 +02:00
Chris Horner	bbb4e8c066	Add platform transition module (#591 )	2020-04-04 21:40:02 -05:00
Eric Kuck	12e66867f1	Version bumps	2020-03-30 12:27:21 -05:00
Paul Woitaschek	8eee79dcea	Updated lint. (#587 )	2020-03-30 11:37:34 -05:00
Eric Kuck	5ebd8c9a5d	Minor lambda cleanup	2020-03-30 11:22:38 -05:00
Eric Kuck	4c9f2e9f30	RestoreViewOnCreateController functionality merged into Controller	2020-03-30 11:19:04 -05:00
Eric Kuck	b0340d4c67	Removes platform TransitionChangeHandler	2020-03-30 11:12:07 -05:00
Eric Kuck	f6b396f679	Removes RxLifecycle for RxJava 1	2020-03-30 11:10:54 -05:00
Paul Woitaschek	589cb91fff	Introduce Kotlin (and Java 8) (#585 ) * Introduce kotlin and converted the ControllerChangeType to kotlin. * Migrated the ThreadUtils to kotlin. * Migrated the TransactionIndexer to kotlin. * Migrated the ChangeHandlerFrameLayout to kotlin. * Migrated Conductor to kotlin. * Added RestrictTo annotations. * Migrated the RouterRequiringFunc to kotlin. * Migrated the RouterTransaction to kotlin * Make use of diamonds. * Make use of lambdas and method references. * Use an interface with default implementations for the LifecycleListener. * Simplify the attachRouter function. * Updated the code style and checkin the idea folder. * Use a Controller extension function for the router transaction. * Use let's instead of forced !! casts. * Added default implementations of ControllerChangeListener * Migrated the NoOpControllerChangeHandler to kotlin. * Use a top level extension function for the asTransaction function. * Add JvmField annotations to the ControllerChangeType fields. * Use the local variables instead of calling the controller again.	2020-03-30 16:37:13 +02:00
Paul Woitaschek	a51f4192cb	Updated AGP to 3.6.1	2020-03-28 21:29:19 +01:00
Paul Woitaschek	266d6a0fd6	Updated the androidx annotations.	2020-03-28 21:24:34 +01:00
Paul Woitaschek	7410f7d123	Disabled the jetifier as it's no longer needed.	2020-03-28 21:24:13 +01:00
Paul Woitaschek	56b5ce3b33	Updated gradle to 6.3	2020-03-28 21:23:21 +01:00
Paul Woitaschek	a20ee6477a	Replaced unmock with robolectric.	2020-03-28 21:22:55 +01:00
Eric Kuck	41f14f6ae5	support package renamed to viewpager	2020-03-28 14:44:15 -05:00
Alexey Glushkov	a170942ae1	fix of removing/adding child view controller views when the retain mode of a parent controller is RETAIN_DETACH (#571 )	2020-03-28 14:36:11 -05:00
Alexey Glushkov	6df6ce8de7	Fix Conductor pending changes lock, related to #287 discussion (#570 )	2020-03-28 14:33:44 -05:00
Chris Horner	7ddc115918	Fix memory leak in SharedElementTransitionChangeHandler. (#528 )	2020-03-28 14:26:41 -05:00
Alexey Glushkov	5f8f3ad98e	Fix #563 bug: Controller in the middle of a backstack isn't destroyed after calling popController (#569 )	2020-03-28 14:19:42 -05:00
Eric Kuck	5205033cc6	Renamed support->viewpager, removed old deprecated code	2020-03-28 14:07:19 -05:00
Steven Schoen	bbd26995c5	Add androidx-transition module, update demos (#584 )	2020-03-26 21:54:25 -05:00
Eric Kuck	94e4112ece	Travis updates	2020-03-24 11:32:37 -05:00
Eric Kuck	45db55c678	Fixes RouterPagerAdapter state restoration when removing pages. Fixes #582	2020-03-24 11:17:06 -05:00
dtrabo	7a00a6777e	Fixed outdated docs (#576 )	2019-12-06 16:04:40 -06:00
Eric Kuck	7a50f12740	Build tools updates	2019-08-11 11:14:36 -05:00
Steven Schoen	530bd551e2	Fix TransitionChangeHandlers getting stuck when two are run simultaneously (#547 ) * Fix TransitionChangeHandlers getting stuck when two are run simultaneously * Don't unnecessarily re-execute changes	2019-08-11 11:09:58 -05:00
Steven Schoen	e40cdf2fb0	Keep ControllerChangeHandler default constructor in Proguard rules (#550 )	2019-08-11 10:46:56 -05:00
Eric Kuck	94c9121bb1	Fixed logic error that could result in undestroyed controllers	2019-04-06 14:58:54 -04:00
Eric Kuck	f72b5bed65	Fixes #524 - onContextAvailable not being called on all child controllers	2019-03-26 18:24:30 -05:00
Eric Kuck	7cb681f6f1	Fixed an edge case that could result in View being null in change handlers when setting backstack before view has been fully restored	2019-03-01 16:48:36 +02:00
Isuru Kusumal Rajapakse	f80d78858d	Fix MainActivity from leaking by releasing the listeners kept by handlers (#502 )	2019-02-27 15:29:09 +02:00
Eric Kuck	6f856453c1	Version bump	2018-12-18 14:41:18 -06:00
Eric Kuck	a6c50fccca	Fix for onAttach potentially being called after destroy	2018-12-18 14:21:48 -06:00
Shaishav Gandhi	9ad140d00f	Upgrade AutoDispose to 1.0.0 (#497 ) * Upgrade AutoDispose to 1.0.0	2018-11-04 07:36:53 +01:00
Paul Woitaschek	bb173b7cdc	Migrate to AndroidX. Fixes #490 (#492 ) * Gradle 4.10.2 * Android Build tools 3.2.1 * compileSdk 27, targetSdk 27, support libraries 28.0.0 * Migrated to androidX	2018-10-22 20:10:50 +02:00
Andy Byrnes	5f68328131	Fix README typos (#479 )	2018-09-18 15:49:47 -05:00
Eric Kuck	61826fb42b	Added a list of 3rd party modules to the readme	2018-09-04 11:35:09 -07:00
Shaishav Gandhi	6b5495a13b	Update AutoDispose to 1.0.0-RC2 (#469 ) * Upgrade AutoDispose to 1.0.0-RC2 Signed-off-by: shaishavgandhi05 <shaishgandhi@gmail.com> * Remove fully qualified reference Signed-off-by: shaishavgandhi05 <shaishgandhi@gmail.com>	2018-08-22 09:26:50 -05:00
Eric Kuck	7a24f77b59	No longer re-attaches controllers that shouldn't be attached when popController(controller) is called. Fixes #463 .	2018-08-09 14:40:15 -05:00
Paul Woitaschek	562ed171c3	Specify the current api for the IssueRegistry. (#460 )	2018-08-02 09:18:56 +02:00