Skip to content

Commit e798528

Browse files
pushpsenairekar2911pushpsenairekar2911
authored
Merge pull request #8 from cometchat-pro/v2
v2.3.7-1
2 parents 32b982e + 6b99a31 commit e798528

File tree

76 files changed

+4898
-6147
lines changed

Some content is hidden

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

76 files changed

+4898
-6147
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ assignees: ''
1010

1111

1212

13+
1314
**Describe the bug**
1415
A clear and concise description of what the bug is.
1516

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ ios-objective-c-chat-app/.DS_Store
2020

2121

2222

23+

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Please note we have a code of conduct, please follow it in all your interactions
77

88

99

10+
1011
## Pull Request Process
1112

1213
1. Ensure any install or build dependencies are removed before the end of the layer when doing a

‎CometChatObjc/CometChatObjc.xcodeproj/project.pbxproj‎

Lines changed: 2623 additions & 2600 deletions
Large diffs are not rendered by default.

‎CometChatObjc/CometChatObjc.xcodeproj/project.xcworkspace/xcuserdata/pushpsenairekar.xcuserdatad/UserInterfaceState.xcuserstate‎

25.1 KB
Binary file not shown.

‎CometChatObjc/CometChatObjc/Library/UI Components/Chats/Conversation List Item/CometChatConversationListItem.xib‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
33
<device id="retina6_1" orientation="portrait" appearance="dark"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
77
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
8+
<capability name="System colors in document resources" minToolsVersion="11.0"/>
89
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
910
</dependencies>
1011
<objects>
@@ -159,14 +160,14 @@
159160
</stackView>
160161
<view clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="CometChatUserListItem" translatesAutoresizingMaskIntoConstraints="NO" id="ha3-h5-xV4" customClass="CometChatStatusIndicator" customModule="CometChat_KitchenSink" customModuleProvider="target">
161162
<rect key="frame" x="55" y="45" width="18" height="18"/>
162-
<color key="backgroundColor" systemColor="tertiaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.29999999999999999" colorSpace="custom" customColorSpace="sRGB"/>
163+
<color key="backgroundColor" systemColor="tertiaryLabelColor"/>
163164
<constraints>
164165
<constraint firstAttribute="height" constant="18" id="3GY-bD-guv"/>
165166
<constraint firstAttribute="width" constant="18" id="kKk-Qf-CKU"/>
166167
</constraints>
167168
<userDefinedRuntimeAttributes>
168169
<userDefinedRuntimeAttribute type="color" keyPath="borderColor">
169-
<color key="value" systemColor="secondarySystemBackgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
170+
<color key="value" systemColor="secondarySystemBackgroundColor"/>
170171
</userDefinedRuntimeAttribute>
171172
<userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
172173
<real key="value" value="3"/>
@@ -176,7 +177,7 @@
176177
</userDefinedRuntimeAttribute>
177178
<userDefinedRuntimeAttribute type="boolean" keyPath="hide" value="YES"/>
178179
<userDefinedRuntimeAttribute type="color" keyPath="setBackgroundColor">
179-
<color key="value" systemColor="systemRedColor" red="1" green="0.23137254900000001" blue="0.18823529410000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
180+
<color key="value" systemColor="systemRedColor"/>
180181
</userDefinedRuntimeAttribute>
181182
</userDefinedRuntimeAttributes>
182183
</view>
@@ -210,8 +211,25 @@
210211
<point key="canvasLocation" x="257.97101449275362" y="158.03571428571428"/>
211212
</tableViewCell>
212213
</objects>
214+
<designables>
215+
<designable name="Z9k-XE-qnp">
216+
<size key="intrinsicContentSize" width="8.5" height="16"/>
217+
</designable>
218+
<designable name="qg6-2M-6C7">
219+
<size key="intrinsicContentSize" width="240" height="240"/>
220+
</designable>
221+
</designables>
213222
<resources>
214223
<image name="blueTick.png" width="14" height="10"/>
215224
<image name="defaultAvatar.jpg" width="240" height="240"/>
225+
<systemColor name="secondarySystemBackgroundColor">
226+
<color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
227+
</systemColor>
228+
<systemColor name="systemRedColor">
229+
<color red="1" green="0.23137254901960785" blue="0.18823529411764706" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
230+
</systemColor>
231+
<systemColor name="tertiaryLabelColor">
232+
<color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.29999999999999999" colorSpace="custom" customColorSpace="sRGB"/>
233+
</systemColor>
216234
</resources>
217235
</document>

‎CometChatObjc/CometChatObjc/Library/UI Components/Chats/Conversation List/CometChatConversationList.swift‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ extension CometChatConversationList: UITableViewDelegate , UITableViewDataSource
461461

462462

463463
public func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
464-
464+
var actions = [UIContextualAction]()
465465
guard let selectedCell = self.tableView.cellForRow(at: indexPath) as? CometChatConversationListItem else { return nil }
466466

467467
let deleteAction = UIContextualAction(style: .destructive, title: "", handler: { (action,view, completionHandler ) in
@@ -520,7 +520,14 @@ extension CometChatConversationList: UITableViewDelegate , UITableViewDataSource
520520
let image = UIImage(named: "delete.png", in: UIKitSettings.bundle, compatibleWith: nil)?.withRenderingMode(.alwaysTemplate)
521521
deleteAction.image = image
522522
}
523-
return UISwipeActionsConfiguration(actions: [deleteAction])
523+
524+
FeatureRestriction.isclearConversationEnabled(completion: { success in
525+
if success == .enabled {
526+
actions.append(deleteAction)
527+
}
528+
})
529+
530+
return UISwipeActionsConfiguration(actions: actions)
524531
}
525532

526533
}

‎CometChatObjc/CometChatObjc/Library/UI Components/Messages/Message Bubbles/Audio Message/CometChatReceiverAudioMessageBubble.xib‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
33
<device id="retina6_1" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
77
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
88
<capability name="System colors in document resources" minToolsVersion="11.0"/>
99
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -19,7 +19,7 @@
1919
<autoresizingMask key="autoresizingMask"/>
2020
<subviews>
2121
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="defaultAvatar.jpg" translatesAutoresizingMaskIntoConstraints="NO" id="HpJ-Zw-5Ia" customClass="CometChatAvatar" customModule="CometChat_KitchenSink" customModuleProvider="target">
22-
<rect key="frame" x="5" y="30" width="30" height="30"/>
22+
<rect key="frame" x="5" y="33" width="30" height="30"/>
2323
<color key="backgroundColor" systemColor="systemFillColor"/>
2424
<constraints>
2525
<constraint firstAttribute="width" constant="30" id="d7n-sm-DGa"/>
@@ -35,7 +35,7 @@
3535
</userDefinedRuntimeAttributes>
3636
</imageView>
3737
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="3" translatesAutoresizingMaskIntoConstraints="NO" id="xr8-WX-XFr">
38-
<rect key="frame" x="38" y="0.0" width="379" height="123.5"/>
38+
<rect key="frame" x="38" y="3" width="379" height="123.5"/>
3939
<subviews>
4040
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="37s-1Q-vOQ">
4141
<rect key="frame" x="0.0" y="-15" width="240" height="15"/>
@@ -124,7 +124,7 @@
124124
</constraints>
125125
<userDefinedRuntimeAttributes>
126126
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
127-
<integer key="value" value="15"/>
127+
<integer key="value" value="12"/>
128128
</userDefinedRuntimeAttribute>
129129
</userDefinedRuntimeAttributes>
130130
</view>
@@ -180,7 +180,7 @@
180180
</constraints>
181181
</stackView>
182182
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NQq-dg-iQ9">
183-
<rect key="frame" x="293" y="32" width="35" height="28"/>
183+
<rect key="frame" x="293" y="35" width="35" height="28"/>
184184
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="13"/>
185185
<state key="normal" title="Reply"/>
186186
<connections>
@@ -193,7 +193,7 @@
193193
<constraint firstItem="HpJ-Zw-5Ia" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="5" id="TL6-cF-IeY"/>
194194
<constraint firstItem="HpJ-Zw-5Ia" firstAttribute="bottom" secondItem="alw-MY-xmy" secondAttribute="bottom" id="hYX-t7-d5H"/>
195195
<constraint firstAttribute="trailing" secondItem="xr8-WX-XFr" secondAttribute="trailing" id="pl7-Cm-BZb"/>
196-
<constraint firstItem="xr8-WX-XFr" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="qtH-Dd-swF"/>
196+
<constraint firstItem="xr8-WX-XFr" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="3" id="qtH-Dd-swF"/>
197197
<constraint firstItem="NQq-dg-iQ9" firstAttribute="bottom" secondItem="alw-MY-xmy" secondAttribute="bottom" id="t5c-lW-Cy4"/>
198198
<constraint firstAttribute="bottom" secondItem="xr8-WX-XFr" secondAttribute="bottom" constant="3" id="tnM-8o-fsC"/>
199199
<constraint firstItem="NQq-dg-iQ9" firstAttribute="leading" secondItem="alw-MY-xmy" secondAttribute="trailing" constant="5" id="vkb-Qc-wRP"/>

‎CometChatObjc/CometChatObjc/Library/UI Components/Messages/Message Bubbles/Audio Message/CometChatSenderAudioMessageBubble.xib‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
33
<device id="retina6_1" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
77
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
88
<capability name="System colors in document resources" minToolsVersion="11.0"/>
99
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -19,7 +19,7 @@
1919
<autoresizingMask key="autoresizingMask"/>
2020
<subviews>
2121
<stackView opaque="NO" contentMode="right" axis="vertical" distribution="fillProportionally" alignment="bottom" spacing="3" translatesAutoresizingMaskIntoConstraints="NO" id="MYd-dn-X0o">
22-
<rect key="frame" x="0.0" y="0.0" width="486" height="123"/>
22+
<rect key="frame" x="0.0" y="3" width="486" height="123"/>
2323
<subviews>
2424
<view contentMode="right" semanticContentAttribute="forceLeftToRight" translatesAutoresizingMaskIntoConstraints="NO" id="7jV-5h-COK">
2525
<rect key="frame" x="236" y="0.0" width="250" height="55"/>
@@ -95,7 +95,7 @@
9595
</constraints>
9696
<userDefinedRuntimeAttributes>
9797
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
98-
<integer key="value" value="15"/>
98+
<integer key="value" value="12"/>
9999
</userDefinedRuntimeAttribute>
100100
</userDefinedRuntimeAttributes>
101101
</view>
@@ -159,7 +159,7 @@
159159
</constraints>
160160
</stackView>
161161
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HfB-Yq-i5c">
162-
<rect key="frame" x="196" y="27" width="35" height="28"/>
162+
<rect key="frame" x="196" y="30" width="35" height="28"/>
163163
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="13"/>
164164
<state key="normal" title="Reply"/>
165165
<connections>
@@ -171,7 +171,7 @@
171171
<constraint firstAttribute="trailing" secondItem="MYd-dn-X0o" secondAttribute="trailing" constant="15" id="57V-xk-Za1"/>
172172
<constraint firstItem="HfB-Yq-i5c" firstAttribute="bottom" secondItem="7jV-5h-COK" secondAttribute="bottom" id="6jN-av-qjq"/>
173173
<constraint firstAttribute="bottom" secondItem="MYd-dn-X0o" secondAttribute="bottom" constant="3" id="OZu-Q7-tsF"/>
174-
<constraint firstItem="MYd-dn-X0o" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="Ow4-RN-eJE"/>
174+
<constraint firstItem="MYd-dn-X0o" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="3" id="Ow4-RN-eJE"/>
175175
<constraint firstItem="MYd-dn-X0o" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="Pyo-le-9FM"/>
176176
<constraint firstItem="7jV-5h-COK" firstAttribute="leading" secondItem="HfB-Yq-i5c" secondAttribute="trailing" constant="5" id="Rcb-Qg-87h"/>
177177
<constraint firstItem="MYd-dn-X0o" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="Xi7-ui-BbS"/>

0 commit comments

Comments
 (0)