@fishjam-cloud/react-native-client 0.2.0 → 0.2.1

package/README.md

@@ -48,7 +48,7 @@ Add plugin to your `app.json` if it's not already added:
 }
 ```
 
-If you want to use screensharing feature, enable the following flag:
+If you want to use screensharing feature, enable the following flags:
 
 ```json
 {
@@ -59,7 +59,12 @@ If you want to use screensharing feature, enable the following flag:
       [
         "@fishjam-cloud/react-native-client",
         {
-          "setUpScreensharing": true,
+          "android": {
+            "enableForegroundService": true
+          },
+          "ios": {
+            "enableScreensharing": true
+          }
         }
       ]
     ]
@@ -72,11 +77,14 @@ On bare workflow run `expo prebuild` to configure the app, then run
 
 ### Android
 
-1. Add camera and microphone permissions to your `AndroidManifest.xml`.
+1. Add camera and microphone permissions to your `AndroidManifest.xml` or you app.json permissions.
 2. Rebuild the app. That's it!
 
 ### iOS
 
+> [!NOTE]
+> If you're using our plugin with `enableScreensharing` set to `true`. Not further steps are required.
+
 On iOS installation is a bit more complicated, because you need to setup a
 screen broadcast app extension for screensharing.
 
@@ -102,7 +110,7 @@ screen broadcast app extension for screensharing.
    Broadcast Upload Extension → Next. Choose the name for the new target, select
    Swift language and deselect "Include UI Extension".
 
-   ![New target config](../../.github/images/xcode1.png)
+   ![New target config](https://github.com/fishjam-cloud/mobile-client-sdk/blob/main/.github/images/xcode1.png)
 
    Press Finish. In the next alert xcode will ask you if you want to activate
    the new scheme - press Cancel.
@@ -110,7 +118,7 @@ screen broadcast app extension for screensharing.
 4. Configure app group. Go to "Signing & Capabilities" tab, click "+ Capability"
    button in upper left corner and select "App Groups".
 
-   ![App groups config](../../.github/images/xcode2.png)
+   ![App groups config](https://github.com/fishjam-cloud/mobile-client-sdk/blob/main/.github/images/xcode2.png)
 
    Then in the "App Groups" add a new group or select existing. Usually group
    name has format `group.<your-bundle-identifier>`. Verify that both app and
@@ -119,7 +127,7 @@ screen broadcast app extension for screensharing.
 5. A new folder with app extension should appear on the left with contents like
    this:
 
-   ![App extension files](../../.github/images/xcode3.png)
+   ![App extension files](https://github.com/fishjam-cloud/mobile-client-sdk/blob/main/.github/images/xcode3.png)
 
    Replace `SampleHandler.swift` with `MembraneBroadcastSampleHandler.swift` and
    this code:
@@ -221,10 +229,12 @@ room client. To run the app:
    instructions there to setup and run demo server.
 2. Clone the repo
 3. ```
-   cd `examples/fishjam-chat`
    yarn
+   yarn build
+   cd `examples/fishjam-chat`
+   npx expo prebuild --clean
    ```
-4. In App.ts replace server url with your server's url.
+4. Copy `.env.template` and create `.env` with proper secrets.
 5. `yarn run android` or `yarn run ios` or run project from Android Studio /
    Xcode just like every RN project. Note that simulators won't work, you have
    to test on real device for camera and screensharing to run.
@@ -323,6 +333,9 @@ Use track metadata to differentiate between video and screencast tracks.
 
 ### Android foreground service
 
+> [!NOTE]
+> If you're using our plugin with `enableForegroundService` set to `true`. Not further steps are required.
+
 In order for the call to continue running when app is in background, you need to
 set up and start a foreground service. You can use a 3rd party library for this,
 for example [notifee](https://notifee.app/).

package/android/build.gradle

@@ -2,8 +2,10 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
+def packageVersion = '2.1'
+
 group = 'io.fishjam.reactnative'
-version = '0.2.0'
+version = "${packageVersion}"
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -59,7 +61,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 1
-    versionName "0.2.0"
+    versionName "${packageVersion}"
   }
   lintOptions {
     abortOnError false
@@ -82,7 +84,7 @@ dependencies {
     implementation project(':fishjam-cloud-android-client')
   } else {
     // update version number when releasing
-    implementation 'com.github.fishjam-cloud:mobile-client-sdk:0.2.0'
+    implementation "com.github.fishjam-cloud:mobile-client-sdk:${packageVersion}"
   }
   api 'com.github.davidliu:audioswitch:8edf84ee46cdbc84c2b7725aa8f8d66363e19876'
   implementation 'androidx.appcompat:appcompat:1.6.1'

package/expo-module.config.json

@@ -0,0 +1,17 @@
+{
+  "platforms": ["ios", "android", "web"],
+  "ios": {
+    "modules": [
+      "RNFishjamClientModule",
+      "VideoPreviewViewModule",
+      "VideoRendererViewModule"
+    ]
+  },
+  "android": {
+    "modules": [
+      "io.fishjam.reactnative.RNFishjamClientModule",
+      "io.fishjam.reactnative.VideoPreviewViewModule",
+      "io.fishjam.reactnative.VideoRendererViewModule"
+    ]
+  }
+}

package/ios/RNFishjamClient.podspec

@@ -0,0 +1,30 @@
+require 'json'
+
+package = JSON.parse(File.read(File.join(__dir__, '..', 'package.json')))
+
+Pod::Spec.new do |s|
+  s.name           = 'RNFishjamClient'
+  s.version        = package['version']
+  s.summary        = package['description']
+  s.description    = package['description']
+  s.license        = package['license']
+  s.author         = package['author']
+  s.homepage       = package['homepage']
+  s.platform       = :ios, '13.0'
+  s.swift_version  = '5.4'
+  s.source         = { git: 'https://github.com/fishjam-cloud/mobile-client-sdk/tree/main/packages/react-native-client/ios' }
+  s.static_framework = true
+
+  s.dependency 'ExpoModulesCore'
+
+  # Swift/Objective-C compatibility
+  s.pod_target_xcconfig = {
+    'DEFINES_MODULE' => 'YES',
+    'SWIFT_COMPILATION_MODE' => 'wholemodule'
+  }
+
+  s.source_files = '**/*.{h,m,swift}'
+
+  s.dependency 'FishjamCloudClient', '>= 0.1'
+
+end

package/ios/RNFishjamClientModule.swift

@@ -97,7 +97,7 @@ public class RNFishjamClientModule: Module {
             return client
         }()
 
-        AsyncFunction("connect") {
+        AsyncFunction("joinRoom") {
             (
                 url: String, participantToken: String, participantMetadata: [String: Any], config: ConnectConfig,
                 promise: Promise
@@ -136,7 +136,7 @@ public class RNFishjamClientModule: Module {
         }
 
         AsyncFunction("switchCamera") { (cameraId: String) in
-            try rnFishjamClient.switchCamera(captureDeviceId: cameraId)
+            try rnFishjamClient.switchCamera(cameraId: cameraId)
         }
 
         Property("cameras") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishjam-cloud/react-native-client",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "A React Native client for Fishjam Cloud",
   "author": "Fishjam Cloud Team",
   "license": "Apache-2.0",
@@ -31,7 +31,7 @@
   "bugs": {
     "url": "https://github.com/fishjam-cloud/mobile-client-sdk/issues"
   },
-  "homepage": "https://github.com/fishjam-cloud/mobile-client-sdk#readme",
+  "homepage": "https://fishjam.io",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -79,11 +79,14 @@
   },
   "files": [
     "build/",
-    "ios/*.swift",
-    "android/src",
     "android/build.gradle",
-    "plugin/build",
+    "android/src/",
+    "ios/*.swift",
+    "ios/RNFishjamClient.podspec",
+    "plugin/build/",
     "app.plugin.js",
-    "README.md"
+    "expo-module.config.json",
+    "README.md",
+    "!**/node_modules"
   ]
 }