diff --git a/src/App/Styles/Black.xaml b/src/App/Styles/Black.xaml index bf5e183db..abd2d7f53 100644 --- a/src/App/Styles/Black.xaml +++ b/src/App/Styles/Black.xaml @@ -15,6 +15,7 @@ #707070 #000000 + #000000 #282828 #c7c7cd diff --git a/src/App/Styles/Dark.xaml b/src/App/Styles/Dark.xaml index b67b3dd4b..281c1ca60 100644 --- a/src/App/Styles/Dark.xaml +++ b/src/App/Styles/Dark.xaml @@ -15,6 +15,7 @@ #707070 #303030 + #222222 #191919 #c7c7cd diff --git a/src/App/Styles/Light.xaml b/src/App/Styles/Light.xaml index a0d34dd27..843df8b7a 100644 --- a/src/App/Styles/Light.xaml +++ b/src/App/Styles/Light.xaml @@ -15,6 +15,7 @@ #d0d0d0 #ffffff + #efeff4 #dddddd #c7c7cd diff --git a/src/App/Styles/Nord.xaml b/src/App/Styles/Nord.xaml index 56c3098a4..08dc0596e 100644 --- a/src/App/Styles/Nord.xaml +++ b/src/App/Styles/Nord.xaml @@ -15,6 +15,7 @@ #7b88a1 #3b4252 + #2e3440 #2e3440 #d8dee9 diff --git a/src/iOS/AppDelegate.cs b/src/iOS/AppDelegate.cs index 563a68fa5..5b0dc9655 100644 --- a/src/iOS/AppDelegate.cs +++ b/src/iOS/AppDelegate.cs @@ -17,6 +17,8 @@ using CoreNFC; using Foundation; using HockeyApp.iOS; using UIKit; +using Xamarin.Forms; +using Xamarin.Forms.Platform.iOS; namespace Bit.iOS { @@ -58,7 +60,7 @@ namespace Bit.iOS } else if(message.Command == "cancelLockTimer") { - + } else if(message.Command == "updatedTheme") { @@ -87,7 +89,7 @@ namespace Bit.iOS var success = data["successfully"] as bool?; if(success.GetValueOrDefault()) { - + } } } @@ -116,9 +118,13 @@ namespace Bit.iOS }; var backgroundView = new UIView(UIApplication.SharedApplication.KeyWindow.Frame) { - BackgroundColor = new UIColor(red: 0.93f, green: 0.94f, blue: 0.96f, alpha: 1.0f) + BackgroundColor = ((Color)Xamarin.Forms.Application.Current.Resources["SplashBackgroundColor"]) + .ToUIColor() }; - var imageView = new UIImageView(new UIImage("logo.png")) + var theme = ThemeManager.GetTheme(false); + var darkbasedTheme = theme == "dark" || theme == "black" || theme == "nord"; + var logo = new UIImage(darkbasedTheme ? "logo_white.png" : "logo.png"); + var imageView = new UIImageView(logo) { Center = new CoreGraphics.CGPoint(view.Center.X, view.Center.Y - 30) }; diff --git a/src/iOS/Resources/logo_white.png b/src/iOS/Resources/logo_white.png new file mode 100644 index 000000000..b5856a638 Binary files /dev/null and b/src/iOS/Resources/logo_white.png differ diff --git a/src/iOS/Resources/logo_white@2x.png b/src/iOS/Resources/logo_white@2x.png new file mode 100644 index 000000000..7424b6f77 Binary files /dev/null and b/src/iOS/Resources/logo_white@2x.png differ diff --git a/src/iOS/Resources/logo_white@3x.png b/src/iOS/Resources/logo_white@3x.png new file mode 100644 index 000000000..7d76d07d2 Binary files /dev/null and b/src/iOS/Resources/logo_white@3x.png differ diff --git a/src/iOS/iOS.csproj b/src/iOS/iOS.csproj index b0cda4689..c53a67c51 100644 --- a/src/iOS/iOS.csproj +++ b/src/iOS/iOS.csproj @@ -358,4 +358,13 @@ + + + + + + + + + \ No newline at end of file