Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge upstream 3.4.2 #24

Merged
merged 25 commits into from
Aug 29, 2023
Merged

Merge upstream 3.4.2 #24

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
391f96a
Update changelog for development
Kaspik Sep 4, 2020
af2f9cd
Fix compilation issues by importing UIKit
Sep 8, 2020
085eddc
Merge branch 'master' into development
Sep 8, 2020
3272e5d
Merge pull request #1457 from tikhop/development
Kaspik Sep 11, 2020
24ec632
Bump minimum iOS to 12, update fox XCode 12, update example, update p…
Kaspik Sep 16, 2020
4a47214
update changelog
Kaspik Sep 16, 2020
72ac068
Fix readme
Kaspik Sep 16, 2020
3bd7f82
Merge pull request #1464 from MessageKit/xcode12
Kaspik Sep 16, 2020
3e20aee
Merge pull request #1465 from MessageKit/development
Kaspik Sep 16, 2020
7c83db3
Fix IBAV SPM minimum version
Kaspik Sep 16, 2020
22b086c
Remove ConcreteMessageType, handle the case where the messageKind is …
kinoroy Sep 19, 2020
4eb6a9a
Add MIT License header
kinoroy Sep 20, 2020
2fdc4f1
Adds clarifying access modifier
kinoroy Sep 20, 2020
ad4fea8
Add changelog entry
kinoroy Sep 20, 2020
85d2744
Fix xcodproj missing/extra files
kinoroy Sep 20, 2020
28a0e81
Merge pull request #1469 from MessageKit/remove-concrete-message
kinoroy Sep 20, 2020
2362616
remove keyboard observers in viewWillDisappear
kinoroy Oct 1, 2020
84e710c
Add changelog entry
kinoroy Oct 1, 2020
40442dc
Merge pull request #1476 from MessageKit/keyboard-observers
Kaspik Oct 2, 2020
1e4b93c
Bump dependencies, ship 3.4.2
Kaspik Oct 5, 2020
a92f80b
Merge tag '3.4.0' into merge-upstream-3.4.0
manicmaniac Aug 28, 2023
9ba7458
Merge tag '3.4.1' into merge-upstream-3.4.2
manicmaniac Aug 28, 2023
0e52f88
Force merge tag '3.4.2' into merge-upstream-3.4.2 with remaining conf…
manicmaniac Aug 28, 2023
3a2ac0f
fixup! Resolve conflicts
manicmaniac Aug 28, 2023
304483d
Add missing import
manicmaniac Aug 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions Example/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ SPEC CHECKSUMS:
PINRemoteImage: 3b7cedb118c2d357f87e9eabc7c81ba0202cb236
SwiftLint: dfd554ff0dff17288ee574814ccdd5cea85d76f7

<<<<<<< HEAD
PODFILE CHECKSUM: 05b7c748c0f30a6c617d2a85ead3fedcf0931a30
=======
PODFILE CHECKSUM: 24c39a08ead4a8771aa94310cfc35fe3be6b3105
>>>>>>> 3.4.2
PODFILE CHECKSUM: 31c6eb1d734807f78336ea60201a116e2410b2dd
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This checksum was recalculated by bundle exec pod install


COCOAPODS: 1.9.1
13 changes: 0 additions & 13 deletions MessageKit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,8 @@
0EE91E661FDEC888005420A2 /* CGRect+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EE91E651FDEC887005420A2 /* CGRect+Extensions.swift */; };
0EF0888C206F7E83007F2F58 /* CellSizeCalculator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EF0888B206F7E83007F2F58 /* CellSizeCalculator.swift */; };
135E907624AB3B33000EE6AA /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 135E907524AB3B33000EE6AA /* Assets.xcassets */; };
<<<<<<< HEAD
=======
1C93A97D251743DE008E4DE0 /* MessageKind+textMessageKind.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C93A97C251743DE008E4DE0 /* MessageKind+textMessageKind.swift */; };
1F066E131FD90BB600E11013 /* MessagesViewControllerSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F7FC8CB1FD2700B006CC979 /* MessagesViewControllerSpec.swift */; };
>>>>>>> 3.4.2
1F066E141FD90BB700E11013 /* MessageLabelSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F066E101FD90A0600E11013 /* MessageLabelSpec.swift */; };
1F066E1D1FDA3C1700E11013 /* SenderSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F066E1C1FDA3C1700E11013 /* SenderSpec.swift */; };
1F066E211FDA3DEA00E11013 /* AvatarSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F066E201FDA3DEA00E11013 /* AvatarSpec.swift */; };
Expand Down Expand Up @@ -420,12 +417,9 @@
B09643981F295D43004D0129 /* Extensions */ = {
isa = PBXGroup;
children = (
<<<<<<< HEAD
=======
1C93A97C251743DE008E4DE0 /* MessageKind+textMessageKind.swift */,
50FF34562237FE6A0004DCD7 /* UIImage+Extensions.swift */,
0EE91E651FDEC887005420A2 /* CGRect+Extensions.swift */,
>>>>>>> 3.4.2
B7A03F671F8669EB006AEF79 /* Bundle+Extensions.swift */,
0EE91E651FDEC887005420A2 /* CGRect+Extensions.swift */,
B7A03F681F8669EB006AEF79 /* NSAttributedString+Extensions.swift */,
Expand Down Expand Up @@ -659,12 +653,9 @@
buildActionMask = 2147483647;
files = (
382C794221705D2000F4FAF5 /* HorizontalEdgeInsets.swift in Sources */,
<<<<<<< HEAD
=======
B7A03F3C1F866946006AEF79 /* LocationMessageCell.swift in Sources */,
1C93A97D251743DE008E4DE0 /* MessageKind+textMessageKind.swift in Sources */,
1FF377AA20087D78004FD648 /* MessagesViewController+Menu.swift in Sources */,
>>>>>>> 3.4.2
B7A03F5B1F8669CA006AEF79 /* MessageType.swift in Sources */,
B7A03F601F8669CA006AEF79 /* MessagesDisplayDelegate.swift in Sources */,
1FE783A8206633C0007FA024 /* InsetLabel.swift in Sources */,
Expand All @@ -683,11 +674,7 @@
B7A03F6C1F8669EB006AEF79 /* UIView+Extensions.swift in Sources */,
383B9EB121728BAD008AB91A /* SenderType.swift in Sources */,
B7A03F3A1F866946006AEF79 /* TextMessageCell.swift in Sources */,
<<<<<<< HEAD
3725C9DA2438E50600800CED /* ConcreteMessage.swift in Sources */,
=======
50FF34552237FE4C0004DCD7 /* ContactItem.swift in Sources */,
>>>>>>> 3.4.2
B7A03F191F86682C006AEF79 /* MessagesCollectionViewLayoutAttributes.swift in Sources */,
3725C9D82438E35100800CED /* LinkPreviewView.swift in Sources */,
B7A03F461F86694F006AEF79 /* AvatarView.swift in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion Sources/Extensions/MessageKind+textMessageKind.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ internal extension MessageKind {
switch self {
case .linkPreview(let linkItem):
return linkItem.textKind
case .text, .emoji, .attributedText:
case .announcement, .text, .emoji, .attributedText:
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.announcement was added by us.

return self
default:
fatalError("textMessageKind not supported for messageKind: \(self)")
Expand Down
8 changes: 2 additions & 6 deletions Sources/Views/Cells/TextMessageCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,11 @@ open class TextMessageCell: MessageContentCell {
let attributes = displayDelegate.detectorAttributes(for: detector, and: message, at: indexPath)
messageLabel.setAttributes(attributes, detector: detector)
}
<<<<<<< HEAD
switch message.kind {
let textMessageKind = message.kind.textMessageKind
switch textMessageKind {
case .announcement(let text):
messageLabel.textAlignment = .center
messageLabel.attributedText = text
=======
let textMessageKind = message.kind.textMessageKind
switch textMessageKind {
>>>>>>> 3.4.2
case .text(let text), .emoji(let text):
messageLabel.textAlignment = .left
messageLabel.text = text
Expand Down
Loading