Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to use flower.mp4 from files.daohoangson.com #1325

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all 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 demo_app/integration_test/auto_resize_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ void main() {
patrolTest('VideoPlayer', ($) async {
final test = _AspectRatioTest(
child: VideoPlayer(
'https://interactive-examples.mdn.mozilla.net/media/cc0-videos/flower.mp4',
'https://files.daohoangson.com/public/fwfh/flower.mp4',
aspectRatio: 1,
loadingBuilder: (_, __, ___) =>
const Center(child: CircularProgressIndicator()),
Expand Down
9 changes: 5 additions & 4 deletions demo_app/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ PODS:
- Flutter
- webview_flutter_wkwebview (0.0.1):
- Flutter
- FlutterMacOS

DEPENDENCIES:
- audio_session (from `.symlinks/plugins/audio_session/ios`)
Expand All @@ -38,7 +39,7 @@ DEPENDENCIES:
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
- video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
- wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
- webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`)
- webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/darwin`)

SPEC REPOS:
trunk:
Expand Down Expand Up @@ -66,21 +67,21 @@ EXTERNAL SOURCES:
wakelock_plus:
:path: ".symlinks/plugins/wakelock_plus/ios"
webview_flutter_wkwebview:
:path: ".symlinks/plugins/webview_flutter_wkwebview/ios"
:path: ".symlinks/plugins/webview_flutter_wkwebview/darwin"

SPEC CHECKSUMS:
audio_session: 088d2483ebd1dc43f51d253d4a1c517d9a2e7207
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
patrol: 0564cee315ff6c86fb802b3647db05cc2d3d0624
sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
webview_flutter_wkwebview: 2a23822e9039b7b1bc52e5add778e5d89ad488d1
webview_flutter_wkwebview: 0982481e3d9c78fd5c6f62a002fcd24fc791f1e4

PODFILE CHECKSUM: 4047b237a92efec4e335c96f6d2daf630bacba96

Expand Down
18 changes: 12 additions & 6 deletions demo_app/ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_IDENTITY = "Apple Development";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
Expand Down Expand Up @@ -628,6 +628,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Distribution";
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
Expand All @@ -648,6 +649,7 @@
baseConfigurationReference = 3B2390CFDC28229E712F0CAC /* Pods-RunnerTests.debug.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -666,7 +668,7 @@
baseConfigurationReference = 2FCC694B88AA37F582CE3915 /* Pods-RunnerTests.release.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_IDENTITY = "Apple Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = C4S4H36U6P;
Expand All @@ -685,6 +687,7 @@
baseConfigurationReference = DD845412D22E33FB3509B498 /* Pods-RunnerTests.profile.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_IDENTITY = "Apple Distribution";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
GENERATE_INFOPLIST_FILE = YES;
Expand Down Expand Up @@ -725,7 +728,7 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_IDENTITY = "Apple Development";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand Down Expand Up @@ -782,7 +785,7 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_IDENTITY = "Apple Development";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
Expand Down Expand Up @@ -813,6 +816,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
Expand All @@ -835,7 +839,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_IDENTITY = "Apple Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = C4S4H36U6P;
Expand Down Expand Up @@ -865,6 +869,7 @@
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
Expand Down Expand Up @@ -894,7 +899,7 @@
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = C4S4H36U6P;
Expand Down Expand Up @@ -925,6 +930,7 @@
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
Expand Down
2 changes: 1 addition & 1 deletion demo_app/lib/screens/hello_world.dart
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ const kHtml = '''
<h4>&lt;VIDEO&gt;</h4>
<figure>
<video controls width="250">
<source src="https://interactive-examples.mdn.mozilla.net/media/cc0-videos/flower.mp4" type="video/mp4">
<source src="https://files.daohoangson.com/public/fwfh/flower.mp4" type="video/mp4">
<code>VIDEO</code> support is not enabled.
</video>
<figcaption>Source: <a href="https://developer.mozilla.org/en-US/docs/Web/HTML/Element/video">developer.mozilla.org</a></figcaption>
Expand Down
4 changes: 2 additions & 2 deletions demo_app/lib/screens/video.dart
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class _State extends State<VideoScreen> {
_html,
key: Key(_html),
baseUrl: Uri.parse(
'https://interactive-examples.mdn.mozilla.net/pages/tabbed/video.html',
'https://files.daohoangson.com/public/fwfh/',
),
),
),
Expand Down Expand Up @@ -97,7 +97,7 @@ class _State extends State<VideoScreen> {
_html = """
<figure>
<video ${attributes.join(' ')}>
<source src="/media/cc0-videos/flower.mp4" type="video/mp4">
<source src="flower.mp4" type="video/mp4">
<code>VIDEO</code> support is not enabled.
</video>
<figcaption>Source: <a href="https://developer.mozilla.org/en-US/docs/Web/HTML/Element/video">developer.mozilla.org</a></figcaption>
Expand Down
9 changes: 8 additions & 1 deletion demo_app/macos/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ PODS:
- FlutterMacOS
- wakelock_plus (0.0.1):
- FlutterMacOS
- webview_flutter_wkwebview (0.0.1):
- Flutter
- FlutterMacOS

DEPENDENCIES:
- audio_session (from `Flutter/ephemeral/.symlinks/plugins/audio_session/macos`)
Expand All @@ -36,6 +39,7 @@ DEPENDENCIES:
- url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
- video_player_avfoundation (from `Flutter/ephemeral/.symlinks/plugins/video_player_avfoundation/darwin`)
- wakelock_plus (from `Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos`)
- webview_flutter_wkwebview (from `Flutter/ephemeral/.symlinks/plugins/webview_flutter_wkwebview/darwin`)

SPEC REPOS:
trunk:
Expand All @@ -62,19 +66,22 @@ EXTERNAL SOURCES:
:path: Flutter/ephemeral/.symlinks/plugins/video_player_avfoundation/darwin
wakelock_plus:
:path: Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos
webview_flutter_wkwebview:
:path: Flutter/ephemeral/.symlinks/plugins/webview_flutter_wkwebview/darwin

SPEC CHECKSUMS:
audio_session: dea1f41890dbf1718f04a56f1d6150fd50039b72
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
just_audio: 9b67ca7b97c61cfc9784ea23cd8cc55eb226d489
package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce
package_info_plus: fa739dd842b393193c5ca93c26798dff6e3d0e0c
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
patrol: 0564cee315ff6c86fb802b3647db05cc2d3d0624
sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399
video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
wakelock_plus: 4783562c9a43d209c458cb9b30692134af456269
webview_flutter_wkwebview: 0982481e3d9c78fd5c6f62a002fcd24fc791f1e4

PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367

Expand Down
2 changes: 1 addition & 1 deletion demo_app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ dev_dependencies:
golden_toolkit: ^0.15.0
lint: any
measurer: ^2.1.1
patrol: ^3.7.2
patrol: ^3.10.0
test: any

flutter:
Expand Down
4 changes: 2 additions & 2 deletions demo_app/test/goldens.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
"U": "This is an <u>underline</u> text.",
"UL": "<ul>\n <li>One</li>\n <li>\n Two\n <ul>\n <li>2.1</li>\n <li>\n 2.2\n <ul>\n <li>2.2.1</li>\n <li>2.2.2</li>\n <li>2.2.3</li>\n </ul>\n </li>\n <li>2.3</li>\n </ul>\n </li>\n <li>Three</li>\n</ul>",
"VAR": "<var>x</var> = 1",
"VIDEO": "<video controls width=\"250\">\n <source src=\"https://interactive-examples.mdn.mozilla.net/media/cc0-videos/flower.mp4\" type=\"video/mp4\">\n <code>VIDEO</code> support is not enabled.\n</video>",
"VIDEO": "<video controls width=\"250\">\n <source src=\"https://files.daohoangson.com/public/fwfh/flower.mp4\" type=\"video/mp4\">\n <code>VIDEO</code> support is not enabled.\n</video>",
"attribute/align/center": "<div align=\"center\">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut non elementum quam. Suspendisse odio diam, maximus pellentesque nunc a, pulvinar facilisis erat. Vivamus a viverra sem. Vivamus vehicula nibh mi, quis ornare orci laoreet vitae. Maecenas sagittis rutrum nisl nec dignissim. Suspendisse cursus est ut ultrices volutpat. Cras vel vestibulum arcu. Curabitur eget molestie nunc. Quisque fringilla quam vitae rhoncus lacinia. Vivamus id laoreet metus. Etiam sed mollis tellus. Vivamus facilisis faucibus libero eu interdum. Pellentesque laoreet magna porta viverra faucibus.</div>",
"attribute/align/left": "<div align=\"left\">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut non elementum quam. Suspendisse odio diam, maximus pellentesque nunc a, pulvinar facilisis erat. Vivamus a viverra sem. Vivamus vehicula nibh mi, quis ornare orci laoreet vitae. Maecenas sagittis rutrum nisl nec dignissim. Suspendisse cursus est ut ultrices volutpat. Cras vel vestibulum arcu. Curabitur eget molestie nunc. Quisque fringilla quam vitae rhoncus lacinia. Vivamus id laoreet metus. Etiam sed mollis tellus. Vivamus facilisis faucibus libero eu interdum. Pellentesque laoreet magna porta viverra faucibus.</div>",
"attribute/align/right": "<div align=\"right\">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut non elementum quam. Suspendisse odio diam, maximus pellentesque nunc a, pulvinar facilisis erat. Vivamus a viverra sem. Vivamus vehicula nibh mi, quis ornare orci laoreet vitae. Maecenas sagittis rutrum nisl nec dignissim. Suspendisse cursus est ut ultrices volutpat. Cras vel vestibulum arcu. Curabitur eget molestie nunc. Quisque fringilla quam vitae rhoncus lacinia. Vivamus id laoreet metus. Etiam sed mollis tellus. Vivamus facilisis faucibus libero eu interdum. Pellentesque laoreet magna porta viverra faucibus.</div>",
Expand Down Expand Up @@ -230,4 +230,4 @@
"tag/OL/type_upper-roman": "<ol type=\"I\"><li>One</li><li>Two</li><li>Three</li><ol>",
"tag/TABLE/colspan": "<table border=\"1\">\n <caption>Source: <a href=\"https://www.w3schools.com/tags/att_td_colspan.asp\">w3schools</a></caption>\n <tr>\n <th>Month</th>\n <th>Savings</th>\n </tr>\n <tr>\n <td>January</td>\n <td>$100</td>\n </tr>\n <tr>\n <td>February</td>\n <td>$80</td>\n </tr>\n <tr>\n <td colspan=\"2\">Sum: $180</td>\n </tr>\n</table>",
"tag/TABLE/rowspan": "<table border=\"1\">\n <caption>Source: <a href=\"https://www.w3schools.com/tags/att_td_colspan.asp\">w3schools</a></caption>\n <tr>\n <th>Month</th>\n <th>Savings</th>\n <th>Savings for holiday!</th>\n </tr>\n <tr>\n <td>January</td>\n <td>$100</td>\n <td rowspan=\"2\">$50</td>\n </tr>\n <tr>\n <td>February</td>\n <td>$80</td>\n </tr>\n</table>"
}
}
Binary file modified demo_app/test/goldens/VIDEO.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/fwfh_chewie/example/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class MyApp extends StatelessWidget {
child: HtmlWidget(
'''
<video controls width="250">
<source src="https://interactive-examples.mdn.mozilla.net/media/cc0-videos/flower.mp4" type="video/mp4">
<source src="https://files.daohoangson.com/public/fwfh/flower.mp4" type="video/mp4">
<code>VIDEO</code> support is not enabled.
</video>''',
factoryBuilder: () => MyWidgetFactory(),
Expand Down
Loading