Commit Graph

247 Commits

Author SHA1 Message Date
Jakub Kaspar 4db71affef Fix Swiftlint 2020-04-02 21:39:46 +02:00
Jakub Kaspar 6f3a7b2e1d Cherry pick changes for example app 2020-03-20 18:58:19 +01:00
Jakub Kaspar e9aa9f86d0 Revert silly change 2020-03-17 18:33:45 +01:00
Jakub Kaspar 94b887df77 Update example project 2020-03-17 18:31:24 +01:00
Austin Wright 9add67a040 Adjusted the logic back to gesture.location(in:
- Passed in the correct view so that the location is in the same view context as the condition
- Changed imageView back to frame. It doesn't really make a difference in the Example, since the container is the same size and at the same origin as the imageView. However, just in case a framework user does something different than the example (like offsetting the imageView), frame is the safer bet.
- Update podfile to point to the latest InputBarAccessoryView & use cocoapods 1.9.0
2020-03-17 01:03:43 -04:00
Austin Wright afe903e836 - Adjust version number to match previous conventions
- Re-Generate podfile.lock for Example app
2020-02-25 13:38:42 -05:00
Jakub Kaspar b5bb86de78 Prepare framework for beta version 2020-02-25 15:16:03 +01:00
Jakub Kaspar 5ba5295e22 Update podfile, udpate pods, fix warnings, remove unnecessary code 2020-02-21 21:15:12 -08:00
hyouuu d3654c2c48 Merge pull request #1166 from domeniconicoli/master
Added delegate method for image tap action
2020-02-16 22:27:21 -08:00
Domenico 57af77527f Added image tapped delegate 2019-08-18 19:26:07 +02:00
Marc Etcheverry ba2e8264c7 Add loading indicator to audio message cell 2019-06-04 18:11:46 -07:00
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
Iosif Moldovan 9fa69e7e59 Apply code review 2019-03-30 11:12:02 +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
subdiox cfacf94a52 fix for pull request 2019-02-19 18:30:52 +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