From a59917cdc0469f8ea1e49d3b55cbfada7ad11b77 Mon Sep 17 00:00:00 2001 From: mcarare Date: Wed, 27 May 2020 14:56:22 +0300 Subject: [PATCH] For #9626: Swap margin for padding and remove use of touch delegate. Also remove text margin to maintain visual appearance. --- .../org/mozilla/fenix/collections/CollectionCreationView.kt | 6 ------ app/src/main/res/layout/component_collection_creation.xml | 4 +--- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt index ec81bc1b4..cc315a2f7 100644 --- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt +++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt @@ -40,7 +40,6 @@ import mozilla.components.support.ktx.android.view.showKeyboard import org.mozilla.fenix.R import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.ext.components -import org.mozilla.fenix.ext.increaseTapArea import org.mozilla.fenix.ext.toShortUrl import org.mozilla.fenix.home.Tab @@ -68,10 +67,6 @@ class CollectionCreationView( transition.duration = TRANSITION_DURATION transition.excludeTarget(back_button, true) - view.bottom_bar_icon_button.apply { - increaseTapArea(increaseButtonByDps) - } - view.name_collection_edittext.filters += InputFilter.LengthFilter(COLLECTION_NAME_MAX_LENGTH) view.name_collection_edittext.setOnEditorActionListener { view, actionId, _ -> val text = view.text.toString() @@ -319,7 +314,6 @@ class CollectionCreationView( companion object { private const val TRANSITION_DURATION = 200L - private const val increaseButtonByDps = 16 private const val COLLECTION_NAME_MAX_LENGTH = 128 } } diff --git a/app/src/main/res/layout/component_collection_creation.xml b/app/src/main/res/layout/component_collection_creation.xml index c67030d7e..10d9e3cb6 100644 --- a/app/src/main/res/layout/component_collection_creation.xml +++ b/app/src/main/res/layout/component_collection_creation.xml @@ -146,7 +146,7 @@ android:id="@+id/bottom_bar_icon_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="16dp" + android:padding="16dp" android:background="?android:attr/selectableItemBackground" android:contentDescription="@string/create_collection_close" app:srcCompat="@drawable/mozac_ic_close" @@ -159,8 +159,6 @@ android:id="@+id/bottom_bar_text" android:layout_width="0dp" android:layout_height="0dp" - android:layout_marginStart="8dp" - android:layout_marginEnd="8dp" android:gravity="center_vertical" android:text="@string/create_collection_save_to_collection_empty" android:textColor="?neutral"