Commit Graph
101 Commits
Author SHA1 Message Date
Nathan Tannar 8cc96d71a2 Merge remote-tracking branch 'origin/3.0.0-beta' into typingIndicatorView 2019-04-05 00:11:14 -07:00
Iosif Moldovan cdedd2bf8c apply code review 2019-04-04 15:09:59 +03:00
Nathan Tannar 3f93702ff1 Merge branch '3.0.0-beta' into typingIndicatorView 2019-04-02 22:45:52 -07:00
Nathan Tannar d19e7df997 Go back to using a reserved section method 2019-04-02 22:43:09 -07:00
Iosif Moldovan 7a6f15f452 Merge branch '3.0.0-beta' of https://github.com/MessageKit/MessageKit into share_contact
# Conflicts:
#	Example/Sources/Data Generation/SampleData.swift
2019-03-30 11:25:06 +02:00
Iosif Moldovan 9fa69e7e59 Apply code review 2019-03-30 11:12:02 +02:00
Nathan TannarandGitHub a4654372ef Merge pull request #913 from JulienKode/CustomDetectorType
[DetectorType][MessageLabel] Add custom, mention and hashtag detector type 👻
2019-03-24 17:39:48 -07:00
Nathan Tannar b542ac88ee Rename id to senderId in SenderType 2019-03-24 17:38:20 -07:00
Nathan Tannar 9e8abf6d16 Merge branch '3.0.0-beta' into typingIndicatorView 2019-03-24 11:43:16 -07:00
Nathan Tannar 71bfc40d0a Merge remote-tracking branch 'origin/master' into 3.0.0-beta 2019-03-24 11:42:55 -07:00
Iosif Moldovan de6a57645f Merge branch '3.0.0-beta' of github.com:MessageKit/MessageKit into share_contact
# Conflicts:
#	Example/Sources/Data Generation/SampleData.swift
#	Sources/Views/Cells/AudioMessageCell.swift
2019-03-12 16:42:05 +02:00
Iosif Moldovan 08451fbde0 Add contact share message support 2019-03-12 16:02:52 +02:00
Nathan Tannar 085f563a91 Crunch some bugs 2019-03-01 00:01:43 -08:00
Nathan Tannar fa06818e74 Typing Indicator as a Supplementary View 2019-02-28 22:40:36 -08:00
Nathan TannarandGitHub 7555e0ac16 Merge branch '3.0.0-beta' into CustomDetectorType 2019-02-28 19:21:38 -08:00
Ayoub Belemlih 3437eb27c6 Fix documentation error within MessagesDataSource.swift 2019-02-28 15:24:54 -06:00
Nathan Tannar 2f1c0e53ce Bump copyright year 2019-02-21 20:53:23 -08:00
Nathan Tannar 94d121bc00 Merge remote-tracking branch 'origin/3.0.0-beta' into sender-protocol 2019-02-19 00:07:50 -08:00
Iosif Moldovan 7f855d20a3 pull out BasicAudioController from MessageKit framework 2018-12-15 12:44:33 +02:00
Iosif Moldovan ec9e5e906c Merge branch 'development' of github.com:MessageKit/MessageKit into development
# Conflicts:
#	CHANGELOG.md
2018-12-15 11:32:54 +02:00
Kristian PennacchiaandSteven Deutsch db818fd452 Added a didTapBackground(in:) method to MessageCellDelegate. 👻 (#922)
* Added a `didTapBackground(in:)` method to MessageCellDelegate.

Allows apps to detect when the user has tapped on the background of a cell, rather than its content.

* Updated the changelog.
2018-12-03 09:12:00 -06:00
Julien K 60c10d62f3 Merge remote-tracking branch 'upstream/development' into CustomDetectorType 2018-11-27 16:37:34 +01:00
Iosif Moldovan e51fcf3d53 Merge branch 'development' of https://github.com/MessageKit/MessageKit into tagonsoft_development
# Conflicts:
#	CHANGELOG.md
2018-11-27 17:18:41 +02:00
Nathan Tannar 755d20e3da Cleanup / Add changelog 2018-11-25 21:33:07 -08:00
Nathan Tannar 762f583d49 Refactor to see what SenderType would look like 2018-11-25 21:27:33 -08:00
Maxim TsvetkovandSteven Deutsch 32ecab3066 Enhancement/add another bottom label to the cell (#920)
* Rename cell bottom label stuff which actually conforms to message bottom label stuff

* Add cell bottom label methods for flow layout, data source and delegates

* Add vars for cell bottom label alignment and size

* Add cell bottom label into message content cell and set layout for label

* Set attributes for cell bottom label
Add cell bottom label attributes into calculation of cell content height

* Update example project to display cell bottom label

* Set avatar position to messageBottom in example project to display avatar with cell bottom label more pleasant  (cosmetic change)

* Revert "Set avatar position to messageBottom in example project to display avatar with cell bottom label more pleasant  (cosmetic change)"

This reverts commit d8d215518a.

* Fix comment to capitalize word

* Add cell bottom label after message bottom label in message content cell

* Update changelog

* Calculate Y position of cell bottom label as max Y position of message bottom label

* Move layout calculation of cell bottom label after layout calculation of message bottom label (because layout calculation of cell bottom label depends on layout calculation of message bottom label  now)

* Update breaking changes in changelog
2018-11-23 14:27:17 -06:00
Julien K 5593f5ebf7 Merge branch 'development' of https://github.com/MessageKit/MessageKit into CustomDetectorType 2018-11-01 10:46:27 +01:00
Julien K 77e9ccda46 [DetectorType] add .mention, .hashtag and .custon() to detect your own pattern
[DetectorType] Put mention and hashtag as var

[CHANGELOG] Update

[DetectorType] Update to have at least 4 characters and more

[CHANGELOG] Update

[DetectorType]

[MessageLabel] run NSDataDetector once

[MessageLabel] Run NSDataDetector once

[Testing] Add testing and pass rangesOfDetectors as internal

[Refactoring]

[Filter] only .custom

[Examples]
2018-10-26 12:15:27 +02:00
Iosif Moldovan ce6ebb0f0b Merge branch 'development' of https://github.com/MessageKit/MessageKit into tagonsoft_development
# Conflicts:
#	Example/Sources/Data Generation/SampleData.swift
2018-10-26 09:33:45 +03:00
Nathan TannarandGitHub 3b3db11032 Merge pull request #879 from RealBonus/enhancement/customMessageKind
MessagesDataSource & MessagesLayoutDelegate methods for MessageType.custom
2018-10-25 18:02:46 -07:00
Iosif Moldovan 2e6c76f061 rename AudioControllerDelegate method 2018-10-17 10:19:19 +03:00
Iosif Moldovan eae6aa1e5a Merge branch 'development' of https://github.com/MessageKit/MessageKit into tagonsoft_development
# Conflicts:
#	Example/Podfile.lock
#	Example/Sources/View Controllers/ChatViewController.swift
#	MessageKit.xcodeproj/project.pbxproj
#	Sources/Protocols/MessageCellDelegate.swift
2018-10-16 09:13:25 +03:00
Nathan Tannar 78c48fbf2d Merge remote-tracking branch 'origin/development' into accessoryview-updates 2018-10-11 21:32:02 -07:00
Iosif Moldovan ea4c123707 apply second review changes 2018-10-08 13:46:37 +03:00
Iosif Moldovan 84de5586c4 apply review changes 2018-10-05 13:00:46 +03:00
Iosif Moldovan a493493e0e Revert "fix configure audio cell"
This reverts commit da872d6d0a, reversing
changes made to cda9cfa470.
2018-10-04 10:09:55 +03:00
Iosif Moldovan da872d6d0a fix configure audio cell 2018-10-04 09:53:47 +03:00
Iosif Moldovan cda9cfa470 implement support for audio message 2018-10-03 17:20:01 +03:00
Iosif Moldovan 515b98ce45 partial development in add audio message support 2018-10-03 12:19:33 +03:00
Pavel Anokhov 2aa9573c58 Better method names 2018-10-02 12:19:47 +03:00
Nathan Tannar 9a2affcd6f Update to Swift 4.2 2018-09-29 11:45:50 -07:00
Pavel Anokhov 485b4602af swiftlint 2018-09-27 14:32:47 +03:00
Nathan TannarandSteven Deutsch 230e067009 Integrate MessageInputBar as a dependency (#732)
* Remove MessageInputBar files and change build settings

* Conditional imports to allow for builds without MessageInputBar

* Update Cardfile

* Specify Version in Cartfile for MessageInputBar

* Remove conditional imports in favor of Carthage for local development

* Additional `import MessageInputBar`

* Remove `MessageInputBar` from Cartfile.private

* Bump MessageInputBar version

* Add Cartfile

* Tweak build settings

* Specify import of MessageInputBar for Carthage
2018-09-17 12:22:21 -05:00
Pavel Anokhov fe0a000fc5 MessagesDataSource & MessagesLayoutDelegate methods for MessageType.custom handling. 2018-09-08 11:16:42 +03:00
Nathan Tannar a3c7a2f062 Add delegate and adjust layout 2018-08-31 11:04:42 -07:00
hyouuuandGitHub ee08f3c88f Merge pull request #1 from MessageKit/development
Merge from upstream
2018-06-26 19:07:41 -07:00
Steven Deutsch ca117642b0 Relax protocol requirements for get/set 2018-06-13 18:06:25 -05:00
Shawn Gong 7fde2fdc26 mimic avatar 2018-06-02 19:11:19 -07:00
Shawn Gong 3554e3fd24 Fix configCell stub cell type 2018-06-02 14:27:51 -07:00
Shawn Gong 9c23282d07 Add customizable accessoryView besides messageContainer 2018-06-02 02:10:51 -07:00