Commit Graph
1278 Commits
Author SHA1 Message Date
subdiox 7ea72003a4 Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit 77eae4ed2d, reversing
changes made to 667aac9954.
2019-02-27 09:36:30 +09:00
subdiox 77eae4ed2d Merge remote-tracking branch 'upstream/master' 2019-02-27 09:32:03 +09:00
Nathan TannarandGitHub 48c4ac2d8e Merge pull request #997 from justColbs/cw/addToAppsUsing
Added HopUp to apps using MK
2019-02-25 20:57:00 -08:00
justColbs 6f7916a072 Added HopUp to apps using MK 2019-02-25 20:29:47 -05:00
Nathan Tannar e1f6ee3e59 Update CHANGELOG with dependency change entry 2019-02-24 14:15:18 -08:00
Nathan Tannar cf7f096f29 Merge remote-tracking branch 'origin/3.0.0-beta' into 3.0.0-beta 2019-02-24 14:07:24 -08:00
Nathan Tannar ede22c30bc Swap MessageInputBar for InputBarAccessoryView 2019-02-24 14:06:58 -08:00
Nathan Tannar f95d5e1647 Update inset on safe area change 2019-02-21 20:55:11 -08:00
Nathan Tannar 00f9f6e4c3 Expose selectedIndexPathForMenu 2019-02-21 20:54:09 -08:00
Nathan Tannar 171cf89802 Typo cleanup for AudioMessageCell 2019-02-21 20:53:43 -08:00
Nathan Tannar 2f1c0e53ce Bump copyright year 2019-02-21 20:53:23 -08:00
Nathan TannarandGitHub 8cf7bbd03b Merge pull request #986 from jimijings11/master
Fix cell reusability for MediaMessageCell
2019-02-21 12:15:36 -08:00
subdiox 667aac9954 update ChatExample code for AccessoryView to work properly 2019-02-21 04:56:38 +09:00
subdiox 8dee9923a8 fix xcodeproj 2019-02-19 19:02:54 +09:00
subdiox 96ccbce813 change the order of calling methods 2019-02-19 18:37:49 +09:00
subdiox c9c8f356c4 fix duplicate modifier 2019-02-19 18:35:50 +09:00
subdiox cfacf94a52 fix for pull request 2019-02-19 18:30:52 +09:00
Nathan TannarandGitHub 64ef0fcf01 Merge pull request #909 from MessageKit/sender-protocol
Make Sender a protocol, renamed SenderType
2019-02-19 00:08:11 -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
Nathan TannarandGitHub 971affc89d Merge pull request #892 from TAGonSoft/development
Add support for audio messages.
2019-02-19 00:06:00 -08:00
subdiox 31db3f9983 added AccessoryViewPosition parameter 2019-02-18 22:35:42 +09:00
jimijings11 8baa8706ea Update MediaMessageCell.swift
fixing reuse bug.
2019-02-15 21:01:33 +01:00
Iosif Moldovan d0ab6387ca apply code review and update cardfile.resolve 2019-01-23 17:24:51 +02:00
Stepan ValchyschynandGitHub 6937f675ac Updated README.md with manual installation steps 2019-01-18 14:01:46 +02:00
Nathan Tannar 16a070bf58 Fix test spec 2018-12-26 15:46:57 -08:00
Tom FoxandSteven Deutsch 5d2ac65a94 add getting started section (#955) 2018-12-20 12:17:49 -06:00
Nathan TannarandSteven Deutsch d5b93a6562 Add Leading/Trailing padding to AvatarPosition (#944)
* Rework of avatar padding

* Use avatarLeadingTrailingPadding

* Undo edit in example

* Include changelog
2018-12-20 12:16:08 -06: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
Nathan TannarandSteven Deutsch 0194cf7f80 Move handleTapGesture logic to MessageCollectionViewCell (#950)
* Move handleTapGesture func base class

* Add Changelog Entry

* Update CHANGELOG.md
2018-12-01 20:55:30 -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 308eb6bffe Update Test Cases 2018-11-25 21:27:33 -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
Iosif Moldovan 8130c6e0f5 Merge branch 'development' of https://github.com/MessageKit/MessageKit into tagonsoft_development
# Conflicts:
#	CHANGELOG.md
2018-11-16 13:19:37 +02:00
Nathan TannarandGitHub 4b14db10db Merge pull request #923 from alaphao/master
Removed repeated test
2018-11-06 13:15:24 -08:00
Steven DeutschandGitHub 0c0e544d04 Update CHANGELOG.md 2018-11-04 17:08:46 -06:00
Nathan Tannar 339d4c5aec Merge branch 'master' into development 2018-11-04 14:57:20 -08:00
Nathan Tannar d16c6a86b9 Version 2.0.0 Release 2.0.0 2018-11-04 14:54:04 -08:00
Nathan Tannar 37dc8f64f6 Merge branch 'development' 2018-11-04 14:50:54 -08:00
Aleph Retamal be91c62393 Merge remote-tracking branch 'origin/master' into HEAD 2018-11-04 11:05:52 +11:00
Julien K d7df6fd5a5 [Examples] Update MessageTypes enum 2018-11-02 11:59:53 +01:00
Julien K d238e09155 [Update] 2018-11-02 11:17:39 +01:00
Iosif Moldovan cda82760d6 Merge branch 'development' of https://github.com/MessageKit/MessageKit into tagonsoft_development
# Conflicts:
#	CHANGELOG.md
2018-11-02 09:25:39 +02:00
Aleph RetamalandSteven Deutsch 6f04569369 Move test to Quick/Nimble (#924)
Moved **testMessageCollectionView_hasMessageCollectionFlowLayoutAfterViewDidLoad** to MessagesViewControlerSpec.swift and removed a duplication of this test
2018-11-01 22:35:38 -05:00
Nathan TannarandGitHub 93d04d5fee Merge pull request #912 from JulienKode/patch-1
[MessageLabel] Change privacy of properties and function to use allow…
2018-11-01 16:44:22 -07:00
Nathan TannarandGitHub 07f611daba Merge branch 'development' into patch-1 2018-11-01 16:43:45 -07:00