From 98e617001dd63200003041bcacfcdb095c42fb11 Mon Sep 17 00:00:00 2001
From: John Zhen Mo <zhenmogukl@gmail.com>
Date: Tue, 14 Nov 2017 10:51:44 -0800
Subject: [PATCH] -Added search suggestion insert per #840.

---
 .../fragments/list/search/SearchFragment.java |   7 +-
 .../list/search/SuggestionListAdapter.java    |  24 ++++--
 .../ic_arrow_top_left_black_24dp.png          | Bin 0 -> 554 bytes
 .../ic_arrow_top_left_white_24dp.png          | Bin 0 -> 546 bytes
 .../ic_arrow_top_left_black_24dp.png          | Bin 0 -> 418 bytes
 .../ic_arrow_top_left_white_24dp.png          | Bin 0 -> 427 bytes
 .../ic_arrow_top_left_black_24dp.png          | Bin 0 -> 492 bytes
 .../ic_arrow_top_left_white_24dp.png          | Bin 0 -> 500 bytes
 .../ic_arrow_top_left_black_24dp.png          | Bin 0 -> 570 bytes
 .../ic_arrow_top_left_white_24dp.png          | Bin 0 -> 573 bytes
 .../ic_arrow_top_left_black_24dp.png          | Bin 0 -> 675 bytes
 .../ic_arrow_top_left_white_24dp.png          | Bin 0 -> 730 bytes
 .../res/layout/item_search_suggestion.xml     |  80 ++++++++++++------
 app/src/main/res/values/attrs.xml             |   1 +
 app/src/main/res/values/styles.xml            |   2 +
 15 files changed, 79 insertions(+), 35 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_arrow_top_left_black_24dp.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_arrow_top_left_white_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_arrow_top_left_black_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_arrow_top_left_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_arrow_top_left_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_arrow_top_left_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_arrow_top_left_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_arrow_top_left_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_arrow_top_left_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_arrow_top_left_white_24dp.png

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
index fae97bb7b..597c8d74f 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
@@ -165,7 +165,7 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
         suggestionListAdapter = new SuggestionListAdapter(activity);
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
         isSearchHistoryEnabled = preferences.getBoolean(getString(R.string.enable_search_history_key), true);
-        suggestionListAdapter.setShowSugestinHistory(isSearchHistoryEnabled);
+        suggestionListAdapter.setShowSuggestionHistory(isSearchHistoryEnabled);
         
         searchHistoryDAO = NewPipeDatabase.getInstance().searchHistoryDAO();
     }
@@ -446,6 +446,11 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
                 searchEditText.setText(item.query);
             }
 
+            @Override
+            public void onSuggestionItemInserted(SuggestionItem item) {
+                searchEditText.setText(item.query);
+            }
+
             @Override
             public void onSuggestionItemLongClick(SuggestionItem item) {
                 if (item.fromHistory) showDeleteSuggestionDialog(item);
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java
index 3e59b7fa9..2fed3f8fb 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java
@@ -19,10 +19,11 @@ public class SuggestionListAdapter extends RecyclerView.Adapter<SuggestionListAd
     private final ArrayList<SuggestionItem> items = new ArrayList<>();
     private final Context context;
     private OnSuggestionItemSelected listener;
-    private boolean showSugestinHistory = true;
+    private boolean showSuggestionHistory = true;
 
     public interface OnSuggestionItemSelected {
         void onSuggestionItemSelected(SuggestionItem item);
+        void onSuggestionItemInserted(SuggestionItem item);
         void onSuggestionItemLongClick(SuggestionItem item);
     }
 
@@ -32,7 +33,7 @@ public class SuggestionListAdapter extends RecyclerView.Adapter<SuggestionListAd
 
     public void setItems(List<SuggestionItem> items) {
         this.items.clear();
-        if (showSugestinHistory) {
+        if (showSuggestionHistory) {
             this.items.addAll(items);
         } else {
             // remove history items if history is disabled
@@ -49,8 +50,8 @@ public class SuggestionListAdapter extends RecyclerView.Adapter<SuggestionListAd
         this.listener = listener;
     }
 
-    public void setShowSugestinHistory(boolean v) {
-        showSugestinHistory = v;
+    public void setShowSuggestionHistory(boolean v) {
+        showSuggestionHistory = v;
     }
 
     @Override
@@ -62,19 +63,25 @@ public class SuggestionListAdapter extends RecyclerView.Adapter<SuggestionListAd
     public void onBindViewHolder(SuggestionItemHolder holder, int position) {
         final SuggestionItem currentItem = getItem(position);
         holder.updateFrom(currentItem);
-        holder.itemView.setOnClickListener(new View.OnClickListener() {
+        holder.queryView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (listener != null) listener.onSuggestionItemSelected(currentItem);
             }
         });
-        holder.itemView.setOnLongClickListener(new View.OnLongClickListener() {
+        holder.queryView.setOnLongClickListener(new View.OnLongClickListener() {
             @Override
             public boolean onLongClick(View v) {
                 if (listener != null) listener.onSuggestionItemLongClick(currentItem);
                 return true;
             }
         });
+        holder.insertView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (listener != null) listener.onSuggestionItemInserted(currentItem);
+            }
+        });
     }
 
     private SuggestionItem getItem(int position) {
@@ -93,6 +100,8 @@ public class SuggestionListAdapter extends RecyclerView.Adapter<SuggestionListAd
     public static class SuggestionItemHolder extends RecyclerView.ViewHolder {
         private final TextView itemSuggestionQuery;
         private final ImageView suggestionIcon;
+        private final View queryView;
+        private final View insertView;
 
         // Cache some ids, as they can potentially be constantly updated/recycled
         private final int historyResId;
@@ -103,6 +112,9 @@ public class SuggestionListAdapter extends RecyclerView.Adapter<SuggestionListAd
             suggestionIcon = rootView.findViewById(R.id.item_suggestion_icon);
             itemSuggestionQuery = rootView.findViewById(R.id.item_suggestion_query);
 
+            queryView = rootView.findViewById(R.id.suggestion_search);
+            insertView = rootView.findViewById(R.id.suggestion_insert);
+
             historyResId = resolveResourceIdFromAttr(rootView.getContext(), R.attr.history);
             searchResId = resolveResourceIdFromAttr(rootView.getContext(), R.attr.search);
         }
diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_top_left_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_arrow_top_left_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..da56057419410a046719fbacfd78821db0c07f18
GIT binary patch
literal 554
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBSkfJR9T^xl_H+M9WCijWi-X*q
z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e|lz+eS5K)hhiu0R{01Y44~
zy9<y8f}hU2>wy$!fk$L9koEv$x0Bg+K*noN7srr@!*8cKavd@dU|7DDU%=)U*Iq5V
zWiK2*2-dc6DcL!Hc;UGJ;nm3x*mG>R9DSvlwp+1DQlrFk)693v1UOij>fKT#<e8Nd
z-x(KN5<A!6^dn^wZ}MCH3~!}~V)ktgc{9|rrn{`*{?c$$Jm}huEpM(>_&4@Gttwrp
zx*_jK@TqGny>6;S*LW<w6|}9B>w3^66~CoRIOlk7jeO&>D!23MQWL&KtEOCgze??@
zVUPNOsh_k8S@ha|vM=E0SzQru^tab7Zov(Y{%UR7yf$RQCs&`!4cQCX4L)kJtoM3)
z;Ldg*-!uFnY62X8RQ!X*J%6<x%Vz|7TeZYBq9i4;B-JXpC>2OC7#SFv>lzyB8k&R{
zT38tw0FkzVft7)Q^7o6MP&DM`r(~v8;?@wfD$@_BK?7t%aap=mQettcZfQ{_Lt17|
ss+GRJeo1bDer{rVW^%S}nP+i9ak8WPm6!+bfO;4_UHx3vIVCg!0K<mB`Tzg`

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_top_left_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_arrow_top_left_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..24376b63791abf33ee181b1f1a5856973c51006d
GIT binary patch
literal 546
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBSkfJR9T^xl_H+M9WCijWi-X*q
z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e|lz+eS5K)hhiu0R{01Y44~
zy9<y8f}hU2>wy$!fk$L9koEv$x0Bg+K*nQF7srr@!*8cLavd@daJ}EbE@0F5=+xv6
zJr@3pOW6Y)yS86^%n^5>&RkE0+w|oTt!Iu4m!5n-+vl>=!hj#fZ*KZ}CMQgpQERk$
z@#?ipyk3TAo`175?16)Q;yKn8jn9tmSW>o>gSSC(gTdzTpo>Sgy!lgL$NX*5ooG4X
z9gJoC*NYc?o7Tk}%^GB!zjB3wad6(s7ZdITc`{lqouvMJQdX!h-^y#Y-=`Jbl$?K~
zmce6|SJeIfm(q``C%t;G{{6p?J-UZfa+y~;Py8ji^26L+Ub9NnMAn2TXWm@tvmxm2
zIv=1L!}1~oWKZY|WdK8pLAAs+q9i4;B-JXpC>2OC7#SFv>lzyB8k&R{T38tw0FkzV
zft7)Q^7o6MP&DM`r(~v8;?@wfD$@_BK?7t%aap=mQettcZfQ{_Lt17|s+GRJeo1bD
jer{rVW^%S}fNrRZw^LD|th;#(P!EHrtDnm{r-UW|&5FRu

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_top_left_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_arrow_top_left_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..056a0ff28fe1c73e040bbcfe98d4916e35d2c2c1
GIT binary patch
literal 418
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEa{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPV
z+ua371Hn({-St3<v%n*=7)X17vD?XPJ0K(3)5S5w<9Kp{1nXfrgGU1Y{TJ3*BuHt@
z|LcC}x}=1JN=E9zRF$YHVqzUe1_m*UTKyBm3@)4!O5x5(;@rg=vYll%YsglX>8vK4
z>mKHF>KMOU+RAF+{SB!2#f4K%fd(fS8P;&<Kbxfa<N(k*)e_f;l9a@fRIB8oR3OD*
zWMF8nYiOuzXcA&*VP#|hMA`-hRt5&j-!Fbb(U6;;l9^VCTSL&QOh2Fo4Ui4RW$9K)
ziN&e9rA3(xX_+~xR{Hw-CAkIqxrynS$=SN5LBZZR?#^C&im&Yl>S6G7^>bP0l+XkK
DgQ<A0

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_top_left_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_arrow_top_left_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2e73369c9a34b956ec6f7e050b7393d56aac78a
GIT binary patch
literal 427
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEa{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPV
z+ua371Hn({-St3<v%n*=7)X17vD?XPJ0K&+)5S5w<9Kp{1nXfrgCyZU|NsB5Uu0rz
zWF!=H*hJypuYRs|K%w}iFtHf7MXs5NjW2*){lL5G2A3D+yozqhVf58;+}`kNTEgar
zRns19YEV09s-)AHdTejVc7~Ia_5xL3U)agIIN<{`!#Y(K<u|v=_X6!zEpd$~Nl7e8
zwMs5Z1yT$~28QOkhK9O^CLx9vRz?Ouq-|heWniHE{o*GS4Y~O#nQ4`{H3Y57^aE<p
z0NGGnmTr}lSe&X`T9nC<mYI`krLV7Fl3Spko0y)NoUQBX7;2bYUKrvL>2@2ahr!d;
K&t;ucLK6U^dWg{g

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_top_left_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_arrow_top_left_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4255a18aa1fe5067cc5f6cb263513c3f8ce30a3
GIT binary patch
literal 492
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmUKs7M+SzC{oH>NS%G}U;vjb?
zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)pVryh>nTu$sZZAYL$MSD+10f-TA0
z-33Sk!B6Mi^+1ZVz$3C4NPB>>+sSM@AY-kki(^Q}y|>play2^$v^+F?BKUNc&HSnP
z60Ev8E_;vc<-Qp?S6+wZ;Lkl?4w_4+1l5_grK=w=Pp|${apk_SLQwECDaJi}j$dUs
zq_Ayqd-LxnwwIVP821RiP}#=d;w;1Hq*&Bo(Ba=8(2>tjbwrZE^pQ@3SR!M9(i#RU
z7tRK*K&}OjR~Rw`wsIbvB%l+^G;za!+qZk%BctcL@IQEIyJAVp)6?xT>!$>H-Q6sy
zeRmH}h2>g4pu<&5Tq8<S5=&C8l8aJ-6oZk0p}DT1p{}7xh@pj*kpU2C8yHv_7$|?g
z_z6WrZhlH;S|x4`L8~(TfEqMFHWZhoTO}nHr|Om#Wiq5?=A>Hb>+6@~7U<_Dre`K+
d>zW(71{u1ByYM$<^#JuSc)I$ztaD0e0sw$6n)?6%

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_top_left_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_arrow_top_left_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..db578cab9eaea2867b9fc4c52666df450747b034
GIT binary patch
literal 500
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmUKs7M+SzC{oH>NS%G}U;vjb?
zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)pVryh>nTu$sZZAYL$MSD+10f-TA0
z-33Sk!B6Mi^+1ZVz$3C4NPB>>+sSM@AY-eii(^Q}y|>p5`I-#`TmogDcAW4%=RQ@M
zZOKB<#sdPkBi`uDyx%xsM!ME6Kh336g34O&urn@r+3kFy?t5VWHT9xWrX8HWeHr4e
z{XWM~qad{S_>s~r_ad2IFxK3u>HPZZy{&zR$N|wL{s(M@ECr1}SQofIVOSx!lOf85
zvq313Yk~6>h7|%^8KjO#GVm@ssL0_sQ9$P|tKi1Jwz6x=rz%a0f5iJBbMHzvK}H_E
z<Jv$M)ZgZ5s`6b?daDuS8`Tomh?11Vl2ohYqEsNoU}Ruuu4`zhYiJT;Xkle!07Tjb
z237_J%HJ=3LeY?$pOTqYiCaU^s!Tti1`Uu6#bxPMNr}a&x}`;#3~8A;saE>>`X#vq
k`nieenaSC@5hdZ}ArZlTr+>{_3Dm>j>FVdQ&MBb@0DXj_ZvX%Q

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_top_left_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_top_left_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..566b5c5d3a8ab9360f3aa48e743fa9bc717cc45f
GIT binary patch
literal 570
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!Ea{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPV
z+ua371Hn({-St3<v%n*=7)XQdWN<r~Z3pE1_H=O!skrs_=0>hV4g#(hm$!br&+`9@
z6UUF-u#Fo84d3N#I;~>--RabU+lMEq2?;_#;0iwN`}50o-M(}2Wy5aH1x^g2Oe+K&
z=FaXp?|kWI^_yvpmz1tDEOlAM>eX)2ZXh<n&9nJ?h5v%dOLp(@+}tkik*Y9($KmBf
z9fy?@*EnQO%xVZyy2`ZFIf`itSEgow)Dlw%%?a0-THUi4MWj}W21G2G=Abw+in-PK
z6{85(O7Q@RCG#8-CseUdQk=lkn8KmrtRTsBQoy5)ZEAh-{XOng-`}g*s>beR&s!Mp
z@u22wC(AjX=6m<&bbl96f`CQ6-<Z1hEiJem<F*_a45}rr5hW>!C8<`)MX5lF!N|bS
zT-VT0*U%)y(89{d0En~=46F<cl)qp6grXrgKP5A*61Rq+RhfQ34H_UDip$cik`jwk
zbxVsf8PYOyQmyp$^-FRK^m7x_Gn2D*T|6y{1HJv6e#xu>#UX>ItDnm{r-UW|QUSgU

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_top_left_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_top_left_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..89d726f6caf5ccaf2af95e40a989a91cc4136b56
GIT binary patch
literal 573
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!Ea{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPV
z+ua371Hn({-St3<v%n*=7)XQdWN<r~Z3pE1^K@|xskrs_=0?6I1CiFm0)hKykC>+#
zD1N*-r;oeY&?(w$Z^irn>sy|D@jmQyT@VU(u3BFiImyTEd+pVCll;Wk|14+lVhK=c
z5MsPy^z{3Ll8yJOQx?qdXm$8F!HnUkQ<UQjA&<#R4p!|~y%2fH_K$Cr)z3dXOH36e
z7&RPHe#+45c8Zm&JA_F@Xr+jT%q6h}0UptfhZL?dv^uO}E$ZLGJ|TO_-iA9$Z#ka`
zW#%iCd+0XAC~jpcYQ7?Lf;Z^30~4ppggy}ug~l)5OB`R`zq9zOU-pu%v%gF!*?ceK
z9+Qy8`&xy@&uf3qHu2gOm9MA-0ah9MeCxX&ea_Ah28M)ciEBhjN@7W>RdP`(kYX@0
zFf`XSG}JXT2{E*=GBN-nZ36=<0|Vvn7eAqB$jwj5OsmALA!t>mA5en^$cEywbgQJq
z;#A$zqD+Rg%$!s!eSQ6s+yedF#PrPMY+d8f%w+$v0G}_Or!s(g7(8A5T-G@yGywp5
C0mMWA

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_arrow_top_left_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_arrow_top_left_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d536127b5539a902072bbeeb5a5a1879901954e6
GIT binary patch
literal 675
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoEa{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPV
z+ua371Hn({-St3<v%n*=7)X17vD?XPJD~9?o-U3d6}R5rcJw=JAmDJ3Uwy?6&Y&Yt
ztJ(9K9<ZebHabi>w(+=}`CtE2=T;s2ELti$LB(?t6urIb+<xCCHD2rCxvO%U*>{w)
zd89R@zzJEaP#gIJ-rpWn2MQnHXv|`kQ1tL-P-e;CO=xk;K3%JC@wqhb<i0byQPFRV
zKZF&WGhcY=R?tC?*r_ZG$|b>43_TZ)PGd-DDTron5Olf<6l__^%izXwQ3xor#*{%~
zp{EOjfz#F%Ks8zu84qyGc4cQ!&bg!vl!;gm6jZVWY7G0z$KbXj3#jtYem7PI<rotq
z28oCL7lG>crvS~YInBl3*3i`bz3jW-CZPId2`!uwiA-)Y8U)oanA}h0`Q$dY-(5Y)
z{Gn*YDY=sK>s$+dHpg^5_{9EO^59eTNQ?gu<u<WTL<G{^b^iYYU*8gr{a+0Xc-0cu
zh?11Vl2ohYqEsNoU}Ruuu4`zhYiJT;Xkle!07Tjb237_J%HJ=3LeY?$pOTqYiCaU^
zs!Tti1`Uu6#bxPMNr}a&x}`;#3~8A;saE>>`X#vq`nieenaSC@{#Ch!QI$E4*R)ff
Q0QE3<y85}Sb4q9e0JeqTBLDyZ

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_arrow_top_left_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_arrow_top_left_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ddd5a8fad714ef9acee77dae4765a568a202437
GIT binary patch
literal 730
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoEa{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPV
z+ua371Hn({-St3<v%n*=7)X17vD?XPJD~BiJzX3_DsH{K>X>)PK*Tk0x%7fpep(CP
z?M>ys>ls@1Va6WERxXQ=<@-F}Nm_6Fyq;qzP&W*0%j&upFlkf#t9RV~!9T3GSDf5;
z;GUp@B;zDFvCZxD9M#&C`?bPiYzj_O+8A6qE=VMl3%dOgwwn^P@0*aK@`0U6XBSTS
zr1^42!T#rAA3H0je>wbo#bkHkuTn~1f`kve?zrHb%dlS6X^SP}o_QP-pRs)~cInup
z(lB4ysbwkSA05G{tt=ltyJTFHI#4Z;xUz%cUOR`k3+snCml@hd4d0ayooQ@k`!LUC
zhT)nI4ELsUOl^K8bf8*zVUovPriywc8;OAH40g>N<!zU38_p{p>OHtd=s>#Q!}$x>
zh#hz?_%KUhHQR@oE<cQWt}_3KQK}HoWUMh0G-Ceor`G)h-vjG6)`vJc3>cJn8aS90
z4l$rJ9WDi4%1><x{#I+g^3(JWx-WHqubcf<f$4Dk;a(1&df#wCi8{9bhVxbSrrig{
zI23%?qo=%*ljZuueN{ja)e_f;l9a@fRIB8oR3OD*WMF8nYiOuzXcA&*VP#|hMA`-h
zRt5&j-!Fbb(U6;;l9^VCTSL&QOh2Fo4Ui4RW$9K)iN&e9rA3(xX_+~xR{Hw-CAkIq
ixrynS$=SM*fuU82dF9@oGP!yncY3<|xvX<aXaWFlwE!Ie

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/item_search_suggestion.xml b/app/src/main/res/layout/item_search_suggestion.xml
index b230f6da0..f6facf29e 100644
--- a/app/src/main/res/layout/item_search_suggestion.xml
+++ b/app/src/main/res/layout/item_search_suggestion.xml
@@ -1,36 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    android:clickable="true"
-    android:orientation="horizontal"
-    android:paddingBottom="8dp"
-    android:paddingTop="8dp">
+    android:layout_height="wrap_content">
 
-    <ImageView
-        android:id="@+id/item_suggestion_icon"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_gravity="center_vertical"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        tools:ignore="ContentDescription,RtlHardcoded"
-        tools:src="?attr/history"/>
-
-    <TextView
-        android:id="@+id/item_suggestion_query"
+    <LinearLayout
+        android:id="@+id/suggestion_search"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginLeft="8dp"
+        android:background="?attr/selectableItemBackground"
+        android:clickable="true"
+        android:focusable="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_toLeftOf="@id/suggestion_insert"
+        android:layout_toStartOf="@id/suggestion_insert"
+        android:layout_centerVertical="true"
+        android:orientation="horizontal"
+        android:paddingBottom="8dp"
+        android:paddingTop="8dp">
+
+        <ImageView
+            android:id="@+id/item_suggestion_icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            tools:ignore="ContentDescription,RtlHardcoded"
+            tools:src="?attr/history"/>
+
+        <TextView
+            android:id="@+id/item_suggestion_query"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:ellipsize="end"
+            android:maxLines="2"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:textSize="14sp"
+            tools:ignore="RtlHardcoded"
+            tools:text="Search query"/>
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/suggestion_insert"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_centerVertical="true"
+        android:layout_alignParentRight="true"
+        android:clickable="true"
+        android:focusable="true"
+        android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
-        android:ellipsize="end"
-        android:maxLines="2"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-        android:textSize="14sp"
-        tools:ignore="RtlHardcoded"
-        tools:text="Search query"/>
-</LinearLayout>
\ No newline at end of file
+        android:src="?attr/search_add"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        tools:ignore="ContentDescription,RtlHardcoded"/>
+</RelativeLayout>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index abf7c7b09..e51ab9ffd 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -20,6 +20,7 @@
     <attr name="history" format="reference"/>
     <attr name="drag_handle" format="reference"/>
     <attr name="selected" format="reference"/>
+    <attr name="search_add" format="reference"/>
 
     <!-- Can't refer to colors directly into drawable's xml-->
     <attr name="toolbar_shadow_drawable" format="reference"/>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d69bba254..d41b3fe31 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -27,6 +27,7 @@
         <item name="history">@drawable/ic_history_black_24dp</item>
         <item name="drag_handle">@drawable/ic_drag_handle_black_24dp</item>
         <item name="selected">@drawable/ic_fiber_manual_record_black_24dp</item>
+        <item name="search_add">@drawable/ic_arrow_top_left_black_24dp</item>
 
         <item name="separator_color">@color/light_separator_color</item>
         <item name="contrast_background_color">@color/light_contrast_background_color</item>
@@ -65,6 +66,7 @@
         <item name="history">@drawable/ic_history_white_24dp</item>
         <item name="drag_handle">@drawable/ic_drag_handle_white_24dp</item>
         <item name="selected">@drawable/ic_fiber_manual_record_white_24dp</item>
+        <item name="search_add">@drawable/ic_arrow_top_left_white_24dp</item>
 
         <item name="separator_color">@color/dark_separator_color</item>
         <item name="contrast_background_color">@color/dark_contrast_background_color</item>