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 aa6925eb0..53748736e 100644 --- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt +++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt @@ -13,6 +13,7 @@ import io.reactivex.Observer import io.reactivex.Observable import io.reactivex.functions.Consumer import kotlinx.android.synthetic.main.component_collection_creation.view.* +import org.mozilla.fenix.ext.increaseTapArea import org.mozilla.fenix.mvi.UIView class CollectionCreationUIView( @@ -38,6 +39,13 @@ class CollectionCreationUIView( actionEmitter.onNext(CollectionCreationAction.SelectAllTapped) } + view.close_icon.apply { + increaseTapArea(increaseButtonByDps) + setOnClickListener { + actionEmitter.onNext(CollectionCreationAction.Close) + } + } + view.tab_list.run { adapter = collectionCreationTabListAdapter layoutManager = LinearLayoutManager(container.context, RecyclerView.VERTICAL, true) @@ -53,6 +61,11 @@ class CollectionCreationUIView( view.context.getString(R.string.create_collection_save_to_collection_full, it.selectedTabs.size) } + view.add_tabs_button.contentDescription = buttonText view.add_tabs_button_text.text = buttonText } + + companion object { + private const val increaseButtonByDps = 16 + } } \ No newline at end of file diff --git a/app/src/main/res/layout/component_collection_creation.xml b/app/src/main/res/layout/component_collection_creation.xml index 0e3efaaf1..75d5f5359 100644 --- a/app/src/main/res/layout/component_collection_creation.xml +++ b/app/src/main/res/layout/component_collection_creation.xml @@ -58,15 +58,18 @@ android:layout_height="wrap_content" android:layout_margin="16dp" android:background="@drawable/add_tabs_to_collection_background" + android:foreground="?android:attr/selectableItemBackgroundBorderless" android:clipToPadding="false" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent"> - %d tabs selected + + + Close