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 d19e7df997 Go back to using a reserved section method 2019-04-02 22:43:09 -07:00
Iosif Moldovan 9fa69e7e59 Apply code review 2019-03-30 11:12:02 +02: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
subdiox 7936d1ca43 fix conflict on merge 2019-02-27 09:39:36 +09: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 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
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
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
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
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 de8ba43a34 clean code and add tests for audio controller 2018-10-16 10:31:51 +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
Wu ZhongandGitHub aa734da840 Merge pull request #905 from talanov/development
Fix: Allow required initializator methods @ Views.
2018-10-14 23:04:39 +08:00
stanislav 648609d114 Fix: Allow required init coder @ MessageLabel, MessagesCollection, PlayButton Views, MessageContent, MessageCollectionView Cells, MessagesCollectionViewFlow Layout. 2018-10-14 17:45:57 +03:00
Nathan Tannar 2e6de00785 Horizontal Padding only for accessoryView 2018-10-11 22:21:16 -07: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
Julien K bc70b5bccc [Accessoryview] Fix 2018-10-04 16:43:56 +02: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
Nathan Tannar 9a2affcd6f Update to Swift 4.2 2018-09-29 11:45:50 -07:00
Nathan Tannar 406f700109 Minor edits 2018-09-25 23:04:15 -07:00
Nathan Tannar a3c7a2f062 Add delegate and adjust layout 2018-08-31 11:04:42 -07:00
Shawn Gong 4dabb02d2e Fix broken test (not related to this PR), and formatting 2018-06-04 16:55:31 -07:00
Shawn Gong 9c3032d8f7 Don’t ignore size calculation on zero size, and consider accessoryView height 2018-06-02 22:15:19 -07:00
Shawn Gong 7fde2fdc26 mimic avatar 2018-06-02 19:11:19 -07:00
Shawn Gong b36924e3d2 consider accessoryViewPadding vertical attributes 2018-06-02 14:18:34 -07:00
Shawn Gong 9c23282d07 Add customizable accessoryView besides messageContainer 2018-06-02 02:10:51 -07:00
Steven Deutsch 3786989988 Add CHANGELOG entry 2018-04-26 03:11:45 -05:00
Steven Deutsch a6473c673e Rename cellBottomLabel 2018-04-26 02:51:41 -05:00
Steven Deutsch 02805c748a Fix cellContentHeight calculations 2018-04-20 03:40:37 -05:00
zhongwuzw edd79fb3ae Add cellTop/messageLabelTop/cellBottom case for avatar vertical position 2018-04-18 17:24:53 +08:00
zhongwuzw 56418d2c70 Add cellTopLabel and rename topLabel to messageTopLabel 2018-04-16 18:40:58 +08:00
zhongwuzw 39986f0458 Renamed MessageData to MessageKind 2018-04-16 11:57:50 +08:00
Steven Deutsch 4422020347 Merge branch 'master' of https://github.com/MessageKit/MessageKit into development 2018-04-11 16:11:35 -05:00
zhongwuzw bdfb988590 Fixed font invalidation of attributedString in MessageLabel 2018-04-06 11:00:42 +08:00