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)
diff --git a/packages/camera/camera/CHANGELOG.md b/packages/camera/camera/CHANGELOG.md
index 206048a..d95dda2 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 d6bf55f..c187e72 100644
--- a/packages/camera/camera/example/lib/main.dart
+++ b/packages/camera/camera/example/lib/main.dart
@@ -365,16 +365,12 @@
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 @@
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 f4ffc8f..aef4726 100644
--- a/packages/camera/camera/pubspec.yaml
+++ b/packages/camera/camera/pubspec.yaml
@@ -4,7 +4,7 @@
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 426731a..d993e6c 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 56297bc..dca906c 100644
--- a/packages/camera/camera_android/example/lib/main.dart
+++ b/packages/camera/camera_android/example/lib/main.dart
@@ -368,16 +368,12 @@
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 @@
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 68e539e..1e60f92 100644
--- a/packages/camera/camera_android/pubspec.yaml
+++ b/packages/camera/camera_android/pubspec.yaml
@@ -3,7 +3,7 @@
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 1cddca1..f2e845f 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 32768fa..5dbfffa 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 @@
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 @@
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 f8927d0..88e408d 100644
--- a/packages/camera/camera_android_camerax/pubspec.yaml
+++ b/packages/camera/camera_android_camerax/pubspec.yaml
@@ -2,7 +2,7 @@
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 2133c79..6b5810d 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 56297bc..dca906c 100644
--- a/packages/camera/camera_avfoundation/example/lib/main.dart
+++ b/packages/camera/camera_avfoundation/example/lib/main.dart
@@ -368,16 +368,12 @@
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 @@
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 f6137d5..19cb3d1 100644
--- a/packages/camera/camera_avfoundation/pubspec.yaml
+++ b/packages/camera/camera_avfoundation/pubspec.yaml
@@ -2,7 +2,7 @@
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 6d83eee..04874e2 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 3619cb0..6066374 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 @@
children: <Widget>[
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 bdae92f..56d8e67 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 @@
children: <Widget>[
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 25db9ea..f46a6bb 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 @@
@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 cf97987..3b36f68 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 @@
children: <Widget>[
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 2a5a819..4cb49c0 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 @@
children: <Widget>[
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 5223e6a..e9eb48b 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 @@
children: <Widget>[
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 c020245..a8938fa 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 @@
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 8a48d5b..f8527d6 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 9b27c22..29837b4 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 @@
@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 e4fd5dd..9b46571 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 @@
children: <Widget>[
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 cdbf5f2..3ea4ced 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 @@
children: <Widget>[
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 f606fdc..890cb4a 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 @@
children: <Widget>[
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 5c9dc1d..2a9892d 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 2fa862b..351b403 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 @@
children: <Widget>[
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 a312f88..af53822 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 @@
children: <Widget>[
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 3c80f44..4715f26 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 @@
@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 7b3da08..e39dee9 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 @@
children: <Widget>[
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 693ace9..decb1b6 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 @@
children: <Widget>[
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 dd8b7c7..6ffbd28 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 @@
children: <Widget>[
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 bfd83cf..100da3a 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 @@
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 a80935d..376a704 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 7739f67..0ee3bd6 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 @@
children: <Widget>[
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 3c80f44..4715f26 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 @@
@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 7b3da08..e39dee9 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 @@
children: <Widget>[
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 693ace9..decb1b6 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 @@
children: <Widget>[
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 dd8b7c7..6ffbd28 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 @@
children: <Widget>[
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 6208e16..f18050b 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 @@
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 b747a45..659d048 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 2fa862b..351b403 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 @@
children: <Widget>[
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 3c80f44..4715f26 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 @@
@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 7b3da08..e39dee9 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 @@
children: <Widget>[
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 693ace9..decb1b6 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 @@
children: <Widget>[
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 dd8b7c7..6ffbd28 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 @@
children: <Widget>[
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 c92aff0..811ceb9 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 @@
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 60892dc..64b4af8 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 86cd8d8..462260b 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 @@
: 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 a9cfdbe..5219f74 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 @@
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 4c13eab..0eb654d 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 ce06aa1..9072bab 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 @@
: 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 @@
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 48a6e34..07b2189 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 @@
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"
