Skip to content

Commit de6a576

Browse files
moldovaniosifmoldovaniosif
committed
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
2 parents 08451fb + e9b3a70 commit de6a576

File tree

94 files changed

+627
-299
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+627
-299
lines changed

‎.MessageKit.podspec.un~‎

994 Bytes
Binary file not shown.

‎CHANGELOG.md‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@
22

33
The changelog for `MessageKit`. Also see the [releases](https://github.com/MessageKit/MessageKit/releases) on GitHub.
44

5-
--------------------------------------
5+
## 3.0.0
66

7+
### Dependency Changes
78

8-
## Upcoming Release
9+
- **Breaking Change** The dependency `MessageInputBar` was replaced with `InputBarAccessoryView`. As `MessageInputBar` was previously a fork this means no functionality has been lost but improvements and bug fixes will be present. `InputBarAccessoryView` has more of a following outside of `MessageKit` making its development faster than `MessageInputBar`. Maintaining two versions only increased the workload. You can find the changelog for `InputBarAccessoryView` [here](https://github.com/nathantannar4/InputBarAccessoryView/blob/master/CHANGELOG.md).
910

1011
### Changed
1112

13+
- **Breaking Change** Deprecated the Sender struct in favor of the `SenderType` protocol. [#909](https://github.com/MessageKit/MessageKit/pull/909) by [@nathantannar4](https://github.com/nathantannar4)
14+
1215
- **Breaking Change** Add support for audio messages [#892](https://github.com/MessageKit/MessageKit/pull/892) by [@moldovaniosif](https://github.com/moldovaniosif). Added new protocols `AudioControllerDelegate`, `AudioItem` a new cell `AudioMessageCell` and a new controller `BasicAudioController`.
1316

1417
- **Breaking Change** Moved `handleTapGesture` method to `MessageCollectionViewCell` [#950](https://github.com/MessageKit/MessageKit/pull/950) by [@nathantannar4](https://github.com/nathantannar4)
@@ -18,6 +21,18 @@ The changelog for `MessageKit`. Also see the [releases](https://github.com/Messa
1821

1922
### Added
2023

24+
- Added `AccessoryPosition` class.
25+
[#989](https://github.com/MessageKit/MessageKit/pull/989) by [@subdiox](https://github.com/subdiox)
26+
27+
- Added `incomingAccessoryViewPosition` and `outgoingAccessoryViewPosition` variables to `MessageSizeCalculator` class.
28+
[#989](https://github.com/MessageKit/MessageKit/pull/989) by [@subdiox](https://github.com/subdiox)
29+
30+
- Added `setMessageIncomingAccessoryViewPosition(_:)` and `setMessageOutgoingAccessoryViewPosition(_:)` functions to `MessagesCollectionViewFlowLayout` class.
31+
[#989](https://github.com/MessageKit/MessageKit/pull/989) by [@subdiox](https://github.com/subdiox)
32+
33+
- **Breaking Change** Added `avatarLeadingTrailingPadding` as a property of `CellSizeCalculator` and `MessagesCollectionViewLayoutAttributes` to inset the `AvatarView` layout
34+
[#944](https://github.com/MessageKit/MessageKit/pull/944) by [@nathantannar4](https://github.com/nathantannar4)
35+
2136
- **Breaking Change** Added `didTapBackground(in:)` function to `MessageCellDelegate` protocol.
2237
[#922](https://github.com/MessageKit/MessageKit/pull/922) by [@kpennacchia](https://github.com/kpennacchia)
2338

@@ -50,6 +65,11 @@ The changelog for `MessageKit`. Also see the [releases](https://github.com/Messa
5065

5166
## [2.0.0](https://github.com/MessageKit/MessageKit/releases/tag/2.0.0)
5267

68+
### Added
69+
70+
- **Breaking Change** Added new methods to simplify using of custom messages: `customCellSizeCalculator(for:at:in:)` for `MessagesLayoutDelegate` and `customCell(for:at:in:)` for `MessagesDataSource`.
71+
[#879](https://github.com/MessageKit/MessageKit/pull/879) by [@realbonus](https://github.com/RealBonus)
72+
5373
### Changed
5474

5575
- Change acl of `handleGesture(touchLocation:)` in `MessageLabel` from internal to open.
@@ -78,9 +98,6 @@ The changelog for `MessageKit`. Also see the [releases](https://github.com/Messa
7898
- Added `additionalBottomInset` property that allows to adjust the bottom content inset automatically set on the messages collection view by the view controller.
7999
[#787](https://github.com/MessageKit/MessageKit/pull/787) by [@andreyvit](https://github.com/andreyvit)
80100

81-
- Added new methods to simplify using of custom messages: `customCellSizeCalculator(for:at:in:)` for `MessagesLayoutDelegate` and `customCell(for:at:in:)` for `MessagesDataSource`.
82-
[#879](https://github.com/MessageKit/MessageKit/pull/879) by [@realbonus](https://github.com/RealBonus)
83-
84101
### Fixed
85102

86103
- **Breaking Change** Fixed typo of `scrollsToBottomOnKeybordBeginsEditing` to `scrollsToBottomOnKeyboardBeginsEditing`.

‎Cartfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "MessageKit/MessageInputBar" "0.4.0"
1+
github "nathantannar4/InputBarAccessoryView" "4.2.1"

‎Cartfile.resolved‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "MessageKit/MessageInputBar" "0.4.0"
2-
github "Quick/Nimble" "v7.3.2"
3-
github "Quick/Quick" "v1.3.2"
1+
github "Quick/Nimble" "v7.3.4"
2+
github "Quick/Quick" "v1.3.4"
3+
github "nathantannar4/InputBarAccessoryView" "4.2.1"

‎Example/.Podfile.un~‎

628 Bytes
Binary file not shown.

‎Example/ChatExample.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
383B9EB32172A1C4008AB91A /* MockUser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 383B9EB22172A1C4008AB91A /* MockUser.swift */; };
1011
385C2922211FF32E0010B4BA /* CustomCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 385C2920211FF32E0010B4BA /* CustomCell.swift */; };
1112
385C2923211FF32E0010B4BA /* TableViewCells.swift in Sources */ = {isa = PBXBuildFile; fileRef = 385C2921211FF32E0010B4BA /* TableViewCells.swift */; };
1213
385C2927211FF33B0010B4BA /* MockSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 385C2925211FF33A0010B4BA /* MockSocket.swift */; };
@@ -70,6 +71,7 @@
7071
/* Begin PBXFileReference section */
7172
0364943D08CDBE656E6F6DF8 /* Pods-ChatExampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ChatExampleTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ChatExampleTests/Pods-ChatExampleTests.debug.xcconfig"; sourceTree = "<group>"; };
7273
2AC6E3F5C11E39F57598DBE6 /* Pods_ChatExampleUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ChatExampleUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
74+
383B9EB22172A1C4008AB91A /* MockUser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockUser.swift; sourceTree = "<group>"; };
7375
385C2920211FF32E0010B4BA /* CustomCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomCell.swift; sourceTree = "<group>"; };
7476
385C2921211FF32E0010B4BA /* TableViewCells.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableViewCells.swift; sourceTree = "<group>"; };
7577
385C2925211FF33A0010B4BA /* MockSocket.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockSocket.swift; sourceTree = "<group>"; };
@@ -152,6 +154,7 @@
152154
children = (
153155
385C2926211FF33B0010B4BA /* MockMessage.swift */,
154156
385C2925211FF33A0010B4BA /* MockSocket.swift */,
157+
383B9EB22172A1C4008AB91A /* MockUser.swift */,
155158
);
156159
path = Models;
157160
sourceTree = "<group>";
@@ -475,12 +478,12 @@
475478
);
476479
inputPaths = (
477480
"${SRCROOT}/Pods/Target Support Files/Pods-ChatExample/Pods-ChatExample-frameworks.sh",
478-
"${BUILT_PRODUCTS_DIR}/MessageInputBar/MessageInputBar.framework",
481+
"${BUILT_PRODUCTS_DIR}/InputBarAccessoryView/InputBarAccessoryView.framework",
479482
"${BUILT_PRODUCTS_DIR}/MessageKit/MessageKit.framework",
480483
);
481484
name = "[CP] Embed Pods Frameworks";
482485
outputPaths = (
483-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MessageInputBar.framework",
486+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/InputBarAccessoryView.framework",
484487
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MessageKit.framework",
485488
);
486489
runOnlyForDeploymentPostprocessing = 0;
@@ -540,6 +543,7 @@
540543
385C2945211FF38F0010B4BA /* NavigationController.swift in Sources */,
541544
385C2948211FF38F0010B4BA /* ChatViewController.swift in Sources */,
542545
385C2944211FF38F0010B4BA /* MessageContainerController.swift in Sources */,
546+
383B9EB32172A1C4008AB91A /* MockUser.swift in Sources */,
543547
385C2943211FF38F0010B4BA /* SettingsViewController.swift in Sources */,
544548
385C2927211FF33B0010B4BA /* MockSocket.swift in Sources */,
545549
385C2947211FF38F0010B4BA /* BasicExampleViewController.swift in Sources */,

‎Example/ChatExample.xcodeproj/xcshareddata/xcschemes/ChatExample.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1000"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Example/ChatExample.xcodeproj/xcshareddata/xcschemes/ChatExampleUITests.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1000"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Example/Podfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ platform :ios, '9.0'
33
target 'ChatExample' do
44
use_frameworks!
55
pod 'MessageKit', :path => '../'
6-
pod 'MessageInputBar', :git => 'https://github.com/MessageKit/MessageInputBar.git', :branch => 'master'
76

87
target 'ChatExampleTests' do
98
inherit! :search_paths

‎Example/Podfile.lock‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,23 @@
11
PODS:
2-
- MessageInputBar (0.4.1):
3-
- MessageInputBar/Core (= 0.4.1)
4-
- MessageInputBar/Core (0.4.1)
5-
- MessageKit (2.0.0):
6-
- MessageInputBar/Core
2+
- InputBarAccessoryView (4.2.1)
3+
- MessageKit (3.0.0-beta):
4+
- InputBarAccessoryView
75

86
DEPENDENCIES:
9-
- MessageInputBar (from `https://github.com/MessageKit/MessageInputBar.git`, branch `master`)
107
- MessageKit (from `../`)
118

9+
SPEC REPOS:
10+
https://github.com/cocoapods/specs.git:
11+
- InputBarAccessoryView
12+
1213
EXTERNAL SOURCES:
13-
MessageInputBar:
14-
:branch: master
15-
:git: https://github.com/MessageKit/MessageInputBar.git
1614
MessageKit:
1715
:path: "../"
1816

19-
CHECKOUT OPTIONS:
20-
MessageInputBar:
21-
:commit: faebe27f2dd8f39ea145e75b7296ef48133c099a
22-
:git: https://github.com/MessageKit/MessageInputBar.git
23-
2417
SPEC CHECKSUMS:
25-
MessageInputBar: e81c7535347f1f7b923de7080409a535a004b6e4
26-
MessageKit: e86b06ad2eb2d4ddea3ba29c4d9d13edf78843d1
18+
InputBarAccessoryView: 37175becdced159cd9ea335f47ae001b1e112909
19+
MessageKit: 30a1e0b112c44361904016e7add631a78c5128e0
2720

28-
PODFILE CHECKSUM: 04c1a805e1997e83bacab1a34787e71e9fe4432b
21+
PODFILE CHECKSUM: cecdb7bc8129cf99f66de9f68eea3256fec30c3d
2922

3023
COCOAPODS: 1.5.3

0 commit comments

Comments
 (0)