Static

.circleci/config.yml

@@ -8,11 +8,11 @@ jobs:
   build-and-test:
 
     environment:
-      - DESTINATION: "platform=iOS Simulator,name=iPhone 8"
+      - DESTINATION: "platform=iOS Simulator,name=iPhone XS"
 
     # Specify the Xcode version to use.
     macos:
-      xcode: "9.2.0"
+      xcode: "10.0.0"
 
     # Define the steps required to build the project.
     steps:
@@ -22,17 +22,14 @@ jobs:
       - run:
           name: Update Homebrew
           command: brew update
-      - run:
-          name: Update carthage
-          command: brew upgrade carthage
       - run:
           name: Bootstrap Carthage
           command: carthage bootstrap --platform ios
       - run:
-          name: Biuld framework
+          name: Build framework
           command: xcodebuild build -project MessageKit.xcodeproj -scheme MessageKit -destination "$DESTINATION" CODE_SIGNING_REQUIRED=NO | xcpretty -c
       - run:
-          name: Biuld and run tests
+          name: Build and run tests
           command: xcodebuild test -project MessageKit.xcodeproj -scheme MessageKitTests -destination "$DESTINATION" CODE_SIGNING_REQUIRED=NO | xcpretty -c
       - run: 
           name: Fetch CocoaPods Specs
@@ -41,7 +38,7 @@ jobs:
           name: Update Pods
           command: cd Example && pod install
       - run:
-          name: Biuld and analyze Example
+          name: Build and analyze Example
           command: xcodebuild build analyze -workspace Example/ChatExample.xcworkspace -scheme ChatExample -destination "$DESTINATION" ONLY_ACTIVE_ARCH=NO CODE_SIGNING_REQUIRED=NO | xcpretty -c
 
       # Run tests.

.gitignore

@@ -33,3 +33,5 @@ Pods/
 
 # Carthage
 Carthage
+Carthage/Build
+Carthage/Checkouts

.gitmodules

@@ -0,0 +1,9 @@
+[submodule "Carthage/Checkouts/Nimble"]
+	path = Carthage/Checkouts/Nimble
+	url = https://github.com/Quick/Nimble.git
+[submodule "Carthage/Checkouts/Quick"]
+	path = Carthage/Checkouts/Quick
+	url = https://github.com/Quick/Quick.git
+[submodule "Carthage/Checkouts/MessageInputBar"]
+	path = Carthage/Checkouts/MessageInputBar
+	url = https://github.com/ZkHaider/MessageInputBar.git

.swift-version

@@ -1 +1 @@
-4.0
+4.2

CHANGELOG.md

@@ -4,13 +4,63 @@ The changelog for `MessageKit`. Also see the [releases](https://github.com/Messa
 
 --------------------------------------
 
-## Upcoming release
+## [2.0.0](https://github.com/MessageKit/MessageKit/releases/tag/2.0.0)
+
+### Added
+
+- **Breaking Change** Added new methods to simplify using of custom messages: `customCellSizeCalculator(for:at:in:)` for `MessagesLayoutDelegate` and `customCell(for:at:in:)` for `MessagesDataSource`.
+[#879](https://github.com/MessageKit/MessageKit/pull/879) by [@realbonus](https://github.com/RealBonus)
+
+### Changed
+
+- Change acl of `handleGesture(touchLocation:)` in `MessageLabel` from internal to open. 
+[#912](https://github.com/MessageKit/MessageKit/pull/912) by [@julienkode](https://github.com/JulienKode)
+
+## [2.0.0-beta.1](https://github.com/MessageKit/MessageKit/releases/tag/2.0.0-beta.1)
 
 ### Changed
 
-- The `MessageData.emoji` case once again uses a default font of 2x the `messageLabelFont` size.
+- **Breaking Change** Updated codebase to Swift 4.2 [#883](https://github.com/MessageKit/MessageKit/pull/883) by [@nathantannar4](https://github.com/nathantannar4)
+
+- Fixed the way that the Strings and UIImages are parsed in the `InputTextView` to prevent crashes in `parseForComponents()`. 
+[#791](https://github.com/MessageKit/MessageKit/pull/791) by [@nathantannar4](https://github.com/nathantannar4)
+
+### Added
+
+- Added support for detection and handling of `NSLink`s inside of messages.
+[#815](https://github.com/MessageKit/MessageKit/pull/815) by [@jnic](https://github.com/jnic)
+
+- Added customizable `accessoryView`, with a new `MessagesDisplayDelegate` function `configureAccessoryView`, and corresponding size & padding properties in `MessageSizeCalculator`. The `accessoryView` is aligned to the center of the `messageContainerView`.
+[#710](https://github.com/MessageKit/MessageKit/pull/710) by [@hyouuu](https://github.com/hyouuu)
+
+- Added a tap gesture recognition to the `accessoryView` which calls the  `MessageCellDelagate` function `didTapAccessoryView(in:)`. 
+[#834](https://github.com/MessageKit/MessageKit/pull/834) by [@nathantannar4](https://github.com/nathantannar4)
+
+- Added `additionalBottomInset` property that allows to adjust the bottom content inset automatically set on the messages collection view by the view controller. 
+[#787](https://github.com/MessageKit/MessageKit/pull/787) by [@andreyvit](https://github.com/andreyvit)
+
+### Fixed
+
+- **Breaking Change** Fixed typo of `scrollsToBottomOnKeybordBeginsEditing` to `scrollsToBottomOnKeyboardBeginsEditing`.
+[#856](https://github.com/MessageKit/MessageKit/pull/856) by [@p-petrenko](https://github.com/p-petrenko)
+
+-  Fixed a bug that prevented `MessageLabel` from laying out properly when contained by superviews using autolayout.
+[#889](https://github.com/MessageKit/MessageKit/pull/889) by [@marius-serban](https://github.com/marius-serban).
+
+- Fixed bottom content inset adjustment when using an undocked keyboard on iPad, or when `edgesForExtendedLayout` does not include `.top`, or when a parent container view controller adds extra views at the top of the screen. 
+[#787](https://github.com/MessageKit/MessageKit/pull/787) by [@andreyvit](https://github.com/andreyvit)
+
+- Fixed the `MessageData.emoji` case to use 2x the `messageLabelFont` size by default.
 [#795](https://github.com/MessageKit/MessageKit/pull/795) by [@Vortec4800](https://github.com/vortec4800).
 
+### Fixed
+
+- Fixed `MessagesCollectionView` to allow to use nibs with `MessageReusableView`.
+[#832](https://github.com/MessageKit/MessageKit/pull/832) by [@maxxx777](https://github.com/maxxx777).
+
+- Fixed multiple crashes at views, when views are being called from another XIB.
+[#905](https://github.com/MessageKit/MessageKit/pull/905) by [@talanov](https://github.com/talanov).
+
 ## [1.0.0](https://github.com/MessageKit/MessageKit/releases/tag/1.0.0)
 
 - First major release.

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 ### Code of Conduct
 
-Please read our [Code of Conduct](https://github.com/MessageKit/MessageKit/blob/master/Code_of_Conduct.md). 
+Please read our [Code of Conduct](https://github.com/MessageKit/MessageKit/blob/master/CODE_OF_CONDUCT.md). 
 The MessageKit maintainers take this Code of Conduct very seriously. Intolerance, disrespect, harassment, and any form of negativity will not be tolerated.
 
 ### Ways to Contribute

Cartfile

@@ -0,0 +1 @@
+github "ZkHaider/MessageInputBar" "static"

Cartfile.resolved

@@ -1,2 +1,3 @@
-github "Quick/Nimble" "v7.0.3"
-github "Quick/Quick" "v1.2.0"
+github "Quick/Nimble" "v7.3.3"
+github "Quick/Quick" "v1.3.4"
+github "ZkHaider/MessageInputBar" "83e91fe05b75582fabce16cabf9ffa5646379906"

Documentation/FAQs.md

@@ -1,6 +1,13 @@
 # MessageKit Frequently Asked Questions
 
-**Why doesn't the `MessageInputBar` appear in my controller?**
+- [Why doesn't the `MessageInputBar` appear in my controller?](#why-doesnt-the-messageinputbar-appear-in-my-controller)
+- [How can I remove the `AvatarView` from the cell?](#how-can-i-remove-the-avatarview-from-the-cell)
+- [How can I move the `AvatarView` to prevent it from overlapping text in the `MessageBottomLabel` or `CellTopLabel`?](#how-can-i-move-the-avatarview-to-prevent-it-from-overlapping-text-in-the-messagebottomlabel-or-celltoplabel)
+- [How can I dismiss the keyboard?](#how-can-i-dismiss-the-keyboard)
+- [How can I get a reference to the `MessageType` in the `MessageCellDelegate` methods?](#how-can-i-get-a-reference-to-the-messagetype-in-the-messagecelldelegate-methods)
+
+
+## Why doesn't the `MessageInputBar` appear in my controller?
 
 If you're using the `MessagesViewController` as a child view controller then
 you have to call `becomeFirstResponder()` on your view controller. The
@@ -21,7 +28,7 @@ class ParentVC: UIViewController {
 }
 ```
 
-**How can I remove the `AvatarView` from the cell?**
+## How can I remove the `AvatarView` from the cell?
 
 You can set the `AvatarView` to hidden through the `configureAvatarView(_:AvatarView,for:MessageType,at:IndexPath,in:MessagesCollectionView)` method of `MessagesDisplayDelegate`.
 
@@ -52,7 +59,7 @@ if let layout = messagesCollectionView.collectionViewLayout as? MessagesCollecti
 }
 ```
 
-**How can I move the `AvatarView` to prevent it from overlapping text in the `MessageBottomLabel` or `CellTopLabel`?**
+## How can I move the `AvatarView` to prevent it from overlapping text in the `MessageBottomLabel` or `CellTopLabel`?
 
 If you have resized the `AvatarView` to be larger than the default size in MessageKit then you may notice that the
 `AvatarView` overlaps text either in the `MessageBottomLabel` or `CallTopLabel`. MessageKit allows the `AvatarView`
@@ -75,7 +82,7 @@ if let layout = messagesCollectionView.collectionViewLayout as? MessagesCollecti
 
 There are other options provided as well so take a look at the `AvatarPosition` struct to see what they are.
 
-**How can I dismiss the keyboard?**
+## How can I dismiss the keyboard?
 
 The `MessagesViewController` needs to resign the first responder.
 
@@ -84,7 +91,7 @@ let controller = MessagesViewController()
 controller.resignFirstResponder()
 ```
 
-**How can I get a reference to the `MessageType` in the `MessageCellDelegate` methods?**
+## How can I get a reference to the `MessageType` in the `MessageCellDelegate` methods?
 
 You can use `UICollectionView`'s method `indexPath(for: UICollectionViewCell)` to get the
 `IndexPath` for the `MessageCollectionViewCell` argument. Using this `IndexPath`, you can