From 3bbcdce95cf28919d10e3f5af581b5e5c189a396 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 25 Jul 2019 14:10:26 +1000 Subject: [PATCH] Fix splash screen --- Signal/src/ViewControllers/LoadingViewController.swift | 8 ++++---- .../ViewControllers/ScreenLockViewController.m | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Signal/src/ViewControllers/LoadingViewController.swift b/Signal/src/ViewControllers/LoadingViewController.swift index 18f491413..469063266 100644 --- a/Signal/src/ViewControllers/LoadingViewController.swift +++ b/Signal/src/ViewControllers/LoadingViewController.swift @@ -16,14 +16,14 @@ public class LoadingViewController: UIViewController { override public func loadView() { self.view = UIView() - view.backgroundColor = UIColor.ows_materialBlue + view.backgroundColor = UIColor.lokiDarkestGray() - self.logoView = UIImageView(image: #imageLiteral(resourceName: "logoSignal")) + self.logoView = UIImageView(image: #imageLiteral(resourceName: "LokiLogo")) view.addSubview(logoView) logoView.autoCenterInSuperview() - logoView.autoPinToSquareAspectRatio() - logoView.autoMatch(.width, to: .width, of: view, withMultiplier: 1/3) + logoView.autoSetDimension(.width, toSize: 75) + logoView.autoSetDimension(.height, toSize: 71) self.topLabel = buildLabel() topLabel.alpha = 0 diff --git a/SignalMessaging/ViewControllers/ScreenLockViewController.m b/SignalMessaging/ViewControllers/ScreenLockViewController.m index 4293bb81c..6c2733250 100644 --- a/SignalMessaging/ViewControllers/ScreenLockViewController.m +++ b/SignalMessaging/ViewControllers/ScreenLockViewController.m @@ -51,7 +51,6 @@ NSString *NSStringForScreenLockUIState(ScreenLockUIState value) [edgesView addSubview:imageView]; [imageView autoHCenterInSuperview]; - const CGSize screenSize = UIScreen.mainScreen.bounds.size; [imageView autoSetDimension:ALDimensionWidth toSize:75]; [imageView autoSetDimension:ALDimensionHeight toSize:71];