Merge pull request #131 from voximplant/update_ui

Fix ui issues with shadow user, update foreground service version
voximplant · Jun 10, 2022 · f7b22a6 · f7b22a6
2 parents dda7b8b + a30812e
commit f7b22a6
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 27 deletions.
diff --git a/ConferenceDemo/package.json b/ConferenceDemo/package.json
@@ -13,7 +13,7 @@
     "@react-native-async-storage/async-storage": "1.15.17",
     "@react-navigation/native": "6.0.8",
     "@react-navigation/native-stack": "6.4.1",
-    "@voximplant/react-native-foreground-service": "3.0.1",
+    "@voximplant/react-native-foreground-service": "3.0.2",
     "react": "17.0.2",
     "react-native": "0.67.2",
     "react-native-gesture-handler": "2.2.0",
@@ -22,7 +22,7 @@
     "react-native-screens": "3.10.2",
     "react-native-svg": "12.1.1",
     "react-native-svg-transformer": "1.0.0",
-    "react-native-voximplant": "1.29.1",
+    "react-native-voximplant": "1.32.1",
     "react-redux": "7.2.6",
     "redux": "4.1.2",
     "redux-thunk": "2.4.1"

diff --git a/ConferenceDemo/src/Core/Services/ConferenceService.ts b/ConferenceDemo/src/Core/Services/ConferenceService.ts
@@ -12,21 +12,20 @@ import {useUtils} from '../../Utils/useUtils';
 import {RootReducer} from '../Store';
 //@ts-ignore
 import ForegroundService from './ForegroundService';
+import {HardwareService} from './HardwareService';
 
 import {
   changeCallState,
   videoStreamAdded,
   videoStreamRemoved,
   endpointAdded,
   endpointRemoved,
-  setError,
   resetCallState,
   endpointVoiceActivityStarted,
   endpointVoiceActivityStopped,
   endpointMuted,
   manageParticipantStream,
 } from '../Store/conference/actions';
-import {HardwareService} from './HardwareService';
 
 export const ConferenceService = () => {
   const Client = Voximplant.getInstance();
@@ -162,16 +161,19 @@ export const ConferenceService = () => {
       dispatch(changeCallState('Connected'));
     });
     currentConference.current?.on(Voximplant.CallEvents.Disconnected, () => {
-      dispatch(changeCallState('Disconnected'));
       dispatch(resetCallState());
       afterConferenceAction();
       currentConference.current = null;
     });
     currentConference.current?.on(
       Voximplant.CallEvents.Failed,
       (callEvent: any) => {
-        dispatch(changeCallState('Failed'));
-        dispatch(setError(callEvent.reason));
+        dispatch(
+          resetCallState({
+            callState: 'Failed',
+            error: callEvent.reason,
+          }),
+        );
         afterConferenceAction();
       },
     );

diff --git a/ConferenceDemo/src/Core/Services/ForegroundService.ios.ts b/ConferenceDemo/src/Core/Services/ForegroundService.ios.ts
diff --git a/...ore/Services/ForegroundService.android.ts → ...mo/src/Core/Services/ForegroundService.ts b/...ore/Services/ForegroundService.android.ts → ...mo/src/Core/Services/ForegroundService.ts
diff --git a/ConferenceDemo/src/Core/Store/conference/actions.ts b/ConferenceDemo/src/Core/Store/conference/actions.ts
@@ -47,8 +47,9 @@ export const endpointRemoved = (payload: IParticipant): IReduxAction => ({
   payload,
 });
 
-export const resetCallState = (): IReduxAction => ({
+export const resetCallState = (payload?: object): IReduxAction => ({
   type: conferenceActions.RESET_CALL_STATE,
+  payload,
 });
 
 export const endpointVoiceActivityStarted = (

diff --git a/ConferenceDemo/src/Core/Store/conference/reducer.ts b/ConferenceDemo/src/Core/Store/conference/reducer.ts
@@ -75,7 +75,17 @@ const conferenceReducer = (
       return {...state, error: payload};
     }
     case conferenceActions.RESET_CALL_STATE: {
-      return {...state, participants: [], isMuted: false, isSendVideo: false};
+      return {
+        ...state,
+        participants: [],
+        isMuted: false,
+        isSendVideo: false,
+        callState: 'Disconnected',
+        selectedAudioDevice: null,
+        listAudioDevices: [],
+        error: '',
+        ...payload,
+      };
     }
     case conferenceActions.ENDPOINT_VOICE_ACTIVITY_STARTED: {
       return {

diff --git a/ConferenceDemo/src/Screens/Login/styles.ts b/ConferenceDemo/src/Screens/Login/styles.ts
@@ -21,6 +21,7 @@ export default StyleSheet.create({
     width: '58%',
     lineHeight: 24,
     fontSize: 20,
+    paddingVertical: 10,
   },
   passwordInput: {
     width: '100%',

diff --git a/VoximplantDemo/package.json b/VoximplantDemo/package.json
@@ -14,7 +14,7 @@
     "@react-native-community/masked-view": "0.1.11",
     "@react-navigation/native": "5.9.4",
     "@react-navigation/stack": "5.14.5",
-    "@voximplant/react-native-foreground-service": "3.0.1",
+    "@voximplant/react-native-foreground-service": "3.0.2",
     "react": "17.0.2",
     "react-native": "0.66.3",
     "react-native-callkeep": "4.2.0",