agora-appbuilder-core 1.0.7 → 2.0.0

package/template/src/components/Precall.native.tsx

@@ -46,24 +46,29 @@ const Precall = (props: any) => {
       <View style={style.heading}>
         <Text style={style.headingText}>Precall </Text>
       </View>
-      <View style={{zIndex: 50, position: 'absolute', width: '100%', left: '18%', top: 10, alignSelf: 'center'}}>
+      <View
+        style={{
+          zIndex: 50,
+          position: 'absolute',
+          width: '100%',
+          left: '18%',
+          top: 10,
+          alignSelf: 'center',
+        }}>
         {error ? <Error error={error} showBack={true} /> : <></>}
       </View>
       <View style={style.full}>
         <MaxVideoView user={maxUsers[0]} key={maxUsers[0].uid} />
       </View>
       {Platform.OS === 'ios' ? (
-        <View 
-          style={style.textInputHolder}>
+        <View style={style.textInputHolder}>
           <TextInput
             value={username}
             onChangeText={(text) => {
-              if (username !== 'Getting name...') {
-                setUsername(text);
-              }
+              setUsername(text);
             }}
             onSubmitEditing={() => {}}
-            placeholder="Display Name"
+            placeholder={queryComplete ? 'Display name*' : 'Getting name...'}
           />
         </View>
       ) : (
@@ -71,12 +76,11 @@ const Precall = (props: any) => {
           <TextInput
             value={username}
             onChangeText={(text) => {
-              if (username !== 'Getting name...') {
-                setUsername(text);
-              }
+              setUsername(text);
             }}
             onSubmitEditing={() => {}}
-            placeholder="Display Name"
+            placeholder={queryComplete ? 'Display name*' : 'Getting name...'}
+            editable={queryComplete}
           />
         </View>
       )}
@@ -95,10 +99,14 @@ const Precall = (props: any) => {
         // disabled={!queryComplete}
         style={{marginBottom: 50}}>
         {/* <Text style={style.buttonText}> */}
-          {/* {queryComplete ? 'Join Room' : 'Loading...'} */}
+        {/* {queryComplete ? 'Join Room' : 'Loading...'} */}
         {/* </Text> */}
-      {/* </TouchableOpacity> */}
-      <PrimaryButton text={"Join Room"} disabled={!queryComplete} onPress={() => setCallActive(true)} />
+        {/* </TouchableOpacity> */}
+        <PrimaryButton
+          text={'Join Room'}
+          disabled={!queryComplete || username.trim() === ''}
+          onPress={() => setCallActive(true)}
+        />
       </View>
       {/* </ImageBackground> */}
     </View>

package/template/src/components/Precall.tsx

@@ -10,13 +10,7 @@
 *********************************************
 */
 import React, {useState, useContext} from 'react';
-import {
-  View,
-  Text,
-  StyleSheet,
-  Dimensions,
-  Platform,
-} from 'react-native';
+import {View, Text, StyleSheet, Dimensions, Platform} from 'react-native';
 import TextInput from '../atoms/TextInput';
 import PrimaryButton from '../atoms/PrimaryButton';
 import {MaxUidConsumer} from '../../agora-rn-uikit/src/MaxUidContext';
@@ -25,6 +19,7 @@ import {LocalAudioMute, LocalVideoMute} from '../../agora-rn-uikit/Components';
 import LocalUserContext from '../../agora-rn-uikit/src/LocalUserContext';
 import SelectDevice from '../subComponents/SelectDevice';
 import Logo from '../subComponents/Logo';
+import hasBrandLogo from '../utils/hasBrandLogo';
 // import OpenInNativeButton from '../subComponents/OpenInNativeButton';
 import ColorContext from './ColorContext';
 // import {useHistory} from './Router';
@@ -39,6 +34,7 @@ const Precall = (props: any) => {
     Dimensions.get('window').height,
     Dimensions.get('window').width > Dimensions.get('window').height,
   ]);
+
   let onLayout = (e: any) => {
     setDim([e.nativeEvent.layout.width, e.nativeEvent.layout.height]);
   };
@@ -50,7 +46,7 @@ const Precall = (props: any) => {
     //   resizeMode={'cover'}>
     <View style={style.main} onLayout={onLayout}>
       <View style={style.nav}>
-        <Logo />
+        {hasBrandLogo && <Logo />}
         {error ? <Error error={error} showBack={true} /> : <></>}
         {/* <OpenInNativeButton /> */}
       </View>
@@ -94,17 +90,18 @@ const Precall = (props: any) => {
               <TextInput
                 value={username}
                 onChangeText={(text) => {
-                  if (username !== 'Getting name...') {
-                    setUsername(text);
-                  }
+                  setUsername(text);
                 }}
                 onSubmitEditing={() => {}}
-                placeholder="Display Name"
+                placeholder={
+                  queryComplete ? 'Display name*' : 'Getting name...'
+                }
+                editable={queryComplete}
               />
               <View style={style.margin5Btm} />
               <PrimaryButton
                 onPress={() => setCallActive(true)}
-                disabled={!queryComplete}
+                disabled={!queryComplete || username.trim() === ''}
                 text={queryComplete ? 'Join Room' : 'Loading...'}
               />
             </View>
@@ -140,7 +137,11 @@ const Precall = (props: any) => {
               </Text>
               {/* </View> */}
               <View style={{height: 20}} />
-              <View style={{flex: 1, maxWidth: Platform.OS === 'web'? '25vw' : 'auto'}}>
+              <View
+                style={{
+                  flex: 1,
+                  maxWidth: Platform.OS === 'web' ? '25vw' : 'auto',
+                }}>
                 <SelectDevice />
               </View>
               <View
@@ -154,17 +155,18 @@ const Precall = (props: any) => {
                 <TextInput
                   value={username}
                   onChangeText={(text) => {
-                    if (username !== 'Getting name...') {
-                      setUsername(text);
-                    }
+                    setUsername(text);
                   }}
                   onSubmitEditing={() => {}}
-                  placeholder="Display Name"
+                  placeholder={
+                    queryComplete ? 'Display name*' : 'Getting name...'
+                  }
+                  editable={queryComplete}
                 />
                 <View style={{height: 20}} />
                 <PrimaryButton
                   onPress={() => setCallActive(true)}
-                  disabled={!queryComplete}
+                  disabled={!queryComplete || username.trim() === ''}
                   text={queryComplete ? 'Join Room' : 'Loading...'}
                 />
               </View>

package/template/src/components/StorageContext.tsx

@@ -15,6 +15,7 @@ import useMount from './useMount';
 
 interface StoreInterface {
   token: null | string;
+  displayName: null | string;
 }
 
 interface StorageContextInterface {
@@ -24,6 +25,7 @@ interface StorageContextInterface {
 
 const initStoreValue: StoreInterface = {
   token: null,
+  displayName: '',
 };
 
 const initStorageContextValue = {

package/template/src/pages/Authenticate.tsx

@@ -20,6 +20,7 @@ import {
 import Logo from '../subComponents/Logo';
 import OAuth from '../components/OAuth';
 import Illustration from '../subComponents/Illustration';
+import hasBrandLogo from '../utils/hasBrandLogo';
 
 const Authenticate = () => {
   const [dim, setDim] = useState([
@@ -37,13 +38,13 @@ const Authenticate = () => {
       style={style.full}
       resizeMode={'cover'}>
       <View style={style.main}>
-        <View style={style.nav}>
-          <Logo />
-        </View>
+        <View style={style.nav}>{hasBrandLogo && <Logo />}</View>
         <View style={style.content}>
           <View style={style.leftContent}>
             <Text style={style.heading}>Login using OAuth</Text>
-            <Text style={style.headline}>Please select an OAuth provider to login.</Text>
+            <Text style={style.headline}>
+              Please select an OAuth provider to login.
+            </Text>
             <OAuth />
           </View>
           {dim[0] > dim[1] + 150 ? (

package/template/src/pages/Create.tsx

@@ -10,12 +10,7 @@
 *********************************************
 */
 import React, {useState} from 'react';
-import {
-  View,
-  Text,
-  StyleSheet,
-  Dimensions,
-} from 'react-native';
+import {View, Text, StyleSheet, Dimensions, ScrollView} from 'react-native';
 import {useHistory} from '../components/Router';
 import Checkbox from '../subComponents/Checkbox';
 import {gql, useMutation} from '@apollo/client';
@@ -31,6 +26,7 @@ import HorizontalRule from '../atoms/HorizontalRule';
 import TextInput from '../atoms/TextInput';
 import Error from '../subComponents/Error';
 import Toast from '../../react-native-toast-message';
+import hasBrandLogo from '../utils/hasBrandLogo';
 
 type PasswordInput = {
   host: string;
@@ -38,8 +34,16 @@ type PasswordInput = {
 };
 
 const CREATE_CHANNEL = gql`
-  mutation CreateChannel($title: String!, $backendURL: String!, $enablePSTN: Boolean) {
-    createChannel(title: $title, backendURL: $backendURL, enablePSTN: $enablePSTN) {
+  mutation CreateChannel(
+    $title: String!
+    $backendURL: String!
+    $enablePSTN: Boolean
+  ) {
+    createChannel(
+      title: $title
+      backendURL: $backendURL
+      enablePSTN: $enablePSTN
+    ) {
       passphrase {
         host
         view
@@ -111,9 +115,9 @@ const Create = () => {
     //   style={style.full}
     //   resizeMode={'cover'}>
     // <KeyboardAvoidingView behavior={'height'} style={style.main}>
-    <View style={style.main}>
+    <ScrollView contentContainerStyle={style.main}>
       <View style={style.nav}>
-        <Logo />
+        {hasBrandLogo && <Logo />}
         {error ? <Error error={error} /> : <></>}
         {/* <OpenInNativeButton /> */}
       </View>
@@ -179,17 +183,17 @@ const Create = () => {
           roomTitle={roomTitle}
         />
       )}
-    </View>
+    </ScrollView>
   );
 };
 
 const style = StyleSheet.create({
-  full: {flex: 1},
   main: {
-    flex: 2,
-    justifyContent: 'space-evenly',
+    paddingVertical: '8%',
     marginHorizontal: '8%',
-    marginVertical: '2%',
+    display: 'flex',
+    justifyContent: 'space-evenly',
+    flexGrow: 1,
   },
   nav: {
     flex: 1,

package/template/src/pages/Join.tsx

@@ -10,15 +10,12 @@
 *********************************************
 */
 import React, {useContext, useState} from 'react';
-import {
-  View,
-  Text,
-  StyleSheet,
-} from 'react-native';
+import {View, Text, StyleSheet, ScrollView} from 'react-native';
 import {useHistory} from '../components/Router';
 import SessionContext from '../components/SessionContext';
 // import OpenInNativeButton from '../subComponents/OpenInNativeButton';
 import Logo from '../subComponents/Logo';
+import hasBrandLogo from '../utils/hasBrandLogo';
 import LogoutButton from '../subComponents/LogoutButton';
 import ColorContext from '../components/ColorContext';
 // import Illustration from '../subComponents/Illustration';
@@ -38,8 +35,9 @@ const Join = (props: joinProps) => {
   const history = useHistory();
   const {primaryColor} = useContext(ColorContext);
   const {joinSession} = useContext(SessionContext);
-  const [error, setError] =
-    useState<null | {name: string; message: string}>(null);
+  const [error, setError] = useState<null | {name: string; message: string}>(
+    null,
+  );
   // const [dim, setDim] = useState([
   //   Dimensions.get('window').width,
   //   Dimensions.get('window').height,
@@ -57,18 +55,12 @@ const Join = (props: joinProps) => {
   const startCall = async () => {
     joinSession({phrase});
   };
-  // throw new Error("My first Sentry error!");
+
   return (
-    // <ImageBackground
-    //   // onLayout={onLayout}
-    //   style={style.full}
-    //   resizeMode={'cover'}>
-    <View style={style.main}>
-      {/* <KeyboardAvoidingView behavior={'height'} style={style.main}> */}
+    <ScrollView contentContainerStyle={style.main}>
       <View style={style.nav}>
-        <Logo />
+        {hasBrandLogo && <Logo />}
         {error ? <Error error={error} /> : <></>}
-        {/* <OpenInNativeButton /> */}
       </View>
       <View style={style.content}>
         <View style={style.leftContent}>
@@ -99,28 +91,19 @@ const Join = (props: joinProps) => {
             )}
           </View>
         </View>
-        {/* {dim[0] > dim[1] + 150 ? (
-            <View style={style.full}>
-              <Illustration />
-            </View>
-          ) : (
-            <></>
-          )} */}
       </View>
-      {/* </KeyboardAvoidingView> */}
-    </View>
-    // </ImageBackground>
+    </ScrollView>
   );
 };
 
 const style = StyleSheet.create({
-  full: {flex: 1},
   illustration: {flex: 1, alignSelf: 'flex-end'},
   main: {
-    flex: 2,
-    justifyContent: 'space-evenly',
+    paddingVertical: '8%',
     marginHorizontal: '8%',
-    marginVertical: '2%',
+    display: 'flex',
+    justifyContent: 'space-evenly',
+    flexGrow: 1,
   },
   nav: {
     flex: 1,

package/template/src/pages/VideoCall.tsx

@@ -30,6 +30,7 @@ import {gql, useQuery} from '@apollo/client';
 // import Watermark from '../subComponents/Watermark';
 import StorageContext from '../components/StorageContext';
 import Logo from '../subComponents/Logo';
+import hasBrandLogo from '../utils/hasBrandLogo';
 import ChatContext from '../components/ChatContext';
 import {SidePanelType} from '../subComponents/SidePanelEnum';
 import {videoView} from '../../theme.json';
@@ -65,7 +66,8 @@ const useChatNotification = (
 };
 
 const NotificationControl = ({children, chatDisplayed, setSidePanel}) => {
-  const {messageStore, privateMessageStore, userList, localUid} = useContext(ChatContext);
+  const {messageStore, privateMessageStore, userList, localUid} =
+    useContext(ChatContext);
   const [
     lastCheckedPublicState,
     setLastCheckedPublicState,
@@ -116,8 +118,13 @@ const NotificationControl = ({children, chatDisplayed, setSidePanel}) => {
       messageStore[messageStore.length - 1]?.uid !== localUid
     ) {
       Toast.show({
-        text1: messageStore[messageStore.length - 1]?.msg.length > 50 ? messageStore[messageStore.length - 1]?.msg.slice(1, 50) + '...' : messageStore[messageStore.length - 1]?.msg.slice(1),
-        text2: userList[messageStore[messageStore.length - 1]?.uid] ? 'From: ' + userList[messageStore[messageStore.length - 1]?.uid].name : '',
+        text1:
+          messageStore[messageStore.length - 1]?.msg.length > 50
+            ? messageStore[messageStore.length - 1]?.msg.slice(1, 50) + '...'
+            : messageStore[messageStore.length - 1]?.msg.slice(1),
+        text2: userList[messageStore[messageStore.length - 1]?.uid]
+          ? 'From: ' + userList[messageStore[messageStore.length - 1]?.uid].name
+          : '',
         visibilityTime: 1000,
         onPress: () => {
           setSidePanel(SidePanelType.Chat);
@@ -212,8 +219,10 @@ enum RnEncryptionEnum {
 }
 
 const VideoCall: React.FC = () => {
-  const {store} = useContext(StorageContext);
-  const [username, setUsername] = useState('Getting name...');
+  const {store, setStore} = useContext(StorageContext);
+  const getInitialUsername = () =>
+    store?.displayName ? store.displayName : '';
+  const [username, setUsername] = useState(getInitialUsername);
   const [participantsView, setParticipantsView] = useState(false);
   const [callActive, setCallActive] = useState($config.PRECALL ? false : true);
   const [layout, setLayout] = useState(Layout.Grid);
@@ -223,9 +232,9 @@ const VideoCall: React.FC = () => {
   const [sidePanel, setSidePanel] = useState<SidePanelType>(SidePanelType.None);
   const {phrase} = useParams();
   const [errorMessage, setErrorMessage] = useState(null);
-  let isHost = true; //change to false by default after testing
-  let title = null;
-  let rtcProps = {
+  const [isHost, setIsHost] = React.useState(false);
+  const [title, setTitle] = React.useState('');
+  const [rtcProps, setRtcProps] = React.useState({
     appId: $config.APP_ID,
     channel: null,
     uid: null,
@@ -238,60 +247,59 @@ const VideoCall: React.FC = () => {
     encryption: $config.ENCRYPTION_ENABLED
       ? {key: null, mode: RnEncryptionEnum.AES128XTS, screenKey: null}
       : false,
-  };
-  let data, loading, error;
+  });
 
-  ({data, loading, error} = useQuery(
+  const {data, loading, error} = useQuery(
     store.token === null
       ? JOIN_CHANNEL_PHRASE
       : JOIN_CHANNEL_PHRASE_AND_GET_USER,
     {
       variables: {passphrase: phrase},
     },
-  ));
+  );
 
-  if (error) {
-    console.log('error', error);
-    // console.log('error data', data);
-    if (!errorMessage) {
-      setErrorMessage(error);
+  React.useEffect(() => {
+    if (error) {
+      console.log('error', error);
+      // console.log('error data', data);
+      if (!errorMessage) {
+        setErrorMessage(error);
+      }
+      return;
     }
-  }
 
-  if (!loading && data) {
-    console.log('token:', rtcProps.token);
-    console.log('error', data.error);
-    rtcProps = {
-      appId: $config.APP_ID,
-      channel: data.joinChannel.channel,
-      uid: data.joinChannel.mainUser.uid,
-      token: data.joinChannel.mainUser.rtc,
-      rtm: data.joinChannel.mainUser.rtm,
-      dual: true,
-      profile: $config.PROFILE,
-      encryption: $config.ENCRYPTION_ENABLED
-        ? {
-            key: data.joinChannel.secret,
-            mode: RnEncryptionEnum.AES128XTS,
-            screenKey: data.joinChannel.secret,
-          }
-        : false,
-      screenShareUid: data.joinChannel.screenShare.uid,
-      screenShareToken: data.joinChannel.screenShare.rtc,
-    };
-    isHost = data.joinChannel.isHost;
-    title = data.joinChannel.title;
-    console.log('query done: ', data, queryComplete);
-    if (username === 'Getting name...') {
+    if (!loading && data) {
+      console.log('token:', rtcProps.token);
+      console.log('error', data.error);
+      setRtcProps({
+        appId: $config.APP_ID,
+        channel: data.joinChannel.channel,
+        uid: data.joinChannel.mainUser.uid,
+        token: data.joinChannel.mainUser.rtc,
+        rtm: data.joinChannel.mainUser.rtm,
+        dual: true,
+        profile: $config.PROFILE,
+        encryption: $config.ENCRYPTION_ENABLED
+          ? {
+              key: data.joinChannel.secret,
+              mode: RnEncryptionEnum.AES128XTS,
+              screenKey: data.joinChannel.secret,
+            }
+          : false,
+        screenShareUid: data.joinChannel.screenShare.uid,
+        screenShareToken: data.joinChannel.screenShare.rtc,
+      });
+      setIsHost(data.joinChannel.isHost);
+      setTitle(data.joinChannel.title);
+      console.log('query done: ', data, queryComplete);
+      // 1. Store the display name from API
       if (data.getUser) {
         setUsername(data.getUser.name);
-      } else {
-        setUsername('');
       }
+      console.log('token:', rtcProps.token);
+      queryComplete ? {} : setQueryComplete(true);
     }
-    console.log('token:', rtcProps.token);
-    queryComplete ? {} : setQueryComplete(true);
-  }
+  }, [error, loading, data]);
 
   const history = useHistory();
   const callbacks = {
@@ -300,6 +308,14 @@ const VideoCall: React.FC = () => {
         history.push('/');
       }, 0),
   };
+
+  React.useEffect(() => {
+    // Update the username in localstorage when username changes
+    if (setStore) {
+      setStore({token: store?.token || null, displayName: username});
+    }
+  }, [username]);
+
   // throw new Error("My first Sentry error!");
   return (
     <>
@@ -350,7 +366,11 @@ const VideoCall: React.FC = () => {
                                 setLastCheckedPublicState
                               }
                             />
-                            <View style={[style.videoView, {backgroundColor: '#ffffff00'}]}>
+                            <View
+                              style={[
+                                style.videoView,
+                                {backgroundColor: '#ffffff00'},
+                              ]}>
                               {layout === Layout.Pinned ? (
                                 <PinnedVideo />
                               ) : (
@@ -446,9 +466,7 @@ const VideoCall: React.FC = () => {
         </>
       ) : (
         <View style={style.loader}>
-          <View style={style.loaderLogo}>
-            <Logo />
-          </View>
+          <View style={style.loaderLogo}>{hasBrandLogo && <Logo />}</View>
           <Text style={style.loaderText}>Starting Call. Just a second.</Text>
         </View>
       )}

package/template/src/subComponents/LogoutButton.tsx

@@ -31,7 +31,7 @@ const LogoutButton = () => {
 
   const logout = () => {
     if (setStore) {
-      setStore({token: null});
+      setStore({token: null, displayName: ''});
     }
     logoutQuery({variables: {token}}).catch((e) => {
       console.log(e);

package/template/src/subComponents/ScreenshareButton.tsx

@@ -109,11 +109,13 @@ const ScreenshareButton = (props: ScreenSharingProps) => {
               value: [joinedUser[0]],
             });
             setLayout(Layout.Pinned);
-        }else if(newUserUid ===  1){
-          dispatch({
-            type: 'SwapVideo',
-            value: [joinedUser[0]],
-          });
+        } else if (newUserUid === 1) {
+          if (newUserUid !== users[0].uid){
+            dispatch({
+              type: 'SwapVideo',
+              value: [joinedUser[0]],
+            });
+          }
           setLayout(Layout.Pinned);
         }
       }