Commit Graph

212 Commits

Author SHA1 Message Date
Nathan Tannar bed54d3c2a Merge branch 'development' into 3.0.0-swift5 2019-04-25 16:07:22 -07:00
Nathan Tannar d16e5f8078 Improve Example, Add screenshots 2019-04-06 12:09:47 -07:00
Nathan Tannar 5edb955e52 Update Example to Swift 5 2019-04-05 09:51:15 -07:00
Nathan Tannar bdb11d25fc Cleanup / Add warnings / Prep for beta release 2019-04-05 00:35:21 -07:00
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
Nathan Tannar 2138b3ba5d Small changes to try and fix crash 2019-03-26 12:20:11 -07:00
Nathan Tannar a058885b37 Fix example app 2019-03-24 18:34:43 -07:00
Nathan Tannar 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
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 Tannar e9b3a7065f Quick fix for #993 2019-02-28 22:33:27 -08:00
Nathan Tannar 6eff119a5e Add warnings to MessageInputBar 2019-02-28 22:33:04 -08:00
Nathan Tannar 7555e0ac16 Merge branch '3.0.0-beta' into CustomDetectorType 2019-02-28 19:21:38 -08:00
subdiox 7936d1ca43 fix conflict on merge 2019-02-27 09:39:36 +09:00
Nathan Tannar ede22c30bc Swap MessageInputBar for InputBarAccessoryView 2019-02-24 14:06:58 -08:00
subdiox 667aac9954 update ChatExample code for AccessoryView to work properly 2019-02-21 04:56:38 +09:00
subdiox 96ccbce813 change the order of calling methods 2019-02-19 18:37:49 +09:00
Nathan Tannar 94d121bc00 Merge remote-tracking branch 'origin/3.0.0-beta' into sender-protocol 2019-02-19 00:07:50 -08:00
subdiox 31db3f9983 added AccessoryViewPosition parameter 2019-02-18 22:35:42 +09:00
Iosif Moldovan d0ab6387ca apply code review and update cardfile.resolve 2019-01-23 17:24:51 +02:00
Iosif Moldovan 7f855d20a3 pull out BasicAudioController from MessageKit framework 2018-12-15 12:44:33 +02: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 762f583d49 Refactor to see what SenderType would look like 2018-11-25 21:27:33 -08:00
Maxim Tsvetkov 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 d7df6fd5a5 [Examples] Update MessageTypes enum 2018-11-02 11:59:53 +01:00
Julien K 9a64ebf621 [Examples] Add delegate methods 2018-11-01 11:25:45 +01: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 c27865f451 add Audio Message cell in Settings screen 2018-10-26 09:34:10 +03: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
hamzaozturk e5bc7627bd Settings aded to enable/disable message types. 2018-10-23 11:04:00 +03: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
Nathan Tannar b3950af79a Correct AccessoryView Size in Example 2018-10-13 15:31:04 -07: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
hamzaozturk d62d9b4407 isLastSectionVisible method returns wrong results for the BasicExampleViewController. Moreover, there is an easier method to find the visible section.
It is unnecessary to scroll to the bottom when title view updated.
2018-10-08 16:50:46 +03: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 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
Iosif Moldovan 46d9f1c4d9 Merge branch 'development' of https://github.com/MessageKit/MessageKit into audio_message_support
# Conflicts:
#	Cartfile.resolved
#	Example/ChatExample.xcodeproj/project.pbxproj
#	Example/Podfile.lock
#	Example/Sources/AppDelegate.swift
#	Example/Sources/ConversationViewController.swift
#	Example/Sources/Data Generation/SampleData.swift
#	Example/Sources/View Controllers/LaunchViewController.swift
#	MessageKit.xcodeproj/project.pbxproj
#	MessageKit.xcodeproj/xcshareddata/xcschemes/MessageKit.xcscheme
#	MessageKit.xcodeproj/xcshareddata/xcschemes/MessageKitTests.xcscheme
#	Sources/Controllers/MessagesViewController+Keyboard.swift
#	Sources/Views/InputBarItem.swift
#	Sources/Views/InputStackView.swift
#	Sources/Views/InputTextView.swift
#	Sources/Views/MessageInputBar.swift
#	Tests/ViewsTests/InputBarItemTests.swift
2018-10-01 10:44:34 +03:00
Nathan Tannar d806da72e0 Update Example to Swift 4.2 2018-09-29 12:24:01 -07:00