From e73567a81a9f7d0c484f63b8d3b1fe2f2def1528 Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Mon, 28 Jan 2019 11:54:43 -0800
Subject: [PATCH] For #145 - Adds pills to the search screen

---
 app/src/main/res/drawable/ic_qr.xml           | 12 ++++
 app/src/main/res/drawable/ic_shortcuts.xml    | 12 ++++
 .../res/drawable/search_pill_background.xml   | 12 ++++
 app/src/main/res/layout/fragment_search.xml   | 59 ++++++++++++++++++-
 app/src/main/res/values/colors.xml            |  2 +
 app/src/main/res/values/strings.xml           |  2 +
 6 files changed, 98 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable/ic_qr.xml
 create mode 100644 app/src/main/res/drawable/ic_shortcuts.xml
 create mode 100644 app/src/main/res/drawable/search_pill_background.xml

diff --git a/app/src/main/res/drawable/ic_qr.xml b/app/src/main/res/drawable/ic_qr.xml
new file mode 100644
index 000000000..9d22ea8f7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qr.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="18"
+    android:viewportHeight="18">
+  <path
+      android:pathData="M14.5,0C16.433,0 18,1.567 18,3.5L18,6C18,6.5523 17.5523,7 17,7C16.4477,7 16,6.5523 16,6L16,3.5C16,2.6716 15.3284,2 14.5,2L12,2C11.4477,2 11,1.5523 11,1C11,0.4477 11.4477,0 12,0L14.5,0ZM17,11C17.5523,11 18,11.4477 18,12L18,14.5C18,16.433 16.433,18 14.5,18L12,18C11.4477,18 11,17.5523 11,17C11,16.4477 11.4477,16 12,16L14.5,16C15.3284,16 16,15.3284 16,14.5L16,12C16,11.4477 16.4477,11 17,11ZM6,16C6.5523,16 7,16.4477 7,17C7,17.5523 6.5523,18 6,18L3.5,18C1.567,18 0,16.433 0,14.5L0,12C0,11.4477 0.4477,11 1,11C1.5523,11 2,11.4477 2,12L2,14.5C2,15.3284 2.6716,16 3.5,16L6,16ZM1,7C0.4477,7 0,6.5523 0,6L0,3.5C0,1.567 1.567,0 3.5,0L6,0C6.5523,0 7,0.4477 7,1C7,1.5523 6.5523,2 6,2L3.5,2C2.6716,2 2,2.6716 2,3.5L2,6C2,6.5523 1.5523,7 1,7ZM12,4L14,4L14,6L12,6L12,4ZM4,6L4,4L8,4L8,6L8,8L6,8L4,8L4,6ZM12,8L14,8L14,10L12,10L12,8ZM6,10L8,10L8,12L6,12L6,10ZM12,12L14,12L14,14L12,14L12,12ZM8,12L10,12L10,14L8,14L8,12ZM4,12L6,12L6,14L4,14L4,12ZM10,10L12,10L12,12L10,12L10,10ZM10,6L12,6L12,8L10,8L10,6Z"
+      android:strokeWidth="1"
+      android:fillColor="#202340"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_shortcuts.xml b/app/src/main/res/drawable/ic_shortcuts.xml
new file mode 100644
index 000000000..2a1a574ec
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shortcuts.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="18"
+    android:viewportHeight="18">
+  <path
+      android:pathData="M7.0127,9.1576C7.0127,10.7366 7.6987,11.6946 8.8427,11.6946C10.0177,11.6946 10.7477,10.7256 10.7477,9.1576C10.7477,7.5906 10.0177,6.6206 8.8527,6.6206C7.6987,6.6206 7.0127,7.5676 7.0127,9.1576M17.9997,8.0916C17.9997,11.5206 16.3777,13.7316 13.7207,13.7316C12.3697,13.7316 11.3357,13.0786 11.0957,12.0216L10.9437,12.0216C10.4967,13.1106 9.5827,13.6986 8.3197,13.6986C6.0547,13.6986 4.5407,11.8586 4.5407,9.0926C4.5407,6.4466 6.0327,4.6386 8.2107,4.6386C9.3867,4.6386 10.3667,5.2266 10.7917,6.1846L10.9437,6.1846L10.9437,4.8786L13.1547,4.8786L13.1547,10.7046C13.1547,11.4556 13.5027,11.9346 14.1887,11.9346C15.2557,11.9346 15.9967,10.5736 15.9967,8.2546C15.9967,4.2906 13.2627,1.7316 9.1367,1.7316C4.9437,1.7316 2.0037,4.7586 2.0037,9.1366C2.0037,13.7196 5.0637,16.3986 9.5497,16.3986C10.7147,16.3986 11.9017,16.2466 12.5227,16.0176L12.5227,17.7606C11.6737,18.0116 10.5627,18.1636 9.3867,18.1636C3.8767,18.1636 -0.0003,14.7116 -0.0003,9.0816C-0.0003,3.6806 3.7787,0.0006 9.2127,0.0006C14.3737,0.0006 17.9997,3.2446 17.9997,8.0916"
+      android:strokeWidth="1"
+      android:fillColor="#202340"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/search_pill_background.xml b/app/src/main/res/drawable/search_pill_background.xml
new file mode 100644
index 000000000..d86e0dae0
--- /dev/null
+++ b/app/src/main/res/drawable/search_pill_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#FAFAFC"/>
+
+    <stroke android:width="1dp"
+            android:color="#C6C6Ce"/>
+
+    <corners android:radius="16dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index c14456abe..323e68ba1 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -47,9 +47,66 @@
         app:layout_constraintTop_toBottomOf="@id/toolbar_wrapper"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/pill_wrapper"
         mozac:awesomeBarTitleTextColor="#212121"
         mozac:awesomeBarDescriptionTextColor="#6b6b6b"
         mozac:awesomeBarChipTextColor="#ffffff"
         mozac:awesomeBarChipBackgroundColor="#444444" />
+
+    <LinearLayout
+        android:id="@+id/pill_wrapper"
+        android:background="@color/offwhite"
+        android:elevation="10dp"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp"
+        app:layout_constraintTop_toBottomOf="@id/awesomeBar"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <Button
+            tools:ignore="RtlSymmetry"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/search_scan_button"
+            android:textAllCaps="false"
+            android:textSize="14sp"
+            android:textColor="@color/searchPillText"
+            android:layout_gravity="center_vertical"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:drawableStart="@drawable/ic_qr"
+            android:padding="8dp"
+            android:paddingEnd="16dp"
+            android:drawablePadding="8dp"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            android:layout_marginEnd="8dp"
+            android:background="@drawable/search_pill_background"
+            style="@style/Widget.AppCompat.Button.Borderless" />
+        <Button
+            tools:ignore="RtlSymmetry"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/search_shortcuts_button"
+            android:textAllCaps="false"
+            android:textSize="14sp"
+            android:textColor="@color/searchPillText"
+            android:layout_gravity="center_vertical"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:drawableStart="@drawable/ic_shortcuts"
+            android:padding="8dp"
+            android:paddingEnd="16dp"
+            android:drawablePadding="8dp"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            android:background="@drawable/search_pill_background"
+            style="@style/Widget.AppCompat.Button.Borderless" />
+    </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d8eed3e12..9de8cf85b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -15,4 +15,6 @@
     <color name="session_list_empty_bg">#1A665BFD</color>
     <color name="session_list_empty_fg">#665BFD</color>
     <color name="session_list_header">#6D6D6E</color>
+
+    <color name="searchPillText">#202340</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3d30f8db2..983765724 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -23,4 +23,6 @@
     <string name="sessions_intro_description">Fenix will collect your browsing sessions\n on your Home Screen for you to
         retrieve\n later.
     </string>
+    <string name="search_scan_button">Scan</string>
+    <string name="search_shortcuts_button">Shortcuts</string>
 </resources>