From 34683acc39865234e27db640d3803e56f0897f26 Mon Sep 17 00:00:00 2001 From: Francisco Reis Nogueira <67326251+Franreno@users.noreply.github.com> Date: Tue, 8 Aug 2023 20:27:18 -0300 Subject: [PATCH] Migrating styleFrom API to new version. (#4540) Updates the styleFrom API to use `backgroundColor` and `foregroundColor` instead of deprecated methods (`primary`, `onPrimary`). Fixes [#105724](https://github.com/flutter/flutter/issues/105724) --- packages/camera/camera/CHANGELOG.md | 4 ++++ packages/camera/camera/example/lib/main.dart | 16 ++++------------ packages/camera/camera/pubspec.yaml | 2 +- packages/camera/camera_android/CHANGELOG.md | 4 ++++ .../camera/camera_android/example/lib/main.dart | 16 ++++------------ packages/camera/camera_android/pubspec.yaml | 2 +- .../camera/camera_android_camerax/CHANGELOG.md | 4 ++++ .../camera_android_camerax/example/lib/main.dart | 16 ++++------------ .../camera/camera_android_camerax/pubspec.yaml | 2 +- packages/camera/camera_avfoundation/CHANGELOG.md | 3 ++- .../camera_avfoundation/example/lib/main.dart | 16 ++++------------ packages/camera/camera_avfoundation/pubspec.yaml | 2 +- .../file_selector/file_selector/CHANGELOG.md | 4 ++++ .../example/lib/get_directory_page.dart | 7 ++----- .../lib/get_multiple_directories_page.dart | 7 ++----- .../file_selector/example/lib/home_page.dart | 7 ++----- .../example/lib/open_image_page.dart | 7 ++----- .../example/lib/open_multiple_images_page.dart | 7 ++----- .../example/lib/open_text_page.dart | 7 ++----- .../example/lib/save_text_page.dart | 7 ++----- .../file_selector/file_selector_ios/CHANGELOG.md | 4 ++++ .../file_selector_ios/example/lib/home_page.dart | 7 ++----- .../example/lib/open_image_page.dart | 7 ++----- .../example/lib/open_multiple_images_page.dart | 7 ++----- .../example/lib/open_text_page.dart | 7 ++----- .../file_selector_linux/CHANGELOG.md | 4 ++++ .../example/lib/get_directory_page.dart | 7 ++----- .../lib/get_multiple_directories_page.dart | 7 ++----- .../example/lib/home_page.dart | 7 ++----- .../example/lib/open_image_page.dart | 7 ++----- .../example/lib/open_multiple_images_page.dart | 7 ++----- .../example/lib/open_text_page.dart | 7 ++----- .../example/lib/save_text_page.dart | 7 ++----- .../file_selector_macos/CHANGELOG.md | 4 ++++ .../example/lib/get_directory_page.dart | 7 ++----- .../example/lib/home_page.dart | 7 ++----- .../example/lib/open_image_page.dart | 7 ++----- .../example/lib/open_multiple_images_page.dart | 7 ++----- .../example/lib/open_text_page.dart | 7 ++----- .../example/lib/save_text_page.dart | 7 ++----- .../file_selector_windows/CHANGELOG.md | 4 ++++ .../example/lib/get_directory_page.dart | 7 ++----- .../example/lib/home_page.dart | 7 ++----- .../example/lib/open_image_page.dart | 7 ++----- .../example/lib/open_multiple_images_page.dart | 7 ++----- .../example/lib/open_text_page.dart | 7 ++----- .../example/lib/save_text_page.dart | 7 ++----- .../in_app_purchase_android/CHANGELOG.md | 4 ++++ .../example/lib/main.dart | 4 +--- .../in_app_purchase_android/pubspec.yaml | 2 +- .../in_app_purchase_storekit/CHANGELOG.md | 4 ++++ .../example/lib/main.dart | 8 ++------ .../in_app_purchase_storekit/pubspec.yaml | 2 +- 53 files changed, 127 insertions(+), 214 deletions(-) diff --git a/packages/camera/camera/CHANGELOG.md b/packages/camera/camera/CHANGELOG.md index 206048ad59..d95dda2c33 100644 --- a/packages/camera/camera/CHANGELOG.md +++ b/packages/camera/camera/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.10.5+3 + +* Migrates `styleFrom` usage in examples off of deprecated `primary` and `onPrimary` parameters. + ## 0.10.5+2 * Fixes unawaited_futures violations. diff --git a/packages/camera/camera/example/lib/main.dart b/packages/camera/camera/example/lib/main.dart index d6bf55f5d2..c187e72aad 100644 --- a/packages/camera/camera/example/lib/main.dart +++ b/packages/camera/camera/example/lib/main.dart @@ -365,16 +365,12 @@ class _CameraExampleHomeState extends State Widget _exposureModeControlRowWidget() { final ButtonStyle styleAuto = TextButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: controller?.value.exposureMode == ExposureMode.auto + foregroundColor: controller?.value.exposureMode == ExposureMode.auto ? Colors.orange : Colors.blue, ); final ButtonStyle styleLocked = TextButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: controller?.value.exposureMode == ExposureMode.locked + foregroundColor: controller?.value.exposureMode == ExposureMode.locked ? Colors.orange : Colors.blue, ); @@ -452,16 +448,12 @@ class _CameraExampleHomeState extends State Widget _focusModeControlRowWidget() { final ButtonStyle styleAuto = TextButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: controller?.value.focusMode == FocusMode.auto + foregroundColor: controller?.value.focusMode == FocusMode.auto ? Colors.orange : Colors.blue, ); final ButtonStyle styleLocked = TextButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: controller?.value.focusMode == FocusMode.locked + foregroundColor: controller?.value.focusMode == FocusMode.locked ? Colors.orange : Colors.blue, ); diff --git a/packages/camera/camera/pubspec.yaml b/packages/camera/camera/pubspec.yaml index f4ffc8fa10..aef47268c9 100644 --- a/packages/camera/camera/pubspec.yaml +++ b/packages/camera/camera/pubspec.yaml @@ -4,7 +4,7 @@ description: A Flutter plugin for controlling the camera. Supports previewing Dart. repository: https://github.com/flutter/packages/tree/main/packages/camera/camera issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22 -version: 0.10.5+2 +version: 0.10.5+3 environment: sdk: ">=2.18.0 <4.0.0" diff --git a/packages/camera/camera_android/CHANGELOG.md b/packages/camera/camera_android/CHANGELOG.md index 426731aa7f..d993e6c6a4 100644 --- a/packages/camera/camera_android/CHANGELOG.md +++ b/packages/camera/camera_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.10.8+6 + +* Migrates `styleFrom` usage in examples off of deprecated `primary` and `onPrimary` parameters. + ## 0.10.8+5 * Provides a default exposure point if null. diff --git a/packages/camera/camera_android/example/lib/main.dart b/packages/camera/camera_android/example/lib/main.dart index 56297bcce1..dca906cf26 100644 --- a/packages/camera/camera_android/example/lib/main.dart +++ b/packages/camera/camera_android/example/lib/main.dart @@ -368,16 +368,12 @@ class _CameraExampleHomeState extends State Widget _exposureModeControlRowWidget() { final ButtonStyle styleAuto = TextButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: controller?.value.exposureMode == ExposureMode.auto + foregroundColor: controller?.value.exposureMode == ExposureMode.auto ? Colors.orange : Colors.blue, ); final ButtonStyle styleLocked = TextButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: controller?.value.exposureMode == ExposureMode.locked + foregroundColor: controller?.value.exposureMode == ExposureMode.locked ? Colors.orange : Colors.blue, ); @@ -456,16 +452,12 @@ class _CameraExampleHomeState extends State Widget _focusModeControlRowWidget() { final ButtonStyle styleAuto = TextButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: controller?.value.focusMode == FocusMode.auto + foregroundColor: controller?.value.focusMode == FocusMode.auto ? Colors.orange : Colors.blue, ); final ButtonStyle styleLocked = TextButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: controller?.value.focusMode == FocusMode.locked + foregroundColor: controller?.value.focusMode == FocusMode.locked ? Colors.orange : Colors.blue, ); diff --git a/packages/camera/camera_android/pubspec.yaml b/packages/camera/camera_android/pubspec.yaml index 68e539e391..1e60f927c1 100644 --- a/packages/camera/camera_android/pubspec.yaml +++ b/packages/camera/camera_android/pubspec.yaml @@ -3,7 +3,7 @@ description: Android implementation of the camera plugin. repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22 -version: 0.10.8+5 +version: 0.10.8+6 environment: sdk: ">=2.18.0 <4.0.0" diff --git a/packages/camera/camera_android_camerax/CHANGELOG.md b/packages/camera/camera_android_camerax/CHANGELOG.md index 1cddca1cbb..f2e845ff78 100644 --- a/packages/camera/camera_android_camerax/CHANGELOG.md +++ b/packages/camera/camera_android_camerax/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.5.0+13 + +* Migrates `styleFrom` usage in examples off of deprecated `primary` and `onPrimary` parameters. + ## 0.5.0+12 * Wraps classes needed to implement resolution configuration for image capture, image analysis, and preview. diff --git a/packages/camera/camera_android_camerax/example/lib/main.dart b/packages/camera/camera_android_camerax/example/lib/main.dart index 32768fa4db..5dbfffad1b 100644 --- a/packages/camera/camera_android_camerax/example/lib/main.dart +++ b/packages/camera/camera_android_camerax/example/lib/main.dart @@ -357,16 +357,12 @@ class _CameraExampleHomeState extends State Widget _exposureModeControlRowWidget() { final ButtonStyle styleAuto = TextButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: controller?.value.exposureMode == ExposureMode.auto + foregroundColor: controller?.value.exposureMode == ExposureMode.auto ? Colors.orange : Colors.blue, ); final ButtonStyle styleLocked = TextButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: controller?.value.exposureMode == ExposureMode.locked + foregroundColor: controller?.value.exposureMode == ExposureMode.locked ? Colors.orange : Colors.blue, ); @@ -439,16 +435,12 @@ class _CameraExampleHomeState extends State Widget _focusModeControlRowWidget() { final ButtonStyle styleAuto = TextButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: controller?.value.focusMode == FocusMode.auto + foregroundColor: controller?.value.focusMode == FocusMode.auto ? Colors.orange : Colors.blue, ); final ButtonStyle styleLocked = TextButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: controller?.value.focusMode == FocusMode.locked + foregroundColor: controller?.value.focusMode == FocusMode.locked ? Colors.orange : Colors.blue, ); diff --git a/packages/camera/camera_android_camerax/pubspec.yaml b/packages/camera/camera_android_camerax/pubspec.yaml index f8927d0311..88e408d1df 100644 --- a/packages/camera/camera_android_camerax/pubspec.yaml +++ b/packages/camera/camera_android_camerax/pubspec.yaml @@ -2,7 +2,7 @@ name: camera_android_camerax description: Android implementation of the camera plugin using the CameraX library. repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android_camerax issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22 -version: 0.5.0+12 +version: 0.5.0+13 environment: sdk: ">=2.19.0 <4.0.0" diff --git a/packages/camera/camera_avfoundation/CHANGELOG.md b/packages/camera/camera_avfoundation/CHANGELOG.md index 2133c7935c..6b5810d7ae 100644 --- a/packages/camera/camera_avfoundation/CHANGELOG.md +++ b/packages/camera/camera_avfoundation/CHANGELOG.md @@ -1,5 +1,6 @@ -## NEXT +## 0.9.13+3 +* Migrates `styleFrom` usage in examples off of deprecated `primary` and `onPrimary` parameters. * Fixes unawaited_futures violations. ## 0.9.13+2 diff --git a/packages/camera/camera_avfoundation/example/lib/main.dart b/packages/camera/camera_avfoundation/example/lib/main.dart index 56297bcce1..dca906cf26 100644 --- a/packages/camera/camera_avfoundation/example/lib/main.dart +++ b/packages/camera/camera_avfoundation/example/lib/main.dart @@ -368,16 +368,12 @@ class _CameraExampleHomeState extends State Widget _exposureModeControlRowWidget() { final ButtonStyle styleAuto = TextButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: controller?.value.exposureMode == ExposureMode.auto + foregroundColor: controller?.value.exposureMode == ExposureMode.auto ? Colors.orange : Colors.blue, ); final ButtonStyle styleLocked = TextButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: controller?.value.exposureMode == ExposureMode.locked + foregroundColor: controller?.value.exposureMode == ExposureMode.locked ? Colors.orange : Colors.blue, ); @@ -456,16 +452,12 @@ class _CameraExampleHomeState extends State Widget _focusModeControlRowWidget() { final ButtonStyle styleAuto = TextButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: controller?.value.focusMode == FocusMode.auto + foregroundColor: controller?.value.focusMode == FocusMode.auto ? Colors.orange : Colors.blue, ); final ButtonStyle styleLocked = TextButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: controller?.value.focusMode == FocusMode.locked + foregroundColor: controller?.value.focusMode == FocusMode.locked ? Colors.orange : Colors.blue, ); diff --git a/packages/camera/camera_avfoundation/pubspec.yaml b/packages/camera/camera_avfoundation/pubspec.yaml index f6137d59f6..19cb3d126c 100644 --- a/packages/camera/camera_avfoundation/pubspec.yaml +++ b/packages/camera/camera_avfoundation/pubspec.yaml @@ -2,7 +2,7 @@ name: camera_avfoundation description: iOS implementation of the camera plugin. repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_avfoundation issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22 -version: 0.9.13+2 +version: 0.9.13+3 environment: sdk: ">=2.18.0 <4.0.0" diff --git a/packages/file_selector/file_selector/CHANGELOG.md b/packages/file_selector/file_selector/CHANGELOG.md index 6d83eee146..04874e28f4 100644 --- a/packages/file_selector/file_selector/CHANGELOG.md +++ b/packages/file_selector/file_selector/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Migrates `styleFrom` usage in examples off of deprecated `primary` and `onPrimary` parameters. + ## 1.0.0 * Removes the deprecated `getSavePath` in favor of `getSaveLocation`. diff --git a/packages/file_selector/file_selector/example/lib/get_directory_page.dart b/packages/file_selector/file_selector/example/lib/get_directory_page.dart index 3619cb0dac..6066374b3a 100644 --- a/packages/file_selector/file_selector/example/lib/get_directory_page.dart +++ b/packages/file_selector/file_selector/example/lib/get_directory_page.dart @@ -42,11 +42,8 @@ class GetDirectoryPage extends StatelessWidget { children: [ ElevatedButton( style: ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ), onPressed: _isIOS ? null : () => _getDirectoryPath(context), child: const Text( diff --git a/packages/file_selector/file_selector/example/lib/get_multiple_directories_page.dart b/packages/file_selector/file_selector/example/lib/get_multiple_directories_page.dart index bdae92fd6f..56d8e67e4c 100644 --- a/packages/file_selector/file_selector/example/lib/get_multiple_directories_page.dart +++ b/packages/file_selector/file_selector/example/lib/get_multiple_directories_page.dart @@ -44,11 +44,8 @@ class GetMultipleDirectoriesPage extends StatelessWidget { children: [ ElevatedButton( style: ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ), child: const Text( 'Press to ask user to choose multiple directories'), diff --git a/packages/file_selector/file_selector/example/lib/home_page.dart b/packages/file_selector/file_selector/example/lib/home_page.dart index 25db9eaba4..f46a6bbd6b 100644 --- a/packages/file_selector/file_selector/example/lib/home_page.dart +++ b/packages/file_selector/file_selector/example/lib/home_page.dart @@ -15,11 +15,8 @@ class HomePage extends StatelessWidget { @override Widget build(BuildContext context) { final ButtonStyle style = ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ); return Scaffold( appBar: AppBar( diff --git a/packages/file_selector/file_selector/example/lib/open_image_page.dart b/packages/file_selector/file_selector/example/lib/open_image_page.dart index cf979875e5..3b36f68668 100644 --- a/packages/file_selector/file_selector/example/lib/open_image_page.dart +++ b/packages/file_selector/file_selector/example/lib/open_image_page.dart @@ -49,11 +49,8 @@ class OpenImagePage extends StatelessWidget { children: [ ElevatedButton( style: ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ), child: const Text('Press to open an image file(png, jpg)'), onPressed: () => _openImageFile(context), diff --git a/packages/file_selector/file_selector/example/lib/open_multiple_images_page.dart b/packages/file_selector/file_selector/example/lib/open_multiple_images_page.dart index 2a5a819f35..4cb49c02a2 100644 --- a/packages/file_selector/file_selector/example/lib/open_multiple_images_page.dart +++ b/packages/file_selector/file_selector/example/lib/open_multiple_images_page.dart @@ -52,11 +52,8 @@ class OpenMultipleImagesPage extends StatelessWidget { children: [ ElevatedButton( style: ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ), child: const Text('Press to open multiple images (png, jpg)'), onPressed: () => _openImageFile(context), diff --git a/packages/file_selector/file_selector/example/lib/open_text_page.dart b/packages/file_selector/file_selector/example/lib/open_text_page.dart index 5223e6ab60..e9eb48b720 100644 --- a/packages/file_selector/file_selector/example/lib/open_text_page.dart +++ b/packages/file_selector/file_selector/example/lib/open_text_page.dart @@ -53,11 +53,8 @@ class OpenTextPage extends StatelessWidget { children: [ ElevatedButton( style: ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ), child: const Text('Press to open a text file (json, txt)'), onPressed: () => _openTextFile(context), diff --git a/packages/file_selector/file_selector/example/lib/save_text_page.dart b/packages/file_selector/file_selector/example/lib/save_text_page.dart index c020245714..a8938fa6db 100644 --- a/packages/file_selector/file_selector/example/lib/save_text_page.dart +++ b/packages/file_selector/file_selector/example/lib/save_text_page.dart @@ -79,11 +79,8 @@ class SaveTextPage extends StatelessWidget { const SizedBox(height: 10), ElevatedButton( style: ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ), onPressed: _isIOS ? null : () => _saveFile(), child: const Text( diff --git a/packages/file_selector/file_selector_ios/CHANGELOG.md b/packages/file_selector/file_selector_ios/CHANGELOG.md index 8a48d5b089..f8527d6bc1 100644 --- a/packages/file_selector/file_selector_ios/CHANGELOG.md +++ b/packages/file_selector/file_selector_ios/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Migrates `styleFrom` usage in examples off of deprecated `primary` and `onPrimary` parameters. + ## 0.5.1+4 * Updates references to the deprecated `macUTIs`. diff --git a/packages/file_selector/file_selector_ios/example/lib/home_page.dart b/packages/file_selector/file_selector_ios/example/lib/home_page.dart index 9b27c223ab..29837b4eb8 100644 --- a/packages/file_selector/file_selector_ios/example/lib/home_page.dart +++ b/packages/file_selector/file_selector_ios/example/lib/home_page.dart @@ -12,11 +12,8 @@ class HomePage extends StatelessWidget { @override Widget build(BuildContext context) { final ButtonStyle style = ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ); return Scaffold( appBar: AppBar( diff --git a/packages/file_selector/file_selector_ios/example/lib/open_image_page.dart b/packages/file_selector/file_selector_ios/example/lib/open_image_page.dart index e4fd5dd076..9b46571b90 100644 --- a/packages/file_selector/file_selector_ios/example/lib/open_image_page.dart +++ b/packages/file_selector/file_selector_ios/example/lib/open_image_page.dart @@ -49,11 +49,8 @@ class OpenImagePage extends StatelessWidget { children: [ ElevatedButton( style: ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ), child: const Text('Press to open an image file(png, jpg)'), onPressed: () => _openImageFile(context), diff --git a/packages/file_selector/file_selector_ios/example/lib/open_multiple_images_page.dart b/packages/file_selector/file_selector_ios/example/lib/open_multiple_images_page.dart index cdbf5f2f21..3ea4ced58a 100644 --- a/packages/file_selector/file_selector_ios/example/lib/open_multiple_images_page.dart +++ b/packages/file_selector/file_selector_ios/example/lib/open_multiple_images_page.dart @@ -54,11 +54,8 @@ class OpenMultipleImagesPage extends StatelessWidget { children: [ ElevatedButton( style: ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ), child: const Text('Press to open multiple images (png, jpg)'), onPressed: () => _openImageFile(context), diff --git a/packages/file_selector/file_selector_ios/example/lib/open_text_page.dart b/packages/file_selector/file_selector_ios/example/lib/open_text_page.dart index f606fdc7f9..890cb4ab4d 100644 --- a/packages/file_selector/file_selector_ios/example/lib/open_text_page.dart +++ b/packages/file_selector/file_selector_ios/example/lib/open_text_page.dart @@ -46,11 +46,8 @@ class OpenTextPage extends StatelessWidget { children: [ ElevatedButton( style: ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ), child: const Text('Press to open a text file (json, txt)'), onPressed: () => _openTextFile(context), diff --git a/packages/file_selector/file_selector_linux/CHANGELOG.md b/packages/file_selector/file_selector_linux/CHANGELOG.md index 5c9dc1dbcd..2a9892d931 100644 --- a/packages/file_selector/file_selector_linux/CHANGELOG.md +++ b/packages/file_selector/file_selector_linux/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Migrates `styleFrom` usage in examples off of deprecated `primary` and `onPrimary` parameters. + ## 0.9.2 * Adds `getSaveLocation` and deprecates `getSavePath`. diff --git a/packages/file_selector/file_selector_linux/example/lib/get_directory_page.dart b/packages/file_selector/file_selector_linux/example/lib/get_directory_page.dart index 2fa862bb49..351b403ca6 100644 --- a/packages/file_selector/file_selector_linux/example/lib/get_directory_page.dart +++ b/packages/file_selector/file_selector_linux/example/lib/get_directory_page.dart @@ -41,11 +41,8 @@ class GetDirectoryPage extends StatelessWidget { children: [ ElevatedButton( style: ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ), child: const Text('Press to ask user to choose a directory'), onPressed: () => _getDirectoryPath(context), diff --git a/packages/file_selector/file_selector_linux/example/lib/get_multiple_directories_page.dart b/packages/file_selector/file_selector_linux/example/lib/get_multiple_directories_page.dart index a312f886ac..af53822ae5 100644 --- a/packages/file_selector/file_selector_linux/example/lib/get_multiple_directories_page.dart +++ b/packages/file_selector/file_selector_linux/example/lib/get_multiple_directories_page.dart @@ -42,11 +42,8 @@ class GetMultipleDirectoriesPage extends StatelessWidget { children: [ ElevatedButton( style: ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ), child: const Text( 'Press to ask user to choose multiple directories'), diff --git a/packages/file_selector/file_selector_linux/example/lib/home_page.dart b/packages/file_selector/file_selector_linux/example/lib/home_page.dart index 3c80f44057..4715f267e3 100644 --- a/packages/file_selector/file_selector_linux/example/lib/home_page.dart +++ b/packages/file_selector/file_selector_linux/example/lib/home_page.dart @@ -12,11 +12,8 @@ class HomePage extends StatelessWidget { @override Widget build(BuildContext context) { final ButtonStyle style = ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ); return Scaffold( appBar: AppBar( diff --git a/packages/file_selector/file_selector_linux/example/lib/open_image_page.dart b/packages/file_selector/file_selector_linux/example/lib/open_image_page.dart index 7b3da083fc..e39dee95d4 100644 --- a/packages/file_selector/file_selector_linux/example/lib/open_image_page.dart +++ b/packages/file_selector/file_selector_linux/example/lib/open_image_page.dart @@ -48,11 +48,8 @@ class OpenImagePage extends StatelessWidget { children: [ ElevatedButton( style: ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ), child: const Text('Press to open an image file(png, jpg)'), onPressed: () => _openImageFile(context), diff --git a/packages/file_selector/file_selector_linux/example/lib/open_multiple_images_page.dart b/packages/file_selector/file_selector_linux/example/lib/open_multiple_images_page.dart index 693ace9275..decb1b64c7 100644 --- a/packages/file_selector/file_selector_linux/example/lib/open_multiple_images_page.dart +++ b/packages/file_selector/file_selector_linux/example/lib/open_multiple_images_page.dart @@ -52,11 +52,8 @@ class OpenMultipleImagesPage extends StatelessWidget { children: [ ElevatedButton( style: ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ), child: const Text('Press to open multiple images (png, jpg)'), onPressed: () => _openImageFile(context), diff --git a/packages/file_selector/file_selector_linux/example/lib/open_text_page.dart b/packages/file_selector/file_selector_linux/example/lib/open_text_page.dart index dd8b7c762a..6ffbd28c92 100644 --- a/packages/file_selector/file_selector_linux/example/lib/open_text_page.dart +++ b/packages/file_selector/file_selector_linux/example/lib/open_text_page.dart @@ -45,11 +45,8 @@ class OpenTextPage extends StatelessWidget { children: [ ElevatedButton( style: ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ), child: const Text('Press to open a text file (json, txt)'), onPressed: () => _openTextFile(context), diff --git a/packages/file_selector/file_selector_linux/example/lib/save_text_page.dart b/packages/file_selector/file_selector_linux/example/lib/save_text_page.dart index bfd83cfd23..100da3ab89 100644 --- a/packages/file_selector/file_selector_linux/example/lib/save_text_page.dart +++ b/packages/file_selector/file_selector_linux/example/lib/save_text_page.dart @@ -68,11 +68,8 @@ class SaveTextPage extends StatelessWidget { const SizedBox(height: 10), ElevatedButton( style: ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ), onPressed: _saveFile, child: const Text('Press to save a text file'), diff --git a/packages/file_selector/file_selector_macos/CHANGELOG.md b/packages/file_selector/file_selector_macos/CHANGELOG.md index a80935d5f7..376a704ff9 100644 --- a/packages/file_selector/file_selector_macos/CHANGELOG.md +++ b/packages/file_selector/file_selector_macos/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Migrates `styleFrom` usage in examples off of deprecated `primary` and `onPrimary` parameters. + ## 0.9.3+1 * Updates to the latest version of `pigeon`. diff --git a/packages/file_selector/file_selector_macos/example/lib/get_directory_page.dart b/packages/file_selector/file_selector_macos/example/lib/get_directory_page.dart index 7739f67318..0ee3bd6cd3 100644 --- a/packages/file_selector/file_selector_macos/example/lib/get_directory_page.dart +++ b/packages/file_selector/file_selector_macos/example/lib/get_directory_page.dart @@ -41,11 +41,8 @@ class GetDirectoryPage extends StatelessWidget { children: [ ElevatedButton( style: ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ), child: const Text('Press to ask user to choose a directory'), onPressed: () => _getDirectoryPath(context), diff --git a/packages/file_selector/file_selector_macos/example/lib/home_page.dart b/packages/file_selector/file_selector_macos/example/lib/home_page.dart index 3c80f44057..4715f267e3 100644 --- a/packages/file_selector/file_selector_macos/example/lib/home_page.dart +++ b/packages/file_selector/file_selector_macos/example/lib/home_page.dart @@ -12,11 +12,8 @@ class HomePage extends StatelessWidget { @override Widget build(BuildContext context) { final ButtonStyle style = ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ); return Scaffold( appBar: AppBar( diff --git a/packages/file_selector/file_selector_macos/example/lib/open_image_page.dart b/packages/file_selector/file_selector_macos/example/lib/open_image_page.dart index 7b3da083fc..e39dee95d4 100644 --- a/packages/file_selector/file_selector_macos/example/lib/open_image_page.dart +++ b/packages/file_selector/file_selector_macos/example/lib/open_image_page.dart @@ -48,11 +48,8 @@ class OpenImagePage extends StatelessWidget { children: [ ElevatedButton( style: ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ), child: const Text('Press to open an image file(png, jpg)'), onPressed: () => _openImageFile(context), diff --git a/packages/file_selector/file_selector_macos/example/lib/open_multiple_images_page.dart b/packages/file_selector/file_selector_macos/example/lib/open_multiple_images_page.dart index 693ace9275..decb1b64c7 100644 --- a/packages/file_selector/file_selector_macos/example/lib/open_multiple_images_page.dart +++ b/packages/file_selector/file_selector_macos/example/lib/open_multiple_images_page.dart @@ -52,11 +52,8 @@ class OpenMultipleImagesPage extends StatelessWidget { children: [ ElevatedButton( style: ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ), child: const Text('Press to open multiple images (png, jpg)'), onPressed: () => _openImageFile(context), diff --git a/packages/file_selector/file_selector_macos/example/lib/open_text_page.dart b/packages/file_selector/file_selector_macos/example/lib/open_text_page.dart index dd8b7c762a..6ffbd28c92 100644 --- a/packages/file_selector/file_selector_macos/example/lib/open_text_page.dart +++ b/packages/file_selector/file_selector_macos/example/lib/open_text_page.dart @@ -45,11 +45,8 @@ class OpenTextPage extends StatelessWidget { children: [ ElevatedButton( style: ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ), child: const Text('Press to open a text file (json, txt)'), onPressed: () => _openTextFile(context), diff --git a/packages/file_selector/file_selector_macos/example/lib/save_text_page.dart b/packages/file_selector/file_selector_macos/example/lib/save_text_page.dart index 6208e16ef7..f18050bcf7 100644 --- a/packages/file_selector/file_selector_macos/example/lib/save_text_page.dart +++ b/packages/file_selector/file_selector_macos/example/lib/save_text_page.dart @@ -68,11 +68,8 @@ class SaveTextPage extends StatelessWidget { const SizedBox(height: 10), ElevatedButton( style: ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ), onPressed: _saveFile, child: const Text('Press to save a text file'), diff --git a/packages/file_selector/file_selector_windows/CHANGELOG.md b/packages/file_selector/file_selector_windows/CHANGELOG.md index b747a45723..659d048367 100644 --- a/packages/file_selector/file_selector_windows/CHANGELOG.md +++ b/packages/file_selector/file_selector_windows/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Migrates `styleFrom` usage in examples off of deprecated `primary` and `onPrimary` parameters. + ## 0.9.3 * Adds `getSaveLocation` and deprecates `getSavePath`. diff --git a/packages/file_selector/file_selector_windows/example/lib/get_directory_page.dart b/packages/file_selector/file_selector_windows/example/lib/get_directory_page.dart index 2fa862bb49..351b403ca6 100644 --- a/packages/file_selector/file_selector_windows/example/lib/get_directory_page.dart +++ b/packages/file_selector/file_selector_windows/example/lib/get_directory_page.dart @@ -41,11 +41,8 @@ class GetDirectoryPage extends StatelessWidget { children: [ ElevatedButton( style: ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ), child: const Text('Press to ask user to choose a directory'), onPressed: () => _getDirectoryPath(context), diff --git a/packages/file_selector/file_selector_windows/example/lib/home_page.dart b/packages/file_selector/file_selector_windows/example/lib/home_page.dart index 3c80f44057..4715f267e3 100644 --- a/packages/file_selector/file_selector_windows/example/lib/home_page.dart +++ b/packages/file_selector/file_selector_windows/example/lib/home_page.dart @@ -12,11 +12,8 @@ class HomePage extends StatelessWidget { @override Widget build(BuildContext context) { final ButtonStyle style = ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ); return Scaffold( appBar: AppBar( diff --git a/packages/file_selector/file_selector_windows/example/lib/open_image_page.dart b/packages/file_selector/file_selector_windows/example/lib/open_image_page.dart index 7b3da083fc..e39dee95d4 100644 --- a/packages/file_selector/file_selector_windows/example/lib/open_image_page.dart +++ b/packages/file_selector/file_selector_windows/example/lib/open_image_page.dart @@ -48,11 +48,8 @@ class OpenImagePage extends StatelessWidget { children: [ ElevatedButton( style: ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ), child: const Text('Press to open an image file(png, jpg)'), onPressed: () => _openImageFile(context), diff --git a/packages/file_selector/file_selector_windows/example/lib/open_multiple_images_page.dart b/packages/file_selector/file_selector_windows/example/lib/open_multiple_images_page.dart index 693ace9275..decb1b64c7 100644 --- a/packages/file_selector/file_selector_windows/example/lib/open_multiple_images_page.dart +++ b/packages/file_selector/file_selector_windows/example/lib/open_multiple_images_page.dart @@ -52,11 +52,8 @@ class OpenMultipleImagesPage extends StatelessWidget { children: [ ElevatedButton( style: ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ), child: const Text('Press to open multiple images (png, jpg)'), onPressed: () => _openImageFile(context), diff --git a/packages/file_selector/file_selector_windows/example/lib/open_text_page.dart b/packages/file_selector/file_selector_windows/example/lib/open_text_page.dart index dd8b7c762a..6ffbd28c92 100644 --- a/packages/file_selector/file_selector_windows/example/lib/open_text_page.dart +++ b/packages/file_selector/file_selector_windows/example/lib/open_text_page.dart @@ -45,11 +45,8 @@ class OpenTextPage extends StatelessWidget { children: [ ElevatedButton( style: ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ), child: const Text('Press to open a text file (json, txt)'), onPressed: () => _openTextFile(context), diff --git a/packages/file_selector/file_selector_windows/example/lib/save_text_page.dart b/packages/file_selector/file_selector_windows/example/lib/save_text_page.dart index c92aff0556..811ceb98ee 100644 --- a/packages/file_selector/file_selector_windows/example/lib/save_text_page.dart +++ b/packages/file_selector/file_selector_windows/example/lib/save_text_page.dart @@ -88,11 +88,8 @@ class SaveTextPage extends StatelessWidget { const SizedBox(height: 10), ElevatedButton( style: ElevatedButton.styleFrom( - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.blue, - // ignore: deprecated_member_use - onPrimary: Colors.white, + backgroundColor: Colors.blue, + foregroundColor: Colors.white, ), onPressed: _saveFile, child: const Text('Press to save a text file'), diff --git a/packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md b/packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md index 60892dc0df..64b4af8e22 100644 --- a/packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md +++ b/packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.0+11 + +* Migrates `styleFrom` usage in examples off of deprecated `primary` and `onPrimary` parameters. + ## 0.3.0+10 * Bumps com.android.billingclient:billing from 6.0.0 to 6.0.1. diff --git a/packages/in_app_purchase/in_app_purchase_android/example/lib/main.dart b/packages/in_app_purchase/in_app_purchase_android/example/lib/main.dart index 86cd8d8841..462260b4be 100644 --- a/packages/in_app_purchase/in_app_purchase_android/example/lib/main.dart +++ b/packages/in_app_purchase/in_app_purchase_android/example/lib/main.dart @@ -258,9 +258,7 @@ class _MyAppState extends State<_MyApp> { : TextButton( style: TextButton.styleFrom( backgroundColor: Colors.green[800], - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.white, + foregroundColor: Colors.white, ), onPressed: () { // NOTE: If you are making a subscription purchase/upgrade/downgrade, we recommend you to diff --git a/packages/in_app_purchase/in_app_purchase_android/pubspec.yaml b/packages/in_app_purchase/in_app_purchase_android/pubspec.yaml index a9cfdbef1d..5219f74346 100644 --- a/packages/in_app_purchase/in_app_purchase_android/pubspec.yaml +++ b/packages/in_app_purchase/in_app_purchase_android/pubspec.yaml @@ -2,7 +2,7 @@ name: in_app_purchase_android description: An implementation for the Android platform of the Flutter `in_app_purchase` plugin. This uses the Android BillingClient APIs. repository: https://github.com/flutter/packages/tree/main/packages/in_app_purchase/in_app_purchase_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+in_app_purchase%22 -version: 0.3.0+10 +version: 0.3.0+11 environment: sdk: ">=2.18.0 <4.0.0" diff --git a/packages/in_app_purchase/in_app_purchase_storekit/CHANGELOG.md b/packages/in_app_purchase/in_app_purchase_storekit/CHANGELOG.md index 4c13eabc32..0eb654d609 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/CHANGELOG.md +++ b/packages/in_app_purchase/in_app_purchase_storekit/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.6+5 + +* Migrates `styleFrom` usage in examples off of deprecated `primary` and `onPrimary` parameters. + ## 0.3.6+4 * Removes obsolete null checks on non-nullable values. diff --git a/packages/in_app_purchase/in_app_purchase_storekit/example/lib/main.dart b/packages/in_app_purchase/in_app_purchase_storekit/example/lib/main.dart index ce06aa1d1a..9072bab499 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/example/lib/main.dart +++ b/packages/in_app_purchase/in_app_purchase_storekit/example/lib/main.dart @@ -262,9 +262,7 @@ class _MyAppState extends State<_MyApp> { : TextButton( style: TextButton.styleFrom( backgroundColor: Colors.green[800], - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.white, + foregroundColor: Colors.white, ), onPressed: () { final PurchaseParam purchaseParam = PurchaseParam( @@ -339,9 +337,7 @@ class _MyAppState extends State<_MyApp> { TextButton( style: TextButton.styleFrom( backgroundColor: Theme.of(context).colorScheme.primary, - // TODO(darrenaustin): Migrate to new API once it lands in stable: https://github.com/flutter/flutter/issues/105724 - // ignore: deprecated_member_use - primary: Colors.white, + foregroundColor: Colors.white, ), onPressed: () => _iapStoreKitPlatform.restorePurchases(), child: const Text('Restore purchases'), diff --git a/packages/in_app_purchase/in_app_purchase_storekit/pubspec.yaml b/packages/in_app_purchase/in_app_purchase_storekit/pubspec.yaml index 48a6e34e86..07b21899a1 100644 --- a/packages/in_app_purchase/in_app_purchase_storekit/pubspec.yaml +++ b/packages/in_app_purchase/in_app_purchase_storekit/pubspec.yaml @@ -2,7 +2,7 @@ name: in_app_purchase_storekit description: An implementation for the iOS and macOS platforms of the Flutter `in_app_purchase` plugin. This uses the StoreKit Framework. repository: https://github.com/flutter/packages/tree/main/packages/in_app_purchase/in_app_purchase_storekit issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+in_app_purchase%22 -version: 0.3.6+4 +version: 0.3.6+5 environment: sdk: ">=2.18.0 <4.0.0"