From 6540325e2eaa019768b615a4a767418a3d9e6466 Mon Sep 17 00:00:00 2001
From: Laimonas Turauskas <laimiux@gmail.com>
Date: Mon, 17 May 2021 09:41:43 -0700
Subject: [PATCH] Move remaining fragments classes into android package. (#205)

---
 CHANGELOG.md                                              | 5 +++++
 .../main/java/com/instacart/formula/test/TestContract.kt  | 4 ++--
 .../java/com/instacart/formula/test/TestContractWithId.kt | 4 ++--
 .../com/instacart/formula/test/TestFragmentActivity.kt    | 2 +-
 .../com/instacart/formula/test/TestFragmentComponent.kt   | 6 +++---
 .../com/instacart/formula/test/TestLifecycleContract.kt   | 6 +++---
 .../com/instacart/formula/FragmentFlowRenderViewTest.kt   | 4 ++--
 .../com/instacart/formula/FragmentLifecycleStateTest.kt   | 2 +-
 .../java/com/instacart/formula/android/ActivityStore.kt   | 2 --
 .../com/instacart/formula/android/ActivityStoreContext.kt | 2 --
 .../main/java/com/instacart/formula/android/Feature.kt    | 1 -
 .../java/com/instacart/formula/android/FeatureFactory.kt  | 2 --
 .../java/com/instacart/formula/android/FeatureView.kt     | 1 -
 .../java/com/instacart/formula/android/FormulaFragment.kt | 1 -
 .../instacart/formula/android/FragmentBindingBuilder.kt   | 1 -
 .../formula/{fragment => android}/FragmentComponent.kt    | 2 +-
 .../formula/{fragment => android}/FragmentContract.kt     | 3 +--
 .../formula/{fragment => android}/FragmentFlowState.kt    | 7 +------
 .../formula/{fragment => android}/FragmentFlowStore.kt    | 8 +-------
 .../{fragment => android}/FragmentLifecycleCallback.kt    | 2 +-
 .../java/com/instacart/formula/android/ViewInstance.kt    | 1 -
 .../formula/android/internal/ActivityStoreContextImpl.kt  | 2 +-
 .../formula/android/internal/FragmentFlowRenderView.kt    | 2 +-
 .../formula/android/views/FragmentContractViewFactory.kt  | 2 +-
 .../instacart/formula/android/ActivityStoreContextTest.kt | 1 -
 .../java/com/instacart/formula/android/FlowFactoryTest.kt | 1 -
 .../instacart/formula/android/FragmentFlowStoreTest.kt    | 2 --
 .../java/com/instacart/formula/android/fakes/DetailKey.kt | 4 ++--
 .../formula/android/fakes/FakeAuthFlowFactory.kt          | 2 +-
 .../com/instacart/formula/android/fakes/FakeComponent.kt  | 2 +-
 .../java/com/instacart/formula/android/fakes/MainKey.kt   | 4 ++--
 .../formula/android/fakes/TestAccountFragmentContract.kt  | 4 ++--
 .../formula/android/fakes/TestLoginFragmentContract.kt    | 4 ++--
 .../formula/android/fakes/TestSignUpFragmentContract.kt   | 4 ++--
 .../formula/android/fakes/TestTaskListContract.kt         | 4 ++--
 35 files changed, 41 insertions(+), 63 deletions(-)
 rename formula-android/src/main/java/com/instacart/formula/{fragment => android}/FragmentComponent.kt (98%)
 rename formula-android/src/main/java/com/instacart/formula/{fragment => android}/FragmentContract.kt (90%)
 rename formula-android/src/main/java/com/instacart/formula/{fragment => android}/FragmentFlowState.kt (78%)
 rename formula-android/src/main/java/com/instacart/formula/{fragment => android}/FragmentFlowStore.kt (94%)
 rename formula-android/src/main/java/com/instacart/formula/{fragment => android}/FragmentLifecycleCallback.kt (97%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 079b6efa7..d2e0c601f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,11 @@
 - Move `BackCallback` into `android` package.
 - Move `FragmentLifecycleEvent` into `android.events` package.
 - Move `Integration` into `android` package.
+- Move `FragmentLifecycleCallback` into `android` package.
+- Move `FragmentComponent` into `android` package.
+- Move `FragmentContract` into `android` package.
+- Move `FragmentFlowState` into `android` package.
+- Move `FragmentFlowStore` into `android` package.
 
 ## [0.6.1] - November 18, 2020
 - Bugfix: Fix runtime ignoring `Formula.key` for the root formula.
diff --git a/formula-android-tests/src/main/java/com/instacart/formula/test/TestContract.kt b/formula-android-tests/src/main/java/com/instacart/formula/test/TestContract.kt
index f6c900945..6e7b93daa 100644
--- a/formula-android-tests/src/main/java/com/instacart/formula/test/TestContract.kt
+++ b/formula-android-tests/src/main/java/com/instacart/formula/test/TestContract.kt
@@ -2,8 +2,8 @@ package com.instacart.formula.test
 
 import android.view.View
 import com.instacart.formula.R
-import com.instacart.formula.fragment.FragmentComponent
-import com.instacart.formula.fragment.FragmentContract
+import com.instacart.formula.android.FragmentComponent
+import com.instacart.formula.android.FragmentContract
 import kotlinx.android.parcel.Parcelize
 
 @Parcelize
diff --git a/formula-android-tests/src/main/java/com/instacart/formula/test/TestContractWithId.kt b/formula-android-tests/src/main/java/com/instacart/formula/test/TestContractWithId.kt
index c33c6c842..481fcafa9 100644
--- a/formula-android-tests/src/main/java/com/instacart/formula/test/TestContractWithId.kt
+++ b/formula-android-tests/src/main/java/com/instacart/formula/test/TestContractWithId.kt
@@ -2,8 +2,8 @@ package com.instacart.formula.test
 
 import android.view.View
 import com.instacart.formula.R
-import com.instacart.formula.fragment.FragmentComponent
-import com.instacart.formula.fragment.FragmentContract
+import com.instacart.formula.android.FragmentComponent
+import com.instacart.formula.android.FragmentContract
 import kotlinx.android.parcel.Parcelize
 
 @Parcelize
diff --git a/formula-android-tests/src/main/java/com/instacart/formula/test/TestFragmentActivity.kt b/formula-android-tests/src/main/java/com/instacart/formula/test/TestFragmentActivity.kt
index bc283e226..e45b55e22 100644
--- a/formula-android-tests/src/main/java/com/instacart/formula/test/TestFragmentActivity.kt
+++ b/formula-android-tests/src/main/java/com/instacart/formula/test/TestFragmentActivity.kt
@@ -5,7 +5,7 @@ import androidx.annotation.VisibleForTesting
 import com.instacart.formula.FormulaAndroid
 import com.instacart.formula.R
 import com.instacart.formula.android.FormulaFragment
-import com.instacart.formula.fragment.FragmentContract
+import com.instacart.formula.android.FragmentContract
 import com.instacart.formula.android.FragmentKey
 import com.instacart.formula.android.FormulaAppCompatActivity
 
diff --git a/formula-android-tests/src/main/java/com/instacart/formula/test/TestFragmentComponent.kt b/formula-android-tests/src/main/java/com/instacart/formula/test/TestFragmentComponent.kt
index 963f33442..b66ea151b 100644
--- a/formula-android-tests/src/main/java/com/instacart/formula/test/TestFragmentComponent.kt
+++ b/formula-android-tests/src/main/java/com/instacart/formula/test/TestFragmentComponent.kt
@@ -3,9 +3,9 @@ package com.instacart.formula.test
 import android.view.View
 import com.instacart.formula.RenderView
 import com.instacart.formula.Renderer
-import com.instacart.formula.fragment.FragmentComponent
-import com.instacart.formula.fragment.FragmentContract
-import com.instacart.formula.fragment.FragmentLifecycleCallback
+import com.instacart.formula.android.FragmentComponent
+import com.instacart.formula.android.FragmentContract
+import com.instacart.formula.android.FragmentLifecycleCallback
 
 object TestFragmentComponent {
 
diff --git a/formula-android-tests/src/main/java/com/instacart/formula/test/TestLifecycleContract.kt b/formula-android-tests/src/main/java/com/instacart/formula/test/TestLifecycleContract.kt
index 564c4b04d..378f921ef 100644
--- a/formula-android-tests/src/main/java/com/instacart/formula/test/TestLifecycleContract.kt
+++ b/formula-android-tests/src/main/java/com/instacart/formula/test/TestLifecycleContract.kt
@@ -3,9 +3,9 @@ package com.instacart.formula.test
 import android.os.Bundle
 import android.view.View
 import com.instacart.formula.R
-import com.instacart.formula.fragment.FragmentComponent
-import com.instacart.formula.fragment.FragmentContract
-import com.instacart.formula.fragment.FragmentLifecycleCallback
+import com.instacart.formula.android.FragmentComponent
+import com.instacart.formula.android.FragmentContract
+import com.instacart.formula.android.FragmentLifecycleCallback
 import kotlinx.android.parcel.IgnoredOnParcel
 import kotlinx.android.parcel.Parcelize
 
diff --git a/formula-android-tests/src/test/java/com/instacart/formula/FragmentFlowRenderViewTest.kt b/formula-android-tests/src/test/java/com/instacart/formula/FragmentFlowRenderViewTest.kt
index 5a2de3e9e..57b2f187e 100644
--- a/formula-android-tests/src/test/java/com/instacart/formula/FragmentFlowRenderViewTest.kt
+++ b/formula-android-tests/src/test/java/com/instacart/formula/FragmentFlowRenderViewTest.kt
@@ -6,8 +6,8 @@ import androidx.test.core.app.ActivityScenario
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
-import com.instacart.formula.fragment.FragmentContract
-import com.instacart.formula.fragment.FragmentFlowState
+import com.instacart.formula.android.FragmentContract
+import com.instacart.formula.android.FragmentFlowState
 import com.instacart.formula.android.FragmentKey
 import com.instacart.formula.android.BackCallback
 import com.instacart.formula.test.TestContract
diff --git a/formula-android-tests/src/test/java/com/instacart/formula/FragmentLifecycleStateTest.kt b/formula-android-tests/src/test/java/com/instacart/formula/FragmentLifecycleStateTest.kt
index 59a39a43f..8d07905bd 100644
--- a/formula-android-tests/src/test/java/com/instacart/formula/FragmentLifecycleStateTest.kt
+++ b/formula-android-tests/src/test/java/com/instacart/formula/FragmentLifecycleStateTest.kt
@@ -5,7 +5,7 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import com.instacart.formula.android.FormulaFragment
-import com.instacart.formula.fragment.FragmentContract
+import com.instacart.formula.android.FragmentContract
 import com.instacart.formula.android.ActivityStoreContext
 import com.instacart.formula.test.TestContract
 import com.instacart.formula.test.TestContractWithId
diff --git a/formula-android/src/main/java/com/instacart/formula/android/ActivityStore.kt b/formula-android/src/main/java/com/instacart/formula/android/ActivityStore.kt
index 5b7e9b137..0e21c0347 100644
--- a/formula-android/src/main/java/com/instacart/formula/android/ActivityStore.kt
+++ b/formula-android/src/main/java/com/instacart/formula/android/ActivityStore.kt
@@ -1,8 +1,6 @@
 package com.instacart.formula.android
 
 import androidx.fragment.app.FragmentActivity
-import com.instacart.formula.fragment.FragmentFlowState
-import com.instacart.formula.fragment.FragmentFlowStore
 import com.instacart.formula.android.events.FragmentLifecycleEvent
 import io.reactivex.rxjava3.disposables.Disposable
 
diff --git a/formula-android/src/main/java/com/instacart/formula/android/ActivityStoreContext.kt b/formula-android/src/main/java/com/instacart/formula/android/ActivityStoreContext.kt
index 7d8545fa4..d945f8a8f 100644
--- a/formula-android/src/main/java/com/instacart/formula/android/ActivityStoreContext.kt
+++ b/formula-android/src/main/java/com/instacart/formula/android/ActivityStoreContext.kt
@@ -3,8 +3,6 @@ package com.instacart.formula.android
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Lifecycle
 import com.instacart.formula.android.events.ActivityResult
-import com.instacart.formula.fragment.FragmentFlowState
-import com.instacart.formula.fragment.FragmentFlowStore
 import com.instacart.formula.android.events.FragmentLifecycleEvent
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.disposables.Disposable
diff --git a/formula-android/src/main/java/com/instacart/formula/android/Feature.kt b/formula-android/src/main/java/com/instacart/formula/android/Feature.kt
index 74937ba71..abc8e3c18 100644
--- a/formula-android/src/main/java/com/instacart/formula/android/Feature.kt
+++ b/formula-android/src/main/java/com/instacart/formula/android/Feature.kt
@@ -1,7 +1,6 @@
 package com.instacart.formula.android
 
 import io.reactivex.rxjava3.core.Observable
-import com.instacart.formula.fragment.FragmentFlowStore
 
 /**
  * Feature is based on uni-directional state management where a single state model drives
diff --git a/formula-android/src/main/java/com/instacart/formula/android/FeatureFactory.kt b/formula-android/src/main/java/com/instacart/formula/android/FeatureFactory.kt
index 434433677..3e7d90b63 100644
--- a/formula-android/src/main/java/com/instacart/formula/android/FeatureFactory.kt
+++ b/formula-android/src/main/java/com/instacart/formula/android/FeatureFactory.kt
@@ -1,7 +1,5 @@
 package com.instacart.formula.android
 
-import com.instacart.formula.fragment.FragmentFlowStore
-
 /**
  * Feature factory is responsible for creating a [Feature] for a specific [fragment key][Key].
  *
diff --git a/formula-android/src/main/java/com/instacart/formula/android/FeatureView.kt b/formula-android/src/main/java/com/instacart/formula/android/FeatureView.kt
index 1a83d21c2..e491b2a13 100644
--- a/formula-android/src/main/java/com/instacart/formula/android/FeatureView.kt
+++ b/formula-android/src/main/java/com/instacart/formula/android/FeatureView.kt
@@ -2,7 +2,6 @@ package com.instacart.formula.android
 
 import android.view.View
 import com.instacart.formula.Cancelable
-import com.instacart.formula.fragment.FragmentLifecycleCallback
 import io.reactivex.rxjava3.core.Observable
 
 /**
diff --git a/formula-android/src/main/java/com/instacart/formula/android/FormulaFragment.kt b/formula-android/src/main/java/com/instacart/formula/android/FormulaFragment.kt
index d64eecd83..cd97d27d7 100644
--- a/formula-android/src/main/java/com/instacart/formula/android/FormulaFragment.kt
+++ b/formula-android/src/main/java/com/instacart/formula/android/FormulaFragment.kt
@@ -6,7 +6,6 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.instacart.formula.Cancelable
-import com.instacart.formula.fragment.FragmentLifecycleCallback
 import com.jakewharton.rxrelay3.BehaviorRelay
 
 class FormulaFragment : Fragment(), BaseFormulaFragment<Any> {
diff --git a/formula-android/src/main/java/com/instacart/formula/android/FragmentBindingBuilder.kt b/formula-android/src/main/java/com/instacart/formula/android/FragmentBindingBuilder.kt
index 7016ceb8e..1c2bd3f1a 100644
--- a/formula-android/src/main/java/com/instacart/formula/android/FragmentBindingBuilder.kt
+++ b/formula-android/src/main/java/com/instacart/formula/android/FragmentBindingBuilder.kt
@@ -4,7 +4,6 @@ import com.instacart.formula.android.internal.Binding
 import com.instacart.formula.android.internal.Bindings
 import com.instacart.formula.android.internal.FunctionUtils
 import com.instacart.formula.android.views.FragmentContractViewFactory
-import com.instacart.formula.fragment.FragmentContract
 import com.instacart.formula.android.internal.FeatureBinding
 import io.reactivex.rxjava3.core.Observable
 import java.lang.IllegalStateException
diff --git a/formula-android/src/main/java/com/instacart/formula/fragment/FragmentComponent.kt b/formula-android/src/main/java/com/instacart/formula/android/FragmentComponent.kt
similarity index 98%
rename from formula-android/src/main/java/com/instacart/formula/fragment/FragmentComponent.kt
rename to formula-android/src/main/java/com/instacart/formula/android/FragmentComponent.kt
index e9cf7d996..0ef13692a 100644
--- a/formula-android/src/main/java/com/instacart/formula/fragment/FragmentComponent.kt
+++ b/formula-android/src/main/java/com/instacart/formula/android/FragmentComponent.kt
@@ -1,4 +1,4 @@
-package com.instacart.formula.fragment
+package com.instacart.formula.android
 
 import com.instacart.formula.Renderer
 import com.instacart.formula.RenderView
diff --git a/formula-android/src/main/java/com/instacart/formula/fragment/FragmentContract.kt b/formula-android/src/main/java/com/instacart/formula/android/FragmentContract.kt
similarity index 90%
rename from formula-android/src/main/java/com/instacart/formula/fragment/FragmentContract.kt
rename to formula-android/src/main/java/com/instacart/formula/android/FragmentContract.kt
index 186bcc9f6..b033a39ba 100644
--- a/formula-android/src/main/java/com/instacart/formula/fragment/FragmentContract.kt
+++ b/formula-android/src/main/java/com/instacart/formula/android/FragmentContract.kt
@@ -1,7 +1,6 @@
-package com.instacart.formula.fragment
+package com.instacart.formula.android
 
 import android.view.View
-import com.instacart.formula.android.FragmentKey
 
 /**
  * Responsible for providing a [FragmentComponent]
diff --git a/formula-android/src/main/java/com/instacart/formula/fragment/FragmentFlowState.kt b/formula-android/src/main/java/com/instacart/formula/android/FragmentFlowState.kt
similarity index 78%
rename from formula-android/src/main/java/com/instacart/formula/fragment/FragmentFlowState.kt
rename to formula-android/src/main/java/com/instacart/formula/android/FragmentFlowState.kt
index 5e3d122bb..f85809dad 100644
--- a/formula-android/src/main/java/com/instacart/formula/fragment/FragmentFlowState.kt
+++ b/formula-android/src/main/java/com/instacart/formula/android/FragmentFlowState.kt
@@ -1,9 +1,4 @@
-package com.instacart.formula.fragment
-
-import com.instacart.formula.android.FragmentId
-import com.instacart.formula.android.FeatureEvent
-import com.instacart.formula.android.FragmentKey
-import com.instacart.formula.android.FragmentState
+package com.instacart.formula.android
 
 /**
  * Represents currently [activeKeys] and their [states].
diff --git a/formula-android/src/main/java/com/instacart/formula/fragment/FragmentFlowStore.kt b/formula-android/src/main/java/com/instacart/formula/android/FragmentFlowStore.kt
similarity index 94%
rename from formula-android/src/main/java/com/instacart/formula/fragment/FragmentFlowStore.kt
rename to formula-android/src/main/java/com/instacart/formula/android/FragmentFlowStore.kt
index 894d4236c..7eeada0df 100644
--- a/formula-android/src/main/java/com/instacart/formula/fragment/FragmentFlowStore.kt
+++ b/formula-android/src/main/java/com/instacart/formula/android/FragmentFlowStore.kt
@@ -1,16 +1,10 @@
-package com.instacart.formula.fragment
+package com.instacart.formula.android
 
 import com.instacart.formula.Evaluation
 import com.instacart.formula.Formula
 import com.instacart.formula.FormulaContext
-import com.instacart.formula.android.FragmentId
 import com.instacart.formula.rxjava3.RxStream
 import com.instacart.formula.android.internal.Binding
-import com.instacart.formula.android.FeatureEvent
-import com.instacart.formula.android.DisposableScope
-import com.instacart.formula.android.FragmentBindingBuilder
-import com.instacart.formula.android.FragmentEnvironment
-import com.instacart.formula.android.FragmentState
 import com.instacart.formula.android.events.FragmentLifecycleEvent
 import com.instacart.formula.rxjava3.toObservable
 import com.jakewharton.rxrelay3.PublishRelay
diff --git a/formula-android/src/main/java/com/instacart/formula/fragment/FragmentLifecycleCallback.kt b/formula-android/src/main/java/com/instacart/formula/android/FragmentLifecycleCallback.kt
similarity index 97%
rename from formula-android/src/main/java/com/instacart/formula/fragment/FragmentLifecycleCallback.kt
rename to formula-android/src/main/java/com/instacart/formula/android/FragmentLifecycleCallback.kt
index 270b4bc57..76afbfdd5 100644
--- a/formula-android/src/main/java/com/instacart/formula/fragment/FragmentLifecycleCallback.kt
+++ b/formula-android/src/main/java/com/instacart/formula/android/FragmentLifecycleCallback.kt
@@ -1,4 +1,4 @@
-package com.instacart.formula.fragment
+package com.instacart.formula.android
 
 import android.os.Bundle
 import android.view.View
diff --git a/formula-android/src/main/java/com/instacart/formula/android/ViewInstance.kt b/formula-android/src/main/java/com/instacart/formula/android/ViewInstance.kt
index 265d213ae..2123b9393 100644
--- a/formula-android/src/main/java/com/instacart/formula/android/ViewInstance.kt
+++ b/formula-android/src/main/java/com/instacart/formula/android/ViewInstance.kt
@@ -4,7 +4,6 @@ import android.view.View
 import com.instacart.formula.RenderView
 import com.instacart.formula.Renderer
 import com.instacart.formula.android.views.FeatureViewBindFunction
-import com.instacart.formula.fragment.FragmentLifecycleCallback
 
 /**
  * View instance contains an initialized Android [view] and provides factory
diff --git a/formula-android/src/main/java/com/instacart/formula/android/internal/ActivityStoreContextImpl.kt b/formula-android/src/main/java/com/instacart/formula/android/internal/ActivityStoreContextImpl.kt
index a212a983e..796c6b6d2 100644
--- a/formula-android/src/main/java/com/instacart/formula/android/internal/ActivityStoreContextImpl.kt
+++ b/formula-android/src/main/java/com/instacart/formula/android/internal/ActivityStoreContextImpl.kt
@@ -3,7 +3,7 @@ package com.instacart.formula.android.internal
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Lifecycle
 import com.instacart.formula.android.events.ActivityResult
-import com.instacart.formula.fragment.FragmentFlowState
+import com.instacart.formula.android.FragmentFlowState
 import com.instacart.formula.android.FragmentKey
 import com.instacart.formula.android.FragmentId
 import com.instacart.formula.android.ActivityStoreContext
diff --git a/formula-android/src/main/java/com/instacart/formula/android/internal/FragmentFlowRenderView.kt b/formula-android/src/main/java/com/instacart/formula/android/internal/FragmentFlowRenderView.kt
index 8589273f6..b1d41b4d7 100644
--- a/formula-android/src/main/java/com/instacart/formula/android/internal/FragmentFlowRenderView.kt
+++ b/formula-android/src/main/java/com/instacart/formula/android/internal/FragmentFlowRenderView.kt
@@ -12,7 +12,7 @@ import com.instacart.formula.RenderView
 import com.instacart.formula.android.BaseFormulaFragment
 import com.instacart.formula.android.FormulaFragment
 import com.instacart.formula.android.FragmentEnvironment
-import com.instacart.formula.fragment.FragmentFlowState
+import com.instacart.formula.android.FragmentFlowState
 import com.instacart.formula.android.events.FragmentLifecycleEvent
 import com.instacart.formula.android.BackCallback
 import com.instacart.formula.android.FeatureEvent
diff --git a/formula-android/src/main/java/com/instacart/formula/android/views/FragmentContractViewFactory.kt b/formula-android/src/main/java/com/instacart/formula/android/views/FragmentContractViewFactory.kt
index 42dd6b455..2f3cbcf24 100644
--- a/formula-android/src/main/java/com/instacart/formula/android/views/FragmentContractViewFactory.kt
+++ b/formula-android/src/main/java/com/instacart/formula/android/views/FragmentContractViewFactory.kt
@@ -4,7 +4,7 @@ import com.instacart.formula.android.FeatureView
 import com.instacart.formula.android.LayoutViewFactory
 import com.instacart.formula.android.ViewFactory
 import com.instacart.formula.android.ViewInstance
-import com.instacart.formula.fragment.FragmentContract
+import com.instacart.formula.android.FragmentContract
 
 /**
  * An implementation of [ViewFactory] which delegates implementation to [FragmentContract].
diff --git a/formula-android/src/test/java/com/instacart/formula/android/ActivityStoreContextTest.kt b/formula-android/src/test/java/com/instacart/formula/android/ActivityStoreContextTest.kt
index 0da5bfdfb..8db99d6b3 100644
--- a/formula-android/src/test/java/com/instacart/formula/android/ActivityStoreContextTest.kt
+++ b/formula-android/src/test/java/com/instacart/formula/android/ActivityStoreContextTest.kt
@@ -3,7 +3,6 @@ package com.instacart.formula.android
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Lifecycle
 import com.instacart.formula.android.internal.ActivityStoreContextImpl
-import com.instacart.formula.fragment.FragmentContract
 import com.jakewharton.rxrelay3.PublishRelay
 import com.nhaarman.mockito_kotlin.mock
 import com.nhaarman.mockito_kotlin.verify
diff --git a/formula-android/src/test/java/com/instacart/formula/android/FlowFactoryTest.kt b/formula-android/src/test/java/com/instacart/formula/android/FlowFactoryTest.kt
index db6944a8b..1699f0a79 100644
--- a/formula-android/src/test/java/com/instacart/formula/android/FlowFactoryTest.kt
+++ b/formula-android/src/test/java/com/instacart/formula/android/FlowFactoryTest.kt
@@ -1,7 +1,6 @@
 package com.instacart.formula.android
 
 import com.google.common.truth.Truth
-import com.instacart.formula.fragment.FragmentFlowStore
 import com.instacart.formula.android.fakes.TestAccountFragmentContract
 import com.instacart.formula.android.fakes.TestLoginFragmentContract
 import com.instacart.formula.android.fakes.TestSignUpFragmentContract
diff --git a/formula-android/src/test/java/com/instacart/formula/android/FragmentFlowStoreTest.kt b/formula-android/src/test/java/com/instacart/formula/android/FragmentFlowStoreTest.kt
index f7cc01d01..920dafd92 100644
--- a/formula-android/src/test/java/com/instacart/formula/android/FragmentFlowStoreTest.kt
+++ b/formula-android/src/test/java/com/instacart/formula/android/FragmentFlowStoreTest.kt
@@ -5,8 +5,6 @@ import com.instacart.formula.android.fakes.DetailKey
 import com.instacart.formula.android.fakes.FakeAuthFlowFactory
 import com.instacart.formula.android.fakes.FakeComponent
 import com.instacart.formula.android.fakes.MainKey
-import com.instacart.formula.fragment.FragmentContract
-import com.instacart.formula.fragment.FragmentFlowStore
 import com.instacart.formula.android.events.FragmentLifecycleEvent
 import com.instacart.formula.android.fakes.TestAccountFragmentContract
 import com.instacart.formula.android.fakes.TestLoginFragmentContract
diff --git a/formula-android/src/test/java/com/instacart/formula/android/fakes/DetailKey.kt b/formula-android/src/test/java/com/instacart/formula/android/fakes/DetailKey.kt
index c6f3c2045..d82b3218e 100644
--- a/formula-android/src/test/java/com/instacart/formula/android/fakes/DetailKey.kt
+++ b/formula-android/src/test/java/com/instacart/formula/android/fakes/DetailKey.kt
@@ -1,8 +1,8 @@
 package com.instacart.formula.android.fakes
 
 import android.view.View
-import com.instacart.formula.fragment.FragmentComponent
-import com.instacart.formula.fragment.FragmentContract
+import com.instacart.formula.android.FragmentComponent
+import com.instacart.formula.android.FragmentContract
 import kotlinx.android.parcel.Parcelize
 
 @Parcelize
diff --git a/formula-android/src/test/java/com/instacart/formula/android/fakes/FakeAuthFlowFactory.kt b/formula-android/src/test/java/com/instacart/formula/android/fakes/FakeAuthFlowFactory.kt
index c36865cc1..8b84b3c04 100644
--- a/formula-android/src/test/java/com/instacart/formula/android/fakes/FakeAuthFlowFactory.kt
+++ b/formula-android/src/test/java/com/instacart/formula/android/fakes/FakeAuthFlowFactory.kt
@@ -2,7 +2,7 @@ package com.instacart.formula.android.fakes
 
 import com.instacart.formula.android.Flow
 import com.instacart.formula.android.FlowFactory
-import com.instacart.formula.fragment.FragmentContract
+import com.instacart.formula.android.FragmentContract
 import com.instacart.formula.android.DisposableScope
 import io.reactivex.rxjava3.core.Observable
 
diff --git a/formula-android/src/test/java/com/instacart/formula/android/fakes/FakeComponent.kt b/formula-android/src/test/java/com/instacart/formula/android/fakes/FakeComponent.kt
index 9f978a65f..e140504bf 100644
--- a/formula-android/src/test/java/com/instacart/formula/android/fakes/FakeComponent.kt
+++ b/formula-android/src/test/java/com/instacart/formula/android/fakes/FakeComponent.kt
@@ -1,6 +1,6 @@
 package com.instacart.formula.android.fakes
 
-import com.instacart.formula.fragment.FragmentContract
+import com.instacart.formula.android.FragmentContract
 import com.instacart.formula.android.FragmentKey
 import com.instacart.formula.android.DisposableScope
 import com.jakewharton.rxrelay3.PublishRelay
diff --git a/formula-android/src/test/java/com/instacart/formula/android/fakes/MainKey.kt b/formula-android/src/test/java/com/instacart/formula/android/fakes/MainKey.kt
index ef9aeea15..7529ffb0b 100644
--- a/formula-android/src/test/java/com/instacart/formula/android/fakes/MainKey.kt
+++ b/formula-android/src/test/java/com/instacart/formula/android/fakes/MainKey.kt
@@ -1,8 +1,8 @@
 package com.instacart.formula.android.fakes
 
 import android.view.View
-import com.instacart.formula.fragment.FragmentComponent
-import com.instacart.formula.fragment.FragmentContract
+import com.instacart.formula.android.FragmentComponent
+import com.instacart.formula.android.FragmentContract
 import kotlinx.android.parcel.Parcelize
 
 @Parcelize
diff --git a/formula-android/src/test/java/com/instacart/formula/android/fakes/TestAccountFragmentContract.kt b/formula-android/src/test/java/com/instacart/formula/android/fakes/TestAccountFragmentContract.kt
index bc3b4e47e..36c1277b1 100644
--- a/formula-android/src/test/java/com/instacart/formula/android/fakes/TestAccountFragmentContract.kt
+++ b/formula-android/src/test/java/com/instacart/formula/android/fakes/TestAccountFragmentContract.kt
@@ -1,8 +1,8 @@
 package com.instacart.formula.android.fakes
 
 import android.view.View
-import com.instacart.formula.fragment.FragmentComponent
-import com.instacart.formula.fragment.FragmentContract
+import com.instacart.formula.android.FragmentComponent
+import com.instacart.formula.android.FragmentContract
 import kotlinx.android.parcel.Parcelize
 
 @Parcelize
diff --git a/formula-android/src/test/java/com/instacart/formula/android/fakes/TestLoginFragmentContract.kt b/formula-android/src/test/java/com/instacart/formula/android/fakes/TestLoginFragmentContract.kt
index 845160742..1c051bf95 100644
--- a/formula-android/src/test/java/com/instacart/formula/android/fakes/TestLoginFragmentContract.kt
+++ b/formula-android/src/test/java/com/instacart/formula/android/fakes/TestLoginFragmentContract.kt
@@ -1,8 +1,8 @@
 package com.instacart.formula.android.fakes
 
 import android.view.View
-import com.instacart.formula.fragment.FragmentComponent
-import com.instacart.formula.fragment.FragmentContract
+import com.instacart.formula.android.FragmentComponent
+import com.instacart.formula.android.FragmentContract
 import kotlinx.android.parcel.Parcelize
 
 @Parcelize
diff --git a/formula-android/src/test/java/com/instacart/formula/android/fakes/TestSignUpFragmentContract.kt b/formula-android/src/test/java/com/instacart/formula/android/fakes/TestSignUpFragmentContract.kt
index c70cc3f80..7b1722253 100644
--- a/formula-android/src/test/java/com/instacart/formula/android/fakes/TestSignUpFragmentContract.kt
+++ b/formula-android/src/test/java/com/instacart/formula/android/fakes/TestSignUpFragmentContract.kt
@@ -1,8 +1,8 @@
 package com.instacart.formula.android.fakes
 
 import android.view.View
-import com.instacart.formula.fragment.FragmentComponent
-import com.instacart.formula.fragment.FragmentContract
+import com.instacart.formula.android.FragmentComponent
+import com.instacart.formula.android.FragmentContract
 import kotlinx.android.parcel.Parcelize
 
 @Parcelize
diff --git a/formula-android/src/test/java/com/instacart/formula/android/fakes/TestTaskListContract.kt b/formula-android/src/test/java/com/instacart/formula/android/fakes/TestTaskListContract.kt
index 88f5b62c8..3e041f757 100644
--- a/formula-android/src/test/java/com/instacart/formula/android/fakes/TestTaskListContract.kt
+++ b/formula-android/src/test/java/com/instacart/formula/android/fakes/TestTaskListContract.kt
@@ -1,8 +1,8 @@
 package com.instacart.formula.android.fakes
 
 import android.view.View
-import com.instacart.formula.fragment.FragmentComponent
-import com.instacart.formula.fragment.FragmentContract
+import com.instacart.formula.android.FragmentComponent
+import com.instacart.formula.android.FragmentContract
 import kotlinx.android.parcel.Parcelize
 
 @Parcelize