Merge pull request #16 from cometchat-pro/v2

V2
cometchat · Jun 11, 2021 · 8d69fcd · 8d69fcd
2 parents f940366 + 0b678bb
commit 8d69fcd
Show file tree

Hide file tree

Showing 70 changed files with 3,110 additions and 764 deletions.
diff --git a/README.md b/README.md
@@ -60,7 +60,7 @@ To install React-Native UI Kit, you need to first register on CometChat Dashboar
 ### ii. Add the CometChat Dependency
 
 ```javascript
- npm install @cometchat-pro/react-native-chat@2.3.3 --save
+ npm install @cometchat-pro/react-native-chat@2.3.4 --save
 ```
 
 ### iii. Other required DEPENDENCIES
@@ -90,7 +90,7 @@ These packages help make the ui-kit smooth and functioning
 [emoji-mart-native](https://www.npmjs.com/package/emoji-mart-native)</br>
 [react-native-keep-awake](https://www.npmjs.com/package/react-native-keep-awake)</br>
 [react-native-webview](https://www.npmjs.com/package/react-native-webview)</br>
-
+[react-native-swipe-list-view](https://www.npmjs.com/package/react-native-swipe-list-view)</br>
 
 <br/>
 

diff --git a/package.json b/package.json
@@ -1,8 +1,6 @@
 {
   "name": "cometchat-pro-react-native-ui-kit",
-
-  "version": "2.3.3-1",
-
+  "version": "2.3.4-1",
   "description": "Chat UI Kit for React Native App",
   "main": "./src/index.js",
   "scripts": {
@@ -31,7 +29,8 @@
     "@react-navigation/bottom-tabs": "^5.11.2",
     "@react-navigation/native": "^5.8.10",
     "@react-navigation/stack": "^5.12.8",
-    "react-native-video-controls": "^2.7.1"
+    "react-native-video-controls": "^2.7.1",
+    "react-native-swipe-list-view": "^3.2.8"
   },
   "author": "Inscripts",
   "license": "ISC",
@@ -52,7 +51,7 @@
   },
   "dependencies": {
     "@cometchat-pro/react-native-calls": "2.0.3-beta1",
-    "@cometchat-pro/react-native-chat": "2.3.3",
+    "@cometchat-pro/react-native-chat": "2.3.4",
     "@react-native-async-storage/async-storage": "^1.13.4",
     "lodash": "^4.17.20",
     "react-native-autolink": "^3.0.0",

diff --git a/src/components/.DS_Store b/src/components/.DS_Store
diff --git a/src/components/Calls/CometChatIncomingCall/index.js b/src/components/Calls/CometChatIncomingCall/index.js
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useContext } from 'react';
 import {
   View,
   TouchableOpacity,
@@ -14,7 +14,7 @@ import { CometChatManager } from '../../../utils/controller';
 import * as enums from '../../../utils/enums';
 import * as actions from '../../../utils/actions';
 import theme from '../../../resources/theme';
-import { CometChatAvatar } from '../../Shared';
+import CometChatAvatar from '../../Shared/CometChatAvatar';
 
 import { CallAlertManager } from './controller';
 
@@ -25,19 +25,31 @@ import videoCallIcon from './resources/incomingvideocall.png';
 import { incomingCallAlert } from '../../../resources/audio';
 import { logger } from '../../../utils/common';
 import DropDownAlert from '../../Shared/DropDownAlert';
+import { CometChatContext } from '../../../utils/CometChatContext';
 
 export default (props) => {
   let callAlertManager = null;
   const viewTheme = { ...theme, ...props.theme };
   const incomingAlert = new Sound(incomingCallAlert);
 
   const [incomingCall, setIncomingCall] = useState(null);
-
+  const [isMessagesSoundEnabled, setIsMessagesSoundEnabled] = useState(null);
+  const context = useContext(CometChatContext);
+  useEffect(() => {
+    checkRestrictions();
+  }, []);
+  const checkRestrictions = async () => {
+    let isEnabled = await context.FeatureRestriction.isCallsSoundEnabled();
+    setIsMessagesSoundEnabled(isEnabled);
+  };
   /**
    * Play call alerts
    * @param
    */
   const playIncomingAlert = () => {
+    if (!isMessagesSoundEnabled) {
+      return false;
+    }
     try {
       incomingAlert.setCurrentTime(0);
       incomingAlert.setNumberOfLoops(-1);

diff --git a/src/components/Calls/CometChatIncomingDirectCall/index.js b/src/components/Calls/CometChatIncomingDirectCall/index.js
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useContext } from 'react';
 import {
   View,
   TouchableOpacity,
@@ -14,7 +14,7 @@ import { CometChatManager } from '../../../utils/controller';
 import * as enums from '../../../utils/enums';
 import * as actions from '../../../utils/actions';
 import theme from '../../../resources/theme';
-import { CometChatAvatar } from '../../Shared';
+import CometChatAvatar from '../../Shared/CometChatAvatar';
 
 import { messageAlertManager } from './controller';
 
@@ -24,18 +24,30 @@ import audioCallIcon from './resources/incomingaudiocall.png';
 import videoCallIcon from './resources/incomingvideocall.png';
 import { incomingCallAlert } from '../../../resources/audio';
 import { logger } from '../../../utils/common';
+import { CometChatContext } from '../../../utils/CometChatContext';
 export default (props) => {
   let callAlertManager = null;
   const viewTheme = { ...theme, ...props.theme };
   const incomingAlert = new Sound(incomingCallAlert);
 
+  const [isMessagesSoundEnabled, setIsMessagesSoundEnabled] = useState(null);
   const [incomingCall, setIncomingCall] = useState(null);
-
+  const context = useContext(CometChatContext);
+  useEffect(() => {
+    checkRestrictions();
+  }, []);
+  const checkRestrictions = async () => {
+    let isEnabled = await context.FeatureRestriction.isCallsSoundEnabled();
+    setIsMessagesSoundEnabled(isEnabled);
+  };
   /**
    * Play call alerts
    * @param
    */
   const playIncomingAlert = () => {
+    if (!isMessagesSoundEnabled) {
+      return false;
+    }
     try {
       incomingAlert.setCurrentTime(0);
       incomingAlert.setNumberOfLoops(-1);
@@ -217,29 +229,15 @@ export default (props) => {
                 <Text numberOfLines={1} style={style.nameStyle}>
                   {incomingCall.sender.name}
                 </Text>
-                {incomingCall.type === 'video' ? (
-                  <View style={style.callTypeStyle}>
-                    <Image source={videoCallIcon} alt="Incoming video call" />
-                    <View style={style.callMessageContainerStyle}>
-                      <Text
-                        numberOfLines={1}
-                        style={style.callMessageTextStyle}>
-                        Incoming video call
-                      </Text>
-                    </View>
-                  </View>
-                ) : (
-                  <View style={style.callTypeStyle}>
-                    <Image source={audioCallIcon} alt="Incoming audio call" />
-                    <View style={style.callMessageContainerStyle}>
-                      <Text
-                        numberOfLines={1}
-                        style={style.callMessageTextStyle}>
-                        Incoming audio call
-                      </Text>
-                    </View>
+
+                <View style={style.callTypeStyle}>
+                  <Image source={videoCallIcon} alt="Incoming video call" />
+                  <View style={style.callMessageContainerStyle}>
+                    <Text numberOfLines={1} style={style.callMessageTextStyle}>
+                      Incoming video call
+                    </Text>
                   </View>
-                )}
+                </View>
               </View>
               <View style={style.avatarStyle}>
                 <CometChatAvatar

diff --git a/src/components/Calls/CometChatOutgoingCall/index.js b/src/components/Calls/CometChatOutgoingCall/index.js
@@ -9,7 +9,7 @@ import { outgoingCallAlert } from '../../../resources/audio';
 import { CometChatManager } from '../../../utils/controller';
 import { CallScreenManager } from './controller';
 
-import { CometChatAvatar } from '../../Shared';
+import CometChatAvatar from '../../Shared/CometChatAvatar';
 
 import * as enums from '../../../utils/enums';
 import * as actions from '../../../utils/actions';
@@ -257,7 +257,6 @@ class CometChatOutgoingCall extends React.PureComponent {
             callInProgress: null,
             callSettings: null,
           });
-
           this.markMessageAsRead(endedCall);
           this.props.actionGenerated(actions.CALL_ENDED, endedCall);
         },

diff --git a/src/components/Calls/CometChatOutgoingDirectCall/index.js b/src/components/Calls/CometChatOutgoingDirectCall/index.js
@@ -76,7 +76,7 @@ class CometChatOutgoingDirectCall extends React.Component {
 
         const newMessageObj = { ...customMessage, error: error };
         this.props.actionGenerated(
-          enums.ACTIONS['ERROR_IN_SENDING_MESSAGE'],
+          actions['ERROR_IN_SENDING_MESSAGE'],
           newMessageObj,
         );
       });
@@ -88,12 +88,7 @@ class CometChatOutgoingDirectCall extends React.Component {
     let defaultLayout = true;
     let callListener = new CometChat.OngoingCallListener({
       onCallEnded: (call) => {
-        this.props.actionGenerated(actions.DIRECT_CALL_ENDED, call);
-        this.setState({
-          outgoingCallScreen: false,
-          callInProgress: null,
-          callSettings: null,
-        });
+        this.props.close();
       },
       onError: (error) => {
         console.log('Call Error: ', error);

diff --git a/src/components/Chats/CometChatConversationList/controller.js b/src/components/Chats/CometChatConversationList/controller.js
@@ -1,7 +1,7 @@
 import { CometChat } from '@cometchat-pro/react-native-chat';
 
 import * as enums from '../../../utils/enums';
-
+import { UIKitSettings } from '../../../utils/UIKitSettings';
 export class ConversationListManager {
   conversationRequest = null;
 
@@ -14,9 +14,28 @@ export class ConversationListManager {
   callListenerId = `chatlist_call_${new Date().getTime()}`;
 
   constructor() {
-    this.conversationRequest = new CometChat.ConversationsRequestBuilder()
-      .setLimit(30)
-      .build();
+    let UIKitSettingsBuilder = new UIKitSettings();
+    const chatListMode = UIKitSettingsBuilder.chatListMode;
+    const chatListFilterOptions = UIKitSettings.chatListFilterOptions;
+    switch (chatListMode) {
+      case chatListFilterOptions['USERS']:
+        this.conversationRequest = new CometChat.ConversationsRequestBuilder()
+          .setConversationType(CometChat.ACTION_TYPE.TYPE_USER)
+          .setLimit(30)
+          .build();
+        break;
+      case chatListFilterOptions['GROUPS']:
+        this.conversationRequest = new CometChat.ConversationsRequestBuilder()
+          .setConversationType(CometChat.ACTION_TYPE.TYPE_GROUP)
+          .setLimit(30)
+          .build();
+        break;
+      default:
+        this.conversationRequest = new CometChat.ConversationsRequestBuilder()
+          .setLimit(30)
+          .build();
+        break;
+    }
   }
 
   fetchNextConversation() {