Skip to content

Commit cc274cb

Browse files
Merge pull request #1379 from QuickBlox/4.12.0-chat-objc-sample
4.12.0-chat-objc-sample
2 parents d8c074b + 8263f1a commit cc274cb

File tree

3 files changed

+20
-19
lines changed

3 files changed

+20
-19
lines changed

sample-chat-obj-c/sample-chat.xcodeproj/project.pbxproj

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 52;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -111,7 +111,6 @@
111111
2CCEFD9A27BBE49200072ADB /* QBChatMessage+Chat.m in Sources */ = {isa = PBXBuildFile; fileRef = 2CCEFD9927BBE49200072ADB /* QBChatMessage+Chat.m */; };
112112
2CE4588523ED867000ECA9DF /* CircularProgressBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 2CE4588423ED867000ECA9DF /* CircularProgressBar.m */; };
113113
2CE4588823ED9EFF00ECA9DF /* CALayer+Chat.m in Sources */ = {isa = PBXBuildFile; fileRef = 2CE4588723ED9EFF00ECA9DF /* CALayer+Chat.m */; };
114-
2CE6C35729A8EDFB00F0F4B9 /* Quickblox in Frameworks */ = {isa = PBXBuildFile; productRef = 2CE6C35629A8EDFB00F0F4B9 /* Quickblox */; };
115114
2CEBB41522454D8000A5E7BD /* Info.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2CEBB41422454D8000A5E7BD /* Info.xcassets */; };
116115
2CF0B68123E3029F00577F1D /* DialogCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2CF0B68023E3029F00577F1D /* DialogCell.m */; };
117116
2CF0B68423E3219C00577F1D /* UILabel+Chat.m in Sources */ = {isa = PBXBuildFile; fileRef = 2CF0B68323E3219C00577F1D /* UILabel+Chat.m */; };
@@ -125,6 +124,7 @@
125124
2CFE528425C83118004A1DDB /* InputContainer.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2CFE527B25C83118004A1DDB /* InputContainer.xib */; };
126125
2CFE528525C83118004A1DDB /* AuthorizationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2CFE527C25C83118004A1DDB /* AuthorizationViewController.m */; };
127126
2CFE528625C83118004A1DDB /* PresenterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2CFE527E25C83118004A1DDB /* PresenterViewController.m */; };
127+
3ADB7A8C2D0AF22B00BE0202 /* Quickblox in Frameworks */ = {isa = PBXBuildFile; productRef = 3ADB7A8B2D0AF22B00BE0202 /* Quickblox */; };
128128
86A716671B9EF0820019C42A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 86A716651B9EF0820019C42A /* InfoPlist.strings */; };
129129
BFE6FB76180E8EF100E64AC4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BFE6FB75180E8EF100E64AC4 /* Foundation.framework */; };
130130
BFE6FB78180E8EF100E64AC4 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BFE6FB77180E8EF100E64AC4 /* CoreGraphics.framework */; };
@@ -404,7 +404,7 @@
404404
BFE6FBB6180E9E7400E64AC4 /* CoreData.framework in Frameworks */,
405405
BFE6FB78180E8EF100E64AC4 /* CoreGraphics.framework in Frameworks */,
406406
BFE6FBB2180E9E5E00E64AC4 /* SystemConfiguration.framework in Frameworks */,
407-
2CE6C35729A8EDFB00F0F4B9 /* Quickblox in Frameworks */,
407+
3ADB7A8C2D0AF22B00BE0202 /* Quickblox in Frameworks */,
408408
BFE6FBB0180E9E5300E64AC4 /* CFNetwork.framework in Frameworks */,
409409
BFE6FB7A180E8EF100E64AC4 /* UIKit.framework in Frameworks */,
410410
BFE6FB76180E8EF100E64AC4 /* Foundation.framework in Frameworks */,
@@ -1199,7 +1199,7 @@
11991199
);
12001200
name = samplechat;
12011201
packageProductDependencies = (
1202-
2CE6C35629A8EDFB00F0F4B9 /* Quickblox */,
1202+
3ADB7A8B2D0AF22B00BE0202 /* Quickblox */,
12031203
);
12041204
productName = "sample-chat";
12051205
productReference = BFE6FB72180E8EF100E64AC4 /* sample-chat.app */;
@@ -1241,7 +1241,7 @@
12411241
);
12421242
mainGroup = BFE6FB69180E8EF100E64AC4;
12431243
packageReferences = (
1244-
2CE6C35529A8EDFB00F0F4B9 /* XCRemoteSwiftPackageReference "ios-quickblox-sdk" */,
1244+
3ADB7A8A2D0AF22B00BE0202 /* XCRemoteSwiftPackageReference "ios-quickblox-sdk" */,
12451245
);
12461246
productRefGroup = BFE6FB73180E8EF100E64AC4 /* Products */;
12471247
projectDirPath = "";
@@ -1483,7 +1483,7 @@
14831483
"$(inherited)",
14841484
"@executable_path/Frameworks",
14851485
);
1486-
MARKETING_VERSION = 4.11.0;
1486+
MARKETING_VERSION = 4.12.0;
14871487
OTHER_CODE_SIGN_FLAGS = "--deep";
14881488
OTHER_LDFLAGS = "$(inherited)";
14891489
PRODUCT_BUNDLE_IDENTIFIER = com.quickblox.chats;
@@ -1635,7 +1635,7 @@
16351635
"$(inherited)",
16361636
"@executable_path/Frameworks",
16371637
);
1638-
MARKETING_VERSION = 4.11.0;
1638+
MARKETING_VERSION = 4.12.0;
16391639
OTHER_CODE_SIGN_FLAGS = "--deep";
16401640
OTHER_LDFLAGS = "$(inherited)";
16411641
PRODUCT_BUNDLE_IDENTIFIER = com.quickblox.chats;
@@ -1674,7 +1674,7 @@
16741674
"$(inherited)",
16751675
"@executable_path/Frameworks",
16761676
);
1677-
MARKETING_VERSION = 4.11.0;
1677+
MARKETING_VERSION = 4.12.0;
16781678
OTHER_CODE_SIGN_FLAGS = "--deep";
16791679
OTHER_LDFLAGS = "$(inherited)";
16801680
PRODUCT_BUNDLE_IDENTIFIER = com.quickblox.chats;
@@ -1712,20 +1712,20 @@
17121712
/* End XCConfigurationList section */
17131713

17141714
/* Begin XCRemoteSwiftPackageReference section */
1715-
2CE6C35529A8EDFB00F0F4B9 /* XCRemoteSwiftPackageReference "ios-quickblox-sdk" */ = {
1715+
3ADB7A8A2D0AF22B00BE0202 /* XCRemoteSwiftPackageReference "ios-quickblox-sdk" */ = {
17161716
isa = XCRemoteSwiftPackageReference;
1717-
repositoryURL = "https://github.com/QuickBlox/ios-quickblox-sdk.git";
1717+
repositoryURL = "https://github.com/QuickBlox/ios-quickblox-sdk";
17181718
requirement = {
1719-
branch = master;
1720-
kind = branch;
1719+
kind = upToNextMajorVersion;
1720+
minimumVersion = 2.21.0;
17211721
};
17221722
};
17231723
/* End XCRemoteSwiftPackageReference section */
17241724

17251725
/* Begin XCSwiftPackageProductDependency section */
1726-
2CE6C35629A8EDFB00F0F4B9 /* Quickblox */ = {
1726+
3ADB7A8B2D0AF22B00BE0202 /* Quickblox */ = {
17271727
isa = XCSwiftPackageProductDependency;
1728-
package = 2CE6C35529A8EDFB00F0F4B9 /* XCRemoteSwiftPackageReference "ios-quickblox-sdk" */;
1728+
package = 3ADB7A8A2D0AF22B00BE0202 /* XCRemoteSwiftPackageReference "ios-quickblox-sdk" */;
17291729
productName = Quickblox;
17301730
};
17311731
/* End XCSwiftPackageProductDependency section */

sample-chat-obj-c/sample-chat.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sample-chat-obj-c/sample-chat/Components/ChatScreen/Views/ChatCollectionView/ChatContainerView/ChatContainerView.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ + (UIImage *)bubleImageWithArrowSize:(CGSize)arrowSize
4343
float leftCap = space + cornerRadius + 1;
4444
float topCap = cornerRadius;
4545

46-
CGSize size = CGSizeMake(arrowSize.width + (space + cornerRadius * 2) +2,
47-
cornerRadius * 2 + arrowSize.height);
46+
CGSize size = CGSizeMake(arrowSize.width + (space + cornerRadius * 2) + 2,
47+
cornerRadius * 2 + arrowSize.height +0.001);
4848

4949
if (img) {
5050
return img;

0 commit comments

Comments
 (0)