Added new methods in `MessagesLayoutDelegate` for adjusting alignment of message top and bottom labels by martinpucik · Pull Request #1671 · MessageKit/MessageKit · GitHub
Skip to content

Added new methods in MessagesLayoutDelegate for adjusting alignment of message top and bottom labels #1671

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

Merged
martinpucik merged 6 commits into from
Feb 8, 2022
Merged

Added new methods in MessagesLayoutDelegate for adjusting alignment of message top and bottom labels #1671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bc33b52
chore: Removed unused ChatExample.xcworkspace
martinpucik Jan 22, 2022
951b73f
chore: Update Package.swift to tools version 5.5
martinpucik Feb 3, 2022
ccad748
feat: MessagesLayoutDelegate methods for Top/Bottom message label ali…
martinpucik Feb 3, 2022
afbc489
Merge branch 'master' of github.com:MessageKit/MessageKit into 4.0.0
martinpucik Feb 3, 2022
1ae3801
feat: MessagesLayoutDelegate methods for Top/Bottom message label ali…
martinpucik Feb 3, 2022
a1a0ba7
feat: MessagesLayoutDelegate methods for Top/Bottom message label ali…
martinpucik Feb 3, 2022
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
18 changes: 0 additions & 18 deletions .swiftlint.yml
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
15 changes: 0 additions & 15 deletions Example/.swiftlint.yml
View file
Open in desktop

This file was deleted.

55 changes: 32 additions & 23 deletions Example/ChatExample.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
/* Begin PBXBuildFile section */
032A15DD25965D9A00E00FE3 /* AlertService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 032A15DC25965D9A00E00FE3 /* AlertService.swift */; };
032A15E225965E1100E00FE3 /* CameraInputBarAccessoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 032A15E125965E1100E00FE3 /* CameraInputBarAccessoryView.swift */; };
13CCA06325793E24005C19BB /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = 13CCA06225793E24005C19BB /* Kingfisher */; };
13EFA5D727AC5631003002CC /* MessageKit in Frameworks */ = {isa = PBXBuildFile; productRef = 13EFA5D627AC5631003002CC /* MessageKit */; };
13EFA5D927AC5634003002CC /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = 13EFA5D827AC5634003002CC /* Kingfisher */; };
1C5433DD24C389C300A5383B /* MessagesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C5433DC24C389C300A5383B /* MessagesView.swift */; };
1C5433DF24C38DBF00A5383B /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C5433DE24C38DBF00A5383B /* SwiftUI.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
1C5433E224C3A33600A5383B /* SwiftUIExampleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C5433E124C3A33600A5383B /* SwiftUIExampleView.swift */; };
Expand All @@ -35,7 +36,6 @@
50739F9621C5090A008CA369 /* BasicAudioController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50739F9521C5090A008CA369 /* BasicAudioController.swift */; };
5074EF4E2163555900D82952 /* sound2.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 5074EF4C2163555900D82952 /* sound2.m4a */; };
5074EF4F2163555900D82952 /* sound1.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 5074EF4D2163555900D82952 /* sound1.m4a */; };
5117FB4626F3230F00F71A2C /* MessageKit in Frameworks */ = {isa = PBXBuildFile; productRef = 5117FB4526F3230F00F71A2C /* MessageKit */; };
5168957524F7AD560058C643 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5168957124F7AD560058C643 /* Assets.xcassets */; };
5168957624F7AD560058C643 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5168957224F7AD560058C643 /* LaunchScreen.storyboard */; };
63ECDABE24182A470016C349 /* MessageSubviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63ECDABD24182A470016C349 /* MessageSubviewViewController.swift */; };
Expand Down Expand Up @@ -72,6 +72,7 @@
032A15DC25965D9A00E00FE3 /* AlertService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertService.swift; sourceTree = "<group>"; };
032A15E125965E1100E00FE3 /* CameraInputBarAccessoryView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CameraInputBarAccessoryView.swift; sourceTree = "<group>"; };
13CCA04225793002005C19BB /* MessageKit */ = {isa = PBXFileReference; lastKnownFileType = folder; path = MessageKit; sourceTree = "<group>"; };
13EFA5D027AC5368003002CC /* MessageKit */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = MessageKit; path = ..; sourceTree = "<group>"; };
1C5433DC24C389C300A5383B /* MessagesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessagesView.swift; sourceTree = "<group>"; };
1C5433DE24C38DBF00A5383B /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; };
1C5433E124C3A33600A5383B /* SwiftUIExampleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIExampleView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -122,9 +123,9 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
5117FB4626F3230F00F71A2C /* MessageKit in Frameworks */,
13CCA06325793E24005C19BB /* Kingfisher in Frameworks */,
13EFA5D927AC5634003002CC /* Kingfisher in Frameworks */,
1C5433DF24C38DBF00A5383B /* SwiftUI.framework in Frameworks */,
13EFA5D727AC5631003002CC /* MessageKit in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -146,6 +147,14 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
13EFA5CF27AC5368003002CC /* Packages */ = {
isa = PBXGroup;
children = (
13EFA5D027AC5368003002CC /* MessageKit */,
);
name = Packages;
sourceTree = "<group>";
};
1C5433E024C3A32400A5383B /* SwiftUI */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -259,6 +268,7 @@
882B5E771CF7D53600B6E160 /* Sources */,
882B5E921CF7D56D00B6E160 /* Tests */,
882B5E8D1CF7D56000B6E160 /* UITests */,
13EFA5CF27AC5368003002CC /* Packages */,
882B5E341CF7D4B900B6E160 /* Products */,
955AE3B8EFF8FDB8F572D3F7 /* Frameworks */,
);
Expand Down Expand Up @@ -333,12 +343,13 @@
buildRules = (
);
dependencies = (
5117FB4826F3231600F71A2C /* PBXTargetDependency */,
13EFA5D527AC557F003002CC /* PBXTargetDependency */,
13EFA5D327AC557A003002CC /* PBXTargetDependency */,
);
name = ChatExample;
packageProductDependencies = (
13CCA06225793E24005C19BB /* Kingfisher */,
5117FB4526F3230F00F71A2C /* MessageKit */,
13EFA5D627AC5631003002CC /* MessageKit */,
13EFA5D827AC5634003002CC /* Kingfisher */,
);
productName = ChatExample;
productReference = 882B5E331CF7D4B900B6E160 /* ChatExample.app */;
Expand Down Expand Up @@ -416,7 +427,6 @@
mainGroup = 882B5E2A1CF7D4B900B6E160;
packageReferences = (
13CCA06125793E24005C19BB /* XCRemoteSwiftPackageReference "Kingfisher" */,
5117FB4226F322FD00F71A2C /* XCRemoteSwiftPackageReference "MessageKit" */,
);
productRefGroup = 882B5E341CF7D4B900B6E160 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -532,9 +542,13 @@
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
5117FB4826F3231600F71A2C /* PBXTargetDependency */ = {
13EFA5D327AC557A003002CC /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = 13EFA5D227AC557A003002CC /* Kingfisher */;
};
13EFA5D527AC557F003002CC /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = 5117FB4726F3231600F71A2C /* MessageKit */;
productRef = 13EFA5D427AC557F003002CC /* MessageKit */;
};
882B5E4B1CF7D4B900B6E160 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
Expand Down Expand Up @@ -823,32 +837,27 @@
minimumVersion = 5.15.8;
};
};
5117FB4226F322FD00F71A2C /* XCRemoteSwiftPackageReference "MessageKit" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/MessageKit/MessageKit";
requirement = {
branch = master;
kind = branch;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
13CCA06225793E24005C19BB /* Kingfisher */ = {
13EFA5D227AC557A003002CC /* Kingfisher */ = {
isa = XCSwiftPackageProductDependency;
package = 13CCA06125793E24005C19BB /* XCRemoteSwiftPackageReference "Kingfisher" */;
productName = Kingfisher;
};
5117FB4526F3230F00F71A2C /* MessageKit */ = {
13EFA5D427AC557F003002CC /* MessageKit */ = {
isa = XCSwiftPackageProductDependency;
package = 5117FB4226F322FD00F71A2C /* XCRemoteSwiftPackageReference "MessageKit" */;
productName = MessageKit;
};
5117FB4726F3231600F71A2C /* MessageKit */ = {
13EFA5D627AC5631003002CC /* MessageKit */ = {
isa = XCSwiftPackageProductDependency;
package = 5117FB4226F322FD00F71A2C /* XCRemoteSwiftPackageReference "MessageKit" */;
productName = MessageKit;
};
13EFA5D827AC5634003002CC /* Kingfisher */ = {
isa = XCSwiftPackageProductDependency;
package = 13CCA06125793E24005C19BB /* XCRemoteSwiftPackageReference "Kingfisher" */;
productName = Kingfisher;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 882B5E2B1CF7D4B900B6E160 /* Project object */;
Expand Down
7 changes: 0 additions & 7 deletions Example/ChatExample.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions Example/ChatExample.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// swift-tools-version:5.3
// swift-tools-version:5.5
// The swift-tools-version declares the minimum version of Swift required to build this package.

/*
MIT License

Copyright (c) 2017-2020 MessageKit
Copyright (c) 2017-2022 MessageKit

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
6 changes: 5 additions & 1 deletion Sources/Extensions/UIView+Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
MIT License

Copyright (c) 2017-2019 MessageKit
Copyright (c) 2017-2022 MessageKit

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -125,4 +125,8 @@ internal extension UIView {
NSLayoutConstraint.activate(constraints)
return constraints
}

func addSubviews(_ subviews: UIView...) {
subviews.forEach { addSubview($0) }
}
}
26 changes: 20 additions & 6 deletions Sources/Layout/MessageSizeCalculator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
MIT License

Copyright (c) 2017-2019 MessageKit
Copyright (c) 2017-2022 MessageKit

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -84,9 +84,9 @@ open class MessageSizeCalculator: CellSizeCalculator {
attributes.messageTimeLabelSize = messageTimeLabelSize(for: message, at: indexPath)
attributes.cellBottomLabelAlignment = cellBottomLabelAlignment(for: message)
attributes.messageTopLabelSize = messageTopLabelSize(for: message, at: indexPath)
attributes.messageTopLabelAlignment = messageTopLabelAlignment(for: message)
attributes.messageTopLabelAlignment = messageTopLabelAlignment(for: message, at: indexPath)

attributes.messageBottomLabelAlignment = messageBottomLabelAlignment(for: message)
attributes.messageBottomLabelAlignment = messageBottomLabelAlignment(for: message, at: indexPath)
attributes.messageBottomLabelSize = messageBottomLabelSize(for: message, at: indexPath)

attributes.accessoryViewSize = accessoryViewSize(for: message)
Expand Down Expand Up @@ -185,15 +185,22 @@ open class MessageSizeCalculator: CellSizeCalculator {
}

// MARK: - Top message Label

open func messageTopLabelSize(for message: MessageType, at indexPath: IndexPath) -> CGSize {
let layoutDelegate = messagesLayout.messagesLayoutDelegate
let collectionView = messagesLayout.messagesCollectionView
let height = layoutDelegate.messageTopLabelHeight(for: message, at: indexPath, in: collectionView)
return CGSize(width: messagesLayout.itemWidth, height: height)
}

open func messageTopLabelAlignment(for message: MessageType) -> LabelAlignment {
open func messageTopLabelAlignment(for message: MessageType, at indexPath: IndexPath) -> LabelAlignment {
let collectionView = messagesLayout.messagesCollectionView
let layoutDelegate = messagesLayout.messagesLayoutDelegate

if let alignment = layoutDelegate.messageTopLabelAlignment(for: message, at: indexPath, in: collectionView) {
return alignment
}

let dataSource = messagesLayout.messagesDataSource
let isFromCurrentSender = dataSource.isFromCurrentSender(message: message)
return isFromCurrentSender ? outgoingMessageTopLabelAlignment : incomingMessageTopLabelAlignment
Expand Down Expand Up @@ -234,7 +241,14 @@ open class MessageSizeCalculator: CellSizeCalculator {
return CGSize(width: messagesLayout.itemWidth, height: height)
}

open func messageBottomLabelAlignment(for message: MessageType) -> LabelAlignment {
open func messageBottomLabelAlignment(for message: MessageType, at indexPath: IndexPath) -> LabelAlignment {
let collectionView = messagesLayout.messagesCollectionView
let layoutDelegate = messagesLayout.messagesLayoutDelegate

if let alignment = layoutDelegate.messageBottomLabelAlignment(for: message, at: indexPath, in: collectionView) {
return alignment
}

let dataSource = messagesLayout.messagesDataSource
let isFromCurrentSender = dataSource.isFromCurrentSender(message: message)
return isFromCurrentSender ? outgoingMessageBottomLabelAlignment : incomingMessageBottomLabelAlignment
Expand Down
30 changes: 28 additions & 2 deletions Sources/Protocols/MessagesLayoutDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
MIT License

Copyright (c) 2017-2019 MessageKit
Copyright (c) 2017-2022 MessageKit

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -100,6 +100,15 @@ public protocol MessagesLayoutDelegate: AnyObject {
/// The default value returned by this method is zero.
func messageTopLabelHeight(for message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> CGFloat

/// Specifies the label alignment for the message bubble's top label.
/// - Parameters:
/// - message: The `MessageType` that will be displayed for this cell.
/// - indexPath: The `IndexPath` of the cell.
/// - messagesCollectionView: The `MessagesCollectionView` in which this cell will be displayed.
/// - Returns: Optional LabelAlignment for the message bubble's top label. If nil is returned or the delegate method is not implemented,
/// alignment from MessageSizeCalculator will be used depending if the message is outgoing or incoming
func messageTopLabelAlignment(for message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> LabelAlignment?

/// Specifies the height for the `MessageContentCell`'s bottom label.
///
/// - Parameters:
Expand All @@ -110,7 +119,16 @@ public protocol MessagesLayoutDelegate: AnyObject {
/// - Note:
/// The default value returned by this method is zero.
func messageBottomLabelHeight(for message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> CGFloat


/// Specifies the label alignment for the message bubble's bottom label.
/// - Parameters:
/// - message: The `MessageType` that will be displayed for this cell.
/// - indexPath: The `IndexPath` of the cell.
/// - messagesCollectionView: The `MessagesCollectionView` in which this cell will be displayed.
/// - Returns: Optional LabelAlignment for the message bubble's bottom label. If nil is returned or the delegate method is not implemented,
/// alignment from MessageSizeCalculator will be used depending if the message is outgoing or incoming
func messageBottomLabelAlignment(for message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> LabelAlignment?

/// Text cell size calculator for messages with MessageType.text.
///
/// - Parameters:
Expand Down Expand Up @@ -244,9 +262,17 @@ public extension MessagesLayoutDelegate {
return 0
}

func messageTopLabelAlignment(for message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> LabelAlignment? {
return nil
}

func messageBottomLabelHeight(for message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> CGFloat {
return 0
}

func messageBottomLabelAlignment(for message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> LabelAlignment? {
return nil
}

func textCellSizeCalculator(for message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> CellSizeCalculator? {
return nil
Expand Down
3 changes: 1 addition & 2 deletions Sources/Views/Cells/MessageCollectionViewCell.swift
View file
Open in desktop
Loading