From b6dfd81cd258f21eb92496e1b5fa801c16e39fb2 Mon Sep 17 00:00:00 2001 From: Emily Kager Date: Tue, 4 Jun 2019 08:35:47 -0700 Subject: [PATCH] [fenix] Closes https://github.com/mozilla-mobile/fenix/issues/1618 - Add fade to awesome bar list instead of shadow (https://github.com/mozilla-mobile/fenix/pull/3110) * Closes https://github.com/mozilla-mobile/fenix/issues/1618 - Add fade to awesome bar list instead of shadow * For https://github.com/mozilla-mobile/fenix/issues/1211 - Hide keyboard on fling suggestions list --- .../fenix/search/awesomebar/AwesomeBarUIView.kt | 11 +++++++++++ app/src/main/res/layout/component_awesomebar.xml | 6 ++++-- app/src/main/res/layout/fragment_search.xml | 10 +++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt index efa91d8686..27fdaf6ae2 100644 --- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt +++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt @@ -8,6 +8,7 @@ import android.graphics.PorterDuff import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.ContextCompat +import androidx.recyclerview.widget.RecyclerView import io.reactivex.Observable import io.reactivex.Observer import io.reactivex.functions.Consumer @@ -21,6 +22,7 @@ import mozilla.components.feature.awesomebar.provider.SessionSuggestionProvider import mozilla.components.feature.search.SearchUseCases import mozilla.components.feature.session.SessionUseCases import mozilla.components.support.ktx.android.graphics.drawable.toBitmap +import mozilla.components.support.ktx.android.view.hideKeyboard import org.mozilla.fenix.R import org.mozilla.fenix.ThemeManager import org.mozilla.fenix.ext.components @@ -156,6 +158,15 @@ class AwesomeBarUIView( ) shortcutEngineManager.shortcutsEnginePickerProvider = shortcutsEnginePickerProvider + + val listener = object : RecyclerView.OnFlingListener() { + override fun onFling(velocityX: Int, velocityY: Int): Boolean { + view.hideKeyboard() + return false + } + } + + view.onFlingListener = listener } } diff --git a/app/src/main/res/layout/component_awesomebar.xml b/app/src/main/res/layout/component_awesomebar.xml index fe31f4d760..0d874888df 100644 --- a/app/src/main/res/layout/component_awesomebar.xml +++ b/app/src/main/res/layout/component_awesomebar.xml @@ -8,8 +8,10 @@ android:id="@+id/awesomeBar" android:layout_width="0dp" android:layout_height="0dp" - android:padding="4dp" - app:layout_constraintBottom_toTopOf="@id/pill_wrapper" + android:fadingEdge="horizontal" + android:fadingEdgeLength="40dp" + android:requiresFadingEdge="vertical" + app:layout_constraintBottom_toTopOf="@id/search_divider" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/toolbar_wrapper" diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml index 5cfc9be896..5509fc5eec 100644 --- a/app/src/main/res/layout/fragment_search.xml +++ b/app/src/main/res/layout/fragment_search.xml @@ -60,12 +60,20 @@ app:layout_constraintStart_toStartOf="@id/toolbar_wrapper" app:layout_constraintTop_toBottomOf="@id/toolbar_wrapper" /> + +