From 30e2e16c6eebc975fd9cf40db72b0d11c6cff8c1 Mon Sep 17 00:00:00 2001 From: Yogesh Singh Date: Tue, 28 Nov 2023 16:41:00 +0530 Subject: [PATCH 01/32] updated packages --- .trunk/trunk.yaml | 4 +- packages/hms_room_kit/example/pubspec.lock | 8 +-- packages/hms_room_kit/pubspec.lock | 8 +-- .../example/android/Gemfile.lock | 16 ++--- .../hmssdk_flutter/example/ios/Gemfile.lock | 16 ++--- packages/hmssdk_flutter/example/pubspec.lock | 8 +-- .../lib/src/model/hms_recording_state.dart | 63 +++++++++++++++++++ sample apps/bloc/pubspec.lock | 26 ++++---- .../pubspec.lock | 26 ++++---- 9 files changed, 119 insertions(+), 56 deletions(-) create mode 100644 packages/hmssdk_flutter/lib/src/model/hms_recording_state.dart diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index d93f8dae9..46d9cfc3e 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -9,10 +9,10 @@ plugins: lint: enabled: - actionlint@1.6.26 - - checkov@3.1.4 + - checkov@3.1.9 - osv-scanner@1.4.3 - trivy@0.47.0 - - trufflehog@3.63.1 + - trufflehog@3.63.2-rc0 - oxipng@9.0.0 - yamllint@1.33.0 - markdownlint@0.37.0 diff --git a/packages/hms_room_kit/example/pubspec.lock b/packages/hms_room_kit/example/pubspec.lock index 68e6bec16..6849733df 100644 --- a/packages/hms_room_kit/example/pubspec.lock +++ b/packages/hms_room_kit/example/pubspec.lock @@ -85,10 +85,10 @@ packages: dependency: transitive description: name: cross_file - sha256: "445db18de832dba8d851e287aff8ccf169bed30d2e94243cb54c7d2f1ed2142c" + sha256: "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5" url: "https://pub.dev" source: hosted - version: "0.3.3+6" + version: "0.3.3+7" crypto: dependency: transitive description: @@ -235,10 +235,10 @@ packages: dependency: transitive description: name: http - sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" + sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139 url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.2" http_parser: dependency: transitive description: diff --git a/packages/hms_room_kit/pubspec.lock b/packages/hms_room_kit/pubspec.lock index cb5be5991..b087f34b2 100644 --- a/packages/hms_room_kit/pubspec.lock +++ b/packages/hms_room_kit/pubspec.lock @@ -85,10 +85,10 @@ packages: dependency: transitive description: name: cross_file - sha256: "445db18de832dba8d851e287aff8ccf169bed30d2e94243cb54c7d2f1ed2142c" + sha256: "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5" url: "https://pub.dev" source: hosted - version: "0.3.3+6" + version: "0.3.3+7" crypto: dependency: transitive description: @@ -220,10 +220,10 @@ packages: dependency: transitive description: name: http - sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" + sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139 url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.2" http_parser: dependency: transitive description: diff --git a/packages/hmssdk_flutter/example/android/Gemfile.lock b/packages/hmssdk_flutter/example/android/Gemfile.lock index 50e119744..9d46e2b05 100644 --- a/packages/hmssdk_flutter/example/android/Gemfile.lock +++ b/packages/hmssdk_flutter/example/android/Gemfile.lock @@ -12,21 +12,21 @@ GEM public_suffix (>= 2.0.2, < 6.0) artifactory (3.0.15) atomos (0.1.3) - aws-eventstream (1.2.0) - aws-partitions (1.855.0) - aws-sdk-core (3.187.1) + aws-eventstream (1.3.0) + aws-partitions (1.859.0) + aws-sdk-core (3.188.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.72.0) - aws-sdk-core (~> 3, >= 3.184.0) + aws-sdk-kms (1.73.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.138.0) - aws-sdk-core (~> 3, >= 3.181.0) + aws-sdk-s3 (1.140.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.6) - aws-sigv4 (1.6.1) + aws-sigv4 (1.7.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.1.0) diff --git a/packages/hmssdk_flutter/example/ios/Gemfile.lock b/packages/hmssdk_flutter/example/ios/Gemfile.lock index 11bca3aac..8f884902d 100644 --- a/packages/hmssdk_flutter/example/ios/Gemfile.lock +++ b/packages/hmssdk_flutter/example/ios/Gemfile.lock @@ -12,21 +12,21 @@ GEM public_suffix (>= 2.0.2, < 6.0) artifactory (3.0.15) atomos (0.1.3) - aws-eventstream (1.2.0) - aws-partitions (1.855.0) - aws-sdk-core (3.187.1) + aws-eventstream (1.3.0) + aws-partitions (1.859.0) + aws-sdk-core (3.188.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.72.0) - aws-sdk-core (~> 3, >= 3.184.0) + aws-sdk-kms (1.73.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.138.0) - aws-sdk-core (~> 3, >= 3.181.0) + aws-sdk-s3 (1.140.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.6) - aws-sigv4 (1.6.1) + aws-sigv4 (1.7.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.1.0) diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index 9fa43f469..2291514f0 100644 --- a/packages/hmssdk_flutter/example/pubspec.lock +++ b/packages/hmssdk_flutter/example/pubspec.lock @@ -93,10 +93,10 @@ packages: dependency: transitive description: name: cross_file - sha256: "445db18de832dba8d851e287aff8ccf169bed30d2e94243cb54c7d2f1ed2142c" + sha256: "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5" url: "https://pub.dev" source: hosted - version: "0.3.3+6" + version: "0.3.3+7" crypto: dependency: transitive description: @@ -307,10 +307,10 @@ packages: dependency: transitive description: name: http - sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" + sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139 url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.2" http_parser: dependency: transitive description: diff --git a/packages/hmssdk_flutter/lib/src/model/hms_recording_state.dart b/packages/hmssdk_flutter/lib/src/model/hms_recording_state.dart new file mode 100644 index 000000000..da610dfdf --- /dev/null +++ b/packages/hmssdk_flutter/lib/src/model/hms_recording_state.dart @@ -0,0 +1,63 @@ +enum HMSRecordingState { + none, + + starting, + + started, + + paused, + + resumed, + + stopped, + + failed, +} + +extension HMSRecordingStateValues on HMSRecordingState { + static HMSRecordingState getRecordingStateFromName(String name) { + switch (name) { + case 'NONE': + return HMSRecordingState.none; + case 'STARTING': + return HMSRecordingState.starting; + case 'STARTED': + return HMSRecordingState.started; + case 'PAUSED': + return HMSRecordingState.paused; + case 'RESUMED': + return HMSRecordingState.resumed; + case 'STOPPED': + return HMSRecordingState.stopped; + case 'FAILED': + return HMSRecordingState.failed; + default: + return HMSRecordingState.none; + } + } + + static String getNameFromRecordingState(HMSRecordingState state) { + switch (state) { + case HMSRecordingState.none: + return 'NONE'; + + case HMSRecordingState.starting: + return 'STARTING'; + + case HMSRecordingState.started: + return 'STARTED'; + + case HMSRecordingState.paused: + return 'PAUSED'; + + case HMSRecordingState.resumed: + return 'RESUMED'; + + case HMSRecordingState.stopped: + return 'STOPPED'; + + case HMSRecordingState.failed: + return 'FAILED'; + } + } +} diff --git a/sample apps/bloc/pubspec.lock b/sample apps/bloc/pubspec.lock index 0353333d2..a2aba3ffb 100644 --- a/sample apps/bloc/pubspec.lock +++ b/sample apps/bloc/pubspec.lock @@ -45,10 +45,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" cupertino_icons: dependency: "direct main" description: @@ -159,10 +159,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" nested: dependency: transitive description: @@ -260,18 +260,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -292,10 +292,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" typed_data: dependency: transitive description: @@ -324,10 +324,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=2.10.0" diff --git a/sample apps/flutter-audio-room-quickstart/pubspec.lock b/sample apps/flutter-audio-room-quickstart/pubspec.lock index b9ad621c8..802acb7e2 100644 --- a/sample apps/flutter-audio-room-quickstart/pubspec.lock +++ b/sample apps/flutter-audio-room-quickstart/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" cupertino_icons: dependency: "direct main" description: @@ -111,10 +111,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" path: dependency: transitive description: @@ -188,18 +188,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -220,10 +220,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" vector_math: dependency: transitive description: @@ -236,10 +236,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=2.8.0" From 7b9497444d462ac550bd0ebf4e4237f13a619203 Mon Sep 17 00:00:00 2001 From: Yogesh Singh Date: Sat, 2 Dec 2023 12:59:08 +0530 Subject: [PATCH 02/32] updated packages --- .trunk/trunk.yaml | 2 +- packages/hms_room_kit/example/pubspec.lock | 12 +++++----- packages/hms_room_kit/pubspec.lock | 12 +++++----- .../example/android/Gemfile.lock | 22 +++++++++---------- .../hmssdk_flutter/example/ios/Gemfile.lock | 22 +++++++++---------- .../hmssdk_flutter/example/ios/Podfile.lock | 4 ++-- packages/hmssdk_flutter/example/pubspec.lock | 12 +++++----- 7 files changed, 43 insertions(+), 43 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 46d9cfc3e..e8be4fec8 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -21,7 +21,7 @@ lint: - shfmt@3.6.0 - shellcheck@0.9.0 - gitleaks@8.18.1 - - svgo@3.0.4 + - svgo@3.0.5 - ktlint@1.0.1 runtimes: enabled: diff --git a/packages/hms_room_kit/example/pubspec.lock b/packages/hms_room_kit/example/pubspec.lock index 6849733df..6270cd67b 100644 --- a/packages/hms_room_kit/example/pubspec.lock +++ b/packages/hms_room_kit/example/pubspec.lock @@ -85,10 +85,10 @@ packages: dependency: transitive description: name: cross_file - sha256: "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5" + sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e url: "https://pub.dev" source: hosted - version: "0.3.3+7" + version: "0.3.3+8" crypto: dependency: transitive description: @@ -443,10 +443,10 @@ packages: dependency: transitive description: name: petitparser - sha256: eeb2d1428ee7f4170e2bd498827296a18d4e7fc462b71727d111c0ac7707cfa6 + sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 url: "https://pub.dev" source: hosted - version: "6.0.1" + version: "6.0.2" platform: dependency: transitive description: @@ -752,10 +752,10 @@ packages: dependency: transitive description: name: win32 - sha256: "7c99c0e1e2fa190b48d25c81ca5e42036d5cac81430ef249027d97b0935c553f" + sha256: b0f37db61ba2f2e9b7a78a1caece0052564d1bc70668156cf3a29d676fe4e574 url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "5.1.1" xdg_directories: dependency: transitive description: diff --git a/packages/hms_room_kit/pubspec.lock b/packages/hms_room_kit/pubspec.lock index b087f34b2..b757fdc8c 100644 --- a/packages/hms_room_kit/pubspec.lock +++ b/packages/hms_room_kit/pubspec.lock @@ -85,10 +85,10 @@ packages: dependency: transitive description: name: cross_file - sha256: "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5" + sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e url: "https://pub.dev" source: hosted - version: "0.3.3+7" + version: "0.3.3+8" crypto: dependency: transitive description: @@ -428,10 +428,10 @@ packages: dependency: transitive description: name: petitparser - sha256: eeb2d1428ee7f4170e2bd498827296a18d4e7fc462b71727d111c0ac7707cfa6 + sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 url: "https://pub.dev" source: hosted - version: "6.0.1" + version: "6.0.2" platform: dependency: transitive description: @@ -737,10 +737,10 @@ packages: dependency: transitive description: name: win32 - sha256: "7c99c0e1e2fa190b48d25c81ca5e42036d5cac81430ef249027d97b0935c553f" + sha256: b0f37db61ba2f2e9b7a78a1caece0052564d1bc70668156cf3a29d676fe4e574 url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "5.1.1" xdg_directories: dependency: transitive description: diff --git a/packages/hmssdk_flutter/example/android/Gemfile.lock b/packages/hmssdk_flutter/example/android/Gemfile.lock index 9d46e2b05..b6be76cfe 100644 --- a/packages/hmssdk_flutter/example/android/Gemfile.lock +++ b/packages/hmssdk_flutter/example/android/Gemfile.lock @@ -13,20 +13,20 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.859.0) - aws-sdk-core (3.188.0) - aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (1.862.0) + aws-sdk-core (3.190.0) + aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.73.0) + aws-sdk-kms (1.74.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.140.0) - aws-sdk-core (~> 3, >= 3.188.0) + aws-sdk-s3 (1.141.0) + aws-sdk-core (~> 3, >= 3.189.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.6) - aws-sigv4 (1.7.0) + aws-sigv4 (~> 1.8) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.1.0) @@ -41,7 +41,7 @@ GEM domain_name (0.6.20231109) dotenv (2.8.1) emoji_regex (3.2.3) - excon (0.104.0) + excon (0.105.0) faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -160,7 +160,7 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) jmespath (1.6.2) - json (2.6.3) + json (2.7.0) jwt (2.7.1) mini_magick (4.12.0) mini_mime (1.1.5) diff --git a/packages/hmssdk_flutter/example/ios/Gemfile.lock b/packages/hmssdk_flutter/example/ios/Gemfile.lock index 8f884902d..61114f35a 100644 --- a/packages/hmssdk_flutter/example/ios/Gemfile.lock +++ b/packages/hmssdk_flutter/example/ios/Gemfile.lock @@ -13,20 +13,20 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.859.0) - aws-sdk-core (3.188.0) - aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (1.862.0) + aws-sdk-core (3.190.0) + aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.73.0) + aws-sdk-kms (1.74.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.140.0) - aws-sdk-core (~> 3, >= 3.188.0) + aws-sdk-s3 (1.141.0) + aws-sdk-core (~> 3, >= 3.189.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.6) - aws-sigv4 (1.7.0) + aws-sigv4 (~> 1.8) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.1.0) @@ -41,7 +41,7 @@ GEM domain_name (0.6.20231109) dotenv (2.8.1) emoji_regex (3.2.3) - excon (0.104.0) + excon (0.105.0) faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -161,7 +161,7 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) jmespath (1.6.2) - json (2.6.3) + json (2.7.0) jwt (2.7.1) mini_magick (4.12.0) mini_mime (1.1.5) diff --git a/packages/hmssdk_flutter/example/ios/Podfile.lock b/packages/hmssdk_flutter/example/ios/Podfile.lock index 523d413f9..b4e5fdab8 100644 --- a/packages/hmssdk_flutter/example/ios/Podfile.lock +++ b/packages/hmssdk_flutter/example/ios/Podfile.lock @@ -79,7 +79,7 @@ PODS: - Flutter (1.0.0) - flutter_foreground_task (0.0.1): - Flutter - - GoogleDataTransport (9.2.5): + - GoogleDataTransport (9.3.0): - GoogleUtilities/Environment (~> 7.7) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) @@ -230,7 +230,7 @@ SPEC CHECKSUMS: FirebaseSharedSwift: 62e248642c0582324d0390706cadd314687c116b Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_foreground_task: 21ef182ab0a29a3005cc72cd70e5f45cb7f7f817 - GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2 + GoogleDataTransport: 57c22343ab29bc686febbf7cbb13bad167c2d8fe GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34 HMSAnalyticsSDK: 4d2a88a729b1eb42f3d25f217c28937ec318a5b7 HMSBroadcastExtensionSDK: d80fe325f6c928bd8e5176290b5a4b7ae15d6fbb diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index 2291514f0..191976aa4 100644 --- a/packages/hmssdk_flutter/example/pubspec.lock +++ b/packages/hmssdk_flutter/example/pubspec.lock @@ -93,10 +93,10 @@ packages: dependency: transitive description: name: cross_file - sha256: "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5" + sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e url: "https://pub.dev" source: hosted - version: "0.3.3+7" + version: "0.3.3+8" crypto: dependency: transitive description: @@ -523,10 +523,10 @@ packages: dependency: transitive description: name: petitparser - sha256: eeb2d1428ee7f4170e2bd498827296a18d4e7fc462b71727d111c0ac7707cfa6 + sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 url: "https://pub.dev" source: hosted - version: "6.0.1" + version: "6.0.2" platform: dependency: transitive description: @@ -864,10 +864,10 @@ packages: dependency: transitive description: name: win32 - sha256: "7c99c0e1e2fa190b48d25c81ca5e42036d5cac81430ef249027d97b0935c553f" + sha256: b0f37db61ba2f2e9b7a78a1caece0052564d1bc70668156cf3a29d676fe4e574 url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "5.1.1" xdg_directories: dependency: transitive description: From 72166d100bf3f7cc6853f0dc65f5f8ea1f93178c Mon Sep 17 00:00:00 2001 From: Yogesh Singh Date: Wed, 6 Dec 2023 13:48:04 +0530 Subject: [PATCH 03/32] updated packages --- .trunk/trunk.yaml | 4 +- packages/hms_room_kit/README.md | 2 - .../hms_room_kit/example/ios/Podfile.lock | 10 +- packages/hms_room_kit/example/pubspec.lock | 64 +++++---- packages/hms_room_kit/pubspec.lock | 64 +++++---- packages/hmssdk_flutter/README.md | 2 - .../hms/hmssdk_flutter/HmssdkFlutterPlugin.kt | 126 ++++++++++-------- .../hmssdk_flutter/views/HMSTextureView.kt | 83 +++++++----- .../example/android/Gemfile.lock | 12 +- .../hmssdk_flutter/example/ios/Gemfile.lock | 12 +- .../hmssdk_flutter/example/ios/Podfile.lock | 36 ++--- packages/hmssdk_flutter/example/pubspec.lock | 42 +++--- .../Models/HMSHLSVariantExtension.swift | 5 +- 13 files changed, 253 insertions(+), 209 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index e8be4fec8..a61c828b2 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -11,8 +11,8 @@ lint: - actionlint@1.6.26 - checkov@3.1.9 - osv-scanner@1.4.3 - - trivy@0.47.0 - - trufflehog@3.63.2-rc0 + - trivy@0.48.0 + - trufflehog@3.63.2 - oxipng@9.0.0 - yamllint@1.33.0 - markdownlint@0.37.0 diff --git a/packages/hms_room_kit/README.md b/packages/hms_room_kit/README.md index 4486ec380..e952154e0 100644 --- a/packages/hms_room_kit/README.md +++ b/packages/hms_room_kit/README.md @@ -14,13 +14,11 @@ A powerful prebuilt UI library for audio/video conferencing, live streaming, and one-to-one calls. This package provides developers with a comprehensive set of tools and components to quickly integrate high-quality audio and video communication features into their Flutter applications. - | Package | Version | | -------------- | ------------------------------------------------------------------------------------------------------ | | hms_room_kit | [![Pub Version](https://img.shields.io/pub/v/hms_room_kit)](https://pub.dev/packages/hms_room_kit) | | hmssdk_flutter | [![Pub Version](https://img.shields.io/pub/v/hmssdk_flutter)](https://pub.dev/packages/hmssdk_flutter) | - 📖 Read the Complete Documentation here: https://www.100ms.live/docs/flutter/v2/guides/quickstart 📲 Download the Sample iOS app here: diff --git a/packages/hms_room_kit/example/ios/Podfile.lock b/packages/hms_room_kit/example/ios/Podfile.lock index 5c31dbc5f..5481e0490 100644 --- a/packages/hms_room_kit/example/ios/Podfile.lock +++ b/packages/hms_room_kit/example/ios/Podfile.lock @@ -6,14 +6,14 @@ PODS: - HMSBroadcastExtensionSDK (0.0.9) - HMSHLSPlayerSDK (0.0.2): - HMSAnalyticsSDK (= 0.0.2) - - HMSSDK (1.3.0): + - HMSSDK (1.3.1): - HMSAnalyticsSDK (= 0.0.2) - HMSWebRTC (= 1.0.5116) - - hmssdk_flutter (1.9.3): + - hmssdk_flutter (1.9.4): - Flutter - HMSBroadcastExtensionSDK (= 0.0.9) - HMSHLSPlayerSDK (= 0.0.2) - - HMSSDK (= 1.3.0) + - HMSSDK (= 1.3.1) - HMSWebRTC (1.0.5116) - path_provider_foundation (0.0.1): - Flutter @@ -70,8 +70,8 @@ SPEC CHECKSUMS: HMSAnalyticsSDK: 4d2a88a729b1eb42f3d25f217c28937ec318a5b7 HMSBroadcastExtensionSDK: d80fe325f6c928bd8e5176290b5a4b7ae15d6fbb HMSHLSPlayerSDK: 6a54ad4d12f3dc2270d1ecd24019d71282a4f6a3 - HMSSDK: 631908d772646b66b3c4f7f4e1fb2681f7abb990 - hmssdk_flutter: 0b17359aefb7ec222e1b0cc44a595759a317ff98 + HMSSDK: 04aac0fefd95419cd1b4135156d4295cbcd51216 + hmssdk_flutter: 3876d06f4ad68bf48a2ceb4c797551fedb860bd1 HMSWebRTC: ae54e9dd91b869051b283b43b14f57d43b7bf8e1 path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 diff --git a/packages/hms_room_kit/example/pubspec.lock b/packages/hms_room_kit/example/pubspec.lock index 039975216..fe5952f4c 100644 --- a/packages/hms_room_kit/example/pubspec.lock +++ b/packages/hms_room_kit/example/pubspec.lock @@ -69,10 +69,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" convert: dependency: transitive description: @@ -306,10 +306,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: @@ -394,42 +394,50 @@ packages: dependency: transitive description: name: permission_handler - sha256: "284a66179cabdf942f838543e10413246f06424d960c92ba95c84439154fcac8" + sha256: "860c6b871c94c78e202dc69546d4d8fd84bd59faeb36f8fb9888668a53ff4f78" url: "https://pub.dev" source: hosted - version: "11.0.1" + version: "11.1.0" permission_handler_android: dependency: transitive description: name: permission_handler_android - sha256: f9fddd3b46109bd69ff3f9efa5006d2d309b7aec0f3c1c5637a60a2d5659e76e + sha256: "2f1bec180ee2f5665c22faada971a8f024761f632e93ddc23310487df52dcfa6" url: "https://pub.dev" source: hosted - version: "11.1.0" + version: "12.0.1" permission_handler_apple: dependency: transitive description: name: permission_handler_apple - sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5" + sha256: "1a816084338ada8d574b1cb48390e6e8b19305d5120fe3a37c98825bacc78306" + url: "https://pub.dev" + source: hosted + version: "9.2.0" + permission_handler_html: + dependency: transitive + description: + name: permission_handler_html + sha256: "11b762a8c123dced6461933a88ea1edbbe036078c3f9f41b08886e678e7864df" url: "https://pub.dev" source: hosted - version: "9.1.4" + version: "0.1.0+2" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface - sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4" + sha256: d87349312f7eaf6ce0adaf668daf700ac5b06af84338bd8b8574dfbd93ffe1a1 url: "https://pub.dev" source: hosted - version: "3.12.0" + version: "4.0.2" permission_handler_windows: dependency: transitive description: name: permission_handler_windows - sha256: cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098 + sha256: "1e8640c1e39121128da6b816d236e714d2cf17fac5a105dd6acdd3403a628004" url: "https://pub.dev" source: hosted - version: "0.1.3" + version: "0.2.0" petitparser: dependency: transitive description: @@ -530,10 +538,10 @@ packages: dependency: transitive description: name: shared_preferences_web - sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf + sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.2.2" shared_preferences_windows: dependency: transitive description: @@ -567,18 +575,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -599,10 +607,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" tuple: dependency: transitive description: @@ -671,10 +679,10 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "7fd2f55fe86cea2897b963e864dc01a7eb0719ecc65fcef4c1cc3d686d718bb2" + sha256: "138bd45b3a456dcfafc46d1a146787424f8d2edfbf2809c9324361e58f851cf7" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.1" url_launcher_windows: dependency: transitive description: @@ -735,10 +743,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" win32: dependency: transitive description: @@ -764,5 +772,5 @@ packages: source: hosted version: "6.5.0" sdks: - dart: ">=3.1.0 <4.0.0" - flutter: ">=3.13.0" + dart: ">=3.2.0 <4.0.0" + flutter: ">=3.16.0" diff --git a/packages/hms_room_kit/pubspec.lock b/packages/hms_room_kit/pubspec.lock index c897422fb..ee5be9060 100644 --- a/packages/hms_room_kit/pubspec.lock +++ b/packages/hms_room_kit/pubspec.lock @@ -69,10 +69,10 @@ packages: dependency: "direct main" description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" convert: dependency: transitive description: @@ -291,10 +291,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: @@ -379,42 +379,50 @@ packages: dependency: "direct main" description: name: permission_handler - sha256: "284a66179cabdf942f838543e10413246f06424d960c92ba95c84439154fcac8" + sha256: "860c6b871c94c78e202dc69546d4d8fd84bd59faeb36f8fb9888668a53ff4f78" url: "https://pub.dev" source: hosted - version: "11.0.1" + version: "11.1.0" permission_handler_android: dependency: transitive description: name: permission_handler_android - sha256: f9fddd3b46109bd69ff3f9efa5006d2d309b7aec0f3c1c5637a60a2d5659e76e + sha256: "2f1bec180ee2f5665c22faada971a8f024761f632e93ddc23310487df52dcfa6" url: "https://pub.dev" source: hosted - version: "11.1.0" + version: "12.0.1" permission_handler_apple: dependency: transitive description: name: permission_handler_apple - sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5" + sha256: "1a816084338ada8d574b1cb48390e6e8b19305d5120fe3a37c98825bacc78306" + url: "https://pub.dev" + source: hosted + version: "9.2.0" + permission_handler_html: + dependency: transitive + description: + name: permission_handler_html + sha256: "11b762a8c123dced6461933a88ea1edbbe036078c3f9f41b08886e678e7864df" url: "https://pub.dev" source: hosted - version: "9.1.4" + version: "0.1.0+2" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface - sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4" + sha256: d87349312f7eaf6ce0adaf668daf700ac5b06af84338bd8b8574dfbd93ffe1a1 url: "https://pub.dev" source: hosted - version: "3.12.0" + version: "4.0.2" permission_handler_windows: dependency: transitive description: name: permission_handler_windows - sha256: cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098 + sha256: "1e8640c1e39121128da6b816d236e714d2cf17fac5a105dd6acdd3403a628004" url: "https://pub.dev" source: hosted - version: "0.1.3" + version: "0.2.0" petitparser: dependency: transitive description: @@ -515,10 +523,10 @@ packages: dependency: transitive description: name: shared_preferences_web - sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf + sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.2.2" shared_preferences_windows: dependency: transitive description: @@ -552,18 +560,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -584,10 +592,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" tuple: dependency: "direct main" description: @@ -656,10 +664,10 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "7fd2f55fe86cea2897b963e864dc01a7eb0719ecc65fcef4c1cc3d686d718bb2" + sha256: "138bd45b3a456dcfafc46d1a146787424f8d2edfbf2809c9324361e58f851cf7" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.1" url_launcher_windows: dependency: transitive description: @@ -720,10 +728,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" win32: dependency: transitive description: @@ -749,5 +757,5 @@ packages: source: hosted version: "6.5.0" sdks: - dart: ">=3.1.0 <4.0.0" - flutter: ">=3.13.0" + dart: ">=3.2.0 <4.0.0" + flutter: ">=3.16.0" diff --git a/packages/hmssdk_flutter/README.md b/packages/hmssdk_flutter/README.md index ddd32dc2f..d8437f853 100644 --- a/packages/hmssdk_flutter/README.md +++ b/packages/hmssdk_flutter/README.md @@ -15,13 +15,11 @@ Integrate Real Time Audio and Video conferencing, Interactive Live Streaming, an With support for HLS and RTMP Live Streaming and Recording, Picture-in-Picture (PiP), CallKit, VoIP, one-to-one Video Call Modes, Audio Rooms, Video Player and much more, add immersive real-time communications to your apps. - | Package | Version | | -------------- | ------------------------------------------------------------------------------------------------------ | | hms_room_kit | [![Pub Version](https://img.shields.io/pub/v/hms_room_kit)](https://pub.dev/packages/hms_room_kit) | | hmssdk_flutter | [![Pub Version](https://img.shields.io/pub/v/hmssdk_flutter)](https://pub.dev/packages/hmssdk_flutter) | - 📖 Read the Complete Documentation here: https://www.100ms.live/docs/flutter/v2/guides/quickstart 📲 Download the Sample iOS app here: diff --git a/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HmssdkFlutterPlugin.kt b/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HmssdkFlutterPlugin.kt index e80b5aea7..bcbc71617 100644 --- a/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HmssdkFlutterPlugin.kt +++ b/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HmssdkFlutterPlugin.kt @@ -82,9 +82,10 @@ class HmssdkFlutterPlugin : var hlsStreamUrl: String? = null private var isRoomAudioUnmutedLocally = true - private val renderers = HashMap() + private val renderers = HashMap() private var hmsTextureRegistry: TextureRegistry? = null private var hmsBinaryMessenger: BinaryMessenger? = null + override fun onAttachedToEngine( @NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding, ) { @@ -136,7 +137,6 @@ class HmssdkFlutterPlugin : } } - override fun onMethodCall( @NonNull call: MethodCall, @NonNull result: Result, @@ -256,22 +256,22 @@ class HmssdkFlutterPlugin : } "create_texture_view" -> { - createTextureView(call,result) + createTextureView(call, result) } "dispose_texture_view" -> { disposeTextureView(call, result) } "add_track" -> { - addTrack(call,result) + addTrack(call, result) } "remove_track" -> { - removeTrack(call,result) + removeTrack(call, result) } "set_display_resolution" -> { - setDisplayResolution(call,result) + setDisplayResolution(call, result) } "get_peer_list_iterator", "peer_list_iterator_has_next", "peer_list_iterator_next" -> { @@ -617,144 +617,156 @@ class HmssdkFlutterPlugin : return null } - private fun createTextureView(call: MethodCall, result: Result){ - + private fun createTextureView( + call: MethodCall, + result: Result, + ) { val trackId = call.argument("track_id") - val addTrackByDefault = call.argument("add_track_by_def")?:false - val disableAutoSimulcastLayerSelect = call.argument("disable_auto_simulcast_layer_select")?:false + val addTrackByDefault = call.argument("add_track_by_def") ?: false + val disableAutoSimulcastLayerSelect = call.argument("disable_auto_simulcast_layer_select") ?: false val entry: SurfaceTextureEntry? = hmsTextureRegistry?.createSurfaceTexture() entry?.let { surfaceTextureEntry -> val surfaceTexture = surfaceTextureEntry.surfaceTexture() - val renderer = HMSTextureView(surfaceTexture,entry) - if(addTrackByDefault){ + val renderer = HMSTextureView(surfaceTexture, entry) + if (addTrackByDefault) { val room = hmssdk?.getRoom() room?.let { currentRoom -> - trackId?.let {currentTrackId -> - val track = HmsUtilities.getVideoTrack(currentTrackId,currentRoom) + trackId?.let { currentTrackId -> + val track = HmsUtilities.getVideoTrack(currentTrackId, currentRoom) track?.let { videoTrack -> - Log.i("HMSTextureView","Init Add Track called for track: ${track.trackId}") - renderer.addTrack(videoTrack,disableAutoSimulcastLayerSelect) - }?: run { - HMSErrorLogger.returnHMSException("createTextureView","No track with $trackId found","Track not found error",result) + Log.i("HMSTextureView", "Init Add Track called for track: ${track.trackId}") + renderer.addTrack(videoTrack, disableAutoSimulcastLayerSelect) + } ?: run { + HMSErrorLogger.returnHMSException("createTextureView", "No track with $trackId found", "Track not found error", result) return } - }?: run { - HMSErrorLogger.returnHMSException("createTextureView","trackId is null"," NULL ERROR",result) + } ?: run { + HMSErrorLogger.returnHMSException("createTextureView", "trackId is null", " NULL ERROR", result) return } - }?: run { - HMSErrorLogger.returnHMSException("createTextureView","Room is null","NULL Error",result) + } ?: run { + HMSErrorLogger.returnHMSException("createTextureView", "Room is null", "NULL Error", result) return } } renderers["${surfaceTextureEntry.id()}"] = renderer - val eventChannel = EventChannel( - hmsBinaryMessenger, - "HMSTextureView/Texture/" + entry.id() - ) + val eventChannel = + EventChannel( + hmsBinaryMessenger, + "HMSTextureView/Texture/" + entry.id(), + ) eventChannel.setStreamHandler(renderer) renderer.setTextureViewEventChannel(eventChannel) - val data = HashMap() + val data = HashMap() data["texture_id"] = surfaceTextureEntry.id() - result.success(HMSResultExtension.toDictionary(true,data)) - - }?:run{ - HMSErrorLogger.returnHMSException("createTextureView","entry is null","NULL Error",result) + result.success(HMSResultExtension.toDictionary(true, data)) + } ?: run { + HMSErrorLogger.returnHMSException("createTextureView", "entry is null", "NULL Error", result) return } } - private fun disposeTextureView(call: MethodCall,result: Result){ + private fun disposeTextureView( + call: MethodCall, + result: Result, + ) { val textureId = call.argument("texture_id") ?: HMSErrorLogger.returnArgumentsError("textureId is null") var renderer = renderers["$textureId"] - if(renderer != null){ + if (renderer != null) { renderer.disposeTextureView() renderer = null renderers.remove("$textureId") - result.success(HMSResultExtension.toDictionary(true,null)) - } - else { + result.success(HMSResultExtension.toDictionary(true, null)) + } else { HMSErrorLogger.returnHMSException( "disposeTextureView", "No textureView with given textureId found", "Key not found error", - result + result, ) } } - private fun addTrack(call: MethodCall, result: Result){ + private fun addTrack( + call: MethodCall, + result: Result, + ) { val trackId = call.argument("track_id") val textureId = call.argument("texture_id") - val disableAutoSimulcastLayerSelect = call.argument("disable_auto_simulcast_layer_select")?:false + val disableAutoSimulcastLayerSelect = call.argument("disable_auto_simulcast_layer_select") ?: false val height = call.argument("height") val width = call.argument("width") - textureId?.let {texture -> + textureId?.let { texture -> trackId?.let { val renderer = renderers["$textureId"] renderer?.let { textureRenderer -> val room = hmssdk?.getRoom() room?.let { currentRoom -> - val track = HmsUtilities.getVideoTrack(trackId,currentRoom) - track?.let {videoTrack -> - textureRenderer.addTrack(videoTrack,disableAutoSimulcastLayerSelect,height,width) + val track = HmsUtilities.getVideoTrack(trackId, currentRoom) + track?.let { videoTrack -> + textureRenderer.addTrack(videoTrack, disableAutoSimulcastLayerSelect, height, width) result.success(null) - }?: run { + } ?: run { HMSErrorLogger.returnHMSException( "addTrack", "track with given trackId not found", "Track not found error", - result + result, ) } - }?: run { + } ?: run { HMSErrorLogger.returnHMSException( "addTrack", "room not found", "room not found error", - result + result, ) } - }?: run { + } ?: run { HMSErrorLogger.returnHMSException( "addTrack", "renderer with given $texture not found", "renderer not found error", - result + result, ) } - }?: run { + } ?: run { HMSErrorLogger.returnHMSException( "addTrack", "trackId is null", "NULL ERROR", - result + result, ) } - }?:run { + } ?: run { HMSErrorLogger.returnHMSException( "addTrack", "textureId is null", "NULL ERROR", - result + result, ) } } - private fun removeTrack(call: MethodCall, result: Result){ + private fun removeTrack( + call: MethodCall, + result: Result, + ) { val textureId = call.argument("texture_id") val renderer = renderers["$textureId"] renderer?.removeTrack() result.success(null) - } - private fun setDisplayResolution(call: MethodCall, result: Result){ + private fun setDisplayResolution( + call: MethodCall, + result: Result, + ) { val textureId = call.argument("texture_id") val height = call.argument("height") val width = call.argument("width") @@ -762,7 +774,7 @@ class HmssdkFlutterPlugin : height?.let { videoViewHeight -> width?.let { videoViewWidth -> - renderer?.setDisplayResolution(videoViewWidth,videoViewHeight) + renderer?.setDisplayResolution(videoViewWidth, videoViewHeight) } } result.success(null) diff --git a/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/views/HMSTextureView.kt b/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/views/HMSTextureView.kt index 9d70dc219..c328c689f 100644 --- a/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/views/HMSTextureView.kt +++ b/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/views/HMSTextureView.kt @@ -8,71 +8,81 @@ import io.flutter.view.TextureRegistry import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import live.hms.hmssdk_flutter.HMSTrackUpdateExtension import live.hms.video.media.tracks.HMSVideoTrack import live.hms.videoview.VideoViewStateChangeListener import live.hms.videoview.textureview.HMSTextureRenderer class HMSTextureView( texture: SurfaceTexture, - private var entry: TextureRegistry.SurfaceTextureEntry? -):EventChannel.StreamHandler{ - + private var entry: TextureRegistry.SurfaceTextureEntry?, +) : EventChannel.StreamHandler { private var eventChannel: EventChannel? = null private var eventSink: EventSink? = null private var hmsTextureRenderer: HMSTextureRenderer? = null private var uid: Long? = null + init { hmsTextureRenderer = HMSTextureRenderer(texture) uid = entry?.id() } - private val videoViewStateChangeListener = object : VideoViewStateChangeListener{ - override fun onResolutionChange(newWidth: kotlin.Int, newHeight: kotlin.Int) { - Log.i("Vkohli", "onResolutionChange -> newWidth:$newWidth, newHeight-> $newHeight") - val args = HashMap() - args["event_name"] = "on_resolution_changed" - val data = HashMap() - data["height"] = newHeight - data["width"] = newWidth - args["data"] = data - if (args["data"] != null) { - CoroutineScope(Dispatchers.Main).launch { - eventSink?.success(args) + private val videoViewStateChangeListener = + object : VideoViewStateChangeListener { + override fun onResolutionChange( + newWidth: kotlin.Int, + newHeight: kotlin.Int, + ) { + val args = HashMap() + args["event_name"] = "on_resolution_changed" + val data = HashMap() + data["height"] = newHeight + data["width"] = newWidth + args["data"] = data + if (args["data"] != null) { + CoroutineScope(Dispatchers.Main).launch { + eventSink?.success(args) + } } } - } - override fun onFirstFrameRendered() { - super.onFirstFrameRendered() + override fun onFirstFrameRendered() { + super.onFirstFrameRendered() + } } - } - fun addTrack(track: HMSVideoTrack, disableAutoSimulcastLayerSelect: Boolean, height: Int? = null, width: Int? = null){ - Log.i("HMSTextureView","Add Track called for track: ${track.trackId}") + fun addTrack( + track: HMSVideoTrack, + disableAutoSimulcastLayerSelect: Boolean, + height: Int? = null, + width: Int? = null, + ) { + Log.i("HMSTextureView", "Add Track called for track: ${track.trackId}") hmsTextureRenderer?.addVideoViewStateChangeListener(videoViewStateChangeListener) hmsTextureRenderer?.disableAutoSimulcastLayerSelect(disableAutoSimulcastLayerSelect) - if(!disableAutoSimulcastLayerSelect){ + if (!disableAutoSimulcastLayerSelect) { height?.let { videoViewHeight -> width?.let { videoViewWidth -> - hmsTextureRenderer?.displayResolution(videoViewWidth,videoViewHeight) + hmsTextureRenderer?.displayResolution(videoViewWidth, videoViewHeight) } } } - hmsTextureRenderer?.addTrack(track,true) + hmsTextureRenderer?.addTrack(track, true) } - fun setDisplayResolution(width: Int, height: Int){ - hmsTextureRenderer?.displayResolution(width,height) + fun setDisplayResolution( + width: Int, + height: Int, + ) { + hmsTextureRenderer?.displayResolution(width, height) } - fun removeTrack(){ - Log.i("HMSTextureView","Remove Track called") + fun removeTrack() { + Log.i("HMSTextureView", "Remove Track called") hmsTextureRenderer?.removeTrack() } - fun disposeTextureView(){ - Log.i("HMSTextureView","disposeTextureView called") + fun disposeTextureView() { + Log.i("HMSTextureView", "disposeTextureView called") removeTrack() entry?.release() entry = null @@ -81,15 +91,18 @@ class HMSTextureView( eventSink = null } - fun setTextureViewEventChannel(eventChannel:EventChannel){ - this.eventChannel = eventChannel + fun setTextureViewEventChannel(eventChannel: EventChannel) { + this.eventChannel = eventChannel } - override fun onListen(arguments: Any?, events: EventSink?) { + override fun onListen( + arguments: Any?, + events: EventSink?, + ) { eventSink = events } override fun onCancel(arguments: Any?) { eventSink = null } -} \ No newline at end of file +} diff --git a/packages/hmssdk_flutter/example/android/Gemfile.lock b/packages/hmssdk_flutter/example/android/Gemfile.lock index b6be76cfe..3aa217277 100644 --- a/packages/hmssdk_flutter/example/android/Gemfile.lock +++ b/packages/hmssdk_flutter/example/android/Gemfile.lock @@ -13,7 +13,7 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.862.0) + aws-partitions (1.863.0) aws-sdk-core (3.190.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) @@ -133,11 +133,11 @@ GEM google-apis-core (>= 0.11.0, < 2.a) google-apis-storage_v1 (0.29.0) google-apis-core (>= 0.11.0, < 2.a) - google-cloud-core (1.6.0) - google-cloud-env (~> 1.0) + google-cloud-core (1.6.1) + google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (1.6.0) - faraday (>= 0.17.3, < 3.0) + google-cloud-env (2.0.1) + faraday (>= 1.0, < 3.a) google-cloud-errors (1.3.1) google-cloud-storage (1.45.0) addressable (~> 2.8) @@ -160,7 +160,7 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) jmespath (1.6.2) - json (2.7.0) + json (2.7.1) jwt (2.7.1) mini_magick (4.12.0) mini_mime (1.1.5) diff --git a/packages/hmssdk_flutter/example/ios/Gemfile.lock b/packages/hmssdk_flutter/example/ios/Gemfile.lock index 61114f35a..b63c798f1 100644 --- a/packages/hmssdk_flutter/example/ios/Gemfile.lock +++ b/packages/hmssdk_flutter/example/ios/Gemfile.lock @@ -13,7 +13,7 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.862.0) + aws-partitions (1.863.0) aws-sdk-core (3.190.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) @@ -134,11 +134,11 @@ GEM google-apis-core (>= 0.11.0, < 2.a) google-apis-storage_v1 (0.29.0) google-apis-core (>= 0.11.0, < 2.a) - google-cloud-core (1.6.0) - google-cloud-env (~> 1.0) + google-cloud-core (1.6.1) + google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (1.6.0) - faraday (>= 0.17.3, < 3.0) + google-cloud-env (2.0.1) + faraday (>= 1.0, < 3.a) google-cloud-errors (1.3.1) google-cloud-storage (1.45.0) addressable (~> 2.8) @@ -161,7 +161,7 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) jmespath (1.6.2) - json (2.7.0) + json (2.7.1) jwt (2.7.1) mini_magick (4.12.0) mini_mime (1.1.5) diff --git a/packages/hmssdk_flutter/example/ios/Podfile.lock b/packages/hmssdk_flutter/example/ios/Podfile.lock index 5ee7a9fc4..a1481439c 100644 --- a/packages/hmssdk_flutter/example/ios/Podfile.lock +++ b/packages/hmssdk_flutter/example/ios/Podfile.lock @@ -25,15 +25,15 @@ PODS: - Firebase/Performance (= 10.9.0) - firebase_core - Flutter - - FirebaseABTesting (10.18.0): + - FirebaseABTesting (10.19.0): - FirebaseCore (~> 10.0) - FirebaseCore (10.9.0): - FirebaseCoreInternal (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/Logger (~> 7.8) - - FirebaseCoreExtension (10.18.0): + - FirebaseCoreExtension (10.19.0): - FirebaseCore (~> 10.0) - - FirebaseCoreInternal (10.18.0): + - FirebaseCoreInternal (10.19.0): - "GoogleUtilities/NSData+zlib (~> 7.8)" - FirebaseCrashlytics (10.9.0): - FirebaseCore (~> 10.5) @@ -45,7 +45,7 @@ PODS: - PromisesObjC (~> 2.1) - FirebaseDynamicLinks (10.9.0): - FirebaseCore (~> 10.0) - - FirebaseInstallations (10.18.0): + - FirebaseInstallations (10.19.0): - FirebaseCore (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) @@ -60,14 +60,14 @@ PODS: - GoogleUtilities/ISASwizzler (~> 7.8) - GoogleUtilities/MethodSwizzler (~> 7.8) - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseRemoteConfig (10.18.0): + - FirebaseRemoteConfig (10.19.0): - FirebaseABTesting (~> 10.0) - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - FirebaseSharedSwift (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - "GoogleUtilities/NSData+zlib (~> 7.8)" - - FirebaseSessions (10.18.0): + - FirebaseSessions (10.19.0): - FirebaseCore (~> 10.5) - FirebaseCoreExtension (~> 10.0) - FirebaseInstallations (~> 10.0) @@ -75,7 +75,7 @@ PODS: - GoogleUtilities/Environment (~> 7.10) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesSwift (~> 2.1) - - FirebaseSharedSwift (10.18.0) + - FirebaseSharedSwift (10.19.0) - Flutter (1.0.0) - flutter_foreground_task (0.0.1): - Flutter @@ -97,14 +97,14 @@ PODS: - HMSBroadcastExtensionSDK (0.0.9) - HMSHLSPlayerSDK (0.0.2): - HMSAnalyticsSDK (= 0.0.2) - - HMSSDK (1.3.0): + - HMSSDK (1.3.1): - HMSAnalyticsSDK (= 0.0.2) - HMSWebRTC (= 1.0.5116) - hmssdk_flutter (1.9.4): - Flutter - HMSBroadcastExtensionSDK (= 0.0.9) - HMSHLSPlayerSDK (= 0.0.2) - - HMSSDK (= 1.3.0) + - HMSSDK (= 1.3.1) - HMSWebRTC (1.0.5116) - MTBBarcodeScanner (5.0.11) - nanopb (2.30909.1): @@ -217,17 +217,17 @@ SPEC CHECKSUMS: firebase_crashlytics: 9b80d1944507cc07fa1c4455797f7d2eb7c8873f firebase_dynamic_links: db9f2ebcc3ea646e76a1d3ee37e9e57890ff0a83 firebase_performance: d11d1fd9591547f6b75f325aaadd6550eaf7e090 - FirebaseABTesting: d8b10ff4c6d1a9d6b11f02a08463ad5fd9fc6b1b + FirebaseABTesting: bfa3b384b68cee10a89183649c64cd7998a37a12 FirebaseCore: b68d3616526ec02e4d155166bbafb8eca64af557 - FirebaseCoreExtension: 62b201498aa10535801cdf3448c7f4db5e24ed80 - FirebaseCoreInternal: 8eb002e564b533bdcf1ba011f33f2b5c10e2ed4a + FirebaseCoreExtension: c08d14c7b22e07994e876d837e6f58642f340087 + FirebaseCoreInternal: b444828ea7cfd594fca83046b95db98a2be4f290 FirebaseCrashlytics: b60329455285aff853e54139d8ddbfe1e5f2b9f9 FirebaseDynamicLinks: 8cb66c4f403aa6ddf86ff3bc3c383a652f344ce9 - FirebaseInstallations: e842042ec6ac1fd2e37d7706363ebe7f662afea4 + FirebaseInstallations: 033d199474164db20c8350736842a94fe717b960 FirebasePerformance: eee2f5da94fd7e5d15487649f8fe10a90c87c174 - FirebaseRemoteConfig: bbd42790a4e84fde6aab7eae810b608e7b5c0bf6 - FirebaseSessions: f90fe9212ee2818641eda051c0835c9c4e30d9ae - FirebaseSharedSwift: 62e248642c0582324d0390706cadd314687c116b + FirebaseRemoteConfig: a7fcc7a5941faa7e09248e91c8797340aa4c85f6 + FirebaseSessions: e5f4caa188dc8bc6142abc974355be75b042215e + FirebaseSharedSwift: f34eeb7d3ea87a34497629b6ca41657beadef76a Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_foreground_task: 21ef182ab0a29a3005cc72cd70e5f45cb7f7f817 GoogleDataTransport: 57c22343ab29bc686febbf7cbb13bad167c2d8fe @@ -235,8 +235,8 @@ SPEC CHECKSUMS: HMSAnalyticsSDK: 4d2a88a729b1eb42f3d25f217c28937ec318a5b7 HMSBroadcastExtensionSDK: d80fe325f6c928bd8e5176290b5a4b7ae15d6fbb HMSHLSPlayerSDK: 6a54ad4d12f3dc2270d1ecd24019d71282a4f6a3 - HMSSDK: 631908d772646b66b3c4f7f4e1fb2681f7abb990 - hmssdk_flutter: ce3c54bbda2a8e1d893be672a877510a546da012 + HMSSDK: 04aac0fefd95419cd1b4135156d4295cbcd51216 + hmssdk_flutter: 3876d06f4ad68bf48a2ceb4c797551fedb860bd1 HMSWebRTC: ae54e9dd91b869051b283b43b14f57d43b7bf8e1 MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5 diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index f81a063e2..90f3dc1b9 100644 --- a/packages/hmssdk_flutter/example/pubspec.lock +++ b/packages/hmssdk_flutter/example/pubspec.lock @@ -394,10 +394,10 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017" + sha256: "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79" url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "5.0.1" package_info_plus_platform_interface: dependency: transitive description: @@ -474,42 +474,50 @@ packages: dependency: transitive description: name: permission_handler - sha256: "284a66179cabdf942f838543e10413246f06424d960c92ba95c84439154fcac8" + sha256: "860c6b871c94c78e202dc69546d4d8fd84bd59faeb36f8fb9888668a53ff4f78" url: "https://pub.dev" source: hosted - version: "11.0.1" + version: "11.1.0" permission_handler_android: dependency: transitive description: name: permission_handler_android - sha256: f9fddd3b46109bd69ff3f9efa5006d2d309b7aec0f3c1c5637a60a2d5659e76e + sha256: "2f1bec180ee2f5665c22faada971a8f024761f632e93ddc23310487df52dcfa6" url: "https://pub.dev" source: hosted - version: "11.1.0" + version: "12.0.1" permission_handler_apple: dependency: transitive description: name: permission_handler_apple - sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5" + sha256: "1a816084338ada8d574b1cb48390e6e8b19305d5120fe3a37c98825bacc78306" + url: "https://pub.dev" + source: hosted + version: "9.2.0" + permission_handler_html: + dependency: transitive + description: + name: permission_handler_html + sha256: "11b762a8c123dced6461933a88ea1edbbe036078c3f9f41b08886e678e7864df" url: "https://pub.dev" source: hosted - version: "9.1.4" + version: "0.1.0+2" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface - sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4" + sha256: d87349312f7eaf6ce0adaf668daf700ac5b06af84338bd8b8574dfbd93ffe1a1 url: "https://pub.dev" source: hosted - version: "3.12.0" + version: "4.0.2" permission_handler_windows: dependency: transitive description: name: permission_handler_windows - sha256: cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098 + sha256: "1e8640c1e39121128da6b816d236e714d2cf17fac5a105dd6acdd3403a628004" url: "https://pub.dev" source: hosted - version: "0.1.3" + version: "0.2.0" petitparser: dependency: transitive description: @@ -618,10 +626,10 @@ packages: dependency: transitive description: name: shared_preferences_web - sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf + sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.2.2" shared_preferences_windows: dependency: transitive description: @@ -783,10 +791,10 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "7fd2f55fe86cea2897b963e864dc01a7eb0719ecc65fcef4c1cc3d686d718bb2" + sha256: "138bd45b3a456dcfafc46d1a146787424f8d2edfbf2809c9324361e58f851cf7" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.1" url_launcher_windows: dependency: transitive description: @@ -877,4 +885,4 @@ packages: version: "6.5.0" sdks: dart: ">=3.2.0 <4.0.0" - flutter: ">=3.13.0" + flutter: ">=3.16.0" diff --git a/packages/hmssdk_flutter/ios/Classes/Models/HMSHLSVariantExtension.swift b/packages/hmssdk_flutter/ios/Classes/Models/HMSHLSVariantExtension.swift index 8d9e71ffc..8d02b750e 100644 --- a/packages/hmssdk_flutter/ios/Classes/Models/HMSHLSVariantExtension.swift +++ b/packages/hmssdk_flutter/ios/Classes/Models/HMSHLSVariantExtension.swift @@ -18,10 +18,9 @@ class HMSHLSVariantExtension { dict["metadata"] = hmshlsVariant.metadata - if let url = hmshlsVariant.url{ + if let url = hmshlsVariant.url { dict["hls_stream_url"] = url.absoluteString - } - else{ + } else { dict["hls_stream_url"] = nil } From 7b1aa8496147e6db346819e3eddfd309d90e8edb Mon Sep 17 00:00:00 2001 From: Yogesh Singh Date: Wed, 6 Dec 2023 16:19:17 +0530 Subject: [PATCH 04/32] added states enum --- .../hmssdk_flutter/HMSRtmpStreamingState.kt | 94 ++++++++++++------- 1 file changed, 58 insertions(+), 36 deletions(-) diff --git a/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HMSRtmpStreamingState.kt b/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HMSRtmpStreamingState.kt index aca5ed6d1..3fe4ce4bf 100644 --- a/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HMSRtmpStreamingState.kt +++ b/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HMSRtmpStreamingState.kt @@ -6,67 +6,89 @@ import java.text.SimpleDateFormat class HMSStreamingState { companion object { - fun toDictionary(hmsRtmpStreamingState: HMSRtmpStreamingState?): HashMap? { + fun toDictionary(rtmpStreamingState: HMSRtmpStreamingState?): HashMap? { val map = HashMap() - if (hmsRtmpStreamingState == null)return null - map["running"] = hmsRtmpStreamingState.running - map["error"] = HMSExceptionExtension.toDictionary(hmsRtmpStreamingState.error) - if (hmsRtmpStreamingState.running) { - hmsRtmpStreamingState.startedAt?.let { - map["started_at"] = SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(hmsRtmpStreamingState.startedAt).toString() - } + if (rtmpStreamingState == null) return null + + map["running"] = rtmpStreamingState.running + + map["error"] = HMSExceptionExtension.toDictionary(rtmpStreamingState.error) + + rtmpStreamingState.startedAt?.let { + map["started_at"] = SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(rtmpStreamingState.startedAt).toString() } + + map["state"] = rtmpStreamingState.state.name + return map } - fun toDictionary(hmsServerRecordingState: HMSServerRecordingState?): HashMap? { + fun toDictionary(serverRecordingState: HMSServerRecordingState?): HashMap? { val map = HashMap() - if (hmsServerRecordingState == null)return null - map["running"] = hmsServerRecordingState.running - map["error"] = HMSExceptionExtension.toDictionary(hmsServerRecordingState.error) - if (hmsServerRecordingState.running) { - hmsServerRecordingState.startedAt?.let { - map["started_at"] = SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(hmsServerRecordingState.startedAt).toString() - } + if (serverRecordingState == null) return null + + map["running"] = serverRecordingState.running + + map["error"] = HMSExceptionExtension.toDictionary(serverRecordingState.error) + + serverRecordingState.startedAt?.let { + map["started_at"] = SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serverRecordingState.startedAt).toString() } + + map["state"] = serverRecordingState.state.name + return map } - fun toDictionary(hmsBrowserRecordingState: HMSBrowserRecordingState?): HashMap? { + fun toDictionary(browserRecordingState: HMSBrowserRecordingState?): HashMap? { val map = HashMap() - if (hmsBrowserRecordingState == null)return null - map["running"] = hmsBrowserRecordingState.running - map["error"] = HMSExceptionExtension.toDictionary(hmsBrowserRecordingState.error) - if (hmsBrowserRecordingState.running) { - hmsBrowserRecordingState.startedAt?.let { - map["started_at"] = SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(hmsBrowserRecordingState.startedAt).toString() - } + if (browserRecordingState == null) return null + + map["running"] = browserRecordingState.running + + map["error"] = HMSExceptionExtension.toDictionary(browserRecordingState.error) + + browserRecordingState.startedAt?.let { + map["started_at"] = SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(browserRecordingState.startedAt).toString() } - map["initialising"] = hmsBrowserRecordingState.initialising + + map["initialising"] = browserRecordingState.initialising + + map["state"] = browserRecordingState.state.name + return map } - fun toDictionary(hmsHlsStreamingState: HMSHLSStreamingState?): HashMap? { + fun toDictionary(hlsStreamingState: HMSHLSStreamingState?): HashMap? { val map = HashMap() - if (hmsHlsStreamingState == null)return null - map["running"] = hmsHlsStreamingState.running + if (hlsStreamingState == null) return null + + map["running"] = hlsStreamingState.running + val args = ArrayList() - hmsHlsStreamingState.variants?.forEach { + hlsStreamingState.variants?.forEach { args.add(HMSHLSVariantExtension.toDictionary(it)!!) } + map["variants"] = args + + map["state"] = hlsStreamingState.state.name + return map } - fun toDictionary(hmsHlsRecordingState: HmsHlsRecordingState?): HashMap? { + fun toDictionary(hlsRecordingState: HmsHlsRecordingState?): HashMap? { val map = HashMap() - if (hmsHlsRecordingState == null)return null - map["running"] = hmsHlsRecordingState.running - if (hmsHlsRecordingState.running == true) { - hmsHlsRecordingState.startedAt?.let { - map["started_at"] = SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(hmsHlsRecordingState.startedAt).toString() - } + if (hlsRecordingState == null) return null + + map["running"] = hlsRecordingState.running + + hlsRecordingState.startedAt?.let { + map["started_at"] = SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(hlsRecordingState.startedAt).toString() } + + map["state"] = hlsRecordingState.state.name + return map } } From 63e2dd1098613b130f105c7173dfcc501bac93a1 Mon Sep 17 00:00:00 2001 From: Yogesh Singh Date: Thu, 7 Dec 2023 15:40:52 +0530 Subject: [PATCH 05/32] added state parsing in Dart --- .trunk/trunk.yaml | 4 +- .../model/hms_browser_recording_state.dart | 11 +++-- .../src/model/hms_hls_recording_state.dart | 11 ++++- .../src/model/hms_hls_streaming_state.dart | 9 +++- .../src/model/hms_rtmp_streaming_state.dart | 13 +++-- .../src/model/hms_server_recording_state.dart | 11 ++++- .../lib/src/model/hms_streaming_state.dart | 49 +++++++++++++++++++ 7 files changed, 95 insertions(+), 13 deletions(-) create mode 100644 packages/hmssdk_flutter/lib/src/model/hms_streaming_state.dart diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index a61c828b2..3d660863f 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -1,6 +1,6 @@ version: 0.1 cli: - version: 1.17.2 + version: 1.18.0 plugins: sources: - id: trunk @@ -10,7 +10,7 @@ lint: enabled: - actionlint@1.6.26 - checkov@3.1.9 - - osv-scanner@1.4.3 + - osv-scanner@1.5.0 - trivy@0.48.0 - trufflehog@3.63.2 - oxipng@9.0.0 diff --git a/packages/hmssdk_flutter/lib/src/model/hms_browser_recording_state.dart b/packages/hmssdk_flutter/lib/src/model/hms_browser_recording_state.dart index eab39848f..622d7b762 100644 --- a/packages/hmssdk_flutter/lib/src/model/hms_browser_recording_state.dart +++ b/packages/hmssdk_flutter/lib/src/model/hms_browser_recording_state.dart @@ -1,20 +1,23 @@ // Project imports: import 'package:hmssdk_flutter/src/exceptions/hms_exception.dart'; import 'package:hmssdk_flutter/src/model/hms_date_extension.dart'; +import 'package:hmssdk_flutter/src/model/hms_recording_state.dart'; ///100ms HMSBrowserRecordingState /// -///[HMSBrowserRecordingState] contains information about the borwser recording status. +///[HMSBrowserRecordingState] contains information about the browser recording status. class HMSBrowserRecordingState { final HMSException? error; final bool running; DateTime? startedAt; final bool initialising; + HMSRecordingState state; HMSBrowserRecordingState( {required this.error, required this.running, this.startedAt, - required this.initialising}); + required this.initialising, + required this.state}); factory HMSBrowserRecordingState.fromMap(Map map) { return HMSBrowserRecordingState( @@ -23,6 +26,8 @@ class HMSBrowserRecordingState { startedAt: map['started_at'] != null ? HMSDateExtension.convertDateFromString(map['started_at']) : null, - initialising: map['initialising']); + initialising: map['initialising'], + state: HMSRecordingStateValues.getRecordingStateFromName( + map['state'] ?? 'NONE')); } } diff --git a/packages/hmssdk_flutter/lib/src/model/hms_hls_recording_state.dart b/packages/hmssdk_flutter/lib/src/model/hms_hls_recording_state.dart index 840647dca..551a848d5 100644 --- a/packages/hmssdk_flutter/lib/src/model/hms_hls_recording_state.dart +++ b/packages/hmssdk_flutter/lib/src/model/hms_hls_recording_state.dart @@ -1,6 +1,7 @@ // Project imports: import 'package:hmssdk_flutter/src/exceptions/hms_exception.dart'; import 'package:hmssdk_flutter/src/model/hms_date_extension.dart'; +import 'package:hmssdk_flutter/src/model/hms_recording_state.dart'; ///100ms HMSHLSRecordingState /// @@ -9,8 +10,12 @@ class HMSHLSRecordingState { final HMSException? error; final bool running; DateTime? startedAt; + HMSRecordingState state; HMSHLSRecordingState( - {required this.error, required this.running, this.startedAt}); + {required this.error, + required this.running, + this.startedAt, + required this.state}); factory HMSHLSRecordingState.fromMap(Map map) { return HMSHLSRecordingState( @@ -20,6 +25,8 @@ class HMSHLSRecordingState { running: map['running'], startedAt: map['started_at'] != null ? HMSDateExtension.convertDateFromString(map['started_at']) - : null); + : null, + state: HMSRecordingStateValues.getRecordingStateFromName( + map['state'] ?? 'NONE')); } } diff --git a/packages/hmssdk_flutter/lib/src/model/hms_hls_streaming_state.dart b/packages/hmssdk_flutter/lib/src/model/hms_hls_streaming_state.dart index 3e2855d07..738a7e6bc 100644 --- a/packages/hmssdk_flutter/lib/src/model/hms_hls_streaming_state.dart +++ b/packages/hmssdk_flutter/lib/src/model/hms_hls_streaming_state.dart @@ -1,5 +1,6 @@ // Project imports import 'package:hmssdk_flutter/src/model/hms_hls_variant.dart'; +import 'package:hmssdk_flutter/src/model/hms_streaming_state.dart'; ///100ms HMSHLSStreamingState /// @@ -7,7 +8,9 @@ import 'package:hmssdk_flutter/src/model/hms_hls_variant.dart'; class HMSHLSStreamingState { final bool running; final List variants; - HMSHLSStreamingState({required this.running, required this.variants}); + HMSStreamingState state; + HMSHLSStreamingState( + {required this.running, required this.variants, required this.state}); factory HMSHLSStreamingState.fromMap(Map map) { List variants = []; @@ -24,9 +27,13 @@ class HMSHLSStreamingState { } } + HMSStreamingState state = HMSStreamingStateValues.getStreamingStateFromName( + map['state'] ?? 'NONE'); + return HMSHLSStreamingState( running: map['running'], variants: variants, + state: state, ); } } diff --git a/packages/hmssdk_flutter/lib/src/model/hms_rtmp_streaming_state.dart b/packages/hmssdk_flutter/lib/src/model/hms_rtmp_streaming_state.dart index 65b46dc8e..a1244ab2e 100644 --- a/packages/hmssdk_flutter/lib/src/model/hms_rtmp_streaming_state.dart +++ b/packages/hmssdk_flutter/lib/src/model/hms_rtmp_streaming_state.dart @@ -1,16 +1,21 @@ // Project imports: import 'package:hmssdk_flutter/src/exceptions/hms_exception.dart'; import 'package:hmssdk_flutter/src/model/hms_date_extension.dart'; +import 'package:hmssdk_flutter/src/model/hms_streaming_state.dart'; -///100ms HMSRtmlStreamingState +///100ms HMSRtmpStreamingState /// ///[HMSRtmpStreamingState] contains information about the rtmp streaming status. class HMSRtmpStreamingState { final HMSException? error; final bool running; DateTime? startedAt; + HMSStreamingState state; HMSRtmpStreamingState( - {required this.error, required this.running, this.startedAt}); + {required this.error, + required this.running, + this.startedAt, + required this.state}); factory HMSRtmpStreamingState.fromMap(Map map) { return HMSRtmpStreamingState( @@ -18,6 +23,8 @@ class HMSRtmpStreamingState { running: map['running'], startedAt: map['started_at'] != null ? HMSDateExtension.convertDateFromString(map['started_at']) - : null); + : null, + state: HMSStreamingStateValues.getStreamingStateFromName( + map['state'] ?? 'NONE')); } } diff --git a/packages/hmssdk_flutter/lib/src/model/hms_server_recording_state.dart b/packages/hmssdk_flutter/lib/src/model/hms_server_recording_state.dart index 127bd0c24..57fcbdcf4 100644 --- a/packages/hmssdk_flutter/lib/src/model/hms_server_recording_state.dart +++ b/packages/hmssdk_flutter/lib/src/model/hms_server_recording_state.dart @@ -1,5 +1,6 @@ // Project imports: import 'package:hmssdk_flutter/src/model/hms_date_extension.dart'; +import 'package:hmssdk_flutter/src/model/hms_recording_state.dart'; import '../../hmssdk_flutter.dart'; @@ -10,8 +11,12 @@ class HMSServerRecordingState { final HMSException? error; final bool running; DateTime? startedAt; + HMSRecordingState state; HMSServerRecordingState( - {required this.error, required this.running, this.startedAt}); + {required this.error, + required this.running, + this.startedAt, + required this.state}); factory HMSServerRecordingState.fromMap(Map map) { return HMSServerRecordingState( @@ -19,6 +24,8 @@ class HMSServerRecordingState { running: map['running'], startedAt: map['started_at'] != null ? HMSDateExtension.convertDateFromString(map['started_at']) - : null); + : null, + state: HMSRecordingStateValues.getRecordingStateFromName( + map['state'] ?? 'NONE')); } } diff --git a/packages/hmssdk_flutter/lib/src/model/hms_streaming_state.dart b/packages/hmssdk_flutter/lib/src/model/hms_streaming_state.dart new file mode 100644 index 000000000..c8c849756 --- /dev/null +++ b/packages/hmssdk_flutter/lib/src/model/hms_streaming_state.dart @@ -0,0 +1,49 @@ +enum HMSStreamingState { + none, + + starting, + + started, + + stopped, + + failed, +} + +extension HMSStreamingStateValues on HMSStreamingState { + static HMSStreamingState getStreamingStateFromName(String name) { + switch (name) { + case 'NONE': + return HMSStreamingState.none; + case 'STARTING': + return HMSStreamingState.starting; + case 'STARTED': + return HMSStreamingState.started; + case 'STOPPED': + return HMSStreamingState.stopped; + case 'FAILED': + return HMSStreamingState.failed; + default: + return HMSStreamingState.none; + } + } + + static String getNameFromStreamingState(HMSStreamingState state) { + switch (state) { + case HMSStreamingState.none: + return 'NONE'; + + case HMSStreamingState.starting: + return 'STARTING'; + + case HMSStreamingState.started: + return 'STARTED'; + + case HMSStreamingState.stopped: + return 'STOPPED'; + + case HMSStreamingState.failed: + return 'FAILED'; + } + } +} From edfd58a793013214571d251d2014fca64797e04c Mon Sep 17 00:00:00 2001 From: ygit Date: Thu, 7 Dec 2023 10:27:36 +0000 Subject: [PATCH 06/32] =?UTF-8?q?=F0=9F=A4=96=20Automated=20Format=20and?= =?UTF-8?q?=20Fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/hmssdk_flutter/example/pubspec.lock | 8 -------- 1 file changed, 8 deletions(-) diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index 90f3dc1b9..59dc0eaf5 100644 --- a/packages/hmssdk_flutter/example/pubspec.lock +++ b/packages/hmssdk_flutter/example/pubspec.lock @@ -49,14 +49,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.1" - bot_toast: - dependency: transitive - description: - name: bot_toast - sha256: "6b93030a99a98335b8827ecd83021e92e885ffc61d261d3825ffdecdd17f3bdf" - url: "https://pub.dev" - source: hosted - version: "4.1.3" characters: dependency: transitive description: From 0cbd6757e50bbb1e58abfb7423cc101da637ab9e Mon Sep 17 00:00:00 2001 From: Yogesh Singh Date: Fri, 8 Dec 2023 14:32:24 +0530 Subject: [PATCH 07/32] added style --- .github/styles/Vocab/HMSVocab/accept.txt | 171 +++++++++++++++++++++++ .github/workflows/vale.yml | 2 +- .vale.ini | 2 +- 3 files changed, 173 insertions(+), 2 deletions(-) create mode 100644 .github/styles/Vocab/HMSVocab/accept.txt diff --git a/.github/styles/Vocab/HMSVocab/accept.txt b/.github/styles/Vocab/HMSVocab/accept.txt new file mode 100644 index 000000000..f2ee5d003 --- /dev/null +++ b/.github/styles/Vocab/HMSVocab/accept.txt @@ -0,0 +1,171 @@ +__main__ +__name__ +100ms +access_key +account_id +app_access_key +app_secret +async +beam_id +boolean +config +const +created_at +datetime +error_type +hostname +html +iat +json +JSON +jti +jwtid +meeting_url +metadata_id +metadata_timestamp +msg +nbf +npm +peer_id +presigned_url +recording_hls_vod_playlist_location +recording_single_files +recording_thumbnails +room_id +session_id +session_started_at +started_at +state_message +state_name +state_timestamp +stopped_at +sys +template_id +user_data +user_id +user_name +UUID +WebSocket +jwt +JWT +APIs +SDKs +param +Params +subscribeParams +application/json +customer_id +joined_at +left_at +TL;DR +Wowza +bitrate +custom_role_url +startedAt +meetingURL +livestream +recording_info +app_id +setVolume +trackBy +framerate +params +unmounting +HMSPeer's +hms +HMS +RTMP +HLS +URL +SDK +useEffect +DevTools +Bluetooth +Bool +downlink +YouTube +WebRTC +management_token +_id +you've +we've +We've +You've +pixelated +screenshare +unmuted +unmute +capturer +teardown +enum +nullable +subview +stringified +ProGuard +errMsg +bundler +validator +viewport +unmount +hls.failure +hls.stopped.success +hls.started.success +hls.recording.success +hls_vod_recording_path +hls_vod_recording_presigned_url +session_duration +px +broadcasted +navbar +upload_info +serializable +rtmpDestinations +hlsDestinations +WebKit +Codesandbox +autoplay +bitcode +onwards +Podfile +CocoaPods +FFmpeg +telehealth +kbps +updated_at +recording_assets +started_by +stopped_by +presign_duration +single_file_per_layer +asset_types +audio_only +hls +large_room +max_duration_seconds +codec +rtmp +txt +srt +superset +presign +output_modes +custom_vocabulary +tooltip +unmuting +sdk +autofocus +skippable +nack +pli +ssrc +tldraw +keyof +unobserve +qp +rehype +num +url +answer_max_len +answer_min_len +userid +peerid \ No newline at end of file diff --git a/.github/workflows/vale.yml b/.github/workflows/vale.yml index 5ebf066ef..83c1058d2 100644 --- a/.github/workflows/vale.yml +++ b/.github/workflows/vale.yml @@ -23,4 +23,4 @@ jobs: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} with: fail_on_error: true - filter_mode: diff_context \ No newline at end of file + filter_mode: diff_context diff --git a/.vale.ini b/.vale.ini index 252587669..5fceca20b 100644 --- a/.vale.ini +++ b/.vale.ini @@ -17,4 +17,4 @@ BasedOnStyles = Vale, Google BlockIgnores = (?s) *(\x60\x60\x60[a-z]*\n[\s\S]*?\x60\x60\x60) -TokenIgnores = [a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89aAbB][a-f0-9]{3}-[a-f0-9]{12} , r.M , (^[a-z]|[A-Z])[a-z]* , `{3}([\S]+)?\n([\s\S]+)\n`{3} , .*", \ No newline at end of file +TokenIgnores = [a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89aAbB][a-f0-9]{3}-[a-f0-9]{12} , r.M , (^[a-z]|[A-Z])[a-z]* , `{3}([\S]+)?\n([\s\S]+)\n`{3} , .*", From 84d6271afe44d0fa5fbaa568926a8e48252c9df7 Mon Sep 17 00:00:00 2001 From: Yogesh Singh Date: Fri, 8 Dec 2023 15:05:32 +0530 Subject: [PATCH 08/32] updated vale settings --- .github/styles/Vocab/HMSVocab/accept.txt | 4 +++- .vale.ini | 6 +----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/styles/Vocab/HMSVocab/accept.txt b/.github/styles/Vocab/HMSVocab/accept.txt index f2ee5d003..f2a8db832 100644 --- a/.github/styles/Vocab/HMSVocab/accept.txt +++ b/.github/styles/Vocab/HMSVocab/accept.txt @@ -168,4 +168,6 @@ url answer_max_len answer_min_len userid -peerid \ No newline at end of file +peerid +ios +android diff --git a/.vale.ini b/.vale.ini index 5fceca20b..54b8ace59 100644 --- a/.vale.ini +++ b/.vale.ini @@ -6,11 +6,7 @@ Vocab = HMSVocab Packages = Google -[formats] -mdx = md - -[*.md] - +[*] BasedOnStyles = Vale, Google From d3fef4e75c3a1a84a3a3c56d5bafda42d92046b7 Mon Sep 17 00:00:00 2001 From: Yogesh Singh Date: Mon, 11 Dec 2023 14:57:05 +0530 Subject: [PATCH 09/32] updated package versions --- .gitignore | 1 + .../hms_room_kit/example/ios/Podfile.lock | 10 +-- packages/hms_room_kit/example/pubspec.lock | 86 ++++++++++--------- packages/hms_room_kit/example/pubspec.yaml | 2 +- packages/hms_room_kit/pubspec.lock | 84 ++++++++++-------- packages/hms_room_kit/pubspec.yaml | 2 +- .../example/android/Gemfile.lock | 19 ++-- .../hmssdk_flutter/example/ios/Gemfile.lock | 19 ++-- .../hmssdk_flutter/example/ios/Podfile.lock | 36 ++++---- packages/hmssdk_flutter/example/pubspec.lock | 66 +++++++------- packages/hmssdk_flutter/example/pubspec.yaml | 2 +- .../lib/assets/sdk-versions.json | 4 +- packages/hmssdk_flutter/pubspec.yaml | 2 +- sample apps/bloc/pubspec.lock | 26 +++--- .../pubspec.lock | 26 +++--- .../flutter-hls-quickstart/pubspec.lock | 26 +++--- .../flutter-quickstart-app/pubspec.lock | 26 +++--- .../pubspec.lock | 26 +++--- sample apps/getx/pubspec.lock | 26 +++--- sample apps/hms-callkit-app/pubspec.lock | 26 +++--- sample apps/mobx/pubspec.lock | 26 +++--- sample apps/riverpod/pubspec.lock | 26 +++--- 22 files changed, 297 insertions(+), 270 deletions(-) diff --git a/.gitignore b/.gitignore index 0c4dd3865..bd60d1b62 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ sample apps/hms-callkit-app/.dart_tool/flutter_build/ .DS_Store packages/.DS_Store Runner.ipa +sample apps/flutterflow-prebuilt-quickstart/.dart_tool/ diff --git a/packages/hms_room_kit/example/ios/Podfile.lock b/packages/hms_room_kit/example/ios/Podfile.lock index 5c31dbc5f..5481e0490 100644 --- a/packages/hms_room_kit/example/ios/Podfile.lock +++ b/packages/hms_room_kit/example/ios/Podfile.lock @@ -6,14 +6,14 @@ PODS: - HMSBroadcastExtensionSDK (0.0.9) - HMSHLSPlayerSDK (0.0.2): - HMSAnalyticsSDK (= 0.0.2) - - HMSSDK (1.3.0): + - HMSSDK (1.3.1): - HMSAnalyticsSDK (= 0.0.2) - HMSWebRTC (= 1.0.5116) - - hmssdk_flutter (1.9.3): + - hmssdk_flutter (1.9.4): - Flutter - HMSBroadcastExtensionSDK (= 0.0.9) - HMSHLSPlayerSDK (= 0.0.2) - - HMSSDK (= 1.3.0) + - HMSSDK (= 1.3.1) - HMSWebRTC (1.0.5116) - path_provider_foundation (0.0.1): - Flutter @@ -70,8 +70,8 @@ SPEC CHECKSUMS: HMSAnalyticsSDK: 4d2a88a729b1eb42f3d25f217c28937ec318a5b7 HMSBroadcastExtensionSDK: d80fe325f6c928bd8e5176290b5a4b7ae15d6fbb HMSHLSPlayerSDK: 6a54ad4d12f3dc2270d1ecd24019d71282a4f6a3 - HMSSDK: 631908d772646b66b3c4f7f4e1fb2681f7abb990 - hmssdk_flutter: 0b17359aefb7ec222e1b0cc44a595759a317ff98 + HMSSDK: 04aac0fefd95419cd1b4135156d4295cbcd51216 + hmssdk_flutter: 3876d06f4ad68bf48a2ceb4c797551fedb860bd1 HMSWebRTC: ae54e9dd91b869051b283b43b14f57d43b7bf8e1 path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 diff --git a/packages/hms_room_kit/example/pubspec.lock b/packages/hms_room_kit/example/pubspec.lock index 49e421dac..70ca8e183 100644 --- a/packages/hms_room_kit/example/pubspec.lock +++ b/packages/hms_room_kit/example/pubspec.lock @@ -61,10 +61,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" convert: dependency: transitive description: @@ -77,10 +77,10 @@ packages: dependency: transitive description: name: cross_file - sha256: "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5" + sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e url: "https://pub.dev" source: hosted - version: "0.3.3+7" + version: "0.3.3+8" crypto: dependency: transitive description: @@ -214,7 +214,7 @@ packages: path: ".." relative: true source: path - version: "1.0.7" + version: "1.0.8" hmssdk_flutter: dependency: transitive description: @@ -227,10 +227,10 @@ packages: dependency: transitive description: name: http - sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" + sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139 url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.2" http_parser: dependency: transitive description: @@ -299,10 +299,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: @@ -387,50 +387,58 @@ packages: dependency: transitive description: name: permission_handler - sha256: "284a66179cabdf942f838543e10413246f06424d960c92ba95c84439154fcac8" + sha256: "860c6b871c94c78e202dc69546d4d8fd84bd59faeb36f8fb9888668a53ff4f78" url: "https://pub.dev" source: hosted - version: "11.0.1" + version: "11.1.0" permission_handler_android: dependency: transitive description: name: permission_handler_android - sha256: f9fddd3b46109bd69ff3f9efa5006d2d309b7aec0f3c1c5637a60a2d5659e76e + sha256: "2f1bec180ee2f5665c22faada971a8f024761f632e93ddc23310487df52dcfa6" url: "https://pub.dev" source: hosted - version: "11.1.0" + version: "12.0.1" permission_handler_apple: dependency: transitive description: name: permission_handler_apple - sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5" + sha256: "1a816084338ada8d574b1cb48390e6e8b19305d5120fe3a37c98825bacc78306" + url: "https://pub.dev" + source: hosted + version: "9.2.0" + permission_handler_html: + dependency: transitive + description: + name: permission_handler_html + sha256: "11b762a8c123dced6461933a88ea1edbbe036078c3f9f41b08886e678e7864df" url: "https://pub.dev" source: hosted - version: "9.1.4" + version: "0.1.0+2" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface - sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4" + sha256: d87349312f7eaf6ce0adaf668daf700ac5b06af84338bd8b8574dfbd93ffe1a1 url: "https://pub.dev" source: hosted - version: "3.12.0" + version: "4.0.2" permission_handler_windows: dependency: transitive description: name: permission_handler_windows - sha256: cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098 + sha256: "1e8640c1e39121128da6b816d236e714d2cf17fac5a105dd6acdd3403a628004" url: "https://pub.dev" source: hosted - version: "0.1.3" + version: "0.2.0" petitparser: dependency: transitive description: name: petitparser - sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 + sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 url: "https://pub.dev" source: hosted - version: "5.4.0" + version: "6.0.2" platform: dependency: transitive description: @@ -523,10 +531,10 @@ packages: dependency: transitive description: name: shared_preferences_web - sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf + sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.2.2" shared_preferences_windows: dependency: transitive description: @@ -560,18 +568,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -592,10 +600,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" tuple: dependency: transitive description: @@ -616,10 +624,10 @@ packages: dependency: transitive description: name: url_launcher - sha256: b1c9e98774adf8820c96fbc7ae3601231d324a7d5ebd8babe27b6dfac91357ba + sha256: e9aa5ea75c84cf46b3db4eea212523591211c3cf2e13099ee4ec147f54201c86 url: "https://pub.dev" source: hosted - version: "6.2.1" + version: "6.2.2" url_launcher_android: dependency: transitive description: @@ -664,10 +672,10 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "7fd2f55fe86cea2897b963e864dc01a7eb0719ecc65fcef4c1cc3d686d718bb2" + sha256: "7286aec002c8feecc338cc33269e96b73955ab227456e9fb2a91f7fab8a358e9" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.2" url_launcher_windows: dependency: transitive description: @@ -728,10 +736,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" win32: dependency: transitive description: @@ -752,10 +760,10 @@ packages: dependency: transitive description: name: xml - sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" + sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 url: "https://pub.dev" source: hosted - version: "6.3.0" + version: "6.5.0" sdks: - dart: ">=3.1.0 <4.0.0" - flutter: ">=3.13.0" + dart: ">=3.2.0 <4.0.0" + flutter: ">=3.16.0" diff --git a/packages/hms_room_kit/example/pubspec.yaml b/packages/hms_room_kit/example/pubspec.yaml index 60a14146d..f22f2b898 100644 --- a/packages/hms_room_kit/example/pubspec.yaml +++ b/packages/hms_room_kit/example/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.0.7 +version: 1.0.8 environment: sdk: ">=2.19.6 <3.0.0" diff --git a/packages/hms_room_kit/pubspec.lock b/packages/hms_room_kit/pubspec.lock index e84a0bdc1..bd2da3397 100644 --- a/packages/hms_room_kit/pubspec.lock +++ b/packages/hms_room_kit/pubspec.lock @@ -61,10 +61,10 @@ packages: dependency: "direct main" description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" convert: dependency: transitive description: @@ -77,10 +77,10 @@ packages: dependency: transitive description: name: cross_file - sha256: "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5" + sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e url: "https://pub.dev" source: hosted - version: "0.3.3+7" + version: "0.3.3+8" crypto: dependency: transitive description: @@ -212,10 +212,10 @@ packages: dependency: transitive description: name: http - sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" + sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139 url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.2" http_parser: dependency: transitive description: @@ -284,10 +284,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: @@ -372,50 +372,58 @@ packages: dependency: "direct main" description: name: permission_handler - sha256: "284a66179cabdf942f838543e10413246f06424d960c92ba95c84439154fcac8" + sha256: "860c6b871c94c78e202dc69546d4d8fd84bd59faeb36f8fb9888668a53ff4f78" url: "https://pub.dev" source: hosted - version: "11.0.1" + version: "11.1.0" permission_handler_android: dependency: transitive description: name: permission_handler_android - sha256: f9fddd3b46109bd69ff3f9efa5006d2d309b7aec0f3c1c5637a60a2d5659e76e + sha256: "2f1bec180ee2f5665c22faada971a8f024761f632e93ddc23310487df52dcfa6" url: "https://pub.dev" source: hosted - version: "11.1.0" + version: "12.0.1" permission_handler_apple: dependency: transitive description: name: permission_handler_apple - sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5" + sha256: "1a816084338ada8d574b1cb48390e6e8b19305d5120fe3a37c98825bacc78306" + url: "https://pub.dev" + source: hosted + version: "9.2.0" + permission_handler_html: + dependency: transitive + description: + name: permission_handler_html + sha256: "11b762a8c123dced6461933a88ea1edbbe036078c3f9f41b08886e678e7864df" url: "https://pub.dev" source: hosted - version: "9.1.4" + version: "0.1.0+2" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface - sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4" + sha256: d87349312f7eaf6ce0adaf668daf700ac5b06af84338bd8b8574dfbd93ffe1a1 url: "https://pub.dev" source: hosted - version: "3.12.0" + version: "4.0.2" permission_handler_windows: dependency: transitive description: name: permission_handler_windows - sha256: cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098 + sha256: "1e8640c1e39121128da6b816d236e714d2cf17fac5a105dd6acdd3403a628004" url: "https://pub.dev" source: hosted - version: "0.1.3" + version: "0.2.0" petitparser: dependency: transitive description: name: petitparser - sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 + sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 url: "https://pub.dev" source: hosted - version: "5.4.0" + version: "6.0.2" platform: dependency: transitive description: @@ -508,10 +516,10 @@ packages: dependency: transitive description: name: shared_preferences_web - sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf + sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.2.2" shared_preferences_windows: dependency: transitive description: @@ -545,18 +553,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -577,10 +585,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" tuple: dependency: "direct main" description: @@ -601,10 +609,10 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: b1c9e98774adf8820c96fbc7ae3601231d324a7d5ebd8babe27b6dfac91357ba + sha256: e9aa5ea75c84cf46b3db4eea212523591211c3cf2e13099ee4ec147f54201c86 url: "https://pub.dev" source: hosted - version: "6.2.1" + version: "6.2.2" url_launcher_android: dependency: transitive description: @@ -649,10 +657,10 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "7fd2f55fe86cea2897b963e864dc01a7eb0719ecc65fcef4c1cc3d686d718bb2" + sha256: "7286aec002c8feecc338cc33269e96b73955ab227456e9fb2a91f7fab8a358e9" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.2" url_launcher_windows: dependency: transitive description: @@ -713,10 +721,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" win32: dependency: transitive description: @@ -737,10 +745,10 @@ packages: dependency: transitive description: name: xml - sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" + sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 url: "https://pub.dev" source: hosted - version: "6.3.0" + version: "6.5.0" sdks: - dart: ">=3.1.0 <4.0.0" - flutter: ">=3.13.0" + dart: ">=3.2.0 <4.0.0" + flutter: ">=3.16.0" diff --git a/packages/hms_room_kit/pubspec.yaml b/packages/hms_room_kit/pubspec.yaml index 8036542eb..120e33ae0 100644 --- a/packages/hms_room_kit/pubspec.yaml +++ b/packages/hms_room_kit/pubspec.yaml @@ -1,6 +1,6 @@ name: hms_room_kit description: 100ms Room Kit provides simple & easy to use UI components to build Live Streaming & Video Conferencing experiences in your apps. -version: 1.0.7 +version: 1.0.8 homepage: https://www.100ms.live/ repository: https://github.com/100mslive/100ms-flutter issue_tracker: https://github.com/100mslive/100ms-flutter/issues diff --git a/packages/hmssdk_flutter/example/android/Gemfile.lock b/packages/hmssdk_flutter/example/android/Gemfile.lock index b6be76cfe..84347bec1 100644 --- a/packages/hmssdk_flutter/example/android/Gemfile.lock +++ b/packages/hmssdk_flutter/example/android/Gemfile.lock @@ -8,12 +8,12 @@ GEM i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.862.0) + aws-partitions (1.864.0) aws-sdk-core (3.190.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) @@ -133,11 +133,11 @@ GEM google-apis-core (>= 0.11.0, < 2.a) google-apis-storage_v1 (0.29.0) google-apis-core (>= 0.11.0, < 2.a) - google-cloud-core (1.6.0) - google-cloud-env (~> 1.0) + google-cloud-core (1.6.1) + google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (1.6.0) - faraday (>= 0.17.3, < 3.0) + google-cloud-env (2.0.1) + faraday (>= 1.0, < 3.a) google-cloud-errors (1.3.1) google-cloud-storage (1.45.0) addressable (~> 2.8) @@ -147,8 +147,9 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.8.1) - faraday (>= 0.17.3, < 3.a) + googleauth (1.9.0) + faraday (>= 1.0, < 3.a) + google-cloud-env (~> 2.0, >= 2.0.1) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) os (>= 0.9, < 2.0) @@ -160,7 +161,7 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) jmespath (1.6.2) - json (2.7.0) + json (2.7.1) jwt (2.7.1) mini_magick (4.12.0) mini_mime (1.1.5) diff --git a/packages/hmssdk_flutter/example/ios/Gemfile.lock b/packages/hmssdk_flutter/example/ios/Gemfile.lock index 61114f35a..3973c327d 100644 --- a/packages/hmssdk_flutter/example/ios/Gemfile.lock +++ b/packages/hmssdk_flutter/example/ios/Gemfile.lock @@ -8,12 +8,12 @@ GEM i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.862.0) + aws-partitions (1.864.0) aws-sdk-core (3.190.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) @@ -134,11 +134,11 @@ GEM google-apis-core (>= 0.11.0, < 2.a) google-apis-storage_v1 (0.29.0) google-apis-core (>= 0.11.0, < 2.a) - google-cloud-core (1.6.0) - google-cloud-env (~> 1.0) + google-cloud-core (1.6.1) + google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (1.6.0) - faraday (>= 0.17.3, < 3.0) + google-cloud-env (2.0.1) + faraday (>= 1.0, < 3.a) google-cloud-errors (1.3.1) google-cloud-storage (1.45.0) addressable (~> 2.8) @@ -148,8 +148,9 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.8.1) - faraday (>= 0.17.3, < 3.a) + googleauth (1.9.0) + faraday (>= 1.0, < 3.a) + google-cloud-env (~> 2.0, >= 2.0.1) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) os (>= 0.9, < 2.0) @@ -161,7 +162,7 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) jmespath (1.6.2) - json (2.7.0) + json (2.7.1) jwt (2.7.1) mini_magick (4.12.0) mini_mime (1.1.5) diff --git a/packages/hmssdk_flutter/example/ios/Podfile.lock b/packages/hmssdk_flutter/example/ios/Podfile.lock index 5ee7a9fc4..a1481439c 100644 --- a/packages/hmssdk_flutter/example/ios/Podfile.lock +++ b/packages/hmssdk_flutter/example/ios/Podfile.lock @@ -25,15 +25,15 @@ PODS: - Firebase/Performance (= 10.9.0) - firebase_core - Flutter - - FirebaseABTesting (10.18.0): + - FirebaseABTesting (10.19.0): - FirebaseCore (~> 10.0) - FirebaseCore (10.9.0): - FirebaseCoreInternal (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/Logger (~> 7.8) - - FirebaseCoreExtension (10.18.0): + - FirebaseCoreExtension (10.19.0): - FirebaseCore (~> 10.0) - - FirebaseCoreInternal (10.18.0): + - FirebaseCoreInternal (10.19.0): - "GoogleUtilities/NSData+zlib (~> 7.8)" - FirebaseCrashlytics (10.9.0): - FirebaseCore (~> 10.5) @@ -45,7 +45,7 @@ PODS: - PromisesObjC (~> 2.1) - FirebaseDynamicLinks (10.9.0): - FirebaseCore (~> 10.0) - - FirebaseInstallations (10.18.0): + - FirebaseInstallations (10.19.0): - FirebaseCore (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) @@ -60,14 +60,14 @@ PODS: - GoogleUtilities/ISASwizzler (~> 7.8) - GoogleUtilities/MethodSwizzler (~> 7.8) - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseRemoteConfig (10.18.0): + - FirebaseRemoteConfig (10.19.0): - FirebaseABTesting (~> 10.0) - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - FirebaseSharedSwift (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - "GoogleUtilities/NSData+zlib (~> 7.8)" - - FirebaseSessions (10.18.0): + - FirebaseSessions (10.19.0): - FirebaseCore (~> 10.5) - FirebaseCoreExtension (~> 10.0) - FirebaseInstallations (~> 10.0) @@ -75,7 +75,7 @@ PODS: - GoogleUtilities/Environment (~> 7.10) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesSwift (~> 2.1) - - FirebaseSharedSwift (10.18.0) + - FirebaseSharedSwift (10.19.0) - Flutter (1.0.0) - flutter_foreground_task (0.0.1): - Flutter @@ -97,14 +97,14 @@ PODS: - HMSBroadcastExtensionSDK (0.0.9) - HMSHLSPlayerSDK (0.0.2): - HMSAnalyticsSDK (= 0.0.2) - - HMSSDK (1.3.0): + - HMSSDK (1.3.1): - HMSAnalyticsSDK (= 0.0.2) - HMSWebRTC (= 1.0.5116) - hmssdk_flutter (1.9.4): - Flutter - HMSBroadcastExtensionSDK (= 0.0.9) - HMSHLSPlayerSDK (= 0.0.2) - - HMSSDK (= 1.3.0) + - HMSSDK (= 1.3.1) - HMSWebRTC (1.0.5116) - MTBBarcodeScanner (5.0.11) - nanopb (2.30909.1): @@ -217,17 +217,17 @@ SPEC CHECKSUMS: firebase_crashlytics: 9b80d1944507cc07fa1c4455797f7d2eb7c8873f firebase_dynamic_links: db9f2ebcc3ea646e76a1d3ee37e9e57890ff0a83 firebase_performance: d11d1fd9591547f6b75f325aaadd6550eaf7e090 - FirebaseABTesting: d8b10ff4c6d1a9d6b11f02a08463ad5fd9fc6b1b + FirebaseABTesting: bfa3b384b68cee10a89183649c64cd7998a37a12 FirebaseCore: b68d3616526ec02e4d155166bbafb8eca64af557 - FirebaseCoreExtension: 62b201498aa10535801cdf3448c7f4db5e24ed80 - FirebaseCoreInternal: 8eb002e564b533bdcf1ba011f33f2b5c10e2ed4a + FirebaseCoreExtension: c08d14c7b22e07994e876d837e6f58642f340087 + FirebaseCoreInternal: b444828ea7cfd594fca83046b95db98a2be4f290 FirebaseCrashlytics: b60329455285aff853e54139d8ddbfe1e5f2b9f9 FirebaseDynamicLinks: 8cb66c4f403aa6ddf86ff3bc3c383a652f344ce9 - FirebaseInstallations: e842042ec6ac1fd2e37d7706363ebe7f662afea4 + FirebaseInstallations: 033d199474164db20c8350736842a94fe717b960 FirebasePerformance: eee2f5da94fd7e5d15487649f8fe10a90c87c174 - FirebaseRemoteConfig: bbd42790a4e84fde6aab7eae810b608e7b5c0bf6 - FirebaseSessions: f90fe9212ee2818641eda051c0835c9c4e30d9ae - FirebaseSharedSwift: 62e248642c0582324d0390706cadd314687c116b + FirebaseRemoteConfig: a7fcc7a5941faa7e09248e91c8797340aa4c85f6 + FirebaseSessions: e5f4caa188dc8bc6142abc974355be75b042215e + FirebaseSharedSwift: f34eeb7d3ea87a34497629b6ca41657beadef76a Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_foreground_task: 21ef182ab0a29a3005cc72cd70e5f45cb7f7f817 GoogleDataTransport: 57c22343ab29bc686febbf7cbb13bad167c2d8fe @@ -235,8 +235,8 @@ SPEC CHECKSUMS: HMSAnalyticsSDK: 4d2a88a729b1eb42f3d25f217c28937ec318a5b7 HMSBroadcastExtensionSDK: d80fe325f6c928bd8e5176290b5a4b7ae15d6fbb HMSHLSPlayerSDK: 6a54ad4d12f3dc2270d1ecd24019d71282a4f6a3 - HMSSDK: 631908d772646b66b3c4f7f4e1fb2681f7abb990 - hmssdk_flutter: ce3c54bbda2a8e1d893be672a877510a546da012 + HMSSDK: 04aac0fefd95419cd1b4135156d4295cbcd51216 + hmssdk_flutter: 3876d06f4ad68bf48a2ceb4c797551fedb860bd1 HMSWebRTC: ae54e9dd91b869051b283b43b14f57d43b7bf8e1 MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5 diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index ba7af1473..ad230093f 100644 --- a/packages/hmssdk_flutter/example/pubspec.lock +++ b/packages/hmssdk_flutter/example/pubspec.lock @@ -85,10 +85,10 @@ packages: dependency: transitive description: name: cross_file - sha256: "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5" + sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e url: "https://pub.dev" source: hosted - version: "0.3.3+7" + version: "0.3.3+8" crypto: dependency: transitive description: @@ -286,7 +286,7 @@ packages: path: "../../hms_room_kit" relative: true source: path - version: "1.0.7" + version: "1.0.8" hmssdk_flutter: dependency: transitive description: @@ -299,10 +299,10 @@ packages: dependency: transitive description: name: http - sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" + sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139 url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.2" http_parser: dependency: transitive description: @@ -387,10 +387,10 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017" + sha256: "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79" url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "5.0.1" package_info_plus_platform_interface: dependency: transitive description: @@ -467,50 +467,58 @@ packages: dependency: transitive description: name: permission_handler - sha256: "284a66179cabdf942f838543e10413246f06424d960c92ba95c84439154fcac8" + sha256: "860c6b871c94c78e202dc69546d4d8fd84bd59faeb36f8fb9888668a53ff4f78" url: "https://pub.dev" source: hosted - version: "11.0.1" + version: "11.1.0" permission_handler_android: dependency: transitive description: name: permission_handler_android - sha256: f9fddd3b46109bd69ff3f9efa5006d2d309b7aec0f3c1c5637a60a2d5659e76e + sha256: "2f1bec180ee2f5665c22faada971a8f024761f632e93ddc23310487df52dcfa6" url: "https://pub.dev" source: hosted - version: "11.1.0" + version: "12.0.1" permission_handler_apple: dependency: transitive description: name: permission_handler_apple - sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5" + sha256: "1a816084338ada8d574b1cb48390e6e8b19305d5120fe3a37c98825bacc78306" + url: "https://pub.dev" + source: hosted + version: "9.2.0" + permission_handler_html: + dependency: transitive + description: + name: permission_handler_html + sha256: "11b762a8c123dced6461933a88ea1edbbe036078c3f9f41b08886e678e7864df" url: "https://pub.dev" source: hosted - version: "9.1.4" + version: "0.1.0+2" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface - sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4" + sha256: d87349312f7eaf6ce0adaf668daf700ac5b06af84338bd8b8574dfbd93ffe1a1 url: "https://pub.dev" source: hosted - version: "3.12.0" + version: "4.0.2" permission_handler_windows: dependency: transitive description: name: permission_handler_windows - sha256: cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098 + sha256: "1e8640c1e39121128da6b816d236e714d2cf17fac5a105dd6acdd3403a628004" url: "https://pub.dev" source: hosted - version: "0.1.3" + version: "0.2.0" petitparser: dependency: transitive description: name: petitparser - sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 + sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 url: "https://pub.dev" source: hosted - version: "5.4.0" + version: "6.0.2" platform: dependency: transitive description: @@ -611,10 +619,10 @@ packages: dependency: transitive description: name: shared_preferences_web - sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf + sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.2.2" shared_preferences_windows: dependency: transitive description: @@ -728,10 +736,10 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: b1c9e98774adf8820c96fbc7ae3601231d324a7d5ebd8babe27b6dfac91357ba + sha256: e9aa5ea75c84cf46b3db4eea212523591211c3cf2e13099ee4ec147f54201c86 url: "https://pub.dev" source: hosted - version: "6.2.1" + version: "6.2.2" url_launcher_android: dependency: transitive description: @@ -776,10 +784,10 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "7fd2f55fe86cea2897b963e864dc01a7eb0719ecc65fcef4c1cc3d686d718bb2" + sha256: "7286aec002c8feecc338cc33269e96b73955ab227456e9fb2a91f7fab8a358e9" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.2" url_launcher_windows: dependency: transitive description: @@ -864,10 +872,10 @@ packages: dependency: transitive description: name: xml - sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" + sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 url: "https://pub.dev" source: hosted - version: "6.3.0" + version: "6.5.0" sdks: - dart: ">=3.2.0-194.0.dev <4.0.0" - flutter: ">=3.13.0" + dart: ">=3.2.0 <4.0.0" + flutter: ">=3.16.0" diff --git a/packages/hmssdk_flutter/example/pubspec.yaml b/packages/hmssdk_flutter/example/pubspec.yaml index ae66f6208..b152fd524 100644 --- a/packages/hmssdk_flutter/example/pubspec.yaml +++ b/packages/hmssdk_flutter/example/pubspec.yaml @@ -4,7 +4,7 @@ description: Demonstrates how to use the hmssdk_flutter plugin. # The following line prevents the package from being accidentally published to # pub.dev using `pub publish`. This is preferred for private packages. publish_to: "none" # Remove this line if you wish to publish to pub.dev -version: 1.9.4 +version: 1.9.5 environment: sdk: ">=2.16.0 <4.0.0" diff --git a/packages/hmssdk_flutter/lib/assets/sdk-versions.json b/packages/hmssdk_flutter/lib/assets/sdk-versions.json index 56b239ded..17d0668de 100644 --- a/packages/hmssdk_flutter/lib/assets/sdk-versions.json +++ b/packages/hmssdk_flutter/lib/assets/sdk-versions.json @@ -1,6 +1,6 @@ { - "flutter": "1.9.4", - "ios": "1.3.1", + "flutter": "1.9.5", + "ios": "1.4.0", "iOSBroadcastExtension": "0.0.9", "iOSHLSPlayerSDK": "0.0.2", "android": "2.8.3" diff --git a/packages/hmssdk_flutter/pubspec.yaml b/packages/hmssdk_flutter/pubspec.yaml index ecc8f88f7..5208094b9 100644 --- a/packages/hmssdk_flutter/pubspec.yaml +++ b/packages/hmssdk_flutter/pubspec.yaml @@ -1,6 +1,6 @@ name: hmssdk_flutter description: Add Real Time Audio & Video calls, Interactive Live Streaming & Recording, Chat, HLS, RTMP, PiP, CallKit, VoIP, Video conferencing, Stream Player & WebRTC-based communications API -version: 1.9.4 +version: 1.9.5 homepage: https://www.100ms.live/ repository: https://github.com/100mslive/100ms-flutter issue_tracker: https://github.com/100mslive/100ms-flutter/issues diff --git a/sample apps/bloc/pubspec.lock b/sample apps/bloc/pubspec.lock index 0353333d2..a2aba3ffb 100644 --- a/sample apps/bloc/pubspec.lock +++ b/sample apps/bloc/pubspec.lock @@ -45,10 +45,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" cupertino_icons: dependency: "direct main" description: @@ -159,10 +159,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" nested: dependency: transitive description: @@ -260,18 +260,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -292,10 +292,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" typed_data: dependency: transitive description: @@ -324,10 +324,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=2.10.0" diff --git a/sample apps/flutter-audio-room-quickstart/pubspec.lock b/sample apps/flutter-audio-room-quickstart/pubspec.lock index b9ad621c8..802acb7e2 100644 --- a/sample apps/flutter-audio-room-quickstart/pubspec.lock +++ b/sample apps/flutter-audio-room-quickstart/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" cupertino_icons: dependency: "direct main" description: @@ -111,10 +111,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" path: dependency: transitive description: @@ -188,18 +188,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -220,10 +220,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" vector_math: dependency: transitive description: @@ -236,10 +236,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=2.8.0" diff --git a/sample apps/flutter-hls-quickstart/pubspec.lock b/sample apps/flutter-hls-quickstart/pubspec.lock index 3cc98b632..e93e320f7 100644 --- a/sample apps/flutter-hls-quickstart/pubspec.lock +++ b/sample apps/flutter-hls-quickstart/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" csslib: dependency: transitive description: @@ -132,10 +132,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" path: dependency: transitive description: @@ -209,18 +209,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -241,10 +241,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" vector_math: dependency: transitive description: @@ -297,10 +297,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.3.0" diff --git a/sample apps/flutter-quickstart-app/pubspec.lock b/sample apps/flutter-quickstart-app/pubspec.lock index 8f4622fce..707d7c566 100644 --- a/sample apps/flutter-quickstart-app/pubspec.lock +++ b/sample apps/flutter-quickstart-app/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" cupertino_icons: dependency: "direct main" description: @@ -111,10 +111,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" path: dependency: transitive description: @@ -188,18 +188,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -220,10 +220,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" vector_math: dependency: transitive description: @@ -236,10 +236,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=2.10.0" diff --git a/sample apps/flutterflow-prebuilt-quickstart/pubspec.lock b/sample apps/flutterflow-prebuilt-quickstart/pubspec.lock index c259ef983..560354217 100644 --- a/sample apps/flutterflow-prebuilt-quickstart/pubspec.lock +++ b/sample apps/flutterflow-prebuilt-quickstart/pubspec.lock @@ -101,10 +101,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" convert: dependency: transitive description: @@ -425,10 +425,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: @@ -742,18 +742,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -782,10 +782,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" timeago: dependency: "direct main" description: @@ -926,10 +926,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" win32: dependency: transitive description: @@ -955,5 +955,5 @@ packages: source: hosted version: "6.3.0" sdks: - dart: ">=3.1.0 <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.13.0" diff --git a/sample apps/getx/pubspec.lock b/sample apps/getx/pubspec.lock index d775b7e51..f362cecd1 100644 --- a/sample apps/getx/pubspec.lock +++ b/sample apps/getx/pubspec.lock @@ -45,10 +45,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" cupertino_icons: dependency: "direct main" description: @@ -151,10 +151,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" path: dependency: transitive description: @@ -228,18 +228,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -260,10 +260,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" typed_data: dependency: transitive description: @@ -292,10 +292,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=2.8.0" diff --git a/sample apps/hms-callkit-app/pubspec.lock b/sample apps/hms-callkit-app/pubspec.lock index 181a17dfa..277674560 100644 --- a/sample apps/hms-callkit-app/pubspec.lock +++ b/sample apps/hms-callkit-app/pubspec.lock @@ -69,10 +69,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" cross_file: dependency: transitive description: @@ -276,10 +276,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: @@ -441,18 +441,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -473,10 +473,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" typed_data: dependency: transitive description: @@ -537,10 +537,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" win32: dependency: transitive description: @@ -558,5 +558,5 @@ packages: source: hosted version: "0.2.0+3" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.3.0" diff --git a/sample apps/mobx/pubspec.lock b/sample apps/mobx/pubspec.lock index 2fa543676..f6a657bbc 100644 --- a/sample apps/mobx/pubspec.lock +++ b/sample apps/mobx/pubspec.lock @@ -141,10 +141,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" convert: dependency: transitive description: @@ -359,10 +359,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: @@ -516,18 +516,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" stream_transform: dependency: transitive description: @@ -556,10 +556,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" timing: dependency: transitive description: @@ -604,10 +604,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" web_socket_channel: dependency: transitive description: @@ -625,5 +625,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=2.8.0" diff --git a/sample apps/riverpod/pubspec.lock b/sample apps/riverpod/pubspec.lock index ecdac52f5..7b8d8be33 100644 --- a/sample apps/riverpod/pubspec.lock +++ b/sample apps/riverpod/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" cupertino_icons: dependency: "direct main" description: @@ -135,10 +135,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" path: dependency: transitive description: @@ -220,10 +220,10 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" state_notifier: dependency: transitive description: @@ -236,10 +236,10 @@ packages: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -260,10 +260,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" typed_data: dependency: transitive description: @@ -284,10 +284,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.0.0" From ace5a7c4db23f24ab5100970715dffa3fd4d38ae Mon Sep 17 00:00:00 2001 From: Pushpam <93931528+Decoder07@users.noreply.github.com> Date: Mon, 11 Dec 2023 15:17:45 +0530 Subject: [PATCH 10/32] Fixed active Speaker bug while screenshare (#1659) Co-authored-by: ygit --- packages/hms_room_kit/lib/src/meeting/meeting_store.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart index 0c5e6509c..082256f8a 100644 --- a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart +++ b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart @@ -1075,7 +1075,7 @@ class MeetingStore extends ChangeNotifier for (var speaker in updateSpeakers) { int index = peerTracks.indexWhere((previousSpeaker) => previousSpeaker.uid == "${speaker.peer.peerId}mainVideo"); - if (index > (peersInActiveSpeakerLayout - 1)) { + if (index > ((peersInActiveSpeakerLayout + screenShareCount) - 1)) { PeerTrackNode activeSpeaker = peerTracks[index]; peerTracks.removeAt(index); peerTracks.insert(screenShareCount, activeSpeaker); From 2a6b9f11bdee2c39adc90466dad5dbbbe8df79c8 Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Mon, 11 Dec 2023 17:05:55 +0530 Subject: [PATCH 11/32] released sample app version 1.5.103 (403) --- .../example/android/app/build.gradle | 4 +- .../example/ios/Runner/Info.plist | 4 +- packages/hmssdk_flutter/example/pubspec.lock | 84 +++++++++---------- packages/hmssdk_flutter/pubspec.lock | 26 +++--- 4 files changed, 55 insertions(+), 63 deletions(-) diff --git a/packages/hmssdk_flutter/example/android/app/build.gradle b/packages/hmssdk_flutter/example/android/app/build.gradle index 76dd2e826..64e420447 100644 --- a/packages/hmssdk_flutter/example/android/app/build.gradle +++ b/packages/hmssdk_flutter/example/android/app/build.gradle @@ -32,8 +32,8 @@ android { applicationId "live.hms.flutter" minSdkVersion 21 targetSdkVersion 33 - versionCode 402 - versionName "1.5.102" + versionCode 403 + versionName "1.5.103" } signingConfigs { diff --git a/packages/hmssdk_flutter/example/ios/Runner/Info.plist b/packages/hmssdk_flutter/example/ios/Runner/Info.plist index 07f71b7bd..e5f26adf6 100644 --- a/packages/hmssdk_flutter/example/ios/Runner/Info.plist +++ b/packages/hmssdk_flutter/example/ios/Runner/Info.plist @@ -21,7 +21,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.5.101 + 1.5.103 CFBundleSignature ???? CFBundleURLTypes @@ -48,7 +48,7 @@ CFBundleVersion - 401 + 403 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index ad230093f..7e961d9e6 100644 --- a/packages/hmssdk_flutter/example/pubspec.lock +++ b/packages/hmssdk_flutter/example/pubspec.lock @@ -69,10 +69,10 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.17.2" convert: dependency: transitive description: @@ -85,10 +85,10 @@ packages: dependency: transitive description: name: cross_file - sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e + sha256: "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5" url: "https://pub.dev" source: hosted - version: "0.3.3+8" + version: "0.3.3+7" crypto: dependency: transitive description: @@ -299,10 +299,10 @@ packages: dependency: transitive description: name: http - sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139 + sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.0" http_parser: dependency: transitive description: @@ -363,10 +363,10 @@ packages: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.9.1" mime: dependency: transitive description: @@ -387,10 +387,10 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79" + sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017" url: "https://pub.dev" source: hosted - version: "5.0.1" + version: "4.2.0" package_info_plus_platform_interface: dependency: transitive description: @@ -467,58 +467,50 @@ packages: dependency: transitive description: name: permission_handler - sha256: "860c6b871c94c78e202dc69546d4d8fd84bd59faeb36f8fb9888668a53ff4f78" + sha256: "284a66179cabdf942f838543e10413246f06424d960c92ba95c84439154fcac8" url: "https://pub.dev" source: hosted - version: "11.1.0" + version: "11.0.1" permission_handler_android: dependency: transitive description: name: permission_handler_android - sha256: "2f1bec180ee2f5665c22faada971a8f024761f632e93ddc23310487df52dcfa6" + sha256: f9fddd3b46109bd69ff3f9efa5006d2d309b7aec0f3c1c5637a60a2d5659e76e url: "https://pub.dev" source: hosted - version: "12.0.1" + version: "11.1.0" permission_handler_apple: dependency: transitive description: name: permission_handler_apple - sha256: "1a816084338ada8d574b1cb48390e6e8b19305d5120fe3a37c98825bacc78306" - url: "https://pub.dev" - source: hosted - version: "9.2.0" - permission_handler_html: - dependency: transitive - description: - name: permission_handler_html - sha256: "11b762a8c123dced6461933a88ea1edbbe036078c3f9f41b08886e678e7864df" + sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5" url: "https://pub.dev" source: hosted - version: "0.1.0+2" + version: "9.1.4" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface - sha256: d87349312f7eaf6ce0adaf668daf700ac5b06af84338bd8b8574dfbd93ffe1a1 + sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4" url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "3.12.0" permission_handler_windows: dependency: transitive description: name: permission_handler_windows - sha256: "1e8640c1e39121128da6b816d236e714d2cf17fac5a105dd6acdd3403a628004" + sha256: cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098 url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.1.3" petitparser: dependency: transitive description: name: petitparser - sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 + sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 url: "https://pub.dev" source: hosted - version: "6.0.2" + version: "5.4.0" platform: dependency: transitive description: @@ -619,10 +611,10 @@ packages: dependency: transitive description: name: shared_preferences_web - sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21" + sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.2.1" shared_preferences_windows: dependency: transitive description: @@ -656,18 +648,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.1" string_scanner: dependency: transitive description: @@ -688,10 +680,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.6.0" tuple: dependency: transitive description: @@ -784,10 +776,10 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "7286aec002c8feecc338cc33269e96b73955ab227456e9fb2a91f7fab8a358e9" + sha256: "7fd2f55fe86cea2897b963e864dc01a7eb0719ecc65fcef4c1cc3d686d718bb2" url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.2.0" url_launcher_windows: dependency: transitive description: @@ -848,10 +840,10 @@ packages: dependency: transitive description: name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.1.4-beta" win32: dependency: transitive description: @@ -872,10 +864,10 @@ packages: dependency: transitive description: name: xml - sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 + sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" url: "https://pub.dev" source: hosted - version: "6.5.0" + version: "6.3.0" sdks: - dart: ">=3.2.0 <4.0.0" - flutter: ">=3.16.0" + dart: ">=3.1.0 <4.0.0" + flutter: ">=3.13.0" diff --git a/packages/hmssdk_flutter/pubspec.lock b/packages/hmssdk_flutter/pubspec.lock index 53939cd59..c3cc2c33e 100644 --- a/packages/hmssdk_flutter/pubspec.lock +++ b/packages/hmssdk_flutter/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.17.2" fake_async: dependency: transitive description: @@ -79,10 +79,10 @@ packages: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.9.1" path: dependency: transitive description: @@ -108,18 +108,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.1" string_scanner: dependency: transitive description: @@ -140,10 +140,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.6.0" vector_math: dependency: transitive description: @@ -156,10 +156,10 @@ packages: dependency: transitive description: name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.1.4-beta" sdks: - dart: ">=3.2.0-194.0.dev <4.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0" flutter: ">=2.10.0" From 9c972622fd8d0447860495ffc67c323444272287 Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Tue, 12 Dec 2023 17:07:24 +0530 Subject: [PATCH 12/32] Added implementation for beam intermediate changes --- packages/hms_room_kit/example/pubspec.lock | 89 ++++++++---------- .../lib/src/meeting/meeting_store.dart | 29 +++--- .../lib/src/preview/preview_store.dart | 13 ++- .../app_utilities_bottom_sheet.dart | 15 +-- packages/hms_room_kit/pubspec.lock | 89 ++++++++---------- packages/hms_room_kit/pubspec.yaml | 3 +- packages/hmssdk_flutter/example/pubspec.lock | 93 +++++++++---------- .../hmssdk_flutter/lib/hmssdk_flutter.dart | 2 + .../model/hms_browser_recording_state.dart | 2 +- .../src/model/hms_hls_recording_state.dart | 2 +- .../src/model/hms_hls_streaming_state.dart | 2 +- .../lib/src/model/hms_recording_state.dart | 63 ------------- .../src/model/hms_rtmp_streaming_state.dart | 2 +- .../src/model/hms_server_recording_state.dart | 2 +- .../lib/src/model/hms_streaming_state.dart | 49 ---------- packages/hmssdk_flutter/pubspec.lock | 26 +++--- 16 files changed, 168 insertions(+), 313 deletions(-) delete mode 100644 packages/hmssdk_flutter/lib/src/model/hms_recording_state.dart delete mode 100644 packages/hmssdk_flutter/lib/src/model/hms_streaming_state.dart diff --git a/packages/hms_room_kit/example/pubspec.lock b/packages/hms_room_kit/example/pubspec.lock index 70ca8e183..b6a3ff0fb 100644 --- a/packages/hms_room_kit/example/pubspec.lock +++ b/packages/hms_room_kit/example/pubspec.lock @@ -61,10 +61,10 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.17.2" convert: dependency: transitive description: @@ -77,10 +77,10 @@ packages: dependency: transitive description: name: cross_file - sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e + sha256: "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5" url: "https://pub.dev" source: hosted - version: "0.3.3+8" + version: "0.3.3+7" crypto: dependency: transitive description: @@ -218,19 +218,18 @@ packages: hmssdk_flutter: dependency: transitive description: - name: hmssdk_flutter - sha256: "27dfc516ee4673ff092fc4e18487c315780b8470a2fbcf0f486bdfa529fc53cb" - url: "https://pub.dev" - source: hosted - version: "1.9.4" + path: "../../hmssdk_flutter" + relative: true + source: path + version: "1.9.5" http: dependency: transitive description: name: http - sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139 + sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.0" http_parser: dependency: transitive description: @@ -299,10 +298,10 @@ packages: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.9.1" mime: dependency: transitive description: @@ -387,58 +386,50 @@ packages: dependency: transitive description: name: permission_handler - sha256: "860c6b871c94c78e202dc69546d4d8fd84bd59faeb36f8fb9888668a53ff4f78" + sha256: "284a66179cabdf942f838543e10413246f06424d960c92ba95c84439154fcac8" url: "https://pub.dev" source: hosted - version: "11.1.0" + version: "11.0.1" permission_handler_android: dependency: transitive description: name: permission_handler_android - sha256: "2f1bec180ee2f5665c22faada971a8f024761f632e93ddc23310487df52dcfa6" + sha256: f9fddd3b46109bd69ff3f9efa5006d2d309b7aec0f3c1c5637a60a2d5659e76e url: "https://pub.dev" source: hosted - version: "12.0.1" + version: "11.1.0" permission_handler_apple: dependency: transitive description: name: permission_handler_apple - sha256: "1a816084338ada8d574b1cb48390e6e8b19305d5120fe3a37c98825bacc78306" + sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5" url: "https://pub.dev" source: hosted - version: "9.2.0" - permission_handler_html: - dependency: transitive - description: - name: permission_handler_html - sha256: "11b762a8c123dced6461933a88ea1edbbe036078c3f9f41b08886e678e7864df" - url: "https://pub.dev" - source: hosted - version: "0.1.0+2" + version: "9.1.4" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface - sha256: d87349312f7eaf6ce0adaf668daf700ac5b06af84338bd8b8574dfbd93ffe1a1 + sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4" url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "3.12.0" permission_handler_windows: dependency: transitive description: name: permission_handler_windows - sha256: "1e8640c1e39121128da6b816d236e714d2cf17fac5a105dd6acdd3403a628004" + sha256: cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098 url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.1.3" petitparser: dependency: transitive description: name: petitparser - sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 + sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 url: "https://pub.dev" source: hosted - version: "6.0.2" + version: "5.4.0" platform: dependency: transitive description: @@ -531,10 +522,10 @@ packages: dependency: transitive description: name: shared_preferences_web - sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21" + sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.2.1" shared_preferences_windows: dependency: transitive description: @@ -568,18 +559,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.1" string_scanner: dependency: transitive description: @@ -600,10 +591,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.6.0" tuple: dependency: transitive description: @@ -672,10 +663,10 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "7286aec002c8feecc338cc33269e96b73955ab227456e9fb2a91f7fab8a358e9" + sha256: "7fd2f55fe86cea2897b963e864dc01a7eb0719ecc65fcef4c1cc3d686d718bb2" url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.2.0" url_launcher_windows: dependency: transitive description: @@ -736,10 +727,10 @@ packages: dependency: transitive description: name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.1.4-beta" win32: dependency: transitive description: @@ -760,10 +751,10 @@ packages: dependency: transitive description: name: xml - sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 + sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" url: "https://pub.dev" source: hosted - version: "6.5.0" + version: "6.3.0" sdks: - dart: ">=3.2.0 <4.0.0" - flutter: ">=3.16.0" + dart: ">=3.1.0 <4.0.0" + flutter: ">=3.13.0" diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart index 082256f8a..49ba8f822 100644 --- a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart +++ b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart @@ -768,25 +768,25 @@ class MeetingStore extends ChangeNotifier log("onJoin-> room: ${room.toString()}"); isMeetingStarted = true; hmsRoom = room; - if (room.hmshlsStreamingState?.running ?? false) { + if (room.hmshlsStreamingState?.state == HMSStreamingState.started) { hasHlsStarted = true; streamUrl = room.hmshlsStreamingState?.variants[0]?.hlsStreamUrl; } else { hasHlsStarted = false; } - if (room.hmsBrowserRecordingState?.running == true) { + if (room.hmsBrowserRecordingState?.state == HMSRecordingState.started) { recordingType["browser"] = true; } - if (room.hmsServerRecordingState?.running == true) { + if (room.hmsServerRecordingState?.state == HMSRecordingState.started) { recordingType["server"] = true; } - if (room.hmshlsRecordingState?.running == true) { + if (room.hmshlsRecordingState?.state == HMSRecordingState.started) { recordingType["hls"] = true; } - if (room.hmsRtmpStreamingState?.running == true) { + if (room.hmsRtmpStreamingState?.state == HMSStreamingState.started) { streamingType["rtmp"] = true; } - if (room.hmshlsStreamingState?.running == true) { + if (room.hmshlsStreamingState?.state == HMSStreamingState.started) { streamingType["hls"] = true; } setParticipantsList(roles); @@ -897,30 +897,27 @@ class MeetingStore extends ChangeNotifier switch (update) { case HMSRoomUpdate.browserRecordingStateUpdated: recordingType["browser"] = - room.hmsBrowserRecordingState?.running ?? false; + room.hmsBrowserRecordingState?.state == HMSRecordingState.started; isRecordingInInitialisingState = - room.hmsBrowserRecordingState?.initialising ?? false; + room.hmsBrowserRecordingState?.state == HMSRecordingState.starting; break; case HMSRoomUpdate.serverRecordingStateUpdated: recordingType["server"] = - room.hmsServerRecordingState?.running ?? false; + room.hmsServerRecordingState?.state == HMSRecordingState.started; break; case HMSRoomUpdate.hlsRecordingStateUpdated: - recordingType["hls"] = room.hmshlsRecordingState?.running ?? false; + recordingType["hls"] = room.hmshlsRecordingState?.state == HMSRecordingState.started; break; case HMSRoomUpdate.rtmpStreamingStateUpdated: - streamingType["rtmp"] = room.hmsRtmpStreamingState?.running ?? false; + streamingType["rtmp"] = room.hmsRtmpStreamingState?.state == HMSStreamingState.started; break; case HMSRoomUpdate.hlsStreamingStateUpdated: isHLSLoading = false; - streamingType["hls"] = room.hmshlsStreamingState?.running ?? false; - hasHlsStarted = room.hmshlsStreamingState?.running ?? false; + streamingType["hls"] = room.hmshlsStreamingState?.state == HMSStreamingState.started; + hasHlsStarted = room.hmshlsStreamingState?.state == HMSStreamingState.started; streamUrl = hasHlsStarted ? room.hmshlsStreamingState?.variants[0]?.hlsStreamUrl : null; - Utilities.showToast(room.hmshlsStreamingState?.running ?? false - ? "HLS Streaming Started" - : "HLS Streaming Stopped"); break; default: break; diff --git a/packages/hms_room_kit/lib/src/preview/preview_store.dart b/packages/hms_room_kit/lib/src/preview/preview_store.dart index 486a56a99..8ea3a92b3 100644 --- a/packages/hms_room_kit/lib/src/preview/preview_store.dart +++ b/packages/hms_room_kit/lib/src/preview/preview_store.dart @@ -174,25 +174,24 @@ class PreviewStore extends ChangeNotifier log("onRoomUpdate-> room: ${room.toString()} update: ${update.name}"); switch (update) { case HMSRoomUpdate.browserRecordingStateUpdated: - isRecordingStarted = room.hmsBrowserRecordingState?.running ?? false; + isRecordingStarted = room.hmsBrowserRecordingState?.state == HMSRecordingState.started; break; case HMSRoomUpdate.serverRecordingStateUpdated: - isRecordingStarted = room.hmsServerRecordingState?.running ?? false; - break; + isRecordingStarted = room.hmsServerRecordingState?.state == HMSRecordingState.started; case HMSRoomUpdate.hlsRecordingStateUpdated: - isRecordingStarted = room.hmshlsRecordingState?.running ?? false; + isRecordingStarted = room.hmshlsRecordingState?.state == HMSRecordingState.started; break; case HMSRoomUpdate.rtmpStreamingStateUpdated: - isRTMPStreamingStarted = room.hmsRtmpStreamingState?.running ?? false; + isRTMPStreamingStarted = room.hmsRtmpStreamingState?.state == HMSStreamingState.started; break; case HMSRoomUpdate.hlsStreamingStateUpdated: - isHLSStreamingStarted = room.hmshlsStreamingState?.running ?? false; + isHLSStreamingStarted = room.hmshlsStreamingState?.state == HMSStreamingState.started; if (!isMeetingJoined && isRoomJoined) { isRoomJoinedAndHLSStarted = - (room.hmshlsStreamingState?.running ?? false) && isRoomJoined; + (room.hmshlsStreamingState?.state == HMSStreamingState.started) && isRoomJoined; isMeetingJoined = true; } break; diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/app_utilities_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/app_utilities_bottom_sheet.dart index c43e57643..5a12e8593 100644 --- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/app_utilities_bottom_sheet.dart +++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/app_utilities_bottom_sheet.dart @@ -219,7 +219,7 @@ class _AppUtilitiesBottomSheetState extends State { HMSThemeColors.onSurfaceLowEmphasis, BlendMode.srcIn), ), - optionText: "Start Recording", + optionText: "Record", optionTextColor: HMSThemeColors.onSurfaceLowEmphasis, ) : MoreOptionItem( @@ -227,8 +227,6 @@ class _AppUtilitiesBottomSheetState extends State { bool isRecordingRunning = ((meetingStore.recordingType["hls"] ?? false) || (meetingStore.recordingType["browser"] ?? - false) || - (meetingStore.recordingType["server"] ?? false)); if (isRecordingRunning) { Navigator.pop(context); @@ -279,10 +277,9 @@ class _AppUtilitiesBottomSheetState extends State { isActive: ((meetingStore.recordingType["hls"] ?? false) || (meetingStore.recordingType["browser"] ?? - false) || - (meetingStore.recordingType["server"] ?? false)), + false)), optionIcon: SvgPicture.asset( - "packages/hms_room_kit/lib/src/assets/icons/record.svg", + "packages/hms_room_kit/lib/src/ass ets/icons/record.svg", height: 20, width: 20, colorFilter: ColorFilter.mode( @@ -292,11 +289,9 @@ class _AppUtilitiesBottomSheetState extends State { optionText: ((meetingStore.recordingType["hls"] ?? false) || (meetingStore.recordingType["browser"] ?? - false) || - (meetingStore.recordingType["server"] ?? false)) - ? "Stop Recording" - : "Start Recording", + ? "Recording" + : "Record", ) ], ), diff --git a/packages/hms_room_kit/pubspec.lock b/packages/hms_room_kit/pubspec.lock index bd2da3397..02154959e 100644 --- a/packages/hms_room_kit/pubspec.lock +++ b/packages/hms_room_kit/pubspec.lock @@ -61,10 +61,10 @@ packages: dependency: "direct main" description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.17.2" convert: dependency: transitive description: @@ -77,10 +77,10 @@ packages: dependency: transitive description: name: cross_file - sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e + sha256: "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5" url: "https://pub.dev" source: hosted - version: "0.3.3+8" + version: "0.3.3+7" crypto: dependency: transitive description: @@ -203,19 +203,18 @@ packages: hmssdk_flutter: dependency: "direct main" description: - name: hmssdk_flutter - sha256: "27dfc516ee4673ff092fc4e18487c315780b8470a2fbcf0f486bdfa529fc53cb" - url: "https://pub.dev" - source: hosted - version: "1.9.4" + path: "../hmssdk_flutter" + relative: true + source: path + version: "1.9.5" http: dependency: transitive description: name: http - sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139 + sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.0" http_parser: dependency: transitive description: @@ -284,10 +283,10 @@ packages: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.9.1" mime: dependency: transitive description: @@ -372,58 +371,50 @@ packages: dependency: "direct main" description: name: permission_handler - sha256: "860c6b871c94c78e202dc69546d4d8fd84bd59faeb36f8fb9888668a53ff4f78" + sha256: "284a66179cabdf942f838543e10413246f06424d960c92ba95c84439154fcac8" url: "https://pub.dev" source: hosted - version: "11.1.0" + version: "11.0.1" permission_handler_android: dependency: transitive description: name: permission_handler_android - sha256: "2f1bec180ee2f5665c22faada971a8f024761f632e93ddc23310487df52dcfa6" + sha256: f9fddd3b46109bd69ff3f9efa5006d2d309b7aec0f3c1c5637a60a2d5659e76e url: "https://pub.dev" source: hosted - version: "12.0.1" + version: "11.1.0" permission_handler_apple: dependency: transitive description: name: permission_handler_apple - sha256: "1a816084338ada8d574b1cb48390e6e8b19305d5120fe3a37c98825bacc78306" + sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5" url: "https://pub.dev" source: hosted - version: "9.2.0" - permission_handler_html: - dependency: transitive - description: - name: permission_handler_html - sha256: "11b762a8c123dced6461933a88ea1edbbe036078c3f9f41b08886e678e7864df" - url: "https://pub.dev" - source: hosted - version: "0.1.0+2" + version: "9.1.4" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface - sha256: d87349312f7eaf6ce0adaf668daf700ac5b06af84338bd8b8574dfbd93ffe1a1 + sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4" url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "3.12.0" permission_handler_windows: dependency: transitive description: name: permission_handler_windows - sha256: "1e8640c1e39121128da6b816d236e714d2cf17fac5a105dd6acdd3403a628004" + sha256: cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098 url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.1.3" petitparser: dependency: transitive description: name: petitparser - sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 + sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 url: "https://pub.dev" source: hosted - version: "6.0.2" + version: "5.4.0" platform: dependency: transitive description: @@ -516,10 +507,10 @@ packages: dependency: transitive description: name: shared_preferences_web - sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21" + sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.2.1" shared_preferences_windows: dependency: transitive description: @@ -553,18 +544,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.1" string_scanner: dependency: transitive description: @@ -585,10 +576,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.6.0" tuple: dependency: "direct main" description: @@ -657,10 +648,10 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "7286aec002c8feecc338cc33269e96b73955ab227456e9fb2a91f7fab8a358e9" + sha256: "7fd2f55fe86cea2897b963e864dc01a7eb0719ecc65fcef4c1cc3d686d718bb2" url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.2.0" url_launcher_windows: dependency: transitive description: @@ -721,10 +712,10 @@ packages: dependency: transitive description: name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.1.4-beta" win32: dependency: transitive description: @@ -745,10 +736,10 @@ packages: dependency: transitive description: name: xml - sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 + sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" url: "https://pub.dev" source: hosted - version: "6.5.0" + version: "6.3.0" sdks: - dart: ">=3.2.0 <4.0.0" - flutter: ">=3.16.0" + dart: ">=3.1.0 <4.0.0" + flutter: ">=3.13.0" diff --git a/packages/hms_room_kit/pubspec.yaml b/packages/hms_room_kit/pubspec.yaml index 120e33ae0..53af1a9a4 100644 --- a/packages/hms_room_kit/pubspec.yaml +++ b/packages/hms_room_kit/pubspec.yaml @@ -14,7 +14,8 @@ dependencies: flutter: sdk: flutter - hmssdk_flutter: ^1.9.4 + hmssdk_flutter: + path: ../hmssdk_flutter intl: ^0.18.1 permission_handler: ^11.0.0 provider: ^6.0.5 diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index ad230093f..569673c04 100644 --- a/packages/hmssdk_flutter/example/pubspec.lock +++ b/packages/hmssdk_flutter/example/pubspec.lock @@ -69,10 +69,10 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.17.2" convert: dependency: transitive description: @@ -85,10 +85,10 @@ packages: dependency: transitive description: name: cross_file - sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e + sha256: "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5" url: "https://pub.dev" source: hosted - version: "0.3.3+8" + version: "0.3.3+7" crypto: dependency: transitive description: @@ -290,19 +290,18 @@ packages: hmssdk_flutter: dependency: transitive description: - name: hmssdk_flutter - sha256: "27dfc516ee4673ff092fc4e18487c315780b8470a2fbcf0f486bdfa529fc53cb" - url: "https://pub.dev" - source: hosted - version: "1.9.4" + path: ".." + relative: true + source: path + version: "1.9.5" http: dependency: transitive description: name: http - sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139 + sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.0" http_parser: dependency: transitive description: @@ -363,10 +362,10 @@ packages: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.9.1" mime: dependency: transitive description: @@ -387,10 +386,10 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79" + sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017" url: "https://pub.dev" source: hosted - version: "5.0.1" + version: "4.2.0" package_info_plus_platform_interface: dependency: transitive description: @@ -467,58 +466,50 @@ packages: dependency: transitive description: name: permission_handler - sha256: "860c6b871c94c78e202dc69546d4d8fd84bd59faeb36f8fb9888668a53ff4f78" + sha256: "284a66179cabdf942f838543e10413246f06424d960c92ba95c84439154fcac8" url: "https://pub.dev" source: hosted - version: "11.1.0" + version: "11.0.1" permission_handler_android: dependency: transitive description: name: permission_handler_android - sha256: "2f1bec180ee2f5665c22faada971a8f024761f632e93ddc23310487df52dcfa6" + sha256: f9fddd3b46109bd69ff3f9efa5006d2d309b7aec0f3c1c5637a60a2d5659e76e url: "https://pub.dev" source: hosted - version: "12.0.1" + version: "11.1.0" permission_handler_apple: dependency: transitive description: name: permission_handler_apple - sha256: "1a816084338ada8d574b1cb48390e6e8b19305d5120fe3a37c98825bacc78306" + sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5" url: "https://pub.dev" source: hosted - version: "9.2.0" - permission_handler_html: - dependency: transitive - description: - name: permission_handler_html - sha256: "11b762a8c123dced6461933a88ea1edbbe036078c3f9f41b08886e678e7864df" - url: "https://pub.dev" - source: hosted - version: "0.1.0+2" + version: "9.1.4" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface - sha256: d87349312f7eaf6ce0adaf668daf700ac5b06af84338bd8b8574dfbd93ffe1a1 + sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4" url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "3.12.0" permission_handler_windows: dependency: transitive description: name: permission_handler_windows - sha256: "1e8640c1e39121128da6b816d236e714d2cf17fac5a105dd6acdd3403a628004" + sha256: cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098 url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.1.3" petitparser: dependency: transitive description: name: petitparser - sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 + sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 url: "https://pub.dev" source: hosted - version: "6.0.2" + version: "5.4.0" platform: dependency: transitive description: @@ -619,10 +610,10 @@ packages: dependency: transitive description: name: shared_preferences_web - sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21" + sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.2.1" shared_preferences_windows: dependency: transitive description: @@ -656,18 +647,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.1" string_scanner: dependency: transitive description: @@ -688,10 +679,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.6.0" tuple: dependency: transitive description: @@ -784,10 +775,10 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "7286aec002c8feecc338cc33269e96b73955ab227456e9fb2a91f7fab8a358e9" + sha256: "7fd2f55fe86cea2897b963e864dc01a7eb0719ecc65fcef4c1cc3d686d718bb2" url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.2.0" url_launcher_windows: dependency: transitive description: @@ -848,10 +839,10 @@ packages: dependency: transitive description: name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.1.4-beta" win32: dependency: transitive description: @@ -872,10 +863,10 @@ packages: dependency: transitive description: name: xml - sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 + sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" url: "https://pub.dev" source: hosted - version: "6.5.0" + version: "6.3.0" sdks: - dart: ">=3.2.0 <4.0.0" - flutter: ">=3.16.0" + dart: ">=3.1.0 <4.0.0" + flutter: ">=3.13.0" diff --git a/packages/hmssdk_flutter/lib/hmssdk_flutter.dart b/packages/hmssdk_flutter/lib/hmssdk_flutter.dart index 691329cea..121adadd8 100644 --- a/packages/hmssdk_flutter/lib/hmssdk_flutter.dart +++ b/packages/hmssdk_flutter/lib/hmssdk_flutter.dart @@ -100,6 +100,8 @@ export 'src/model/hls_player/hms_hls_cue.dart'; export 'src/model/hls_player/hms_hls_timed_metadata.dart'; export 'src/model/hms_peer_list_iterator.dart'; export 'src/model/peer_list_iterator_options.dart'; +export 'src/enum/hms_recording_state.dart'; +export 'src/enum/hms_streaming_state.dart'; //Views export 'src/ui/meeting/hms_texture_view.dart'; diff --git a/packages/hmssdk_flutter/lib/src/model/hms_browser_recording_state.dart b/packages/hmssdk_flutter/lib/src/model/hms_browser_recording_state.dart index 622d7b762..38b69b49f 100644 --- a/packages/hmssdk_flutter/lib/src/model/hms_browser_recording_state.dart +++ b/packages/hmssdk_flutter/lib/src/model/hms_browser_recording_state.dart @@ -1,7 +1,7 @@ // Project imports: import 'package:hmssdk_flutter/src/exceptions/hms_exception.dart'; import 'package:hmssdk_flutter/src/model/hms_date_extension.dart'; -import 'package:hmssdk_flutter/src/model/hms_recording_state.dart'; +import 'package:hmssdk_flutter/src/enum/hms_recording_state.dart'; ///100ms HMSBrowserRecordingState /// diff --git a/packages/hmssdk_flutter/lib/src/model/hms_hls_recording_state.dart b/packages/hmssdk_flutter/lib/src/model/hms_hls_recording_state.dart index 551a848d5..c94bdc9a6 100644 --- a/packages/hmssdk_flutter/lib/src/model/hms_hls_recording_state.dart +++ b/packages/hmssdk_flutter/lib/src/model/hms_hls_recording_state.dart @@ -1,7 +1,7 @@ // Project imports: import 'package:hmssdk_flutter/src/exceptions/hms_exception.dart'; import 'package:hmssdk_flutter/src/model/hms_date_extension.dart'; -import 'package:hmssdk_flutter/src/model/hms_recording_state.dart'; +import 'package:hmssdk_flutter/src/enum/hms_recording_state.dart'; ///100ms HMSHLSRecordingState /// diff --git a/packages/hmssdk_flutter/lib/src/model/hms_hls_streaming_state.dart b/packages/hmssdk_flutter/lib/src/model/hms_hls_streaming_state.dart index 738a7e6bc..b1308cabb 100644 --- a/packages/hmssdk_flutter/lib/src/model/hms_hls_streaming_state.dart +++ b/packages/hmssdk_flutter/lib/src/model/hms_hls_streaming_state.dart @@ -1,6 +1,6 @@ // Project imports import 'package:hmssdk_flutter/src/model/hms_hls_variant.dart'; -import 'package:hmssdk_flutter/src/model/hms_streaming_state.dart'; +import 'package:hmssdk_flutter/src/enum/hms_streaming_state.dart'; ///100ms HMSHLSStreamingState /// diff --git a/packages/hmssdk_flutter/lib/src/model/hms_recording_state.dart b/packages/hmssdk_flutter/lib/src/model/hms_recording_state.dart deleted file mode 100644 index da610dfdf..000000000 --- a/packages/hmssdk_flutter/lib/src/model/hms_recording_state.dart +++ /dev/null @@ -1,63 +0,0 @@ -enum HMSRecordingState { - none, - - starting, - - started, - - paused, - - resumed, - - stopped, - - failed, -} - -extension HMSRecordingStateValues on HMSRecordingState { - static HMSRecordingState getRecordingStateFromName(String name) { - switch (name) { - case 'NONE': - return HMSRecordingState.none; - case 'STARTING': - return HMSRecordingState.starting; - case 'STARTED': - return HMSRecordingState.started; - case 'PAUSED': - return HMSRecordingState.paused; - case 'RESUMED': - return HMSRecordingState.resumed; - case 'STOPPED': - return HMSRecordingState.stopped; - case 'FAILED': - return HMSRecordingState.failed; - default: - return HMSRecordingState.none; - } - } - - static String getNameFromRecordingState(HMSRecordingState state) { - switch (state) { - case HMSRecordingState.none: - return 'NONE'; - - case HMSRecordingState.starting: - return 'STARTING'; - - case HMSRecordingState.started: - return 'STARTED'; - - case HMSRecordingState.paused: - return 'PAUSED'; - - case HMSRecordingState.resumed: - return 'RESUMED'; - - case HMSRecordingState.stopped: - return 'STOPPED'; - - case HMSRecordingState.failed: - return 'FAILED'; - } - } -} diff --git a/packages/hmssdk_flutter/lib/src/model/hms_rtmp_streaming_state.dart b/packages/hmssdk_flutter/lib/src/model/hms_rtmp_streaming_state.dart index a1244ab2e..d6c64c9c2 100644 --- a/packages/hmssdk_flutter/lib/src/model/hms_rtmp_streaming_state.dart +++ b/packages/hmssdk_flutter/lib/src/model/hms_rtmp_streaming_state.dart @@ -1,7 +1,7 @@ // Project imports: import 'package:hmssdk_flutter/src/exceptions/hms_exception.dart'; import 'package:hmssdk_flutter/src/model/hms_date_extension.dart'; -import 'package:hmssdk_flutter/src/model/hms_streaming_state.dart'; +import 'package:hmssdk_flutter/src/enum/hms_streaming_state.dart'; ///100ms HMSRtmpStreamingState /// diff --git a/packages/hmssdk_flutter/lib/src/model/hms_server_recording_state.dart b/packages/hmssdk_flutter/lib/src/model/hms_server_recording_state.dart index 57fcbdcf4..edee81a76 100644 --- a/packages/hmssdk_flutter/lib/src/model/hms_server_recording_state.dart +++ b/packages/hmssdk_flutter/lib/src/model/hms_server_recording_state.dart @@ -1,6 +1,6 @@ // Project imports: import 'package:hmssdk_flutter/src/model/hms_date_extension.dart'; -import 'package:hmssdk_flutter/src/model/hms_recording_state.dart'; +import 'package:hmssdk_flutter/src/enum/hms_recording_state.dart'; import '../../hmssdk_flutter.dart'; diff --git a/packages/hmssdk_flutter/lib/src/model/hms_streaming_state.dart b/packages/hmssdk_flutter/lib/src/model/hms_streaming_state.dart deleted file mode 100644 index c8c849756..000000000 --- a/packages/hmssdk_flutter/lib/src/model/hms_streaming_state.dart +++ /dev/null @@ -1,49 +0,0 @@ -enum HMSStreamingState { - none, - - starting, - - started, - - stopped, - - failed, -} - -extension HMSStreamingStateValues on HMSStreamingState { - static HMSStreamingState getStreamingStateFromName(String name) { - switch (name) { - case 'NONE': - return HMSStreamingState.none; - case 'STARTING': - return HMSStreamingState.starting; - case 'STARTED': - return HMSStreamingState.started; - case 'STOPPED': - return HMSStreamingState.stopped; - case 'FAILED': - return HMSStreamingState.failed; - default: - return HMSStreamingState.none; - } - } - - static String getNameFromStreamingState(HMSStreamingState state) { - switch (state) { - case HMSStreamingState.none: - return 'NONE'; - - case HMSStreamingState.starting: - return 'STARTING'; - - case HMSStreamingState.started: - return 'STARTED'; - - case HMSStreamingState.stopped: - return 'STOPPED'; - - case HMSStreamingState.failed: - return 'FAILED'; - } - } -} diff --git a/packages/hmssdk_flutter/pubspec.lock b/packages/hmssdk_flutter/pubspec.lock index 53939cd59..c3cc2c33e 100644 --- a/packages/hmssdk_flutter/pubspec.lock +++ b/packages/hmssdk_flutter/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.17.2" fake_async: dependency: transitive description: @@ -79,10 +79,10 @@ packages: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.9.1" path: dependency: transitive description: @@ -108,18 +108,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.1" string_scanner: dependency: transitive description: @@ -140,10 +140,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.6.0" vector_math: dependency: transitive description: @@ -156,10 +156,10 @@ packages: dependency: transitive description: name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.1.4-beta" sdks: - dart: ">=3.2.0-194.0.dev <4.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0" flutter: ">=2.10.0" From 7e20ca81b97cb80df649bc8ce335dd3777d97c4a Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Tue, 12 Dec 2023 17:07:39 +0530 Subject: [PATCH 13/32] Updated file path --- .../lib/src/enum/hms_recording_state.dart | 63 +++++++++++++++++++ .../lib/src/enum/hms_streaming_state.dart | 49 +++++++++++++++ 2 files changed, 112 insertions(+) create mode 100644 packages/hmssdk_flutter/lib/src/enum/hms_recording_state.dart create mode 100644 packages/hmssdk_flutter/lib/src/enum/hms_streaming_state.dart diff --git a/packages/hmssdk_flutter/lib/src/enum/hms_recording_state.dart b/packages/hmssdk_flutter/lib/src/enum/hms_recording_state.dart new file mode 100644 index 000000000..da610dfdf --- /dev/null +++ b/packages/hmssdk_flutter/lib/src/enum/hms_recording_state.dart @@ -0,0 +1,63 @@ +enum HMSRecordingState { + none, + + starting, + + started, + + paused, + + resumed, + + stopped, + + failed, +} + +extension HMSRecordingStateValues on HMSRecordingState { + static HMSRecordingState getRecordingStateFromName(String name) { + switch (name) { + case 'NONE': + return HMSRecordingState.none; + case 'STARTING': + return HMSRecordingState.starting; + case 'STARTED': + return HMSRecordingState.started; + case 'PAUSED': + return HMSRecordingState.paused; + case 'RESUMED': + return HMSRecordingState.resumed; + case 'STOPPED': + return HMSRecordingState.stopped; + case 'FAILED': + return HMSRecordingState.failed; + default: + return HMSRecordingState.none; + } + } + + static String getNameFromRecordingState(HMSRecordingState state) { + switch (state) { + case HMSRecordingState.none: + return 'NONE'; + + case HMSRecordingState.starting: + return 'STARTING'; + + case HMSRecordingState.started: + return 'STARTED'; + + case HMSRecordingState.paused: + return 'PAUSED'; + + case HMSRecordingState.resumed: + return 'RESUMED'; + + case HMSRecordingState.stopped: + return 'STOPPED'; + + case HMSRecordingState.failed: + return 'FAILED'; + } + } +} diff --git a/packages/hmssdk_flutter/lib/src/enum/hms_streaming_state.dart b/packages/hmssdk_flutter/lib/src/enum/hms_streaming_state.dart new file mode 100644 index 000000000..c8c849756 --- /dev/null +++ b/packages/hmssdk_flutter/lib/src/enum/hms_streaming_state.dart @@ -0,0 +1,49 @@ +enum HMSStreamingState { + none, + + starting, + + started, + + stopped, + + failed, +} + +extension HMSStreamingStateValues on HMSStreamingState { + static HMSStreamingState getStreamingStateFromName(String name) { + switch (name) { + case 'NONE': + return HMSStreamingState.none; + case 'STARTING': + return HMSStreamingState.starting; + case 'STARTED': + return HMSStreamingState.started; + case 'STOPPED': + return HMSStreamingState.stopped; + case 'FAILED': + return HMSStreamingState.failed; + default: + return HMSStreamingState.none; + } + } + + static String getNameFromStreamingState(HMSStreamingState state) { + switch (state) { + case HMSStreamingState.none: + return 'NONE'; + + case HMSStreamingState.starting: + return 'STARTING'; + + case HMSStreamingState.started: + return 'STARTED'; + + case HMSStreamingState.stopped: + return 'STOPPED'; + + case HMSStreamingState.failed: + return 'FAILED'; + } + } +} From b6271d31266024d24f2b9a06a5173661cc3f5b8f Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Tue, 12 Dec 2023 11:39:00 +0000 Subject: [PATCH 14/32] =?UTF-8?q?=F0=9F=A4=96=20Automated=20Format=20and?= =?UTF-8?q?=20Fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lib/src/meeting/meeting_store.dart | 12 ++++++--- .../lib/src/preview/preview_store.dart | 18 ++++++++----- .../app_utilities_bottom_sheet.dart | 3 +-- packages/hmssdk_flutter/example/pubspec.lock | 26 +++++++++---------- .../src/model/hms_server_recording_state.dart | 1 - packages/hmssdk_flutter/pubspec.lock | 26 +++++++++---------- 6 files changed, 47 insertions(+), 39 deletions(-) diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart index 49ba8f822..93d479644 100644 --- a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart +++ b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart @@ -906,15 +906,19 @@ class MeetingStore extends ChangeNotifier room.hmsServerRecordingState?.state == HMSRecordingState.started; break; case HMSRoomUpdate.hlsRecordingStateUpdated: - recordingType["hls"] = room.hmshlsRecordingState?.state == HMSRecordingState.started; + recordingType["hls"] = + room.hmshlsRecordingState?.state == HMSRecordingState.started; break; case HMSRoomUpdate.rtmpStreamingStateUpdated: - streamingType["rtmp"] = room.hmsRtmpStreamingState?.state == HMSStreamingState.started; + streamingType["rtmp"] = + room.hmsRtmpStreamingState?.state == HMSStreamingState.started; break; case HMSRoomUpdate.hlsStreamingStateUpdated: isHLSLoading = false; - streamingType["hls"] = room.hmshlsStreamingState?.state == HMSStreamingState.started; - hasHlsStarted = room.hmshlsStreamingState?.state == HMSStreamingState.started; + streamingType["hls"] = + room.hmshlsStreamingState?.state == HMSStreamingState.started; + hasHlsStarted = + room.hmshlsStreamingState?.state == HMSStreamingState.started; streamUrl = hasHlsStarted ? room.hmshlsStreamingState?.variants[0]?.hlsStreamUrl : null; diff --git a/packages/hms_room_kit/lib/src/preview/preview_store.dart b/packages/hms_room_kit/lib/src/preview/preview_store.dart index 8ea3a92b3..c1d722b06 100644 --- a/packages/hms_room_kit/lib/src/preview/preview_store.dart +++ b/packages/hms_room_kit/lib/src/preview/preview_store.dart @@ -174,24 +174,30 @@ class PreviewStore extends ChangeNotifier log("onRoomUpdate-> room: ${room.toString()} update: ${update.name}"); switch (update) { case HMSRoomUpdate.browserRecordingStateUpdated: - isRecordingStarted = room.hmsBrowserRecordingState?.state == HMSRecordingState.started; + isRecordingStarted = + room.hmsBrowserRecordingState?.state == HMSRecordingState.started; break; case HMSRoomUpdate.serverRecordingStateUpdated: - isRecordingStarted = room.hmsServerRecordingState?.state == HMSRecordingState.started; + isRecordingStarted = + room.hmsServerRecordingState?.state == HMSRecordingState.started; case HMSRoomUpdate.hlsRecordingStateUpdated: - isRecordingStarted = room.hmshlsRecordingState?.state == HMSRecordingState.started; + isRecordingStarted = + room.hmshlsRecordingState?.state == HMSRecordingState.started; break; case HMSRoomUpdate.rtmpStreamingStateUpdated: - isRTMPStreamingStarted = room.hmsRtmpStreamingState?.state == HMSStreamingState.started; + isRTMPStreamingStarted = + room.hmsRtmpStreamingState?.state == HMSStreamingState.started; break; case HMSRoomUpdate.hlsStreamingStateUpdated: - isHLSStreamingStarted = room.hmshlsStreamingState?.state == HMSStreamingState.started; + isHLSStreamingStarted = + room.hmshlsStreamingState?.state == HMSStreamingState.started; if (!isMeetingJoined && isRoomJoined) { isRoomJoinedAndHLSStarted = - (room.hmshlsStreamingState?.state == HMSStreamingState.started) && isRoomJoined; + (room.hmshlsStreamingState?.state == HMSStreamingState.started) && + isRoomJoined; isMeetingJoined = true; } break; diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/app_utilities_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/app_utilities_bottom_sheet.dart index 5a12e8593..473525b7d 100644 --- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/app_utilities_bottom_sheet.dart +++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/app_utilities_bottom_sheet.dart @@ -276,8 +276,7 @@ class _AppUtilitiesBottomSheetState extends State { }, isActive: ((meetingStore.recordingType["hls"] ?? false) || - (meetingStore.recordingType["browser"] ?? - false)), + (meetingStore.recordingType["browser"] ?? false)), optionIcon: SvgPicture.asset( "packages/hms_room_kit/lib/src/ass ets/icons/record.svg", height: 20, diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index 569673c04..9afb586fe 100644 --- a/packages/hmssdk_flutter/example/pubspec.lock +++ b/packages/hmssdk_flutter/example/pubspec.lock @@ -69,10 +69,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" convert: dependency: transitive description: @@ -362,10 +362,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: @@ -647,18 +647,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -679,10 +679,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" tuple: dependency: transitive description: @@ -839,10 +839,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" win32: dependency: transitive description: @@ -868,5 +868,5 @@ packages: source: hosted version: "6.3.0" sdks: - dart: ">=3.1.0 <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.13.0" diff --git a/packages/hmssdk_flutter/lib/src/model/hms_server_recording_state.dart b/packages/hmssdk_flutter/lib/src/model/hms_server_recording_state.dart index edee81a76..60ec489c6 100644 --- a/packages/hmssdk_flutter/lib/src/model/hms_server_recording_state.dart +++ b/packages/hmssdk_flutter/lib/src/model/hms_server_recording_state.dart @@ -1,6 +1,5 @@ // Project imports: import 'package:hmssdk_flutter/src/model/hms_date_extension.dart'; -import 'package:hmssdk_flutter/src/enum/hms_recording_state.dart'; import '../../hmssdk_flutter.dart'; diff --git a/packages/hmssdk_flutter/pubspec.lock b/packages/hmssdk_flutter/pubspec.lock index c3cc2c33e..53939cd59 100644 --- a/packages/hmssdk_flutter/pubspec.lock +++ b/packages/hmssdk_flutter/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" fake_async: dependency: transitive description: @@ -79,10 +79,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" path: dependency: transitive description: @@ -108,18 +108,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -140,10 +140,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" vector_math: dependency: transitive description: @@ -156,10 +156,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=2.10.0" From 158a680d3c48cb516ab45384a966fa86e95c9645 Mon Sep 17 00:00:00 2001 From: Pushpam <93931528+Decoder07@users.noreply.github.com> Date: Wed, 13 Dec 2023 12:21:22 +0530 Subject: [PATCH 15/32] Added iOS beam state changes (#1662) --- .../lib/src/assets/icons/recording_paused.svg | 3 + .../lib/src/hls_viewer/hls_viewer_header.dart | 22 +++- .../lib/src/meeting/meeting_header.dart | 22 +++- .../lib/src/meeting/meeting_store.dart | 10 +- .../app_utilities_bottom_sheet.dart | 21 ++-- .../common_widgets/hms_subtitle_text.dart | 16 ++- .../common_widgets/more_option_item.dart | 2 + .../hmssdk_flutter/example/ios/Podfile.lock | 10 +- .../ios/Runner.xcodeproj/project.pbxproj | 110 +++++++++--------- .../Models/HMSStreamingStateExtension.swift | 8 +- 10 files changed, 133 insertions(+), 91 deletions(-) create mode 100644 packages/hms_room_kit/lib/src/assets/icons/recording_paused.svg diff --git a/packages/hms_room_kit/lib/src/assets/icons/recording_paused.svg b/packages/hms_room_kit/lib/src/assets/icons/recording_paused.svg new file mode 100644 index 000000000..9fbd1e990 --- /dev/null +++ b/packages/hms_room_kit/lib/src/assets/icons/recording_paused.svg @@ -0,0 +1,3 @@ + + + diff --git a/packages/hms_room_kit/lib/src/hls_viewer/hls_viewer_header.dart b/packages/hms_room_kit/lib/src/hls_viewer/hls_viewer_header.dart index 9e9c139b0..18c263fce 100644 --- a/packages/hms_room_kit/lib/src/hls_viewer/hls_viewer_header.dart +++ b/packages/hms_room_kit/lib/src/hls_viewer/hls_viewer_header.dart @@ -2,9 +2,10 @@ import 'dart:developer'; import 'dart:io'; +///Package imports import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:hms_room_kit/src/common/utility_functions.dart'; +import 'package:hmssdk_flutter/hmssdk_flutter.dart'; import 'package:provider/provider.dart'; import 'package:tuple/tuple.dart'; @@ -13,6 +14,7 @@ import 'package:hms_room_kit/src/layout_api/hms_room_layout.dart'; import 'package:hms_room_kit/src/layout_api/hms_theme_colors.dart'; import 'package:hms_room_kit/src/meeting/meeting_store.dart'; import 'package:hms_room_kit/src/widgets/common_widgets/hms_title_text.dart'; +import 'package:hms_room_kit/src/common/utility_functions.dart'; ///[HLSViewerHeader] is the header of the HLS Viewer screen class HLSViewerHeader extends StatelessWidget { @@ -97,12 +99,13 @@ class HLSViewerHeader extends StatelessWidget { ///If the recording is not started we show nothing /// ///If recording initialising state is true we show the loader - Selector>( + Selector>( selector: (_, meetingStore) => Tuple4( meetingStore.recordingType["browser"] ?? false, meetingStore.recordingType["server"] ?? false, meetingStore.recordingType["hls"] ?? false, - meetingStore.isRecordingInInitialisingState), + meetingStore.hmsRecordingState), builder: (_, data, __) { return (data.item1 || data.item2 || data.item3) ? SvgPicture.asset( @@ -113,7 +116,7 @@ class HLSViewerHeader extends StatelessWidget { HMSThemeColors.alertErrorDefault, BlendMode.srcIn), ) - : data.item4 + : data.item4 == HMSRecordingState.starting ? SizedBox( height: 24, width: 24, @@ -121,7 +124,16 @@ class HLSViewerHeader extends StatelessWidget { strokeWidth: 1, color: HMSThemeColors.onSurfaceHighEmphasis, )) - : Container(); + : data.item4 == HMSRecordingState.paused + ? SvgPicture.asset( + "packages/hms_room_kit/lib/src/assets/icons/recording_paused.svg", + height: 24, + width: 24, + colorFilter: ColorFilter.mode( + HMSThemeColors.onSurfaceHighEmphasis, + BlendMode.srcIn), + ) + : Container(); }), const SizedBox( width: 8, diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_header.dart b/packages/hms_room_kit/lib/src/meeting/meeting_header.dart index b544c57e1..cd461bec6 100644 --- a/packages/hms_room_kit/lib/src/meeting/meeting_header.dart +++ b/packages/hms_room_kit/lib/src/meeting/meeting_header.dart @@ -116,13 +116,13 @@ class _MeetingHeaderState extends State { /// ///For recording status we use the recordingType map from the [MeetingStore] Selector>( + Tuple4>( selector: (_, meetingStore) => Tuple4( meetingStore.recordingType["browser"] ?? false, meetingStore.recordingType["server"] ?? false, meetingStore.recordingType["hls"] ?? false, - meetingStore.isRecordingInInitialisingState), + meetingStore.hmsRecordingState), builder: (_, data, __) { return (data.item1 || data.item2 || data.item3) ? SvgPicture.asset( @@ -133,16 +133,26 @@ class _MeetingHeaderState extends State { HMSThemeColors.alertErrorDefault, BlendMode.srcIn), ) - : data.item4 + : data.item4 == HMSRecordingState.starting ? SizedBox( - height: 24, - width: 24, + height: 20, + width: 20, child: CircularProgressIndicator( strokeWidth: 2, color: HMSThemeColors .onSurfaceHighEmphasis, )) - : Container(); + : data.item4 == HMSRecordingState.paused + ? SvgPicture.asset( + "packages/hms_room_kit/lib/src/assets/icons/recording_paused.svg", + height: 24, + width: 24, + colorFilter: ColorFilter.mode( + HMSThemeColors + .alertErrorDefault, + BlendMode.srcIn), + ) + : Container(); }), const SizedBox( width: 8, diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart index 93d479644..f0915458f 100644 --- a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart +++ b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart @@ -229,7 +229,7 @@ class MeetingStore extends ChangeNotifier int peersInRoom = 0; ///Check whether recording is in intialising state - bool isRecordingInInitialisingState = false; + HMSRecordingState hmsRecordingState = HMSRecordingState.none; ///Pool of video views List viewControllers = []; @@ -529,7 +529,7 @@ class MeetingStore extends ChangeNotifier meetingUrl: meetingUrl, toRecord: toRecord, rtmpUrls: rtmpUrls); _hmsSDKInteractor.startRtmpOrRecording(hmsRecordingConfig, this); - isRecordingInInitialisingState = true; + hmsRecordingState = HMSRecordingState.starting; notifyListeners(); } @@ -898,8 +898,8 @@ class MeetingStore extends ChangeNotifier case HMSRoomUpdate.browserRecordingStateUpdated: recordingType["browser"] = room.hmsBrowserRecordingState?.state == HMSRecordingState.started; - isRecordingInInitialisingState = - room.hmsBrowserRecordingState?.state == HMSRecordingState.starting; + hmsRecordingState = + room.hmsBrowserRecordingState?.state ?? HMSRecordingState.none; break; case HMSRoomUpdate.serverRecordingStateUpdated: recordingType["server"] = @@ -2193,7 +2193,7 @@ class MeetingStore extends ChangeNotifier case HMSActionResultListenerMethod.startRtmpOrRecording: toasts.add(HMSToastModel(hmsException, hmsToastType: HMSToastsType.errorToast)); - isRecordingInInitialisingState = false; + hmsRecordingState = HMSRecordingState.failed; notifyListeners(); break; case HMSActionResultListenerMethod.stopRtmpAndRecording: diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/app_utilities_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/app_utilities_bottom_sheet.dart index 473525b7d..f4d8ca1e6 100644 --- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/app_utilities_bottom_sheet.dart +++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/app_utilities_bottom_sheet.dart @@ -2,6 +2,7 @@ import 'package:badges/badges.dart' as badge; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; +import 'package:hmssdk_flutter/hmssdk_flutter.dart'; import 'package:provider/provider.dart'; ///Project imports @@ -207,7 +208,8 @@ class _AppUtilitiesBottomSheetState extends State { ///If streaming is on or in initialising state disable the button ((meetingStore.streamingType["hls"] ?? false) || (meetingStore.streamingType["rtmp"] ?? false) || - meetingStore.isRecordingInInitialisingState) + meetingStore.hmsRecordingState == + HMSRecordingState.starting) ? MoreOptionItem( onTap: () {}, isActive: false, @@ -274,19 +276,22 @@ class _AppUtilitiesBottomSheetState extends State { rtmpUrls: null); } }, - isActive: ((meetingStore.recordingType["hls"] ?? - false) || - (meetingStore.recordingType["browser"] ?? false)), + isActive: false, optionIcon: SvgPicture.asset( - "packages/hms_room_kit/lib/src/ass ets/icons/record.svg", + "packages/hms_room_kit/lib/src/assets/icons/${meetingStore.hmsRecordingState == HMSRecordingState.paused ? "recording_paused" : "record"}.svg", height: 20, width: 20, colorFilter: ColorFilter.mode( - HMSThemeColors.onSurfaceHighEmphasis, + meetingStore.hmsRecordingState == + HMSRecordingState.started + ? HMSThemeColors.alertErrorDefault + : HMSThemeColors.onSurfaceHighEmphasis, BlendMode.srcIn), ), - optionText: - ((meetingStore.recordingType["hls"] ?? false) || + optionText: meetingStore.hmsRecordingState == + HMSRecordingState.paused + ? "Recording Paused" + : ((meetingStore.recordingType["hls"] ?? false) || (meetingStore.recordingType["browser"] ?? false)) ? "Recording" diff --git a/packages/hms_room_kit/lib/src/widgets/common_widgets/hms_subtitle_text.dart b/packages/hms_room_kit/lib/src/widgets/common_widgets/hms_subtitle_text.dart index 8b550777f..2f3e306a7 100644 --- a/packages/hms_room_kit/lib/src/widgets/common_widgets/hms_subtitle_text.dart +++ b/packages/hms_room_kit/lib/src/widgets/common_widgets/hms_subtitle_text.dart @@ -23,6 +23,7 @@ class HMSSubtitleText extends StatelessWidget { final FontWeight? fontWeight; final TextOverflow? textOverflow; final TextAlign? textAlign; + final int? maxLines; const HMSSubtitleText( {Key? key, @@ -33,7 +34,8 @@ class HMSSubtitleText extends StatelessWidget { this.fontSize = 12, this.fontWeight = FontWeight.w400, this.textOverflow = TextOverflow.ellipsis, - this.textAlign}) + this.textAlign, + this.maxLines = 1}) : super(key: key); @override @@ -41,12 +43,14 @@ class HMSSubtitleText extends StatelessWidget { return Text(text, overflow: textOverflow, softWrap: true, + maxLines: maxLines, textAlign: textAlign, style: HMSTextStyle.setTextStyle( - height: lineHeight! / fontSize!, - fontSize: fontSize, - letterSpacing: letterSpacing, - color: textColor, - fontWeight: fontWeight)); + height: lineHeight! / fontSize!, + fontSize: fontSize, + letterSpacing: letterSpacing, + color: textColor, + fontWeight: fontWeight, + )); } } diff --git a/packages/hms_room_kit/lib/src/widgets/common_widgets/more_option_item.dart b/packages/hms_room_kit/lib/src/widgets/common_widgets/more_option_item.dart index 7a5dfd018..389615e09 100644 --- a/packages/hms_room_kit/lib/src/widgets/common_widgets/more_option_item.dart +++ b/packages/hms_room_kit/lib/src/widgets/common_widgets/more_option_item.dart @@ -40,7 +40,9 @@ class MoreOptionItem extends StatelessWidget { optionIcon, const SizedBox(height: 8), HMSSubtitleText( + maxLines: 2, text: optionText, + textAlign: TextAlign.center, textColor: optionTextColor ?? HMSThemeColors.onSurfaceHighEmphasis, fontWeight: FontWeight.w600, diff --git a/packages/hmssdk_flutter/example/ios/Podfile.lock b/packages/hmssdk_flutter/example/ios/Podfile.lock index a1481439c..f8bb6db68 100644 --- a/packages/hmssdk_flutter/example/ios/Podfile.lock +++ b/packages/hmssdk_flutter/example/ios/Podfile.lock @@ -97,14 +97,14 @@ PODS: - HMSBroadcastExtensionSDK (0.0.9) - HMSHLSPlayerSDK (0.0.2): - HMSAnalyticsSDK (= 0.0.2) - - HMSSDK (1.3.1): + - HMSSDK (1.4.0): - HMSAnalyticsSDK (= 0.0.2) - HMSWebRTC (= 1.0.5116) - - hmssdk_flutter (1.9.4): + - hmssdk_flutter (1.9.5): - Flutter - HMSBroadcastExtensionSDK (= 0.0.9) - HMSHLSPlayerSDK (= 0.0.2) - - HMSSDK (= 1.3.1) + - HMSSDK (= 1.4.0) - HMSWebRTC (1.0.5116) - MTBBarcodeScanner (5.0.11) - nanopb (2.30909.1): @@ -235,8 +235,8 @@ SPEC CHECKSUMS: HMSAnalyticsSDK: 4d2a88a729b1eb42f3d25f217c28937ec318a5b7 HMSBroadcastExtensionSDK: d80fe325f6c928bd8e5176290b5a4b7ae15d6fbb HMSHLSPlayerSDK: 6a54ad4d12f3dc2270d1ecd24019d71282a4f6a3 - HMSSDK: 04aac0fefd95419cd1b4135156d4295cbcd51216 - hmssdk_flutter: 3876d06f4ad68bf48a2ceb4c797551fedb860bd1 + HMSSDK: 1bfd81ce70d61864cf2496018892d95335164b53 + hmssdk_flutter: b8e4641f6839d0492c447b338169a813cb443816 HMSWebRTC: ae54e9dd91b869051b283b43b14f57d43b7bf8e1 MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5 diff --git a/packages/hmssdk_flutter/example/ios/Runner.xcodeproj/project.pbxproj b/packages/hmssdk_flutter/example/ios/Runner.xcodeproj/project.pbxproj index b4f14f7ae..3f12e3fba 100644 --- a/packages/hmssdk_flutter/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/hmssdk_flutter/example/ios/Runner.xcodeproj/project.pbxproj @@ -7,14 +7,14 @@ objects = { /* Begin PBXBuildFile section */ + 13A4E967BFA539D9C281B0C1 /* Pods_FlutterBroadcastUploadExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FFB31E34C8F8BCED73A0DED /* Pods_FlutterBroadcastUploadExtension.framework */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; - 6A8DAA457993A7BBF808447F /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 650E3B08A6C973442370ABD8 /* Pods_Runner.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - C45DFE66D74DCDD1B6244A17 /* Pods_FlutterBroadcastUploadExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 683C65A6AADC79CE61E0513E /* Pods_FlutterBroadcastUploadExtension.framework */; }; + D18F570DD3255ED3EA289977 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41B8003D2A87475893EBDC35 /* Pods_Runner.framework */; }; EC1052B22858A77D005EAB9E /* ReplayKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EC1052B12858A77D005EAB9E /* ReplayKit.framework */; }; EC1052B52858A77D005EAB9E /* SampleHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC1052B42858A77D005EAB9E /* SampleHandler.swift */; }; EC1052B92858A77D005EAB9E /* FlutterBroadcastUploadExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = EC1052B02858A77D005EAB9E /* FlutterBroadcastUploadExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; @@ -56,17 +56,17 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 0379B33E02429598E0E5B6DD /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 238323F347131537C23069F5 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 33004F7844D65ECDC49C7337 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 41AA5D92A2CC1BB27F1A83DE /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - 650E3B08A6C973442370ABD8 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 683C65A6AADC79CE61E0513E /* Pods_FlutterBroadcastUploadExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FlutterBroadcastUploadExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 41B8003D2A87475893EBDC35 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 4F65824659E8556B8219638A /* Pods-FlutterBroadcastUploadExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlutterBroadcastUploadExtension.release.xcconfig"; path = "Target Support Files/Pods-FlutterBroadcastUploadExtension/Pods-FlutterBroadcastUploadExtension.release.xcconfig"; sourceTree = ""; }; + 6FFB31E34C8F8BCED73A0DED /* Pods_FlutterBroadcastUploadExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FlutterBroadcastUploadExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 89EFF6EE4AAF69984055D76C /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -74,9 +74,9 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - B0623F8FBD08D7EF79FF5844 /* Pods-FlutterBroadcastUploadExtension.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlutterBroadcastUploadExtension.profile.xcconfig"; path = "Target Support Files/Pods-FlutterBroadcastUploadExtension/Pods-FlutterBroadcastUploadExtension.profile.xcconfig"; sourceTree = ""; }; B44CF4C02A83BCF0003B3D5E /* RunnerRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RunnerRelease.entitlements; sourceTree = ""; }; - CD3C8BA7497CF5A349499EE7 /* Pods-FlutterBroadcastUploadExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlutterBroadcastUploadExtension.release.xcconfig"; path = "Target Support Files/Pods-FlutterBroadcastUploadExtension/Pods-FlutterBroadcastUploadExtension.release.xcconfig"; sourceTree = ""; }; + D0C8C6B4A94A6E15007F7D46 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + EA887658136F948769F1129B /* Pods-FlutterBroadcastUploadExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlutterBroadcastUploadExtension.debug.xcconfig"; path = "Target Support Files/Pods-FlutterBroadcastUploadExtension/Pods-FlutterBroadcastUploadExtension.debug.xcconfig"; sourceTree = ""; }; EC1052B02858A77D005EAB9E /* FlutterBroadcastUploadExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = FlutterBroadcastUploadExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; EC1052B12858A77D005EAB9E /* ReplayKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ReplayKit.framework; path = System/Library/Frameworks/ReplayKit.framework; sourceTree = SDKROOT; }; EC1052B42858A77D005EAB9E /* SampleHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleHandler.swift; sourceTree = ""; }; @@ -84,7 +84,7 @@ EC3386D4296EBF6B00F565A8 /* Runner.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = ""; }; EC638D182858ABE8005D0AF2 /* FlutterBroadcastUploadExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = FlutterBroadcastUploadExtension.entitlements; sourceTree = ""; }; EC9BCD2A26B1CFDB00D378A0 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; - FA1DA48EB088E64EABD2ADFE /* Pods-FlutterBroadcastUploadExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlutterBroadcastUploadExtension.debug.xcconfig"; path = "Target Support Files/Pods-FlutterBroadcastUploadExtension/Pods-FlutterBroadcastUploadExtension.debug.xcconfig"; sourceTree = ""; }; + FF549B17CAF9408297610536 /* Pods-FlutterBroadcastUploadExtension.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlutterBroadcastUploadExtension.profile.xcconfig"; path = "Target Support Files/Pods-FlutterBroadcastUploadExtension/Pods-FlutterBroadcastUploadExtension.profile.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -92,7 +92,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6A8DAA457993A7BBF808447F /* Pods_Runner.framework in Frameworks */, + D18F570DD3255ED3EA289977 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -101,7 +101,7 @@ buildActionMask = 2147483647; files = ( EC1052B22858A77D005EAB9E /* ReplayKit.framework in Frameworks */, - C45DFE66D74DCDD1B6244A17 /* Pods_FlutterBroadcastUploadExtension.framework in Frameworks */, + 13A4E967BFA539D9C281B0C1 /* Pods_FlutterBroadcastUploadExtension.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -112,8 +112,8 @@ isa = PBXGroup; children = ( EC1052B12858A77D005EAB9E /* ReplayKit.framework */, - 683C65A6AADC79CE61E0513E /* Pods_FlutterBroadcastUploadExtension.framework */, - 650E3B08A6C973442370ABD8 /* Pods_Runner.framework */, + 6FFB31E34C8F8BCED73A0DED /* Pods_FlutterBroadcastUploadExtension.framework */, + 41B8003D2A87475893EBDC35 /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; @@ -171,12 +171,12 @@ B2F80193CC408B94D74DE224 /* Pods */ = { isa = PBXGroup; children = ( - 89EFF6EE4AAF69984055D76C /* Pods-Runner.debug.xcconfig */, - 41AA5D92A2CC1BB27F1A83DE /* Pods-Runner.release.xcconfig */, - 238323F347131537C23069F5 /* Pods-Runner.profile.xcconfig */, - FA1DA48EB088E64EABD2ADFE /* Pods-FlutterBroadcastUploadExtension.debug.xcconfig */, - CD3C8BA7497CF5A349499EE7 /* Pods-FlutterBroadcastUploadExtension.release.xcconfig */, - B0623F8FBD08D7EF79FF5844 /* Pods-FlutterBroadcastUploadExtension.profile.xcconfig */, + EA887658136F948769F1129B /* Pods-FlutterBroadcastUploadExtension.debug.xcconfig */, + 4F65824659E8556B8219638A /* Pods-FlutterBroadcastUploadExtension.release.xcconfig */, + FF549B17CAF9408297610536 /* Pods-FlutterBroadcastUploadExtension.profile.xcconfig */, + D0C8C6B4A94A6E15007F7D46 /* Pods-Runner.debug.xcconfig */, + 33004F7844D65ECDC49C7337 /* Pods-Runner.release.xcconfig */, + 0379B33E02429598E0E5B6DD /* Pods-Runner.profile.xcconfig */, ); path = Pods; sourceTree = ""; @@ -198,16 +198,16 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - D769E267F13386F26EC49DC5 /* [CP] Check Pods Manifest.lock */, + 2FFBE73C2E229E9599BF0B6B /* [CP] Check Pods Manifest.lock */, 9705A1C41CF9048500538489 /* Embed Frameworks */, EC1052BA2858A77D005EAB9E /* Embed App Extensions */, - 7B56423DDF1948A38AE2EA10 /* [CP] Embed Pods Frameworks */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, CC19BBB77EA3E7F699588CF7 /* [firebase_crashlytics] Crashlytics Upload Symbols */, + 6F3F5B27EBB90D146ABDD315 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -223,7 +223,7 @@ isa = PBXNativeTarget; buildConfigurationList = EC1052BE2858A77D005EAB9E /* Build configuration list for PBXNativeTarget "FlutterBroadcastUploadExtension" */; buildPhases = ( - 402164D3899CD572C6304156 /* [CP] Check Pods Manifest.lock */, + 35CCB99FE7A87DC47FA18972 /* [CP] Check Pods Manifest.lock */, EC1052AC2858A77D005EAB9E /* Sources */, EC1052AD2858A77D005EAB9E /* Frameworks */, EC1052AE2858A77D005EAB9E /* Resources */, @@ -298,23 +298,29 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + 2FFBE73C2E229E9599BF0B6B /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( - "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( ); - name = "Thin Binary"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; }; - 402164D3899CD572C6304156 /* [CP] Check Pods Manifest.lock */ = { + 35CCB99FE7A87DC47FA18972 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -336,7 +342,23 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 7B56423DDF1948A38AE2EA10 /* [CP] Embed Pods Frameworks */ = { + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", + ); + name = "Thin Binary"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n"; + }; + 6F3F5B27EBB90D146ABDD315 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -388,28 +410,6 @@ shellPath = /bin/sh; shellScript = "\"$PODS_ROOT/FirebaseCrashlytics/upload-symbols\" --flutter-project \"$PROJECT_DIR/firebase_app_id_file.json\" \n"; }; - D769E267F13386F26EC49DC5 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -730,7 +730,7 @@ }; EC1052BB2858A77D005EAB9E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = FA1DA48EB088E64EABD2ADFE /* Pods-FlutterBroadcastUploadExtension.debug.xcconfig */; + baseConfigurationReference = EA887658136F948769F1129B /* Pods-FlutterBroadcastUploadExtension.debug.xcconfig */; buildSettings = { CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; @@ -775,7 +775,7 @@ }; EC1052BC2858A77D005EAB9E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CD3C8BA7497CF5A349499EE7 /* Pods-FlutterBroadcastUploadExtension.release.xcconfig */; + baseConfigurationReference = 4F65824659E8556B8219638A /* Pods-FlutterBroadcastUploadExtension.release.xcconfig */; buildSettings = { CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; @@ -815,7 +815,7 @@ }; EC1052BD2858A77D005EAB9E /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B0623F8FBD08D7EF79FF5844 /* Pods-FlutterBroadcastUploadExtension.profile.xcconfig */; + baseConfigurationReference = FF549B17CAF9408297610536 /* Pods-FlutterBroadcastUploadExtension.profile.xcconfig */; buildSettings = { CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; diff --git a/packages/hmssdk_flutter/ios/Classes/Models/HMSStreamingStateExtension.swift b/packages/hmssdk_flutter/ios/Classes/Models/HMSStreamingStateExtension.swift index 549e70c34..6b573b123 100644 --- a/packages/hmssdk_flutter/ios/Classes/Models/HMSStreamingStateExtension.swift +++ b/packages/hmssdk_flutter/ios/Classes/Models/HMSStreamingStateExtension.swift @@ -20,6 +20,8 @@ class HMSStreamingStateExtension { if let error = rtmp.error { dict.merge(HMSErrorExtension.toDictionary(error)) { (_, new) in new } } + + dict["state"] = rtmp.state.displayString().uppercased() return dict } @@ -34,7 +36,8 @@ class HMSStreamingStateExtension { if let error = server.error { dict.merge(HMSErrorExtension.toDictionary(error)) { (_, new) in new } } - + + dict["state"] = server.state.displayString().uppercased() return dict } @@ -52,6 +55,7 @@ class HMSStreamingStateExtension { dict.merge(HMSErrorExtension.toDictionary(error)) { (_, new) in new } } + dict["state"] = browser.state.displayString().uppercased() return dict } @@ -65,6 +69,7 @@ class HMSStreamingStateExtension { } dict["variants"]=args + dict["state"] = hlsStreaming.state.displayString().uppercased() return dict } @@ -79,6 +84,7 @@ class HMSStreamingStateExtension { dict.merge(HMSErrorExtension.toDictionary(error)) { (_, new) in new } } + dict["state"] = hlsRecording.state.displayString().uppercased() return dict } } From 1b3de47a41e2153ba41cc64af32634f9ddc9578f Mon Sep 17 00:00:00 2001 From: Pushpam <93931528+Decoder07@users.noreply.github.com> Date: Wed, 13 Dec 2023 14:44:59 +0530 Subject: [PATCH 16/32] Streaming date type fix (#1663) --- packages/hms_room_kit/lib/src/preview/preview_store.dart | 8 +++----- .../live/hms/hmssdk_flutter/HMSHLSVariantExtension.kt | 2 +- .../live/hms/hmssdk_flutter/HMSRtmpStreamingState.kt | 8 ++++---- .../ios/Classes/Models/HMSHLSVariantExtension.swift | 2 +- .../ios/Classes/Models/HMSStreamingStateExtension.swift | 8 ++++---- .../lib/src/model/hms_browser_recording_state.dart | 2 +- .../lib/src/model/hms_hls_recording_state.dart | 2 +- .../hmssdk_flutter/lib/src/model/hms_hls_variant.dart | 2 +- .../lib/src/model/hms_rtmp_streaming_state.dart | 2 +- .../lib/src/model/hms_server_recording_state.dart | 2 +- 10 files changed, 18 insertions(+), 20 deletions(-) diff --git a/packages/hms_room_kit/lib/src/preview/preview_store.dart b/packages/hms_room_kit/lib/src/preview/preview_store.dart index c1d722b06..971273c6e 100644 --- a/packages/hms_room_kit/lib/src/preview/preview_store.dart +++ b/packages/hms_room_kit/lib/src/preview/preview_store.dart @@ -171,7 +171,7 @@ class PreviewStore extends ChangeNotifier @override void onRoomUpdate({required HMSRoom room, required HMSRoomUpdate update}) { this.room = room; - log("onRoomUpdate-> room: ${room.toString()} update: ${update.name}"); + log("onRoomUpdate-> room: ${room.toString()} update: ${update.name} streamingState: ${room.hmshlsStreamingState?.state.name}"); switch (update) { case HMSRoomUpdate.browserRecordingStateUpdated: isRecordingStarted = @@ -194,10 +194,8 @@ class PreviewStore extends ChangeNotifier case HMSRoomUpdate.hlsStreamingStateUpdated: isHLSStreamingStarted = room.hmshlsStreamingState?.state == HMSStreamingState.started; - if (!isMeetingJoined && isRoomJoined) { - isRoomJoinedAndHLSStarted = - (room.hmshlsStreamingState?.state == HMSStreamingState.started) && - isRoomJoined; + if (!isMeetingJoined && isRoomJoined && isHLSStreamingStarted) { + isRoomJoinedAndHLSStarted = true; isMeetingJoined = true; } break; diff --git a/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HMSHLSVariantExtension.kt b/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HMSHLSVariantExtension.kt index 823ea8296..bebd5530e 100644 --- a/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HMSHLSVariantExtension.kt +++ b/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HMSHLSVariantExtension.kt @@ -12,7 +12,7 @@ class HMSHLSVariantExtension { args["meeting_url"] = hmshlsVariant.meetingUrl ?: "" args["metadata"] = hmshlsVariant.metadata ?: "" hmshlsVariant.startedAt?.let { - args["started_at"] = SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(it).toString() + args["started_at"] = it } return args } diff --git a/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HMSRtmpStreamingState.kt b/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HMSRtmpStreamingState.kt index 3fe4ce4bf..04e62b4b2 100644 --- a/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HMSRtmpStreamingState.kt +++ b/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HMSRtmpStreamingState.kt @@ -15,7 +15,7 @@ class HMSStreamingState { map["error"] = HMSExceptionExtension.toDictionary(rtmpStreamingState.error) rtmpStreamingState.startedAt?.let { - map["started_at"] = SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(rtmpStreamingState.startedAt).toString() + map["started_at"] = it } map["state"] = rtmpStreamingState.state.name @@ -32,7 +32,7 @@ class HMSStreamingState { map["error"] = HMSExceptionExtension.toDictionary(serverRecordingState.error) serverRecordingState.startedAt?.let { - map["started_at"] = SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serverRecordingState.startedAt).toString() + map["started_at"] = it } map["state"] = serverRecordingState.state.name @@ -49,7 +49,7 @@ class HMSStreamingState { map["error"] = HMSExceptionExtension.toDictionary(browserRecordingState.error) browserRecordingState.startedAt?.let { - map["started_at"] = SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(browserRecordingState.startedAt).toString() + map["started_at"] = it } map["initialising"] = browserRecordingState.initialising @@ -84,7 +84,7 @@ class HMSStreamingState { map["running"] = hlsRecordingState.running hlsRecordingState.startedAt?.let { - map["started_at"] = SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(hlsRecordingState.startedAt).toString() + map["started_at"] = it } map["state"] = hlsRecordingState.state.name diff --git a/packages/hmssdk_flutter/ios/Classes/Models/HMSHLSVariantExtension.swift b/packages/hmssdk_flutter/ios/Classes/Models/HMSHLSVariantExtension.swift index 8d02b750e..965b9bd34 100644 --- a/packages/hmssdk_flutter/ios/Classes/Models/HMSHLSVariantExtension.swift +++ b/packages/hmssdk_flutter/ios/Classes/Models/HMSHLSVariantExtension.swift @@ -25,7 +25,7 @@ class HMSHLSVariantExtension { } if let startedAt = hmshlsVariant.startedAt { - dict["started_at"] = "\(startedAt)" + dict["started_at"] = Int(startedAt.timeIntervalSince1970 * 1000) } return dict diff --git a/packages/hmssdk_flutter/ios/Classes/Models/HMSStreamingStateExtension.swift b/packages/hmssdk_flutter/ios/Classes/Models/HMSStreamingStateExtension.swift index 6b573b123..e1c1895a1 100644 --- a/packages/hmssdk_flutter/ios/Classes/Models/HMSStreamingStateExtension.swift +++ b/packages/hmssdk_flutter/ios/Classes/Models/HMSStreamingStateExtension.swift @@ -15,7 +15,7 @@ class HMSStreamingStateExtension { dict["running"] = rtmp.running if let startedAt = rtmp.startedAt { - dict["started_at"] = "\(startedAt)" + dict["started_at"] = Int(startedAt.timeIntervalSince1970 * 1000) } if let error = rtmp.error { dict.merge(HMSErrorExtension.toDictionary(error)) { (_, new) in new } @@ -31,7 +31,7 @@ class HMSStreamingStateExtension { dict["running"] = server.running if let startedAt = server.startedAt { - dict["started_at"] = "\(startedAt)" + dict["started_at"] = Int(startedAt.timeIntervalSince1970 * 1000) } if let error = server.error { dict.merge(HMSErrorExtension.toDictionary(error)) { (_, new) in new } @@ -49,7 +49,7 @@ class HMSStreamingStateExtension { dict["running"] = browser.running if let startedAt = browser.startedAt { - dict["started_at"] = "\(startedAt)" + dict["started_at"] = Int(startedAt.timeIntervalSince1970 * 1000) } if let error = browser.error { dict.merge(HMSErrorExtension.toDictionary(error)) { (_, new) in new } @@ -78,7 +78,7 @@ class HMSStreamingStateExtension { dict["running"] = hlsRecording.running if let startedAt = hlsRecording.startedAt { - dict["started_at"] = "\(startedAt)" + dict["started_at"] = Int(startedAt.timeIntervalSince1970 * 1000) } if let error = hlsRecording.error { dict.merge(HMSErrorExtension.toDictionary(error)) { (_, new) in new } diff --git a/packages/hmssdk_flutter/lib/src/model/hms_browser_recording_state.dart b/packages/hmssdk_flutter/lib/src/model/hms_browser_recording_state.dart index 38b69b49f..60dc9115a 100644 --- a/packages/hmssdk_flutter/lib/src/model/hms_browser_recording_state.dart +++ b/packages/hmssdk_flutter/lib/src/model/hms_browser_recording_state.dart @@ -24,7 +24,7 @@ class HMSBrowserRecordingState { error: map["error"] != null ? HMSException.fromMap(map) : null, running: map['running'], startedAt: map['started_at'] != null - ? HMSDateExtension.convertDateFromString(map['started_at']) + ? HMSDateExtension.convertDateFromEpoch(map['started_at']) : null, initialising: map['initialising'], state: HMSRecordingStateValues.getRecordingStateFromName( diff --git a/packages/hmssdk_flutter/lib/src/model/hms_hls_recording_state.dart b/packages/hmssdk_flutter/lib/src/model/hms_hls_recording_state.dart index c94bdc9a6..1ded6f1d6 100644 --- a/packages/hmssdk_flutter/lib/src/model/hms_hls_recording_state.dart +++ b/packages/hmssdk_flutter/lib/src/model/hms_hls_recording_state.dart @@ -24,7 +24,7 @@ class HMSHLSRecordingState { : null, running: map['running'], startedAt: map['started_at'] != null - ? HMSDateExtension.convertDateFromString(map['started_at']) + ? HMSDateExtension.convertDateFromEpoch(map['started_at']) : null, state: HMSRecordingStateValues.getRecordingStateFromName( map['state'] ?? 'NONE')); diff --git a/packages/hmssdk_flutter/lib/src/model/hms_hls_variant.dart b/packages/hmssdk_flutter/lib/src/model/hms_hls_variant.dart index d875b9f06..70cd49f67 100644 --- a/packages/hmssdk_flutter/lib/src/model/hms_hls_variant.dart +++ b/packages/hmssdk_flutter/lib/src/model/hms_hls_variant.dart @@ -38,7 +38,7 @@ class HMSHLSVariant { meetingUrl: map['meeting_url'] as String?, metadata: map['metadata'] as String?, startedAt: map['started_at'] != null - ? HMSDateExtension.convertDateFromString(map['started_at']) + ? HMSDateExtension.convertDateFromEpoch(map['started_at']) : null, ); } diff --git a/packages/hmssdk_flutter/lib/src/model/hms_rtmp_streaming_state.dart b/packages/hmssdk_flutter/lib/src/model/hms_rtmp_streaming_state.dart index d6c64c9c2..dc0af80e6 100644 --- a/packages/hmssdk_flutter/lib/src/model/hms_rtmp_streaming_state.dart +++ b/packages/hmssdk_flutter/lib/src/model/hms_rtmp_streaming_state.dart @@ -22,7 +22,7 @@ class HMSRtmpStreamingState { error: map["error"] != null ? HMSException.fromMap(map) : null, running: map['running'], startedAt: map['started_at'] != null - ? HMSDateExtension.convertDateFromString(map['started_at']) + ? HMSDateExtension.convertDateFromEpoch(map['started_at']) : null, state: HMSStreamingStateValues.getStreamingStateFromName( map['state'] ?? 'NONE')); diff --git a/packages/hmssdk_flutter/lib/src/model/hms_server_recording_state.dart b/packages/hmssdk_flutter/lib/src/model/hms_server_recording_state.dart index 60ec489c6..dbe833a92 100644 --- a/packages/hmssdk_flutter/lib/src/model/hms_server_recording_state.dart +++ b/packages/hmssdk_flutter/lib/src/model/hms_server_recording_state.dart @@ -22,7 +22,7 @@ class HMSServerRecordingState { error: map["error"] != null ? HMSException.fromMap(map) : null, running: map['running'], startedAt: map['started_at'] != null - ? HMSDateExtension.convertDateFromString(map['started_at']) + ? HMSDateExtension.convertDateFromEpoch(map['started_at']) : null, state: HMSRecordingStateValues.getRecordingStateFromName( map['state'] ?? 'NONE')); From a33c3fc27e93cdf3dcb7b44a3daab1ed83f93dee Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Wed, 13 Dec 2023 16:40:10 +0530 Subject: [PATCH 17/32] Updated app changelog --- .../example/ExampleAppChangelog.txt | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/packages/hmssdk_flutter/example/ExampleAppChangelog.txt b/packages/hmssdk_flutter/example/ExampleAppChangelog.txt index 6292c0c06..92a1109c2 100644 --- a/packages/hmssdk_flutter/example/ExampleAppChangelog.txt +++ b/packages/hmssdk_flutter/example/ExampleAppChangelog.txt @@ -1,21 +1,9 @@ Board: https://100ms.atlassian.net/jira/software/projects/FLUT/boards/34/ -- Added TextureView in place of SurfaceView for better performance -https://100ms.atlassian.net/browse/FLUT-121 +- Beam Intermediate State Updates +https://100ms.atlassian.net/browse/FLUT-135 -- Disable editing username in preview screen if username is passed to prebuilt in options config -https://100ms.atlassian.net/browse/FLUT-158 - -- Getting 3 blank messages for flutter on stage user if declined 3 invite before -https://100ms.atlassian.net/browse/FLUT-172 - -- Active Speaker should come within first 2 tiles when doing Screenshare -https://100ms.atlassian.net/browse/FLUT-161 - -- Flutter iOS VNRT to stage, app crash. -https://100ms.atlassian.net/browse/FLUT-173 - -Room Kit: 1.0.7 -Core SDK: 1.9.4 +Room Kit: 1.0.8 +Core SDK: 1.9.5 Android SDK: 2.8.3 -iOS SDK: 1.3.1 +iOS SDK: 1.4.0 From ed2a1f2980085e8f7f769e75c5fe2dcca9a14c03 Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Wed, 13 Dec 2023 17:22:53 +0530 Subject: [PATCH 18/32] =?UTF-8?q?released=20sample=20app=20version=201.5.1?= =?UTF-8?q?04=20(404)=20=F0=9F=8D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/android/app/build.gradle | 4 +-- .../example/ios/Runner/Info.plist | 4 +-- packages/hmssdk_flutter/example/pubspec.lock | 26 +++++++++---------- packages/hmssdk_flutter/pubspec.lock | 26 +++++++++---------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/packages/hmssdk_flutter/example/android/app/build.gradle b/packages/hmssdk_flutter/example/android/app/build.gradle index 64e420447..e555a101a 100644 --- a/packages/hmssdk_flutter/example/android/app/build.gradle +++ b/packages/hmssdk_flutter/example/android/app/build.gradle @@ -32,8 +32,8 @@ android { applicationId "live.hms.flutter" minSdkVersion 21 targetSdkVersion 33 - versionCode 403 - versionName "1.5.103" + versionCode 404 + versionName "1.5.104" } signingConfigs { diff --git a/packages/hmssdk_flutter/example/ios/Runner/Info.plist b/packages/hmssdk_flutter/example/ios/Runner/Info.plist index e5f26adf6..405ff169e 100644 --- a/packages/hmssdk_flutter/example/ios/Runner/Info.plist +++ b/packages/hmssdk_flutter/example/ios/Runner/Info.plist @@ -21,7 +21,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.5.103 + 1.5.104 CFBundleSignature ???? CFBundleURLTypes @@ -48,7 +48,7 @@ CFBundleVersion - 403 + 404 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index 9afb586fe..569673c04 100644 --- a/packages/hmssdk_flutter/example/pubspec.lock +++ b/packages/hmssdk_flutter/example/pubspec.lock @@ -69,10 +69,10 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.17.2" convert: dependency: transitive description: @@ -362,10 +362,10 @@ packages: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.9.1" mime: dependency: transitive description: @@ -647,18 +647,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.1" string_scanner: dependency: transitive description: @@ -679,10 +679,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.6.0" tuple: dependency: transitive description: @@ -839,10 +839,10 @@ packages: dependency: transitive description: name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.1.4-beta" win32: dependency: transitive description: @@ -868,5 +868,5 @@ packages: source: hosted version: "6.3.0" sdks: - dart: ">=3.2.0-194.0.dev <4.0.0" + dart: ">=3.1.0 <4.0.0" flutter: ">=3.13.0" diff --git a/packages/hmssdk_flutter/pubspec.lock b/packages/hmssdk_flutter/pubspec.lock index 53939cd59..c3cc2c33e 100644 --- a/packages/hmssdk_flutter/pubspec.lock +++ b/packages/hmssdk_flutter/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.17.2" fake_async: dependency: transitive description: @@ -79,10 +79,10 @@ packages: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.9.1" path: dependency: transitive description: @@ -108,18 +108,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.1" string_scanner: dependency: transitive description: @@ -140,10 +140,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.6.0" vector_math: dependency: transitive description: @@ -156,10 +156,10 @@ packages: dependency: transitive description: name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.1.4-beta" sdks: - dart: ">=3.2.0-194.0.dev <4.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0" flutter: ">=2.10.0" From 6e033207d80b5dd3d39b13cd4e8d0ae45b1a04b2 Mon Sep 17 00:00:00 2001 From: Pushpam <93931528+Decoder07@users.noreply.github.com> Date: Wed, 13 Dec 2023 19:10:17 +0530 Subject: [PATCH 19/32] Added hit test behaviour in iOS (#1664) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added hit test behaviour in iOS * 🤖 Automated Format and Fix --------- Co-authored-by: Decoder07 --- packages/hmssdk_flutter/example/pubspec.lock | 26 +++++++++---------- .../lib/src/ui/meeting/hms_texture_view.dart | 2 ++ packages/hmssdk_flutter/pubspec.lock | 26 +++++++++---------- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index 569673c04..9afb586fe 100644 --- a/packages/hmssdk_flutter/example/pubspec.lock +++ b/packages/hmssdk_flutter/example/pubspec.lock @@ -69,10 +69,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" convert: dependency: transitive description: @@ -362,10 +362,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: @@ -647,18 +647,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -679,10 +679,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" tuple: dependency: transitive description: @@ -839,10 +839,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" win32: dependency: transitive description: @@ -868,5 +868,5 @@ packages: source: hosted version: "6.3.0" sdks: - dart: ">=3.1.0 <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.13.0" diff --git a/packages/hmssdk_flutter/lib/src/ui/meeting/hms_texture_view.dart b/packages/hmssdk_flutter/lib/src/ui/meeting/hms_texture_view.dart index 35e188382..19cc0f15b 100644 --- a/packages/hmssdk_flutter/lib/src/ui/meeting/hms_texture_view.dart +++ b/packages/hmssdk_flutter/lib/src/ui/meeting/hms_texture_view.dart @@ -4,6 +4,7 @@ import 'dart:math'; // Flutter imports: import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; import 'package:flutter/services.dart' show StandardMessageCodec; // Project imports: @@ -191,6 +192,7 @@ class _PlatformViewState extends State<_PlatformView> { } else if (Platform.isIOS) { ///UIKitView for ios it uses VideoView provided by 100ms ios_sdk internally. return UiKitView( + hitTestBehavior: PlatformViewHitTestBehavior.transparent, viewType: 'HMSFlutterPlatformView', creationParamsCodec: StandardMessageCodec(), creationParams: { diff --git a/packages/hmssdk_flutter/pubspec.lock b/packages/hmssdk_flutter/pubspec.lock index c3cc2c33e..53939cd59 100644 --- a/packages/hmssdk_flutter/pubspec.lock +++ b/packages/hmssdk_flutter/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" fake_async: dependency: transitive description: @@ -79,10 +79,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" path: dependency: transitive description: @@ -108,18 +108,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -140,10 +140,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" vector_math: dependency: transitive description: @@ -156,10 +156,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=2.10.0" From 90636fbc18f5b68717facae4c149b0bc8f293aae Mon Sep 17 00:00:00 2001 From: Pushpam <93931528+Decoder07@users.noreply.github.com> Date: Thu, 14 Dec 2023 12:22:45 +0530 Subject: [PATCH 20/32] Added option to toggle preview change name from application (#1660) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added option to toggle preview change name from application * 🤖 Automated Format and Fix --------- Co-authored-by: Decoder07 Co-authored-by: ygit --- .../lib/src/service/app_debug_config.dart | 2 + .../local_peer_bottom_sheet.dart | 77 ++++++++++--------- .../widgets/common_widgets/inset_tile.dart | 2 +- .../src/widgets/common_widgets/peer_tile.dart | 2 +- .../peer_widgets/inset_tile_more_option.dart | 70 ----------------- .../peer_widgets/local_peer_more_option.dart | 74 ++++++++++++++++++ .../lib/app_settings_bottom_sheet.dart | 35 +++++++++ packages/hmssdk_flutter/example/lib/main.dart | 3 + .../example/lib/qr_code_screen.dart | 3 + 9 files changed, 158 insertions(+), 110 deletions(-) delete mode 100644 packages/hms_room_kit/lib/src/widgets/peer_widgets/inset_tile_more_option.dart create mode 100644 packages/hms_room_kit/lib/src/widgets/peer_widgets/local_peer_more_option.dart diff --git a/packages/hms_room_kit/lib/src/service/app_debug_config.dart b/packages/hms_room_kit/lib/src/service/app_debug_config.dart index f92c2ec00..0c6a78d27 100644 --- a/packages/hms_room_kit/lib/src/service/app_debug_config.dart +++ b/packages/hms_room_kit/lib/src/service/app_debug_config.dart @@ -14,6 +14,7 @@ class AppDebugConfig { static bool isSoftwareDecoderDisabled = true; static bool isAudioMixerDisabled = true; static bool isAutoSimulcast = true; + static bool nameChangeOnPreview = true; static bool isDebugMode = false; static bool isProdRoom = true; @@ -32,5 +33,6 @@ class AppDebugConfig { isAudioMixerDisabled = true; isAutoSimulcast = true; isProdRoom = true; + nameChangeOnPreview = true; } } diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/local_peer_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/local_peer_bottom_sheet.dart index 89c55d24d..991e67ac7 100644 --- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/local_peer_bottom_sheet.dart +++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/local_peer_bottom_sheet.dart @@ -148,44 +148,45 @@ class _LocalPeerBottomSheetState extends State { // title: HMSSubheadingText( // text: "Spotlight Tile for Everyone", // textColor: HMSThemeColors.onSurfaceHighEmphasis)), - ListTile( - horizontalTitleGap: 2, - onTap: () async { - Navigator.pop(context); - showModalBottomSheet( - isScrollControlled: true, - backgroundColor: HMSThemeColors.surfaceDim, - shape: const RoundedRectangleBorder( - borderRadius: BorderRadius.only( - topLeft: Radius.circular(16), - topRight: Radius.circular(16)), - ), - context: context, - builder: (ctx) => ChangeNotifierProvider.value( - value: widget.meetingStore, - child: Padding( - padding: EdgeInsets.only( - bottom: MediaQuery.of(ctx) - .viewInsets - .bottom), - child: const ChangeNameBottomSheet( - showPrivacyInfo: false, - ))), - ); - }, - contentPadding: EdgeInsets.zero, - leading: SvgPicture.asset( - "packages/hms_room_kit/lib/src/assets/icons/pencil.svg", - semanticsLabel: "fl_local_pin_tile", - height: 20, - width: 20, - colorFilter: ColorFilter.mode( - HMSThemeColors.onSurfaceHighEmphasis, - BlendMode.srcIn), - ), - title: HMSSubheadingText( - text: "Change Name", - textColor: HMSThemeColors.onSurfaceHighEmphasis)), + if (Constant.prebuiltOptions?.userName == null) + ListTile( + horizontalTitleGap: 2, + onTap: () async { + Navigator.pop(context); + showModalBottomSheet( + isScrollControlled: true, + backgroundColor: HMSThemeColors.surfaceDim, + shape: const RoundedRectangleBorder( + borderRadius: BorderRadius.only( + topLeft: Radius.circular(16), + topRight: Radius.circular(16)), + ), + context: context, + builder: (ctx) => ChangeNotifierProvider.value( + value: widget.meetingStore, + child: Padding( + padding: EdgeInsets.only( + bottom: MediaQuery.of(ctx) + .viewInsets + .bottom), + child: const ChangeNameBottomSheet( + showPrivacyInfo: false, + ))), + ); + }, + contentPadding: EdgeInsets.zero, + leading: SvgPicture.asset( + "packages/hms_room_kit/lib/src/assets/icons/pencil.svg", + semanticsLabel: "fl_local_pin_tile", + height: 20, + width: 20, + colorFilter: ColorFilter.mode( + HMSThemeColors.onSurfaceHighEmphasis, + BlendMode.srcIn), + ), + title: HMSSubheadingText( + text: "Change Name", + textColor: HMSThemeColors.onSurfaceHighEmphasis)), if (widget.isInsetTile) ListTile( horizontalTitleGap: 2, diff --git a/packages/hms_room_kit/lib/src/widgets/common_widgets/inset_tile.dart b/packages/hms_room_kit/lib/src/widgets/common_widgets/inset_tile.dart index d73311b67..53685bd57 100644 --- a/packages/hms_room_kit/lib/src/widgets/common_widgets/inset_tile.dart +++ b/packages/hms_room_kit/lib/src/widgets/common_widgets/inset_tile.dart @@ -9,7 +9,7 @@ import 'package:provider/provider.dart'; ///Project imports import 'package:hms_room_kit/src/layout_api/hms_theme_colors.dart'; -import 'package:hms_room_kit/src/widgets/peer_widgets/inset_tile_more_option.dart'; +import 'package:hms_room_kit/src/widgets/peer_widgets/local_peer_more_option.dart'; import 'package:hms_room_kit/src/model/peer_track_node.dart'; import 'package:hms_room_kit/src/widgets/common_widgets/video_view.dart'; import 'package:hms_room_kit/src/widgets/peer_widgets/audio_mute_status.dart'; diff --git a/packages/hms_room_kit/lib/src/widgets/common_widgets/peer_tile.dart b/packages/hms_room_kit/lib/src/widgets/common_widgets/peer_tile.dart index f131045ac..03f783240 100644 --- a/packages/hms_room_kit/lib/src/widgets/common_widgets/peer_tile.dart +++ b/packages/hms_room_kit/lib/src/widgets/common_widgets/peer_tile.dart @@ -10,7 +10,7 @@ import 'package:provider/provider.dart'; // Project imports import 'package:hms_room_kit/src/layout_api/hms_theme_colors.dart'; import 'package:hms_room_kit/src/meeting/meeting_store.dart'; -import 'package:hms_room_kit/src/widgets/peer_widgets/inset_tile_more_option.dart'; +import 'package:hms_room_kit/src/widgets/peer_widgets/local_peer_more_option.dart'; import 'package:hms_room_kit/src/widgets/peer_widgets/name_and_network.dart'; import 'package:hms_room_kit/src/widgets/peer_widgets/screen_share_tile_name.dart'; import 'package:hms_room_kit/src/model/peer_track_node.dart'; diff --git a/packages/hms_room_kit/lib/src/widgets/peer_widgets/inset_tile_more_option.dart b/packages/hms_room_kit/lib/src/widgets/peer_widgets/inset_tile_more_option.dart deleted file mode 100644 index 5652f782d..000000000 --- a/packages/hms_room_kit/lib/src/widgets/peer_widgets/inset_tile_more_option.dart +++ /dev/null @@ -1,70 +0,0 @@ -///Package imports -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; - -///Project imports -import 'package:hms_room_kit/src/layout_api/hms_theme_colors.dart'; -import 'package:hms_room_kit/src/meeting/meeting_store.dart'; -import 'package:hms_room_kit/src/model/peer_track_node.dart'; -import 'package:hms_room_kit/src/widgets/bottom_sheets/local_peer_bottom_sheet.dart'; - -///[LocalPeerMoreOption] is a widget that is used to render the more option button on a local peer(inset) tile -///This is used in the [LocalPeerTile] -///It has following parameters: -///[callbackFunction] is a function that is called when the more option button is clicked -class LocalPeerMoreOption extends StatelessWidget { - final Function()? callbackFunction; - final bool isInsetTile; - const LocalPeerMoreOption( - {super.key, this.callbackFunction, this.isInsetTile = true}); - - @override - Widget build(BuildContext context) { - return Positioned( - bottom: 5, - right: 5, - child: GestureDetector( - onTap: () { - ///[peerTrackNode] is the peerTrackNode of the peer whose more option is clicked - ///We only show the modal bottom sheet if the peer is the local peer - var peerTrackNode = context.read(); - showModalBottomSheet( - isScrollControlled: true, - backgroundColor: HMSThemeColors.surfaceDim, - shape: const RoundedRectangleBorder( - borderRadius: BorderRadius.only( - topLeft: Radius.circular(16), topRight: Radius.circular(16)), - ), - context: context, - builder: (ctx) => ChangeNotifierProvider.value( - value: context.read(), - child: LocalPeerBottomSheet( - isInsetTile: isInsetTile, - meetingStore: context.read(), - peerTrackNode: peerTrackNode, - callbackFunction: callbackFunction, - )), - ); - }, - child: Semantics( - label: "fl_${context.read().peer.name}more_option", - child: Container( - height: 28, - width: 28, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(8), - color: HMSThemeColors.backgroundDim.withOpacity(0.64), - ), - child: Center( - child: Icon( - Icons.more_vert, - color: HMSThemeColors.onSurfaceHighEmphasis, - size: 20, - ), - ), - ), - ), - ), - ); - } -} diff --git a/packages/hms_room_kit/lib/src/widgets/peer_widgets/local_peer_more_option.dart b/packages/hms_room_kit/lib/src/widgets/peer_widgets/local_peer_more_option.dart new file mode 100644 index 000000000..8e64da5a8 --- /dev/null +++ b/packages/hms_room_kit/lib/src/widgets/peer_widgets/local_peer_more_option.dart @@ -0,0 +1,74 @@ +///Package imports +import 'package:flutter/material.dart'; +import 'package:hms_room_kit/hms_room_kit.dart'; +import 'package:provider/provider.dart'; + +///Project imports +import 'package:hms_room_kit/src/meeting/meeting_store.dart'; +import 'package:hms_room_kit/src/model/peer_track_node.dart'; +import 'package:hms_room_kit/src/widgets/bottom_sheets/local_peer_bottom_sheet.dart'; + +///[LocalPeerMoreOption] is a widget that is used to render the more option button on a local peer(inset) tile +///This is used in the [LocalPeerTile] +///It has following parameters: +///[callbackFunction] is a function that is called when the more option button is clicked +class LocalPeerMoreOption extends StatelessWidget { + final Function()? callbackFunction; + final bool isInsetTile; + const LocalPeerMoreOption( + {super.key, this.callbackFunction, this.isInsetTile = true}); + + @override + Widget build(BuildContext context) { + return (Constant.prebuiltOptions?.userName != null && !isInsetTile) + ? const SizedBox() + : Positioned( + bottom: 5, + right: 5, + child: GestureDetector( + onTap: () { + ///[peerTrackNode] is the peerTrackNode of the peer whose more option is clicked + ///We only show the modal bottom sheet if the peer is the local peer + var peerTrackNode = context.read(); + showModalBottomSheet( + isScrollControlled: true, + backgroundColor: HMSThemeColors.surfaceDim, + shape: const RoundedRectangleBorder( + borderRadius: BorderRadius.only( + topLeft: Radius.circular(16), + topRight: Radius.circular(16)), + ), + context: context, + builder: (ctx) => ChangeNotifierProvider.value( + value: context.read(), + child: LocalPeerBottomSheet( + isInsetTile: isInsetTile, + meetingStore: context.read(), + peerTrackNode: peerTrackNode, + callbackFunction: callbackFunction, + )), + ); + }, + child: Semantics( + label: + "fl_${context.read().peer.name}more_option", + child: Container( + height: 28, + width: 28, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(8), + color: HMSThemeColors.backgroundDim.withOpacity(0.64), + ), + child: Center( + child: Icon( + Icons.more_vert, + color: HMSThemeColors.onSurfaceHighEmphasis, + size: 20, + ), + ), + ), + ), + ), + ); + } +} diff --git a/packages/hmssdk_flutter/example/lib/app_settings_bottom_sheet.dart b/packages/hmssdk_flutter/example/lib/app_settings_bottom_sheet.dart index dea898ac9..978aeb86c 100644 --- a/packages/hmssdk_flutter/example/lib/app_settings_bottom_sheet.dart +++ b/packages/hmssdk_flutter/example/lib/app_settings_bottom_sheet.dart @@ -28,6 +28,7 @@ class _AppSettingsBottomSheetState extends State { bool isDebugMode = false; HMSAudioMode currentAudioMode = HMSAudioMode.VOICE; bool isStreamingFlow = true; + bool nameChangeOnPreview = true; var versions = {}; @@ -72,6 +73,9 @@ class _AppSettingsBottomSheetState extends State { isStreamingFlow = await Utilities.getBoolData(key: 'is_streaming_flow') ?? true; + nameChangeOnPreview = + await Utilities.getBoolData(key: 'name-change-on-preview') ?? true; + WidgetsBinding.instance.addPostFrameCallback((_) { setState(() {}); }); @@ -89,6 +93,7 @@ class _AppSettingsBottomSheetState extends State { AppDebugConfig.showStats = showStats; AppDebugConfig.skipPreview = skipPreview; AppDebugConfig.isDebugMode = isDebugMode; + AppDebugConfig.nameChangeOnPreview = true; } Future _launchUrl() async { @@ -336,6 +341,36 @@ class _AppSettingsBottomSheetState extends State { setState(() {}) }), ), + ListTile( + horizontalTitleGap: 2, + enabled: false, + contentPadding: EdgeInsets.zero, + leading: SvgPicture.asset( + "packages/hms_room_kit/lib/src/assets/icons/pencil.svg", + fit: BoxFit.scaleDown, + colorFilter: + ColorFilter.mode(themeDefaultColor, BlendMode.srcIn), + ), + title: Text( + "Name Change On Preview", + semanticsLabel: "fl_disable_name_change_on_preview", + style: HMSTextStyle.setTextStyle( + fontSize: 14, + color: themeDefaultColor, + letterSpacing: 0.25, + fontWeight: FontWeight.w600), + ), + trailing: CupertinoSwitch( + activeColor: hmsdefaultColor, + value: nameChangeOnPreview, + onChanged: (value) => { + nameChangeOnPreview = value, + Utilities.saveBoolData( + key: 'name-change-on-preview', value: value), + AppDebugConfig.nameChangeOnPreview = value, + setState(() {}) + }), + ), ListTile( horizontalTitleGap: 2, enabled: false, diff --git a/packages/hmssdk_flutter/example/lib/main.dart b/packages/hmssdk_flutter/example/lib/main.dart index 7cdf8690f..e8b1509ef 100644 --- a/packages/hmssdk_flutter/example/lib/main.dart +++ b/packages/hmssdk_flutter/example/lib/main.dart @@ -290,6 +290,9 @@ class _HomePageState extends State { builder: (_) => HMSPrebuilt( roomCode: Constant.roomCode, options: HMSPrebuiltOptions( + userName: AppDebugConfig.nameChangeOnPreview + ? null + : "Flutter User", endPoints: endPoints, userId: "user_flutter", // pass your custom unique user identifier here diff --git a/packages/hmssdk_flutter/example/lib/qr_code_screen.dart b/packages/hmssdk_flutter/example/lib/qr_code_screen.dart index 7df014c7e..54a78eddc 100644 --- a/packages/hmssdk_flutter/example/lib/qr_code_screen.dart +++ b/packages/hmssdk_flutter/example/lib/qr_code_screen.dart @@ -78,6 +78,9 @@ class _QRCodeScreenState extends State { builder: (_) => HMSPrebuilt( roomCode: Constant.roomCode, options: HMSPrebuiltOptions( + userName: AppDebugConfig.nameChangeOnPreview + ? null + : "Flutter User", endPoints: endPoints, iOSScreenshareConfig: HMSIOSScreenshareConfig( appGroup: "group.flutterhms", From a2c2fbdb43607b755788037c99c68807b11aeb31 Mon Sep 17 00:00:00 2001 From: Pushpam <93931528+Decoder07@users.noreply.github.com> Date: Thu, 14 Dec 2023 12:31:37 +0530 Subject: [PATCH 21/32] Fixed recording pause bug (#1665) * Fixed recording pause bug * Added resumed check in preview for role --- .../lib/src/hls_viewer/hls_viewer_header.dart | 45 ++++++++++---- .../lib/src/meeting/meeting_header.dart | 55 +++++++++++++---- .../lib/src/meeting/meeting_store.dart | 59 +++++++++---------- .../preview_for_role_header.dart | 32 +++++++--- .../app_utilities_bottom_sheet.dart | 32 ++++++---- .../more_settings_bottom_sheet.dart | 6 +- 6 files changed, 150 insertions(+), 79 deletions(-) diff --git a/packages/hms_room_kit/lib/src/hls_viewer/hls_viewer_header.dart b/packages/hms_room_kit/lib/src/hls_viewer/hls_viewer_header.dart index 18c263fce..0dcd96025 100644 --- a/packages/hms_room_kit/lib/src/hls_viewer/hls_viewer_header.dart +++ b/packages/hms_room_kit/lib/src/hls_viewer/hls_viewer_header.dart @@ -69,7 +69,10 @@ class HLSViewerHeader extends StatelessWidget { ///If the HLS streaming is not started we show nothing Selector( selector: (_, meetingStore) => - meetingStore.streamingType['hls'] ?? false, + (meetingStore.streamingType['hls'] == + HMSStreamingState.started || + meetingStore.streamingType['rtmp'] == + HMSStreamingState.started), builder: (_, isHLSStarted, __) { return isHLSStarted ? Container( @@ -99,15 +102,24 @@ class HLSViewerHeader extends StatelessWidget { ///If the recording is not started we show nothing /// ///If recording initialising state is true we show the loader - Selector>( - selector: (_, meetingStore) => Tuple4( - meetingStore.recordingType["browser"] ?? false, - meetingStore.recordingType["server"] ?? false, - meetingStore.recordingType["hls"] ?? false, - meetingStore.hmsRecordingState), + Selector< + MeetingStore, + Tuple3>( + selector: (_, meetingStore) => Tuple3( + meetingStore.recordingType["browser"] ?? + HMSRecordingState.none, + meetingStore.recordingType["server"] ?? + HMSRecordingState.none, + meetingStore.recordingType["hls"] ?? + HMSRecordingState.none), builder: (_, data, __) { - return (data.item1 || data.item2 || data.item3) + return (data.item1 == HMSRecordingState.started || + data.item1 == HMSRecordingState.resumed || + data.item2 == HMSRecordingState.started || + data.item2 == HMSRecordingState.resumed || + data.item3 == HMSRecordingState.started || + data.item3 == HMSRecordingState.resumed) ? SvgPicture.asset( "packages/hms_room_kit/lib/src/assets/icons/record.svg", height: 24, @@ -116,7 +128,9 @@ class HLSViewerHeader extends StatelessWidget { HMSThemeColors.alertErrorDefault, BlendMode.srcIn), ) - : data.item4 == HMSRecordingState.starting + : (data.item1 == HMSRecordingState.starting || + data.item2 == HMSRecordingState.starting || + data.item3 == HMSRecordingState.starting) ? SizedBox( height: 24, width: 24, @@ -124,7 +138,9 @@ class HLSViewerHeader extends StatelessWidget { strokeWidth: 1, color: HMSThemeColors.onSurfaceHighEmphasis, )) - : data.item4 == HMSRecordingState.paused + : (data.item1 == HMSRecordingState.paused || + data.item2 == HMSRecordingState.paused || + data.item3 == HMSRecordingState.paused) ? SvgPicture.asset( "packages/hms_room_kit/lib/src/assets/icons/recording_paused.svg", height: 24, @@ -140,11 +156,14 @@ class HLSViewerHeader extends StatelessWidget { ), ///This renders the number of peers - ///If the HLS streaming is started, we render the number of peers + ///If the HLS or RTMP streaming is started, we render the number of peers ///else we render an empty Container Selector>( selector: (_, meetingStore) => Tuple2( - meetingStore.streamingType['hls'] ?? false, + meetingStore.streamingType['hls'] == + HMSStreamingState.started || + meetingStore.streamingType['rtmp'] == + HMSStreamingState.started, meetingStore.peersInRoom), builder: (_, data, __) { return data.item1 diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_header.dart b/packages/hms_room_kit/lib/src/meeting/meeting_header.dart index cd461bec6..e251bcf62 100644 --- a/packages/hms_room_kit/lib/src/meeting/meeting_header.dart +++ b/packages/hms_room_kit/lib/src/meeting/meeting_header.dart @@ -83,7 +83,10 @@ class _MeetingHeaderState extends State { ///If recording initialising state is true we show the loader Selector( selector: (_, meetingStore) => - meetingStore.streamingType['hls'] ?? false, + (meetingStore.streamingType['hls'] == + HMSStreamingState.started || + meetingStore.streamingType['rtmp'] == + HMSStreamingState.started), builder: (_, isHLSStarted, __) { return isHLSStarted ? Container( @@ -115,16 +118,29 @@ class _MeetingHeaderState extends State { ///else we render an empty Container /// ///For recording status we use the recordingType map from the [MeetingStore] - Selector>( - selector: (_, meetingStore) => Tuple4( + Selector< + MeetingStore, + Tuple3>( + selector: (_, meetingStore) => Tuple3( meetingStore.recordingType["browser"] ?? - false, - meetingStore.recordingType["server"] ?? false, - meetingStore.recordingType["hls"] ?? false, - meetingStore.hmsRecordingState), + HMSRecordingState.none, + meetingStore.recordingType["server"] ?? + HMSRecordingState.none, + meetingStore.recordingType["hls"] ?? + HMSRecordingState.none), builder: (_, data, __) { - return (data.item1 || data.item2 || data.item3) + return (data.item1 == + HMSRecordingState.started || + data.item1 == + HMSRecordingState.resumed || + data.item2 == + HMSRecordingState.started || + data.item2 == + HMSRecordingState.resumed || + data.item3 == + HMSRecordingState.started || + data.item3 == HMSRecordingState.resumed) ? SvgPicture.asset( "packages/hms_room_kit/lib/src/assets/icons/record.svg", height: 24, @@ -133,7 +149,12 @@ class _MeetingHeaderState extends State { HMSThemeColors.alertErrorDefault, BlendMode.srcIn), ) - : data.item4 == HMSRecordingState.starting + : (data.item1 == + HMSRecordingState.starting || + data.item2 == + HMSRecordingState.starting || + data.item3 == + HMSRecordingState.starting) ? SizedBox( height: 20, width: 20, @@ -142,14 +163,19 @@ class _MeetingHeaderState extends State { color: HMSThemeColors .onSurfaceHighEmphasis, )) - : data.item4 == HMSRecordingState.paused + : (data.item1 == + HMSRecordingState.paused || + data.item2 == + HMSRecordingState.paused || + data.item3 == + HMSRecordingState.paused) ? SvgPicture.asset( "packages/hms_room_kit/lib/src/assets/icons/recording_paused.svg", height: 24, width: 24, colorFilter: ColorFilter.mode( HMSThemeColors - .alertErrorDefault, + .onSurfaceHighEmphasis, BlendMode.srcIn), ) : Container(); @@ -163,7 +189,10 @@ class _MeetingHeaderState extends State { ///else we render an empty Container Selector>( selector: (_, meetingStore) => Tuple2( - meetingStore.streamingType['hls'] ?? false, + ((meetingStore.streamingType['hls'] == + HMSStreamingState.started) || + (meetingStore.streamingType['rtmp'] == + HMSStreamingState.started)), meetingStore.peersInRoom), builder: (_, data, __) { return data.item1 diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart index f0915458f..67964737d 100644 --- a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart +++ b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart @@ -87,13 +87,16 @@ class MeetingStore extends ChangeNotifier List toasts = []; - Map recordingType = { - "browser": false, - "server": false, - "hls": false + Map recordingType = { + "browser": HMSRecordingState.none, + "server": HMSRecordingState.none, + "hls": HMSRecordingState.none }; - Map streamingType = {"rtmp": false, "hls": false}; + Map streamingType = { + "rtmp": HMSStreamingState.none, + "hls": HMSStreamingState.none + }; String description = "Meeting Ended"; @@ -228,9 +231,6 @@ class MeetingStore extends ChangeNotifier ///This stores the number of peers in the room int peersInRoom = 0; - ///Check whether recording is in intialising state - HMSRecordingState hmsRecordingState = HMSRecordingState.none; - ///Pool of video views List viewControllers = []; @@ -529,7 +529,8 @@ class MeetingStore extends ChangeNotifier meetingUrl: meetingUrl, toRecord: toRecord, rtmpUrls: rtmpUrls); _hmsSDKInteractor.startRtmpOrRecording(hmsRecordingConfig, this); - hmsRecordingState = HMSRecordingState.starting; + recordingType["browser"] = HMSRecordingState.starting; + notifyListeners(); } @@ -774,21 +775,19 @@ class MeetingStore extends ChangeNotifier } else { hasHlsStarted = false; } - if (room.hmsBrowserRecordingState?.state == HMSRecordingState.started) { - recordingType["browser"] = true; - } - if (room.hmsServerRecordingState?.state == HMSRecordingState.started) { - recordingType["server"] = true; - } - if (room.hmshlsRecordingState?.state == HMSRecordingState.started) { - recordingType["hls"] = true; - } - if (room.hmsRtmpStreamingState?.state == HMSStreamingState.started) { - streamingType["rtmp"] = true; - } - if (room.hmshlsStreamingState?.state == HMSStreamingState.started) { - streamingType["hls"] = true; - } + + recordingType["browser"] = + room.hmsBrowserRecordingState?.state ?? HMSRecordingState.none; + recordingType["server"] = + room.hmsServerRecordingState?.state ?? HMSRecordingState.none; + recordingType["hls"] = + room.hmshlsRecordingState?.state ?? HMSRecordingState.none; + + streamingType["rtmp"] = + room.hmsRtmpStreamingState?.state ?? HMSStreamingState.none; + streamingType["hls"] = + room.hmshlsStreamingState?.state ?? HMSStreamingState.none; + setParticipantsList(roles); for (HMSPeer each in room.peers!) { if (each.isLocal) { @@ -897,26 +896,24 @@ class MeetingStore extends ChangeNotifier switch (update) { case HMSRoomUpdate.browserRecordingStateUpdated: recordingType["browser"] = - room.hmsBrowserRecordingState?.state == HMSRecordingState.started; - hmsRecordingState = room.hmsBrowserRecordingState?.state ?? HMSRecordingState.none; break; case HMSRoomUpdate.serverRecordingStateUpdated: recordingType["server"] = - room.hmsServerRecordingState?.state == HMSRecordingState.started; + room.hmsServerRecordingState?.state ?? HMSRecordingState.none; break; case HMSRoomUpdate.hlsRecordingStateUpdated: recordingType["hls"] = - room.hmshlsRecordingState?.state == HMSRecordingState.started; + room.hmshlsRecordingState?.state ?? HMSRecordingState.none; break; case HMSRoomUpdate.rtmpStreamingStateUpdated: streamingType["rtmp"] = - room.hmsRtmpStreamingState?.state == HMSStreamingState.started; + room.hmsRtmpStreamingState?.state ?? HMSStreamingState.none; break; case HMSRoomUpdate.hlsStreamingStateUpdated: isHLSLoading = false; streamingType["hls"] = - room.hmshlsStreamingState?.state == HMSStreamingState.started; + room.hmshlsStreamingState?.state ?? HMSStreamingState.none; hasHlsStarted = room.hmshlsStreamingState?.state == HMSStreamingState.started; streamUrl = hasHlsStarted @@ -2193,7 +2190,7 @@ class MeetingStore extends ChangeNotifier case HMSActionResultListenerMethod.startRtmpOrRecording: toasts.add(HMSToastModel(hmsException, hmsToastType: HMSToastsType.errorToast)); - hmsRecordingState = HMSRecordingState.failed; + recordingType["browser"] = HMSRecordingState.failed; notifyListeners(); break; case HMSActionResultListenerMethod.stopRtmpAndRecording: diff --git a/packages/hms_room_kit/lib/src/preview_for_role/preview_for_role_header.dart b/packages/hms_room_kit/lib/src/preview_for_role/preview_for_role_header.dart index c25deda2e..82c65b90c 100644 --- a/packages/hms_room_kit/lib/src/preview_for_role/preview_for_role_header.dart +++ b/packages/hms_room_kit/lib/src/preview_for_role/preview_for_role_header.dart @@ -5,6 +5,7 @@ import 'dart:developer'; import 'package:flutter/cupertino.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:hms_room_kit/hms_room_kit.dart'; +import 'package:hmssdk_flutter/hmssdk_flutter.dart'; import 'package:provider/provider.dart'; import 'package:tuple/tuple.dart'; @@ -59,7 +60,8 @@ class _PreviewForRoleHeaderState extends State { ///If the HLS streaming is not started we show nothing Selector( selector: (_, meetingStore) => - meetingStore.streamingType['hls'] ?? false, + meetingStore.streamingType['hls'] == + HMSStreamingState.started, builder: (_, isHLSStrted, __) { return isHLSStrted ? Container( @@ -86,14 +88,25 @@ class _PreviewForRoleHeaderState extends State { ///We render the recording icon based on the recording status ///If the recording is started we show the recording icon ///If the recording is not started we show nothing - Selector>( + Selector< + MeetingStore, + Tuple3>( selector: (_, meetingStore) => Tuple3( - meetingStore.recordingType["browser"] ?? false, - meetingStore.recordingType["server"] ?? false, - meetingStore.recordingType["hls"] ?? false, + meetingStore.recordingType["browser"] ?? + HMSRecordingState.none, + meetingStore.recordingType["server"] ?? + HMSRecordingState.none, + meetingStore.recordingType["hls"] ?? + HMSRecordingState.none, ), builder: (_, data, __) { - return (data.item1 || data.item2 || data.item3) + return (data.item1 == HMSRecordingState.started || + data.item1 == HMSRecordingState.resumed || + data.item2 == HMSRecordingState.started || + data.item2 == HMSRecordingState.resumed || + data.item3 == HMSRecordingState.started || + data.item3 == HMSRecordingState.resumed) ? SvgPicture.asset( "packages/hms_room_kit/lib/src/assets/icons/record.svg", height: 24, @@ -109,11 +122,14 @@ class _PreviewForRoleHeaderState extends State { ), ///This renders the number of peers - ///If the HLS streaming is started, we render the number of peers + ///If the HLS or RTMP streaming is started, we render the number of peers ///else we render an empty Container Selector>( selector: (_, meetingStore) => Tuple2( - meetingStore.streamingType['hls'] ?? false, + meetingStore.streamingType['hls'] == + HMSStreamingState.started || + meetingStore.streamingType['rtmp'] == + HMSStreamingState.started, meetingStore.peersInRoom), builder: (_, data, __) { return data.item1 diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/app_utilities_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/app_utilities_bottom_sheet.dart index f4d8ca1e6..d46fd1935 100644 --- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/app_utilities_bottom_sheet.dart +++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/app_utilities_bottom_sheet.dart @@ -206,9 +206,11 @@ class _AppUtilitiesBottomSheetState extends State { false) ///If streaming is on or in initialising state disable the button - ((meetingStore.streamingType["hls"] ?? false) || - (meetingStore.streamingType["rtmp"] ?? false) || - meetingStore.hmsRecordingState == + ((meetingStore.streamingType["hls"] == + HMSStreamingState.started) || + (meetingStore.streamingType["rtmp"] == + HMSStreamingState.started) || + meetingStore.recordingType["browser"] == HMSRecordingState.starting) ? MoreOptionItem( onTap: () {}, @@ -227,9 +229,14 @@ class _AppUtilitiesBottomSheetState extends State { : MoreOptionItem( onTap: () async { bool isRecordingRunning = - ((meetingStore.recordingType["hls"] ?? false) || - (meetingStore.recordingType["browser"] ?? - false)); + ((meetingStore.recordingType["hls"] == + HMSRecordingState.started) || + meetingStore.recordingType["hls"] == + HMSRecordingState.resumed) || + (meetingStore.recordingType["browser"] == + HMSRecordingState.started || + meetingStore.recordingType["browser"] == + HMSRecordingState.resumed); if (isRecordingRunning) { Navigator.pop(context); showModalBottomSheet( @@ -278,22 +285,23 @@ class _AppUtilitiesBottomSheetState extends State { }, isActive: false, optionIcon: SvgPicture.asset( - "packages/hms_room_kit/lib/src/assets/icons/${meetingStore.hmsRecordingState == HMSRecordingState.paused ? "recording_paused" : "record"}.svg", + "packages/hms_room_kit/lib/src/assets/icons/${meetingStore.recordingType["browser"] == HMSRecordingState.paused ? "recording_paused" : "record"}.svg", height: 20, width: 20, colorFilter: ColorFilter.mode( - meetingStore.hmsRecordingState == + meetingStore.recordingType["browser"] == HMSRecordingState.started ? HMSThemeColors.alertErrorDefault : HMSThemeColors.onSurfaceHighEmphasis, BlendMode.srcIn), ), - optionText: meetingStore.hmsRecordingState == + optionText: meetingStore.recordingType["browser"] == HMSRecordingState.paused ? "Recording Paused" - : ((meetingStore.recordingType["hls"] ?? false) || - (meetingStore.recordingType["browser"] ?? - false)) + : ((meetingStore.recordingType["hls"] == + HMSRecordingState.started) || + (meetingStore.recordingType["browser"] == + HMSRecordingState.started)) ? "Recording" : "Record", ) diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/more_settings_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/more_settings_bottom_sheet.dart index 4359f54bb..20b548bcb 100644 --- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/more_settings_bottom_sheet.dart +++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/more_settings_bottom_sheet.dart @@ -436,7 +436,8 @@ class _MoreSettingsBottomSheetState extends State { false) Selector( selector: (_, meetingStore) => - meetingStore.streamingType["rtmp"] ?? false, + meetingStore.streamingType["rtmp"] == + HMSStreamingState.started, builder: (_, isRTMPRunning, __) { return ListTile( horizontalTitleGap: 2, @@ -499,7 +500,8 @@ class _MoreSettingsBottomSheetState extends State { false) Selector( selector: (_, meetingStore) => - meetingStore.recordingType["browser"] ?? false, + meetingStore.recordingType["browser"] == + HMSRecordingState.started, builder: (_, isBrowserRecording, __) { return ListTile( horizontalTitleGap: 2, From 003445feef2a4506ff1de17691b2547408a9e61f Mon Sep 17 00:00:00 2001 From: Pushpam <93931528+Decoder07@users.noreply.github.com> Date: Thu, 14 Dec 2023 13:55:31 +0530 Subject: [PATCH 22/32] Fixed HLS Stream URL (#1666) --- .../live/hms/hmssdk_flutter/HmssdkFlutterPlugin.kt | 9 +++------ .../ios/Classes/SwiftHmssdkFlutterPlugin.swift | 8 ++++---- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HmssdkFlutterPlugin.kt b/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HmssdkFlutterPlugin.kt index bcbc71617..06fb32e83 100644 --- a/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HmssdkFlutterPlugin.kt +++ b/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HmssdkFlutterPlugin.kt @@ -38,10 +38,7 @@ import live.hms.video.events.AgentType import live.hms.video.media.tracks.* import live.hms.video.sdk.* import live.hms.video.sdk.models.* -import live.hms.video.sdk.models.enums.AudioMixingMode -import live.hms.video.sdk.models.enums.HMSPeerUpdate -import live.hms.video.sdk.models.enums.HMSRoomUpdate -import live.hms.video.sdk.models.enums.HMSTrackUpdate +import live.hms.video.sdk.models.enums.* import live.hms.video.sdk.models.role.HMSRole import live.hms.video.sdk.models.trackchangerequest.HMSChangeTrackStateRequest import live.hms.video.sessionstore.HMSKeyChangeListener @@ -1205,7 +1202,7 @@ class HmssdkFlutterPlugin : * the stream URL. */ room.hlsStreamingState?.let { streamingState -> - if (streamingState.running) { + if (streamingState.state == HMSStreamingState.STARTED) { streamingState.variants?.let { variants -> if (variants.isNotEmpty()) { hlsStreamUrl = variants[0].hlsStreamUrl @@ -1274,7 +1271,7 @@ class HmssdkFlutterPlugin : */ if (type == HMSRoomUpdate.HLS_STREAMING_STATE_UPDATED) { hmsRoom.hlsStreamingState?.let { streamingState -> - if (streamingState.running) { + if (streamingState.state == HMSStreamingState.STARTED) { streamingState.variants?.let { variants -> if (variants.isNotEmpty()) { hlsStreamUrl = variants[0].hlsStreamUrl diff --git a/packages/hmssdk_flutter/ios/Classes/SwiftHmssdkFlutterPlugin.swift b/packages/hmssdk_flutter/ios/Classes/SwiftHmssdkFlutterPlugin.swift index cc60287fb..158e8d361 100644 --- a/packages/hmssdk_flutter/ios/Classes/SwiftHmssdkFlutterPlugin.swift +++ b/packages/hmssdk_flutter/ios/Classes/SwiftHmssdkFlutterPlugin.swift @@ -1200,9 +1200,9 @@ public class SwiftHmssdkFlutterPlugin: NSObject, FlutterPlugin, HMSUpdateListene * the stream URL. */ - if room.hlsStreamingState.running { + if room.hlsStreamingState.state == HMSStreamingState.started { if !room.hlsStreamingState.variants.isEmpty { - hlsStreamUrl = room.hlsStreamingState.variants[0].url?.absoluteString + hlsStreamUrl = room.hlsStreamingState.variants.first?.url?.absoluteString } } @@ -1225,9 +1225,9 @@ public class SwiftHmssdkFlutterPlugin: NSObject, FlutterPlugin, HMSUpdateListene * the stream URL. */ - if room.hlsStreamingState.running { + if room.hlsStreamingState.state == HMSStreamingState.started { if !room.hlsStreamingState.variants.isEmpty { - hlsStreamUrl = room.hlsStreamingState.variants[0].url?.absoluteString + hlsStreamUrl = room.hlsStreamingState.variants.first?.url?.absoluteString } } From 82ee5f08291da9e3a216665caf23467791df43d5 Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Thu, 14 Dec 2023 14:06:05 +0530 Subject: [PATCH 23/32] =?UTF-8?q?released=20sample=20app=20version=201.5.1?= =?UTF-8?q?06=20(406)=20=F0=9F=8D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/android/app/build.gradle | 4 +-- .../example/ios/Runner/Info.plist | 4 +-- packages/hmssdk_flutter/example/pubspec.lock | 26 +++++++++---------- packages/hmssdk_flutter/pubspec.lock | 26 +++++++++---------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/packages/hmssdk_flutter/example/android/app/build.gradle b/packages/hmssdk_flutter/example/android/app/build.gradle index e555a101a..a362a6452 100644 --- a/packages/hmssdk_flutter/example/android/app/build.gradle +++ b/packages/hmssdk_flutter/example/android/app/build.gradle @@ -32,8 +32,8 @@ android { applicationId "live.hms.flutter" minSdkVersion 21 targetSdkVersion 33 - versionCode 404 - versionName "1.5.104" + versionCode 406 + versionName "1.5.106" } signingConfigs { diff --git a/packages/hmssdk_flutter/example/ios/Runner/Info.plist b/packages/hmssdk_flutter/example/ios/Runner/Info.plist index 405ff169e..b5bc353b8 100644 --- a/packages/hmssdk_flutter/example/ios/Runner/Info.plist +++ b/packages/hmssdk_flutter/example/ios/Runner/Info.plist @@ -21,7 +21,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.5.104 + 1.5.106 CFBundleSignature ???? CFBundleURLTypes @@ -48,7 +48,7 @@ CFBundleVersion - 404 + 406 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index 9afb586fe..569673c04 100644 --- a/packages/hmssdk_flutter/example/pubspec.lock +++ b/packages/hmssdk_flutter/example/pubspec.lock @@ -69,10 +69,10 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.17.2" convert: dependency: transitive description: @@ -362,10 +362,10 @@ packages: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.9.1" mime: dependency: transitive description: @@ -647,18 +647,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.1" string_scanner: dependency: transitive description: @@ -679,10 +679,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.6.0" tuple: dependency: transitive description: @@ -839,10 +839,10 @@ packages: dependency: transitive description: name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.1.4-beta" win32: dependency: transitive description: @@ -868,5 +868,5 @@ packages: source: hosted version: "6.3.0" sdks: - dart: ">=3.2.0-194.0.dev <4.0.0" + dart: ">=3.1.0 <4.0.0" flutter: ">=3.13.0" diff --git a/packages/hmssdk_flutter/pubspec.lock b/packages/hmssdk_flutter/pubspec.lock index 53939cd59..c3cc2c33e 100644 --- a/packages/hmssdk_flutter/pubspec.lock +++ b/packages/hmssdk_flutter/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.17.2" fake_async: dependency: transitive description: @@ -79,10 +79,10 @@ packages: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.9.1" path: dependency: transitive description: @@ -108,18 +108,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.1" string_scanner: dependency: transitive description: @@ -140,10 +140,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.6.0" vector_math: dependency: transitive description: @@ -156,10 +156,10 @@ packages: dependency: transitive description: name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.1.4-beta" sdks: - dart: ">=3.2.0-194.0.dev <4.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0" flutter: ">=2.10.0" From 8d1b796ce726c2b31a53df8e2ee9273e0b785f4c Mon Sep 17 00:00:00 2001 From: Pushpam <93931528+Decoder07@users.noreply.github.com> Date: Thu, 14 Dec 2023 15:53:23 +0530 Subject: [PATCH 24/32] Removed unused addTrackByDefault Property (#1667) --- .../lib/src/widgets/common_widgets/video_view.dart | 4 ---- .../lib/src/ui/meeting/hms_texture_view.dart | 9 --------- 2 files changed, 13 deletions(-) diff --git a/packages/hms_room_kit/lib/src/widgets/common_widgets/video_view.dart b/packages/hms_room_kit/lib/src/widgets/common_widgets/video_view.dart index c6c3234cd..0154eeac5 100644 --- a/packages/hms_room_kit/lib/src/widgets/common_widgets/video_view.dart +++ b/packages/hms_room_kit/lib/src/widgets/common_widgets/video_view.dart @@ -83,8 +83,6 @@ class _VideoViewState extends State { // Similarly to avoid rebuilding the key should be kept the same for particular HMSVideoView. child: HMSTextureView( controller: widget.videoViewController, - addTrackByDefault: - !context.read().isOffscreen, key: Key(data.item1!.trackId), scaleType: ScaleType.SCALE_ASPECT_FIT, track: data.item1!, @@ -98,8 +96,6 @@ class _VideoViewState extends State { // Similarly to avoid rebuilding the key should be kept the same for particular HMSVideoView. child: HMSTextureView( controller: widget.videoViewController, - addTrackByDefault: - !context.read().isOffscreen, key: Key(data.item1!.trackId), scaleType: ScaleType.SCALE_ASPECT_FILL, track: data.item1!, diff --git a/packages/hmssdk_flutter/lib/src/ui/meeting/hms_texture_view.dart b/packages/hmssdk_flutter/lib/src/ui/meeting/hms_texture_view.dart index 19cc0f15b..da62f1848 100644 --- a/packages/hmssdk_flutter/lib/src/ui/meeting/hms_texture_view.dart +++ b/packages/hmssdk_flutter/lib/src/ui/meeting/hms_texture_view.dart @@ -34,8 +34,6 @@ import 'package:hmssdk_flutter/hmssdk_flutter.dart'; /// **key** - [key] property can be used to forcefully rebuild the video widget by setting a unique key everytime. /// Similarly to avoid rebuilding the key should be kept the same for particular HMSVideoView. /// -/// **addTrackByDefault** - To call addTrack by default as HMSTextureView is attached to the tree. Default value is [true] -/// /// **controller** - To control the video view, this is useful for custom usecases when you wish to control the addTrack and removeTrack /// track functionalities on your own. /// @@ -58,9 +56,6 @@ class HMSTextureView extends StatelessWidget { /// Default is [false] final bool disableAutoSimulcastLayerSelect; - /// [addTrackByDefault] - To call addTrack by default as HMSVideoView is attached to the tree. Default value is [true] - final bool addTrackByDefault; - /// [controller] - To control the video view, this is useful for custom usecases when you wish to control the addTrack and removeTrack /// track functionalities on your own. final HMSTextureViewController? controller; @@ -71,7 +66,6 @@ class HMSTextureView extends StatelessWidget { this.setMirror = false, this.scaleType = ScaleType.SCALE_ASPECT_FIT, this.disableAutoSimulcastLayerSelect = false, - this.addTrackByDefault = true, this.controller}) : super(key: key); @@ -82,7 +76,6 @@ class HMSTextureView extends StatelessWidget { setMirror: setMirror, scaleType: this.scaleType, disableAutoSimulcastLayerSelect: disableAutoSimulcastLayerSelect, - addTrackByDefault: addTrackByDefault, controller: controller, ); } @@ -93,7 +86,6 @@ class _PlatformView extends StatefulWidget { final bool setMirror; final ScaleType scaleType; final bool disableAutoSimulcastLayerSelect; - final bool addTrackByDefault; final HMSTextureViewController? controller; _PlatformView( @@ -102,7 +94,6 @@ class _PlatformView extends StatefulWidget { this.setMirror = false, required this.scaleType, this.disableAutoSimulcastLayerSelect = false, - this.addTrackByDefault = true, this.controller}) : super(key: key); From 621fca3ad9d0a3940cd2cfd29b32f4747cc6b5a9 Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Thu, 14 Dec 2023 16:04:59 +0530 Subject: [PATCH 25/32] Update texture view parameters --- .../hmssdk_flutter/lib/src/ui/meeting/hms_texture_view.dart | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/hmssdk_flutter/lib/src/ui/meeting/hms_texture_view.dart b/packages/hmssdk_flutter/lib/src/ui/meeting/hms_texture_view.dart index da62f1848..b176fb7a0 100644 --- a/packages/hmssdk_flutter/lib/src/ui/meeting/hms_texture_view.dart +++ b/packages/hmssdk_flutter/lib/src/ui/meeting/hms_texture_view.dart @@ -32,7 +32,7 @@ import 'package:hmssdk_flutter/hmssdk_flutter.dart'; /// **disableAutoSimulcastLayerSelect** - To disable auto simulcast (Adaptive Bitrate) /// /// **key** - [key] property can be used to forcefully rebuild the video widget by setting a unique key everytime. -/// Similarly to avoid rebuilding the key should be kept the same for particular HMSVideoView. +/// Similarly to avoid rebuilding the key should be kept the same for particular HMSTextureView. /// /// **controller** - To control the video view, this is useful for custom usecases when you wish to control the addTrack and removeTrack /// track functionalities on your own. @@ -72,6 +72,7 @@ class HMSTextureView extends StatelessWidget { @override Widget build(BuildContext context) { return _PlatformView( + key: key, track: track, setMirror: setMirror, scaleType: this.scaleType, @@ -112,7 +113,7 @@ class _PlatformViewState extends State<_PlatformView> { if (Platform.isAndroid) { if (widget.controller == null) { viewController = - HMSTextureViewController(track: widget.track as HMSVideoTrack); + HMSTextureViewController(track: widget.track as HMSVideoTrack,disableAutoSimulcastLayerSelect: widget.disableAutoSimulcastLayerSelect); } else { viewController = widget.controller; } From da66ae3c2a0f1ed7c0a1563350290ccfc070eda1 Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Fri, 15 Dec 2023 01:41:15 +0530 Subject: [PATCH 26/32] =?UTF-8?q?released=20sample=20app=20version=201.5.1?= =?UTF-8?q?07=20(407)=20=F0=9F=8D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/hmssdk_flutter/example/android/app/build.gradle | 4 ++-- packages/hmssdk_flutter/example/ios/Runner/Info.plist | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/hmssdk_flutter/example/android/app/build.gradle b/packages/hmssdk_flutter/example/android/app/build.gradle index a362a6452..54a6d0ee7 100644 --- a/packages/hmssdk_flutter/example/android/app/build.gradle +++ b/packages/hmssdk_flutter/example/android/app/build.gradle @@ -32,8 +32,8 @@ android { applicationId "live.hms.flutter" minSdkVersion 21 targetSdkVersion 33 - versionCode 406 - versionName "1.5.106" + versionCode 407 + versionName "1.5.107" } signingConfigs { diff --git a/packages/hmssdk_flutter/example/ios/Runner/Info.plist b/packages/hmssdk_flutter/example/ios/Runner/Info.plist index b5bc353b8..7cec9b70f 100644 --- a/packages/hmssdk_flutter/example/ios/Runner/Info.plist +++ b/packages/hmssdk_flutter/example/ios/Runner/Info.plist @@ -21,7 +21,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.5.106 + 1.5.107 CFBundleSignature ???? CFBundleURLTypes @@ -48,7 +48,7 @@ CFBundleVersion - 406 + 407 ITSAppUsesNonExemptEncryption LSApplicationCategoryType From 4fed961e21d63bc33ae53c72f2db16a6ce833ee6 Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Thu, 14 Dec 2023 20:23:42 +0000 Subject: [PATCH 27/32] =?UTF-8?q?=F0=9F=A4=96=20Automated=20Format=20and?= =?UTF-8?q?=20Fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/hmssdk_flutter/example/pubspec.lock | 26 +++++++++---------- .../lib/src/ui/meeting/hms_texture_view.dart | 6 +++-- packages/hmssdk_flutter/pubspec.lock | 26 +++++++++---------- 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index 569673c04..9afb586fe 100644 --- a/packages/hmssdk_flutter/example/pubspec.lock +++ b/packages/hmssdk_flutter/example/pubspec.lock @@ -69,10 +69,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" convert: dependency: transitive description: @@ -362,10 +362,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: @@ -647,18 +647,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -679,10 +679,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" tuple: dependency: transitive description: @@ -839,10 +839,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" win32: dependency: transitive description: @@ -868,5 +868,5 @@ packages: source: hosted version: "6.3.0" sdks: - dart: ">=3.1.0 <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.13.0" diff --git a/packages/hmssdk_flutter/lib/src/ui/meeting/hms_texture_view.dart b/packages/hmssdk_flutter/lib/src/ui/meeting/hms_texture_view.dart index b176fb7a0..db56abf40 100644 --- a/packages/hmssdk_flutter/lib/src/ui/meeting/hms_texture_view.dart +++ b/packages/hmssdk_flutter/lib/src/ui/meeting/hms_texture_view.dart @@ -112,8 +112,10 @@ class _PlatformViewState extends State<_PlatformView> { /// (Android Only) if (Platform.isAndroid) { if (widget.controller == null) { - viewController = - HMSTextureViewController(track: widget.track as HMSVideoTrack,disableAutoSimulcastLayerSelect: widget.disableAutoSimulcastLayerSelect); + viewController = HMSTextureViewController( + track: widget.track as HMSVideoTrack, + disableAutoSimulcastLayerSelect: + widget.disableAutoSimulcastLayerSelect); } else { viewController = widget.controller; } diff --git a/packages/hmssdk_flutter/pubspec.lock b/packages/hmssdk_flutter/pubspec.lock index c3cc2c33e..53939cd59 100644 --- a/packages/hmssdk_flutter/pubspec.lock +++ b/packages/hmssdk_flutter/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" fake_async: dependency: transitive description: @@ -79,10 +79,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" path: dependency: transitive description: @@ -108,18 +108,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -140,10 +140,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" vector_math: dependency: transitive description: @@ -156,10 +156,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=2.10.0" From c8f3b5b0fa7d759f010d9fdad37054d066bd3174 Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Fri, 15 Dec 2023 02:04:39 +0530 Subject: [PATCH 28/32] Updated changelog --- packages/hms_room_kit/CHANGELOG.md | 11 +++++++++++ packages/hmssdk_flutter/CHANGELOG.md | 24 ++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/packages/hms_room_kit/CHANGELOG.md b/packages/hms_room_kit/CHANGELOG.md index ee07a4e65..5ded47fe0 100644 --- a/packages/hms_room_kit/CHANGELOG.md +++ b/packages/hms_room_kit/CHANGELOG.md @@ -5,6 +5,17 @@ | hms_room_kit | [![Pub Version](https://img.shields.io/pub/v/hms_room_kit)](https://pub.dev/packages/hms_room_kit) | | hmssdk_flutter | [![Pub Version](https://img.shields.io/pub/v/hmssdk_flutter)](https://pub.dev/packages/hmssdk_flutter) | +## 1.0.8 - 2023-12-15 + +| Package | Version | +| -------------- | ------------------------------------------------------------------------------------------------------ | +| hms_room_kit | 1.0.8 | +| hmssdk_flutter | 1.9.5 | + +### 🔄 Changed + +- Updated Streaming and Recording UI + ## 1.0.7 - 2023-12-08 | Package | Version | diff --git a/packages/hmssdk_flutter/CHANGELOG.md b/packages/hmssdk_flutter/CHANGELOG.md index a96440978..8c5adf1ae 100644 --- a/packages/hmssdk_flutter/CHANGELOG.md +++ b/packages/hmssdk_flutter/CHANGELOG.md @@ -5,6 +5,30 @@ | hms_room_kit | [![Pub Version](https://img.shields.io/pub/v/hms_room_kit)](https://pub.dev/packages/hms_room_kit) | | hmssdk_flutter | [![Pub Version](https://img.shields.io/pub/v/hmssdk_flutter)](https://pub.dev/packages/hmssdk_flutter) | +# 1.9.5 - 2023-12-15 + +| Package | Version | +| -------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- | +| hms_room_kit | 1.0.8 | +| hmssdk_flutter | 1.9.5 | + +### Added + +- Added `state` property to recording and streaming classes to get the current state of recording and streaming. + + Learn more about `HMSStreamingState` and `HMSRecordingState` [here](https://www.100ms.live/docs/flutter/v2/how-to-guides/record-and-live-stream/recording#current-room-status). + +### Changed + +- Removed `addTrackByDefault` property from `HMSTextureView`. + + This should not affect any existing implementation as `addTrackByDefault` was set to `true` by default. + Learn more about `HMSTextureView` [here](https://www.100ms.live/docs/flutter/v2/how-to-guides/set-up-video-conferencing/render-video/hms-texture-view). + +Updated to Android SDK 2.8.3 & iOS SDK 1.4.0 + +**Full Changelog**: [1.9.4...1.9.5](https://github.com/100mslive/100ms-flutter/compare/1.9.4...1.9.5) + # 1.9.4 - 2023-12-08 | Package | Version | From 844ebd5b35c5c7fbf31d25525a4d613fd775a2ec Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Fri, 15 Dec 2023 02:11:01 +0530 Subject: [PATCH 29/32] Added comments --- packages/hmssdk_flutter/lib/src/enum/hms_recording_state.dart | 1 + packages/hmssdk_flutter/lib/src/enum/hms_streaming_state.dart | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/hmssdk_flutter/lib/src/enum/hms_recording_state.dart b/packages/hmssdk_flutter/lib/src/enum/hms_recording_state.dart index da610dfdf..30e6afcee 100644 --- a/packages/hmssdk_flutter/lib/src/enum/hms_recording_state.dart +++ b/packages/hmssdk_flutter/lib/src/enum/hms_recording_state.dart @@ -1,3 +1,4 @@ +///Enum for the recording state in room enum HMSRecordingState { none, diff --git a/packages/hmssdk_flutter/lib/src/enum/hms_streaming_state.dart b/packages/hmssdk_flutter/lib/src/enum/hms_streaming_state.dart index c8c849756..ad9b119a5 100644 --- a/packages/hmssdk_flutter/lib/src/enum/hms_streaming_state.dart +++ b/packages/hmssdk_flutter/lib/src/enum/hms_streaming_state.dart @@ -1,3 +1,4 @@ +///Enum for the streaming state in room enum HMSStreamingState { none, From b46202f8a0f3f1f372a42656293b8c842e4ad16e Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Fri, 15 Dec 2023 16:54:55 +0530 Subject: [PATCH 30/32] Updated hmssdk version in room kit --- packages/hms_room_kit/example/pubspec.lock | 7 +++--- packages/hms_room_kit/pubspec.lock | 7 +++--- packages/hms_room_kit/pubspec.yaml | 3 +-- packages/hmssdk_flutter/pubspec.lock | 26 +++++++++++----------- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/packages/hms_room_kit/example/pubspec.lock b/packages/hms_room_kit/example/pubspec.lock index b6a3ff0fb..e8d2e2d92 100644 --- a/packages/hms_room_kit/example/pubspec.lock +++ b/packages/hms_room_kit/example/pubspec.lock @@ -218,9 +218,10 @@ packages: hmssdk_flutter: dependency: transitive description: - path: "../../hmssdk_flutter" - relative: true - source: path + name: hmssdk_flutter + sha256: f61fb1ffcaf7296e0e2eeff9bc34d699baf9190136b8570a15cde61819cf3276 + url: "https://pub.dev" + source: hosted version: "1.9.5" http: dependency: transitive diff --git a/packages/hms_room_kit/pubspec.lock b/packages/hms_room_kit/pubspec.lock index 02154959e..ff98cfb7e 100644 --- a/packages/hms_room_kit/pubspec.lock +++ b/packages/hms_room_kit/pubspec.lock @@ -203,9 +203,10 @@ packages: hmssdk_flutter: dependency: "direct main" description: - path: "../hmssdk_flutter" - relative: true - source: path + name: hmssdk_flutter + sha256: f61fb1ffcaf7296e0e2eeff9bc34d699baf9190136b8570a15cde61819cf3276 + url: "https://pub.dev" + source: hosted version: "1.9.5" http: dependency: transitive diff --git a/packages/hms_room_kit/pubspec.yaml b/packages/hms_room_kit/pubspec.yaml index 53af1a9a4..3dfa38c97 100644 --- a/packages/hms_room_kit/pubspec.yaml +++ b/packages/hms_room_kit/pubspec.yaml @@ -14,8 +14,7 @@ dependencies: flutter: sdk: flutter - hmssdk_flutter: - path: ../hmssdk_flutter + hmssdk_flutter: ^1.9.5 intl: ^0.18.1 permission_handler: ^11.0.0 provider: ^6.0.5 diff --git a/packages/hmssdk_flutter/pubspec.lock b/packages/hmssdk_flutter/pubspec.lock index 53939cd59..c3cc2c33e 100644 --- a/packages/hmssdk_flutter/pubspec.lock +++ b/packages/hmssdk_flutter/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.17.2" fake_async: dependency: transitive description: @@ -79,10 +79,10 @@ packages: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.9.1" path: dependency: transitive description: @@ -108,18 +108,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.1" string_scanner: dependency: transitive description: @@ -140,10 +140,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.6.0" vector_math: dependency: transitive description: @@ -156,10 +156,10 @@ packages: dependency: transitive description: name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.1.4-beta" sdks: - dart: ">=3.2.0-194.0.dev <4.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0" flutter: ">=2.10.0" From 91a4c4a8e153d63af65d145c44f9713fa7d57108 Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Fri, 15 Dec 2023 17:19:08 +0530 Subject: [PATCH 31/32] Updated intl version --- packages/hms_room_kit/example/pubspec.lock | 4 +- .../hls_viewer_bottom_navigation_bar.dart | 71 ++++++++++--------- .../bottom_sheets/hls_more_options.dart | 63 ++++++++-------- .../more_settings_bottom_sheet.dart | 2 +- packages/hms_room_kit/pubspec.lock | 4 +- packages/hms_room_kit/pubspec.yaml | 2 +- 6 files changed, 77 insertions(+), 69 deletions(-) diff --git a/packages/hms_room_kit/example/pubspec.lock b/packages/hms_room_kit/example/pubspec.lock index e8d2e2d92..872696dd2 100644 --- a/packages/hms_room_kit/example/pubspec.lock +++ b/packages/hms_room_kit/example/pubspec.lock @@ -243,10 +243,10 @@ packages: dependency: transitive description: name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf url: "https://pub.dev" source: hosted - version: "0.18.1" + version: "0.19.0" js: dependency: transitive description: diff --git a/packages/hms_room_kit/lib/src/hls_viewer/hls_viewer_bottom_navigation_bar.dart b/packages/hms_room_kit/lib/src/hls_viewer/hls_viewer_bottom_navigation_bar.dart index d48687772..2b5960b60 100644 --- a/packages/hms_room_kit/lib/src/hls_viewer/hls_viewer_bottom_navigation_bar.dart +++ b/packages/hms_room_kit/lib/src/hls_viewer/hls_viewer_bottom_navigation_bar.dart @@ -4,6 +4,7 @@ import 'dart:io'; ///Package imports import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; +import 'package:hms_room_kit/hms_room_kit.dart'; import 'package:provider/provider.dart'; ///Project imports @@ -14,7 +15,6 @@ import 'package:hms_room_kit/src/common/utility_components.dart'; import 'package:hms_room_kit/src/hls_viewer/hls_chat_component.dart'; import 'package:hms_room_kit/src/widgets/bottom_sheets/hls_more_options.dart'; import 'package:hms_room_kit/src/hls_viewer/hls_player_store.dart'; -import 'package:hms_room_kit/src/layout_api/hms_theme_colors.dart'; import 'package:hms_room_kit/src/meeting/meeting_store.dart'; import 'package:hms_room_kit/src/widgets/common_widgets/hms_embedded_button.dart'; @@ -223,38 +223,45 @@ class HLSViewerBottomNavigationBar extends StatelessWidget { ), ///Menu Button - HMSEmbeddedButton( - onTap: () async => { - showModalBottomSheet( - isScrollControlled: true, - backgroundColor: HMSThemeColors.surfaceDim, - shape: const RoundedRectangleBorder( - borderRadius: BorderRadius.only( - topLeft: Radius.circular(16), - topRight: Radius.circular(16)), - ), - context: context, - builder: (ctx) => ChangeNotifierProvider.value( - value: context.read(), - child: - const HLSMoreOptionsBottomSheet()), - ) - }, - enabledBorderColor: - HMSThemeColors.backgroundDim.withAlpha(64), - onColor: - HMSThemeColors.backgroundDim.withAlpha(64), - isActive: true, - child: Padding( - padding: const EdgeInsets.all(8.0), - child: SvgPicture.asset( - "packages/hms_room_kit/lib/src/assets/icons/menu.svg", - colorFilter: ColorFilter.mode( - HMSThemeColors.onSurfaceHighEmphasis, - BlendMode.srcIn), - semanticsLabel: "more_button"), + if (HMSRoomLayout.isParticipantsListEnabled || + Constant.prebuiltOptions?.userName == null) + HMSEmbeddedButton( + onTap: () async => { + showModalBottomSheet( + isScrollControlled: true, + backgroundColor: + HMSThemeColors.surfaceDim, + shape: const RoundedRectangleBorder( + borderRadius: BorderRadius.only( + topLeft: Radius.circular(16), + topRight: Radius.circular(16)), + ), + context: context, + builder: (ctx) => + ChangeNotifierProvider.value( + value: + context.read(), + child: + const HLSMoreOptionsBottomSheet()), + ) + }, + enabledBorderColor: HMSThemeColors + .backgroundDim + .withAlpha(64), + onColor: HMSThemeColors.backgroundDim + .withAlpha(64), + isActive: true, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: SvgPicture.asset( + "packages/hms_room_kit/lib/src/assets/icons/menu.svg", + colorFilter: ColorFilter.mode( + HMSThemeColors + .onSurfaceHighEmphasis, + BlendMode.srcIn), + semanticsLabel: "more_button"), + ), ), - ), ], ) : Container(), diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/hls_more_options.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/hls_more_options.dart index 71cfa12b9..8660f2113 100644 --- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/hls_more_options.dart +++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/hls_more_options.dart @@ -128,37 +128,38 @@ class _HLSMoreOptionsBottomSheetBottomSheetState ), ), optionText: "Participants"), - MoreOptionItem( - onTap: () async { - var meetingStore = context.read(); - Navigator.pop(context); - showModalBottomSheet( - isScrollControlled: true, - backgroundColor: HMSThemeColors.surfaceDim, - shape: const RoundedRectangleBorder( - borderRadius: BorderRadius.only( - topLeft: Radius.circular(16), - topRight: Radius.circular(16)), - ), - context: context, - builder: (ctx) => ChangeNotifierProvider.value( - value: meetingStore, - child: Padding( - padding: EdgeInsets.only( - bottom: - MediaQuery.of(ctx).viewInsets.bottom), - child: const ChangeNameBottomSheet())), - ); - }, - optionIcon: SvgPicture.asset( - "packages/hms_room_kit/lib/src/assets/icons/pencil.svg", - height: 20, - width: 20, - colorFilter: ColorFilter.mode( - HMSThemeColors.onSurfaceHighEmphasis, - BlendMode.srcIn), - ), - optionText: "Change Name") + if (Constant.prebuiltOptions?.userName == null) + MoreOptionItem( + onTap: () async { + var meetingStore = context.read(); + Navigator.pop(context); + showModalBottomSheet( + isScrollControlled: true, + backgroundColor: HMSThemeColors.surfaceDim, + shape: const RoundedRectangleBorder( + borderRadius: BorderRadius.only( + topLeft: Radius.circular(16), + topRight: Radius.circular(16)), + ), + context: context, + builder: (ctx) => ChangeNotifierProvider.value( + value: meetingStore, + child: Padding( + padding: EdgeInsets.only( + bottom: + MediaQuery.of(ctx).viewInsets.bottom), + child: const ChangeNameBottomSheet())), + ); + }, + optionIcon: SvgPicture.asset( + "packages/hms_room_kit/lib/src/assets/icons/pencil.svg", + height: 20, + width: 20, + colorFilter: ColorFilter.mode( + HMSThemeColors.onSurfaceHighEmphasis, + BlendMode.srcIn), + ), + optionText: "Change Name") ], ), ], diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/more_settings_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/more_settings_bottom_sheet.dart index 20b548bcb..a408ab9ce 100644 --- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/more_settings_bottom_sheet.dart +++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/more_settings_bottom_sheet.dart @@ -454,7 +454,7 @@ class _MoreSettingsBottomSheetState extends State { "Enter Comma separated RTMP Urls", isRecordingEnabled: meetingStore .recordingType["browser"] == - true); + HMSRecordingState.started); List? urls; if (data["url"]!.isNotEmpty) { urls = data["url"]!.split(","); diff --git a/packages/hms_room_kit/pubspec.lock b/packages/hms_room_kit/pubspec.lock index ff98cfb7e..c639d8658 100644 --- a/packages/hms_room_kit/pubspec.lock +++ b/packages/hms_room_kit/pubspec.lock @@ -228,10 +228,10 @@ packages: dependency: "direct main" description: name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf url: "https://pub.dev" source: hosted - version: "0.18.1" + version: "0.19.0" js: dependency: transitive description: diff --git a/packages/hms_room_kit/pubspec.yaml b/packages/hms_room_kit/pubspec.yaml index 3dfa38c97..961253565 100644 --- a/packages/hms_room_kit/pubspec.yaml +++ b/packages/hms_room_kit/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: sdk: flutter hmssdk_flutter: ^1.9.5 - intl: ^0.18.1 + intl: ^0.19.0 permission_handler: ^11.0.0 provider: ^6.0.5 google_fonts: ^6.1.0 From 310a9a726f599c1ed3c2b6360e6103c487ee8caf Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Fri, 15 Dec 2023 11:50:16 +0000 Subject: [PATCH 32/32] =?UTF-8?q?=F0=9F=A4=96=20Automated=20Format=20and?= =?UTF-8?q?=20Fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/hmssdk_flutter/example/pubspec.lock | 11 +++++---- packages/hmssdk_flutter/pubspec.lock | 26 ++++++++++---------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index 9afb586fe..1f981838a 100644 --- a/packages/hmssdk_flutter/example/pubspec.lock +++ b/packages/hmssdk_flutter/example/pubspec.lock @@ -290,9 +290,10 @@ packages: hmssdk_flutter: dependency: transitive description: - path: ".." - relative: true - source: path + name: hmssdk_flutter + sha256: f61fb1ffcaf7296e0e2eeff9bc34d699baf9190136b8570a15cde61819cf3276 + url: "https://pub.dev" + source: hosted version: "1.9.5" http: dependency: transitive @@ -314,10 +315,10 @@ packages: dependency: transitive description: name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf url: "https://pub.dev" source: hosted - version: "0.18.1" + version: "0.19.0" js: dependency: transitive description: diff --git a/packages/hmssdk_flutter/pubspec.lock b/packages/hmssdk_flutter/pubspec.lock index c3cc2c33e..53939cd59 100644 --- a/packages/hmssdk_flutter/pubspec.lock +++ b/packages/hmssdk_flutter/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" fake_async: dependency: transitive description: @@ -79,10 +79,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" path: dependency: transitive description: @@ -108,18 +108,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -140,10 +140,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" vector_math: dependency: transitive description: @@ -156,10 +156,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=2.10.0"