Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
2 changes: 1 addition & 1 deletion example/lib/app/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ class _ChewieDemoState extends State<ChewieDemo> {

int currPlayIndex = 0;

Future<void> toggleVideo() async {
Future<void> toggleVideo(BuildContext context) async {
await _videoPlayerController1.pause();
currPlayIndex += 1;
if (currPlayIndex >= srcs.length) {
Expand Down
2 changes: 1 addition & 1 deletion lib/src/cupertino/widgets/cupertino_options_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class _CupertinoOptionsDialogState extends State<CupertinoOptionsDialog> {
actions: widget.options
.map(
(option) => CupertinoActionSheetAction(
onPressed: () => option.onTap!(),
onPressed: () => option.onTap!(context),
child: Text(option.title),
),
)
Expand Down
11 changes: 7 additions & 4 deletions lib/src/material/material_controls.dart
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,10 @@ class _MaterialControlsState extends State<MaterialControls>
);
}

Widget _buildOptionsButton() {
List<OptionItem> _buildOptions(BuildContext context) {
final options = <OptionItem>[
OptionItem(
onTap: () async {
onTap: (context) async {
Navigator.pop(context);
_onSpeedButtonTap();
},
Expand All @@ -178,7 +178,10 @@ class _MaterialControlsState extends State<MaterialControls>
chewieController.additionalOptions!(context).isNotEmpty) {
options.addAll(chewieController.additionalOptions!(context));
}
return options;
}

Widget _buildOptionsButton() {
return AnimatedOpacity(
opacity: notifier.hideStuff ? 0.0 : 1.0,
duration: const Duration(milliseconds: 250),
Expand All @@ -187,14 +190,14 @@ class _MaterialControlsState extends State<MaterialControls>
_hideTimer?.cancel();

if (chewieController.optionsBuilder != null) {
await chewieController.optionsBuilder!(context, options);
await chewieController.optionsBuilder!(context, _buildOptions(context));
} else {
await showModalBottomSheet<OptionItem>(
context: context,
isScrollControlled: true,
useRootNavigator: chewieController.useRootNavigator,
builder: (context) => OptionsDialog(
options: options,
options: _buildOptions(context),
cancelButtonText:
chewieController.optionsTranslation?.cancelButtonText,
),
Expand Down
2 changes: 1 addition & 1 deletion lib/src/material/material_desktop_controls.dart
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
}) {
final options = <OptionItem>[
OptionItem(
onTap: () async {
onTap: (context) async {
Navigator.pop(context);
_onSpeedButtonTap();
},
Expand Down
2 changes: 1 addition & 1 deletion lib/src/material/widgets/options_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class _OptionsDialogState extends State<OptionsDialog> {
itemCount: widget.options.length,
itemBuilder: (context, i) {
return ListTile(
onTap: widget.options[i].onTap,
onTap: () => widget.options[i].onTap?.call(context),
leading: Icon(widget.options[i].iconData),
title: Text(widget.options[i].title),
subtitle: widget.options[i].subtitle != null
Expand Down
4 changes: 2 additions & 2 deletions lib/src/models/option_item.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ class OptionItem {
this.subtitle,
});

Function()? onTap;
Function(BuildContext context)? onTap;
IconData iconData;
String title;
String? subtitle;

OptionItem copyWith({
Function()? onTap,
Function(BuildContext context)? onTap,
IconData? iconData,
String? title,
String? subtitle,
Expand Down