From a363712127c35a0c6e29ad34104737e60c5b3082 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 4 Oct 2019 09:32:59 -0400
Subject: [PATCH] use black text for search bar on light theme

---
 src/App/Controls/ExtendedSearchBar.cs        | 21 ++++++++++++++++++++
 src/App/Pages/Vault/CiphersPage.xaml         |  2 +-
 src/App/Styles/Android.xaml                  |  3 ++-
 src/App/Styles/iOS.xaml                      |  3 ++-
 src/iOS.Core/Services/DeviceActionService.cs | 10 +++++++++-
 5 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 src/App/Controls/ExtendedSearchBar.cs

diff --git a/src/App/Controls/ExtendedSearchBar.cs b/src/App/Controls/ExtendedSearchBar.cs
new file mode 100644
index 000000000..c93861d94
--- /dev/null
+++ b/src/App/Controls/ExtendedSearchBar.cs
@@ -0,0 +1,21 @@
+using Bit.App.Abstractions;
+using Bit.Core.Utilities;
+using Xamarin.Forms;
+
+namespace Bit.App.Controls
+{
+    public class ExtendedSearchBar : SearchBar
+    {
+        public ExtendedSearchBar()
+        {
+            if(Device.RuntimePlatform == Device.iOS)
+            {
+                var deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService", true);
+                if(!deviceActionService?.UsingDarkTheme() ?? false)
+                {
+                    TextColor = Color.Black;
+                }
+            }
+        }
+    }
+}
diff --git a/src/App/Pages/Vault/CiphersPage.xaml b/src/App/Pages/Vault/CiphersPage.xaml
index b7e52d633..81b63b2a9 100644
--- a/src/App/Pages/Vault/CiphersPage.xaml
+++ b/src/App/Pages/Vault/CiphersPage.xaml
@@ -34,7 +34,7 @@
                     VerticalOptions="CenterAndExpand"
                     Clicked="BackButton_Clicked"
                     x:Name="_backButton" />
-                <SearchBar
+                <controls:ExtendedSearchBar
                     x:Name="_searchBar"
                     HorizontalOptions="FillAndExpand"
                     TextChanged="SearchBar_TextChanged"
diff --git a/src/App/Styles/Android.xaml b/src/App/Styles/Android.xaml
index 64a6a86e6..d8510a441 100644
--- a/src/App/Styles/Android.xaml
+++ b/src/App/Styles/Android.xaml
@@ -22,7 +22,8 @@
         <Setter Property="Margin"
                 Value="-4, 0, -4, -4" />
     </Style>
-    <Style TargetType="SearchBar">
+    <Style TargetType="SearchBar"
+           ApplyToDerivedTypes="True">
         <Setter Property="BackgroundColor"
                 Value="Transparent" />
         <Setter Property="TextColor"
diff --git a/src/App/Styles/iOS.xaml b/src/App/Styles/iOS.xaml
index a1b3934e5..5b918a137 100644
--- a/src/App/Styles/iOS.xaml
+++ b/src/App/Styles/iOS.xaml
@@ -35,7 +35,8 @@
         <Setter Property="OnColor"
                 Value="{StaticResource SwitchOnColor}" />
     </Style>
-    <Style TargetType="SearchBar">
+    <Style TargetType="SearchBar"
+           ApplyToDerivedTypes="True">
         <Setter Property="BackgroundColor"
                 Value="{StaticResource ListHeaderBackgroundColor}" />
         <Setter Property="TextColor"
diff --git a/src/iOS.Core/Services/DeviceActionService.cs b/src/iOS.Core/Services/DeviceActionService.cs
index e43c59014..cb272cdea 100644
--- a/src/iOS.Core/Services/DeviceActionService.cs
+++ b/src/iOS.Core/Services/DeviceActionService.cs
@@ -353,7 +353,15 @@ namespace Bit.iOS.Core.Services
 
         public bool UsingDarkTheme()
         {
-            return UIScreen.MainScreen.TraitCollection.UserInterfaceStyle == UIUserInterfaceStyle.Dark;
+            try
+            {
+                if(SystemMajorVersion() > 12)
+                {
+                    return UIScreen.MainScreen.TraitCollection.UserInterfaceStyle == UIUserInterfaceStyle.Dark;
+                }
+            }
+            catch { }
+            return false;
         }
 
         private void ImagePicker_FinishedPickingMedia(object sender, UIImagePickerMediaPickedEventArgs e)