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.

Sign up for GitHub

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

Jump to bottom

Added option to toggle preview change name from application #1660

Merged
merged 3 commits into from
Dec 14, 2023
Merged

Added option to toggle preview change name from application #1660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
549217f
Added option to toggle preview change name from application
Decoder07 Dec 11, 2023
8ec0c70
🤖 Automated Format and Fix
Decoder07 Dec 11, 2023
4a8d847
Merge branch 'develop' into FLUT-158-extension
ygit Dec 13, 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
2 changes: 2 additions & 0 deletions packages/hms_room_kit/lib/src/service/app_debug_config.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class AppDebugConfig {
static bool isSoftwareDecoderDisabled = true;
static bool isAudioMixerDisabled = true;
static bool isAutoSimulcast = true;
static bool nameChangeOnPreview = true;

static bool isDebugMode = false;
static bool isProdRoom = true;
Expand All @@ -32,5 +33,6 @@ class AppDebugConfig {
isAudioMixerDisabled = true;
isAutoSimulcast = true;
isProdRoom = true;
nameChangeOnPreview = true;
}
}
77 changes: 39 additions & 38 deletions packages/hms_room_kit/lib/src/widgets/bottom_sheets/local_peer_bottom_sheet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,44 +148,45 @@ class _LocalPeerBottomSheetState extends State<LocalPeerBottomSheet> {
// title: HMSSubheadingText(
// text: "Spotlight Tile for Everyone",
// textColor: HMSThemeColors.onSurfaceHighEmphasis)),
ListTile(
horizontalTitleGap: 2,
onTap: () async {
Navigator.pop(context);
showModalBottomSheet(
isScrollControlled: true,
backgroundColor: HMSThemeColors.surfaceDim,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(16),
topRight: Radius.circular(16)),
),
context: context,
builder: (ctx) => ChangeNotifierProvider.value(
value: widget.meetingStore,
child: Padding(
padding: EdgeInsets.only(
bottom: MediaQuery.of(ctx)
.viewInsets
.bottom),
child: const ChangeNameBottomSheet(
showPrivacyInfo: false,
))),
);
},
contentPadding: EdgeInsets.zero,
leading: SvgPicture.asset(
"packages/hms_room_kit/lib/src/assets/icons/pencil.svg",
semanticsLabel: "fl_local_pin_tile",
height: 20,
width: 20,
colorFilter: ColorFilter.mode(
HMSThemeColors.onSurfaceHighEmphasis,
BlendMode.srcIn),
),
title: HMSSubheadingText(
text: "Change Name",
textColor: HMSThemeColors.onSurfaceHighEmphasis)),
if (Constant.prebuiltOptions?.userName == null)
ListTile(
horizontalTitleGap: 2,
onTap: () async {
Navigator.pop(context);
showModalBottomSheet(
isScrollControlled: true,
backgroundColor: HMSThemeColors.surfaceDim,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(16),
topRight: Radius.circular(16)),
),
context: context,
builder: (ctx) => ChangeNotifierProvider.value(
value: widget.meetingStore,
child: Padding(
padding: EdgeInsets.only(
bottom: MediaQuery.of(ctx)
.viewInsets
.bottom),
child: const ChangeNameBottomSheet(
showPrivacyInfo: false,
))),
);
},
contentPadding: EdgeInsets.zero,
leading: SvgPicture.asset(
"packages/hms_room_kit/lib/src/assets/icons/pencil.svg",
semanticsLabel: "fl_local_pin_tile",
height: 20,
width: 20,
colorFilter: ColorFilter.mode(
HMSThemeColors.onSurfaceHighEmphasis,
BlendMode.srcIn),
),
title: HMSSubheadingText(
text: "Change Name",
textColor: HMSThemeColors.onSurfaceHighEmphasis)),
if (widget.isInsetTile)
ListTile(
horizontalTitleGap: 2,
Expand Down
2 changes: 1 addition & 1 deletion packages/hms_room_kit/lib/src/widgets/common_widgets/inset_tile.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import 'package:provider/provider.dart';

///Project imports
import 'package:hms_room_kit/src/layout_api/hms_theme_colors.dart';
import 'package:hms_room_kit/src/widgets/peer_widgets/inset_tile_more_option.dart';
import 'package:hms_room_kit/src/widgets/peer_widgets/local_peer_more_option.dart';
import 'package:hms_room_kit/src/model/peer_track_node.dart';
import 'package:hms_room_kit/src/widgets/common_widgets/video_view.dart';
import 'package:hms_room_kit/src/widgets/peer_widgets/audio_mute_status.dart';
Expand Down
2 changes: 1 addition & 1 deletion packages/hms_room_kit/lib/src/widgets/common_widgets/peer_tile.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import 'package:provider/provider.dart';
// Project imports
import 'package:hms_room_kit/src/layout_api/hms_theme_colors.dart';
import 'package:hms_room_kit/src/meeting/meeting_store.dart';
import 'package:hms_room_kit/src/widgets/peer_widgets/inset_tile_more_option.dart';
import 'package:hms_room_kit/src/widgets/peer_widgets/local_peer_more_option.dart';
import 'package:hms_room_kit/src/widgets/peer_widgets/name_and_network.dart';
import 'package:hms_room_kit/src/widgets/peer_widgets/screen_share_tile_name.dart';
import 'package:hms_room_kit/src/model/peer_track_node.dart';
Expand Down
70 changes: 0 additions & 70 deletions packages/hms_room_kit/lib/src/widgets/peer_widgets/inset_tile_more_option.dart
View file
Open in desktop

This file was deleted.

74 changes: 74 additions & 0 deletions packages/hms_room_kit/lib/src/widgets/peer_widgets/local_peer_more_option.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
///Package imports
import 'package:flutter/material.dart';
import 'package:hms_room_kit/hms_room_kit.dart';
import 'package:provider/provider.dart';

///Project imports
import 'package:hms_room_kit/src/meeting/meeting_store.dart';
import 'package:hms_room_kit/src/model/peer_track_node.dart';
import 'package:hms_room_kit/src/widgets/bottom_sheets/local_peer_bottom_sheet.dart';

///[LocalPeerMoreOption] is a widget that is used to render the more option button on a local peer(inset) tile
///This is used in the [LocalPeerTile]
///It has following parameters:
///[callbackFunction] is a function that is called when the more option button is clicked
class LocalPeerMoreOption extends StatelessWidget {
final Function()? callbackFunction;
final bool isInsetTile;
const LocalPeerMoreOption(
{super.key, this.callbackFunction, this.isInsetTile = true});

@override
Widget build(BuildContext context) {
return (Constant.prebuiltOptions?.userName != null && !isInsetTile)
? const SizedBox()
: Positioned(
bottom: 5,
right: 5,
child: GestureDetector(
onTap: () {
///[peerTrackNode] is the peerTrackNode of the peer whose more option is clicked
///We only show the modal bottom sheet if the peer is the local peer
var peerTrackNode = context.read<PeerTrackNode>();
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<MeetingStore>(),
child: LocalPeerBottomSheet(
isInsetTile: isInsetTile,
meetingStore: context.read<MeetingStore>(),
peerTrackNode: peerTrackNode,
callbackFunction: callbackFunction,
)),
);
},
child: Semantics(
label:
"fl_${context.read<PeerTrackNode>().peer.name}more_option",
child: Container(
height: 28,
width: 28,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8),
color: HMSThemeColors.backgroundDim.withOpacity(0.64),
),
child: Center(
child: Icon(
Icons.more_vert,
color: HMSThemeColors.onSurfaceHighEmphasis,
size: 20,
),
),
),
),
),
);
}
}
35 changes: 35 additions & 0 deletions packages/hmssdk_flutter/example/lib/app_settings_bottom_sheet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class _AppSettingsBottomSheetState extends State<AppSettingsBottomSheet> {
bool isDebugMode = false;
HMSAudioMode currentAudioMode = HMSAudioMode.VOICE;
bool isStreamingFlow = true;
bool nameChangeOnPreview = true;

var versions = {};

Expand Down Expand Up @@ -72,6 +73,9 @@ class _AppSettingsBottomSheetState extends State<AppSettingsBottomSheet> {
isStreamingFlow =
await Utilities.getBoolData(key: 'is_streaming_flow') ?? true;

nameChangeOnPreview =
await Utilities.getBoolData(key: 'name-change-on-preview') ?? true;

WidgetsBinding.instance.addPostFrameCallback((_) {
setState(() {});
});
Expand All @@ -89,6 +93,7 @@ class _AppSettingsBottomSheetState extends State<AppSettingsBottomSheet> {
AppDebugConfig.showStats = showStats;
AppDebugConfig.skipPreview = skipPreview;
AppDebugConfig.isDebugMode = isDebugMode;
AppDebugConfig.nameChangeOnPreview = true;
}

Future<void> _launchUrl() async {
Expand Down Expand Up @@ -336,6 +341,36 @@ class _AppSettingsBottomSheetState extends State<AppSettingsBottomSheet> {
setState(() {})
}),
),
ListTile(
horizontalTitleGap: 2,
enabled: false,
contentPadding: EdgeInsets.zero,
leading: SvgPicture.asset(
"packages/hms_room_kit/lib/src/assets/icons/pencil.svg",
fit: BoxFit.scaleDown,
colorFilter:
ColorFilter.mode(themeDefaultColor, BlendMode.srcIn),
),
title: Text(
"Name Change On Preview",
semanticsLabel: "fl_disable_name_change_on_preview",
style: HMSTextStyle.setTextStyle(
fontSize: 14,
color: themeDefaultColor,
letterSpacing: 0.25,
fontWeight: FontWeight.w600),
),
trailing: CupertinoSwitch(
activeColor: hmsdefaultColor,
value: nameChangeOnPreview,
onChanged: (value) => {
nameChangeOnPreview = value,
Utilities.saveBoolData(
key: 'name-change-on-preview', value: value),
AppDebugConfig.nameChangeOnPreview = value,
setState(() {})
}),
),
ListTile(
horizontalTitleGap: 2,
enabled: false,
Expand Down
3 changes: 3 additions & 0 deletions packages/hmssdk_flutter/example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,9 @@
builder: (_) => HMSPrebuilt(
roomCode: Constant.roomCode,
options: HMSPrebuiltOptions(
userName: AppDebugConfig.nameChangeOnPreview
? null
: "Flutter User",
endPoints: endPoints,
userId:
"user_flutter", // pass your custom unique user identifier here
Expand All @@ -302,7 +305,7 @@
@override
Widget build(BuildContext context) {
double width = MediaQuery.of(context).size.width;
return WillPopScope(

Check notice on line 308 in packages/hmssdk_flutter/example/lib/main.dart

View workflow job for this annotation

GitHub Actions / check_build

'WillPopScope' is deprecated and shouldn't be used. Use PopScope instead. This feature was deprecated after v3.12.0-1.0.pre. 

Try replacing the use of the deprecated member with the replacement.
See https://dart.dev/diagnostics/deprecated_member_use to learn more about this problem.

Check notice on line 308 in packages/hmssdk_flutter/example/lib/main.dart

View workflow job for this annotation

GitHub Actions / check_build

'WillPopScope.new' is deprecated and shouldn't be used. Use PopScope instead. This feature was deprecated after v3.12.0-1.0.pre. 

Try replacing the use of the deprecated member with the replacement.
See https://dart.dev/diagnostics/deprecated_member_use to learn more about this problem.
onWillPop: _closeApp,
child: SafeArea(
child: Scaffold(
Expand Down
3 changes: 3 additions & 0 deletions packages/hmssdk_flutter/example/lib/qr_code_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ class _QRCodeScreenState extends State<QRCodeScreen> {
builder: (_) => HMSPrebuilt(
roomCode: Constant.roomCode,
options: HMSPrebuiltOptions(
userName: AppDebugConfig.nameChangeOnPreview
? null
: "Flutter User",
endPoints: endPoints,
iOSScreenshareConfig: HMSIOSScreenshareConfig(
appGroup: "group.flutterhms",
Expand Down
Loading
Loading