From 8d387460a573bee484ab260482277f90bcfa6715 Mon Sep 17 00:00:00 2001 From: Laimonas Turauskas Date: Wed, 12 May 2021 18:16:49 -0700 Subject: [PATCH] Move FragmentLifecycleEvent into android.events package. --- CHANGELOG.md | 1 + .../main/java/com/instacart/formula/android/ActivityStore.kt | 2 +- .../java/com/instacart/formula/android/ActivityStoreContext.kt | 2 +- .../{fragment => android/events}/FragmentLifecycleEvent.kt | 2 +- .../formula/android/internal/FragmentFlowRenderView.kt | 2 +- .../com/instacart/formula/android/internal/FragmentLifecycle.kt | 2 +- .../java/com/instacart/formula/fragment/FragmentFlowStore.kt | 1 + .../java/com/instacart/formula/android/FragmentFlowStoreTest.kt | 2 +- 8 files changed, 8 insertions(+), 6 deletions(-) rename formula-android/src/main/java/com/instacart/formula/{fragment => android/events}/FragmentLifecycleEvent.kt (92%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f7b1ece8..b8315e90a 100644 --- 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 index 6d8f3657f..5b7e9b137 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 @@ -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 index d93547e32..7d8545fa4 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 @@ -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/formula-android/src/main/java/com/instacart/formula/fragment/FragmentLifecycleEvent.kt b/formula-android/src/main/java/com/instacart/formula/android/events/FragmentLifecycleEvent.kt similarity index 92% rename from formula-android/src/main/java/com/instacart/formula/fragment/FragmentLifecycleEvent.kt rename to formula-android/src/main/java/com/instacart/formula/android/events/FragmentLifecycleEvent.kt index 158352d5a..d30a2639d 100644 --- a/formula-android/src/main/java/com/instacart/formula/fragment/FragmentLifecycleEvent.kt +++ b/formula-android/src/main/java/com/instacart/formula/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/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 4585f4924..8589273f6 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 @@ -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 index 3dccf85bc..2a26f6d28 100644 --- 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 index 8ccab79b8..894d4236c 100644 --- 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 index dd44a8f06..f7cc01d01 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 @@ -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