Merge remote-tracking branch 'origin/main' into convert-to-monorepo

Author: mironiasty

examples/video-chat/App.tsx

@@ -1,4 +1,3 @@
-import { FishjamContextProvider } from '@fishjam-dev/react-native-client';
 import React from 'react';
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import Toast from 'react-native-toast-message';
@@ -9,9 +8,7 @@ function App(): React.JSX.Element {
   return (
     <>
       <GestureHandlerRootView>
-        <FishjamContextProvider>
-          <AppNavigator />
-        </FishjamContextProvider>
+        <AppNavigator />
       </GestureHandlerRootView>
       <Toast />
     </>

examples/video-chat/hooks/useJoinRoom.ts

@@ -1,6 +1,6 @@
 import {
   useCamera,
-  useFishjamClient,
+  joinRoom as fjJoinRoom,
   useMicrophone,
   VideoQuality,
 } from '@fishjam-dev/react-native-client';
@@ -47,7 +47,6 @@ export function useJoinRoom({
   isCameraAvailable,
   isMicrophoneAvailable,
 }: Props) {
-  const { join } = useFishjamClient();
   const { startCamera, getCaptureDevices } = useCamera();
   const { startMicrophone } = useMicrophone();
 
@@ -68,7 +67,7 @@ export function useJoinRoom({
       cameraEnabled: isCameraAvailable,
     });
 
-    await join({
+    await fjJoinRoom({
       name: 'RN mobile',
     });
 
@@ -79,7 +78,7 @@ export function useJoinRoom({
   }, [
     isCameraAvailable,
     isMicrophoneAvailable,
-    join,
+    fjJoinRoom,
     startCamera,
     startMicrophone,
   ]);

examples/video-chat/ios/FishjamExample.xcodeproj/project.pbxproj

@@ -57,8 +57,11 @@ target 'FishjamExample' do
       :mac_catalyst_enabled => false
     )
   end
+  pod 'FishjamClient', :git => 'https://github.com/fishjam-dev/ios-client-sdk.git', :commit => '9d22ecaf75cc563a24212c13e15cd83a3f76ac0f'
 end
 
+
+
 target 'ScreenBroadcast' do
-  pod 'FishjamClient/Broadcast'
+  pod 'FishjamClient/Broadcast', :git => 'https://github.com/fishjam-dev/ios-client-sdk.git', :commit => '9d22ecaf75cc563a24212c13e15cd83a3f76ac0f'
 end

examples/video-chat/ios/Podfile

@@ -32,15 +32,15 @@ PODS:
     - React-Core (= 0.73.4)
     - React-jsi (= 0.73.4)
     - ReactCommon/turbomodule/core (= 0.73.4)
-  - FishjamClient (0.3.0):
-    - FishjamClient/Broadcast (= 0.3.0)
+  - FishjamClient (0.3.1):
+    - FishjamClient/Broadcast (= 0.3.1)
     - PromisesSwift
     - Starscream (~> 4.0.0)
     - SwiftLogJellyfish (= 1.5.2)
     - SwiftPhoenixClient (~> 5.0.0)
     - SwiftProtobuf (~> 1.18.0)
     - WebRTC-SDK (= 114.5735.08)
-  - FishjamClient/Broadcast (0.3.0):
+  - FishjamClient/Broadcast (0.3.1):
     - PromisesSwift
     - Starscream (~> 4.0.0)
     - SwiftLogJellyfish (= 1.5.2)
@@ -1098,7 +1098,7 @@ PODS:
     - React-perflogger (= 0.73.4)
   - RNFishjamClient (0.3.0):
     - ExpoModulesCore
-    - FishjamClient (= 0.3.0)
+    - FishjamClient (= 0.3.1)
   - RNGestureHandler (2.16.2):
     - glog
     - RCT-Folly (= 2022.05.16.00)
@@ -1201,7 +1201,6 @@ DEPENDENCIES:
 
 SPEC REPOS:
   trunk:
-    - FishjamClient
     - fmt
     - libevent
     - PromisesObjC
@@ -1403,7 +1402,7 @@ SPEC CHECKSUMS:
   React-runtimescheduler: ed48e5faac6751e66ee1261c4bd01643b436f112
   React-utils: 6e5ad394416482ae21831050928ae27348f83487
   ReactCommon: 840a955d37b7f3358554d819446bffcf624b2522
-  RNFishjamClient: 6a090b2a484c9f09ed8a42ccc434f1c3cd0bf201
+  RNFishjamClient: 6e7021e6d170aabdde759ebade44151960244a05
   RNGestureHandler: 48c9d38f57c7761b4153def57b718f491f4bbb4b
   RNNotifee: 8e2d3df3f0e9ce8f5d1fe4c967431138190b6175
   RNReanimated: 029ae990587773fc20b938f06383eb492fb3a689
@@ -1417,6 +1416,6 @@ SPEC CHECKSUMS:
   Yoga: 64cd2a583ead952b0315d5135bf39e053ae9be70
   ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5
 
-PODFILE CHECKSUM: 8daa796ed34dbeeeb2b648d198968b27b4c2ae8d
+PODFILE CHECKSUM: 0376e85da25bcfda7c0095d7c9d174ee924ff49d
 
 COCOAPODS: 1.14.2

examples/video-chat/ios/Podfile.lock

@@ -1,4 +1,4 @@
-import { useFishjamClient } from '@fishjam-dev/react-native-client';
+import { connect } from '@fishjam-dev/react-native-client';
 import type { BottomTabScreenProps } from '@react-navigation/bottom-tabs';
 import { CompositeScreenProps } from '@react-navigation/native';
 import { NativeStackScreenProps } from '@react-navigation/native-stack';
@@ -50,7 +50,6 @@ async function getFishjamServer(
 }
 
 const ConnectScreen = ({ navigation }: Props) => {
-  const { connect } = useFishjamClient();
   const [connectionError, setConnectionError] = useState<string | null>(null);
   const [loading, setLoading] = useState(false);
 

examples/video-chat/screens/ConnectWithRoomManagerScreen.tsx

@@ -1,4 +1,4 @@
-import { useFishjamClient } from '@fishjam-dev/react-native-client';
+import { connect } from '@fishjam-dev/react-native-client';
 import type { BottomTabScreenProps } from '@react-navigation/bottom-tabs';
 import { CompositeScreenProps } from '@react-navigation/native';
 import { NativeStackScreenProps } from '@react-navigation/native-stack';
@@ -32,7 +32,6 @@ type Props = CompositeScreenProps<
 
 const { URL_INPUT, TOKEN_INPUT, CONNECT_BUTTON } = connectScreenLabels;
 const ConnectScreen = ({ navigation }: Props) => {
-  const { connect } = useFishjamClient();
   const [connectionError, setConnectionError] = useState<string | null>(null);
 
   const [peerToken, onChangePeerToken] = useState('');

examples/video-chat/screens/ConnectWithTokenScreen.tsx

@@ -1,5 +1,5 @@
 import {
-  useFishjamClient,
+  cleanUp,
   usePeers,
   useScreencast,
   ScreencastQuality,
@@ -40,7 +40,6 @@ const RoomScreen = ({ navigation, route }: Props) => {
     userName,
   } = route?.params;
   usePreventBackButton();
-  const { cleanUp } = useFishjamClient();
   const audioSettings = useAudioSettings();
 
   const { joinRoom } = useJoinRoom({
@@ -57,6 +56,7 @@ const RoomScreen = ({ navigation, route }: Props) => {
   }, [joinRoom]);
 
   const peers = usePeers();
+
   const tracks = useMemo(
     () =>
       peers.flatMap((peer) =>
@@ -72,7 +72,7 @@ const RoomScreen = ({ navigation, route }: Props) => {
   const onDisconnectPress = useCallback(() => {
     cleanUp();
     navigation.navigate('Home');
-  }, [navigation, cleanUp]);
+  }, [navigation]);
 
   const onToggleScreenCast = useCallback(() => {
     toggleScreencast({