From d8f3050487888a0e73af845d90980057dce6f75e Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Mon, 17 Aug 2020 11:14:17 -0700
Subject: [PATCH] For #13473 - Adds pill_wraper to the search dialog

---
 .../searchdialog/SearchDialogFragment.kt      | 16 +++++----
 .../res/layout/fragment_search_dialog.xml     | 33 +++++++++++++++++--
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/searchdialog/SearchDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/searchdialog/SearchDialogFragment.kt
index 9c869aa81..2ea46f886 100644
--- a/app/src/main/java/org/mozilla/fenix/searchdialog/SearchDialogFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/searchdialog/SearchDialogFragment.kt
@@ -16,8 +16,10 @@ import androidx.constraintlayout.widget.ConstraintProperties.TOP
 import androidx.constraintlayout.widget.ConstraintSet
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
-import kotlinx.android.synthetic.main.fragment_search.view.*
 import kotlinx.android.synthetic.main.fragment_search_dialog.*
+import kotlinx.android.synthetic.main.fragment_search_dialog.pill_wrapper
+import kotlinx.android.synthetic.main.fragment_search_dialog.toolbar
+import kotlinx.android.synthetic.main.fragment_search_dialog.view.*
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import mozilla.components.lib.state.ext.consumeFrom
 import mozilla.components.support.base.feature.UserInteractionHandler
@@ -101,7 +103,7 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
         awesomeBarView = AwesomeBarView(
             requireContext(),
             interactor,
-            view.awesomeBar
+            view.awesome_bar
         )
 
         return view
@@ -118,10 +120,10 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
                 clear(toolbar.id, TOP)
                 connect(toolbar.id, BOTTOM, PARENT_ID, BOTTOM)
 
-                clear(awesomeBar.id, TOP)
-                clear(awesomeBar.id, BOTTOM)
-                connect(awesomeBar.id, TOP, PARENT_ID, TOP)
-                connect(awesomeBar.id, BOTTOM, toolbar.id, TOP)
+                clear(awesome_bar.id, TOP)
+                clear(pill_wrapper.id, BOTTOM)
+                connect(awesome_bar.id, TOP, PARENT_ID, TOP)
+                connect(pill_wrapper.id, BOTTOM, toolbar.id, TOP)
 
                 applyTo(search_wrapper)
             }
@@ -133,7 +135,7 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
         }
 
         consumeFrom(store) {
-            awesomeBar?.visibility = if (it.query.isEmpty()) View.INVISIBLE else View.VISIBLE
+            awesome_bar?.visibility = if (it.query.isEmpty()) View.INVISIBLE else View.VISIBLE
             toolbarView.update(it)
             awesomeBarView.update(it)
         }
diff --git a/app/src/main/res/layout/fragment_search_dialog.xml b/app/src/main/res/layout/fragment_search_dialog.xml
index 4a2abe039..1fb1734c9 100644
--- a/app/src/main/res/layout/fragment_search_dialog.xml
+++ b/app/src/main/res/layout/fragment_search_dialog.xml
@@ -30,7 +30,7 @@
         app:layout_constraintTop_toTopOf="parent"/>
     <mozilla.components.browser.awesomebar.BrowserAwesomeBar
         xmlns:mozac="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/awesomeBar"
+        android:id="@+id/awesome_bar"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:fadingEdge="horizontal"
@@ -39,11 +39,40 @@
         android:requiresFadingEdge="vertical"
         android:background="?attr/foundation"
         android:visibility="invisible"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/pill_wrapper"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/toolbar"
         mozac:awesomeBarChipBackgroundColor="@color/photonGreen50"
         mozac:awesomeBarDescriptionTextColor="?secondaryText"
         mozac:awesomeBarTitleTextColor="?primaryText" />
+    <LinearLayout
+        android:id="@+id/pill_wrapper"
+        android:layout_width="0dp"
+        android:layout_height="@dimen/search_fragment_pill_height"
+        android:background="?foundation"
+        android:orientation="horizontal"
+        android:paddingStart="@dimen/search_fragment_pill_padding_start"
+        android:paddingTop="@dimen/search_fragment_pill_padding_vertical"
+        android:paddingEnd="@dimen/search_fragment_pill_padding_end"
+        android:paddingBottom="@dimen/search_fragment_pill_padding_vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <ToggleButton
+            android:id="@+id/search_scan_button"
+            style="@style/search_pill"
+            android:layout_marginEnd="@dimen/search_fragment_scan_button_margin_end"
+            android:textOff="@string/search_scan_button"
+            android:textOn="@string/search_scan_button"
+            app:drawableStartCompat="@drawable/ic_qr" />
+
+        <ToggleButton
+            android:id="@+id/search_engines_shortcut_button"
+            style="@style/search_pill"
+            android:textOff="@string/search_engine_button"
+            android:textOn="@string/search_engine_button"
+            app:drawableStartCompat="@drawable/ic_search" />
+    </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>