From ebb5da7f4e2cef081c8f1eeb6824d4487dd47e10 Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Tue, 29 Jan 2019 16:55:37 -0800
Subject: [PATCH] For #141 - Cleans up search UI

---
 .../main/java/org/mozilla/fenix/home/HomeFragment.kt | 11 +----------
 .../java/org/mozilla/fenix/search/SearchFragment.kt  | 12 ++----------
 app/src/main/res/layout/fragment_home.xml            |  3 +--
 app/src/main/res/layout/fragment_search.xml          | 12 ++++--------
 4 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index e3ba9dd12..3e17c5bbc 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -41,19 +41,10 @@ class HomeFragment : Fragment() {
         toolbar.setCompoundDrawablesWithIntrinsicBounds(searchIcon, null, null, null)
         toolbar.compoundDrawablePadding = (12f * Resources.getSystem().displayMetrics.density).roundToInt()
         toolbar.setOnClickListener { it ->
-            val extras = FragmentNavigator.Extras.Builder().addSharedElement(
-                toolbar, ViewCompat.getTransitionName(toolbar)!!
-            ).build()
-            Navigation.findNavController(it).navigate(R.id.action_homeFragment_to_searchFragment, null, null, extras)
+            Navigation.findNavController(it).navigate(R.id.action_homeFragment_to_searchFragment, null, null)
         }
 
         SessionsComponent(homeLayout, ActionBusFactory.get(this)).setup()
         layoutComponents(homeLayout)
     }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        enterTransition = TransitionInflater.from(context).inflateTransition(android.R.transition.fade)
-        exitTransition = TransitionInflater.from(context).inflateTransition(android.R.transition.fade)
-    }
 }
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 62fabd4d2..6c9f6da69 100644
--- a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
@@ -31,11 +31,6 @@ class SearchFragment : Fragment() {
         return inflater.inflate(R.layout.fragment_search, container, false)
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        sharedElementEnterTransition = TransitionInflater.from(context).inflateTransition(android.R.transition.move)
-    }
-
     override fun onResume() {
         super.onResume()
         toolbar.editMode()
@@ -50,7 +45,7 @@ class SearchFragment : Fragment() {
             toolbar,
             ShippedDomainsProvider().also { it.initialize(requireContext()) },
             requireComponents.core.historyStorage
-        )
+            )
         )
 
         awesomeBarFeature = AwesomeBarFeature(awesomeBar, toolbar, null, onEditComplete = ::userDidSearch)
@@ -74,9 +69,6 @@ class SearchFragment : Fragment() {
     }
 
     private fun userDidSearch() {
-        val extras = FragmentNavigator.Extras.Builder().addSharedElement(
-            toolbar, ViewCompat.getTransitionName(toolbar)!!
-        ).build()
-        Navigation.findNavController(toolbar).navigate(R.id.action_searchFragment_to_browserFragment, null, null, extras)
+        Navigation.findNavController(toolbar).navigate(R.id.action_searchFragment_to_browserFragment, null, null)
     }
 }
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 8116f6086..3f119955d 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -67,8 +67,7 @@
                 android:gravity="center_vertical"
                 android:text="@string/search_hint"
                 android:textColor="@color/searchText"
-                android:textSize="14sp"
-                android:transitionName="firstTransitionName"/>
+                android:textSize="14sp" />
     </org.mozilla.fenix.home.SearchView>
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index b889ed52d..c67ab51ea 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -14,12 +14,10 @@
         android:id="@+id/toolbar_wrapper"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
         android:layout_marginTop="24dp"
-        android:layout_marginRight="16dp"
-        android:background="@drawable/home_search_background_light"
-        android:clipToPadding="false"
-        android:elevation="5dp"
+        android:layout_marginEnd="16dp"
+        android:background="@drawable/home_search_background_dark_no_border"
         android:outlineProvider="paddedBounds"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -30,11 +28,9 @@
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:layout_margin="8dp"
-            android:background="@android:color/white"
             android:clickable="true"
             android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:transitionName="firstTransitionName" />
+            android:focusableInTouchMode="true" />
     </FrameLayout>
 
     <mozilla.components.browser.awesomebar.BrowserAwesomeBar