Skip to content

Commit 9580d03

Browse files
committed
Added more fixes related to supporting Flutter 3.29.
1 parent bb509b5 commit 9580d03

File tree

5 files changed

+8
-39
lines changed

5 files changed

+8
-39
lines changed

lib/src/material/color_compat_extensions.dart

Lines changed: 0 additions & 30 deletions
This file was deleted.

lib/src/material/material_controls.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import 'package:chewie/src/center_seek_button.dart';
55
import 'package:chewie/src/chewie_player.dart';
66
import 'package:chewie/src/chewie_progress_colors.dart';
77
import 'package:chewie/src/helpers/utils.dart';
8-
import 'package:chewie/src/material/color_compat_extensions.dart';
98
import 'package:chewie/src/material/material_progress_bar.dart';
109
import 'package:chewie/src/material/widgets/options_dialog.dart';
1110
import 'package:chewie/src/material/widgets/playback_speed_dialog.dart';
@@ -456,7 +455,7 @@ class _MaterialControlsState extends State<MaterialControls>
456455
text: '/ ${formatDuration(duration)}',
457456
style: TextStyle(
458457
fontSize: 14.0,
459-
color: Colors.white.withOpacityCompat(.75),
458+
color: Colors.white.withValues(alpha: .75),
460459
fontWeight: FontWeight.normal,
461460
),
462461
),
@@ -667,10 +666,10 @@ class _MaterialControlsState extends State<MaterialControls>
667666
handleColor: Theme.of(context).colorScheme.secondary,
668667
bufferedColor: Theme.of(
669668
context,
670-
).colorScheme.surface.withOpacityCompat(0.5),
669+
).colorScheme.surface.withValues(alpha: 0.5),
671670
backgroundColor: Theme.of(
672671
context,
673-
).disabledColor.withOpacityCompat(.5),
672+
).disabledColor.withValues(alpha: .5),
674673
),
675674
draggableProgressBar: chewieController.draggableProgressBar,
676675
),

lib/src/material/material_desktop_controls.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import 'package:chewie/src/center_play_button.dart';
55
import 'package:chewie/src/chewie_player.dart';
66
import 'package:chewie/src/chewie_progress_colors.dart';
77
import 'package:chewie/src/helpers/utils.dart';
8-
import 'package:chewie/src/material/color_compat_extensions.dart';
98
import 'package:chewie/src/material/material_progress_bar.dart';
109
import 'package:chewie/src/material/widgets/options_dialog.dart';
1110
import 'package:chewie/src/material/widgets/playback_speed_dialog.dart';
@@ -628,10 +627,10 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
628627
handleColor: Theme.of(context).colorScheme.secondary,
629628
bufferedColor: Theme.of(
630629
context,
631-
).colorScheme.surface.withOpacityCompat(0.5),
630+
).colorScheme.surface.withValues(alpha: 0.5),
632631
backgroundColor: Theme.of(
633632
context,
634-
).disabledColor.withOpacityCompat(0.5),
633+
).disabledColor.withValues(alpha: 0.5),
635634
),
636635
draggableProgressBar: chewieController.draggableProgressBar,
637636
),

lib/src/models/subtitle_model.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ class Subtitles {
1010
List<Subtitle?> getByPosition(Duration position) {
1111
final found =
1212
subtitle.where((item) {
13-
if (item != null)
13+
if (item != null) {
1414
return position >= item.start && position <= item.end;
15+
}
1516
return false;
1617
}).toList();
1718

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies:
1818
dev_dependencies:
1919
flutter_test:
2020
sdk: flutter
21-
flutter_lints: ^6.0.0
21+
flutter_lints: ^5.0.0
2222

2323
flutter:
2424
uses-material-design: true

0 commit comments

Comments
 (0)