more theming
|
@ -521,5 +521,50 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<AndroidResource Include="Resources\drawable\slider_thumb.xml" />
|
<AndroidResource Include="Resources\drawable\slider_thumb.xml" />
|
||||||
</ItemGroup>
|
</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" />
|
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
|
||||||
</Project>
|
</Project>
|
673
src/Android/Resources/Resource.designer.cs
generated
BIN
src/Android/Resources/drawable-hdpi/cog.png
Normal file
After Width: | Height: | Size: 424 B |
BIN
src/Android/Resources/drawable-hdpi/logo_white.png
Normal file
After Width: | Height: | Size: 6.8 KiB |
BIN
src/Android/Resources/drawable-hdpi/search.png
Normal file
After Width: | Height: | Size: 519 B |
BIN
src/Android/Resources/drawable-xhdpi/cog.png
Normal file
After Width: | Height: | Size: 541 B |
BIN
src/Android/Resources/drawable-xhdpi/search.png
Normal file
After Width: | Height: | Size: 693 B |
BIN
src/Android/Resources/drawable-xxhdpi/cog.png
Normal file
After Width: | Height: | Size: 745 B |
BIN
src/Android/Resources/drawable-xxhdpi/logo_white.png
Normal file
After Width: | Height: | Size: 8.2 KiB |
BIN
src/Android/Resources/drawable-xxhdpi/search.png
Normal file
After Width: | Height: | Size: 957 B |
BIN
src/Android/Resources/drawable-xxxhdpi/cog.png
Normal file
After Width: | Height: | Size: 1 KiB |
BIN
src/Android/Resources/drawable-xxxhdpi/search.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
BIN
src/Android/Resources/drawable/cog.png
Normal file
After Width: | Height: | Size: 305 B |
BIN
src/Android/Resources/drawable/logo_white.png
Normal file
After Width: | Height: | Size: 2.5 KiB |
BIN
src/Android/Resources/drawable/search.png
Normal file
After Width: | Height: | Size: 449 B |
9
src/Android/Resources/drawable/splash_screen_dark.xml
Normal file
|
@ -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>
|
|
@ -2,4 +2,6 @@
|
||||||
<resources>
|
<resources>
|
||||||
<style name="MainTheme" parent="MainTheme.Base">
|
<style name="MainTheme" parent="MainTheme.Base">
|
||||||
</style>
|
</style>
|
||||||
|
<style name="DarkTheme" parent="DarkTheme.Base">
|
||||||
|
</style>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -1,12 +1,5 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<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="colorPrimary">#3c8dbc</color>
|
||||||
<color name="colorPrimaryDark">#222d32</color>
|
<color name="colorPrimaryDark">#222d32</color>
|
||||||
<color name="colorAccent">#3883af</color>
|
<color name="colorAccent">#3883af</color>
|
||||||
|
@ -22,4 +15,11 @@
|
||||||
<color name="dark_darkaccent">#222d32</color>
|
<color name="dark_darkaccent">#222d32</color>
|
||||||
<color name="dark_accent">#449BCE</color>
|
<color name="dark_accent">#449BCE</color>
|
||||||
<color name="dark_border">#545454</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>
|
</resources>
|
||||||
|
|
|
@ -4,6 +4,10 @@
|
||||||
<item name="android:windowBackground">@drawable/splash_screen</item>
|
<item name="android:windowBackground">@drawable/splash_screen</item>
|
||||||
<item name="android:windowNoTitle">true</item>
|
<item name="android:windowNoTitle">true</item>
|
||||||
</style>
|
</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 name="MainTheme" parent="MainTheme.Base">
|
||||||
</style>
|
</style>
|
||||||
|
@ -36,7 +40,6 @@
|
||||||
<item name="android:datePickerDialogTheme">@style/AppCompatDialogStyle</item>
|
<item name="android:datePickerDialogTheme">@style/AppCompatDialogStyle</item>
|
||||||
<item name="android:colorActivatedHighlight">@android:color/transparent</item>
|
<item name="android:colorActivatedHighlight">@android:color/transparent</item>
|
||||||
<item name="android:textCursorDrawable">@null</item>
|
<item name="android:textCursorDrawable">@null</item>
|
||||||
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="AppCompatDialogStyle" parent="Theme.AppCompat.Light.Dialog">
|
<style name="AppCompatDialogStyle" parent="Theme.AppCompat.Light.Dialog">
|
||||||
|
|
|
@ -5,6 +5,7 @@ using Android.OS;
|
||||||
using Android.Support.V7.App;
|
using Android.Support.V7.App;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Android.Content;
|
using Android.Content;
|
||||||
|
using Bit.App.Utilities;
|
||||||
|
|
||||||
namespace Bit.Droid
|
namespace Bit.Droid
|
||||||
{
|
{
|
||||||
|
@ -21,6 +22,7 @@ namespace Bit.Droid
|
||||||
{
|
{
|
||||||
public override void OnCreate(Bundle savedInstanceState, PersistableBundle persistentState)
|
public override void OnCreate(Bundle savedInstanceState, PersistableBundle persistentState)
|
||||||
{
|
{
|
||||||
|
UpdateTheme(ThemeManager.GetTheme());
|
||||||
base.OnCreate(savedInstanceState, persistentState);
|
base.OnCreate(savedInstanceState, persistentState);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -35,5 +37,17 @@ namespace Bit.Droid
|
||||||
});
|
});
|
||||||
startupWork.Start();
|
startupWork.Start();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void UpdateTheme(string theme)
|
||||||
|
{
|
||||||
|
if(theme == "dark")
|
||||||
|
{
|
||||||
|
SetTheme(Resource.Style.DarkTheme_Splash);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SetTheme(Resource.Style.MainTheme_Splash);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
</ContentPage.BindingContext>
|
</ContentPage.BindingContext>
|
||||||
|
|
||||||
<ContentPage.ToolbarItems>
|
<ContentPage.ToolbarItems>
|
||||||
<ToolbarItem Text="" Clicked="Search_Clicked" />
|
<ToolbarItem Icon="search.png" Clicked="Search_Clicked" />
|
||||||
</ContentPage.ToolbarItems>
|
</ContentPage.ToolbarItems>
|
||||||
|
|
||||||
<ContentPage.Resources>
|
<ContentPage.Resources>
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
</ContentPage.BindingContext>
|
</ContentPage.BindingContext>
|
||||||
|
|
||||||
<ContentPage.ToolbarItems>
|
<ContentPage.ToolbarItems>
|
||||||
<ToolbarItem Text="" Clicked="Search_Clicked" />
|
<ToolbarItem Icon="search.png" Clicked="Search_Clicked" />
|
||||||
</ContentPage.ToolbarItems>
|
</ContentPage.ToolbarItems>
|
||||||
|
|
||||||
<ContentPage.Resources>
|
<ContentPage.Resources>
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
|
|
||||||
<Color x:Key="SliderThumbColor">#ffffff</Color>
|
<Color x:Key="SliderThumbColor">#ffffff</Color>
|
||||||
<Color x:Key="SliderThumbBorderColor">#b5b5b5</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="FabColor">#52bdfb</Color>
|
||||||
<Color x:Key="FabPressedColor">#449BCE</Color>
|
<Color x:Key="FabPressedColor">#449BCE</Color>
|
||||||
|
|
|
@ -33,6 +33,6 @@
|
||||||
<Color x:Key="FabPressedColor">#3883af</Color>
|
<Color x:Key="FabPressedColor">#3883af</Color>
|
||||||
|
|
||||||
<Color x:Key="TabBarBackgroundColor">#ffffff</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>
|
<Color x:Key="TabBarSelectedItemColor">#3c8dbc</Color>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
|