From 128935eb9f6c2af0c7aafd1dabded5083af00696 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Sat, 4 May 2019 00:14:49 -0400
Subject: [PATCH] searchbar on ciphers page

---
 src/Android/Android.csproj                    |  1 +
 .../Renderers/CustomSearchBarRenderer.cs      | 30 +++++++++++++++++++
 src/Android/Resources/values/styles.xml       |  1 +
 src/App/Pages/Vault/CiphersPage.xaml          | 21 +++++++++++++
 .../Vault/GroupingsPage/GroupingsPage.xaml.cs |  2 +-
 src/App/Styles/Base.xaml                      | 10 +++++++
 src/App/Styles/Dark.xaml                      |  3 ++
 src/App/Styles/Light.xaml                     |  3 ++
 8 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 src/Android/Renderers/CustomSearchBarRenderer.cs

diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj
index 63c1aa3fd..50c483397 100644
--- a/src/Android/Android.csproj
+++ b/src/Android/Android.csproj
@@ -79,6 +79,7 @@
     <Compile Include="Autofill\FilledItem.cs" />
     <Compile Include="Autofill\Parser.cs" />
     <Compile Include="Autofill\SavedItem.cs" />
+    <Compile Include="Renderers\CustomSearchBarRenderer.cs" />
     <Compile Include="SplashActivity.cs" />
     <Compile Include="Renderers\BoxedView\BoxedViewRecyclerAdapter.cs" />
     <Compile Include="Renderers\BoxedView\BoxedViewRenderer.cs" />
diff --git a/src/Android/Renderers/CustomSearchBarRenderer.cs b/src/Android/Renderers/CustomSearchBarRenderer.cs
new file mode 100644
index 000000000..d3c7715cb
--- /dev/null
+++ b/src/Android/Renderers/CustomSearchBarRenderer.cs
@@ -0,0 +1,30 @@
+using Android.Content;
+using Bit.Droid.Renderers.BoxedView;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+[assembly: ExportRenderer(typeof(SearchBar), typeof(CustomSearchBarRenderer))]
+namespace Bit.Droid.Renderers.BoxedView
+{
+    public class CustomSearchBarRenderer : SearchBarRenderer
+    {
+        public CustomSearchBarRenderer(Context context)
+            : base(context)
+        { }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<SearchBar> e)
+        {
+            base.OnElementChanged(e);
+            if(Control != null && e.NewElement != null)
+            {
+                try
+                {
+                    var magId = Resources.GetIdentifier("android:id/search_mag_icon", null, null);
+                    var magImage = (Android.Widget.ImageView)Control.FindViewById(magId);
+                    magImage.LayoutParameters = new Android.Widget.LinearLayout.LayoutParams(0, 0);
+                }
+                catch { }
+            }
+        }
+    }
+}
diff --git a/src/Android/Resources/values/styles.xml b/src/Android/Resources/values/styles.xml
index 907655a42..26778c886 100644
--- a/src/Android/Resources/values/styles.xml
+++ b/src/Android/Resources/values/styles.xml
@@ -18,6 +18,7 @@
     <item name="windowActionModeOverlay">true</item>
     <item name="android:datePickerDialogTheme">@style/AppCompatDialogStyle</item>
     <item name="android:colorActivatedHighlight">@android:color/transparent</item>
+    <item name="android:textCursorDrawable">@null</item>
   </style>
 
   <style name="AppCompatDialogStyle" parent="Theme.AppCompat.Light.Dialog">
diff --git a/src/App/Pages/Vault/CiphersPage.xaml b/src/App/Pages/Vault/CiphersPage.xaml
index c50cacc97..99bbe5511 100644
--- a/src/App/Pages/Vault/CiphersPage.xaml
+++ b/src/App/Pages/Vault/CiphersPage.xaml
@@ -22,6 +22,27 @@
         </ResourceDictionary>
     </ContentPage.Resources>
 
+    <NavigationPage.TitleView>
+        <StackLayout
+            Orientation="Horizontal"
+            VerticalOptions="FillAndExpand"
+            HorizontalOptions="FillAndExpand"
+            Spacing="0"
+            Padding="0">
+            <controls:MiButton
+                Text="&#xe5c4;"
+                BackgroundColor="Transparent"
+                Padding="0"
+                WidthRequest="37"
+                FontSize="25"
+                VerticalOptions="CenterAndExpand" />
+            <SearchBar
+                HorizontalOptions="FillAndExpand"
+                BackgroundColor="Transparent"
+                Placeholder="{u:I18n SearchVault}" />
+        </StackLayout>
+    </NavigationPage.TitleView>
+
     <StackLayout x:Name="_mainLayout">
         <Label IsVisible="{Binding ShowNoData}"
                Text="{Binding NoDataText}"
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs
index a7e30de08..8d66993d9 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs
@@ -98,7 +98,7 @@ namespace Bit.App.Pages
 
         private async void Search_Clicked(object sender, System.EventArgs e)
         {
-            await Navigation.PushModalAsync(new CiphersPage(), false);
+            await Navigation.PushModalAsync(new NavigationPage(new CiphersPage()), false);
         }
     }
 }
diff --git a/src/App/Styles/Base.xaml b/src/App/Styles/Base.xaml
index 0a1b39a79..deec2dcf1 100644
--- a/src/App/Styles/Base.xaml
+++ b/src/App/Styles/Base.xaml
@@ -48,6 +48,16 @@
         <Setter Property="FontAttributes"
                 Value="Bold" />
     </Style>
+    <Style TargetType="SearchBar">
+        <Setter Property="BackgroundColor"
+                Value="Transparent" />
+        <Setter Property="TextColor"
+                Value="{StaticResource HeaderEntryTextColor}" />
+        <Setter Property="CancelButtonColor"
+                Value="{StaticResource HeaderEntryTextColor}" />
+        <Setter Property="PlaceholderColor"
+                Value="{StaticResource HeaderEntryPlaceholderColor}" />
+    </Style>
     
     <!-- Buttons -->
     <Style TargetType="Button"
diff --git a/src/App/Styles/Dark.xaml b/src/App/Styles/Dark.xaml
index f6570df6a..f6314ef85 100644
--- a/src/App/Styles/Dark.xaml
+++ b/src/App/Styles/Dark.xaml
@@ -17,6 +17,9 @@
 
     <Color x:Key="BoxBorderColor">#f0f0f0</Color>
     <Color x:Key="BoxHeaderTextColor">#3c8dbc</Color>
+    
+    <Color x:Key="HeaderEntryTextColor">#ffffff</Color>
+    <Color x:Key="HeaderEntryPlaceholderColor">#707070</Color>
 
     <Color x:Key="ListItemBorderColor">#f0f0f0</Color>
     <Color x:Key="ListHeaderTextColor">#3c8dbc</Color>
diff --git a/src/App/Styles/Light.xaml b/src/App/Styles/Light.xaml
index 046e04559..1af5470df 100644
--- a/src/App/Styles/Light.xaml
+++ b/src/App/Styles/Light.xaml
@@ -18,6 +18,9 @@
     <Color x:Key="BoxBorderColor">#dddddd</Color>
     <Color x:Key="BoxHeaderTextColor">#3c8dbc</Color>
 
+    <Color x:Key="HeaderEntryTextColor">#ffffff</Color>
+    <Color x:Key="HeaderEntryPlaceholderColor">#c0dbeb</Color>
+
     <Color x:Key="ListItemBorderColor">#f0f0f0</Color>
     <Color x:Key="ListHeaderTextColor">#3c8dbc</Color>
 </ResourceDictionary>