From 7f8a72355f4fc2ffd3c292d8e62e88082071fffd Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Tue, 20 Oct 2020 14:55:29 -0700 Subject: [PATCH 1/2] fix deprecation --- packages/camera/CHANGELOG.md | 4 ++++ packages/camera/example/lib/main.dart | 3 ++- packages/camera/pubspec.yaml | 2 +- packages/webview_flutter/CHANGELOG.md | 4 ++++ packages/webview_flutter/example/lib/main.dart | 16 ++++++++-------- packages/webview_flutter/pubspec.yaml | 2 +- 6 files changed, 20 insertions(+), 11 deletions(-) diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md index 7e1ff85e8574..62fbfae49d15 100644 --- a/packages/camera/CHANGELOG.md +++ b/packages/camera/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.5.8+10 + +* Update the example app to fix the deprecation warning. + ## 0.5.8+9 * Update android compileSdkVersion to 29. diff --git a/packages/camera/example/lib/main.dart b/packages/camera/example/lib/main.dart index ce8d37457123..a41835b4c97f 100644 --- a/packages/camera/example/lib/main.dart +++ b/packages/camera/example/lib/main.dart @@ -272,7 +272,8 @@ class _CameraExampleHomeState extends State String timestamp() => DateTime.now().millisecondsSinceEpoch.toString(); void showInSnackBar(String message) { - _scaffoldKey.currentState.showSnackBar(SnackBar(content: Text(message))); + ScaffoldMessenger.of(_scaffoldKey.currentContext) + .showSnackBar(SnackBar(content: Text(message))); } void onNewCameraSelected(CameraDescription cameraDescription) async { diff --git a/packages/camera/pubspec.yaml b/packages/camera/pubspec.yaml index 95a84d046b5e..b581135967f1 100644 --- a/packages/camera/pubspec.yaml +++ b/packages/camera/pubspec.yaml @@ -2,7 +2,7 @@ name: camera description: A Flutter plugin for getting information about and controlling the camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video, and streaming image buffers to dart. -version: 0.5.8+9 +version: 0.5.8+10 homepage: https://github.com/flutter/plugins/tree/master/packages/camera diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md index 8cb361cdca1e..dff23bffa276 100644 --- a/packages/webview_flutter/CHANGELOG.md +++ b/packages/webview_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.0.4 + +* Update the example app to fix the deprecation warning. + ## 1.0.3 * Update android compileSdkVersion to 29. diff --git a/packages/webview_flutter/example/lib/main.dart b/packages/webview_flutter/example/lib/main.dart index ff25e8a16c9b..e0dd03f60170 100644 --- a/packages/webview_flutter/example/lib/main.dart +++ b/packages/webview_flutter/example/lib/main.dart @@ -92,7 +92,7 @@ class _WebViewExampleState extends State { return JavascriptChannel( name: 'Toaster', onMessageReceived: (JavascriptMessage message) { - Scaffold.of(context).showSnackBar( + ScaffoldMessenger.of(context).showSnackBar( SnackBar(content: Text(message.message)), ); }); @@ -107,7 +107,7 @@ class _WebViewExampleState extends State { return FloatingActionButton( onPressed: () async { final String url = await controller.data.currentUrl(); - Scaffold.of(context).showSnackBar( + ScaffoldMessenger.of(context).showSnackBar( SnackBar(content: Text('Favorited $url')), ); }, @@ -215,7 +215,7 @@ class SampleMenu extends StatelessWidget { WebViewController controller, BuildContext context) async { final String cookies = await controller.evaluateJavascript('document.cookie'); - Scaffold.of(context).showSnackBar(SnackBar( + ScaffoldMessenger.of(context).showSnackBar(SnackBar( content: Column( mainAxisAlignment: MainAxisAlignment.end, mainAxisSize: MainAxisSize.min, @@ -230,7 +230,7 @@ class SampleMenu extends StatelessWidget { void _onAddToCache(WebViewController controller, BuildContext context) async { await controller.evaluateJavascript( 'caches.open("test_caches_entry"); localStorage["test_localStorage"] = "dummy_entry";'); - Scaffold.of(context).showSnackBar(const SnackBar( + ScaffoldMessenger.of(context).showSnackBar(const SnackBar( content: Text('Added a test entry to cache.'), )); } @@ -243,7 +243,7 @@ class SampleMenu extends StatelessWidget { void _onClearCache(WebViewController controller, BuildContext context) async { await controller.clearCache(); - Scaffold.of(context).showSnackBar(const SnackBar( + ScaffoldMessenger.of(context).showSnackBar(const SnackBar( content: Text("Cache cleared."), )); } @@ -254,7 +254,7 @@ class SampleMenu extends StatelessWidget { if (!hadCookies) { message = 'There are no cookies.'; } - Scaffold.of(context).showSnackBar(SnackBar( + ScaffoldMessenger.of(context).showSnackBar(SnackBar( content: Text(message), )); } @@ -306,7 +306,7 @@ class NavigationControls extends StatelessWidget { if (await controller.canGoBack()) { await controller.goBack(); } else { - Scaffold.of(context).showSnackBar( + ScaffoldMessenger.of(context).showSnackBar( const SnackBar(content: Text("No back history item")), ); return; @@ -321,7 +321,7 @@ class NavigationControls extends StatelessWidget { if (await controller.canGoForward()) { await controller.goForward(); } else { - Scaffold.of(context).showSnackBar( + ScaffoldMessenger.of(context).showSnackBar( const SnackBar( content: Text("No forward history item")), ); diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml index 14b11120329b..35b2932c98af 100644 --- a/packages/webview_flutter/pubspec.yaml +++ b/packages/webview_flutter/pubspec.yaml @@ -1,6 +1,6 @@ name: webview_flutter description: A Flutter plugin that provides a WebView widget on Android and iOS. -version: 1.0.3 +version: 1.0.4 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter environment: From 7b15cce5a557064ebf34126d640a7718ef8e90fb Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Tue, 20 Oct 2020 15:11:37 -0700 Subject: [PATCH 2/2] suppress the warning --- packages/camera/CHANGELOG.md | 2 +- packages/camera/example/lib/main.dart | 4 ++-- packages/webview_flutter/CHANGELOG.md | 2 +- .../webview_flutter/example/lib/main.dart | 24 ++++++++++++------- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md index 62fbfae49d15..bd075f490e90 100644 --- a/packages/camera/CHANGELOG.md +++ b/packages/camera/CHANGELOG.md @@ -1,6 +1,6 @@ ## 0.5.8+10 -* Update the example app to fix the deprecation warning. +* Suppress the `deprecated_member_use` warning in the example app for `ScaffoldMessenger.showSnackBar`. ## 0.5.8+9 diff --git a/packages/camera/example/lib/main.dart b/packages/camera/example/lib/main.dart index a41835b4c97f..3ec6604ad788 100644 --- a/packages/camera/example/lib/main.dart +++ b/packages/camera/example/lib/main.dart @@ -272,8 +272,8 @@ class _CameraExampleHomeState extends State String timestamp() => DateTime.now().millisecondsSinceEpoch.toString(); void showInSnackBar(String message) { - ScaffoldMessenger.of(_scaffoldKey.currentContext) - .showSnackBar(SnackBar(content: Text(message))); + // ignore: deprecated_member_use + _scaffoldKey.currentState.showSnackBar(SnackBar(content: Text(message))); } void onNewCameraSelected(CameraDescription cameraDescription) async { diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md index dff23bffa276..5823fa4f42e0 100644 --- a/packages/webview_flutter/CHANGELOG.md +++ b/packages/webview_flutter/CHANGELOG.md @@ -1,6 +1,6 @@ ## 1.0.4 -* Update the example app to fix the deprecation warning. +* Suppress the `deprecated_member_use` warning in the example app for `ScaffoldMessenger.showSnackBar`. ## 1.0.3 diff --git a/packages/webview_flutter/example/lib/main.dart b/packages/webview_flutter/example/lib/main.dart index e0dd03f60170..7ec3008337d8 100644 --- a/packages/webview_flutter/example/lib/main.dart +++ b/packages/webview_flutter/example/lib/main.dart @@ -92,7 +92,8 @@ class _WebViewExampleState extends State { return JavascriptChannel( name: 'Toaster', onMessageReceived: (JavascriptMessage message) { - ScaffoldMessenger.of(context).showSnackBar( + // ignore: deprecated_member_use + Scaffold.of(context).showSnackBar( SnackBar(content: Text(message.message)), ); }); @@ -107,7 +108,8 @@ class _WebViewExampleState extends State { return FloatingActionButton( onPressed: () async { final String url = await controller.data.currentUrl(); - ScaffoldMessenger.of(context).showSnackBar( + // ignore: deprecated_member_use + Scaffold.of(context).showSnackBar( SnackBar(content: Text('Favorited $url')), ); }, @@ -215,7 +217,8 @@ class SampleMenu extends StatelessWidget { WebViewController controller, BuildContext context) async { final String cookies = await controller.evaluateJavascript('document.cookie'); - ScaffoldMessenger.of(context).showSnackBar(SnackBar( + // ignore: deprecated_member_use + Scaffold.of(context).showSnackBar(SnackBar( content: Column( mainAxisAlignment: MainAxisAlignment.end, mainAxisSize: MainAxisSize.min, @@ -230,7 +233,8 @@ class SampleMenu extends StatelessWidget { void _onAddToCache(WebViewController controller, BuildContext context) async { await controller.evaluateJavascript( 'caches.open("test_caches_entry"); localStorage["test_localStorage"] = "dummy_entry";'); - ScaffoldMessenger.of(context).showSnackBar(const SnackBar( + // ignore: deprecated_member_use + Scaffold.of(context).showSnackBar(const SnackBar( content: Text('Added a test entry to cache.'), )); } @@ -243,7 +247,8 @@ class SampleMenu extends StatelessWidget { void _onClearCache(WebViewController controller, BuildContext context) async { await controller.clearCache(); - ScaffoldMessenger.of(context).showSnackBar(const SnackBar( + // ignore: deprecated_member_use + Scaffold.of(context).showSnackBar(const SnackBar( content: Text("Cache cleared."), )); } @@ -254,7 +259,8 @@ class SampleMenu extends StatelessWidget { if (!hadCookies) { message = 'There are no cookies.'; } - ScaffoldMessenger.of(context).showSnackBar(SnackBar( + // ignore: deprecated_member_use + Scaffold.of(context).showSnackBar(SnackBar( content: Text(message), )); } @@ -306,7 +312,8 @@ class NavigationControls extends StatelessWidget { if (await controller.canGoBack()) { await controller.goBack(); } else { - ScaffoldMessenger.of(context).showSnackBar( + // ignore: deprecated_member_use + Scaffold.of(context).showSnackBar( const SnackBar(content: Text("No back history item")), ); return; @@ -321,7 +328,8 @@ class NavigationControls extends StatelessWidget { if (await controller.canGoForward()) { await controller.goForward(); } else { - ScaffoldMessenger.of(context).showSnackBar( + // ignore: deprecated_member_use + Scaffold.of(context).showSnackBar( const SnackBar( content: Text("No forward history item")), );