Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.9.13: Develop to main #1734

Merged
merged 21 commits into from
Mar 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions packages/hms_room_kit/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,21 @@
| hms_room_kit | [![Pub Version](https://img.shields.io/pub/v/hms_room_kit)](https://pub.dev/packages/hms_room_kit) |
| hmssdk_flutter | [![Pub Version](https://img.shields.io/pub/v/hmssdk_flutter)](https://pub.dev/packages/hmssdk_flutter) |

## 1.0.16 - 2024-03-15

| Package | Version |
| -------------- | ------------------------------------------------------------------------------------------------------ |
| hms_room_kit | 1.0.16 |
| hmssdk_flutter | 1.9.13 |

### 🚀 Added

- Ability to join rooms directly without preview

Prebuilt now allows direct room joining without preview, customizable via the dashboard's "customize prebuilt" section.

Updated `hmssdk_flutter` package version to 1.9.13

## 1.0.15 - 2024-03-04

| Package | Version |
Expand Down
4 changes: 2 additions & 2 deletions packages/hms_room_kit/analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
include: package:flutter_lints/flutter.yaml
include: package:lints/core.yaml
# Additional information about this file can be found at
# https://dart.dev/guides/language/analysis-options
# https://dart.dev/guides/language/analysis-options
76 changes: 50 additions & 26 deletions packages/hms_room_kit/example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -214,15 +214,15 @@ packages:
path: ".."
relative: true
source: path
version: "1.0.15"
version: "1.0.16"
hmssdk_flutter:
dependency: transitive
description:
name: hmssdk_flutter
sha256: "2f689fad643f851447b2e95b55547cead6852fc6678c3c39fc62fb016754053e"
sha256: "3155ccd29881cd7ed36edf12db9f0355a586e78ae2c1249e6ca545ccdce73bc6"
url: "https://pub.dev"
source: hosted
version: "1.9.12"
version: "1.9.13"
http:
dependency: transitive
description:
Expand Down Expand Up @@ -255,6 +255,30 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.6.7"
leak_tracker:
dependency: transitive
description:
name: leak_tracker
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
url: "https://pub.dev"
source: hosted
version: "10.0.0"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
url: "https://pub.dev"
source: hosted
version: "2.0.1"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
url: "https://pub.dev"
source: hosted
version: "2.0.1"
linkify:
dependency: transitive
description:
Expand Down Expand Up @@ -283,26 +307,26 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev"
source: hosted
version: "0.12.16"
version: "0.12.16+1"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev"
source: hosted
version: "0.5.0"
version: "0.8.0"
meta:
dependency: transitive
description:
name: meta
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
url: "https://pub.dev"
source: hosted
version: "1.9.1"
version: "1.11.0"
mime:
dependency: transitive
description:
Expand All @@ -323,10 +347,10 @@ packages:
dependency: transitive
description:
name: path
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev"
source: hosted
version: "1.8.3"
version: "1.9.0"
path_parsing:
dependency: transitive
description:
Expand Down Expand Up @@ -459,10 +483,10 @@ packages:
dependency: transitive
description:
name: provider
sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096"
sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
url: "https://pub.dev"
source: hosted
version: "6.1.1"
version: "6.1.2"
share_plus:
dependency: transitive
description:
Expand Down Expand Up @@ -560,18 +584,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:
Expand All @@ -592,10 +616,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:
Expand Down Expand Up @@ -724,14 +748,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.2.2"
web:
vm_service:
dependency: transitive
description:
name: web
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
name: vm_service
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
url: "https://pub.dev"
source: hosted
version: "0.1.4-beta"
version: "13.0.0"
win32:
dependency: transitive
description:
Expand All @@ -757,5 +781,5 @@ packages:
source: hosted
version: "6.3.0"
sdks:
dart: ">=3.1.0 <4.0.0"
dart: ">=3.2.0-0 <4.0.0"
flutter: ">=3.13.0"
2 changes: 1 addition & 1 deletion packages/hms_room_kit/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix.
version: 1.0.15
version: 1.0.16

environment:
sdk: ">=2.19.6 <3.0.0"
Expand Down
2 changes: 2 additions & 0 deletions packages/hms_room_kit/lib/src/common/utility_functions.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
library;

///Dart imports
import 'dart:io';
import 'dart:math' as math;
Expand Down
2 changes: 2 additions & 0 deletions packages/hms_room_kit/lib/src/hls_viewer/hls_player.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
library;

///Package imports
import 'package:flutter/material.dart';
import 'package:hmssdk_flutter/hmssdk_flutter.dart';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
library;

///Dart imports
import 'dart:io';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
library;

///Dart imports
import 'dart:developer';
import 'dart:io';
Expand Down
2 changes: 2 additions & 0 deletions packages/hms_room_kit/lib/src/hls_viewer/hls_viewer_page.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
library;

///Dart imports
import 'dart:math';

Expand Down
2 changes: 2 additions & 0 deletions packages/hms_room_kit/lib/src/hls_viewer/hls_waiting_ui.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
library;

///Package imports
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
library;

///Package imports
import 'package:flutter/material.dart';
import 'package:flutter_linkify/flutter_linkify.dart';
Expand Down
2 changes: 2 additions & 0 deletions packages/hms_room_kit/lib/src/hms_prebuilt.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
library;

///Package imports
import 'package:flutter/widgets.dart';

Expand Down
2 changes: 2 additions & 0 deletions packages/hms_room_kit/lib/src/hms_prebuilt_options.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
library;

///Project imports
import 'package:hms_room_kit/hms_room_kit.dart';

Expand Down
19 changes: 11 additions & 8 deletions packages/hms_room_kit/lib/src/layout_api/hms_room_layout.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
///Dart imports
library;

import 'dart:convert';

///Package imports
Expand Down Expand Up @@ -55,20 +57,19 @@ class ScreenElements {
class Preview {
final ScreenElements? previewHeader;
final JoinForm? joinForm;
final bool? skipPreviewScreen;

Preview({
this.previewHeader,
this.joinForm,
});
Preview({this.previewHeader, this.joinForm, this.skipPreviewScreen = false});

factory Preview.fromJson(Map<String, dynamic>? json) {
if (json == null) {
return Preview();
}
return Preview(
previewHeader: ScreenElements.fromJson(json['preview_header']),
joinForm: JoinForm.fromJson(json['join_form']),
);
previewHeader: ScreenElements.fromJson(
json['default']?['elements']?['preview_header']),
joinForm: JoinForm.fromJson(json['default']?['elements']?['join_form']),
skipPreviewScreen: json["skip_preview_screen"]);
}
}

Expand Down Expand Up @@ -124,7 +125,7 @@ class Screens {
}
return Screens(
preview: json.containsKey('preview') == true
? Preview.fromJson(json['preview']?['default']?['elements'])
? Preview.fromJson(json['preview'])
: null,
conferencing: json.containsKey('conferencing') == true
? Conferencing.fromJson(json['conferencing'])
Expand Down Expand Up @@ -218,6 +219,7 @@ class HMSRoomLayout {
static bool isBRBEnabled = true;
static List<String>? offStageRoles = [];
static bool skipPreviewForRole = false;
static bool skipPreview = false;

static Future<void> getRoomLayout(
{required HMSSDKInteractor hmsSDKInteractor,
Expand Down Expand Up @@ -253,6 +255,7 @@ class HMSRoomLayout {
peerType = roleLayoutData?.screens?.conferencing?.hlsLiveStreaming != null
? PeerRoleType.hlsViewer
: PeerRoleType.conferencing;
skipPreview = roleLayoutData?.screens?.preview?.skipPreviewScreen ?? false;
if (peerType == PeerRoleType.conferencing) {
chatData =
roleLayoutData?.screens?.conferencing?.defaultConf?.elements?.chat;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
///Package imports
library;

import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:provider/provider.dart';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
///Dart imports
library;

import 'dart:io';

///Package imports
Expand Down Expand Up @@ -26,19 +28,20 @@ class MeetingGridComponent extends StatelessWidget {
Widget build(BuildContext context) {
return Selector<
MeetingStore,
Tuple6<List<PeerTrackNode>, bool, int, int, MeetingMode,
PeerTrackNode?>>(
selector: (_, meetingStore) => Tuple6(
Tuple7<List<PeerTrackNode>, bool, int, int, MeetingMode,
PeerTrackNode?, int>>(
selector: (_, meetingStore) => Tuple7(
meetingStore.peerTracks,
meetingStore.isHLSLink,
meetingStore.peerTracks.length,
meetingStore.screenShareCount,
meetingStore.meetingMode,
meetingStore.peerTracks.isNotEmpty
? meetingStore.peerTracks[meetingStore.screenShareCount]
: null),
: null,
meetingStore.viewControllers.length),
builder: (_, data, __) {
if (data.item3 == 0) {
if (data.item3 == 0 || data.item7 == 0) {
return Center(
child: Column(
mainAxisSize: MainAxisSize.min,
Expand Down
2 changes: 2 additions & 0 deletions packages/hms_room_kit/lib/src/meeting/meeting_header.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
///Dart imports
library;

import 'dart:developer';

///Package imports
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
///Dart imports
library;

import 'dart:async';

///Package imports
Expand Down
Loading