Skip to content

Commit e7f759e

Browse files
committed
Merge commit '483e22b07de7ea1eac97c840ee403c247adcdcd9' into custom-lg
* commit '483e22b07de7ea1eac97c840ee403c247adcdcd9': chewie, version 1.11.0. Addresses fluttercommunity#900. Reverted Flutter 3.29 minimum on the example app due to CI conflicts. Added support for Flutter 3.29 while maintaining minimum support for 3.27. # Conflicts: # example/lib/main.dart
2 parents 62035af + 483e22b commit e7f759e

File tree

6 files changed

+34
-37
lines changed

6 files changed

+34
-37
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
# refer to https://docs.flutter.dev/development/tools/sdk/releases.
3232
# Note: The version below should be manually updated to the latest second most recent version
3333
# after a new stable version comes out.
34-
- "3.24.5"
34+
- "3.27.4"
3535
- "3.x"
3636
steps:
3737
- name: 📚 Git Checkout

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
## [1.11.0]
2+
* ⬆️ [#900](https://github.com/fluttercommunity/chewie/pull/900): Flutter `3.29` upgrade. Thanks [diegotori](https://github.com/diegotori).
3+
* **BREAKING CHANGE**: Library now requires at least Flutter version `3.27.0`, for real this time.
4+
15
## [1.10.0]
2-
* [#871](https://github.com/fluttercommunity/chewie/pull/871): Fixed pop the wrong page when changing the speed. Thanks [akmalova](https://github.com/akmalova).
6+
* 🛠️ [#871](https://github.com/fluttercommunity/chewie/pull/871): Fixed pop the wrong page when changing the speed. Thanks [akmalova](https://github.com/akmalova).
37
* **BREAKING CHANGES**:
48
* `OptionItem.onTap` now takes in a `BuildContext`.
59
* `OptionItem`'s properties are now marked as `final`. Use `copyWith` to mutate its properties into

example/lib/app/app.dart

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ import 'package:flutter/material.dart';
66
import 'package:video_player/video_player.dart';
77

88
class ChewieDemo extends StatefulWidget {
9-
const ChewieDemo({
10-
super.key,
11-
this.title = 'Chewie Demo',
12-
});
9+
const ChewieDemo({super.key, this.title = 'Chewie Demo'});
1310

1411
final String title;
1512

@@ -55,13 +52,15 @@ class _ChewieDemoState extends State<ChewieDemo> {
5552
];
5653

5754
Future<void> initializePlayer() async {
58-
_videoPlayerController1 =
59-
VideoPlayerController.networkUrl(Uri.parse(srcs[currPlayIndex]));
60-
_videoPlayerController2 =
61-
VideoPlayerController.networkUrl(Uri.parse(srcs[currPlayIndex]));
55+
_videoPlayerController1 = VideoPlayerController.networkUrl(
56+
Uri.parse(srcs[currPlayIndex]),
57+
);
58+
_videoPlayerController2 = VideoPlayerController.networkUrl(
59+
Uri.parse(srcs[currPlayIndex]),
60+
);
6261
await Future.wait([
6362
_videoPlayerController1.initialize(),
64-
_videoPlayerController2.initialize()
63+
_videoPlayerController2.initialize(),
6564
]);
6665
_createChewieController();
6766
setState(() {});
@@ -101,7 +100,7 @@ class _ChewieDemoState extends State<ChewieDemo> {
101100
TextSpan(
102101
text: 'subtitles',
103102
style: TextStyle(color: Colors.blue, fontSize: 18),
104-
)
103+
),
105104
],
106105
),
107106
),
@@ -138,9 +137,7 @@ class _ChewieDemoState extends State<ChewieDemo> {
138137
subtitleBuilder: (context, dynamic subtitle) => Container(
139138
padding: const EdgeInsets.all(10.0),
140139
child: subtitle is InlineSpan
141-
? RichText(
142-
text: subtitle,
143-
)
140+
? RichText(text: subtitle)
144141
: Text(
145142
subtitle.toString(),
146143
style: const TextStyle(color: Colors.black),
@@ -184,19 +181,15 @@ class _ChewieDemoState extends State<ChewieDemo> {
184181
platform: _platform ?? Theme.of(context).platform,
185182
),
186183
home: Scaffold(
187-
appBar: AppBar(
188-
title: Text(widget.title),
189-
),
184+
appBar: AppBar(title: Text(widget.title)),
190185
body: Column(
191186
children: <Widget>[
192187
Expanded(
193188
child: Center(
194189
child: _chewieController != null &&
195190
_chewieController!
196191
.videoPlayerController.value.isInitialized
197-
? Chewie(
198-
controller: _chewieController!,
199-
)
192+
? Chewie(controller: _chewieController!)
200193
: const Column(
201194
mainAxisAlignment: MainAxisAlignment.center,
202195
children: [
@@ -269,7 +262,7 @@ class _ChewieDemoState extends State<ChewieDemo> {
269262
child: Text("Portrait Video"),
270263
),
271264
),
272-
)
265+
),
273266
],
274267
),
275268
Row(
@@ -299,7 +292,7 @@ class _ChewieDemoState extends State<ChewieDemo> {
299292
child: Text("iOS controls"),
300293
),
301294
),
302-
)
295+
),
303296
],
304297
),
305298
Row(
@@ -332,7 +325,7 @@ class _ChewieDemoState extends State<ChewieDemo> {
332325
}
333326
},
334327
),
335-
)
328+
),
336329
],
337330
),
338331
),

example/pubspec.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ version: 1.0.0
44
publish_to: none
55

66
environment:
7-
sdk: '>=3.3.0 <4.0.0'
8-
flutter: ">=3.19.0"
7+
sdk: '>=3.6.0 <4.0.0'
8+
flutter: ">=3.27.0"
99

1010
dependencies:
1111
chewie:
1212
path: ../
1313
flutter:
1414
sdk: flutter
15+
video_player: ^2.9.3
1516

16-
video_player: ^2.9.1
1717
dev_dependencies:
1818
flutter_test:
1919
sdk: flutter
20-
flutter_lints: ^4.0.0
20+
flutter_lints: ^5.0.0
2121

2222
# For information on the generic Dart part of this file, see the
2323
# following page: https://www.dartlang.org/tools/pub/pubspec

lib/chewie.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
library chewie;
1+
library;
22

33
export 'src/chewie_player.dart';
44
export 'src/chewie_progress_colors.dart';
55
export 'src/cupertino/cupertino_controls.dart';
66
export 'src/material/material_controls.dart';
7-
export 'src/material/material_progress_bar.dart';
87
export 'src/material/material_desktop_controls.dart';
8+
export 'src/material/material_progress_bar.dart';
99
export 'src/models/index.dart';

pubspec.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
name: chewie
22
description: A video player for Flutter with Cupertino and Material play controls
3-
version: 1.10.0
3+
version: 1.11.0
44
homepage: https://github.com/fluttercommunity/chewie
55

66
environment:
7-
sdk: '>=3.5.0 <4.0.0'
8-
flutter: ">=3.24.0"
7+
sdk: '>=3.6.0 <4.0.0'
8+
flutter: ">=3.27.0"
99

1010
dependencies:
11-
cupertino_icons: ^1.0.5
11+
cupertino_icons: ^1.0.8
1212
flutter:
1313
sdk: flutter
1414
provider: ^6.1.2
15-
video_player: ^2.9.1
16-
wakelock_plus: ^1.2.8
15+
video_player: ^2.9.3
16+
wakelock_plus: ^1.2.10
1717

1818
dev_dependencies:
1919
flutter_test:
2020
sdk: flutter
21-
flutter_lints: ^4.0.0
21+
flutter_lints: ^5.0.0
2222

2323
flutter:
2424
uses-material-design: true

0 commit comments

Comments
 (0)