From e4eea3a95acfca9f048760ea7d34573efb8f959f Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 20 Jun 2019 13:43:02 +1000 Subject: [PATCH] Update launch screen --- .../xcshareddata/xcschemes/Signal.xcscheme | 14 +- .../LokiLogo.imageset/Contents.json | 15 ++ .../Loki_Logo_Icon_White.pdf | 156 ++++++++++++++++++ Signal/src/util/Launch Screen.storyboard | 20 +-- .../ScreenLockViewController.m | 10 +- 5 files changed, 191 insertions(+), 24 deletions(-) create mode 100644 Signal/Images.xcassets/LokiLogo.imageset/Contents.json create mode 100644 Signal/Images.xcassets/LokiLogo.imageset/Loki_Logo_Icon_White.pdf diff --git a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme index 3ef9858f5..f080c2943 100644 --- a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme +++ b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme @@ -28,7 +28,7 @@ buildForAnalyzing = "YES"> @@ -56,7 +56,7 @@ skipped = "NO"> @@ -66,7 +66,7 @@ skipped = "NO"> @@ -76,7 +76,7 @@ skipped = "NO"> @@ -86,7 +86,7 @@ skipped = "NO"> @@ -96,7 +96,7 @@ skipped = "NO"> @@ -106,7 +106,7 @@ skipped = "NO"> diff --git a/Signal/Images.xcassets/LokiLogo.imageset/Contents.json b/Signal/Images.xcassets/LokiLogo.imageset/Contents.json new file mode 100644 index 000000000..fd4cbb18f --- /dev/null +++ b/Signal/Images.xcassets/LokiLogo.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "Loki_Logo_Icon_White.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "preserves-vector-representation" : true + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/LokiLogo.imageset/Loki_Logo_Icon_White.pdf b/Signal/Images.xcassets/LokiLogo.imageset/Loki_Logo_Icon_White.pdf new file mode 100644 index 000000000..e19714aea --- /dev/null +++ b/Signal/Images.xcassets/LokiLogo.imageset/Loki_Logo_Icon_White.pdf @@ -0,0 +1,156 @@ +%PDF-1.5 +% +4 0 obj +<< /Length 5 0 R + /Filter /FlateDecode +>> +stream +xmQ +A^ q!}}9CPD@'D È ++,2vb8+ck%ZVBMQ@Z8WzL O۟=KQ$Ь Jsq`")Q7 +glݵKyp: +endstream +endobj +5 0 obj + 168 +endobj +3 0 obj +<< + /ExtGState << + /a0 << /CA 1 /ca 1 >> + >> +>> +endobj +2 0 obj +<< /Type /Page % 1 + /Parent 1 0 R + /MediaBox [ 0 0 1057 1000 ] + /Contents 4 0 R + /Group << + /Type /Group + /S /Transparency + /I true + /CS /DeviceRGB + >> + /Resources 3 0 R +>> +endobj +1 0 obj +<< /Type /Pages + /Kids [ 2 0 R ] + /Count 1 +>> +endobj +6 0 obj +<< /Producer (cairo 1.15.10 (http://cairographics.org)) + /CreationDate (D:20190619222640-05'00) +>> +endobj +7 0 obj +<< /Type /Catalog + /Pages 1 0 R +>> +endobj +xref +0 8 +0000000000 65535 f +0000000574 00000 n +0000000354 00000 n +0000000282 00000 n +0000000015 00000 n +0000000260 00000 n +0000000639 00000 n +0000000755 00000 n +trailer +<< /Size 8 + /Root 7 0 R + /Info 6 0 R +>> +startxref +807 +%%EOF +%BeginExifToolUpdate +6 0 obj +<< +/Creator (Zamzar) +/Producer (Zamzar) +>> +endobj +7 0 obj +<< +/Type /Catalog +/Pages 1 0 R +/Metadata 8 0 R +>> +endobj +8 0 obj +<< +/Type /Metadata +/Subtype /XML +/Length 2943 +>> +stream + + + + + + + + Zamzar + + + + + + Zamzar + + + + + + + + + + + + + + + + + + + + + + + + + + + + +endstream +endobj +xref +0 1 +0000000000 65535 f +6 3 +0000001069 00000 n +0000001127 00000 n +0000001192 00000 n +trailer +<< +/Size 9 +/Root 7 0 R +/Info 6 0 R +/Prev 807 +>> +%EndExifToolUpdate 1048 +startxref +4218 +%%EOF diff --git a/Signal/src/util/Launch Screen.storyboard b/Signal/src/util/Launch Screen.storyboard index 817e6f09f..87f013517 100644 --- a/Signal/src/util/Launch Screen.storyboard +++ b/Signal/src/util/Launch Screen.storyboard @@ -1,13 +1,11 @@ - - + + - - - + @@ -23,16 +21,16 @@ - - + + - + + - + - @@ -44,6 +42,6 @@ - + diff --git a/SignalMessaging/ViewControllers/ScreenLockViewController.m b/SignalMessaging/ViewControllers/ScreenLockViewController.m index 74afe0844..fe0894974 100644 --- a/SignalMessaging/ViewControllers/ScreenLockViewController.m +++ b/SignalMessaging/ViewControllers/ScreenLockViewController.m @@ -37,7 +37,7 @@ NSString *NSStringForScreenLockUIState(ScreenLockUIState value) { [super loadView]; - self.view.backgroundColor = UIColor.ows_materialBlueColor; + self.view.backgroundColor = UIColor.lokiDarkestGray; UIView *edgesView = [UIView containerView]; [self.view addSubview:edgesView]; @@ -45,17 +45,15 @@ NSString *NSStringForScreenLockUIState(ScreenLockUIState value) [edgesView autoPinEdgeToSuperviewEdge:ALEdgeBottom]; [edgesView autoPinWidthToSuperview]; - UIImage *image = [UIImage imageNamed:@"logoSignal"]; + UIImage *image = [UIImage imageNamed:@"LokiLogo"]; UIImageView *imageView = [UIImageView new]; imageView.image = image; [edgesView addSubview:imageView]; [imageView autoHCenterInSuperview]; const CGSize screenSize = UIScreen.mainScreen.bounds.size; - const CGFloat shortScreenDimension = MIN(screenSize.width, screenSize.height); - const CGFloat imageSize = (CGFloat)round(shortScreenDimension / 3.f); - [imageView autoSetDimension:ALDimensionWidth toSize:imageSize]; - [imageView autoSetDimension:ALDimensionHeight toSize:imageSize]; + [imageView autoSetDimension:ALDimensionWidth toSize:75]; + [imageView autoSetDimension:ALDimensionHeight toSize:71]; const CGFloat kButtonHeight = 40.f; OWSFlatButton *button =