Clean up ahead of PR.

Signal.xcodeproj/project.pbxproj

@@ -163,6 +163,7 @@
 		3478506C1FD9B78A007B8332 /* NoopNotificationsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 347850681FD9B78A007B8332 /* NoopNotificationsManager.swift */; };
 		347850711FDAEB17007B8332 /* OWSUserProfile.m in Sources */ = {isa = PBXBuildFile; fileRef = 3478506F1FDAEB16007B8332 /* OWSUserProfile.m */; };
 		347850721FDAEB17007B8332 /* OWSUserProfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 347850701FDAEB16007B8332 /* OWSUserProfile.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		348BB254209CD4B80047AEC2 /* ContactFieldView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 348BB253209CD4B80047AEC2 /* ContactFieldView.swift */; };
 		3496744D2076768700080B5F /* OWSMessageBubbleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3496744C2076768700080B5F /* OWSMessageBubbleView.m */; };
 		3496744F2076ACD000080B5F /* LongTextViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3496744E2076ACCE00080B5F /* LongTextViewController.swift */; };
 		34A55F3720485465002CC6DE /* OWS2FARegistrationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A55F3520485464002CC6DE /* OWS2FARegistrationViewController.m */; };
@@ -759,6 +760,7 @@
 		347850681FD9B78A007B8332 /* NoopNotificationsManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NoopNotificationsManager.swift; sourceTree = "<group>"; };
 		3478506F1FDAEB16007B8332 /* OWSUserProfile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSUserProfile.m; sourceTree = "<group>"; };
 		347850701FDAEB16007B8332 /* OWSUserProfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSUserProfile.h; sourceTree = "<group>"; };
+		348BB253209CD4B80047AEC2 /* ContactFieldView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ContactFieldView.swift; path = SignalMessaging/attachments/ContactFieldView.swift; sourceTree = SOURCE_ROOT; };
 		348F2EAD1F0D21BC00D4ECE0 /* DeviceSleepManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DeviceSleepManager.swift; sourceTree = "<group>"; };
 		3495BC911F1426B800B478F5 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = translations/ar.lproj/Localizable.strings; sourceTree = "<group>"; };
 		3496744B2076768600080B5F /* OWSMessageBubbleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSMessageBubbleView.h; sourceTree = "<group>"; };
@@ -1602,6 +1604,7 @@
 			children = (
 				34382265209A4E3F0094FEB7 /* ApproveContactShareViewController.swift */,
 				344F2498200FD03200CFB4F4 /* AttachmentApprovalViewController.swift */,
+				348BB253209CD4B80047AEC2 /* ContactFieldView.swift */,
 				344F248220069E9B00CFB4F4 /* CountryCodeViewController.h */,
 				344F248320069E9B00CFB4F4 /* CountryCodeViewController.m */,
 				34382269209B63500094FEB7 /* EditContactShareNameViewController.swift */,
@@ -3057,6 +3060,7 @@
 				346129E61FD5C0C600532771 /* OWSDatabaseMigrationRunner.m in Sources */,
 				346129AB1FD1F0EE00532771 /* OWSFormat.m in Sources */,
 				344F249C200FD03300CFB4F4 /* AttachmentApprovalViewController.swift in Sources */,
+				348BB254209CD4B80047AEC2 /* ContactFieldView.swift in Sources */,
 				451F8A461FD715BA005CB9DA /* OWSGroupAvatarBuilder.m in Sources */,
 				347850591FD9972E007B8332 /* SwiftSingletons.swift in Sources */,
 				344F248720069ECB00CFB4F4 /* ModalActivityIndicatorViewController.swift in Sources */,

Signal/src/ViewControllers/ContactViewController.swift

@@ -367,48 +367,14 @@ class ContactViewController: OWSViewController, CNContactViewControllerDelegate
     private func createFieldsView() -> UIView {
         SwiftAssertIsOnMainThread(#function)
 
-        let fieldsView = UIView.container()
+        var rows = [UIView]()
-        fieldsView.layoutMargins = .zero
-        fieldsView.preservesSuperviewLayoutMargins = false
-
-        var lastRow: UIView?
-
-        let addSpacerRow = {
-            guard let prevRow = lastRow else {
-                owsFail("\(self.logTag) missing last row")
-                return
-            }
-            let row = UIView()
-            row.backgroundColor = UIColor(rgbHex: 0xdedee1)
-            fieldsView.addSubview(row)
-            row.autoSetDimension(.height, toSize: 1)
-            row.autoPinLeadingToSuperviewMargin(withInset: self.hMargin)
-            row.autoPinTrailingToSuperviewMargin()
-            row.autoPinEdge(.top, to: .bottom, of: prevRow)
-            lastRow = row
-        }
-
-        let addRow: ((UIView) -> Void) = { (row) in
-            if lastRow != nil {
-                addSpacerRow()
-            }
-            fieldsView.addSubview(row)
-            row.autoPinLeadingToSuperviewMargin()
-            row.autoPinTrailingToSuperviewMargin()
-            if let lastRow = lastRow {
-                row.autoPinEdge(.top, to: .bottom, of: lastRow)
-            } else {
-                row.autoPinEdge(toSuperviewEdge: .top)
-            }
-            lastRow = row
-        }
 
         if viewMode == .nonSystemContact {
-            addRow(createActionRow(labelText: NSLocalizedString("CONVERSATION_SETTINGS_NEW_CONTACT",
+            rows.append(createActionRow(labelText: NSLocalizedString("CONVERSATION_SETTINGS_NEW_CONTACT",
                                                                comment: "Label for 'new contact' button in conversation settings view."),
                                    action: #selector(didPressCreateNewContact)))
 
-            addRow(createActionRow(labelText: NSLocalizedString("CONVERSATION_SETTINGS_ADD_TO_EXISTING_CONTACT",
+            rows.append(createActionRow(labelText: NSLocalizedString("CONVERSATION_SETTINGS_ADD_TO_EXISTING_CONTACT",
                                                                comment: "Label for 'new contact' button in conversation settings view."),
                                    action: #selector(didPressAddToExistingContact)))
         }
@@ -424,7 +390,7 @@ class ContactViewController: OWSViewController, CNContactViewControllerDelegate
         for phoneNumber in contact.phoneNumbers {
             let formattedPhoneNumber = PhoneNumber.bestEffortLocalizedPhoneNumber(withE164: phoneNumber.phoneNumber)
 
-            addRow(createNameValueRow(name: phoneNumber.localizedLabel(),
+            rows.append(createNameValueRow(name: phoneNumber.localizedLabel(),
                                       value: formattedPhoneNumber,
                                       actionBlock: {
                                         guard let url = NSURL(string: "tel:\(phoneNumber.phoneNumber)") else {
@@ -436,7 +402,7 @@ class ContactViewController: OWSViewController, CNContactViewControllerDelegate
         }
 
         for email in contact.emails {
-            addRow(createNameValueRow(name: email.localizedLabel(),
+            rows.append(createNameValueRow(name: email.localizedLabel(),
                                       value: email.email,
                                       actionBlock: {
                                         guard let url = NSURL(string: "mailto:\(email.email)") else {
@@ -449,9 +415,7 @@ class ContactViewController: OWSViewController, CNContactViewControllerDelegate
 
         // TODO: Should we present addresses here too? How?
 
-        lastRow?.autoPinEdge(toSuperviewEdge: .bottom)
+        return ContactFieldView(rows: rows, hMargin: hMargin)
-
-        return fieldsView
     }
 
     private let hMargin = CGFloat(16)

SignalMessaging/attachments/ApproveContactShareViewController.swift

@@ -349,51 +349,15 @@ public class ApproveContactShareViewController: OWSViewController, EditContactSh
     private func createFieldsView() -> UIView {
         SwiftAssertIsOnMainThread(#function)
 
-        let fieldsView = UIView.container()
+        var rows = [UIView]()
-        fieldsView.layoutMargins = .zero
-        fieldsView.preservesSuperviewLayoutMargins = false
 
-        var lastRow: UIView?
+        rows.append(createNameRow())
-
-        let addSpacerRow = {
-            guard let prevRow = lastRow else {
-                owsFail("\(self.logTag) missing last row")
-                return
-            }
-            let row = UIView()
-            row.backgroundColor = UIColor(rgbHex: 0xdedee1)
-            fieldsView.addSubview(row)
-            row.autoSetDimension(.height, toSize: 1)
-            row.autoPinLeadingToSuperviewMargin(withInset: self.hMargin)
-            row.autoPinTrailingToSuperviewMargin()
-            row.autoPinEdge(.top, to: .bottom, of: prevRow, withOffset: 0)
-            lastRow = row
-        }
-
-        let addRow: ((UIView) -> Void) = { (row) in
-            if lastRow != nil {
-                addSpacerRow()
-            }
-            fieldsView.addSubview(row)
-            row.autoPinLeadingToSuperviewMargin(withInset: self.hMargin)
-            row.autoPinTrailingToSuperviewMargin(withInset: self.hMargin)
-            if let lastRow = lastRow {
-                row.autoPinEdge(.top, to: .bottom, of: lastRow, withOffset: 0)
-            } else {
-                row.autoPinEdge(toSuperviewEdge: .top, withInset: 0)
-            }
-            lastRow = row
-        }
-
-        addRow(createNameRow())
 
         for fieldView in fieldViews {
-            addRow(fieldView)
+            rows.append(fieldView)
         }
 
-        lastRow?.autoPinEdge(toSuperviewEdge: .bottom, withInset: 0)
+        return ContactFieldView(rows: rows, hMargin: hMargin)
-
-        return fieldsView
     }
 
     private let hMargin = CGFloat(16)

SignalMessaging/attachments/ContactFieldView.swift

@@ -0,0 +1,63 @@
+//
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//
+
+import Foundation
+
+public class ContactFieldView: UIView {
+
+    @available(*, unavailable, message: "use other constructor instead.")
+    public required init?(coder aDecoder: NSCoder) {
+        fatalError("Unimplemented")
+    }
+
+    public required init(rows: [UIView], hMargin: CGFloat) {
+        super.init(frame: CGRect.zero)
+
+        self.layoutMargins = .zero
+        self.preservesSuperviewLayoutMargins = false
+
+        addRows(rows: rows, hMargin: hMargin)
+    }
+
+    private func addRows(rows: [UIView], hMargin: CGFloat) {
+
+        var lastRow: UIView?
+
+        let addSpacerRow = {
+            guard let prevRow = lastRow else {
+                owsFail("\(self.logTag) missing last row")
+                return
+            }
+            let row = UIView()
+            row.backgroundColor = UIColor(rgbHex: 0xdedee1)
+            self.addSubview(row)
+            row.autoSetDimension(.height, toSize: 1)
+            row.autoPinLeadingToSuperviewMargin(withInset: hMargin)
+            row.autoPinTrailingToSuperviewMargin()
+            row.autoPinEdge(.top, to: .bottom, of: prevRow, withOffset: 0)
+            lastRow = row
+        }
+
+        let addRow: ((UIView) -> Void) = { (row) in
+            if lastRow != nil {
+                addSpacerRow()
+            }
+            self.addSubview(row)
+            row.autoPinLeadingToSuperviewMargin(withInset: hMargin)
+            row.autoPinTrailingToSuperviewMargin(withInset: hMargin)
+            if let lastRow = lastRow {
+                row.autoPinEdge(.top, to: .bottom, of: lastRow, withOffset: 0)
+            } else {
+                row.autoPinEdge(toSuperviewEdge: .top, withInset: 0)
+            }
+            lastRow = row
+        }
+
+        for row in rows {
+            addRow(row)
+        }
+
+        lastRow?.autoPinEdge(toSuperviewEdge: .bottom, withInset: 0)
+    }
+}

SignalMessaging/attachments/EditContactShareNameViewController.swift

@@ -265,49 +265,13 @@ public class EditContactShareNameViewController: OWSViewController, ContactNameF
     private func createFieldsView() -> UIView {
         SwiftAssertIsOnMainThread(#function)
 
-        let fieldsView = UIView.container()
+        var rows = [UIView]()
-        fieldsView.layoutMargins = .zero
-        fieldsView.preservesSuperviewLayoutMargins = false
-
-        var lastRow: UIView?
-
-        let addSpacerRow = {
-            guard let prevRow = lastRow else {
-                owsFail("\(self.logTag) missing last row")
-                return
-            }
-            let row = UIView()
-            row.backgroundColor = UIColor(rgbHex: 0xdedee1)
-            fieldsView.addSubview(row)
-            row.autoSetDimension(.height, toSize: 1)
-            row.autoPinLeadingToSuperviewMargin(withInset: self.hMargin)
-            row.autoPinTrailingToSuperviewMargin()
-            row.autoPinEdge(.top, to: .bottom, of: prevRow, withOffset: 0)
-            lastRow = row
-        }
-
-        let addRow: ((UIView) -> Void) = { (row) in
-            if lastRow != nil {
-                addSpacerRow()
-            }
-            fieldsView.addSubview(row)
-            row.autoPinLeadingToSuperviewMargin(withInset: self.hMargin)
-            row.autoPinTrailingToSuperviewMargin(withInset: self.hMargin)
-            if let lastRow = lastRow {
-                row.autoPinEdge(.top, to: .bottom, of: lastRow, withOffset: 0)
-            } else {
-                row.autoPinEdge(toSuperviewEdge: .top, withInset: 0)
-            }
-            lastRow = row
-        }
 
         for fieldView in fieldViews {
-            addRow(fieldView)
+            rows.append(fieldView)
         }
 
-        lastRow?.autoPinEdge(toSuperviewEdge: .bottom, withInset: 0)
+        return ContactFieldView(rows: rows, hMargin: hMargin)
-
-        return fieldsView
     }
 
     private let hMargin = CGFloat(16)