From f4790cfd028436065356e3b34a326d377ff28567 Mon Sep 17 00:00:00 2001
From: Michael Goderbauer <goderbauer@google.com>
Date: Tue, 2 Apr 2024 09:44:08 -0700
Subject: [PATCH] [various] Remove all traces of the `_ambiguate` workaround
(#6449)
It's no longer needed - for now.
Fixes https://github.com/flutter/flutter/issues/111841.
---
packages/camera/camera_avfoundation/CHANGELOG.md | 4 ++++
.../camera/camera_avfoundation/example/lib/main.dart | 12 +++---------
packages/camera/camera_avfoundation/pubspec.yaml | 2 +-
packages/flutter_markdown/CHANGELOG.md | 4 ++++
packages/flutter_markdown/lib/src/builder.dart | 8 +-------
packages/flutter_markdown/pubspec.yaml | 2 +-
packages/flutter_markdown/test/utils.dart | 8 +-------
packages/video_player/video_player/CHANGELOG.md | 4 ++++
.../video_player/video_player/lib/video_player.dart | 10 ++--------
packages/video_player/video_player/pubspec.yaml | 2 +-
.../video_player/test/video_player_test.dart | 10 ++--------
11 files changed, 24 insertions(+), 42 deletions(-)
diff --git a/packages/camera/camera_avfoundation/CHANGELOG.md b/packages/camera/camera_avfoundation/CHANGELOG.md
index d70fd9e73c..c63f741267 100644
--- a/packages/camera/camera_avfoundation/CHANGELOG.md
+++ b/packages/camera/camera_avfoundation/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.9.14+2
+
+* Removes `_ambiguate` methods from example code.
+
## 0.9.14+1
* Fixes bug where max resolution preset does not produce highest available resolution on iOS.
diff --git a/packages/camera/camera_avfoundation/example/lib/main.dart b/packages/camera/camera_avfoundation/example/lib/main.dart
index 2ada5351ee..26d2527eed 100644
--- a/packages/camera/camera_avfoundation/example/lib/main.dart
+++ b/packages/camera/camera_avfoundation/example/lib/main.dart
@@ -75,7 +75,7 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
@override
void initState() {
super.initState();
- _ambiguate(WidgetsBinding.instance)?.addObserver(this);
+ WidgetsBinding.instance.addObserver(this);
_flashModeControlRowAnimationController = AnimationController(
duration: const Duration(milliseconds: 300),
@@ -105,7 +105,7 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
@override
void dispose() {
- _ambiguate(WidgetsBinding.instance)?.removeObserver(this);
+ WidgetsBinding.instance.removeObserver(this);
_flashModeControlRowAnimationController.dispose();
_exposureModeControlRowAnimationController.dispose();
super.dispose();
@@ -580,7 +580,7 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
}
if (_cameras.isEmpty) {
- _ambiguate(SchedulerBinding.instance)?.addPostFrameCallback((_) async {
+ SchedulerBinding.instance.addPostFrameCallback((_) async {
showInSnackBar('No camera found.');
});
return const Text('None');
@@ -1064,9 +1064,3 @@ Future<void> main() async {
}
runApp(const CameraApp());
}
-
-/// This allows a value of type T or T? to be treated as a value of type T?.
-///
-/// We use this so that APIs that have become non-nullable can still be used
-/// with `!` and `?` on the stable branch.
-T? _ambiguate<T>(T? value) => value;
diff --git a/packages/camera/camera_avfoundation/pubspec.yaml b/packages/camera/camera_avfoundation/pubspec.yaml
index 1d83c8567c..f3af10dc70 100644
--- a/packages/camera/camera_avfoundation/pubspec.yaml
+++ b/packages/camera/camera_avfoundation/pubspec.yaml
@@ -3,7 +3,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.14+1
+version: 0.9.14+2
environment:
sdk: ^3.2.3
diff --git a/packages/flutter_markdown/CHANGELOG.md b/packages/flutter_markdown/CHANGELOG.md
index f3ed8654f3..8bee976eba 100644
--- a/packages/flutter_markdown/CHANGELOG.md
+++ b/packages/flutter_markdown/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.22+1
+
+* Removes `_ambiguate` methods from code.
+
## 0.6.22
* Introduces a new `MarkdownElementBuilder.isBlockElement()` method to specify if custom element
diff --git a/packages/flutter_markdown/lib/src/builder.dart b/packages/flutter_markdown/lib/src/builder.dart
index 739520588d..c8ed950d3e 100644
--- a/packages/flutter_markdown/lib/src/builder.dart
+++ b/packages/flutter_markdown/lib/src/builder.dart
@@ -518,7 +518,7 @@ class MarkdownBuilder implements md.NodeVisitor {
_mergeInlineChildren(current.children, align),
textAlign: align,
);
- _ambiguate(_tables.single.rows.last.children)!.add(child);
+ _tables.single.rows.last.children.add(child);
} else if (tag == 'a') {
_linkHandlers.removeLast();
} else if (tag == 'sup') {
@@ -967,10 +967,4 @@ class MarkdownBuilder implements md.NodeVisitor {
);
}
}
-
- /// This allows a value of type T or T? to be treated as a value of type T?.
- ///
- /// We use this so that APIs that have become non-nullable can still be used
- /// with `!` and `?` on the stable branch.
- T? _ambiguate<T>(T? value) => value;
}
diff --git a/packages/flutter_markdown/pubspec.yaml b/packages/flutter_markdown/pubspec.yaml
index c077bb64f9..a206c7f963 100644
--- a/packages/flutter_markdown/pubspec.yaml
+++ b/packages/flutter_markdown/pubspec.yaml
@@ -4,7 +4,7 @@ description: A Markdown renderer for Flutter. Create rich text output,
formatted with simple Markdown tags.
repository: https://github.com/flutter/packages/tree/main/packages/flutter_markdown
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+flutter_markdown%22
-version: 0.6.22
+version: 0.6.22+1
environment:
sdk: ^3.3.0
diff --git a/packages/flutter_markdown/test/utils.dart b/packages/flutter_markdown/test/utils.dart
index fa635f27c7..b3f57897f1 100644
--- a/packages/flutter_markdown/test/utils.dart
+++ b/packages/flutter_markdown/test/utils.dart
@@ -204,7 +204,7 @@ void expectTableSize(int rows, int columns) {
expect(table.children.length, rows);
for (int index = 0; index < rows; index++) {
- expect(_ambiguate(table.children[index].children)!.length, columns);
+ expect(table.children[index].children.length, columns);
}
}
@@ -263,9 +263,3 @@ class TestAssetBundle extends CachingAssetBundle {
}
}
}
-
-/// This allows a value of type T or T? to be treated as a value of type T?.
-///
-/// We use this so that APIs that have become non-nullable can still be used
-/// with `!` and `?` on the stable branch.
-T? _ambiguate<T>(T? value) => value;
diff --git a/packages/video_player/video_player/CHANGELOG.md b/packages/video_player/video_player/CHANGELOG.md
index cb872ce7c9..595b483ae1 100644
--- a/packages/video_player/video_player/CHANGELOG.md
+++ b/packages/video_player/video_player/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.8.4
+
+* Removes `_ambiguate` methods from code.
+
## 2.8.3
* Fixes typo in `README.md`.
diff --git a/packages/video_player/video_player/lib/video_player.dart b/packages/video_player/video_player/lib/video_player.dart
index d79f280ccb..007c6ba14e 100644
--- a/packages/video_player/video_player/lib/video_player.dart
+++ b/packages/video_player/video_player/lib/video_player.dart
@@ -769,7 +769,7 @@ class _VideoAppLifeCycleObserver extends Object with WidgetsBindingObserver {
final VideoPlayerController _controller;
void initialize() {
- _ambiguate(WidgetsBinding.instance)!.addObserver(this);
+ WidgetsBinding.instance.addObserver(this);
}
@override
@@ -785,7 +785,7 @@ class _VideoAppLifeCycleObserver extends Object with WidgetsBindingObserver {
}
void dispose() {
- _ambiguate(WidgetsBinding.instance)!.removeObserver(this);
+ WidgetsBinding.instance.removeObserver(this);
}
}
@@ -1170,9 +1170,3 @@ class ClosedCaption extends StatelessWidget {
);
}
}
-
-/// This allows a value of type T or T? to be treated as a value of type T?.
-///
-/// We use this so that APIs that have become non-nullable can still be used
-/// with `!` and `?` on the stable branch.
-T? _ambiguate<T>(T? value) => value;
diff --git a/packages/video_player/video_player/pubspec.yaml b/packages/video_player/video_player/pubspec.yaml
index 7b128216f4..757e89f84f 100644
--- a/packages/video_player/video_player/pubspec.yaml
+++ b/packages/video_player/video_player/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for displaying inline video with other Flutter
widgets on Android, iOS, and web.
repository: https://github.com/flutter/packages/tree/main/packages/video_player/video_player
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22
-version: 2.8.3
+version: 2.8.4
environment:
sdk: ">=3.1.0 <4.0.0"
diff --git a/packages/video_player/video_player/test/video_player_test.dart b/packages/video_player/video_player/test/video_player_test.dart
index 820061ebec..c62615a06e 100644
--- a/packages/video_player/video_player/test/video_player_test.dart
+++ b/packages/video_player/video_player/test/video_player_test.dart
@@ -121,10 +121,10 @@ void main() {
required bool shouldPlayInBackground,
}) {
expect(controller.value.isPlaying, true);
- _ambiguate(WidgetsBinding.instance)!
+ WidgetsBinding.instance
.handleAppLifecycleStateChanged(AppLifecycleState.paused);
expect(controller.value.isPlaying, shouldPlayInBackground);
- _ambiguate(WidgetsBinding.instance)!
+ WidgetsBinding.instance
.handleAppLifecycleStateChanged(AppLifecycleState.resumed);
expect(controller.value.isPlaying, true);
}
@@ -1393,9 +1393,3 @@ class FakeVideoPlayerPlatform extends VideoPlayerPlatform {
return Texture(textureId: textureId);
}
}
-
-/// This allows a value of type T or T? to be treated as a value of type T?.
-///
-/// We use this so that APIs that have become non-nullable can still be used
-/// with `!` and `?` on the stable branch.
-T? _ambiguate<T>(T? value) => value;