diff --git a/Signal.xcodeproj/xcshareddata/xcschemes/Signal-Internal.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/Signal-Internal.xcscheme
index 572fd60ab..ee18275a3 100644
--- a/Signal.xcodeproj/xcshareddata/xcschemes/Signal-Internal.xcscheme
+++ b/Signal.xcodeproj/xcshareddata/xcschemes/Signal-Internal.xcscheme
@@ -15,7 +15,7 @@
@@ -33,7 +33,7 @@
@@ -56,7 +56,7 @@
@@ -87,7 +87,7 @@
diff --git a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
index e523f2c19..3ef9858f5 100644
--- a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
+++ b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
@@ -15,7 +15,7 @@
@@ -28,7 +28,7 @@
buildForAnalyzing = "YES">
@@ -56,7 +56,7 @@
skipped = "NO">
@@ -117,7 +117,7 @@
@@ -152,7 +152,7 @@
@@ -193,7 +193,7 @@
diff --git a/Signal.xcodeproj/xcshareddata/xcschemes/SignalShareExtension.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/SignalShareExtension.xcscheme
index cc64d8a0e..859263a4d 100644
--- a/Signal.xcodeproj/xcshareddata/xcschemes/SignalShareExtension.xcscheme
+++ b/Signal.xcodeproj/xcshareddata/xcschemes/SignalShareExtension.xcscheme
@@ -30,7 +30,7 @@
@@ -72,7 +72,7 @@
@@ -92,7 +92,7 @@
diff --git a/Signal/src/Loki/FriendRequestView.swift b/Signal/src/Loki/FriendRequestView.swift
index 6c1950765..627cbb7d1 100644
--- a/Signal/src/Loki/FriendRequestView.swift
+++ b/Signal/src/Loki/FriendRequestView.swift
@@ -59,9 +59,11 @@
case .incoming:
mainStackView.addArrangedSubview(buttonStackView)
let acceptButton = OWSFlatButton.button(title: NSLocalizedString("Accept", comment: ""), font: buttonFont, titleColor: .ows_materialBlue, backgroundColor: .white, target: self, selector: #selector(accept))
+ acceptButton.setBackgroundColors(upColor: .clear, downColor: .clear)
acceptButton.autoSetDimension(.height, toSize: buttonHeight)
buttonStackView.addArrangedSubview(acceptButton)
let declineButton = OWSFlatButton.button(title: NSLocalizedString("Decline", comment: ""), font: buttonFont, titleColor: .ows_destructiveRed, backgroundColor: .white, target: self, selector: #selector(decline))
+ declineButton.setBackgroundColors(upColor: .clear, downColor: .clear)
declineButton.autoSetDimension(.height, toSize: buttonHeight)
buttonStackView.addArrangedSubview(declineButton)
case .outgoing: break
@@ -100,7 +102,9 @@
default: preconditionFailure()
}
}()
- label.text = String(format: format, message.authorId)
+ let contactID = message.authorId
+ let displayName = Environment.shared.contactsManager.profileName(forRecipientId: contactID) ?? contactID
+ label.text = String(format: format, displayName)
case .outgoing:
guard let message = message as? TSOutgoingMessage else { preconditionFailure() }
let format: String? = {
@@ -115,7 +119,9 @@
}
}()
if let format = format {
- label.text = String(format: format, message.thread.contactIdentifier()!)
+ let contactID = message.thread.contactIdentifier()!
+ let displayName = Environment.shared.contactsManager.profileName(forRecipientId: contactID) ?? contactID
+ label.text = String(format: format, displayName)
}
label.isHidden = (format == nil)
topSpacer.isHidden = (label.isHidden)
diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m
index 59b588d25..4445c5830 100644
--- a/Signal/src/ViewControllers/HomeView/HomeViewController.m
+++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m
@@ -429,7 +429,7 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) {
OWSLayerView *layerView = [OWSLayerView new];
layerView.layoutMargins = UIEdgeInsetsMake(11 + kTailHeight, 16, 11, 16);
CAShapeLayer *shapeLayer = [CAShapeLayer new];
- shapeLayer.fillColor = UIColor.ows_signalBlueColor.CGColor;
+ shapeLayer.fillColor = UIColor.lokiGreen.CGColor;
[layerView.layer addSublayer:shapeLayer];
layerView.layoutCallback = ^(UIView *view) {
UIBezierPath *bezierPath = [UIBezierPath new];
diff --git a/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift
index 960719d54..6743b9a8a 100644
--- a/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift
+++ b/Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift
@@ -23,14 +23,13 @@ public class OnboardingSplashViewController: OnboardingBaseViewController {
heroImageView.setContentHuggingVerticalLow()
heroImageView.accessibilityIdentifier = "onboarding.splash." + "heroImageView"
- let titleLabel = self.createTitleLabel(text: NSLocalizedString("ONBOARDING_SPLASH_TITLE", comment: "Title of the 'onboarding splash' view."))
+ let titleLabel = self.createTitleLabel(text: NSLocalizedString("Loki Messenger", comment: ""))
view.addSubview(titleLabel)
titleLabel.autoPinEdges(toSuperviewMarginsExcludingEdge: .bottom)
titleLabel.accessibilityIdentifier = "onboarding.splash." + "titleLabel"
let explanationLabel = UILabel()
- explanationLabel.text = NSLocalizedString("ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY",
- comment: "Link to the 'terms and privacy policy' in the 'onboarding splash' view.")
+ explanationLabel.text = NSLocalizedString("Privacy Policy", comment: "")
explanationLabel.textColor = .ows_materialBlue
explanationLabel.font = UIFont.ows_dynamicTypeSubheadlineClamped
explanationLabel.numberOfLines = 0
@@ -47,14 +46,12 @@ public class OnboardingSplashViewController: OnboardingBaseViewController {
continueButton.accessibilityIdentifier = "onboarding.splash." + "continueButton"
let stackView = UIStackView(arrangedSubviews: [
- heroImageView,
- UIView.spacer(withHeight: 22),
titleLabel,
- UIView.spacer(withHeight: 92),
+ UIView.vStretchingSpacer(),
explanationLabel,
UIView.spacer(withHeight: 24),
continueButton
- ])
+ ])
stackView.axis = .vertical
stackView.alignment = .fill
stackView.layoutMargins = UIEdgeInsets(top: 32, left: 32, bottom: 32, right: 32)
diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings
index 2b4ebae94..88e14d0c8 100644
--- a/Signal/translations/en.lproj/Localizable.strings
+++ b/Signal/translations/en.lproj/Localizable.strings
@@ -2591,3 +2591,4 @@
"Prevent Loki Messenger previews from appearing in the app switcher." = "Prevent Loki Messenger previews from appearing in the app switcher.";
"Display Name" = "Display Name";
"Loki Messenger" = "Loki Messenger";
+"Privacy Policy" = "Privacy Policy";