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

FLUT-121: Texture View implementation #1654

Merged
merged 57 commits into from
Dec 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
e1a46ca
fetching Android SDK from local .m2
ygit Oct 10, 2023
2a2b171
updated implementation
ygit Oct 10, 2023
3b0cc5d
Added texture view implementation
Decoder07 Oct 16, 2023
17d01aa
Added dispose texture view method
Decoder07 Oct 16, 2023
34ea0bd
Merged Develop
Decoder07 Oct 16, 2023
7393f8d
Fixed errors
Decoder07 Oct 16, 2023
9e9718d
Updated pubspec
Decoder07 Oct 16, 2023
f5751ef
Added texture view in sample app
Decoder07 Oct 16, 2023
fa02140
Updated implementation
Decoder07 Oct 18, 2023
0a0d09d
Updated cache extent and add track logic
Decoder07 Oct 19, 2023
834fc2e
Added pooling for prebuilt
Decoder07 Oct 25, 2023
c73266d
released sample app version 1.5.78 (378) 🍀
Decoder07 Oct 26, 2023
342425c
Added active speaker
Decoder07 Oct 27, 2023
16aa782
Updated widget tree in screenshare layout
Decoder07 Oct 30, 2023
de6ccc6
Added event channels in texture-view
Decoder07 Oct 30, 2023
d508514
Updated android sdk branch
Decoder07 Nov 21, 2023
6587f31
Updated versions
Decoder07 Nov 21, 2023
4df3b3c
Updated changelog
Decoder07 Nov 21, 2023
d537fd7
Updated fastlane
Decoder07 Nov 21, 2023
5bde425
released sample app version 1.5.91 (391) 🍀
Decoder07 Nov 21, 2023
96e4538
Fixed resolution issue
Decoder07 Nov 23, 2023
2199554
Updated gemfile
Decoder07 Nov 23, 2023
6b83afa
released sample app version 1.5.92 (392) 🍀
Decoder07 Nov 24, 2023
106df2a
Updated texture view implementation
Decoder07 Nov 24, 2023
6b5775e
Merged develop
Decoder07 Nov 24, 2023
f16fff0
Fixed screenshare bugs
Decoder07 Nov 27, 2023
54b1671
released sample app version 1.5.93 (393) 🍀
Decoder07 Nov 27, 2023
9bfbaf7
released sample app version 1.5.93 (393) 🍀
Decoder07 Nov 27, 2023
c88964f
FLUT-167: Fixed preview stretching bug (#1645)
Decoder07 Nov 28, 2023
3d16436
Fixed colored line issue in grid (#1646)
Decoder07 Nov 29, 2023
9935263
released sample app version 1.5.95 (395) 🍀
Decoder07 Nov 29, 2023
6282b7b
Fixed iOS streal url fix (#1647)
Decoder07 Nov 30, 2023
88aabe6
released sample app version 1.5.96 (396) 🍀
Decoder07 Nov 30, 2023
00cd699
🤖 Automated Format and Fix
ygit Nov 30, 2023
f133c17
Updated android sdk version to 2.8.2
Decoder07 Dec 1, 2023
399adde
🤖 Automated Format and Fix
Decoder07 Dec 1, 2023
55904ff
released sample app version 1.5.97 (397) 🍀
Decoder07 Dec 1, 2023
c599d8a
🤖 Automated Format and Fix
Decoder07 Dec 1, 2023
1a772cb
Fixed iOS crash with texture view (#1649)
Decoder07 Dec 3, 2023
75922ec
released sample app version 1.5.98 (398) 🍀
Decoder07 Dec 4, 2023
13e1de9
🤖 Automated Format and Fix
Decoder07 Dec 4, 2023
4aba3e4
Merge branch 'develop' into FLUT-121
Decoder07 Dec 5, 2023
0e12350
🤖 Automated Format and Fix
Decoder07 Dec 5, 2023
8571f9b
Fixed activeSpeaker layout while screenshare (#1650)
Decoder07 Dec 5, 2023
79b2c38
Added feature to disable name edit on preview (#1651)
Decoder07 Dec 5, 2023
36708d6
Fixed empty message on role change decline (#1652)
Decoder07 Dec 5, 2023
b44cc36
Updated changelog
Decoder07 Dec 5, 2023
093d175
Updated android sdk branch to dev-v2
Decoder07 Dec 5, 2023
0450204
Updated android sdk version
Decoder07 Dec 6, 2023
2fed0b1
Fixed sizing issues
Decoder07 Dec 6, 2023
a1093d0
released sample app version 1.5.100 (400) 🍀
Decoder07 Dec 6, 2023
3c56038
Removed logs
Decoder07 Dec 6, 2023
6dbea3d
Corrected comments
Decoder07 Dec 6, 2023
97ee8fc
removed unused code
Decoder07 Dec 6, 2023
4f47440
resolved merge conflicts
Decoder07 Dec 7, 2023
195ad9c
🤖 Automated Format and Fix
Decoder07 Dec 7, 2023
06ad194
Fixed build.gradle
Decoder07 Dec 7, 2023
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
24 changes: 8 additions & 16 deletions packages/hms_room_kit/example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.1"
bot_toast:
dependency: transitive
description:
name: bot_toast
sha256: "6b93030a99a98335b8827ecd83021e92e885ffc61d261d3825ffdecdd17f3bdf"
url: "https://pub.dev"
source: hosted
version: "4.1.3"
characters:
dependency: transitive
description:
Expand Down Expand Up @@ -85,10 +77,10 @@ packages:
dependency: transitive
description:
name: cross_file
sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e
sha256: "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5"
url: "https://pub.dev"
source: hosted
version: "0.3.3+8"
version: "0.3.3+7"
crypto:
dependency: transitive
description:
Expand Down Expand Up @@ -234,10 +226,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:
Expand Down Expand Up @@ -434,10 +426,10 @@ packages:
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:
Expand Down Expand Up @@ -759,10 +751,10 @@ packages:
dependency: transitive
description:
name: xml
sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84"
url: "https://pub.dev"
source: hosted
version: "6.5.0"
version: "6.3.0"
sdks:
dart: ">=3.1.0 <4.0.0"
flutter: ">=3.13.0"
25 changes: 12 additions & 13 deletions packages/hms_room_kit/lib/src/common/utility_functions.dart
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
//Package imports
///Dart imports
import 'dart:io';
import 'dart:math' as math;

import 'package:bot_toast/bot_toast.dart';
///Package imports
import 'package:flutter/material.dart';
import 'package:flutter_foreground_task/flutter_foreground_task.dart';
import 'package:hms_room_kit/hms_room_kit.dart';
import 'package:hmssdk_flutter/hmssdk_flutter.dart';
import 'package:hms_room_kit/src/common/animated_text.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:shared_preferences/shared_preferences.dart';

Expand Down Expand Up @@ -266,16 +265,16 @@ class Utilities {

static void showTimedMetadata(String message,
{int time = 1, Alignment align = const Alignment(0, 0.8)}) {
BotToast.showText(
align: align,
wrapToastAnimation: (controller, cancelFunc, widget) =>
AnimatedTextWidget(
text: message, duration: Duration(seconds: time)),
onlyOne: false,
textStyle: HMSTextStyle.setTextStyle(fontSize: 14),
text: message,
contentColor: Colors.black87,
duration: Duration(seconds: time));
// BotToast.showText(
// align: align,
// wrapToastAnimation: (controller, cancelFunc, widget) =>
// AnimatedTextWidget(
// text: message, duration: Duration(seconds: time)),
// onlyOne: false,
// textStyle: HMSTextStyle.setTextStyle(fontSize: 14),
// text: message,
// contentColor: Colors.black87,
// duration: Duration(seconds: time));
}

static Future<String> getStringData({required String key}) async {
Expand Down
4 changes: 3 additions & 1 deletion packages/hms_room_kit/lib/src/meeting/meeting_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -292,9 +292,11 @@ class _MeetingPageState extends State<MeetingPage> {
context:
context,
size: size)
: const CustomOneToOneGrid(
: CustomOneToOneGrid(
isLocalInsetPresent:
false,
peerTracks:
data.item1,
),
));
});
Expand Down
19 changes: 16 additions & 3 deletions packages/hms_room_kit/lib/src/meeting/meeting_store.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1051,10 +1051,21 @@ class MeetingStore extends ChangeNotifier
@override
void onUpdateSpeakers({required List<HMSSpeaker> updateSpeakers}) {
//To handle the active speaker mode scenario

///This is to handle whether to bring the user to first index
///In case of normal layout if the user is on the first page i.e
///index < 6 we don't move the peer to first page. Similarly, if
///screenshare is on and index < 2 we don't update the position
///of the peer
int peersInActiveSpeakerLayout = 6;
if (screenShareCount > 0) {
peersInActiveSpeakerLayout = 2;
}

if ((currentPage == 0) &&
(meetingMode == MeetingMode.activeSpeakerWithInset ||
meetingMode == MeetingMode.activeSpeakerWithoutInset) &&
peerTracks.length > 6) {
peerTracks.length > peersInActiveSpeakerLayout) {
/* Here we iterate through the updateSpeakers list
* and do the following:
* Find the index of the peer
Expand All @@ -1064,7 +1075,7 @@ class MeetingStore extends ChangeNotifier
for (var speaker in updateSpeakers) {
int index = peerTracks.indexWhere((previousSpeaker) =>
previousSpeaker.uid == "${speaker.peer.peerId}mainVideo");
if (index > 5) {
if (index > (peersInActiveSpeakerLayout - 1)) {
PeerTrackNode activeSpeaker = peerTracks[index];
peerTracks.removeAt(index);
peerTracks.insert(screenShareCount, activeSpeaker);
Expand Down Expand Up @@ -1344,7 +1355,9 @@ class MeetingStore extends ChangeNotifier
}

void addMessage(HMSMessage message) {
messages.add(message);
if (message.type == "chat") {
messages.add(message);
}
}

void updatePeerAt(HMSPeer peer) {
Expand Down
3 changes: 3 additions & 0 deletions packages/hms_room_kit/lib/src/preview/preview_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,9 @@ class _PreviewPageState extends State<PreviewPage> {
height: 48,
width: width * 0.50,
child: TextField(
enabled: widget.name
.trim()
.isEmpty,
cursorColor:
HMSThemeColors
.onSurfaceHighEmphasis,
Expand Down
2 changes: 1 addition & 1 deletion packages/hms_room_kit/lib/src/screen_controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ class _ScreenControllerState extends State<ScreenController> {
value: _previewStore,
child: PreviewPage(
roomCode: Constant.roomCode,
name: widget.options?.userName ?? "",
name: widget.options?.userName?.trim() ?? "",
options: widget.options,
))
: PreviewPermissions(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,6 @@ class _PeerTileState extends State<PeerTile> {
if (mounted) {
Provider.of<PeerTrackNode>(context, listen: false)
.setOffScreenStatus(true);
if (context.read<PeerTrackNode>().track != null) {
// log("HMSVideoViewController remove video track ${context.read<PeerTrackNode>().peer.name}");

///Avoiding remove track
// widget.videoViewController?.removeTrack();
}
}
},
onFocusGained: () {
Expand Down
Loading
Loading