Move FragmentLifecycleEvent into android.events package.

instacart · May 14, 2021 · 8d38746 · 8d38746
1 parent c9bb180
commit 8d38746
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,7 @@
 - Move `DisposableScope` into `android` package.
 - Move `FormulaFragment` into `android` package.
 - Move `BackCallback` into `android` package.
+- Move `FragmentLifecycleEvent` into `android.events` package.
 
 ## [0.6.1] - November 18, 2020
 - Bugfix: Fix runtime ignoring `Formula.key` for the root formula.

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
@@ -3,7 +3,7 @@ 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.fragment.FragmentLifecycleEvent
+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
@@ -5,7 +5,7 @@ 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.fragment.FragmentLifecycleEvent
+import com.instacart.formula.android.events.FragmentLifecycleEvent
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.disposables.Disposable
 

diff --git a/...ormula/fragment/FragmentLifecycleEvent.kt → .../android/events/FragmentLifecycleEvent.kt b/...ormula/fragment/FragmentLifecycleEvent.kt → .../android/events/FragmentLifecycleEvent.kt
@@ -1,4 +1,4 @@
-package com.instacart.formula.fragment
+package com.instacart.formula.android.events
 
 import com.instacart.formula.android.FragmentId
 

diff --git a/...la-android/src/main/java/com/instacart/formula/android/internal/FragmentFlowRenderView.kt b/...la-android/src/main/java/com/instacart/formula/android/internal/FragmentFlowRenderView.kt
@@ -13,7 +13,7 @@ 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.fragment.FragmentLifecycleEvent
+import com.instacart.formula.android.events.FragmentLifecycleEvent
 import com.instacart.formula.android.BackCallback
 import com.instacart.formula.android.FeatureEvent
 import com.instacart.formula.android.FragmentId

diff --git a/formula-android/src/main/java/com/instacart/formula/android/internal/FragmentLifecycle.kt b/formula-android/src/main/java/com/instacart/formula/android/internal/FragmentLifecycle.kt
@@ -7,7 +7,7 @@ import com.instacart.formula.android.FragmentId
 import com.instacart.formula.android.FragmentKey
 import com.instacart.formula.android.BaseFormulaFragment
 import com.instacart.formula.android.FormulaFragment
-import com.instacart.formula.fragment.FragmentLifecycleEvent
+import com.instacart.formula.android.events.FragmentLifecycleEvent
 
 /**
  * Provides utility method [lifecycleEvents] to track what fragments are added and removed from the backstack.

diff --git a/formula-android/src/main/java/com/instacart/formula/fragment/FragmentFlowStore.kt b/formula-android/src/main/java/com/instacart/formula/fragment/FragmentFlowStore.kt
@@ -11,6 +11,7 @@ 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
 import io.reactivex.rxjava3.core.Observable

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
@@ -7,7 +7,7 @@ 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.fragment.FragmentLifecycleEvent
+import com.instacart.formula.android.events.FragmentLifecycleEvent
 import com.instacart.formula.android.fakes.TestAccountFragmentContract
 import com.instacart.formula.android.fakes.TestLoginFragmentContract
 import com.instacart.formula.android.fakes.TestSignUpFragmentContract