From 6e91d66b2ccd80fe086d742467eb71bf1adc32e7 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 29 May 2019 17:14:15 -0400
Subject: [PATCH] white logo and popupTheme

---
 src/Android/Resources/values/styles.xml | 1 +
 src/App/Pages/Accounts/HomePage.xaml    | 4 +++-
 src/App/Pages/Accounts/HomePage.xaml.cs | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Android/Resources/values/styles.xml b/src/Android/Resources/values/styles.xml
index 10d7cb4fb..3134d214b 100644
--- a/src/Android/Resources/values/styles.xml
+++ b/src/Android/Resources/values/styles.xml
@@ -40,6 +40,7 @@
     <item name="android:datePickerDialogTheme">@style/AppCompatDialogStyle</item>
     <item name="android:colorActivatedHighlight">@android:color/transparent</item>
     <item name="android:textCursorDrawable">@null</item>
+    <item name="popupTheme">@style/ThemeOverlay.AppCompat</item>
   </style>
 
   <style name="AppCompatDialogStyle" parent="Theme.AppCompat.Light.Dialog">
diff --git a/src/App/Pages/Accounts/HomePage.xaml b/src/App/Pages/Accounts/HomePage.xaml
index a4aa96d03..3f5ef4e72 100644
--- a/src/App/Pages/Accounts/HomePage.xaml
+++ b/src/App/Pages/Accounts/HomePage.xaml
@@ -18,7 +18,9 @@
                            HorizontalOptions="Start"
                            Clicked="Settings_Clicked" />
         <StackLayout VerticalOptions="CenterAndExpand" Spacing="20">
-            <Image Source="logo.png" 
+            <Image
+                x:Name="_logo"
+                Source="logo.png"
                 VerticalOptions="Center" />
             <Label Text="{u:I18n LoginOrCreateNewAccount}"
                    StyleClass="text-lg"
diff --git a/src/App/Pages/Accounts/HomePage.xaml.cs b/src/App/Pages/Accounts/HomePage.xaml.cs
index 20bdfde65..fe76646ae 100644
--- a/src/App/Pages/Accounts/HomePage.xaml.cs
+++ b/src/App/Pages/Accounts/HomePage.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+using Bit.App.Utilities;
+using System;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -8,6 +9,7 @@ namespace Bit.App.Pages
         public HomePage()
         {
             InitializeComponent();
+            _logo.Source = ThemeManager.GetTheme() == "dark" ? "logo_white.png" : "logo.png";
         }
 
         private void LogIn_Clicked(object sender, EventArgs e)