oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Format 

// FREEBIE
This commit is contained in:
Michael Kirk 2018-04-02 15:34:10 -04:00
parent 6f1608f44b
commit f441c6211d
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
#import "OWSAudioMessageView.h"

2
Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
#import "OWSGenericAttachmentView.h"

4
Signal/src/ViewControllers/ExperienceUpgradesPageViewController.swift
View File

@ -51,7 +51,7 @@ private class IntroducingCustomNotificationAudioExperienceUpgradeViewController:
// Construct the "settings" view & push the "notifications settings" view.
let navigationController = AppSettingsViewController.inModalNavigationController()
navigationController.pushViewController(NotificationSettingsViewController(), animated:false)
navigationController.pushViewController(NotificationSettingsViewController(), animated: false)
fromViewController.present(navigationController, animated: true)
}
@ -96,7 +96,7 @@ private class IntroducingCustomNotificationAudioExperienceUpgradeViewController:
button.setTitle(title, for: .normal)
button.setTitleColor(UIColor.ows_signalBrandBlue, for: .normal)
button.isUserInteractionEnabled = true
button.addTarget(self, action:#selector(didTapButton), for: .touchUpInside)
button.addTarget(self, action: #selector(didTapButton), for: .touchUpInside)
button.contentEdgeInsets = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10)
button.titleLabel?.textAlignment = .center
button.titleLabel?.font = UIFont.ows_mediumFont(withSize: ScaleFromIPhone5(18))

2
Signal/src/views/GroupTableViewCell.swift
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
import UIKit

22
SignalMessaging/attachments/MessageApprovalViewController.swift
View File

@ -60,8 +60,8 @@ public class MessageApprovalViewController: OWSViewController, UITextViewDelegat
let spacer = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
items.append(spacer)
let sendButton = UIBarButtonItem(title: NSLocalizedString("SEND_BUTTON_TITLE",
comment:"Label for the send button in the conversation view."),
style:.plain,
comment: "Label for the send button in the conversation view."),
style: .plain,
target: self,
action: #selector(sendPressed))
items.append(sendButton)
@ -99,8 +99,8 @@ public class MessageApprovalViewController: OWSViewController, UITextViewDelegat
textView.textColor = UIColor.black
textView.font = UIFont.ows_dynamicTypeBody()
textView.text = self.initialMessageText
textView.contentInset = UIEdgeInsets(top:0.0, left:0.0, bottom:0.0, right:0.0)
textView.textContainerInset = UIEdgeInsets(top:10.0, left:10.0, bottom:10.0, right:10.0)
textView.contentInset = UIEdgeInsets(top: 0.0, left: 0.0, bottom: 0.0, right: 0.0)
textView.textContainerInset = UIEdgeInsets(top: 10.0, left: 10.0, bottom: 10.0, right: 10.0)
view.addSubview(textView)
textView.autoPinWidthToSuperview()
textView.autoPinEdge(.top, to: .bottom, of: recipientRow)
@ -115,7 +115,7 @@ public class MessageApprovalViewController: OWSViewController, UITextViewDelegat
// Hairline borders should be 1 pixel, not 1 point.
let borderThickness = 1.0 / UIScreen.main.scale
let borderColor = UIColor(white:135 / 255.0, alpha:1.0)
let borderColor = UIColor(white: 135 / 255.0, alpha: 1.0)
let topBorder = UIView.container()
topBorder.backgroundColor = borderColor
@ -131,7 +131,7 @@ public class MessageApprovalViewController: OWSViewController, UITextViewDelegat
bottomBorder.autoPinBottomToSuperviewMargin()
bottomBorder.autoSetDimension(.height, toSize: borderThickness)
let font = UIFont.ows_regularFont(withSize:ScaleFromIPhone5To7Plus(14.0, 18.0))
let font = UIFont.ows_regularFont(withSize: ScaleFromIPhone5To7Plus(14.0, 18.0))
let hSpacing = CGFloat(10)
let hMargin = CGFloat(15)
let vSpacing = CGFloat(5)
@ -154,7 +154,7 @@ public class MessageApprovalViewController: OWSViewController, UITextViewDelegat
toLabel.setContentHuggingHorizontalHigh()
toLabel.setCompressionResistanceHorizontalHigh()
toLabel.autoAlignAxis(.horizontal, toSameAxisOf: nameLabel)
nameLabel.autoPinLeading(toTrailingEdgeOf: toLabel, offset: hSpacing)
nameLabel.autoPinTrailingToSuperviewMargin(withInset: hMargin)
nameLabel.setContentHuggingHorizontalLow()
@ -176,10 +176,10 @@ public class MessageApprovalViewController: OWSViewController, UITextViewDelegat
return recipientRow
}
nameLabel.attributedText = contactsManager.formattedFullName(forRecipientId:contactThread.contactIdentifier(), font:font)
nameLabel.attributedText = contactsManager.formattedFullName(forRecipientId: contactThread.contactIdentifier(), font: font)
nameLabel.textColor = UIColor.black
if let profileName = self.profileName(contactThread:contactThread) {
if let profileName = self.profileName(contactThread: contactThread) {
// If there's a profile name worth showing, add it as a second line below the name.
let profileNameLabel = UILabel()
profileNameLabel.textColor = UIColor.ows_darkGray
@ -203,11 +203,11 @@ public class MessageApprovalViewController: OWSViewController, UITextViewDelegat
private func profileName(contactThread: TSContactThread) -> String? {
let recipientId = contactThread.contactIdentifier()
if contactsManager.hasNameInSystemContacts(forRecipientId:recipientId) {
if contactsManager.hasNameInSystemContacts(forRecipientId: recipientId) {
// Don't display profile name when we have a veritas name in system Contacts
return nil
}
return contactsManager.formattedProfileName(forRecipientId:recipientId)
return contactsManager.formattedProfileName(forRecipientId: recipientId)
}
// MARK: - Event Handlers

2
SignalMessaging/categories/UIView+OWS.m
View File

@ -2,8 +2,8 @@
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
#import "OWSMath.h"
#import "UIView+OWS.h"
#import "OWSMath.h"
#import <SignalServiceKit/AppContext.h>
NS_ASSUME_NONNULL_BEGIN