Skip to content

Commit 206684e

Browse files
ekazaevekazaev
committed
Minor code cleanup
1 parent 1d3840e commit 206684e

19 files changed

+116
-86
lines changed

‎ChatLayout.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'ChatLayout'
3-
s.version = '1.2.2'
3+
s.version = '1.2.3'
44
s.summary = 'Chat UI Library. It uses custom UICollectionViewLayout to provide you full control over the presentation.'
55
s.swift_version = '5.7'
66

‎ChatLayout/Classes/Extras/CellLayoutContainerView.swift

+6-4
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,12 @@ public final class CellLayoutContainerView<LeadingAccessory: StaticViewFactory,
121121
stackView.translatesAutoresizingMaskIntoConstraints = false
122122
addSubview(stackView)
123123

124-
stackView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor).isActive = true
125-
stackView.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor).isActive = true
126-
stackView.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor).isActive = true
127-
stackView.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor).isActive = true
124+
NSLayoutConstraint.activate([
125+
stackView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor),
126+
stackView.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor),
127+
stackView.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor),
128+
stackView.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor)
129+
])
128130

129131
if let leadingAccessoryView = leadingView {
130132
stackView.addArrangedSubview(leadingAccessoryView)

‎ChatLayout/Classes/Extras/ContainerCollectionReusableView.swift

+6-4
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,12 @@ public final class ContainerCollectionReusableView<CustomView: UIView>: UICollec
8181
layoutMargins = .zero
8282

8383
customView.translatesAutoresizingMaskIntoConstraints = false
84-
customView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor).isActive = true
85-
customView.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor).isActive = true
86-
customView.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor).isActive = true
87-
customView.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor).isActive = true
84+
NSLayoutConstraint.activate([
85+
customView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor),
86+
customView.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor),
87+
customView.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor),
88+
customView.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor)
89+
])
8890
}
8991

9092
}

‎ChatLayout/Classes/Extras/ContainerCollectionViewCell.swift

+6-4
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,12 @@ public final class ContainerCollectionViewCell<CustomView: UIView>: UICollection
8383
contentView.layoutMargins = .zero
8484

8585
customView.translatesAutoresizingMaskIntoConstraints = false
86-
customView.topAnchor.constraint(equalTo: contentView.layoutMarginsGuide.topAnchor).isActive = true
87-
customView.bottomAnchor.constraint(equalTo: contentView.layoutMarginsGuide.bottomAnchor).isActive = true
88-
customView.leadingAnchor.constraint(equalTo: contentView.layoutMarginsGuide.leadingAnchor).isActive = true
89-
customView.trailingAnchor.constraint(equalTo: contentView.layoutMarginsGuide.trailingAnchor).isActive = true
86+
NSLayoutConstraint.activate([
87+
customView.topAnchor.constraint(equalTo: contentView.layoutMarginsGuide.topAnchor),
88+
customView.bottomAnchor.constraint(equalTo: contentView.layoutMarginsGuide.bottomAnchor),
89+
customView.leadingAnchor.constraint(equalTo: contentView.layoutMarginsGuide.leadingAnchor),
90+
customView.trailingAnchor.constraint(equalTo: contentView.layoutMarginsGuide.trailingAnchor)
91+
])
9092
}
9193

9294
}

‎ChatLayout/Classes/Extras/EdgeAligningView.swift

+1-3
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,7 @@ public final class EdgeAligningView<CustomView: UIView>: UIView {
135135
addedConstraints.append(view.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor))
136136
}
137137
}
138-
addedConstraints.forEach { constraint in
139-
constraint.isActive = true
140-
}
138+
NSLayoutConstraint.activate(addedConstraints)
141139
self.addedConstraints.append(contentsOf: addedConstraints)
142140
}
143141

‎ChatLayout/Classes/Extras/ImageMaskedView.swift

+8-6
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ public final class ImageMaskedView<CustomView: UIView>: UIView {
5656

5757
/// Returns an object initialized from data in a given unarchiver.
5858
/// - Parameter coder: An unarchiver object.
59-
public required init?(coder aDecoder: NSCoder) {
60-
super.init(coder: aDecoder)
59+
public required init?(coder: NSCoder) {
60+
super.init(coder: coder)
6161
setupSubviews()
6262
}
6363

@@ -68,10 +68,12 @@ public final class ImageMaskedView<CustomView: UIView>: UIView {
6868

6969
addSubview(customView)
7070
customView.translatesAutoresizingMaskIntoConstraints = false
71-
customView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor).isActive = true
72-
customView.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor).isActive = true
73-
customView.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor).isActive = true
74-
customView.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor).isActive = true
71+
NSLayoutConstraint.activate([
72+
customView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor),
73+
customView.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor),
74+
customView.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor),
75+
customView.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor)
76+
])
7577
}
7678

7779
private func setupMask() {

‎ChatLayout/Classes/Extras/MessageContainerView.swift

+6-4
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,12 @@ public final class MessageContainerView<AccessoryViewFactory: StaticViewFactory,
6666
stackView.axis = .horizontal
6767
stackView.spacing = .zero
6868

69-
stackView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor).isActive = true
70-
stackView.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor).isActive = true
71-
stackView.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor).isActive = true
72-
stackView.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor).isActive = true
69+
NSLayoutConstraint.activate([
70+
stackView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor),
71+
stackView.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor),
72+
stackView.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor),
73+
stackView.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor)
74+
])
7375

7476
if let accessoryView = accessoryView {
7577
stackView.addArrangedSubview(accessoryView)

‎ChatLayout/Classes/Extras/RoundedCornersContainerView.swift

+6-4
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,12 @@ public final class RoundedCornersContainerView<CustomView: UIView>: UIView {
4141
layoutMargins = .zero
4242

4343
customView.translatesAutoresizingMaskIntoConstraints = false
44-
customView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor).isActive = true
45-
customView.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor).isActive = true
46-
customView.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor).isActive = true
47-
customView.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor).isActive = true
44+
NSLayoutConstraint.activate([
45+
customView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor),
46+
customView.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor),
47+
customView.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor),
48+
customView.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor)
49+
])
4850
}
4951

5052
/// Lays out subviews.

‎Example/ChatLayout/Chat/View/Avatar View/AvatarView.swift

+6-4
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,12 @@ final class AvatarView: UIView, StaticViewFactory {
4747
addSubview(circleImageView)
4848

4949
circleImageView.translatesAutoresizingMaskIntoConstraints = false
50-
circleImageView.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor).isActive = true
51-
circleImageView.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor).isActive = true
52-
circleImageView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor).isActive = true
53-
circleImageView.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor).isActive = true
50+
NSLayoutConstraint.activate([
51+
circleImageView.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor),
52+
circleImageView.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor),
53+
circleImageView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor),
54+
circleImageView.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor)
55+
])
5456

5557
let constraint = circleImageView.widthAnchor.constraint(equalToConstant: 30)
5658
constraint.priority = UILayoutPriority(rawValue: 999)

‎Example/ChatLayout/Chat/View/ChatViewController.swift

+6-4
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,12 @@ final class ChatViewController: UIViewController {
140140

141141
collectionView.translatesAutoresizingMaskIntoConstraints = false
142142
collectionView.frame = view.bounds
143-
collectionView.topAnchor.constraint(equalTo: view.topAnchor, constant: 0).isActive = true
144-
collectionView.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: 0).isActive = true
145-
collectionView.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 0).isActive = true
146-
collectionView.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: 0).isActive = true
143+
NSLayoutConstraint.activate([
144+
collectionView.topAnchor.constraint(equalTo: view.topAnchor, constant: 0),
145+
collectionView.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: 0),
146+
collectionView.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 0),
147+
collectionView.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: 0)
148+
])
147149
collectionView.backgroundColor = .clear
148150
collectionView.showsHorizontalScrollIndicator = false
149151
dataSource.prepare(with: collectionView)

‎Example/ChatLayout/Chat/View/Date Accessory View/DateAccessoryView.swift

+6-4
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,12 @@ final class DateAccessoryView: UIView {
4141
layoutMargins = .zero
4242

4343
addSubview(accessoryView)
44-
accessoryView.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor).isActive = true
45-
accessoryView.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor).isActive = true
46-
accessoryView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor).isActive = true
47-
accessoryView.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor).isActive = true
44+
NSLayoutConstraint.activate([
45+
accessoryView.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor),
46+
accessoryView.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor),
47+
accessoryView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor),
48+
accessoryView.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor)
49+
])
4850

4951
accessoryView.translatesAutoresizingMaskIntoConstraints = false
5052

‎Example/ChatLayout/Chat/View/Editing Accessory View/EditingAccessoryView.swift

+6-4
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,12 @@ final class EditingAccessoryView: UIView, StaticViewFactory {
3434
addSubview(button)
3535

3636
button.translatesAutoresizingMaskIntoConstraints = false
37-
button.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor).isActive = true
38-
button.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor).isActive = true
39-
button.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor).isActive = true
40-
button.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor).isActive = true
37+
NSLayoutConstraint.activate([
38+
button.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor),
39+
button.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor),
40+
button.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor),
41+
button.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor)
42+
])
4143

4244
button.setTitle("Delete", for: .normal)
4345
button.addTarget(self, action: #selector(buttonTapped), for: .touchUpInside)

‎Example/ChatLayout/Chat/View/Image View/ImageView.swift

+6-4
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,12 @@ final class ImageView: UIView, ContainerCollectionViewCellDelegate {
105105

106106
addSubview(stackView)
107107
stackView.translatesAutoresizingMaskIntoConstraints = false
108-
stackView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor).isActive = true
109-
stackView.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor).isActive = true
110-
stackView.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor).isActive = true
111-
stackView.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor).isActive = true
108+
NSLayoutConstraint.activate([
109+
stackView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor),
110+
stackView.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor),
111+
stackView.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor),
112+
stackView.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor)
113+
])
112114

113115
imageView.translatesAutoresizingMaskIntoConstraints = false
114116
imageView.contentMode = .scaleAspectFill

‎Example/ChatLayout/Chat/View/Other/BezierMaskedView.swift

+6-4
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,12 @@ final class BezierMaskedView<CustomView: UIView>: UIView {
8282
preservesSuperviewLayoutMargins = false
8383
addSubview(customView)
8484
customView.translatesAutoresizingMaskIntoConstraints = false
85-
customView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor).isActive = true
86-
customView.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor).isActive = true
87-
customView.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor).isActive = true
88-
customView.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor).isActive = true
85+
NSLayoutConstraint.activate([
86+
customView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor),
87+
customView.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor),
88+
customView.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor),
89+
customView.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor)
90+
])
8991
}
9092

9193
private func updateChannelStyle() {

‎Example/ChatLayout/Chat/View/Other/MainContainerView.swift

+6-4
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,12 @@ final class MainContainerView<LeadingAccessory: StaticViewFactory, CustomView: U
7373
layoutMargins = .zero
7474
clipsToBounds = false
7575
addSubview(containerView)
76-
containerView.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor).isActive = true
77-
containerView.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor).isActive = true
78-
containerView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor).isActive = true
79-
containerView.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor).isActive = true
76+
NSLayoutConstraint.activate([
77+
containerView.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor),
78+
containerView.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor),
79+
containerView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor),
80+
containerView.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor)
81+
])
8082

8183
accessoryView.translatesAutoresizingMaskIntoConstraints = false
8284

‎Example/ChatLayout/Chat/View/Status View/StatusView.swift

+6-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,12 @@ final class StatusView: UIView, StaticViewFactory {
3232
addSubview(imageView)
3333

3434
imageView.translatesAutoresizingMaskIntoConstraints = false
35-
imageView.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor).isActive = true
36-
imageView.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor).isActive = true
37-
imageView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor).isActive = true
38-
imageView.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor).isActive = true
35+
NSLayoutConstraint.activate([
36+
imageView.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor),
37+
imageView.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor),
38+
imageView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor),
39+
imageView.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor)
40+
])
3941
let widthConstraint = imageView.widthAnchor.constraint(equalToConstant: 15)
4042
widthConstraint.priority = UILayoutPriority(rawValue: 999)
4143
widthConstraint.isActive = true

‎Example/ChatLayout/Chat/View/Text Message View/TextMessageView.swift

+6-4
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,12 @@ final class TextMessageView: UIView, ContainerCollectionViewCellDelegate {
109109
textView.isExclusiveTouch = true
110110
textView.font = UIFont.preferredFont(forTextStyle: .body)
111111
addSubview(textView)
112-
textView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor).isActive = true
113-
textView.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor).isActive = true
114-
textView.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor).isActive = true
115-
textView.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor).isActive = true
112+
NSLayoutConstraint.activate([
113+
textView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor),
114+
textView.bottomAnchor.constraint(equalTo: layoutMarginsGuide.bottomAnchor),
115+
textView.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor),
116+
textView.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor)
117+
])
116118
textViewWidthConstraint = textView.widthAnchor.constraint(lessThanOrEqualToConstant: viewPortWidth)
117119
textViewWidthConstraint?.isActive = true
118120
}

‎Example/ChatLayout/Chat/View/URL View/URLView.swift

+6-4
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,12 @@ final class URLView: UIView, ContainerCollectionViewCellDelegate {
8181
}
8282
addSubview(newLinkView)
8383
newLinkView.translatesAutoresizingMaskIntoConstraints = false
84-
newLinkView.topAnchor.constraint(equalTo: self.topAnchor).isActive = true
85-
newLinkView.bottomAnchor.constraint(equalTo: self.bottomAnchor).isActive = true
86-
newLinkView.leadingAnchor.constraint(equalTo: self.leadingAnchor).isActive = true
87-
newLinkView.trailingAnchor.constraint(equalTo: self.trailingAnchor).isActive = true
84+
NSLayoutConstraint.activate([
85+
newLinkView.topAnchor.constraint(equalTo: self.topAnchor),
86+
newLinkView.bottomAnchor.constraint(equalTo: self.bottomAnchor),
87+
newLinkView.leadingAnchor.constraint(equalTo: self.leadingAnchor),
88+
newLinkView.trailingAnchor.constraint(equalTo: self.trailingAnchor)
89+
])
8890

8991
linkWidthConstraint = newLinkView.widthAnchor.constraint(equalToConstant: 310)
9092
linkWidthConstraint?.priority = UILayoutPriority(999)

0 commit comments

Comments
 (0)