diff --git a/Signal/src/ViewControllers/LoadingViewController.swift b/Signal/src/ViewControllers/LoadingViewController.swift index 1533f9375..3202f0ee2 100644 --- a/Signal/src/ViewControllers/LoadingViewController.swift +++ b/Signal/src/ViewControllers/LoadingViewController.swift @@ -18,12 +18,13 @@ public class LoadingViewController: UIViewController { self.view = UIView() view.backgroundColor = UIColor.lokiDarkestGray() - self.logoView = UIImageView(image: #imageLiteral(resourceName: "Loki")) + self.logoView = UIImageView(image: #imageLiteral(resourceName: "Session")) view.addSubview(logoView) logoView.autoCenterInSuperview() logoView.autoSetDimension(.width, toSize: 75) - logoView.autoSetDimension(.height, toSize: 71) + logoView.autoSetDimension(.height, toSize: 75) + logoView.contentMode = .scaleAspectFit self.topLabel = buildLabel() topLabel.alpha = 0 diff --git a/Signal/src/util/UIViewController+Permissions.m b/Signal/src/util/UIViewController+Permissions.m index 7a34e91e4..607d9bb7d 100644 --- a/Signal/src/util/UIViewController+Permissions.m +++ b/Signal/src/util/UIViewController+Permissions.m @@ -39,7 +39,7 @@ NS_ASSUME_NONNULL_BEGIN AVAuthorizationStatus status = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo]; if (status == AVAuthorizationStatusDenied) { UIAlertController *alert = [UIAlertController - alertControllerWithTitle:NSLocalizedString(@"Loki Messenger needs camera access to scan QR codes.", @"") + alertControllerWithTitle:NSLocalizedString(@"Session needs camera access to scan QR codes.", @"") message:NSLocalizedString(@"You can enable camera access in your device settings.", @"") preferredStyle:UIAlertControllerStyleAlert]; diff --git a/SignalMessaging/ViewControllers/ScreenLockViewController.m b/SignalMessaging/ViewControllers/ScreenLockViewController.m index 7150589b7..aa44c6664 100644 --- a/SignalMessaging/ViewControllers/ScreenLockViewController.m +++ b/SignalMessaging/ViewControllers/ScreenLockViewController.m @@ -45,18 +45,19 @@ NSString *NSStringForScreenLockUIState(ScreenLockUIState value) [edgesView autoPinEdgeToSuperviewEdge:ALEdgeBottom]; [edgesView autoPinWidthToSuperview]; - UIImage *image = [UIImage imageNamed:@"Loki"]; + UIImage *image = [UIImage imageNamed:@"Session"]; UIImageView *imageView = [UIImageView new]; imageView.image = image; + imageView.contentMode = UIViewContentModeScaleAspectFit; [edgesView addSubview:imageView]; [imageView autoHCenterInSuperview]; [imageView autoSetDimension:ALDimensionWidth toSize:75]; - [imageView autoSetDimension:ALDimensionHeight toSize:71]; + [imageView autoSetDimension:ALDimensionHeight toSize:75]; const CGFloat kButtonHeight = 40.f; OWSFlatButton *button = - [OWSFlatButton buttonWithTitle:NSLocalizedString(@"Unlock Loki Messenger", @"") + [OWSFlatButton buttonWithTitle:NSLocalizedString(@"Unlock Session", @"") font:[OWSFlatButton fontForHeight:kButtonHeight] titleColor:UIColor.whiteColor backgroundColor:UIColor.clearColor