Skip to content

Commit 982cedc

Browse files
abdelaziz-mahdyabdelaziz-mahdy
authored
Merge pull request #186 from KhunHtetzNaing/master
upgrade dependencies & example dead videos link
2 parents 271ce69 + 3089e1e commit 982cedc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+324
-317
lines changed

‎.github/workflows/build_cross_platform.yml

+7-3
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,16 @@ jobs:
1919
name: Android
2020
runs-on: windows-latest
2121
steps:
22-
- uses: actions/setup-java@v1
23-
with:
24-
java-version: '11'
2522
- uses: actions/checkout@v2
2623
with:
2724
submodules: "true"
25+
- uses: actions/setup-java@v4
26+
with:
27+
distribution: 'zulu'
28+
java-version: '17'
29+
cache: 'gradle'
30+
check-latest: true
31+
2832
- uses: subosito/flutter-action@v2
2933
with:
3034
channel: "stable"

‎.gitignore

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Miscellaneous
2+
*.class
3+
*.log
4+
*.pyc
5+
*.swp
6+
.DS_Store
7+
.atom/
8+
.buildlog/
9+
.history
10+
.svn/
11+
12+
# IntelliJ related
13+
*.iml
14+
*.ipr
15+
*.iws
16+
.idea/
17+
18+
# The .vscode folder contains launch configuration and tasks you configure in
19+
# VS Code which you may wish to be included in version control, so this line
20+
# is commented out by default.
21+
#.vscode/
22+
23+
# Flutter/Dart/Pub related
24+
# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
25+
/pubspec.lock
26+
**/doc/api/
27+
.dart_tool/
28+
.packages
29+
build/

‎package/example/android/app/build.gradle

+11-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ android {
4040
applicationId "com.zezo357.flutter_meedu_videoplayer_example"
4141
// You can update the following values to match your application needs.
4242
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
43-
minSdkVersion 19
43+
minSdkVersion flutter.minSdkVersion
4444
targetSdkVersion flutter.targetSdkVersion
4545
versionCode flutterVersionCode.toInteger()
4646
versionName flutterVersionName
@@ -59,4 +59,13 @@ android {
5959
flutter {
6060
source '../..'
6161
}
62-
62+
// https://github.com/flutter/flutter/issues/119247#issuecomment-1405825291
63+
configurations.all {
64+
resolutionStrategy {
65+
eachDependency {
66+
if ((requested.group == "org.jetbrains.kotlin") && (requested.name.startsWith("kotlin-stdlib"))) {
67+
useVersion("1.8.22")
68+
}
69+
}
70+
}
71+
}

‎package/example/android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.7.10'
2+
ext.kotlin_version = '1.8.22'
33
repositories {
44
google()
55
mavenCentral()

‎package/example/ios/Flutter/AppFrameworkInfo.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>11.0</string>
24+
<string>12.0</string>
2525
</dict>
2626
</plist>

‎package/example/ios/PodFile

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ post_install do |installer|
3838
installer.pods_project.targets.each do |target|
3939
flutter_additional_ios_build_settings(target)
4040
end
41-
end
41+
end

‎package/example/ios/Podfile.lock

+40-39
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
PODS:
22
- auto_orientation (0.0.1):
33
- Flutter
4-
- DKImagePickerController/Core (4.3.4):
4+
- DKImagePickerController/Core (4.3.9):
55
- DKImagePickerController/ImageDataManager
66
- DKImagePickerController/Resource
7-
- DKImagePickerController/ImageDataManager (4.3.4)
8-
- DKImagePickerController/PhotoGallery (4.3.4):
7+
- DKImagePickerController/ImageDataManager (4.3.9)
8+
- DKImagePickerController/PhotoGallery (4.3.9):
99
- DKImagePickerController/Core
1010
- DKPhotoGallery
11-
- DKImagePickerController/Resource (4.3.4)
12-
- DKPhotoGallery (0.0.17):
13-
- DKPhotoGallery/Core (= 0.0.17)
14-
- DKPhotoGallery/Model (= 0.0.17)
15-
- DKPhotoGallery/Preview (= 0.0.17)
16-
- DKPhotoGallery/Resource (= 0.0.17)
11+
- DKImagePickerController/Resource (4.3.9)
12+
- DKPhotoGallery (0.0.19):
13+
- DKPhotoGallery/Core (= 0.0.19)
14+
- DKPhotoGallery/Model (= 0.0.19)
15+
- DKPhotoGallery/Preview (= 0.0.19)
16+
- DKPhotoGallery/Resource (= 0.0.19)
1717
- SDWebImage
1818
- SwiftyGif
19-
- DKPhotoGallery/Core (0.0.17):
19+
- DKPhotoGallery/Core (0.0.19):
2020
- DKPhotoGallery/Model
2121
- DKPhotoGallery/Preview
2222
- SDWebImage
2323
- SwiftyGif
24-
- DKPhotoGallery/Model (0.0.17):
24+
- DKPhotoGallery/Model (0.0.19):
2525
- SDWebImage
2626
- SwiftyGif
27-
- DKPhotoGallery/Preview (0.0.17):
27+
- DKPhotoGallery/Preview (0.0.19):
2828
- DKPhotoGallery/Model
2929
- DKPhotoGallery/Resource
3030
- SDWebImage
3131
- SwiftyGif
32-
- DKPhotoGallery/Resource (0.0.17):
32+
- DKPhotoGallery/Resource (0.0.19):
3333
- SDWebImage
3434
- SwiftyGif
3535
- file_picker (0.0.1):
@@ -38,11 +38,11 @@ PODS:
3838
- Flutter (1.0.0)
3939
- flutter_meedu_videoplayer (0.0.1):
4040
- Flutter
41-
- fvp (0.0.1):
41+
- fvp (0.17.0):
4242
- Flutter
4343
- FlutterMacOS
44-
- mdk
45-
- mdk (0.10.3.0)
44+
- mdk (~> 0.28.0)
45+
- mdk (0.28.0)
4646
- native_device_orientation (0.0.1):
4747
- Flutter
4848
- package_info_plus (0.4.5):
@@ -52,15 +52,16 @@ PODS:
5252
- FlutterMacOS
5353
- screen_brightness_ios (0.1.0):
5454
- Flutter
55-
- SDWebImage (5.15.8):
56-
- SDWebImage/Core (= 5.15.8)
57-
- SDWebImage/Core (5.15.8)
55+
- SDWebImage (5.19.2):
56+
- SDWebImage/Core (= 5.19.2)
57+
- SDWebImage/Core (5.19.2)
5858
- shared_preferences_foundation (0.0.1):
5959
- Flutter
6060
- FlutterMacOS
61-
- SwiftyGif (5.4.4)
61+
- SwiftyGif (5.4.5)
6262
- video_player_avfoundation (0.0.1):
6363
- Flutter
64+
- FlutterMacOS
6465
- volume_controller (0.0.1):
6566
- Flutter
6667
- wakelock_plus (0.0.1):
@@ -77,7 +78,7 @@ DEPENDENCIES:
7778
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
7879
- screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`)
7980
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
80-
- video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`)
81+
- video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
8182
- volume_controller (from `.symlinks/plugins/volume_controller/ios`)
8283
- wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
8384

@@ -111,32 +112,32 @@ EXTERNAL SOURCES:
111112
shared_preferences_foundation:
112113
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
113114
video_player_avfoundation:
114-
:path: ".symlinks/plugins/video_player_avfoundation/ios"
115+
:path: ".symlinks/plugins/video_player_avfoundation/darwin"
115116
volume_controller:
116117
:path: ".symlinks/plugins/volume_controller/ios"
117118
wakelock_plus:
118119
:path: ".symlinks/plugins/wakelock_plus/ios"
119120

120121
SPEC CHECKSUMS:
121122
auto_orientation: 102ed811a5938d52c86520ddd7ecd3a126b5d39d
122-
DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
123-
DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
124-
file_picker: ce3938a0df3cc1ef404671531facef740d03f920
125-
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
123+
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
124+
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
125+
file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655
126+
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
126127
flutter_meedu_videoplayer: 5b898478d509443ff74817795882f5430e2b7001
127-
fvp: cb4a2438331cfd98abcdcac3ae49d0b0456274a2
128-
mdk: 61c96dd73d548d4ee01c45c3b82fa013e4a6695a
129-
native_device_orientation: 3b4cfc9565a7b879cc4fde282b3e27745e852d0d
130-
package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7
131-
path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
132-
screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
133-
SDWebImage: cb032eba469c54e0000e78bcb0a13cdde0a52798
134-
shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
135-
SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
136-
video_player_avfoundation: 81e49bb3d9fb63dccf9fa0f6d877dc3ddbeac126
128+
fvp: 6e4e1f45b22816d81da8f565799a13e05e9b3383
129+
mdk: 66f31cfd10f1339837797c95842cd6ce3466ff4e
130+
native_device_orientation: 348b10c346a60ebbc62fb235a4fdb5d1b61a8f55
131+
package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
132+
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
133+
screen_brightness_ios: 7437207a2a9bc56553aa10f782afecf830b4c4e2
134+
SDWebImage: dfe95b2466a9823cf9f0c6d01217c06550d7b29a
135+
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
136+
SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
137+
video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
137138
volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
138-
wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
139+
wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
139140

140-
PODFILE CHECKSUM: 2449ef18f5fe4be9d998ede69d54b361b1de6a78
141+
PODFILE CHECKSUM: 0dbd5a87e0ace00c9610d2037ac22083a01f861d
141142

142-
COCOAPODS: 1.12.1
143+
COCOAPODS: 1.15.2

‎package/example/ios/Runner.xcodeproj/project.pbxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
97C146E61CF9000F007C117D /* Project object */ = {
157157
isa = PBXProject;
158158
attributes = {
159-
LastUpgradeCheck = 1430;
159+
LastUpgradeCheck = 1510;
160160
ORGANIZATIONNAME = "";
161161
TargetAttributes = {
162162
97C146ED1CF9000F007C117D = {

‎package/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎package/example/lib/main.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ void main() {
3838
});
3939
initMeeduPlayer(
4040
androidUseFVP: true,
41-
iosUseFVP: false,
41+
iosUseFVP: true,
4242
);
4343
runApp(const MyApp());
4444
}
4545

4646
class MyApp extends StatelessWidget {
47-
const MyApp({Key? key}) : super(key: key);
47+
const MyApp({super.key});
4848

4949
@override
5050
Widget build(BuildContext context) {

‎package/example/lib/pages/auto_hidecontrol_disable.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class _AutoHideControlsDisableState extends State<AutoHideControlsDisable> {
4444
DataSource(
4545
type: DataSourceType.network,
4646
source:
47-
"https://movietrailers.apple.com/movies/paramount/the-spongebob-movie-sponge-on-the-run/the-spongebob-movie-sponge-on-the-run-big-game_h720p.mov",
47+
"https://storage.googleapis.com/gtv-videos-bucket/sample/ForBiggerMeltdowns.mp4",
4848
),
4949
autoplay: true,
5050
looping: false);

‎package/example/lib/pages/basic_example_page.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class _BasicExamplePageState extends State<BasicExamplePage> {
4343
DataSource(
4444
type: DataSourceType.network,
4545
source:
46-
"https://movietrailers.apple.com/movies/paramount/the-spongebob-movie-sponge-on-the-run/the-spongebob-movie-sponge-on-the-run-big-game_h720p.mov",
46+
"https://storage.googleapis.com/gtv-videos-bucket/sample/ForBiggerMeltdowns.mp4",
4747
),
4848
autoplay: true,
4949
looping: false);

‎package/example/lib/pages/basic_example_with_looping_page.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class _BasicExampleWithLoopingPageState
3939
DataSource(
4040
type: DataSourceType.network,
4141
source:
42-
"https://movietrailers.apple.com/movies/paramount/the-spongebob-movie-sponge-on-the-run/the-spongebob-movie-sponge-on-the-run-big-game_h720p.mov",
42+
"https://storage.googleapis.com/gtv-videos-bucket/sample/ForBiggerMeltdowns.mp4",
4343
),
4444
autoplay: true,
4545
looping: true);

‎package/example/lib/pages/basic_lock_controls_example_page.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class _BasicLockControlsExamplePageState
4545
DataSource(
4646
type: DataSourceType.network,
4747
source:
48-
"https://movietrailers.apple.com/movies/paramount/the-spongebob-movie-sponge-on-the-run/the-spongebob-movie-sponge-on-the-run-big-game_h720p.mov",
48+
"https://storage.googleapis.com/gtv-videos-bucket/sample/ForBiggerMeltdowns.mp4",
4949
),
5050
autoplay: true,
5151
looping: false);

‎package/example/lib/pages/basic_pip_example_page.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class _BasicPipExamplePageState extends State<BasicPipExamplePage> {
4343
DataSource(
4444
type: DataSourceType.network,
4545
source:
46-
"https://movietrailers.apple.com/movies/paramount/the-spongebob-movie-sponge-on-the-run/the-spongebob-movie-sponge-on-the-run-big-game_h720p.mov",
46+
"https://storage.googleapis.com/gtv-videos-bucket/sample/ForBiggerMeltdowns.mp4",
4747
),
4848
autoplay: true,
4949
looping: false);

‎package/example/lib/pages/custom_background.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class _CustomBackgroundPageState extends State<CustomBackgroundPage> {
4343
DataSource(
4444
type: DataSourceType.network,
4545
source:
46-
"https://movietrailers.apple.com/movies/paramount/the-spongebob-movie-sponge-on-the-run/the-spongebob-movie-sponge-on-the-run-big-game_h720p.mov",
46+
"https://storage.googleapis.com/gtv-videos-bucket/sample/ForBiggerMeltdowns.mp4",
4747
),
4848
autoplay: true,
4949
looping: false);

‎package/example/lib/pages/custom_controls.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class _CustomControlsExamplePageState extends State<CustomControlsExamplePage> {
3939
DataSource(
4040
type: DataSourceType.network,
4141
source:
42-
"https://movietrailers.apple.com/movies/paramount/the-spongebob-movie-sponge-on-the-run/the-spongebob-movie-sponge-on-the-run-big-game_h720p.mov",
42+
"https://storage.googleapis.com/gtv-videos-bucket/sample/ForBiggerMeltdowns.mp4",
4343
),
4444
autoplay: true,
4545
);

‎package/example/lib/pages/custom_icon_size.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class _CustomSizesExamplePageState extends State<CustomSizesExamplePage> {
4444
DataSource(
4545
type: DataSourceType.network,
4646
source:
47-
"https://movietrailers.apple.com/movies/paramount/the-spongebob-movie-sponge-on-the-run/the-spongebob-movie-sponge-on-the-run-big-game_h720p.mov",
47+
"https://storage.googleapis.com/gtv-videos-bucket/sample/ForBiggerMeltdowns.mp4",
4848
),
4949
autoplay: true,
5050
);

‎package/example/lib/pages/custom_icons_example.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class _CustomIconsExamplePageState extends State<CustomIconsExamplePage> {
5353
DataSource(
5454
type: DataSourceType.network,
5555
source:
56-
"https://movietrailers.apple.com/movies/paramount/the-spongebob-movie-sponge-on-the-run/the-spongebob-movie-sponge-on-the-run-big-game_h720p.mov",
56+
"https://storage.googleapis.com/gtv-videos-bucket/sample/ForBiggerMeltdowns.mp4",
5757
),
5858
autoplay: true,
5959
);

‎package/example/lib/pages/custom_subtitles.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class _CustomNetworkWithSubtitlesPageState
3535
await _controller.setDataSource(
3636
DataSource(
3737
source:
38-
'https://thepaciellogroup.github.io/AT-browser-tests/video/ElephantsDream.mp4',
38+
'https://storage.googleapis.com/gtv-videos-bucket/sample/ForBiggerMeltdowns.mp4',
3939
type: DataSourceType.network,
4040
closedCaptionFile: _loadCaptions(),
4141
),

‎package/example/lib/pages/disabled_buttons_example_page.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class _DisabledButtonsExampleState extends State<DisabledButtonsExample> {
5454
DataSource(
5555
type: DataSourceType.network,
5656
source:
57-
"https://movietrailers.apple.com/movies/paramount/the-spongebob-movie-sponge-on-the-run/the-spongebob-movie-sponge-on-the-run-big-game_h720p.mov",
57+
"https://storage.googleapis.com/gtv-videos-bucket/sample/ForBiggerMeltdowns.mp4",
5858
),
5959
autoplay: true,
6060
);

‎package/example/lib/pages/gridview_example.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class _VideoItemState extends State<VideoItem>
5959
_controller.setDataSource(
6060
DataSource(
6161
source:
62-
'https://movietrailers.apple.com/movies/paramount/the-spongebob-movie-sponge-on-the-run/the-spongebob-movie-sponge-on-the-run-big-game_h720p.mov',
62+
'https://storage.googleapis.com/gtv-videos-bucket/sample/ForBiggerMeltdowns.mp4',
6363
type: DataSourceType.network,
6464
),
6565
autoplay: false,

‎package/example/lib/pages/listview_example.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class _VideoItemState extends State<VideoItem>
5454
_controller.setDataSource(
5555
DataSource(
5656
source:
57-
'https://movietrailers.apple.com/movies/paramount/the-spongebob-movie-sponge-on-the-run/the-spongebob-movie-sponge-on-the-run-big-game_h720p.mov',
57+
'https://storage.googleapis.com/gtv-videos-bucket/sample/ForBiggerMeltdowns.mp4',
5858
type: DataSourceType.network,
5959
httpHeaders: {
6060
// u can change the link to ur referr

0 commit comments

Comments
 (0)