From df1109cde56acb8538256bdeccbc47664aea4f4a Mon Sep 17 00:00:00 2001
From: Johannes Baiter <johannes.baiter@gmail.com>
Date: Wed, 29 Oct 2014 02:05:20 +0100
Subject: [PATCH 1/3] Add filtering to password list

---
 .../com/zeapo/pwdstore/PasswordFragment.java  |  14 ++++++
 .../com/zeapo/pwdstore/PasswordStore.java     |  41 +++++++++++++++++-
 .../res/drawable-hdpi/ic_action_search.png    | Bin 0 -> 702 bytes
 .../res/drawable-mdpi/ic_action_search.png    | Bin 0 -> 479 bytes
 .../res/drawable-xhdpi/ic_action_search.png   | Bin 0 -> 900 bytes
 .../res/drawable-xxhdpi/ic_action_search.png  | Bin 0 -> 1153 bytes
 app/src/main/res/menu/pwdstore.xml            |  11 ++++-
 app/src/main/res/values/strings.xml           |   1 +
 8 files changed, 64 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_action_search.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_action_search.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_action_search.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_search.png

diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java b/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java
index 4e8ef5ef..4d433013 100644
--- a/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java
+++ b/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java
@@ -126,6 +126,20 @@ public class PasswordFragment extends Fragment{
         ((ActionBarActivity) getActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(false);
     }
 
+    public void filterAdapter(String filter) {
+        if (filter.isEmpty()) {
+            updateAdapter();
+            return;
+        }
+        for (int i=0; i<recyclerAdapter.getItemCount(); i++) {
+            PasswordItem item = recyclerAdapter.getValues().get(i);
+            boolean matches = item.getName().toLowerCase().contains(filter);
+            if (!matches) {
+                recyclerAdapter.remove(i);
+            }
+        }
+    }
+
     public void popBack() {
         recyclerView.scrollToPosition(scrollPosition.pop());
         recyclerAdapter.clear();
diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
index 025435f4..a82aec2c 100644
--- a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
+++ b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
@@ -9,7 +9,9 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.v4.view.MenuItemCompat;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.SearchView;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -68,7 +70,36 @@ public class PasswordStore extends ActionBarActivity  {
     public boolean onCreateOptionsMenu(Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.
         getMenuInflater().inflate(R.menu.pwdstore, menu);
-        return true;
+        MenuItem searchItem = menu.findItem(R.id.action_search);
+        SearchView searchView = (SearchView) MenuItemCompat.getActionView(searchItem);
+        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String s) {
+                return true;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String s) {
+                filterListAdapter(s);
+                return true;
+            }
+        });
+
+        // When using the support library, the setOnActionExpandListener() method is
+        // static and accepts the MenuItem object as an argument
+        MenuItemCompat.setOnActionExpandListener(searchItem, new MenuItemCompat.OnActionExpandListener() {
+            @Override
+            public boolean onMenuItemActionCollapse(MenuItem item) {
+                refreshListAdapter();
+                return true;
+            }
+
+            @Override
+            public boolean onMenuItemActionExpand(MenuItem item) {
+                return true;
+            }
+        });
+        return super.onCreateOptionsMenu(menu);
     }
 
     @Override
@@ -376,6 +407,14 @@ public class PasswordStore extends ActionBarActivity  {
         }
     }
 
+    public void filterListAdapter(String filter) {
+        PasswordFragment plist;
+        if  (null !=
+                (plist = (PasswordFragment) getFragmentManager().findFragmentByTag("PasswordsList"))) {
+            plist.filterAdapter(filter);
+        }
+    }
+
     private File getCurrentDir() {
         return new File(((PasswordFragment) getFragmentManager().findFragmentByTag("PasswordsList")).getArguments().getString("Path"));
     }
diff --git a/app/src/main/res/drawable-hdpi/ic_action_search.png b/app/src/main/res/drawable-hdpi/ic_action_search.png
new file mode 100644
index 0000000000000000000000000000000000000000..f594b4e482c7db630737b6b68c8646726480d4af
GIT binary patch
literal 702
zcmV;v0zv(WP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!U`a$lRCwC#SfOsiFc5844XmUfWU5+P
zGO$QR8*K2tVWl0+eqnfYWS}Jjr7aB^DOshKmJB3PM?wZVFtR)8ELm34+KJ;@lb>`-
zYT3@c^WFKbjfR7RgM&i_cse#23<f?td~PURtyX)h34qdlc-(?qgS2v{WFTvh7|3MS
z5Fl%hK>7;HVvt20r{a~c`dF|yDzzbtGju@$VR-^F1ro_g2$1rRf{V;Sp=H5*BpHGX
zIl@TxNvBIS72F1uKc^v7`UMpEELyYM?S4VFolfV2+^tRP`!N1)lmIC40FO(iJSaXv
z1!dO4ydNTQMI_qr+e30X2%Jf}PM>p|nd(O<c&FUZkX)>O0+cEl=4CSp1uu)27NuV!
z1lWi6MFFdTIrkpaPJn`!9rdQ_$0+--4Ae7m0=|$obs)>xyH*#n8vmX^DwGF0(B(>t
zdI?a<WIh{I&E0gTv~rA7s|&5U_psvk!h(HkB@hcYs9)0h0hjwTI9)RYD0j!)4LVkJ
zC76#n|DGF~nF?Zt1s8OvOhih_T0Rm=>a8vUo}v{ap_y4yeUudhY*<h-pfR3xbZDv_
znNJ;AFXwg@J2KJD_QF^~CyRR}Wn;oC8IX5Er**7!n33B=2Wp^6nPRcZzY?q@4oE3q
zurB8LHE&s3qm_i$FboRn@qsByBu-Ha9m`%LAbDdm0ht;|nncsI_R!3KK~tYebYua}
zgZZgd1c*ecKw<;)zpd*BC{QO7Q!lJL0fm#mKN8-o?#Pau#MHVVmOKe8J6?5_+$Jx%
k9u<KO4h{|uX7DG#08dou2U`sf^#A|>07*qoM6N<$f@EtW!T<mO

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_action_search.png b/app/src/main/res/drawable-mdpi/ic_action_search.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e446ec03e770abba86e8994ddaaf5f5544788b1
GIT binary patch
literal 479
zcmV<50U-W~P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzfk{L`RCwC#m#=SwKorL*omnlWA*o&E
z1PbhI^>i(^`#)-zx#^ji+0NFC1by}d3d=;zzAt%~TnHRcUe_h#B`??G9``=?>wDDq
zu5A7U@b3X``UFK$6rgy3uiybcF5x+OmSyF+0J9#+A31rORqzi$9K->T{0YS!S1G{}
zi8Qy-^8_AqJGH%v0azoa5$;XmhByLA;S2cN(3$W%*4%R?CqtV;@yyi?-d#wX0+amU
zN?wCdJPY>{04uYu1Nt&kzm@<9cw~A&UzPptSb*x<O89N<@V;h7t|b6+E|UR$nOG$S
zK+6#KnFYkeELbJ>O+Ffcwf&Q;sS5&abY!=+lOQI=TT5ycC$M*WVo9~vrJCnnMl`|=
zi%gT13}#{~E;YkcqW~DfDBQZX+m%^!#E^LHYM`AEGs!azh?j=PP6+8QBHbeEyS7V8
z8es2$NG}e+)7%De`zs%%4v0pLm|x<8DT?A0hT#`}F5xHmJHU?KU$p6u$pr8tzyP+N
VjEWx1<;nm6002ovPDHLkV1lr>(e3~M

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_action_search.png b/app/src/main/res/drawable-xhdpi/ic_action_search.png
new file mode 100644
index 0000000000000000000000000000000000000000..aad535e9781380fe111046fa0bbd14de899c7a39
GIT binary patch
literal 900
zcmV-~1AF|5P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#CP_p=RCwC#njvi4Koo}US_KO!@IV#S
z)CDDxqJhvBmj;KH40LpGbR`3&DJ>n&Xh<X3WKvB7qJg6+Si#;&&(iI5j(z7l=bXG>
zIyrLelkdCt-rak45RgbD5{X12k&aWLi%!Sm@c<4N&@S;5|NRDyLEA!GuU4z#-~hnD
zM{t-x8#TC`gUF#R0LHr40AS!L9A?mB!!9yt&j5n;4gd^(3WuAT%L;@O*I2|8K*)Ll
z0R8+9T3RuqycP1S!hH$eb5j9i4)-kk0N_sH>je&gwRD}%AcPjpp8N2^(2}MYJVkx)
zVx<TT9+=PC7uz!i{mvu^+={+Izgw38P7LmuDQ3R4xk4Xvj2orm2Enyk05D4v$zKZ-
zv)`d7Tn$QHql<WB0dmlr+k6-__g})Pfg(2S2LR552q1H`aal-KF!IF$E);9Mb)gmH
z!l~330GEn2-<4h!n<sBpfpVr??%U<QKllJZG{wDTZ~Fwmr09Iq0ODf=u<a@^DFQC@
z0l<1kOt3An@2$&#+ZX_5W}+21*{6eL#S(zrr>(H~FfnF^wsqUZhRYOyocPRaCMyW^
zzm(W@iA)OsR&STmYB04l_<<tT{^?aZEIgDL3np01Xgm0OMXK$*EEehBu-R<hhQr|>
z`1wgVoxnNXe#8HN4b1*Cv~xMvfWDkph}#rJCkm4-^Z7+xDGQ_hZB4$v#7dEW0Cqqq
zLFAa#F~ue))!0Wkg<#{wNZYqUVtUOgEF#1H6TI%xR<Sf{+X46~1K;Pt>K%(Frv|An
zFRVUupNGCa;y^|5_;4nyJXdhti*CGeVgZV1UcMYnYw`;2BAIHPSCq)Bw&o9QEg^In
zU@&2liy5rR-oE0^lXVDA0knkoRpAQOA)EyMD$%&^-gHauGk`)9mJx)=*U>|i=RxvH
zi2ijtGg%$H1;7Wv2jdz-<gp91f$$FZ7JZKaWeU!t`$M2tif_Ct^&WsBgx7-tpb3Em
z8g;}d=#d)41P<wkP8B%}dMKfSlt?rGsQb}nF98S;%1`aM&*!ecCnAwZBoc{4A{~<c
a2`~WNM?H&)NF^=+0000<MNUMnLSTXy*_WjN

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_search.png b/app/src/main/res/drawable-xxhdpi/ic_action_search.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c0ea3ca04bcd4b699ddaadfc3fa9be1267a3e3b
GIT binary patch
literal 1153
zcmV-{1b+L8P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$BS}O-RCwC#oFQ!EFcgN}v6klGLU**%
zPzPJO($STUjvhUFqoW%wZD|KrG^v9Znxmn?XP;hl)nqqGW5+M{|4UZXX>F4C`8~hq
z*bxGPAP9mW2!bF8f*=TjAP9n-YsBeduCK3Cc^K2j@3NJ$<@CAu`1mLQz^=is<Y6kC
zI;IW2qJU)74j}*;c`*7!9u~6AWJ@~!oC2|tATj`GZuq%u6U#rZ!qj?*AVxhIUxk>J
zg&tq0gKV!7L<s=@jekcyzo`mp$GU9cHR`+15<(s|017#G6zl5@cA!BuJMnu74c1d?
zb%V7EN&6@PkntaDGMlpp&=%v#3wH>v0IW{*{F37I!4l}(nh^Jk^WZ#kVEj`t-^m~;
z&#6Mvy}=vQxqfo387>@TJ0|1rr4gQ8WGLiKPh{+`QcxbadccK6<4-8nG#UTJ<&99*
zV}g*%>syBI0SiN(e{gO5h7jhINreZ1djH%s;P!b#1Yv6kMaxh<U||>ly;P<0oI6T$
zziLLEB{%@OlryuDYIe}3#kCF>0A)T&3j_4!1)0eULh}IKv_Qe6_}LjUq9h~$SB8Si
zyC?*f4X=5y08*|1s<BA(w{JlJpl7(I_{&9qLiT{MF8(u1wSNo7>Iz^o001In4@d>%
z6+j6S`UQ{=^uCKw0O)kd%-BiD0CYDpVK(iX1`B{5^Rccp4c8J>2+|c@Qw}#ro|tm3
z4V(dBGVgw)%iK6s>NWtF=6x0n?oT)M{25XjT8#s`9yRyr1@sVJmkhiI1%R|OOjF!?
zjQzT2)CIRiT2=tiyt}R_ThOAZzO@qid8&<ICYy!W+VJ;#)3mjt-hXFEJu{B$M6CfJ
z*FG3R(PJMF<T++12LH8SDBDvJucqqQH3aJUE7KUob-#d%#ktDJkHWlAc1!DaY@M%K
z`+2JRR_A@<2w~(f6s&5Bx6YgE<arj9X*EfASwe8RL#7Tw1!C7`0T-p1H{!fqmh2!n
z-6KYewjLVv&}#p$dVsE*r>W+2n(ika41_*5=_LfAuT*qL-Z80xpb~~D!5vfbu<aX6
zpZkQD!p$Dx<8Y=n=H)es04wk4b*DUe!&2B?pIOj=zHgC@v4P;_T@jQz&ZwOenv{{$
ztmb>o)>ifqyuU5wX#a0|1mo&U53ioQ{Trm)q_5l|uzFpML&#Hc-bOv=5H3U<I(J6a
z`4mbl0J^Nwa0($70A1w_LM#AEt`K4Yu;mJ26bXPX>8R7}C>j7<Aw&hh5riLIHls(E
z1=YMy;+!#|(>mBF(@@J05&-ZEAqN0|5IQgPjlL4@2;mKdm_G=){N4rt{6MJw7nQJw
zIw7Y5tOS65At-~t*$6uT&<sLVWF-{uGgt+JAP9mW2!bF8f*=TjAP5?${t7SvjES_T
ThEgMX00000NkvXXu0mjf>R1R*

literal 0
HcmV?d00001

diff --git a/app/src/main/res/menu/pwdstore.xml b/app/src/main/res/menu/pwdstore.xml
index a3f44f73..c6b25043 100644
--- a/app/src/main/res/menu/pwdstore.xml
+++ b/app/src/main/res/menu/pwdstore.xml
@@ -1,10 +1,17 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:pwstore="http://schemas.android.com/apk/res-auto"
     tools:context=".pwdstore" >
 
+    <item android:id="@+id/action_search"
+          android:title="@string/action_search"
+          android:icon="@drawable/ic_action_search"
+          pwstore:showAsAction="ifRoom|collapseActionView"
+          pwstore:actionViewClass="android.support.v7.widget.SearchView" />
+
     <item android:id="@+id/menu_add_password"
         android:icon="@drawable/ico_add"
-        android:showAsAction="always"
+        pwstore:showAsAction="ifRoom"
         android:title="New password"/>
 
     <!--<item android:id="@+id/menu_add_category"-->
@@ -17,7 +24,7 @@
 
     <item android:id="@+id/referesh"
         android:title="Refresh list"
-        android:showAsAction="never"
+        pwstore:showAsAction="never"
         android:icon="@drawable/ico_sync"/>
 
     <item android:id="@+id/user_pref"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c35514ec..07c6b3fd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -42,6 +42,7 @@
 
     <!-- DECRYPT Layout -->
     <string name="crypto_category">Category</string>
+    <string name="action_search">Search</string>
 
 
 </resources>

From ac57d0d6d43a5029aa010c4fee11c4df93fb092e Mon Sep 17 00:00:00 2001
From: Johannes Baiter <johannes.baiter@gmail.com>
Date: Wed, 29 Oct 2014 02:55:26 +0100
Subject: [PATCH 2/3] Fix filtering when loosening query

---
 .../com/zeapo/pwdstore/PasswordFragment.java     | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java b/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java
index 4d433013..6058d169 100644
--- a/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java
+++ b/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java
@@ -129,13 +129,15 @@ public class PasswordFragment extends Fragment{
     public void filterAdapter(String filter) {
         if (filter.isEmpty()) {
             updateAdapter();
-            return;
-        }
-        for (int i=0; i<recyclerAdapter.getItemCount(); i++) {
-            PasswordItem item = recyclerAdapter.getValues().get(i);
-            boolean matches = item.getName().toLowerCase().contains(filter);
-            if (!matches) {
-                recyclerAdapter.remove(i);
+        } else {
+            for (PasswordItem item : PasswordRepository.getPasswords()) {
+                boolean matches = item.getName().toLowerCase().contains(filter);
+                boolean inAdapter = recyclerAdapter.getValues().contains(item);
+                if (matches && !inAdapter) {
+                    recyclerAdapter.add(item);
+                } else if (!matches && inAdapter) {
+                    recyclerAdapter.remove(recyclerAdapter.getValues().indexOf(item));
+                }
             }
         }
     }

From a05a4a42df17b8dee25252b7cdfbb93a17b46943 Mon Sep 17 00:00:00 2001
From: Johannes Baiter <johannes.baiter@gmail.com>
Date: Wed, 29 Oct 2014 11:13:40 +0100
Subject: [PATCH 3/3] Use Holo Dark search icon

---
 .../res/drawable-hdpi/ic_action_search.png    | Bin 702 -> 650 bytes
 .../res/drawable-mdpi/ic_action_search.png    | Bin 479 -> 449 bytes
 .../res/drawable-xhdpi/ic_action_search.png   | Bin 900 -> 827 bytes
 .../res/drawable-xxhdpi/ic_action_search.png  | Bin 1153 -> 1152 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/src/main/res/drawable-hdpi/ic_action_search.png b/app/src/main/res/drawable-hdpi/ic_action_search.png
index f594b4e482c7db630737b6b68c8646726480d4af..772e3598edb5441a68bb184f9c85e17109ebd6ee 100644
GIT binary patch
delta 588
zcmV-S0<-<T1&RfbNq;O!L_t(|+U!}~ae_b)=HfF2m;y)v6d)<U0x<8U4D}rgfcL}#
z^gZ|<8=wFwzyi$P<YQ*%2K4wnOm1g(1m<qpZ~xdmC(eV@!~(DYEC36@D2XnFT(8$>
z`kAsvnGoVKY5=6PPd{_w8L?ZkBqvUZcLe4<8UV2NirBBQZGT6c^x+lJ!0M4=ajDdi
zm|NK+4wUT~@tQznMgTzhSP2nn)qTZ!2{Ht`4D4H%Ath>r%?DHDK)lrn3G9vFl_J3x
zgO(~%A}0O@uN&-li9eZ)<&etz?8SS8MiV(6lk?S7j!I7&Yv$~_aV0_W9&qcHBzbQD
zW<>&4C2S2!N`K_`2LK6Jxcb<-V*FO09Jen+c!0MDU6sCbiR@lOXw>xQ0c1*h&;@xV
zvikvml365O(6)A?9dQQ(07}_)*z$d0h1^~N?6?9btxc>Su#Z<x-W>)2YWI$PL8H2%
zB-;qg5Cv_Au0jcmS*c76rF1PHD=qcO#5~|BiWF^iQh(OpBVogeo<|zvy^9I0?nI{c
z_I$WeCo(n6F3PhEp7k&zq`d=RK$gm+b&GPu{0Sbc3cXE}X0gqwM9~t@(3njX>q<_!
zWwEDI5W*RlkkrwQCAC19=!Nc8uN8ruj~ReY3!x1{7y#fvxs}G!yWwO6Kur*fTZduB
z<^foCqeZdQ9i;~}Js}SgUPnEV-SNc6c@&bKP!7I=hnsJ4dgnX;iR_<z7Jvm{0hpy9
a0R{jdKM=T_dBCFp0000<MNUMnLSTaCxD2=e

delta 640
zcmV-`0)PFA1-=E4Nq=BTL_t(|+U!`NZo@DTZB`Aeq#$IfT3Rx&NJSfL@V;TC9n5}V
zcywf-B?F}`4H+p}rIwZqBvMC020AdZJLxQ0R?^yu<64uSbV_R3&b{;9`L2zIgM)*E
zLj`y`HW>^CK0JJGC|#{qd#ee6(tUW`f?R{Na;9V;YmgYoWPjEWAZw36`U=ZpkVPG*
z;+3%aSg<%MwIPc$bU^}Pc>*#863Iyjkn)d$i_AfxWx;$T8G;Ns!btW>r%N>z+y<3D
zry*4O1r+%#TC>~jenGaKPUnN%txfCuF#c|o04VVQk4vUJC_X_2W!A#HA0lx@B--%X
zLvlI@oJqP)pMP_knd(O<c&FUZkX)>O0+cEl=4CSp1uu)27NuV!1lWi6MFFdTIrkpa
zPJn`!9rdQ_$0+--4Ae7m0=|$obs)>xyH*#n8vmX^DwGF0(B(>tdI?a<WIh{I&E0gT
zv~rA7s|&5U_psvk!h(HkB@hcYs9)0h0hjwTI9)RYD1Udy+zmQbbtRaOIscv;nwbh>
zh6NXNs7ypk$yz=VO6sjH0-mB3BcYjDQhk&a1Z-GPGN3V@b#!Q|9hpxZSuf{y6+1G~
z&Gy1rLMMxRC1qp6D;bb?LZ@}CbeNIbL<ef1Ntt4?%D)n<Bo0U^U$8Fb`897@TBDVO
z*DwqU>Ur^jDM}<xQ41Z*ULzoRV>1Dn8c3Q%)3o-`%zr^spGkCN0nUT@sZ|7sM5;hy
z1M|PF>jx-MClXUHtUCdPlfXX`-mLD(j-15Qx*(Q32`oEab(P#EFS#BSfesE14i0AU
aC%^ztROts>4G;AI0000<MNUMnLSTaSI~Jt?

diff --git a/app/src/main/res/drawable-mdpi/ic_action_search.png b/app/src/main/res/drawable-mdpi/ic_action_search.png
index 2e446ec03e770abba86e8994ddaaf5f5544788b1..4edb1ff92fe4c88a984a299ae6ff643cb6e0cbf2 100644
GIT binary patch
delta 385
zcmV-{0e=491Hl83Nq=KWL_t(|+U!=rjlwVxjQLZ*xd0k)0~A0CNCQv+4Nw3LgaSwb
zx&P(<qyZNI1-O7PE3G9f!X}oM+&!|=XobD<j2-WoqF7>yKMpmeXcz{KQ~?`6^Y9($
zfM2E5{bK?^eq{1kIN$;ijko}i*GPtc5<v?h%X2hd0z01n#(&&N?Ay@JfgA7xY!Y>b
zYpAx8BG<g&Ek!;O;l-|VxK@#IzmvuvdGb3d)guvzd@CWq@4C%c%U?nxAwcuaY{puS
z^OuAGH<uA51#qiP4R26ZLO{p4%vj6&K`+&YzPHVU`jTr~Nh8_^y=@Y8Rp1%fM)b~#
zPotx4f(xp7&U%dQ&LO9JraVTpt38{{t9Ss{pvG~wEXGMZ$KK&g(C0+ZgP`LYGOv0h
z^sNXb+0%3nUJNHitb~2VMr^%~JyOyF4ha$Gj|<>qj)|D%1X3cJV$Ps%4xE82Ipy;I
fe~Et^PXPu1!=KTV_gtK200000NkvXXu0mjf3}3Mq

delta 416
zcmV;R0bl;X1K$IXNq>P!L_t(|+U%FFZ-YP-$0?mzEv6x<UF8G{>}>UPEw=kVYL~g`
znVH$n){F#w_5=#cM9sc0d6!%W98g}@CF3P8*W(`dKKJW;)c3Az{si#v0dD#PMNt%>
zc!00q0Y5I`IeC_4<+%W}9?2g$d7D-64?rBm0g(I&#T{2E!G95nG`G?71RircwY`b~
zSR<zq?oHx`I08xG3;5g6neaQ-+;b%-Lz_bJ%+(FvT}Ye)ll<UHUV~6P3-=NLE3>Wx
z`Z80$mH-HNWO_hfmHqBmfa=;x_-*a*zGg<QB>-|RlL391SS1BO%MkaO1;oTGSS9vN
zJ{o|v{gbPy3x5J_bY!=+lOQI=TT5ycC$M*WVo9~vrJCnnMl`|=i%gT13}#{~E;Ykc
zqW~DfDBQZX+m%^!#E^LHYM`AEGs!azh?j=PP6+8QBHbeEyS7V88es2$NG}e+)7%De
z`zs%%4v0pLm|x<8DT?A0hT#`}F5xHmJHU?KU$p6u$r%LjBftQ*pNxtg%jL=d0000<
KMNUMnLSTaD7{lcN

diff --git a/app/src/main/res/drawable-xhdpi/ic_action_search.png b/app/src/main/res/drawable-xhdpi/ic_action_search.png
index aad535e9781380fe111046fa0bbd14de899c7a39..19658e4a2acbe30df1aeb743ba5ac5e16a5edd21 100644
GIT binary patch
delta 767
zcmV<b0s#Gl2fGH4NPhy|Nkl<Zc-rim!Ex#^5QeSXDF7Eh0~GKmASr+p5DFmokUKAT
zQUDZ?6krN)0~BBvK<>QV$!bPVBVtRI%-Y$1Mq`o~jr3`ErClY<L?V$$Boc{4zf&qj
zr<coR0*@KAIsFPhe?hCDouQqSQsw9Xz{D5uxQDiA@j8MyLVw!>jMJb2z{GK-H_)bm
zT@=vX07Nx705JJAJeCcwp}FS`fY2gd0YWhd0OaRe!_Vy%Me{E0RfX^A*zkA-2txQ6
z0)VZ<*Grl})zNi&gP<as{a+aLA<&Z66g*9>`q(K{z<_bpcCl9s`rTL%YIGCm_nZ>I
zUBGuXj+O6hu7A+ShGK`-v_)|37XYl%gXOPfh}r+3SK1A<mgFLAEZ~o0!14U?+uTi{
z6Gv>g4FFmRGwK(K4lW1F3Km=}U}pV%OcIs9t-$Pi&IQ2SvFE2!={P*G*#-1Ur98LW
zeNVVqz|FF^TLP&2SP{+uD(jH)>j0el3QUfGTXO(#YJV7HDgft{0k<^(%FIkFcuX-M
zu&mqyaOC0w_F$%z8OGL=qqxEbz~0UbV<syE^uLrib&1Ri099{4t=(W9Y4Q_Cs{PI?
z9X1AK#)5k)W^|qW&XH<=umeC5*-nEI!ZySm$n5uyWUJ14P?w@87DrwjX9Y}W4^5>k
ziuO+p`G5W=Rf_ll_yK|jaipxSa_sSQk8?y)2r({3y50(zDR6zoB5)_j$xZOR=UBzk
zSXX1{`%7xRaR4X%t^=N<I(+R^x{3iI_T{Lq;Vl|WT)Rl&+UNU(pi%}HN|<bmsN0<F
zuiQLEhmaINM|iHSF*=01jIU-M@9jd5<eUMNo_Mf=AaDloocYxrgCHoz0L&c0r~2d-
z6F6Idz9d-%Si*7)F3<%+J{kal5Xw;j@Ptrj9%Zz_0B8vT|GxG)6b%YM1B9BQzt^>$
x$_6SU1I@|ji`4&5Boc{4B9TZW8k7DBFaWjb9TtHJeu)48002ovPDHLkV1j%}W|IH_

delta 841
zcmV-P1GfCT280KYNPhz+Nkl<Zc-rimA#B?~6o&0u1q&(gKo!;01tpQ9fzTG028Wgm
zbaZfZB?F}?EgjBiNF&)~QcVM*fuku{!QM&F((QDPedjypoV;H;Idbfi@4NTj-FtQr
zkVqsFi9{lij#HtFPRHZ%01g+>F7Xuq{RWLe+d^BfR;%LR0Dr*1M{t-x8#TC`gUF#R
z0LHr40AS!L9A?mB!!9yt&j5n;4gd^(3WuAT%L;@O*I2|8K*)Ll0R8+9T3RuqycP1S
z!hH$eb5j9i4)-kk0N_sH>je&gwRD}%AcPjpp8N2^(2}MYJVkx)Vx<TT9+=PC7uz!i
z{mvu^+={+Izkgeo08R|<nJH$zwYfqcbBr6M;s(LBTL3Ui6Uko-6SLo;CtM9mU89S5
zV*zr|o7;RCH1}V^sevLk><0kOga{yWv~gKTRxt9#0xlG5y>+1#<ie@c7XX)vHQ$w9
z6`Ln-R)KP+T<+WDzCZW?Ks3d@WpDcgz@+GW)BxgR1b?vYDljPmF7pAvdPhvKEwS&d
z%YfS$0A^;Q6*$?agJs1MfZV68u=p@BW`?$P+r@^<6o8!g%xoqr2=u>{*ma3a3jkJc
zm(pr5wKVvFBGvxsRXQv@lo$&pSj=cU_<KdF?Yt}&>E5u}Y~F^$;UD<<NjROrIo^K5
z|9=h4{(m#Hb2-<5zMNNx+Z0773X?7K`9)nR3#0vQO}@XxN|Ap6c0edW<e1el#U>}!
z*he^pVB^I|+qXhudd(^<BE$X@yzbFfu{3Ji0r)8c-{-;V9g8NX2B|MEtUhy}hrT}I
zKt=KRa3-ugS8&~nZoF|~0g7l|z8p<!@(S)EnSW}XSCq)Bw&o9QEg^InU@&2liy5rR
z-oE0^lXVDA0knkoRpAQOA)EyMD$%&^-gHauGk`)9mJx)=*U>|i=RxvHi2ijtGg%$H
z1;7Wv2jdz-<gp91f$$FZ7JZKaWeU!t`$M2tif_Ct^&WsBgx7-tpb3Em8g;}d=#d)4
z1VRq!hfWna40<S`f|N)z|ET-XWiJ5;5Xw*OxX<UVzb7J*NF)-8L?RuM{s}Mu-A6r(
TiAW_b00000NkvXXu0mjfbmfYn

diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_search.png b/app/src/main/res/drawable-xxhdpi/ic_action_search.png
index 9c0ea3ca04bcd4b699ddaadfc3fa9be1267a3e3b..a10863887e448e59e0eb34d7d08eb5f273498628 100644
GIT binary patch
delta 1094
zcmV-M1iAZx34jTZNq-_qL_t(|+U%Uck>W5AMQ!c`00B4w0vG~-y?f^l0T2LiU-k|O
zH~=;PCIAvp0OJ5004pu+T8gr;jU}rs{a@vp8fL(zpSsoEmK;S81VIo4K@bE%5ClOG
z1VIpFT`{MNx!rDw{4u6qXYwfIA?Wu!j^l3tFl%sS<T)8TX@Bq*1>{P{mk&T<2S!&T
zJe9{%9+QqAr$C$}h${dzH+=dKW=u(islyOK#61~bg_xaz5nrc^JoXYq0RaDvzoAjz
zRJlB!V|&uVYt;KU5`qXC0EHZ7{6zzUsgZkm6+-0aO=+_JpozO~vi>bU?;IomGXAk9
zvw3?0Z84whxqm~j1z`7L<QHU^iy_dfnh>|<JUPb}jQ=X;TbU%~IaNs7YP><6>yvBE
z5F0kcj6zS9{zxP2ELYJ-4Fn<2{gWerk>R+%b7A~{Bk7*?tZBqQE0Nc?@)`hzovJ+l
zV%zu)A*7T^`3K-3E2*4tdyT1g2&alal@qp?9-vDHoqtrN@|+o^xzAeAVDS#XvMSFv
zk!p6(N%Q)`D*%-FOj;PAFE6-iykO~@2UN8Mawf%3rpbt=J^`3%3NH6W&OHPc4X=5y
z01~bM%DJfGwTTx1sQT2!UoH|pdq7o6morPXS>GkI0bmF>%DwS`B!Zj*C}2Xj0K`DQ
zckT;-A%BFWDd%}=WML$YnYDcrZ#{r+^RccpHP_;e2k7$b4-Q|BJTc*18`uIcXVQ1C
zYCRX6Ds>Y8zBI3=48Gs8#q|yo0L=qcBPw<21#}a>s_Az23IHk7v?*4Oj6c<QV9srk
zmJtBdcNZEjm^=7hx<y*2h?z_lVh5cubZu)(qkn&+Nj<L|*NGYfK(2k!grZ{~5ac<Q
zFDCy(#89SN5qn*AY#RcN{H<<|;<{hJC;(amw9!<@C4|(l;Z^J7Sd;cH`V51uY-TYO
zY-@_Q&YSB9<|=Bodqxe4H8)SNxkIK7LJ1;kvw(|I%tiFxE=zV0tnLw`MO(ibjL>rb
zuYb@Kb!AVd>3-tDK<HzW-jpEp6@xSKkZ}zJl`zc7i`4&qQ&<#U0eET+*w`cd7|zsQ
zVNtVLgOzvmx>KIKVHKHOAe+<3JwKgm5D=U^D}tJI<wW{UXi`Q}UCndN)>ifqoIfq)
zVgGOP0Auzv!pl2vf?5jK7N5@=0;|W>Sbu~(r$m5V#x#n;(EQE!S#P0)0-(!kXsZxH
z0nk;}AcO*-;0hrW04J^x;y?g&Nk^?_N5KH#3Lz)}mLUA-vKc+NEU4yr67S3joz}qy
znT8sMFaZF!5Cj0YgV1@QZ}63HM+h0xP<Pppk;kB+7xbPdl>duL*nuYqD!>W==sy>N
zGPqj9WORi!0O%o<Mb?Dk{S{V$AP9mW2!bF8f*=TjAP9m6s=opZ02#2aak#Y@Qvd(}
M07*qoM6N<$f}>UE(*OVf

delta 1095
zcmV-N1i1Tv34sZaNq-|rL_t(|+U%SmY~wH#hTXB2=HNniw9-%qTe{NGm5z=cJ$j>~
z8!c^V2Uj$ygBO~kp}}XLUUb!DH%Vj1FZTaSR@7;2lK1&NzvtKy0)ik2f*=TjAP9mW
z2!bF8f}Cr_>0++0uTyy#)5q_!m9pjZx%l|_C;-5&!LQ_DDu0_grVYNLfMnDTApjY9
zF#1Fu7P8G`OFI6X0<n=GG5~09__=Ho%RjHe)Ov^@Mm-r{g_xCv9$%+}Y_AeT2>}0%
ze@8vPsS0Yxx@_S!>buVpLLM~$3ORQa>+1}5pg}b|@p}mk)>CSAgS84t`zQgB@gHk4
zo3jVd7URhacYg@30IW{*{F37I!4l}(nh^Jk^WZ#kVEj`t-^m~;&#6Mvy}=vQxqfo3
z87>@TJ0|1rr4gQ8WGLiKPh{+`QcxbadccK6<4-8nG#UTJ<&99*V}g*%>syBI0SiN(
ze{gO5h7jhINreZ1djH%s;P!b#1Yv6kMaxh<U||>ly?<1t@|-(LbH8dvoh3K`x|B1s
zk!p6(rp2`m7XW2GNect?<pr6^3qtb%-Lyc#r1;qxGNL3T09S^B%eyE9mJP3YumDo7
z0IIP_^S5t70H9~MrufT6e?s<vu`d2IOSOLs#_9@SG5`P~WDiIM<P|^(6Z!>^5A?o^
zPypz3$$!k)Nyq?nH!@*1?VAP*fFAR)t~3qT5>yD%6<t#fH%FeBa;^=W0bnxkexu9W
zI92L40GQ@|77XrBH}(7(QW{!~1G*kH_vr=n5MGxIyaxq<v@=Xo+<J`tx@Xh{w?$f3
z0MNX<t|(j3qN%>M68d?njbJ95h1lBg_j}W{wSS}De`iQNGmh&-tpOm{J{UsLV;>OY
zIc6sY|FvK!+fxy*rs~)=1nT)K(-_5dzkrLyxys0o!n{y+OY3%Qov&K^d8+zW=Y8S`
zVdO9rtZIt4&YSDxc@~suHA#0_LU6f5rVc^{V%KH?7p0gt;=Em!>>xPZBSwq19vbw}
zYJdN)dVsE*r>W+2n(ika41_*5=_LfAuT*qL-Z80xpb~~D!5vfbu<aX6pZkQD!p$Dx
z<8Y=n=H)es04wk4b*DUe!&2B?pIOj=zHgC@v4P;_T@jQz&ZwOenv{{$tmb>o)>ifq
zyuU5wX#a0|1mo&U53ioQ{Trm)q_5l|uzz}8jYG&&ao$Ef=MXML96EPK*7+1lEC9N!
z(r^kP764u43_>gbO0E!M0kGu?VH62~F6pS#>?j%lTp>gSz!8KWT{fdfmj%_lPvV?0
zq0>6pDAQ2O5E20J3n2#pe-Jt^^o_m}?g-%xg_u7Gx%}P+0Q^9x{uh<7hdLpr0zj+;
zfPNt;gTL7bI{?rOLRDlX6z?-w1%e<5f*=TjAP9mW2!bF88mRsXFaV5+w5NtrBYFS;
N002ovPDHLkV1k%B`}F_-