For #8454 - Removes back button from the search screen

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()
     }
 

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,
+                    searchAccessPoint = searchAccessPoint
-                    isAnimatingOut = false
                 )
             )
         }
@@ -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<String>,
@@ -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

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 searchAccessPoint: Event.PerformedSearch.SearchAccessPoint?
-    val isAnimatingOut: Boolean
 ) : 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)
     }
 }

app/src/main/res/layout/fragment_search.xml

@@ -32,19 +32,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <ImageButton
-        android:id="@+id/back_button"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_margin="8dp"
-        android:background="?selectableItemBackground"
-        android:contentDescription="@string/browser_menu_back"
-        android:tint="?primaryText"
-        app:layout_constraintBottom_toBottomOf="@id/toolbar_wrapper"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/toolbar_wrapper"
-        app:srcCompat="@drawable/mozac_ic_back" />
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/toolbar_wrapper"
         android:layout_width="0dp"
@@ -53,7 +40,7 @@
         android:outlineProvider="paddedBounds"
         android:transitionName="toolbar_wrapper_transition"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/back_button"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
         <FrameLayout
@@ -80,7 +67,7 @@
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@id/awesomeBar_barrier"
         app:layout_constraintEnd_toEndOf="@id/toolbar_wrapper"
-        app:layout_constraintStart_toStartOf="@id/back_button"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/toolbar_wrapper">
 
         <ImageView
@@ -138,7 +125,7 @@
         android:layout_marginTop="@dimen/search_fragment_shortcuts_label_margin_vertical"
         android:layout_marginEnd="@dimen/search_fragment_shortcuts_label_margin_horizontal"
         android:text="@string/search_shortcuts_search_with_2"
-        app:layout_constraintStart_toStartOf="@id/back_button"
+        app:layout_constraintStart_toStartOf="@id/toolbar_wrapper"
         app:layout_constraintTop_toBottomOf="@id/awesomeBar_barrier"
         tools:text="This time, search with:" />
 

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,
+        searchAccessPoint = Event.PerformedSearch.SearchAccessPoint.NONE
-        isAnimatingOut = false
     )
 }

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()
         }
     }