more theming

src/Android/Android.csproj

@@ -521,5 +521,50 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\slider_thumb.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\splash_screen_dark.xml">
+      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\logo_white.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-hdpi\logo_white.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xxhdpi\logo_white.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\search.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-hdpi\search.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\search.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xxhdpi\search.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xxxhdpi\search.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\cog.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-hdpi\cog.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\cog.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xxhdpi\cog.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xxxhdpi\cog.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>

src/Android/Resources/drawable/splash_screen_dark.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+  <item>
+    <color android:color="@color/darkgray"/>
+  </item>
+  <item>
+    <bitmap android:src="@drawable/logo_white" android:tileMode="disabled" android:gravity="center"/>
+  </item>
+</layer-list>

src/Android/Resources/values-v21/styles.xml

@@ -2,4 +2,6 @@
 <resources>
   <style name="MainTheme" parent="MainTheme.Base">
   </style>
+  <style name="DarkTheme" parent="DarkTheme.Base">
+  </style>
 </resources>

src/Android/Resources/values/colors.xml

@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <color name="launcher_background">#FFFFFF</color>
-  <color name="white">#FFFFFF</color>
-  <color name="black">#000000</color>
-  <color name="darkgray">#333333</color>
-  <color name="gray">#738182</color>
-  <color name="lightgray">#efeff4</color>
-
   <color name="colorPrimary">#3c8dbc</color>
   <color name="colorPrimaryDark">#222d32</color>
   <color name="colorAccent">#3883af</color>
@@ -22,4 +15,11 @@
   <color name="dark_darkaccent">#222d32</color>
   <color name="dark_accent">#449BCE</color>
   <color name="dark_border">#545454</color>
+
+  <color name="launcher_background">#FFFFFF</color>
+  <color name="white">#FFFFFF</color>
+  <color name="black">#000000</color>
+  <color name="darkgray">#333333</color>
+  <color name="gray">#738182</color>
+  <color name="lightgray">#efeff4</color>
 </resources>

src/Android/Resources/values/styles.xml

@@ -4,6 +4,10 @@
     <item name="android:windowBackground">@drawable/splash_screen</item>
     <item name="android:windowNoTitle">true</item>
   </style>
+  <style name="DarkTheme.Splash" parent="DarkTheme.Base">
+    <item name="android:windowBackground">@drawable/splash_screen_dark</item>
+    <item name="android:windowNoTitle">true</item>
+  </style>
 
   <style name="MainTheme" parent="MainTheme.Base">
   </style>
@@ -36,7 +40,6 @@
     <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.Light</item>
   </style>
 
   <style name="AppCompatDialogStyle" parent="Theme.AppCompat.Light.Dialog">

src/Android/SplashActivity.cs

@@ -5,6 +5,7 @@ using Android.OS;
 using Android.Support.V7.App;
 using System.Threading.Tasks;
 using Android.Content;
+using Bit.App.Utilities;
 
 namespace Bit.Droid
 {
@@ -21,6 +22,7 @@ namespace Bit.Droid
     {
         public override void OnCreate(Bundle savedInstanceState, PersistableBundle persistentState)
         {
+            UpdateTheme(ThemeManager.GetTheme());
             base.OnCreate(savedInstanceState, persistentState);
         }
 
@@ -35,5 +37,17 @@ namespace Bit.Droid
             });
             startupWork.Start();
         }
+
+        private void UpdateTheme(string theme)
+        {
+            if(theme == "dark")
+            {
+                SetTheme(Resource.Style.DarkTheme_Splash);
+            }
+            else
+            {
+                SetTheme(Resource.Style.MainTheme_Splash);
+            }
+        }
     }
 }

src/App/Pages/Vault/AutofillCiphersPage.xaml

@@ -15,7 +15,7 @@
     </ContentPage.BindingContext>
 
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="&#xf002;" Clicked="Search_Clicked" />
+        <ToolbarItem Icon="search.png" Clicked="Search_Clicked" />
     </ContentPage.ToolbarItems>
 
     <ContentPage.Resources>

src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml

@@ -15,7 +15,7 @@
     </ContentPage.BindingContext>
 
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="&#xf002;" Clicked="Search_Clicked" />
+        <ToolbarItem Icon="search.png" Clicked="Search_Clicked" />
     </ContentPage.ToolbarItems>
 
     <ContentPage.Resources>

src/App/Styles/Dark.xaml

@@ -27,7 +27,7 @@
 
     <Color x:Key="SliderThumbColor">#ffffff</Color>
     <Color x:Key="SliderThumbBorderColor">#b5b5b5</Color>
-    <Color x:Key="SliderTrackColor">#52bdfb</Color>
+    <Color x:Key="SliderTrackColor">#111111</Color>
 
     <Color x:Key="FabColor">#52bdfb</Color>
     <Color x:Key="FabPressedColor">#449BCE</Color>

src/App/Styles/Light.xaml

@@ -33,6 +33,6 @@
     <Color x:Key="FabPressedColor">#3883af</Color>
 
     <Color x:Key="TabBarBackgroundColor">#ffffff</Color>
-    <Color x:Key="TabBarItemColor">#C0C0C0</Color>
+    <Color x:Key="TabBarItemColor">#757575</Color>
     <Color x:Key="TabBarSelectedItemColor">#3c8dbc</Color>
 </ResourceDictionary>