From e52362282fac3dbc2fe1dff97ee2d81d04d43a71 Mon Sep 17 00:00:00 2001 From: Elena Nazarova Date: Fri, 8 Dec 2023 22:03:06 +0300 Subject: [PATCH] =?UTF-8?q?PSDK-1153=20-=20=D0=9F=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B0=20=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=D0=B0=20=D0=BD=D0=B0?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=BE=D0=B5=D0=BA=20=D0=B8=20=D0=B2=D1=8B?= =?UTF-8?q?=D0=B2=D0=BE=D0=B4=D0=B0=20=D1=81=D1=83=D0=B1=D1=82=D0=B8=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/bloc/playerview_bloc.dart | 2 +- .../presentation/player_settings_view.dart | 42 ++++++++++--------- .../presentation/player_view.dart | 10 ++--- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/nut_player/example/lib/src/features/player_screen/domain/bloc/playerview_bloc.dart b/nut_player/example/lib/src/features/player_screen/domain/bloc/playerview_bloc.dart index 4dacf5e..95eb96c 100644 --- a/nut_player/example/lib/src/features/player_screen/domain/bloc/playerview_bloc.dart +++ b/nut_player/example/lib/src/features/player_screen/domain/bloc/playerview_bloc.dart @@ -84,7 +84,7 @@ class PlayerViewBloc extends Bloc { _subtitlesListener = () { final subtitles = controller.value.subtitles; if (subtitles != null) { - if (subtitles.isNotEmpty) { add(SubsReceivedEvent(subtitles)); } + if (subtitles.length > 1) { add(SubsReceivedEvent(subtitles)); } _listenToChanges(_subtitlesListener, false); _subtitlesListener = null; } diff --git a/nut_player/example/lib/src/features/player_screen/presentation/player_settings_view.dart b/nut_player/example/lib/src/features/player_screen/presentation/player_settings_view.dart index a70581b..b598993 100644 --- a/nut_player/example/lib/src/features/player_screen/presentation/player_settings_view.dart +++ b/nut_player/example/lib/src/features/player_screen/presentation/player_settings_view.dart @@ -1,5 +1,4 @@ import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; import '../../../common/models/option_data.dart'; class PlayerSettingsView extends StatelessWidget { @@ -10,21 +9,28 @@ class PlayerSettingsView extends StatelessWidget { @override Widget build(BuildContext context) { - return ListView.builder( - shrinkWrap: true, - itemBuilder: (context, index) { - final item = options[index]; - return Column(children: [ - _buildNavTile(item, context), - _buildSeparator() - ]); - }, - itemCount: options.length, + return Container( + decoration: const BoxDecoration( + color: CupertinoColors.white, + borderRadius: BorderRadius.vertical(top: Radius.circular(5)) + ), + child: ListView.builder( + shrinkWrap: true, + padding: const EdgeInsets.only(top: 5, bottom: 30), + itemBuilder: (context, index) { + final item = options[index]; + return Column(children: [ + _buildNavTile(item, context), + _buildSeparator() + ]); + }, + itemCount: options.length, + ), ); } Widget _buildNavTile(OptionDataContainer option, BuildContext context) { - return ListTile( + return CupertinoListTile( title: Row( children: [ Text(option.title, style: TextStyle(color: CupertinoColors.black.withOpacity(0.45), fontWeight: FontWeight.w400)), @@ -81,8 +87,7 @@ class PlayerSettingsView extends StatelessWidget { } Widget _buildBackButton(OptionDataContainer option, BuildContext context) { - return Material( - child: ListTile( + return CupertinoListTile( title: Row( children: [ const Icon(CupertinoIcons.chevron_back, color: CupertinoColors.systemGrey), @@ -93,7 +98,7 @@ class PlayerSettingsView extends StatelessWidget { onTap: () { Navigator.of(context).pop(); }, - )); + ); } Widget _buildSeparator() { @@ -108,11 +113,10 @@ class PlayerSettingsView extends StatelessWidget { final currentOption = option.options[index]; final isSelected = option.selectedIndex == index; - return Material( - child: ListTile( + return CupertinoListTile( title: Row( children: [ - if (isSelected) const Icon(CupertinoIcons.checkmark), + if (isSelected) const Icon(CupertinoIcons.checkmark, color: CupertinoColors.black), SizedBox(width: (isSelected) ? 6 : 30), Text(currentOption.title, style: const TextStyle(color: CupertinoColors.black, fontWeight: FontWeight.w400)), const Spacer() @@ -125,6 +129,6 @@ class PlayerSettingsView extends StatelessWidget { Navigator.of(context)..pop()..pop(); } }, - )); + ); } } \ No newline at end of file diff --git a/nut_player/example/lib/src/features/player_screen/presentation/player_view.dart b/nut_player/example/lib/src/features/player_screen/presentation/player_view.dart index 38f9481..5f308c3 100644 --- a/nut_player/example/lib/src/features/player_screen/presentation/player_view.dart +++ b/nut_player/example/lib/src/features/player_screen/presentation/player_view.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:nut_player_example/src/common/models/option_data.dart'; @@ -62,10 +61,7 @@ class _PlayerViewState extends State { }); } case 'pluginSkinSettingsAction': - showModalBottomSheet( - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(5.0), - ), + showCupertinoModalPopup( context: context, builder: (_) { final speedSettings = PlayerViewController.playbackSettings.firstWhere((element) => element.key == const Key('PlaybackSpeedSettingID')); @@ -260,7 +256,7 @@ class _PlayerViewState extends State { } final subtitles = _createSubs(bloc); - if (subtitles != null && subtitles.options.length > 1) { + if (subtitles != null) { final subtitleWidget = _buildOptionsView(subtitles, bloc); widgets.insert(2, subtitleWidget); } @@ -366,7 +362,7 @@ class _PlayerViewState extends State { child: Container( width: size.width, height: size.height, - color: Colors.black, + color: CupertinoColors.black, child: videoPlayer, ) );