From 96c97236d76dd6d6ec436f3344835b5c8c093fb1 Mon Sep 17 00:00:00 2001 From: Yogesh Singh Date: Fri, 22 Dec 2023 12:42:22 +0530 Subject: [PATCH 01/18] updated packages --- packages/hms_room_kit/example/pubspec.lock | 30 +++++++++++----------- packages/hms_room_kit/pubspec.lock | 30 +++++++++++----------- packages/hms_room_kit/pubspec.yaml | 2 +- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/packages/hms_room_kit/example/pubspec.lock b/packages/hms_room_kit/example/pubspec.lock index 872696dd2..e948a8ae0 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: @@ -243,10 +243,10 @@ packages: dependency: transitive description: name: intl - sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" url: "https://pub.dev" source: hosted - version: "0.19.0" + version: "0.18.1" js: 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: @@ -560,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: @@ -592,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: transitive description: @@ -728,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: @@ -757,5 +757,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/hms_room_kit/pubspec.lock b/packages/hms_room_kit/pubspec.lock index c639d8658..0be89dbd7 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: @@ -228,10 +228,10 @@ packages: dependency: "direct main" description: name: intl - sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" url: "https://pub.dev" source: hosted - version: "0.19.0" + version: "0.18.1" js: 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: @@ -545,18 +545,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 +577,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: @@ -713,10 +713,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: @@ -742,5 +742,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/hms_room_kit/pubspec.yaml b/packages/hms_room_kit/pubspec.yaml index 961253565..0882f2788 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.19.0 + intl: ^0.18.0 permission_handler: ^11.0.0 provider: ^6.0.5 google_fonts: ^6.1.0 From 13bb0d6dd35fe2ea09ceced427b4ee6091714d33 Mon Sep 17 00:00:00 2001 From: Yogesh Singh Date: Fri, 22 Dec 2023 12:45:33 +0530 Subject: [PATCH 02/18] fixed to exact version of intl --- packages/hms_room_kit/example/pubspec.lock | 4 ++-- packages/hms_room_kit/pubspec.lock | 4 ++-- packages/hms_room_kit/pubspec.yaml | 2 +- packages/hmssdk_flutter/example/pubspec.lock | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/hms_room_kit/example/pubspec.lock b/packages/hms_room_kit/example/pubspec.lock index e948a8ae0..585323c40 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: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 url: "https://pub.dev" source: hosted - version: "0.18.1" + version: "0.18.0" js: dependency: transitive description: diff --git a/packages/hms_room_kit/pubspec.lock b/packages/hms_room_kit/pubspec.lock index 0be89dbd7..cac4ac4d6 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: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 url: "https://pub.dev" source: hosted - version: "0.18.1" + version: "0.18.0" js: dependency: transitive description: diff --git a/packages/hms_room_kit/pubspec.yaml b/packages/hms_room_kit/pubspec.yaml index 0882f2788..893abfb11 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.0 + intl: 0.18.0 permission_handler: ^11.0.0 provider: ^6.0.5 google_fonts: ^6.1.0 diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index 1f981838a..eca3e352c 100644 --- a/packages/hmssdk_flutter/example/pubspec.lock +++ b/packages/hmssdk_flutter/example/pubspec.lock @@ -315,10 +315,10 @@ packages: dependency: transitive description: name: intl - sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" url: "https://pub.dev" source: hosted - version: "0.19.0" + version: "0.18.1" js: dependency: transitive description: From 4f79496950eecf3de66b8d0edc6a7d31cd47b8d5 Mon Sep 17 00:00:00 2001 From: ygit Date: Fri, 22 Dec 2023 07:20:52 +0000 Subject: [PATCH 03/18] =?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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index eca3e352c..8b5db5c04 100644 --- a/packages/hmssdk_flutter/example/pubspec.lock +++ b/packages/hmssdk_flutter/example/pubspec.lock @@ -315,10 +315,10 @@ packages: dependency: transitive description: name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 url: "https://pub.dev" source: hosted - version: "0.18.1" + version: "0.18.0" js: dependency: transitive description: From 4eaf373bbc12a6dae069c7c5c9e42062de453798 Mon Sep 17 00:00:00 2001 From: Yogesh Singh Date: Fri, 22 Dec 2023 13:03:57 +0530 Subject: [PATCH 04/18] updated packages --- packages/hms_room_kit/example/ios/Podfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/hms_room_kit/example/ios/Podfile.lock b/packages/hms_room_kit/example/ios/Podfile.lock index 5481e0490..42772d9de 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.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) - path_provider_foundation (0.0.1): - Flutter @@ -70,8 +70,8 @@ SPEC CHECKSUMS: HMSAnalyticsSDK: 4d2a88a729b1eb42f3d25f217c28937ec318a5b7 HMSBroadcastExtensionSDK: d80fe325f6c928bd8e5176290b5a4b7ae15d6fbb HMSHLSPlayerSDK: 6a54ad4d12f3dc2270d1ecd24019d71282a4f6a3 - HMSSDK: 04aac0fefd95419cd1b4135156d4295cbcd51216 - hmssdk_flutter: 3876d06f4ad68bf48a2ceb4c797551fedb860bd1 + HMSSDK: 1bfd81ce70d61864cf2496018892d95335164b53 + hmssdk_flutter: b8e4641f6839d0492c447b338169a813cb443816 HMSWebRTC: ae54e9dd91b869051b283b43b14f57d43b7bf8e1 path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 From 7b8ee360c73dc3f663e7160e24b98c449da6a759 Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Wed, 27 Dec 2023 17:05:29 +0530 Subject: [PATCH 05/18] updated intl version --- packages/hms_room_kit/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/hms_room_kit/pubspec.yaml b/packages/hms_room_kit/pubspec.yaml index 893abfb11..634bbebbf 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.0 + intl: 0.18.1 permission_handler: ^11.0.0 provider: ^6.0.5 google_fonts: ^6.1.0 From 9b6392ea54bbc4d572f3b60f7f43b1a85fcf3a93 Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Wed, 27 Dec 2023 17:14:41 +0530 Subject: [PATCH 06/18] Added option to unpin chat --- .../lib/src/assets/icons/unpin.svg | 8 ++++++++ .../bottom_sheets/chat_bottom_sheet.dart | 20 +++++++++---------- 2 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 packages/hms_room_kit/lib/src/assets/icons/unpin.svg diff --git a/packages/hms_room_kit/lib/src/assets/icons/unpin.svg b/packages/hms_room_kit/lib/src/assets/icons/unpin.svg new file mode 100644 index 000000000..cdd38030c --- /dev/null +++ b/packages/hms_room_kit/lib/src/assets/icons/unpin.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/chat_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/chat_bottom_sheet.dart index e0130b270..752ec12a6 100644 --- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/chat_bottom_sheet.dart +++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/chat_bottom_sheet.dart @@ -132,16 +132,6 @@ class _ChatBottomSheetState extends State { children: [ Row( children: [ - SvgPicture.asset( - "packages/hms_room_kit/lib/src/assets/icons/pin.svg", - height: 20, - width: 20, - colorFilter: ColorFilter.mode( - HMSThemeColors - .onSurfaceMediumEmphasis, - BlendMode.srcIn), - ), - const SizedBox(width: 8), SizedBox( width: MediaQuery.of(context) @@ -186,6 +176,16 @@ class _ChatBottomSheetState extends State { .w400), ), ), + const SizedBox(width: 8), + SvgPicture.asset( + "packages/hms_room_kit/lib/src/assets/icons/unpin.svg", + height: 20, + width: 20, + colorFilter: ColorFilter.mode( + HMSThemeColors + .onSurfaceMediumEmphasis, + BlendMode.srcIn), + ), ], ), Row( From 30e59ae9dd05a93dc3bd1fc18405abe3caebe30c Mon Sep 17 00:00:00 2001 From: ygit Date: Thu, 28 Dec 2023 06:15:32 +0000 Subject: [PATCH 07/18] =?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 ++++++++++---------- packages/hmssdk_flutter/pubspec.lock | 26 ++++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index 9bed406ba..108ecd622 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/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 a4f7dbc058a95e4c38106df1ca723d78deb95c9b Mon Sep 17 00:00:00 2001 From: Yogesh Singh Date: Thu, 28 Dec 2023 11:54:28 +0530 Subject: [PATCH 08/18] updated packages --- packages/hms_room_kit/example/pubspec.lock | 64 +++++++++-------- packages/hms_room_kit/pubspec.lock | 64 +++++++++-------- .../example/ExampleAppChangelog.txt | 3 + .../example/android/Gemfile.lock | 10 +-- .../hmssdk_flutter/example/ios/Gemfile.lock | 10 +-- packages/hmssdk_flutter/example/pubspec.lock | 68 +++++++++++-------- 6 files changed, 123 insertions(+), 96 deletions(-) diff --git a/packages/hms_room_kit/example/pubspec.lock b/packages/hms_room_kit/example/pubspec.lock index 5f979b594..91ee9e27b 100644 --- a/packages/hms_room_kit/example/pubspec.lock +++ b/packages/hms_room_kit/example/pubspec.lock @@ -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: @@ -226,10 +226,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: @@ -242,10 +242,10 @@ packages: dependency: transitive description: name: intl - sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" url: "https://pub.dev" source: hosted - version: "0.18.0" + version: "0.18.1" js: dependency: transitive description: @@ -346,10 +346,10 @@ packages: dependency: transitive description: name: path_provider_android - sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72 + sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.2.2" path_provider_foundation: dependency: transitive description: @@ -386,50 +386,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.1.4" + 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" 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: @@ -522,10 +530,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: @@ -663,10 +671,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: @@ -751,10 +759,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/hms_room_kit/pubspec.lock b/packages/hms_room_kit/pubspec.lock index b9a1d1354..300c6423b 100644 --- a/packages/hms_room_kit/pubspec.lock +++ b/packages/hms_room_kit/pubspec.lock @@ -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: @@ -211,10 +211,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: @@ -227,10 +227,10 @@ packages: dependency: "direct main" description: name: intl - sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" url: "https://pub.dev" source: hosted - version: "0.18.0" + version: "0.18.1" js: dependency: transitive description: @@ -331,10 +331,10 @@ packages: dependency: transitive description: name: path_provider_android - sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72 + sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.2.2" path_provider_foundation: dependency: transitive description: @@ -371,50 +371,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.1.4" + 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" 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: @@ -507,10 +515,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: @@ -648,10 +656,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: @@ -736,10 +744,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/ExampleAppChangelog.txt b/packages/hmssdk_flutter/example/ExampleAppChangelog.txt index 027c108e5..62d37e6a0 100644 --- a/packages/hmssdk_flutter/example/ExampleAppChangelog.txt +++ b/packages/hmssdk_flutter/example/ExampleAppChangelog.txt @@ -12,6 +12,9 @@ https://100ms.atlassian.net/browse/FLUT-162 - Even if screenshare is disabled, UI still shows screenshare option https://100ms.atlassian.net/browse/LIVE-1981 +- Multi pin Chat +https://100ms.atlassian.net/browse/FLUT-154 + - Block Peer From Chat https://100ms.atlassian.net/browse/FLUT-157 diff --git a/packages/hmssdk_flutter/example/android/Gemfile.lock b/packages/hmssdk_flutter/example/android/Gemfile.lock index 5c0424dfc..ac107e4d8 100644 --- a/packages/hmssdk_flutter/example/android/Gemfile.lock +++ b/packages/hmssdk_flutter/example/android/Gemfile.lock @@ -13,8 +13,8 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.869.0) - aws-sdk-core (3.190.0) + aws-partitions (1.875.0) + aws-sdk-core (3.190.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) @@ -22,7 +22,7 @@ GEM aws-sdk-kms (1.75.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.141.0) + aws-sdk-s3 (1.142.0) aws-sdk-core (~> 3, >= 3.189.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) @@ -70,7 +70,7 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) - fastimage (2.2.7) + fastimage (2.3.0) fastlane (2.217.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) @@ -172,7 +172,7 @@ GEM naturally (2.2.1) optparse (0.1.1) os (1.1.4) - plist (3.7.0) + plist (3.7.1) public_suffix (5.0.4) rake (13.1.0) representable (3.2.0) diff --git a/packages/hmssdk_flutter/example/ios/Gemfile.lock b/packages/hmssdk_flutter/example/ios/Gemfile.lock index 301551d57..762fb1264 100644 --- a/packages/hmssdk_flutter/example/ios/Gemfile.lock +++ b/packages/hmssdk_flutter/example/ios/Gemfile.lock @@ -13,8 +13,8 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.869.0) - aws-sdk-core (3.190.0) + aws-partitions (1.875.0) + aws-sdk-core (3.190.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) @@ -22,7 +22,7 @@ GEM aws-sdk-kms (1.75.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.141.0) + aws-sdk-s3 (1.142.0) aws-sdk-core (~> 3, >= 3.189.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) @@ -70,7 +70,7 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) - fastimage (2.2.7) + fastimage (2.3.0) fastlane (2.217.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) @@ -173,7 +173,7 @@ GEM naturally (2.2.1) optparse (0.1.1) os (1.1.4) - plist (3.7.0) + plist (3.7.1) public_suffix (5.0.4) rake (13.1.0) representable (3.2.0) diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index 108ecd622..00956f59c 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: @@ -298,10 +298,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: @@ -314,10 +314,10 @@ packages: dependency: transitive description: name: intl - sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" url: "https://pub.dev" source: hosted - version: "0.18.0" + version: "0.18.1" js: dependency: transitive description: @@ -386,10 +386,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: @@ -426,10 +426,10 @@ packages: dependency: transitive description: name: path_provider_android - sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72 + sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.2.2" path_provider_foundation: dependency: transitive description: @@ -466,50 +466,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.1.4" + 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" 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: @@ -610,10 +618,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: @@ -775,10 +783,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: @@ -863,10 +871,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" From f6697e5ec46e24c0064186a4498ad625afd227fe Mon Sep 17 00:00:00 2001 From: Yogesh Singh Date: Thu, 28 Dec 2023 12:08:14 +0530 Subject: [PATCH 09/18] =?UTF-8?q?released=20sample=20app=20version=201.5.1?= =?UTF-8?q?14=20(414)=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 ae8562674..e9de7e70e 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 413 - versionName "1.5.113" + versionCode 414 + versionName "1.5.114" } signingConfigs { diff --git a/packages/hmssdk_flutter/example/ios/Runner/Info.plist b/packages/hmssdk_flutter/example/ios/Runner/Info.plist index cb9d6547d..64d9c32c1 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.113 + 1.5.114 CFBundleSignature ???? CFBundleURLTypes @@ -48,7 +48,7 @@ CFBundleVersion - 413 + 414 ITSAppUsesNonExemptEncryption LSApplicationCategoryType From b96374d3525e374e33140e6fad796bb9b93c4c00 Mon Sep 17 00:00:00 2001 From: Yogesh Singh Date: Thu, 28 Dec 2023 13:53:04 +0530 Subject: [PATCH 10/18] updated Changelog --- packages/hmssdk_flutter/example/ExampleAppChangelog.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/hmssdk_flutter/example/ExampleAppChangelog.txt b/packages/hmssdk_flutter/example/ExampleAppChangelog.txt index 62d37e6a0..027c108e5 100644 --- a/packages/hmssdk_flutter/example/ExampleAppChangelog.txt +++ b/packages/hmssdk_flutter/example/ExampleAppChangelog.txt @@ -12,9 +12,6 @@ https://100ms.atlassian.net/browse/FLUT-162 - Even if screenshare is disabled, UI still shows screenshare option https://100ms.atlassian.net/browse/LIVE-1981 -- Multi pin Chat -https://100ms.atlassian.net/browse/FLUT-154 - - Block Peer From Chat https://100ms.atlassian.net/browse/FLUT-157 From 86b616194078d09e0985ef42b9bf7405bf3ac09c Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Mon, 8 Jan 2024 17:05:18 +0530 Subject: [PATCH 11/18] Completed pin message ui --- .../lib/src/assets/icons/copy.svg | 5 + .../hls_viewer/overlay_chat_component.dart | 291 +++++------------- .../meeting_bottom_navigation_bar.dart | 8 - .../lib/src/meeting/meeting_page.dart | 8 +- .../lib/src/meeting/meeting_store.dart | 40 ++- .../bottom_sheets/chat_bottom_sheet.dart | 115 +------ .../chat_utilities_bottom_sheet.dart | 31 +- .../widgets/chat_widgets/chat_text_field.dart | 176 ++++++----- .../widgets/chat_widgets/pin_chat_widget.dart | 165 ++++++++++ .../src/widgets/toasts/hms_error_toast.dart | 48 +++ .../toasts/hms_recording_error_toast.dart | 4 +- .../src/widgets/toasts/hms_toasts_type.dart | 3 +- packages/hmssdk_flutter/example/pubspec.lock | 84 +++-- 13 files changed, 503 insertions(+), 475 deletions(-) create mode 100644 packages/hms_room_kit/lib/src/assets/icons/copy.svg create mode 100644 packages/hms_room_kit/lib/src/widgets/chat_widgets/pin_chat_widget.dart create mode 100644 packages/hms_room_kit/lib/src/widgets/toasts/hms_error_toast.dart diff --git a/packages/hms_room_kit/lib/src/assets/icons/copy.svg b/packages/hms_room_kit/lib/src/assets/icons/copy.svg new file mode 100644 index 000000000..e9de99898 --- /dev/null +++ b/packages/hms_room_kit/lib/src/assets/icons/copy.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/packages/hms_room_kit/lib/src/hls_viewer/overlay_chat_component.dart b/packages/hms_room_kit/lib/src/hls_viewer/overlay_chat_component.dart index 062e4fc60..296cb36de 100644 --- a/packages/hms_room_kit/lib/src/hls_viewer/overlay_chat_component.dart +++ b/packages/hms_room_kit/lib/src/hls_viewer/overlay_chat_component.dart @@ -1,10 +1,11 @@ //Dart imports -import 'dart:math' as math; ///Package imports import 'package:flutter/material.dart'; import 'package:flutter_linkify/flutter_linkify.dart'; import 'package:flutter_svg/flutter_svg.dart'; +import 'package:hms_room_kit/src/widgets/chat_widgets/chat_text_field.dart'; +import 'package:hms_room_kit/src/widgets/chat_widgets/pin_chat_widget.dart'; import 'package:hmssdk_flutter/hmssdk_flutter.dart'; import 'package:provider/provider.dart'; import 'package:tuple/tuple.dart'; @@ -15,9 +16,6 @@ import 'package:hms_room_kit/hms_room_kit.dart'; import 'package:hms_room_kit/src/meeting/meeting_store.dart'; import 'package:hms_room_kit/src/enums/session_store_keys.dart'; import 'package:hms_room_kit/src/layout_api/hms_room_layout.dart'; -import 'package:hms_room_kit/src/widgets/common_widgets/hms_subheading_text.dart'; -import 'package:hms_room_kit/src/widgets/toasts/hms_toast.dart'; -import 'package:hms_room_kit/src/widgets/toasts/hms_toast_button.dart'; ///[OverlayChatComponent] is a component that is used to show the chat class OverlayChatComponent extends StatefulWidget { @@ -119,6 +117,18 @@ class _OverlayChatComponentState extends State { height: 8, ), + ///This renders the pinned message widget + Selector, int>>( + selector: (_, meetingStore) => Tuple2( + meetingStore.pinnedMessages, + meetingStore.pinnedMessages.length), + builder: (_, data, __) { + return PinChatWidget( + pinnedMessage: data.item1, + backgroundColor: HMSThemeColors.backgroundDim.withAlpha(64), + ); + }), + Selector( selector: (_, meetingStore) => meetingStore.chatControls["enabled"], @@ -131,70 +141,70 @@ class _OverlayChatComponentState extends State { children: [ ///This will be added in future versions /// - // Row( - // children: [ - // Padding( - // padding: const EdgeInsets.only(right: 8.0), - // child: HMSTitleText( - // text: "TO", - // textColor: HMSThemeColors - // .onSurfaceMediumEmphasis, - // fontSize: 12, - // fontWeight: FontWeight.w400, - // lineHeight: 16, - // letterSpacing: 0.4, - // ), - // ), - // Container( - // height: 24, - // decoration: BoxDecoration( - // borderRadius: const BorderRadius.all( - // Radius.circular(4)), - // color: HMSThemeColors.backgroundDim - // .withOpacity(0.64)), - // child: Padding( - // padding: const EdgeInsets.symmetric( - // horizontal: 4.0), - // child: Row( - // mainAxisAlignment: - // MainAxisAlignment.center, - // children: [ - // Padding( - // padding: const EdgeInsets.only( - // right: 4.0), - // child: SvgPicture.asset( - // "packages/hms_room_kit/lib/src/assets/icons/participants.svg", - // height: 16, - // width: 16, - // colorFilter: ColorFilter.mode( - // HMSThemeColors - // .onSurfaceMediumEmphasis, - // BlendMode.srcIn), - // ), - // ), - // HMSTitleText( - // text: "Everyone", - // fontSize: 12, - // lineHeight: 16, - // letterSpacing: 0.4, - // fontWeight: FontWeight.w400, - // textColor: HMSThemeColors - // .onPrimaryHighEmphasis), - // Padding( - // padding: const EdgeInsets.only( - // left: 4.0), - // child: Icon( - // Icons.keyboard_arrow_down, - // color: HMSThemeColors - // .onPrimaryHighEmphasis, - // size: 12, - // ), - // ), - // ], - // ), - // )) - // ], - // ), + Row( + children: [ + Padding( + padding: const EdgeInsets.only(right: 8.0), + child: HMSTitleText( + text: "TO", + textColor: HMSThemeColors + .onSurfaceMediumEmphasis, + fontSize: 12, + fontWeight: FontWeight.w400, + lineHeight: 16, + letterSpacing: 0.4, + ), + ), + Container( + height: 24, + decoration: BoxDecoration( + borderRadius: const BorderRadius.all( + Radius.circular(4)), + color: HMSThemeColors.backgroundDim + .withOpacity(0.64)), + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 4.0), + child: Row( + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Padding( + padding: const EdgeInsets.only( + right: 4.0), + child: SvgPicture.asset( + "packages/hms_room_kit/lib/src/assets/icons/participants.svg", + height: 16, + width: 16, + colorFilter: ColorFilter.mode( + HMSThemeColors + .onSurfaceMediumEmphasis, + BlendMode.srcIn), + ), + ), + HMSTitleText( + text: "Everyone", + fontSize: 12, + lineHeight: 16, + letterSpacing: 0.4, + fontWeight: FontWeight.w400, + textColor: HMSThemeColors + .onPrimaryHighEmphasis), + Padding( + padding: const EdgeInsets.only( + left: 4.0), + child: Icon( + Icons.keyboard_arrow_down, + color: HMSThemeColors + .onPrimaryHighEmphasis, + size: 12, + ), + ), + ], + ), + )) + ], + ), const SizedBox(), if (HMSRoomLayout.chatData?.realTimeControls ?.canDisableChat ?? @@ -307,147 +317,10 @@ class _OverlayChatComponentState extends State { ) : const SizedBox(); }), - - Selector( - selector: (_, meetingStore) => - meetingStore.chatControls["enabled"], - builder: (_, isChatEnabled, __) { - return isChatEnabled - ? Container( - height: 48, - width: MediaQuery.of(context).size.width - 16, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(8), - color: HMSThemeColors.surfaceDim), - child: TextField( - textAlignVertical: TextAlignVertical.center, - keyboardType: TextInputType.text, - cursorColor: HMSThemeColors.onSurfaceHighEmphasis, - onTapOutside: (event) => - FocusManager.instance.primaryFocus?.unfocus(), - onChanged: (value) { - setState(() {}); - }, - onSubmitted: (value) { - if (messageTextController.text.trim().isEmpty) { - Utilities.showToast("Message can't be empty"); - return; - } - _sendMessage(); - }, - textCapitalization: TextCapitalization.sentences, - textInputAction: TextInputAction.send, - style: HMSTextStyle.setTextStyle( - color: HMSThemeColors.onSurfaceHighEmphasis, - fontWeight: FontWeight.w400, - height: 20 / 14, - fontSize: 14, - letterSpacing: 0.25), - controller: messageTextController, - decoration: InputDecoration( - suffixIcon: IconButton( - onPressed: () { - if (messageTextController.text - .trim() - .isEmpty) { - Utilities.showToast( - "Message can't be empty"); - } - _sendMessage(); - }, - icon: SvgPicture.asset( - "packages/hms_room_kit/lib/src/assets/icons/send_message.svg", - height: 24, - width: 24, - colorFilter: ColorFilter.mode( - messageTextController.text.isEmpty - ? HMSThemeColors - .onSurfaceLowEmphasis - : HMSThemeColors - .onSurfaceHighEmphasis, - BlendMode.srcIn), - )), - border: InputBorder.none, - focusedBorder: OutlineInputBorder( - borderSide: BorderSide( - width: 2, - color: HMSThemeColors.primaryDefault), - borderRadius: const BorderRadius.all( - Radius.circular(8))), - hintStyle: HMSTextStyle.setTextStyle( - color: HMSThemeColors.onSurfaceLowEmphasis, - fontSize: 14, - height: 0.6, - letterSpacing: 0.25, - fontWeight: FontWeight.w400), - contentPadding: const EdgeInsets.only( - left: 16, right: 8, top: 0, bottom: 0), - hintText: "Send a message..."), - ), - ) - : HMSToast( - toastColor: HMSThemeColors.surfaceDefault, - toastPosition: 0, - subtitle: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - HMSSubheadingText( - text: "Chat paused", - textColor: HMSThemeColors.onSurfaceHighEmphasis, - lineHeight: 20, - letterSpacing: 0.1, - fontWeight: FontWeight.w400, - ), - HMSSubtitleText( - text: - "Chat has been paused by ${context.read().chatControls["updatedBy"].toString().substring(0, math.min(10, context.read().chatControls["updatedBy"].toString().length))}", - textColor: - HMSThemeColors.onSurfaceMediumEmphasis, - ) - ], - ), - action: (HMSRoomLayout.chatData?.realTimeControls - ?.canDisableChat ?? - false) - ? HMSToastButton( - buttonTitle: "Resume", - action: () { - context - .read() - .setSessionMetadataForKey( - key: SessionStoreKeyValues - .getNameFromMethod( - SessionStoreKey.chatState), - metadata: { - "enabled": true, - "updatedBy": { - "peerID": context - .read() - .localPeer - ?.peerId, - "userID": context - .read() - .localPeer - ?.customerUserId, - "userName": context - .read() - .localPeer - ?.name - }, - "updatedAt": DateTime.now() - .millisecondsSinceEpoch //unix timestamp in miliseconds - }); - }, - height: 36, - width: 88, - buttonColor: HMSThemeColors.primaryDefault, - textColor: - HMSThemeColors.onPrimaryHighEmphasis, - ) - : null, - ); - }), + ChatTextField( + sendMessage: _sendMessage, + toastBackgroundColor: HMSThemeColors.backgroundDim.withAlpha(64), + ) ], ), ), diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_bottom_navigation_bar.dart b/packages/hms_room_kit/lib/src/meeting/meeting_bottom_navigation_bar.dart index 455c1c79a..bb9155044 100644 --- a/packages/hms_room_kit/lib/src/meeting/meeting_bottom_navigation_bar.dart +++ b/packages/hms_room_kit/lib/src/meeting/meeting_bottom_navigation_bar.dart @@ -13,7 +13,6 @@ import 'package:hms_room_kit/src/widgets/tab_widgets/chat_participants_tab_bar.d import 'package:hms_room_kit/hms_room_kit.dart'; import 'package:hms_room_kit/src/common/utility_components.dart'; import 'package:hms_room_kit/src/enums/meeting_mode.dart'; -import 'package:hms_room_kit/src/enums/session_store_keys.dart'; import 'package:hms_room_kit/src/meeting/meeting_store.dart'; import 'package:hms_room_kit/src/widgets/bottom_sheets/app_utilities_bottom_sheet.dart'; import 'package:hms_room_kit/src/widgets/common_widgets/hms_embedded_button.dart'; @@ -190,13 +189,6 @@ class _MeetingBottomNavigationBarState } else { - context - .read() - .getSessionMetadata( - SessionStoreKeyValues - .getNameFromMethod( - SessionStoreKey - .pinnedMessageSessionKey)), context .read() .setNewMessageFalse(), diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_page.dart b/packages/hms_room_kit/lib/src/meeting/meeting_page.dart index 0df2a3260..7212157e1 100644 --- a/packages/hms_room_kit/lib/src/meeting/meeting_page.dart +++ b/packages/hms_room_kit/lib/src/meeting/meeting_page.dart @@ -33,6 +33,7 @@ import 'package:hms_room_kit/src/widgets/common_widgets/hms_circular_avatar.dart import 'package:hms_room_kit/src/widgets/common_widgets/hms_left_room_screen.dart'; import 'package:hms_room_kit/src/widgets/toasts/hms_recording_error_toast.dart'; import 'package:hms_room_kit/src/widgets/toasts/hms_chat_pause_resume_toast.dart'; +import 'package:hms_room_kit/src/widgets/toasts/hms_error_toast.dart'; ///[MeetingPage] is the main page of the meeting ///It takes the following parameters: @@ -88,7 +89,7 @@ class _MeetingPageState extends State { peer: toast.toastData, meetingStore: context.read(), ); - case HMSToastsType.errorToast: + case HMSToastsType.recordingErrorToast: return HMSRecordingErrorToast( recordingError: toast.toastData, meetingStore: context.read()); @@ -109,6 +110,11 @@ class _MeetingPageState extends State { isChatEnabled: toast.toastData["enabled"], userName: toast.toastData["updatedBy"], meetingStore: context.read()); + case HMSToastsType.errorToast: + return HMSErrorToast( + error: toast.toastData, meetingStore: context.read()); + default: + return const SizedBox(); } } 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 945016d95..0aa25df3c 100644 --- a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart +++ b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart @@ -428,9 +428,9 @@ class MeetingStore extends ChangeNotifier toast.hmsToastType == HMSToastsType.roleChangeToast && data.peerId == toast.toastData.peerId); break; - case HMSToastsType.errorToast: + case HMSToastsType.recordingErrorToast: toasts.removeWhere( - (toast) => toast.hmsToastType == HMSToastsType.errorToast); + (toast) => toast.hmsToastType == HMSToastsType.recordingErrorToast); break; case HMSToastsType.localScreenshareToast: toasts.removeWhere((toast) => @@ -444,6 +444,9 @@ class MeetingStore extends ChangeNotifier case HMSToastsType.chatPauseResumeToast: toasts.removeWhere((toast) => toast.hmsToastType == HMSToastsType.chatPauseResumeToast); + case HMSToastsType.errorToast: + toasts.removeWhere( + (toast) => toast.hmsToastType == HMSToastsType.errorToast); } notifyListeners(); } @@ -1759,6 +1762,7 @@ class MeetingStore extends ChangeNotifier data.forEach((element) => pinnedMessages.add({ "id": element["id"], "text": element["text"], + "pinnedBy": element["pinnedBy"] })); } } @@ -1964,6 +1968,32 @@ class MeetingStore extends ChangeNotifier metadata: blackListedUserIds); } + ///[unpinMessage] method is used to unpin a message in the session + void unpinMessage(String messageId) { + pinnedMessages.removeWhere((element) => element["id"] == messageId); + setSessionMetadataForKey( + key: SessionStoreKeyValues.getNameFromMethod( + SessionStoreKey.pinnedMessageSessionKey), + metadata: pinnedMessages); + } + + ///[pinMessage] method is used to pin a message for the session + void pinMessage(HMSMessage message) { + if (pinnedMessages.length == 3) { + pinnedMessages.removeAt(0); + } + var data = List.from(pinnedMessages); + data.add({ + "id": message.messageId, + "text": "${message.sender?.name}: ${message.message}", + "pinnedBy": localPeer?.name, + }); + setSessionMetadataForKey( + key: SessionStoreKeyValues.getNameFromMethod( + SessionStoreKey.pinnedMessageSessionKey), + metadata: data); + } + void getSessionMetadata(String key) async { dynamic result = await _hmsSessionStore?.getSessionMetadataForKey(key: key); if (result is HMSException) { @@ -2273,7 +2303,7 @@ class MeetingStore extends ChangeNotifier break; case HMSActionResultListenerMethod.startRtmpOrRecording: toasts.add(HMSToastModel(hmsException, - hmsToastType: HMSToastsType.errorToast)); + hmsToastType: HMSToastsType.recordingErrorToast)); recordingType["browser"] = HMSRecordingState.failed; notifyListeners(); break; @@ -2312,7 +2342,9 @@ class MeetingStore extends ChangeNotifier Utilities.showToast("Change role failed"); break; case HMSActionResultListenerMethod.setSessionMetadataForKey: - Utilities.showToast("Set session metadata failed"); + toasts.add(HMSToastModel(hmsException, + hmsToastType: HMSToastsType.errorToast)); + notifyListeners(); break; case HMSActionResultListenerMethod.sendHLSTimedMetadata: // TODO: Handle this case. diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/chat_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/chat_bottom_sheet.dart index d71fcb7c7..3ec06526b 100644 --- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/chat_bottom_sheet.dart +++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/chat_bottom_sheet.dart @@ -1,20 +1,16 @@ //Package imports import 'package:flutter/material.dart'; -import 'package:flutter_linkify/flutter_linkify.dart'; -import 'package:flutter_svg/svg.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:tuple/tuple.dart'; import 'package:hmssdk_flutter/hmssdk_flutter.dart'; -import 'package:url_launcher/url_launcher.dart'; //Project imports -import 'package:hms_room_kit/hms_room_kit.dart'; -import 'package:hms_room_kit/src/enums/session_store_keys.dart'; import 'package:hms_room_kit/src/widgets/chat_widgets/hms_empty_chat_widget.dart'; import 'package:hms_room_kit/src/widgets/common_widgets/message_container.dart'; import 'package:hms_room_kit/src/meeting/meeting_store.dart'; import 'package:hms_room_kit/src/widgets/chat_widgets/chat_text_field.dart'; +import 'package:hms_room_kit/src/widgets/chat_widgets/pin_chat_widget.dart'; ///[ChatBottomSheet] is a bottom sheet that is used to render the bottom sheet for chat class ChatBottomSheet extends StatefulWidget { @@ -106,114 +102,7 @@ class _ChatBottomSheetState extends State { child: Column(children: [ ///If there is a pinned chat if (data.item3.isNotEmpty) - Padding( - padding: const EdgeInsets.only(bottom: 8.0), - child: Container( - constraints: - const BoxConstraints(maxHeight: 150), - decoration: BoxDecoration( - borderRadius: - BorderRadius.circular(8), - color: HMSThemeColors.surfaceDefault), - child: SingleChildScrollView( - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Row( - children: [ - SizedBox( - width: - MediaQuery.of(context) - .size - .width * - 0.75, - child: SelectableLinkify( - text: data.item3[0] - ["text"], - onOpen: (link) async { - Uri url = - Uri.parse(link.url); - if (await canLaunchUrl( - url)) { - await launchUrl(url, - mode: LaunchMode - .externalApplication); - } - }, - options: - const LinkifyOptions( - humanize: false), - style: HMSTextStyle - .setTextStyle( - fontSize: 14.0, - color: HMSThemeColors - .onSurfaceHighEmphasis, - letterSpacing: 0.25, - height: 20 / 14, - fontWeight: - FontWeight.w400, - ), - linkStyle: HMSTextStyle - .setTextStyle( - fontSize: 14.0, - color: HMSThemeColors - .primaryDefault, - letterSpacing: - 0.25, - height: 20 / 14, - fontWeight: - FontWeight - .w400), - ), - ), - const SizedBox(width: 8), - SvgPicture.asset( - "packages/hms_room_kit/lib/src/assets/icons/unpin.svg", - height: 20, - width: 20, - colorFilter: ColorFilter.mode( - HMSThemeColors - .onSurfaceMediumEmphasis, - BlendMode.srcIn), - ), - ], - ), - Row( - children: [ - GestureDetector( - onTap: () { - context - .read< - MeetingStore>() - .setSessionMetadataForKey( - key: SessionStoreKeyValues - .getNameFromMethod( - SessionStoreKey - .pinnedMessageSessionKey), - metadata: null); - }, - child: SvgPicture.asset( - "packages/hms_room_kit/lib/src/assets/icons/close.svg", - height: 20, - width: 20, - colorFilter: - ColorFilter.mode( - HMSThemeColors - .onSurfaceMediumEmphasis, - BlendMode - .srcIn), - )), - ], - ) - ], - ), - ), - ), - ), - ), + PinChatWidget(pinnedMessage: data.item3), /// List containing chats Expanded( diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/chat_utilities_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/chat_utilities_bottom_sheet.dart index b597d2386..f8f0c39e1 100644 --- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/chat_utilities_bottom_sheet.dart +++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/chat_utilities_bottom_sheet.dart @@ -1,5 +1,6 @@ ///Package imports import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:hmssdk_flutter/hmssdk_flutter.dart'; import 'package:provider/provider.dart'; @@ -76,13 +77,7 @@ class _ChatUtilitiesBottomSheetState extends State { horizontalTitleGap: 2, onTap: () async { Navigator.pop(context); - // context - // .read() - // .setSessionMetadataForKey( - // key: SessionStoreKeyValues - // .getNameFromMethod(SessionStoreKey - // .pinnedMessageSessionKey), - // metadata: "${senderName!}: $message") + context.read().pinMessage(widget.message); }, contentPadding: EdgeInsets.zero, leading: SvgPicture.asset( @@ -99,6 +94,28 @@ class _ChatUtilitiesBottomSheetState extends State { fontWeight: FontWeight.w600, textColor: HMSThemeColors.onSurfaceHighEmphasis)), + ListTile( + horizontalTitleGap: 2, + onTap: () async { + Navigator.pop(context); + await Clipboard.setData( + ClipboardData(text: widget.message.message)); + }, + contentPadding: EdgeInsets.zero, + leading: SvgPicture.asset( + "packages/hms_room_kit/lib/src/assets/icons/copy.svg", + semanticsLabel: "fl_copy_message_icon", + height: 20, + width: 20, + colorFilter: ColorFilter.mode( + HMSThemeColors.onSurfaceHighEmphasis, BlendMode.srcIn), + ), + title: HMSSubheadingText( + text: "Copy Text", + letterSpacing: 0.1, + fontWeight: FontWeight.w600, + textColor: HMSThemeColors.onSurfaceHighEmphasis)), + if (HMSRoomLayout.chatData?.realTimeControls?.canBlockUser ?? false) ListTile( horizontalTitleGap: 2, diff --git a/packages/hms_room_kit/lib/src/widgets/chat_widgets/chat_text_field.dart b/packages/hms_room_kit/lib/src/widgets/chat_widgets/chat_text_field.dart index b18cac4ef..7127f70db 100644 --- a/packages/hms_room_kit/lib/src/widgets/chat_widgets/chat_text_field.dart +++ b/packages/hms_room_kit/lib/src/widgets/chat_widgets/chat_text_field.dart @@ -20,8 +20,10 @@ import 'package:hms_room_kit/src/widgets/toasts/hms_toast_button.dart'; ///It renders the text field or relevant UI based on chat State class ChatTextField extends StatefulWidget { final Function sendMessage; - - const ChatTextField({Key? key, required this.sendMessage}) : super(key: key); + final Color? toastBackgroundColor; + const ChatTextField( + {Key? key, required this.sendMessage, this.toastBackgroundColor}) + : super(key: key); @override State createState() => _ChatTextFieldState(); @@ -59,8 +61,8 @@ class _ChatTextFieldState extends State { padding: const EdgeInsets.only(top: 8.0), child: Container( decoration: BoxDecoration( - borderRadius: BorderRadius.circular(8), - color: HMSThemeColors.surfaceDefault), + borderRadius: BorderRadius.circular(8), + ), child: chatControls.item3.contains(context .read() .localPeer @@ -68,7 +70,9 @@ class _ChatTextFieldState extends State { ? Row( children: [ Expanded( - child: SizedBox( + child: Container( + color: widget.toastBackgroundColor ?? + HMSThemeColors.surfaceDefault, height: 36, child: Center( child: HMSSubheadingText( @@ -84,90 +88,94 @@ class _ChatTextFieldState extends State { : Row( children: [ Expanded( - child: TextField( - textCapitalization: - TextCapitalization.sentences, - textInputAction: TextInputAction.send, - onTapOutside: (event) => FocusManager - .instance.primaryFocus - ?.unfocus(), - onSubmitted: (value) { - widget.sendMessage(messageTextController); - messageTextController.clear(); - }, - onChanged: (value) { - setState(() {}); - }, - style: HMSTextStyle.setTextStyle( - color: HMSThemeColors - .onSurfaceHighEmphasis, - fontWeight: FontWeight.w400, - height: 20 / 14, - fontSize: 14, - letterSpacing: 0.25), - controller: messageTextController, - decoration: InputDecoration( - suffixIcon: IconButton( - splashRadius: 1, - onPressed: () { - if (messageTextController.text - .trim() - .isEmpty) { - Utilities.showToast( - "Message can't be empty"); - } - widget.sendMessage( - messageTextController); - messageTextController.clear(); - }, - icon: SvgPicture.asset( - "packages/hms_room_kit/lib/src/assets/icons/send_message.svg", - height: 24, - width: 24, - colorFilter: ColorFilter.mode( - messageTextController - .text - .trim() - .isEmpty - ? HMSThemeColors - .onSurfaceLowEmphasis - : HMSThemeColors - .onSurfaceHighEmphasis, - BlendMode.srcIn), - )), - border: InputBorder.none, - focusedBorder: OutlineInputBorder( - borderSide: BorderSide( - width: 2, - color: HMSThemeColors - .primaryDefault), - borderRadius: - const BorderRadius.all( - Radius.circular(8))), - enabledBorder: InputBorder.none, - errorBorder: InputBorder.none, - disabledBorder: InputBorder.none, - hintStyle: HMSTextStyle.setTextStyle( - color: HMSThemeColors - .onSurfaceLowEmphasis, - fontSize: 14, - height: 20 / 14, - letterSpacing: 0.25, - fontWeight: FontWeight.w400), - contentPadding: const EdgeInsets.only( - left: 16, - bottom: 8, - top: 12, - right: 8), - hintText: HMSRoomLayout - .chatData?.messagePlaceholder ?? - "Send a message..."), + child: Container( + color: HMSThemeColors.surfaceDefault, + child: TextField( + textCapitalization: + TextCapitalization.sentences, + textInputAction: TextInputAction.send, + onTapOutside: (event) => FocusManager + .instance.primaryFocus + ?.unfocus(), + onSubmitted: (value) { + widget + .sendMessage(messageTextController); + messageTextController.clear(); + }, + onChanged: (value) { + setState(() {}); + }, + style: HMSTextStyle.setTextStyle( + color: HMSThemeColors + .onSurfaceHighEmphasis, + fontWeight: FontWeight.w400, + height: 20 / 14, + fontSize: 14, + letterSpacing: 0.25), + controller: messageTextController, + decoration: InputDecoration( + suffixIcon: IconButton( + splashRadius: 1, + onPressed: () { + if (messageTextController.text + .trim() + .isEmpty) { + Utilities.showToast( + "Message can't be empty"); + } + widget.sendMessage( + messageTextController); + messageTextController.clear(); + }, + icon: SvgPicture.asset( + "packages/hms_room_kit/lib/src/assets/icons/send_message.svg", + height: 24, + width: 24, + colorFilter: ColorFilter.mode( + messageTextController.text + .trim() + .isEmpty + ? HMSThemeColors + .onSurfaceLowEmphasis + : HMSThemeColors + .onSurfaceHighEmphasis, + BlendMode.srcIn), + )), + border: InputBorder.none, + focusedBorder: OutlineInputBorder( + borderSide: BorderSide( + width: 2, + color: HMSThemeColors + .primaryDefault), + borderRadius: + const BorderRadius.all( + Radius.circular(8))), + enabledBorder: InputBorder.none, + errorBorder: InputBorder.none, + disabledBorder: InputBorder.none, + hintStyle: HMSTextStyle.setTextStyle( + color: HMSThemeColors + .onSurfaceLowEmphasis, + fontSize: 14, + height: 20 / 14, + letterSpacing: 0.25, + fontWeight: FontWeight.w400), + contentPadding: const EdgeInsets.only( + left: 16, + bottom: 8, + top: 12, + right: 8), + hintText: HMSRoomLayout.chatData + ?.messagePlaceholder ?? + "Send a message..."), + ), ), ) ], ))) : HMSToast( - toastColor: HMSThemeColors.surfaceDefault, + toastColor: widget.toastBackgroundColor ?? + HMSThemeColors.surfaceDefault, toastPosition: 0, subtitle: Column( crossAxisAlignment: CrossAxisAlignment.start, diff --git a/packages/hms_room_kit/lib/src/widgets/chat_widgets/pin_chat_widget.dart b/packages/hms_room_kit/lib/src/widgets/chat_widgets/pin_chat_widget.dart new file mode 100644 index 000000000..4998eac4c --- /dev/null +++ b/packages/hms_room_kit/lib/src/widgets/chat_widgets/pin_chat_widget.dart @@ -0,0 +1,165 @@ +///Package imports +import 'package:dots_indicator/dots_indicator.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_linkify/flutter_linkify.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:provider/provider.dart'; +import 'package:url_launcher/url_launcher.dart'; + +///Project imports +import 'package:hms_room_kit/hms_room_kit.dart'; +import 'package:hms_room_kit/src/layout_api/hms_room_layout.dart'; +import 'package:hms_room_kit/src/meeting/meeting_store.dart'; + +///[PinChatWidget] renders the pinned message widget +class PinChatWidget extends StatefulWidget { + final List pinnedMessage; + final Color? backgroundColor; + + const PinChatWidget( + {Key? key, required this.pinnedMessage, this.backgroundColor}) + : super(key: key); + + @override + State createState() => _PinChatWidgetState(); +} + +class _PinChatWidgetState extends State { + int currentPage = 0; + PageController? _pageController; + bool isExpanded = false; + + @override + void initState() { + super.initState(); + _pageController = PageController(); + } + + @override + void dispose() { + _pageController?.dispose(); + super.dispose(); + } + + void setCurrentPage(int page) { + _pageController?.animateToPage(page, + duration: const Duration(milliseconds: 100), curve: Curves.easeInOut); + setState(() { + currentPage = page; + }); + } + + void toggleExpand() { + setState(() { + isExpanded = !isExpanded; + }); + } + + @override + Widget build(BuildContext context) { + return GestureDetector( + onTap: () => toggleExpand(), + child: Padding( + padding: const EdgeInsets.only(bottom: 8.0), + child: Row( + children: [ + AnimatedContainer( + height: MediaQuery.of(context).size.height * + (isExpanded ? 0.13 : 0.07), + width: (HMSRoomLayout.chatData?.allowPinningMessages ?? false) + ? MediaQuery.of(context).size.width * 0.85 + : MediaQuery.of(context).size.width * 0.9, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(8), + color: + widget.backgroundColor ?? HMSThemeColors.surfaceDefault), + duration: const Duration(milliseconds: 0), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + if (widget.pinnedMessage.length > 1) + DotsIndicator( + axis: Axis.vertical, + mainAxisSize: MainAxisSize.min, + dotsCount: widget.pinnedMessage.length, + position: currentPage > widget.pinnedMessage.length + ? 0 + : currentPage, + decorator: DotsDecorator( + spacing: const EdgeInsets.only(bottom: 3.0, right: 8), + size: Size(2.0, isExpanded ? 24 : 9.0), + activeSize: Size(2.0, isExpanded ? 24 : 9.0), + color: HMSThemeColors.onSurfaceLowEmphasis, + activeColor: HMSThemeColors.onSurfaceHighEmphasis, + activeShape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(16.0)), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(16.0)), + ), + onTap: (position) => setCurrentPage(position), + ), + Expanded( + child: PageView.builder( + scrollDirection: Axis.vertical, + controller: _pageController, + itemCount: widget.pinnedMessage.length, + physics: const PageScrollPhysics(), + onPageChanged: (value) => setCurrentPage(value), + itemBuilder: (context, index) => SelectableLinkify( + maxLines: 2, + scrollPhysics: isExpanded + ? const BouncingScrollPhysics() + : const NeverScrollableScrollPhysics(), + text: widget.pinnedMessage[index]["text"], + onOpen: (link) async { + Uri url = Uri.parse(link.url); + if (await canLaunchUrl(url)) { + await launchUrl(url, + mode: LaunchMode.externalApplication); + } + }, + onTap: () => toggleExpand(), + options: const LinkifyOptions(humanize: false), + style: HMSTextStyle.setTextStyle( + fontSize: 14.0, + color: HMSThemeColors.onSurfaceHighEmphasis, + letterSpacing: 0.25, + height: 20 / 14, + fontWeight: FontWeight.w400, + ), + linkStyle: HMSTextStyle.setTextStyle( + fontSize: 14.0, + color: HMSThemeColors.primaryDefault, + letterSpacing: 0.25, + height: 20 / 14, + fontWeight: FontWeight.w400), + ), + ), + ), + ], + ), + ), + ), + const SizedBox(width: 8), + if (HMSRoomLayout.chatData?.allowPinningMessages ?? false) + GestureDetector( + onTap: () => context + .read() + .unpinMessage(widget.pinnedMessage[currentPage]["id"]), + child: SvgPicture.asset( + "packages/hms_room_kit/lib/src/assets/icons/unpin.svg", + height: 20, + width: 20, + colorFilter: ColorFilter.mode( + HMSThemeColors.onSurfaceMediumEmphasis, BlendMode.srcIn), + ), + ), + ], + ), + ), + ); + } +} diff --git a/packages/hms_room_kit/lib/src/widgets/toasts/hms_error_toast.dart b/packages/hms_room_kit/lib/src/widgets/toasts/hms_error_toast.dart new file mode 100644 index 000000000..56d8494f4 --- /dev/null +++ b/packages/hms_room_kit/lib/src/widgets/toasts/hms_error_toast.dart @@ -0,0 +1,48 @@ +///Package imports +import 'package:flutter/material.dart'; +import 'package:hmssdk_flutter/hmssdk_flutter.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/common_widgets/hms_subheading_text.dart'; +import 'package:hms_room_kit/src/widgets/toasts/hms_toast.dart'; +import 'package:hms_room_kit/src/widgets/toasts/hms_toasts_type.dart'; + +///[HMSRecordingErrorToast] renders the toast when recording fails to start +class HMSErrorToast extends StatelessWidget { + final HMSException error; + final MeetingStore meetingStore; + final Color? toastColor; + final double? toastPosition; + const HMSErrorToast( + {super.key, + required this.error, + required this.meetingStore, + this.toastColor, + this.toastPosition}); + + @override + Widget build(BuildContext context) { + return HMSToast( + toastColor: toastColor, + toastPosition: toastPosition, + subtitle: HMSSubheadingText( + text: error.description, + textColor: HMSThemeColors.onSurfaceHighEmphasis, + fontWeight: FontWeight.w600, + letterSpacing: 0.1, + ), + cancelToastButton: IconButton( + icon: Icon( + Icons.close, + color: HMSThemeColors.onSurfaceHighEmphasis, + size: 24, + ), + onPressed: () { + meetingStore.removeToast(HMSToastsType.errorToast); + }, + ), + ); + } +} diff --git a/packages/hms_room_kit/lib/src/widgets/toasts/hms_recording_error_toast.dart b/packages/hms_room_kit/lib/src/widgets/toasts/hms_recording_error_toast.dart index b7a94f937..ff1ec73be 100644 --- a/packages/hms_room_kit/lib/src/widgets/toasts/hms_recording_error_toast.dart +++ b/packages/hms_room_kit/lib/src/widgets/toasts/hms_recording_error_toast.dart @@ -46,7 +46,7 @@ class HMSRecordingErrorToast extends StatelessWidget { buttonTitle: "Retry", action: () { meetingStore.startRtmpOrRecording(toRecord: true); - meetingStore.removeToast(HMSToastsType.errorToast); + meetingStore.removeToast(HMSToastsType.recordingErrorToast); }, height: 36, buttonColor: HMSThemeColors.secondaryDefault, @@ -59,7 +59,7 @@ class HMSRecordingErrorToast extends StatelessWidget { size: 24, ), onPressed: () { - meetingStore.removeToast(HMSToastsType.errorToast); + meetingStore.removeToast(HMSToastsType.recordingErrorToast); }, ), ); diff --git a/packages/hms_room_kit/lib/src/widgets/toasts/hms_toasts_type.dart b/packages/hms_room_kit/lib/src/widgets/toasts/hms_toasts_type.dart index 747e365ae..f366d16d0 100644 --- a/packages/hms_room_kit/lib/src/widgets/toasts/hms_toasts_type.dart +++ b/packages/hms_room_kit/lib/src/widgets/toasts/hms_toasts_type.dart @@ -1,8 +1,9 @@ ///[HMSToastsType] is used to define the type of toast to be shown. enum HMSToastsType { roleChangeToast, - errorToast, + recordingErrorToast, localScreenshareToast, roleChangeDeclineToast, chatPauseResumeToast, + errorToast } diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index 00956f59c..cb0c5b7b7 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: @@ -298,10 +298,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: @@ -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: @@ -386,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: @@ -466,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" - 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: @@ -618,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: @@ -655,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: @@ -687,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: @@ -783,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: @@ -847,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: @@ -871,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" From 5b0d862c7e53704e565325f3ba3ebc7c70ddeed8 Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Mon, 8 Jan 2024 11:37:01 +0000 Subject: [PATCH 12/18] =?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 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index cb0c5b7b7..098334077 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" From 35c4ddd155d9192486faa45a86d1dcd9c08bfd69 Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Mon, 8 Jan 2024 18:44:43 +0530 Subject: [PATCH 13/18] Fixed pinned message bug on iOS --- .../hls_viewer/overlay_chat_component.dart | 100 ++++++--- .../bottom_sheets/chat_bottom_sheet.dart | 6 +- .../widgets/chat_widgets/pin_chat_widget.dart | 207 +++++++++--------- .../src/widgets/toasts/hms_error_toast.dart | 6 +- .../lib/src/widgets/toasts/hms_toast.dart | 1 + .../example/ExampleAppChangelog.txt | 6 + .../example/android/app/build.gradle | 4 +- .../hmssdk_flutter/example/ios/Gemfile.lock | 12 +- .../Actions/HMSSessionStoreAction.swift | 2 + .../Classes/SwiftHmssdkFlutterPlugin.swift | 2 + packages/hmssdk_flutter/pubspec.lock | 26 +-- 11 files changed, 218 insertions(+), 154 deletions(-) diff --git a/packages/hms_room_kit/lib/src/hls_viewer/overlay_chat_component.dart b/packages/hms_room_kit/lib/src/hls_viewer/overlay_chat_component.dart index 296cb36de..3c1b4d4db 100644 --- a/packages/hms_room_kit/lib/src/hls_viewer/overlay_chat_component.dart +++ b/packages/hms_room_kit/lib/src/hls_viewer/overlay_chat_component.dart @@ -4,6 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_linkify/flutter_linkify.dart'; import 'package:flutter_svg/flutter_svg.dart'; +import 'package:hms_room_kit/src/widgets/bottom_sheets/chat_utilities_bottom_sheet.dart'; import 'package:hms_room_kit/src/widgets/chat_widgets/chat_text_field.dart'; import 'package:hms_room_kit/src/widgets/chat_widgets/pin_chat_widget.dart'; import 'package:hmssdk_flutter/hmssdk_flutter.dart'; @@ -74,39 +75,78 @@ class _OverlayChatComponentState extends State { shrinkWrap: true, itemCount: data.item1.length, itemBuilder: (_, index) { - return Column( - crossAxisAlignment: CrossAxisAlignment.start, + return Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - HMSTitleText( - text: data.item1[index].sender?.name ?? - "Anonymous", - textColor: Colors.white, - fontSize: 14, - lineHeight: 20, - letterSpacing: 0.1, - ), - const SizedBox( - height: 2, + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + HMSTitleText( + text: data.item1[index].sender?.name ?? + "Anonymous", + textColor: Colors.white, + fontSize: 14, + lineHeight: 20, + letterSpacing: 0.1, + ), + const SizedBox( + height: 2, + ), + SelectableLinkify( + text: data.item1[index].message, + onOpen: (link) async { + Uri url = Uri.parse(link.url); + if (await canLaunchUrl(url)) { + await launchUrl(url, + mode: LaunchMode + .externalApplication); + } + }, + scrollPhysics: + const NeverScrollableScrollPhysics(), + options: + const LinkifyOptions(humanize: false), + style: HMSTextStyle.setTextStyle( + color: Colors.white, + fontSize: 14, + height: 20 / 14, + letterSpacing: 0.25, + ), + ), + const SizedBox( + height: 8, + ) + ], + ), ), - SelectableLinkify( - text: data.item1[index].message, - onOpen: (link) async { - Uri url = Uri.parse(link.url); - if (await canLaunchUrl(url)) { - await launchUrl(url, - mode: LaunchMode.externalApplication); - } + GestureDetector( + onTap: () { + 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: ChatUtilitiesBottomSheet( + message: data.item1[index], + )), + ); }, - options: const LinkifyOptions(humanize: false), - style: HMSTextStyle.setTextStyle( - color: Colors.white, - fontSize: 14, - height: 20 / 14, - letterSpacing: 0.25, + child: SvgPicture.asset( + "packages/hms_room_kit/lib/src/assets/icons/more.svg", + height: 20, + width: 20, + colorFilter: ColorFilter.mode( + HMSThemeColors.onSurfaceMediumEmphasis, + BlendMode.srcIn), ), - ), - const SizedBox( - height: 8, ) ], ); @@ -124,7 +164,7 @@ class _OverlayChatComponentState extends State { meetingStore.pinnedMessages.length), builder: (_, data, __) { return PinChatWidget( - pinnedMessage: data.item1, + pinnedMessage: data.item1.reversed.toList(), backgroundColor: HMSThemeColors.backgroundDim.withAlpha(64), ); }), diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/chat_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/chat_bottom_sheet.dart index 3ec06526b..4185d0249 100644 --- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/chat_bottom_sheet.dart +++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/chat_bottom_sheet.dart @@ -100,9 +100,9 @@ class _ChatBottomSheetState extends State { child: Center(child: HMSEmptyChatWidget())) : Expanded( child: Column(children: [ - ///If there is a pinned chat - if (data.item3.isNotEmpty) - PinChatWidget(pinnedMessage: data.item3), + PinChatWidget( + pinnedMessage: + data.item3.reversed.toList()), /// List containing chats Expanded( diff --git a/packages/hms_room_kit/lib/src/widgets/chat_widgets/pin_chat_widget.dart b/packages/hms_room_kit/lib/src/widgets/chat_widgets/pin_chat_widget.dart index 4998eac4c..15690750f 100644 --- a/packages/hms_room_kit/lib/src/widgets/chat_widgets/pin_chat_widget.dart +++ b/packages/hms_room_kit/lib/src/widgets/chat_widgets/pin_chat_widget.dart @@ -57,109 +57,118 @@ class _PinChatWidgetState extends State { @override Widget build(BuildContext context) { - return GestureDetector( - onTap: () => toggleExpand(), - child: Padding( - padding: const EdgeInsets.only(bottom: 8.0), - child: Row( - children: [ - AnimatedContainer( - height: MediaQuery.of(context).size.height * - (isExpanded ? 0.13 : 0.07), - width: (HMSRoomLayout.chatData?.allowPinningMessages ?? false) - ? MediaQuery.of(context).size.width * 0.85 - : MediaQuery.of(context).size.width * 0.9, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(8), - color: - widget.backgroundColor ?? HMSThemeColors.surfaceDefault), - duration: const Duration(milliseconds: 0), - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - if (widget.pinnedMessage.length > 1) - DotsIndicator( - axis: Axis.vertical, - mainAxisSize: MainAxisSize.min, - dotsCount: widget.pinnedMessage.length, - position: currentPage > widget.pinnedMessage.length - ? 0 - : currentPage, - decorator: DotsDecorator( - spacing: const EdgeInsets.only(bottom: 3.0, right: 8), - size: Size(2.0, isExpanded ? 24 : 9.0), - activeSize: Size(2.0, isExpanded ? 24 : 9.0), - color: HMSThemeColors.onSurfaceLowEmphasis, - activeColor: HMSThemeColors.onSurfaceHighEmphasis, - activeShape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(16.0)), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(16.0)), - ), - onTap: (position) => setCurrentPage(position), - ), - Expanded( - child: PageView.builder( - scrollDirection: Axis.vertical, - controller: _pageController, - itemCount: widget.pinnedMessage.length, - physics: const PageScrollPhysics(), - onPageChanged: (value) => setCurrentPage(value), - itemBuilder: (context, index) => SelectableLinkify( - maxLines: 2, - scrollPhysics: isExpanded - ? const BouncingScrollPhysics() - : const NeverScrollableScrollPhysics(), - text: widget.pinnedMessage[index]["text"], - onOpen: (link) async { - Uri url = Uri.parse(link.url); - if (await canLaunchUrl(url)) { - await launchUrl(url, - mode: LaunchMode.externalApplication); - } - }, - onTap: () => toggleExpand(), - options: const LinkifyOptions(humanize: false), - style: HMSTextStyle.setTextStyle( - fontSize: 14.0, - color: HMSThemeColors.onSurfaceHighEmphasis, - letterSpacing: 0.25, - height: 20 / 14, - fontWeight: FontWeight.w400, + ///If there are no pinnedMessage we render an empty SizedBox + ///else we render the pinned message widget + return widget.pinnedMessage.isEmpty + ? const SizedBox() + : GestureDetector( + onTap: () => toggleExpand(), + child: Padding( + padding: const EdgeInsets.only(bottom: 8.0), + child: Row( + children: [ + AnimatedContainer( + height: MediaQuery.of(context).size.height * + (isExpanded ? 0.13 : 0.07), + width: + (HMSRoomLayout.chatData?.allowPinningMessages ?? false) + ? MediaQuery.of(context).size.width * 0.85 + : MediaQuery.of(context).size.width * 0.9, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(8), + color: widget.backgroundColor ?? + HMSThemeColors.surfaceDefault), + duration: const Duration(milliseconds: 0), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + if (widget.pinnedMessage.length > 1) + DotsIndicator( + axis: Axis.vertical, + mainAxisSize: MainAxisSize.min, + dotsCount: widget.pinnedMessage.length, + position: + currentPage > widget.pinnedMessage.length + ? 0 + : currentPage, + decorator: DotsDecorator( + spacing: const EdgeInsets.only( + bottom: 3.0, right: 8), + size: Size(2.0, isExpanded ? 24 : 9.0), + activeSize: Size(2.0, isExpanded ? 24 : 9.0), + color: HMSThemeColors.onSurfaceLowEmphasis, + activeColor: + HMSThemeColors.onSurfaceHighEmphasis, + activeShape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(16.0)), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(16.0)), + ), + onTap: (position) => setCurrentPage(position), + ), + Expanded( + child: PageView.builder( + scrollDirection: Axis.vertical, + controller: _pageController, + itemCount: widget.pinnedMessage.length, + physics: const PageScrollPhysics(), + onPageChanged: (value) => setCurrentPage(value), + itemBuilder: (context, index) => + SelectableLinkify( + maxLines: 2, + scrollPhysics: isExpanded + ? const BouncingScrollPhysics() + : const NeverScrollableScrollPhysics(), + text: widget.pinnedMessage[index]["text"], + onOpen: (link) async { + Uri url = Uri.parse(link.url); + if (await canLaunchUrl(url)) { + await launchUrl(url, + mode: LaunchMode.externalApplication); + } + }, + onTap: () => toggleExpand(), + options: const LinkifyOptions(humanize: false), + style: HMSTextStyle.setTextStyle( + fontSize: 14.0, + color: HMSThemeColors.onSurfaceHighEmphasis, + letterSpacing: 0.25, + height: 20 / 14, + fontWeight: FontWeight.w400, + ), + linkStyle: HMSTextStyle.setTextStyle( + fontSize: 14.0, + color: HMSThemeColors.primaryDefault, + letterSpacing: 0.25, + height: 20 / 14, + fontWeight: FontWeight.w400), + ), + ), ), - linkStyle: HMSTextStyle.setTextStyle( - fontSize: 14.0, - color: HMSThemeColors.primaryDefault, - letterSpacing: 0.25, - height: 20 / 14, - fontWeight: FontWeight.w400), - ), + ], + ), + ), + ), + const SizedBox(width: 8), + if (HMSRoomLayout.chatData?.allowPinningMessages ?? false) + GestureDetector( + onTap: () => context.read().unpinMessage( + widget.pinnedMessage[currentPage]["id"]), + child: SvgPicture.asset( + "packages/hms_room_kit/lib/src/assets/icons/unpin.svg", + height: 20, + width: 20, + colorFilter: ColorFilter.mode( + HMSThemeColors.onSurfaceMediumEmphasis, + BlendMode.srcIn), ), ), - ], - ), + ], ), ), - const SizedBox(width: 8), - if (HMSRoomLayout.chatData?.allowPinningMessages ?? false) - GestureDetector( - onTap: () => context - .read() - .unpinMessage(widget.pinnedMessage[currentPage]["id"]), - child: SvgPicture.asset( - "packages/hms_room_kit/lib/src/assets/icons/unpin.svg", - height: 20, - width: 20, - colorFilter: ColorFilter.mode( - HMSThemeColors.onSurfaceMediumEmphasis, BlendMode.srcIn), - ), - ), - ], - ), - ), - ); + ); } } diff --git a/packages/hms_room_kit/lib/src/widgets/toasts/hms_error_toast.dart b/packages/hms_room_kit/lib/src/widgets/toasts/hms_error_toast.dart index 56d8494f4..a57d87924 100644 --- a/packages/hms_room_kit/lib/src/widgets/toasts/hms_error_toast.dart +++ b/packages/hms_room_kit/lib/src/widgets/toasts/hms_error_toast.dart @@ -1,3 +1,6 @@ +///Dart imports +import 'dart:math' as math; + ///Package imports import 'package:flutter/material.dart'; import 'package:hmssdk_flutter/hmssdk_flutter.dart'; @@ -28,7 +31,8 @@ class HMSErrorToast extends StatelessWidget { toastColor: toastColor, toastPosition: toastPosition, subtitle: HMSSubheadingText( - text: error.description, + text: error.description + .substring(0, math.min(50, error.description.length)), textColor: HMSThemeColors.onSurfaceHighEmphasis, fontWeight: FontWeight.w600, letterSpacing: 0.1, diff --git a/packages/hms_room_kit/lib/src/widgets/toasts/hms_toast.dart b/packages/hms_room_kit/lib/src/widgets/toasts/hms_toast.dart index 814d1cd5e..392fd66bc 100644 --- a/packages/hms_room_kit/lib/src/widgets/toasts/hms_toast.dart +++ b/packages/hms_room_kit/lib/src/widgets/toasts/hms_toast.dart @@ -37,6 +37,7 @@ class _HMSToastState extends State { return Padding( padding: EdgeInsets.only(bottom: widget.toastPosition ?? 68), child: AlertDialog( + backgroundColor: widget.toastColor, insetPadding: const EdgeInsets.all(0), alignment: Alignment.bottomCenter, contentPadding: const EdgeInsets.all(0), diff --git a/packages/hmssdk_flutter/example/ExampleAppChangelog.txt b/packages/hmssdk_flutter/example/ExampleAppChangelog.txt index 027c108e5..2ebf4dc92 100644 --- a/packages/hmssdk_flutter/example/ExampleAppChangelog.txt +++ b/packages/hmssdk_flutter/example/ExampleAppChangelog.txt @@ -15,6 +15,12 @@ https://100ms.atlassian.net/browse/LIVE-1981 - Block Peer From Chat https://100ms.atlassian.net/browse/FLUT-157 +- Multi Pin Chat +https://100ms.atlassian.net/browse/FLUT-154 + +- can't see pinned chat(by remote peer) on Flutter +https://100ms.atlassian.net/browse/FLUT-187 + Room Kit: 1.0.9 Core SDK: 1.9.6 Android SDK: 2.8.4 diff --git a/packages/hmssdk_flutter/example/android/app/build.gradle b/packages/hmssdk_flutter/example/android/app/build.gradle index e9de7e70e..d4876a003 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 414 - versionName "1.5.114" + versionCode 415 + versionName "1.5.115" } signingConfigs { diff --git a/packages/hmssdk_flutter/example/ios/Gemfile.lock b/packages/hmssdk_flutter/example/ios/Gemfile.lock index 762fb1264..d23efec30 100644 --- a/packages/hmssdk_flutter/example/ios/Gemfile.lock +++ b/packages/hmssdk_flutter/example/ios/Gemfile.lock @@ -13,13 +13,13 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.875.0) + aws-partitions (1.877.0) aws-sdk-core (3.190.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.75.0) + aws-sdk-kms (1.76.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.142.0) @@ -41,7 +41,7 @@ GEM domain_name (0.6.20231109) dotenv (2.8.1) emoji_regex (3.2.3) - excon (0.108.0) + excon (0.109.0) faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -71,7 +71,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.3.0) - fastlane (2.217.0) + fastlane (2.218.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -98,7 +98,7 @@ GEM mini_magick (>= 4.9.4, < 5.0.0) multipart-post (>= 2.0.0, < 3.0.0) naturally (~> 2.2) - optparse (~> 0.1.1) + optparse (>= 0.1.1) plist (>= 3.1.0, < 4.0.0) rubyzip (>= 2.0.0, < 3.0.0) security (= 0.1.3) @@ -171,7 +171,7 @@ GEM multipart-post (2.3.0) nanaimo (0.3.0) naturally (2.2.1) - optparse (0.1.1) + optparse (0.4.0) os (1.1.4) plist (3.7.1) public_suffix (5.0.4) diff --git a/packages/hmssdk_flutter/ios/Classes/Actions/HMSSessionStoreAction.swift b/packages/hmssdk_flutter/ios/Classes/Actions/HMSSessionStoreAction.swift index 42b52794d..5bf8c16ee 100644 --- a/packages/hmssdk_flutter/ios/Classes/Actions/HMSSessionStoreAction.swift +++ b/packages/hmssdk_flutter/ios/Classes/Actions/HMSSessionStoreAction.swift @@ -71,6 +71,8 @@ class HMSSessionStoreAction { } else if let boolValue = value as? Bool{ let stringValue = String(boolValue) result(HMSResultExtension.toDictionary(true, stringValue)) + } else if (value == nil || value is NSNull){ + result(HMSResultExtension.toDictionary(true, nil)) } else{ HMSErrorLogger.logError(#function, "Session metadata type is not compatible, Please use compatible type while setting metadata", "Type Incompatibility Error") diff --git a/packages/hmssdk_flutter/ios/Classes/SwiftHmssdkFlutterPlugin.swift b/packages/hmssdk_flutter/ios/Classes/SwiftHmssdkFlutterPlugin.swift index 7100fae6f..ef9e71cb5 100644 --- a/packages/hmssdk_flutter/ios/Classes/SwiftHmssdkFlutterPlugin.swift +++ b/packages/hmssdk_flutter/ios/Classes/SwiftHmssdkFlutterPlugin.swift @@ -566,6 +566,8 @@ public class SwiftHmssdkFlutterPlugin: NSObject, FlutterPlugin, HMSUpdateListene dict["value"] = stringValue } else if let boolValue = value as? Bool{ dict["value"] = String(boolValue) + } else if (value == nil || value is NSNull) { + dict["value"] = nil } else{ HMSErrorLogger.logError(#function, "Session metadata type is not compatible, Please use compatible type while setting metadata", "Type Incompatibility Error") 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 6284a82cb8e08ef86db6d6f687bf0dae80d1177c Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Mon, 8 Jan 2024 13:16:25 +0000 Subject: [PATCH 14/18] =?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/pubspec.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) 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 2914c7442ad144144621a5cbedb2f8323b2ad82e Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Mon, 8 Jan 2024 19:50:59 +0530 Subject: [PATCH 15/18] Fixed error description bug on iOS --- .../src/widgets/toasts/hms_error_toast.dart | 2 +- .../example/android/app/build.gradle | 4 +-- packages/hmssdk_flutter/example/pubspec.lock | 26 +++++++++---------- .../Actions/HMSSessionStoreAction.swift | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/hms_room_kit/lib/src/widgets/toasts/hms_error_toast.dart b/packages/hms_room_kit/lib/src/widgets/toasts/hms_error_toast.dart index a57d87924..bf39abfc5 100644 --- a/packages/hms_room_kit/lib/src/widgets/toasts/hms_error_toast.dart +++ b/packages/hms_room_kit/lib/src/widgets/toasts/hms_error_toast.dart @@ -32,7 +32,7 @@ class HMSErrorToast extends StatelessWidget { toastPosition: toastPosition, subtitle: HMSSubheadingText( text: error.description - .substring(0, math.min(50, error.description.length)), + .substring(0, math.min(30, error.description.length)), textColor: HMSThemeColors.onSurfaceHighEmphasis, fontWeight: FontWeight.w600, letterSpacing: 0.1, diff --git a/packages/hmssdk_flutter/example/android/app/build.gradle b/packages/hmssdk_flutter/example/android/app/build.gradle index d4876a003..3c2398aa1 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 415 - versionName "1.5.115" + versionCode 416 + versionName "1.5.116" } signingConfigs { diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index 098334077..cb0c5b7b7 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/ios/Classes/Actions/HMSSessionStoreAction.swift b/packages/hmssdk_flutter/ios/Classes/Actions/HMSSessionStoreAction.swift index 5bf8c16ee..f400ede98 100644 --- a/packages/hmssdk_flutter/ios/Classes/Actions/HMSSessionStoreAction.swift +++ b/packages/hmssdk_flutter/ios/Classes/Actions/HMSSessionStoreAction.swift @@ -112,7 +112,7 @@ class HMSSessionStoreAction { if let error = error { HMSErrorLogger.logError(#function, "Error in setting data: \(data ?? "null") for key: \(key) to the Session Store. Error: \(error.localizedDescription)", "Key Error") - result(HMSErrorExtension.getError("Error in setting data: \(data ?? "null") for key: \(key) to the Session Store. Error: \(error.localizedDescription)")) + result(HMSErrorExtension.toDictionary(error)) return } result(nil) From 7a6e1604caaa2d9b5dc3d5508990e8270c18c32a Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Mon, 8 Jan 2024 14:22:55 +0000 Subject: [PATCH 16/18] =?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 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index cb0c5b7b7..098334077 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" From 366640e25c9667d7c89c1af1ad076346c3ea458e Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Tue, 9 Jan 2024 00:20:18 +0530 Subject: [PATCH 17/18] =?UTF-8?q?released=20sample=20app=20version=201.5.1?= =?UTF-8?q?17=20(417)=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 3c2398aa1..02b43f6a5 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 416 - versionName "1.5.116" + versionCode 417 + versionName "1.5.117" } signingConfigs { diff --git a/packages/hmssdk_flutter/example/ios/Runner/Info.plist b/packages/hmssdk_flutter/example/ios/Runner/Info.plist index 64d9c32c1..4c2d4a4b4 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.114 + 1.5.117 CFBundleSignature ???? CFBundleURLTypes @@ -48,7 +48,7 @@ CFBundleVersion - 414 + 417 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index 098334077..cb0c5b7b7 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 bc0deb38017bd6190d9bcddc7590a48bca6f9a9d Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Mon, 8 Jan 2024 18:52:07 +0000 Subject: [PATCH 18/18] =?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 ++++++++++---------- packages/hmssdk_flutter/pubspec.lock | 26 ++++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index cb0c5b7b7..098334077 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/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"