diff --git a/Assets/logo.svg b/Assets/logo.svg
new file mode 100644
index 00000000..5a1f1da3
--- /dev/null
+++ b/Assets/logo.svg
@@ -0,0 +1,32 @@
+
+
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..80f4b83f
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,75 @@
+# Contributing Guidelines
+
+### Code of Conduct
+
+Please read our [Code of Conduct](https://github.com/MessageKit/MessageKit/blob/974cb068f40a4959ec3b7bbf5894d405925079e4/Code_of_Conduct.md).
+The MessageKit maintainers take this Code of Conduct very seriously. Intolereance, disrespect, harassment, and any form of negavity will not be tolerated.
+
+### Ways to Contribute
+
+You can contribute to MessageKit in a variety of ways:
+
+- Fixing or reporting bugs :scream:
+- Improving documentation :heart:
+- Suggesting new features :smiley:
+- Increasing unit test coverage :pray:
+- Resolving any open issues :+1:
+
+If you're new to Open Source or Swift, the MessageKit community is a great place to get involved.
+
+**Your contributions are always welcome, no contribution is too small.**
+
+### Opening a New Issue
+
+- Please check the [README](https://github.com/MessageKit/MessageKit/blob/master/README.md) to see if your question is answered there.
+- Search [open issues](https://github.com/MessageKit/MessageKit/issues?q=is%3Aopen+is%3Aissue) and [closed issues](https://github.com/MessageKit/MessageKit/issues?q=is%3Aissue+is%3Aclosed) to avoid opening a duplicate issue.
+- Avoiding duplicate issues organizes all relevant information for project maintainers and other users.
+- If no issues represent your problem, please open a new issue with a good tile and useful description.
+
+- Information to Provide When Opening an Issue:
+ - MessageKit version(s)
+ - iOS version(s)
+ - Devices/Simulators affected
+ - Full crash log, if applicable
+ - A well written description of the problem you are experiencing
+ - *Please provide complete steps to reproduce the issue*
+ - For UI related issues, please provide a screenshot/GIF/video showing the issue
+ - Link to a project or demo project that exhibits the issue
+ - Search for an list any issues that might be related
+
+The more information you can provide, the easier it will be for us to resolve your issue in a timely manner.
+
+### Submitting a Pull Request
+
+- Please read the MessageKit [VISION.md](https://github.com/MessageKit/MessageKit/blob/master/VISION.md) document to understand the project goals, scope, and other technical considerations.
+- We strongly encourage you to open an issue discussing any potential new features before an implementation is provided.
+ - This ensures the feature is in scope and no ones time is wasted.
+
+- **Please DO NOT submit pull requests to the `master` branch**
+ - This branch is always stable and represents a relase.
+
+- **Please DO submit your pull request to the branch repersenting the next release version**
+
+1. Link to any issues the pull request resolves. If none exist, create one.
+2. Write unit tests for new functionality or fix any broken by your changes.
+3. If your changes affect documentation, please update them accordingly.
+4. Avoid pull requests with a large number of commits.
+5. Write clean code and follow the MessageKit [style guidelines](#style-guidelines).
+
+**You should submit one pull request per feature, the smaller the pull request the better chances it will be merged.**
+Enormous pull requests take a signficant time to review and understand their implications on the existing codebase.
+
+### Style Guidelines
+
+Writing clean code and upholding project standards is as important as adding new features. To ensure this, MessageKit employs a few practices:
+
+1. We use [SwiftLint](https://github.com/realm/SwiftLint) to enforce style and conventions at compile time.
+2. We adhere to the [Swift API Design Guidelines](https://swift.org/documentation/api-design-guidelines/).
+3. We follow the [Raywenderlich Swift Style Guide ](https://github.com/raywenderlich/swift-style-guide) but may have slight variations.
+
+### Questions and Contact
+
+If any of the sections above are unclear and require further explanation, *do not hesitate to reach out*.
+MessageKit strives to build an inclusive open source community and to make contributing as easy as possible for memebers of all experience levels.
+
+**You can get in touch with the MessageKit core team directly by joining our open Slack community channel: [here](https://join.slack.com/t/messagekit/shared_invite/MjI0NDkxNjgwMzA3LTE1MDIzMTU0MjUtMzJhZDZlNTkxMA).**
diff --git a/Example/Sources/ConversationViewController.swift b/Example/Sources/ConversationViewController.swift
index e4453d26..2015e2c6 100644
--- a/Example/Sources/ConversationViewController.swift
+++ b/Example/Sources/ConversationViewController.swift
@@ -62,15 +62,15 @@ extension ConversationViewController: MessagesDataSource {
extension ConversationViewController: MessagesDisplayDataSource {
- func avatarForMessage(_ message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> Avatar {
+ func avatar(for message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> Avatar {
return SampleData().getAvatarFor(sender: message.sender)
}
- func headerForMessage(_ message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> MessageHeaderView? {
+ func messageHeaderView(for message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> MessageHeaderView? {
return messagesCollectionView.dequeueMessageHeaderView(for: indexPath)
}
- func footerForMessage(_ message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> MessageFooterView? {
+ func messageFooterView(for message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> MessageFooterView? {
return messagesCollectionView.dequeueMessageFooterView(for: indexPath)
}
@@ -92,11 +92,11 @@ extension ConversationViewController: MessagesDisplayDataSource {
extension ConversationViewController: MessagesLayoutDelegate {
- func headerSizeFor(_ message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> CGSize {
+ func headerViewSize(for message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> CGSize {
return CGSize(width: messagesCollectionView.bounds.width, height: 4)
}
- func footerSizeFor(_ message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> CGSize {
+ func footerViewSize(for message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> CGSize {
return CGSize(width: messagesCollectionView.bounds.width, height: 4)
}
diff --git a/Example/Sources/MockMessage.swift b/Example/Sources/MockMessage.swift
index 355eb82d..d8d36c62 100644
--- a/Example/Sources/MockMessage.swift
+++ b/Example/Sources/MockMessage.swift
@@ -26,17 +26,25 @@ import Foundation
import MessageKit
struct MockMessage: MessageType {
-
- var messageId: String
- var sender: Sender
- var sentDate: Date
- var data: MessageData
-
- init(text: String, sender: Sender, messageId: String) {
- data = .text(text)
- self.sender = sender
- self.messageId = messageId
- self.sentDate = Date()
- }
-
+
+ var messageId: String
+ var sender: Sender
+ var sentDate: Date
+ var data: MessageData
+
+ private init(data: MessageData, sender: Sender, messageId: String) {
+ self.data = data
+ self.sender = sender
+ self.messageId = messageId
+ self.sentDate = Date()
+ }
+
+ init(text: String, sender: Sender, messageId: String) {
+ self.init(data: .text(text), sender: sender, messageId: messageId)
+ }
+
+ init(attributedText: NSAttributedString, sender: Sender, messageId: String) {
+ self.init(data: .attributedText(attributedText), sender: sender, messageId: messageId)
+ }
+
}
diff --git a/Example/Sources/SampleData.swift b/Example/Sources/SampleData.swift
index 5fbf6a95..c7dccf8e 100644
--- a/Example/Sources/SampleData.swift
+++ b/Example/Sources/SampleData.swift
@@ -39,8 +39,28 @@ struct SampleData {
let msg6 = MockMessage(text: "I think if you do something and it turns out pretty good, then you should go do something else wonderful, not dwell on it for too long. Just figure out what’s next.", sender: Jobs, messageId: UUID().uuidString)
let msg7 = MockMessage(text: "Remembering that I'll be dead soon is the most important tool I've ever encountered to help me make the big choices in life. Because almost everything - all external expectations, all pride, all fear of embarrassment or failure - these things just fall away in the face of death, leaving only what is truly important.", sender: Jobs, messageId: UUID().uuidString)
let msg8 = MockMessage(text: "Price is rarely the most important thing. A cheap product might sell some units. Somebody gets it home and they feel great when they pay the money, but then they get it home and use it and the joy is gone.", sender: Cook, messageId: UUID().uuidString)
-
- return [msg1, msg2, msg3, msg4, msg5, msg6, msg7, msg8]
+
+ let msg9Text = NSString(string: "Use .attributedText() to add bold, italic, colored text and more...")
+ let msg9AttributedText = NSMutableAttributedString(string: String(msg9Text))
+
+ if #available(iOS 9.0, *) {
+ msg9AttributedText.addAttributes([NSFontAttributeName: UIFont.monospacedDigitSystemFont(ofSize: UIFont.systemFontSize, weight: UIFontWeightBold)], range: msg9Text.range(of: ".attributedText()"))
+ } else {
+ msg9AttributedText.addAttributes([NSUnderlineStyleAttributeName: NSUnderlineStyle.styleSingle], range: msg9Text.range(of: ".attributedText()"))
+ }
+
+ msg9AttributedText.addAttributes([NSFontAttributeName: UIFont.boldSystemFont(ofSize: UIFont.systemFontSize)],
+ range: msg9Text.range(of: "bold"))
+
+ msg9AttributedText.addAttributes([NSFontAttributeName: UIFont.italicSystemFont(ofSize: UIFont.systemFontSize)],
+ range: msg9Text.range(of: "italic"))
+
+ msg9AttributedText.addAttributes([NSForegroundColorAttributeName: UIColor.red],
+ range: msg9Text.range(of: "colored"))
+
+ let msg9 = MockMessage(attributedText: msg9AttributedText, sender: Jobs, messageId: UUID().uuidString)
+
+ return [msg1, msg2, msg3, msg4, msg5, msg6, msg7, msg8, msg9]
}
func getCurrentSender() -> Sender {
diff --git a/MessageKit.podspec b/MessageKit.podspec
index 722e6954..faca6b81 100644
--- a/MessageKit.podspec
+++ b/MessageKit.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'MessageKit'
- s.version = '0.3.0'
+ s.version = '0.4.0'
s.license = { :type => "MIT", :file => "LICENSE.md" }
s.summary = 'An elegant messages UI library for iOS.'
diff --git a/README.md b/README.md
index fb7159f1..e6ce94b2 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,78 @@
# MessageKit
+
+