Skip to content

Commit 7bfab99

Browse files
pushpsenairekar2911pushpsenairekar2911
authored
Merge pull request #9 from cometchat-pro/v2
v2.3.7-2
2 parents e798528 + 4a3405c commit 7bfab99

File tree

313 files changed

+5517
-3454
lines changed

Some content is hidden

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

313 files changed

+5517
-3454
lines changed

‎.DS_Store‎

0 Bytes
Binary file not shown.

‎CONTRIBUTING.md‎

Lines changed: 0 additions & 1 deletion

‎CometChatObjc/CometChatObjc.xcodeproj/project.pbxproj‎

Lines changed: 3655 additions & 2627 deletions
Large diffs are not rendered by default.

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

-17 Bytes
Binary file not shown.

‎CometChatObjc/CometChatObjc/Library/UI Components/Calls/Call Logs/CometChatCallDetail.swift‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,28 @@ class CometChatCallDetails: UIViewController {
9292
fetchCalls(forEntity: group)
9393
}
9494

95+
private func addBackButton(bool: Bool) {
96+
let backButton = UIButton(type: .custom)
97+
if #available(iOS 13.0, *) {
98+
let edit = UIImage(named: "calls-back.png", in: UIKitSettings.bundle, compatibleWith: nil)?.withRenderingMode(.alwaysTemplate)
99+
backButton.setImage(edit, for: .normal)
100+
backButton.tintColor = UIKitSettings.primaryColor
101+
} else {}
102+
backButton.tintColor = UIKitSettings.primaryColor
103+
backButton.setTitleColor(backButton.tintColor, for: .normal) // You can change the TitleColor
104+
backButton.addTarget(self, action: #selector(self.didBackButtonPressed), for: .touchUpInside)
105+
self.navigationItem.leftBarButtonItem = nil
106+
if bool == true {
107+
self.navigationItem.leftBarButtonItem = UIBarButtonItem(customView: backButton)
108+
}else{
109+
self.navigationItem.leftBarButtonItem = UIBarButtonItem(customView: backButton)
110+
}
111+
}
112+
113+
@objc func didBackButtonPressed() {
114+
self.navigationController?.popViewController(animated: true)
115+
}
116+
95117
/**
96118
This method fetch call messages for entity.
97119
- Parameter group: This specifies `AppEntity` Object.
@@ -255,6 +277,7 @@ class CometChatCallDetails: UIViewController {
255277
self.navigationController?.navigationBar.isTranslucent = true
256278
}
257279
self.navigationController?.navigationBar.tintColor = UIKitSettings.primaryColor
280+
self.addBackButton(bool: true)
258281
}
259282
}
260283
}

‎CometChatObjc/CometChatObjc/Library/UI Components/Calls/Call Logs/CometChatCallsList.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ public class CometChatCallsList: UIViewController {
320320
private func addNewCallButton(bool: Bool){
321321
if bool == true {
322322
var newCall = UIBarButtonItem()
323-
newCall = UIBarButtonItem(image: UIImage(named: "newCall", in: UIKitSettings.bundle, compatibleWith: nil), style: .done, target: self, action: #selector(didNewCallPressed))
323+
newCall = UIBarButtonItem(image: UIImage(named: "new-call", in: UIKitSettings.bundle, compatibleWith: nil), style: .done, target: self, action: #selector(didNewCallPressed))
324324
newCall.tintColor = UIKitSettings.primaryColor
325325
self.navigationItem.rightBarButtonItem = newCall
326326
}

‎CometChatObjc/CometChatObjc/Library/UI Components/Calls/CometChatCallDetailsLogItem/CometChatCallDetailsLogItem.swift‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,46 +32,46 @@ class CometChatCallDetailsLogItem: UITableViewCell {
3232
switch call.callStatus {
3333
case .initiated where call.callType == .audio && (call.callInitiator as? User)?.uid == LoggedInUser.uid:
3434
self.callStatus.text = "OUTGOING_AUDIO_CALL".localized()
35-
self.callStatusIcon.image = UIImage(named: "outgoingAudio", in: UIKitSettings.bundle, compatibleWith: nil)
35+
self.callStatusIcon.image = UIImage(named: "outgoing-audio-call", in: UIKitSettings.bundle, compatibleWith: nil)
3636

3737
case .initiated where call.callType == .audio && (call.callInitiator as? User)?.uid != LoggedInUser.uid:
3838

3939
self.callStatus.text = "INCOMING_AUDIO_CALL".localized()
40-
self.callStatusIcon.image = UIImage(named: "incomingAudio", in: UIKitSettings.bundle, compatibleWith: nil)
40+
self.callStatusIcon.image = UIImage(named: "incoming-audio-call", in: UIKitSettings.bundle, compatibleWith: nil)
4141

4242

4343
case .initiated where call.callType == .video && (call.callInitiator as? User)?.uid != LoggedInUser.uid:
4444

4545
self.callStatus.text = "INCOMING_VIDEO_CALL".localized()
46-
self.callStatusIcon.image = UIImage(named: "incomingVideo", in: UIKitSettings.bundle, compatibleWith: nil)
46+
self.callStatusIcon.image = UIImage(named: "incoming-video-call", in: UIKitSettings.bundle, compatibleWith: nil)
4747

4848

4949
case .initiated where call.callType == .video && (call.callInitiator as? User)?.uid == LoggedInUser.uid:
5050

5151
// This case satisfies the condition where loggedIn user sends audio call in a group.
5252
self.callStatus.text = "OUTGOING_VIDEO_CALL".localized()
53-
self.callStatusIcon.image = UIImage(named: "outgoingVideo", in: UIKitSettings.bundle, compatibleWith: nil)
53+
self.callStatusIcon.image = UIImage(named: "outgoing-video-call", in: UIKitSettings.bundle, compatibleWith: nil)
5454

5555

5656
case .unanswered where call.callType == .audio && (call.callInitiator as? User)?.uid == LoggedInUser.uid:
5757

5858
self.callStatus.text = "UNANSWERED_AUDIO_CALL".localized()
59-
self.callStatusIcon.image = UIImage(named: "missedAudio", in: UIKitSettings.bundle, compatibleWith: nil)
59+
self.callStatusIcon.image = UIImage(named: "end-call", in: UIKitSettings.bundle, compatibleWith: nil)
6060

6161
case .unanswered where call.callType == .audio && (call.callInitiator as? User)?.uid != LoggedInUser.uid:
6262

6363
self.callStatus.text = "MISSED_CALL".localized()
64-
self.callStatusIcon.image = UIImage(named: "missedAudio", in: UIKitSettings.bundle, compatibleWith: nil)
64+
self.callStatusIcon.image = UIImage(named: "end-call", in: UIKitSettings.bundle, compatibleWith: nil)
6565

6666
case .unanswered where call.callType == .video && (call.callInitiator as? User)?.uid == LoggedInUser.uid:
6767

6868
self.callStatus.text = "UNANSWERED_VIDEO_CALL".localized()
69-
self.callStatusIcon.image = UIImage(named: "missedVideo", in: UIKitSettings.bundle, compatibleWith: nil)
69+
self.callStatusIcon.image = UIImage(named: "end-call", in: UIKitSettings.bundle, compatibleWith: nil)
7070

7171
case .unanswered where call.callType == .video && (call.callInitiator as? User)?.uid != LoggedInUser.uid:
7272

7373
self.callStatus.text = "MISSED_CALL".localized()
74-
self.callStatusIcon.image = UIImage(named: "missedVideo", in: UIKitSettings.bundle, compatibleWith: nil)
74+
self.callStatusIcon.image = UIImage(named: "end-call", in: UIKitSettings.bundle, compatibleWith: nil)
7575
case .rejected: break
7676
case .busy: break
7777
case .cancelled: break

‎CometChatObjc/CometChatObjc/Library/UI Components/Calls/CometChatCallListItem/CometChatCallListItem.swift‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class CometChatCallListItem: UITableViewCell {
4141

4242
}
4343
callStatus.text = "OUTGOING_AUDIO_CALL".localized()
44-
callStatusIcon.image = UIImage(named: "outgoingAudio", in: UIKitSettings.bundle, compatibleWith: nil)
44+
callStatusIcon.image = UIImage(named: "outgoing-audio-call", in: UIKitSettings.bundle, compatibleWith: nil)
4545
if #available(iOS 13.0, *) {
4646
name.textColor = .label
4747
} else {
@@ -57,7 +57,7 @@ class CometChatCallListItem: UITableViewCell {
5757
avatar.set(image: user.avatar ?? "", with: user.name ?? "")
5858
}
5959
callStatus.text = "INCOMING_AUDIO_CALL".localized()
60-
callStatusIcon.image = UIImage(named: "incomingAudio", in: UIKitSettings.bundle, compatibleWith: nil)
60+
callStatusIcon.image = UIImage(named: "incoming-audio-call", in: UIKitSettings.bundle, compatibleWith: nil)
6161
if #available(iOS 13.0, *) {
6262
name.textColor = .label
6363
} else {
@@ -73,7 +73,7 @@ class CometChatCallListItem: UITableViewCell {
7373
avatar.set(image: group.icon ?? "", with: group.name ?? "")
7474
}
7575
callStatus.text = "INCOMING_AUDIO_CALL".localized()
76-
callStatusIcon.image = UIImage(named: "incomingAudio", in: UIKitSettings.bundle, compatibleWith: nil)
76+
callStatusIcon.image = UIImage(named: "incoming-audio-call", in: UIKitSettings.bundle, compatibleWith: nil)
7777
if #available(iOS 13.0, *) {
7878
name.textColor = .label
7979
} else {
@@ -89,7 +89,7 @@ class CometChatCallListItem: UITableViewCell {
8989
avatar.set(image: group.icon ?? "", with: group.name ?? "")
9090
}
9191
callStatus.text = "OUTGOING_AUDIO_CALL".localized()
92-
callStatusIcon.image = UIImage(named: "outgoingAudio", in: UIKitSettings.bundle, compatibleWith: nil)
92+
callStatusIcon.image = UIImage(named: "outgoing-audio-call", in: UIKitSettings.bundle, compatibleWith: nil)
9393
if #available(iOS 13.0, *) {
9494
name.textColor = .label
9595
} else {
@@ -105,7 +105,7 @@ class CometChatCallListItem: UITableViewCell {
105105

106106
}
107107
callStatus.text = "OUTGOING_VIDEO_CALL".localized()
108-
callStatusIcon.image = UIImage(named: "outgoingVideo", in: UIKitSettings.bundle, compatibleWith: nil)
108+
callStatusIcon.image = UIImage(named: "outgoing-video-call", in: UIKitSettings.bundle, compatibleWith: nil)
109109
if #available(iOS 13.0, *) {
110110
name.textColor = .label
111111
} else {
@@ -120,7 +120,7 @@ class CometChatCallListItem: UITableViewCell {
120120

121121
}
122122
callStatus.text = "INCOMING_VIDEO_CALL".localized()
123-
callStatusIcon.image = UIImage(named: "incomingVideo", in: UIKitSettings.bundle, compatibleWith: nil)
123+
callStatusIcon.image = UIImage(named: "incoming-video-call", in: UIKitSettings.bundle, compatibleWith: nil)
124124
if #available(iOS 13.0, *) {
125125
name.textColor = .label
126126
} else {
@@ -134,7 +134,7 @@ class CometChatCallListItem: UITableViewCell {
134134
avatar.set(image: group.icon ?? "", with: group.name ?? "")
135135
}
136136
callStatus.text = "OUTGOING_VIDEO_CALL".localized()
137-
callStatusIcon.image = UIImage(named: "outgoingVideo", in: UIKitSettings.bundle, compatibleWith: nil)
137+
callStatusIcon.image = UIImage(named: "outgoing-video-call", in: UIKitSettings.bundle, compatibleWith: nil)
138138
if #available(iOS 13.0, *) {
139139
name.textColor = .label
140140
} else {
@@ -148,7 +148,7 @@ class CometChatCallListItem: UITableViewCell {
148148
avatar.set(image: group.icon ?? "", with: group.name ?? "")
149149
}
150150
callStatus.text = "INCOMING_VIDEO_CALL".localized()
151-
callStatusIcon.image = UIImage(named: "incomingVideo", in: UIKitSettings.bundle, compatibleWith: nil)
151+
callStatusIcon.image = UIImage(named: "incoming-video-call", in: UIKitSettings.bundle, compatibleWith: nil)
152152
if #available(iOS 13.0, *) {
153153
name.textColor = .label
154154
} else {
@@ -162,7 +162,7 @@ class CometChatCallListItem: UITableViewCell {
162162
avatar.set(image: user.avatar ?? "", with: user.name ?? "")
163163
}
164164
callStatus.text = "UNANSWERED_AUDIO_CALL".localized()
165-
callStatusIcon.image = UIImage(named: "missedAudio", in: UIKitSettings.bundle, compatibleWith: nil)
165+
callStatusIcon.image = UIImage(named: "end-call", in: UIKitSettings.bundle, compatibleWith: nil)
166166
if #available(iOS 13.0, *) {
167167
name.textColor = .systemRed
168168
} else {
@@ -177,7 +177,7 @@ class CometChatCallListItem: UITableViewCell {
177177

178178
}
179179
callStatus.text = "MISSED_CALL".localized()
180-
callStatusIcon.image = UIImage(named: "missedAudio", in: UIKitSettings.bundle, compatibleWith: nil)
180+
callStatusIcon.image = UIImage(named: "end-call", in: UIKitSettings.bundle, compatibleWith: nil)
181181
if #available(iOS 13.0, *) {
182182
name.textColor = .systemRed
183183
} else {
@@ -191,7 +191,7 @@ class CometChatCallListItem: UITableViewCell {
191191
avatar.set(image: group.icon ?? "", with: group.name ?? "")
192192
}
193193
callStatus.text = "UNANSWERED_AUDIO_CALL".localized()
194-
callStatusIcon.image = UIImage(named: "missedAudio", in: UIKitSettings.bundle, compatibleWith: nil)
194+
callStatusIcon.image = UIImage(named: "end-call", in: UIKitSettings.bundle, compatibleWith: nil)
195195
if #available(iOS 13.0, *) {
196196
name.textColor = .systemRed
197197
} else {
@@ -205,7 +205,7 @@ class CometChatCallListItem: UITableViewCell {
205205
avatar.set(image: group.icon ?? "", with: group.name ?? "")
206206
}
207207
callStatus.text = "MISSED_CALL".localized()
208-
callStatusIcon.image = UIImage(named: "missedAudio", in: UIKitSettings.bundle, compatibleWith: nil)
208+
callStatusIcon.image = UIImage(named: "end-call", in: UIKitSettings.bundle, compatibleWith: nil)
209209
if #available(iOS 13.0, *) {
210210
name.textColor = .systemRed
211211
} else {
@@ -219,7 +219,7 @@ class CometChatCallListItem: UITableViewCell {
219219
avatar.set(image: user.avatar ?? "", with: user.name ?? "")
220220
}
221221
callStatus.text = "UNANSWERED_VIDEO_CALL".localized()
222-
callStatusIcon.image = UIImage(named: "missedVideo", in: UIKitSettings.bundle, compatibleWith: nil)
222+
callStatusIcon.image = UIImage(named: "end-call", in: UIKitSettings.bundle, compatibleWith: nil)
223223
if #available(iOS 13.0, *) {
224224
name.textColor = .systemRed
225225
} else {
@@ -234,7 +234,7 @@ class CometChatCallListItem: UITableViewCell {
234234

235235
}
236236
callStatus.text = "MISSED_CALL".localized()
237-
callStatusIcon.image = UIImage(named: "missedVideo", in: UIKitSettings.bundle, compatibleWith: nil)
237+
callStatusIcon.image = UIImage(named: "end-call", in: UIKitSettings.bundle, compatibleWith: nil)
238238
if #available(iOS 13.0, *) {
239239
name.textColor = .systemRed
240240
} else {
@@ -248,7 +248,7 @@ class CometChatCallListItem: UITableViewCell {
248248
avatar.set(image: group.icon ?? "", with: group.name ?? "")
249249
}
250250
callStatus.text = "UNANSWERED_VIDEO_CALL".localized()
251-
callStatusIcon.image = UIImage(named: "missedVideo", in: UIKitSettings.bundle, compatibleWith: nil)
251+
callStatusIcon.image = UIImage(named: "end-call", in: UIKitSettings.bundle, compatibleWith: nil)
252252
if #available(iOS 13.0, *) {
253253
name.textColor = .systemRed
254254
} else {
@@ -262,7 +262,7 @@ class CometChatCallListItem: UITableViewCell {
262262
avatar.set(image: group.icon ?? "", with: group.name ?? "")
263263
}
264264
callStatus.text = "MISSED_CALL".localized()
265-
callStatusIcon.image = UIImage(named: "missedVideo", in: UIKitSettings.bundle, compatibleWith: nil)
265+
callStatusIcon.image = UIImage(named: "end-call", in: UIKitSettings.bundle, compatibleWith: nil)
266266
if #available(iOS 13.0, *) {
267267
name.textColor = .systemRed
268268
} else {

‎CometChatObjc/CometChatObjc/Library/UI Components/Calls/CometChatCallListItem/CometChatCallListItem.xib‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
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"/>
1010
</dependencies>
1111
<objects>
1212
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
1313
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
14-
<tableViewCell contentMode="scaleToFill" restorationIdentifier="CometChatCallListItem" selectionStyle="default" accessoryType="detailButton" indentationWidth="10" reuseIdentifier="CometChatCallListItem" rowHeight="107" id="KGk-i7-Jjw" customClass="CometChatCallListItem" customModule="CometChat_KitchenSink" customModuleProvider="target">
14+
<tableViewCell contentMode="scaleToFill" restorationIdentifier="CometChatCallListItem" selectionStyle="none" accessoryType="detailButton" indentationWidth="10" reuseIdentifier="CometChatCallListItem" editingAccessoryType="disclosureIndicator" rowHeight="107" id="KGk-i7-Jjw" customClass="CometChatCallListItem" customModule="CometChat_KitchenSink" customModuleProvider="target">
1515
<rect key="frame" x="0.0" y="0.0" width="393" height="107"/>
1616
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
1717
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
18-
<rect key="frame" x="0.0" y="0.0" width="349" height="107"/>
18+
<rect key="frame" x="0.0" y="0.0" width="352.5" height="107"/>
1919
<autoresizingMask key="autoresizingMask"/>
2020
<subviews>
2121
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="defaultAvatar.jpg" translatesAutoresizingMaskIntoConstraints="NO" id="Rbg-8J-TD7" customClass="CometChatAvatar" customModule="CometChat_KitchenSink" customModuleProvider="target">

‎CometChatObjc/CometChatObjc/Library/UI Components/Calls/Resources/calls-audio-call@2x.png‎

1 KB

0 commit comments

Comments
 (0)