diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationComponent.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationComponent.kt index c822da7540..97ef431fc1 100644 --- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationComponent.kt +++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationComponent.kt @@ -26,7 +26,7 @@ sealed class CollectionCreationChange : Change { } sealed class CollectionCreationAction : Action { - + object Close : CollectionCreationAction() } class CollectionCreationComponent( diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt index b72e5301b4..cfb09f6f5e 100644 --- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt +++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt @@ -32,7 +32,7 @@ class CollectionCreationUIView( init { view.back_button.setOnClickListener { - Log.e("Collection Creation", "Back button tapped") + actionEmitter.onNext(CollectionCreationAction.Close) } view.select_all_button.setOnClickListener { diff --git a/app/src/main/java/org/mozilla/fenix/collections/CreateCollectionFragment.kt b/app/src/main/java/org/mozilla/fenix/collections/CreateCollectionFragment.kt index 1e9b37994a..646a245f68 100644 --- a/app/src/main/java/org/mozilla/fenix/collections/CreateCollectionFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/collections/CreateCollectionFragment.kt @@ -16,6 +16,7 @@ import androidx.lifecycle.ViewModelProviders import kotlinx.android.synthetic.main.fragment_create_collection.view.* import org.mozilla.fenix.R import org.mozilla.fenix.mvi.ActionBusFactory +import org.mozilla.fenix.mvi.getAutoDisposeObservable import org.mozilla.fenix.mvi.getManagedEmitter class CreateCollectionFragment : DialogFragment() { @@ -48,6 +49,12 @@ class CreateCollectionFragment : DialogFragment() { }!!.tabs getManagedEmitter().onNext(CollectionCreationChange.TabListChange(tabs)) + + getAutoDisposeObservable().subscribe { + when (it) { + is CollectionCreationAction.Close -> dismissAllowingStateLoss() + } + } } companion object {