oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Polish UI

Browse source
This commit is contained in:
Niels Andriesse 2019-06-14 16:36:40 +10:00
parent 3567eec9e2
commit 621bf922ab
7 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Signal.xcodeproj/xcshareddata/xcschemes/Signal-Internal.xcscheme
View file

@ -15,7 +15,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "D221A088169C9E5E00537ABF" BlueprintIdentifier = "D221A088169C9E5E00537ABF"
BuildableName = "Signal.app" BuildableName = "Loki Messenger.app"
BlueprintName = "Signal" BlueprintName = "Signal"
ReferencedContainer = "container:Signal.xcodeproj"> ReferencedContainer = "container:Signal.xcodeproj">
</BuildableReference> </BuildableReference>
@ -33,7 +33,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "D221A088169C9E5E00537ABF" BlueprintIdentifier = "D221A088169C9E5E00537ABF"
BuildableName = "Signal.app" BuildableName = "Loki Messenger.app"
BlueprintName = "Signal" BlueprintName = "Signal"
ReferencedContainer = "container:Signal.xcodeproj"> ReferencedContainer = "container:Signal.xcodeproj">
</BuildableReference> </BuildableReference>
@ -56,7 +56,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "D221A088169C9E5E00537ABF" BlueprintIdentifier = "D221A088169C9E5E00537ABF"
BuildableName = "Signal.app" BuildableName = "Loki Messenger.app"
BlueprintName = "Signal" BlueprintName = "Signal"
ReferencedContainer = "container:Signal.xcodeproj"> ReferencedContainer = "container:Signal.xcodeproj">
</BuildableReference> </BuildableReference>
@ -87,7 +87,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "D221A088169C9E5E00537ABF" BlueprintIdentifier = "D221A088169C9E5E00537ABF"
BuildableName = "Signal.app" BuildableName = "Loki Messenger.app"
BlueprintName = "Signal" BlueprintName = "Signal"
ReferencedContainer = "container:Signal.xcodeproj"> ReferencedContainer = "container:Signal.xcodeproj">
</BuildableReference> </BuildableReference>

12
Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
View file

@ -15,7 +15,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "D221A088169C9E5E00537ABF" BlueprintIdentifier = "D221A088169C9E5E00537ABF"
BuildableName = "Signal.app" BuildableName = "Loki Messenger.app"
BlueprintName = "Signal" BlueprintName = "Signal"
ReferencedContainer = "container:Signal.xcodeproj"> ReferencedContainer = "container:Signal.xcodeproj">
</BuildableReference> </BuildableReference>
@ -28,7 +28,7 @@
buildForAnalyzing = "YES"> buildForAnalyzing = "YES">
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "2D8EA4E0F4AC2732133869D7CB377264" BlueprintIdentifier = "E562E914157E3E5A003DAEF85CEA5CF9"
BuildableName = "SignalServiceKit.framework" BuildableName = "SignalServiceKit.framework"
BlueprintName = "SignalServiceKit" BlueprintName = "SignalServiceKit"
ReferencedContainer = "container:Pods/Pods.xcodeproj"> ReferencedContainer = "container:Pods/Pods.xcodeproj">
@ -56,7 +56,7 @@
skipped = "NO"> skipped = "NO">
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "F2DF3B1FC831DB848464A6B2F610EACB" BlueprintIdentifier = "3FC719A0D2B2FA321E696D83720CAC6F"
BuildableName = "SignalServiceKit-Unit-Tests.xctest" BuildableName = "SignalServiceKit-Unit-Tests.xctest"
BlueprintName = "SignalServiceKit-Unit-Tests" BlueprintName = "SignalServiceKit-Unit-Tests"
ReferencedContainer = "container:Pods/Pods.xcodeproj"> ReferencedContainer = "container:Pods/Pods.xcodeproj">
@ -117,7 +117,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "D221A088169C9E5E00537ABF" BlueprintIdentifier = "D221A088169C9E5E00537ABF"
BuildableName = "Signal.app" BuildableName = "Loki Messenger.app"
BlueprintName = "Signal" BlueprintName = "Signal"
ReferencedContainer = "container:Signal.xcodeproj"> ReferencedContainer = "container:Signal.xcodeproj">
</BuildableReference> </BuildableReference>
@ -152,7 +152,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "D221A088169C9E5E00537ABF" BlueprintIdentifier = "D221A088169C9E5E00537ABF"
BuildableName = "Signal.app" BuildableName = "Loki Messenger.app"
BlueprintName = "Signal" BlueprintName = "Signal"
ReferencedContainer = "container:Signal.xcodeproj"> ReferencedContainer = "container:Signal.xcodeproj">
</BuildableReference> </BuildableReference>
@ -193,7 +193,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "D221A088169C9E5E00537ABF" BlueprintIdentifier = "D221A088169C9E5E00537ABF"
BuildableName = "Signal.app" BuildableName = "Loki Messenger.app"
BlueprintName = "Signal" BlueprintName = "Signal"
ReferencedContainer = "container:Signal.xcodeproj"> ReferencedContainer = "container:Signal.xcodeproj">
</BuildableReference> </BuildableReference>

6
Signal.xcodeproj/xcshareddata/xcschemes/SignalShareExtension.xcscheme
View file

@ -30,7 +30,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "D221A088169C9E5E00537ABF" BlueprintIdentifier = "D221A088169C9E5E00537ABF"
BuildableName = "Signal.app" BuildableName = "Loki Messenger.app"
BlueprintName = "Signal" BlueprintName = "Signal"
ReferencedContainer = "container:Signal.xcodeproj"> ReferencedContainer = "container:Signal.xcodeproj">
</BuildableReference> </BuildableReference>
@ -72,7 +72,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "D221A088169C9E5E00537ABF" BlueprintIdentifier = "D221A088169C9E5E00537ABF"
BuildableName = "Signal.app" BuildableName = "Loki Messenger.app"
BlueprintName = "Signal" BlueprintName = "Signal"
ReferencedContainer = "container:Signal.xcodeproj"> ReferencedContainer = "container:Signal.xcodeproj">
</BuildableReference> </BuildableReference>
@ -92,7 +92,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "D221A088169C9E5E00537ABF" BlueprintIdentifier = "D221A088169C9E5E00537ABF"
BuildableName = "Signal.app" BuildableName = "Loki Messenger.app"
BlueprintName = "Signal" BlueprintName = "Signal"
ReferencedContainer = "container:Signal.xcodeproj"> ReferencedContainer = "container:Signal.xcodeproj">
</BuildableReference> </BuildableReference>

10
Signal/src/Loki/FriendRequestView.swift
View file

@ -59,9 +59,11 @@
case .incoming: case .incoming:
mainStackView.addArrangedSubview(buttonStackView) mainStackView.addArrangedSubview(buttonStackView)
let acceptButton = OWSFlatButton.button(title: NSLocalizedString("Accept", comment: ""), font: buttonFont, titleColor: .ows_materialBlue, backgroundColor: .white, target: self, selector: #selector(accept)) 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) acceptButton.autoSetDimension(.height, toSize: buttonHeight)
buttonStackView.addArrangedSubview(acceptButton) buttonStackView.addArrangedSubview(acceptButton)
let declineButton = OWSFlatButton.button(title: NSLocalizedString("Decline", comment: ""), font: buttonFont, titleColor: .ows_destructiveRed, backgroundColor: .white, target: self, selector: #selector(decline)) 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) declineButton.autoSetDimension(.height, toSize: buttonHeight)
buttonStackView.addArrangedSubview(declineButton) buttonStackView.addArrangedSubview(declineButton)
case .outgoing: break case .outgoing: break
@ -100,7 +102,9 @@
default: preconditionFailure() 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: case .outgoing:
guard let message = message as? TSOutgoingMessage else { preconditionFailure() } guard let message = message as? TSOutgoingMessage else { preconditionFailure() }
let format: String? = { let format: String? = {
@ -115,7 +119,9 @@
} }
}() }()
if let format = format { 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) label.isHidden = (format == nil)
topSpacer.isHidden = (label.isHidden) topSpacer.isHidden = (label.isHidden)

2
Signal/src/ViewControllers/HomeView/HomeViewController.m
View file

@ -429,7 +429,7 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) {
OWSLayerView *layerView = [OWSLayerView new]; OWSLayerView *layerView = [OWSLayerView new];
layerView.layoutMargins = UIEdgeInsetsMake(11 + kTailHeight, 16, 11, 16); layerView.layoutMargins = UIEdgeInsetsMake(11 + kTailHeight, 16, 11, 16);
CAShapeLayer *shapeLayer = [CAShapeLayer new]; CAShapeLayer *shapeLayer = [CAShapeLayer new];
shapeLayer.fillColor = UIColor.ows_signalBlueColor.CGColor; shapeLayer.fillColor = UIColor.lokiGreen.CGColor;
[layerView.layer addSublayer:shapeLayer]; [layerView.layer addSublayer:shapeLayer];
layerView.layoutCallback = ^(UIView *view) { layerView.layoutCallback = ^(UIView *view) {
UIBezierPath *bezierPath = [UIBezierPath new]; UIBezierPath *bezierPath = [UIBezierPath new];

9
Signal/src/ViewControllers/Registration/OnboardingSplashViewController.swift
View file

@ -23,14 +23,13 @@ public class OnboardingSplashViewController: OnboardingBaseViewController {
heroImageView.setContentHuggingVerticalLow() heroImageView.setContentHuggingVerticalLow()
heroImageView.accessibilityIdentifier = "onboarding.splash." + "heroImageView" 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) view.addSubview(titleLabel)
titleLabel.autoPinEdges(toSuperviewMarginsExcludingEdge: .bottom) titleLabel.autoPinEdges(toSuperviewMarginsExcludingEdge: .bottom)
titleLabel.accessibilityIdentifier = "onboarding.splash." + "titleLabel" titleLabel.accessibilityIdentifier = "onboarding.splash." + "titleLabel"
let explanationLabel = UILabel() let explanationLabel = UILabel()
explanationLabel.text = NSLocalizedString("ONBOARDING_SPLASH_TERM_AND_PRIVACY_POLICY", explanationLabel.text = NSLocalizedString("Privacy Policy", comment: "")
comment: "Link to the 'terms and privacy policy' in the 'onboarding splash' view.")
explanationLabel.textColor = .ows_materialBlue explanationLabel.textColor = .ows_materialBlue
explanationLabel.font = UIFont.ows_dynamicTypeSubheadlineClamped explanationLabel.font = UIFont.ows_dynamicTypeSubheadlineClamped
explanationLabel.numberOfLines = 0 explanationLabel.numberOfLines = 0
@ -47,10 +46,8 @@ public class OnboardingSplashViewController: OnboardingBaseViewController {
continueButton.accessibilityIdentifier = "onboarding.splash." + "continueButton" continueButton.accessibilityIdentifier = "onboarding.splash." + "continueButton"
let stackView = UIStackView(arrangedSubviews: [ let stackView = UIStackView(arrangedSubviews: [
heroImageView,
UIView.spacer(withHeight: 22),
titleLabel, titleLabel,
UIView.spacer(withHeight: 92), UIView.vStretchingSpacer(),
explanationLabel, explanationLabel,
UIView.spacer(withHeight: 24), UIView.spacer(withHeight: 24),
continueButton continueButton

1
Signal/translations/en.lproj/Localizable.strings
View file

@ -2591,3 +2591,4 @@
"Prevent Loki Messenger previews from appearing in the app switcher." = "Prevent Loki Messenger previews from appearing in the app switcher."; "Prevent Loki Messenger previews from appearing in the app switcher." = "Prevent Loki Messenger previews from appearing in the app switcher.";
"Display Name" = "Display Name"; "Display Name" = "Display Name";
"Loki Messenger" = "Loki Messenger"; "Loki Messenger" = "Loki Messenger";
"Privacy Policy" = "Privacy Policy";