From f02e06afae557c739f73f27b0063e457d40257c2 Mon Sep 17 00:00:00 2001 From: Sawyer Blatz Date: Thu, 20 Feb 2020 15:15:47 -0800 Subject: [PATCH] For #8454 - Removes back button from the search screen --- .../mozilla/fenix/search/SearchController.kt | 1 - .../mozilla/fenix/search/SearchFragment.kt | 29 +------------------ .../fenix/search/SearchFragmentStore.kt | 9 +----- app/src/main/res/layout/fragment_search.xml | 19 ++---------- .../fenix/search/SearchFragmentStoreTest.kt | 3 +- .../fenix/search/SearchInteractorTest.kt | 1 - 6 files changed, 6 insertions(+), 56 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchController.kt b/app/src/main/java/org/mozilla/fenix/search/SearchController.kt index ce441cb0e..840664fae 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchController.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchController.kt @@ -74,7 +74,6 @@ class DefaultSearchController( } override fun handleEditingCancelled() { - store.dispatch(SearchFragmentAction.UpdateEditingCanceled) navController.navigateUp() } diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt index 454de55c1..264b1bc57 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt @@ -17,9 +17,7 @@ import android.view.ViewGroup import android.view.ViewStub import androidx.appcompat.app.AlertDialog import androidx.core.view.isVisible -import androidx.core.view.marginStart import androidx.fragment.app.Fragment -import androidx.interpolator.view.animation.FastOutSlowInInterpolator import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs import androidx.transition.TransitionInflater @@ -108,8 +106,7 @@ class SearchFragment : Fragment(), UserInteractionHandler { showBookmarkSuggestions = requireContext().settings().shouldShowBookmarkSuggestions, session = session, pastedText = pastedText, - searchAccessPoint = searchAccessPoint, - isAnimatingOut = false + searchAccessPoint = searchAccessPoint ) ) } @@ -196,10 +193,6 @@ class SearchFragment : Fragment(), UserInteractionHandler { qrFeature.get()?.scan(R.id.container) } - view.back_button.setOnClickListener { - searchInteractor.onEditingCanceled() - } - val stubListener = ViewStub.OnInflateListener { _, inflated -> inflated.learn_more.setOnClickListener { (activity as HomeActivity) @@ -251,7 +244,6 @@ class SearchFragment : Fragment(), UserInteractionHandler { updateSearchWithLabel(it) updateClipboardSuggestion(it, requireContext().components.clipboardHandler.url) updateSearchSuggestionsHintVisibility(it) - updateBackButton(it) } startPostponedEnterTransition() @@ -315,13 +307,6 @@ class SearchFragment : Fragment(), UserInteractionHandler { clipboard_url.text = clipboardUrl } - private fun updateBackButton(searchState: SearchFragmentState) { - if (searchState.isAnimatingOut) { - searchStore.dispatch(SearchFragmentAction.ConsumeEditingCancelled) - animateBackButtonAway() - } - } - override fun onRequestPermissionsResult( requestCode: Int, permissions: Array, @@ -358,18 +343,6 @@ class SearchFragment : Fragment(), UserInteractionHandler { } } - private fun animateBackButtonAway() { - val backButton = requireView().back_button - val xTranslation = with(backButton) { - -(width + marginStart + paddingStart).toFloat() - } - - backButton - .animate() - .translationX(xTranslation) - .interpolator = FastOutSlowInInterpolator() - } - companion object { private const val SHARED_TRANSITION_MS = 200L private const val REQUEST_CODE_CAMERA_PERMISSIONS = 1 diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchFragmentStore.kt b/app/src/main/java/org/mozilla/fenix/search/SearchFragmentStore.kt index a3146d0a1..1ff62bc61 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchFragmentStore.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchFragmentStore.kt @@ -57,16 +57,13 @@ data class SearchFragmentState( val showBookmarkSuggestions: Boolean, val session: Session?, val pastedText: String? = null, - val searchAccessPoint: Event.PerformedSearch.SearchAccessPoint?, - val isAnimatingOut: Boolean + val searchAccessPoint: Event.PerformedSearch.SearchAccessPoint? ) : State /** * Actions to dispatch through the `SearchStore` to modify `SearchState` through the reducer. */ sealed class SearchFragmentAction : Action { - object UpdateEditingCanceled : SearchFragmentAction() - object ConsumeEditingCancelled : SearchFragmentAction() data class SearchShortcutEngineSelected(val engine: SearchEngine) : SearchFragmentAction() data class SelectNewDefaultSearchEngine(val engine: SearchEngine) : SearchFragmentAction() data class ShowSearchShortcutEnginePicker(val show: Boolean) : SearchFragmentAction() @@ -94,9 +91,5 @@ private fun searchStateReducer(state: SearchFragmentState, action: SearchFragmen ) is SearchFragmentAction.AllowSearchSuggestionsInPrivateModePrompt -> state.copy(showSearchSuggestionsHint = action.show) - is SearchFragmentAction.UpdateEditingCanceled -> - state.copy(isAnimatingOut = true) - is SearchFragmentAction.ConsumeEditingCancelled -> - state.copy(isAnimatingOut = false) } } diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml index 8b6a29d58..2a1bcde99 100644 --- a/app/src/main/res/layout/fragment_search.xml +++ b/app/src/main/res/layout/fragment_search.xml @@ -32,19 +32,6 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> - - diff --git a/app/src/test/java/org/mozilla/fenix/search/SearchFragmentStoreTest.kt b/app/src/test/java/org/mozilla/fenix/search/SearchFragmentStoreTest.kt index 0c510ee52..061805ac2 100644 --- a/app/src/test/java/org/mozilla/fenix/search/SearchFragmentStoreTest.kt +++ b/app/src/test/java/org/mozilla/fenix/search/SearchFragmentStoreTest.kt @@ -58,7 +58,6 @@ class SearchFragmentStoreTest { showHistorySuggestions = false, showBookmarkSuggestions = false, session = null, - searchAccessPoint = Event.PerformedSearch.SearchAccessPoint.NONE, - isAnimatingOut = false + searchAccessPoint = Event.PerformedSearch.SearchAccessPoint.NONE ) } diff --git a/app/src/test/java/org/mozilla/fenix/search/SearchInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/search/SearchInteractorTest.kt index 2203ac9b3..f87b6c7c3 100644 --- a/app/src/test/java/org/mozilla/fenix/search/SearchInteractorTest.kt +++ b/app/src/test/java/org/mozilla/fenix/search/SearchInteractorTest.kt @@ -99,7 +99,6 @@ class SearchInteractorTest { interactor.onEditingCanceled() verify { - store.dispatch(SearchFragmentAction.UpdateEditingCanceled) navController.navigateUp() } }