From 58eb77e073f6ff3e184ab28d46140b44cc12c3ea Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 23 Mar 2017 13:46:41 -0400 Subject: [PATCH] =?UTF-8?q?Use=20=E2=80=9Cstop=E2=80=9D=20not=20=E2=80=9Cc?= =?UTF-8?q?ancel=E2=80=9D=20buttons.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit // FREEBIE --- .../view controllers/AttachmentApprovalViewController.swift | 2 +- Signal/src/view controllers/ContactsPicker.swift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Signal/src/view controllers/AttachmentApprovalViewController.swift b/Signal/src/view controllers/AttachmentApprovalViewController.swift index c8b80002a..db57b8f1b 100644 --- a/Signal/src/view controllers/AttachmentApprovalViewController.swift +++ b/Signal/src/view controllers/AttachmentApprovalViewController.swift @@ -38,7 +38,7 @@ class AttachmentApprovalViewController: UIViewController { view.backgroundColor = UIColor.black - self.navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem:.done, + self.navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem:.stop, target:self, action:#selector(donePressed)) self.navigationItem.title = NSLocalizedString("ATTACHMENT_APPROVAL_DIALOG_TITLE", diff --git a/Signal/src/view controllers/ContactsPicker.swift b/Signal/src/view controllers/ContactsPicker.swift index 0a37cb46c..2016c4047 100644 --- a/Signal/src/view controllers/ContactsPicker.swift +++ b/Signal/src/view controllers/ContactsPicker.swift @@ -91,11 +91,11 @@ open class ContactsPicker: UIViewController, UITableViewDelegate, UITableViewDat } func initializeBarButtons() { - let cancelButton = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.cancel, target: self, action: #selector(onTouchCancelButton)) + let cancelButton = UIBarButtonItem(barButtonSystemItem: .stop, target: self, action: #selector(onTouchCancelButton)) self.navigationItem.leftBarButtonItem = cancelButton if multiSelectEnabled { - let doneButton = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.done, target: self, action: #selector(onTouchDoneButton)) + let doneButton = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(onTouchDoneButton)) self.navigationItem.rightBarButtonItem = doneButton } }