From 2f33f0f45b9ef8f06ddae9779838224680bb7e73 Mon Sep 17 00:00:00 2001 From: FMorschel <52160996+FMorschel@users.noreply.github.com> Date: Tue, 15 Oct 2024 22:18:28 -0300 Subject: [PATCH 1/5] removing unnecessary parenthesis --- packages/camera/camera/example/lib/main.dart | 2 +- packages/camera/camera_android/example/lib/main.dart | 2 +- packages/camera/camera_avfoundation/example/lib/main.dart | 2 +- .../google_maps_flutter/example/lib/place_polygon.dart | 4 ++-- .../example/lib/place_polygon.dart | 4 ++-- .../example/shared/maps_example_dart/lib/place_polygon.dart | 4 ++-- packages/pigeon/lib/dart_generator.dart | 4 ++-- packages/pigeon/lib/objc_generator.dart | 2 +- .../example/integration_test/webview_flutter_test.dart | 4 ++-- .../example/integration_test/webview_flutter_test_legacy.dart | 4 ++-- .../example/integration_test/webview_flutter_test.dart | 4 ++-- .../example/integration_test/webview_flutter_test_legacy.dart | 4 ++-- .../example/integration_test/legacy/webview_flutter_test.dart | 4 ++-- .../example/integration_test/webview_flutter_test.dart | 4 ++-- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/camera/camera/example/lib/main.dart b/packages/camera/camera/example/lib/main.dart index 120e7f6ec50..d048fc794f2 100644 --- a/packages/camera/camera/example/lib/main.dart +++ b/packages/camera/camera/example/lib/main.dart @@ -534,7 +534,7 @@ class _CameraExampleHomeState extends State onPressed: cameraController != null && cameraController.value.isInitialized && cameraController.value.isRecordingVideo - ? (cameraController.value.isRecordingPaused) + ? cameraController.value.isRecordingPaused ? onResumeButtonPressed : onPauseButtonPressed : null, diff --git a/packages/camera/camera_android/example/lib/main.dart b/packages/camera/camera_android/example/lib/main.dart index 0b587ff669a..47c40c7d20d 100644 --- a/packages/camera/camera_android/example/lib/main.dart +++ b/packages/camera/camera_android/example/lib/main.dart @@ -540,7 +540,7 @@ class _CameraExampleHomeState extends State onPressed: cameraController != null && cameraController.value.isInitialized && cameraController.value.isRecordingVideo - ? (cameraController.value.isRecordingPaused) + ? cameraController.value.isRecordingPaused ? onResumeButtonPressed : onPauseButtonPressed : null, diff --git a/packages/camera/camera_avfoundation/example/lib/main.dart b/packages/camera/camera_avfoundation/example/lib/main.dart index 6bbfede262c..f0ebf7b7865 100644 --- a/packages/camera/camera_avfoundation/example/lib/main.dart +++ b/packages/camera/camera_avfoundation/example/lib/main.dart @@ -540,7 +540,7 @@ class _CameraExampleHomeState extends State onPressed: cameraController != null && cameraController.value.isInitialized && cameraController.value.isRecordingVideo - ? (cameraController.value.isRecordingPaused) + ? cameraController.value.isRecordingPaused ? onResumeButtonPressed : onPauseButtonPressed : null, diff --git a/packages/google_maps_flutter/google_maps_flutter/example/lib/place_polygon.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/place_polygon.dart index e18d088ed31..11b3ed6e0bb 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/lib/place_polygon.dart +++ b/packages/google_maps_flutter/google_maps_flutter/example/lib/place_polygon.dart @@ -225,7 +225,7 @@ class PlacePolygonBodyState extends State { TextButton( onPressed: (selectedId == null) ? null - : ((polygons[selectedId]!.holes.isNotEmpty) + : (polygons[selectedId]!.holes.isNotEmpty ? null : () => _addHoles(selectedId)), child: const Text('add holes'), @@ -233,7 +233,7 @@ class PlacePolygonBodyState extends State { TextButton( onPressed: (selectedId == null) ? null - : ((polygons[selectedId]!.holes.isEmpty) + : (polygons[selectedId]!.holes.isEmpty ? null : () => _removeHoles(selectedId)), child: const Text('remove holes'), diff --git a/packages/google_maps_flutter/google_maps_flutter_android/example/lib/place_polygon.dart b/packages/google_maps_flutter/google_maps_flutter_android/example/lib/place_polygon.dart index 889c38d6376..a1fdafd7a31 100644 --- a/packages/google_maps_flutter/google_maps_flutter_android/example/lib/place_polygon.dart +++ b/packages/google_maps_flutter/google_maps_flutter_android/example/lib/place_polygon.dart @@ -226,7 +226,7 @@ class PlacePolygonBodyState extends State { TextButton( onPressed: (selectedId == null) ? null - : ((polygons[selectedId]!.holes.isNotEmpty) + : (polygons[selectedId]!.holes.isNotEmpty ? null : () => _addHoles(selectedId)), child: const Text('add holes'), @@ -234,7 +234,7 @@ class PlacePolygonBodyState extends State { TextButton( onPressed: (selectedId == null) ? null - : ((polygons[selectedId]!.holes.isEmpty) + : (polygons[selectedId]!.holes.isEmpty ? null : () => _removeHoles(selectedId)), child: const Text('remove holes'), diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/lib/place_polygon.dart b/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/lib/place_polygon.dart index 889c38d6376..a1fdafd7a31 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/lib/place_polygon.dart +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/lib/place_polygon.dart @@ -226,7 +226,7 @@ class PlacePolygonBodyState extends State { TextButton( onPressed: (selectedId == null) ? null - : ((polygons[selectedId]!.holes.isNotEmpty) + : (polygons[selectedId]!.holes.isNotEmpty ? null : () => _addHoles(selectedId)), child: const Text('add holes'), @@ -234,7 +234,7 @@ class PlacePolygonBodyState extends State { TextButton( onPressed: (selectedId == null) ? null - : ((polygons[selectedId]!.holes.isEmpty) + : (polygons[selectedId]!.holes.isEmpty ? null : () => _removeHoles(selectedId)), child: const Text('remove holes'), diff --git a/packages/pigeon/lib/dart_generator.dart b/packages/pigeon/lib/dart_generator.dart index b6d81bbdd77..e8c7550cd70 100644 --- a/packages/pigeon/lib/dart_generator.dart +++ b/packages/pigeon/lib/dart_generator.dart @@ -2168,11 +2168,11 @@ String _addGenericTypes(TypeDeclaration type) { final List typeArguments = type.typeArguments; switch (type.baseName) { case 'List': - return (typeArguments.isEmpty) + return typeArguments.isEmpty ? 'List' : 'List<${_flattenTypeArguments(typeArguments)}>'; case 'Map': - return (typeArguments.isEmpty) + return typeArguments.isEmpty ? 'Map' : 'Map<${_flattenTypeArguments(typeArguments)}>'; default: diff --git a/packages/pigeon/lib/objc_generator.dart b/packages/pigeon/lib/objc_generator.dart index 3a4d8962435..d0e0e99ee29 100644 --- a/packages/pigeon/lib/objc_generator.dart +++ b/packages/pigeon/lib/objc_generator.dart @@ -1515,7 +1515,7 @@ String _propertyTypeForDartType(TypeDeclaration type, } String _capitalize(String str) => - (str.isEmpty) ? '' : str[0].toUpperCase() + str.substring(1); + str.isEmpty ? '' : str[0].toUpperCase() + str.substring(1); /// Returns the components of the objc selector that will be generated from /// [func], ie the strings between the semicolons. [lastSelectorComponent] is diff --git a/packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test.dart b/packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test.dart index eaf9d7ea309..e9d38e420f4 100644 --- a/packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test.dart +++ b/packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test.dart @@ -584,7 +584,7 @@ Future main() async { await controller.setNavigationDelegate(NavigationDelegate( onPageFinished: (_) => pageLoaded.complete(), onNavigationRequest: (NavigationRequest navigationRequest) { - return (navigationRequest.url.contains('youtube.com')) + return navigationRequest.url.contains('youtube.com') ? NavigationDecision.prevent : NavigationDecision.navigate; }, @@ -654,7 +654,7 @@ Future main() async { await controller.setNavigationDelegate(NavigationDelegate( onPageFinished: (_) => pageLoaded.complete(), onNavigationRequest: (NavigationRequest navigationRequest) { - return (navigationRequest.url.contains('youtube.com')) + return navigationRequest.url.contains('youtube.com') ? NavigationDecision.prevent : NavigationDecision.navigate; })); diff --git a/packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test_legacy.dart b/packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test_legacy.dart index fb037cffd36..076c103bc2f 100644 --- a/packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test_legacy.dart +++ b/packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test_legacy.dart @@ -873,7 +873,7 @@ Future main() async { }, javascriptMode: JavascriptMode.unrestricted, navigationDelegate: (NavigationRequest request) { - return (request.url.contains('youtube.com')) + return request.url.contains('youtube.com') ? NavigationDecision.prevent : NavigationDecision.navigate; }, @@ -1003,7 +1003,7 @@ Future main() async { }, javascriptMode: JavascriptMode.unrestricted, navigationDelegate: (NavigationRequest request) { - return (request.url.contains('youtube.com')) + return request.url.contains('youtube.com') ? NavigationDecision.prevent : NavigationDecision.navigate; }, diff --git a/packages/webview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test.dart b/packages/webview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test.dart index 4c22df1ff28..d5ed471afd3 100644 --- a/packages/webview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test.dart +++ b/packages/webview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test.dart @@ -867,7 +867,7 @@ Future main() async { await delegate.setOnPageFinished((_) => pageLoaded.complete()); await delegate .setOnNavigationRequest((NavigationRequest navigationRequest) { - return (navigationRequest.url.contains('youtube.com')) + return navigationRequest.url.contains('youtube.com') ? NavigationDecision.prevent : NavigationDecision.navigate; }); @@ -1059,7 +1059,7 @@ Future main() async { await delegate.setOnPageFinished((_) => pageLoaded.complete()); await delegate .setOnNavigationRequest((NavigationRequest navigationRequest) { - return (navigationRequest.url.contains('youtube.com')) + return navigationRequest.url.contains('youtube.com') ? NavigationDecision.prevent : NavigationDecision.navigate; }); diff --git a/packages/webview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test_legacy.dart b/packages/webview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test_legacy.dart index 2e7f3d0b8dd..51f71d7801b 100644 --- a/packages/webview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test_legacy.dart +++ b/packages/webview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test_legacy.dart @@ -1126,7 +1126,7 @@ Future main() async { }, javascriptMode: JavascriptMode.unrestricted, navigationDelegate: (NavigationRequest request) { - return (request.url.contains('youtube.com')) + return request.url.contains('youtube.com') ? NavigationDecision.prevent : NavigationDecision.navigate; }, @@ -1251,7 +1251,7 @@ Future main() async { }, javascriptMode: JavascriptMode.unrestricted, navigationDelegate: (NavigationRequest request) { - return (request.url.contains('youtube.com')) + return request.url.contains('youtube.com') ? NavigationDecision.prevent : NavigationDecision.navigate; }, diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/integration_test/legacy/webview_flutter_test.dart b/packages/webview_flutter/webview_flutter_wkwebview/example/integration_test/legacy/webview_flutter_test.dart index f6bf750071d..10d6514582b 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/integration_test/legacy/webview_flutter_test.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/integration_test/legacy/webview_flutter_test.dart @@ -917,7 +917,7 @@ Future main() async { }, javascriptMode: JavascriptMode.unrestricted, navigationDelegate: (NavigationRequest request) { - return (request.url.contains('youtube.com')) + return request.url.contains('youtube.com') ? NavigationDecision.prevent : NavigationDecision.navigate; }, @@ -1047,7 +1047,7 @@ Future main() async { }, javascriptMode: JavascriptMode.unrestricted, navigationDelegate: (NavigationRequest request) { - return (request.url.contains('youtube.com')) + return request.url.contains('youtube.com') ? NavigationDecision.prevent : NavigationDecision.navigate; }, diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/integration_test/webview_flutter_test.dart b/packages/webview_flutter/webview_flutter_wkwebview/example/integration_test/webview_flutter_test.dart index 6f9256687df..84bb246580f 100644 --- a/packages/webview_flutter/webview_flutter_wkwebview/example/integration_test/webview_flutter_test.dart +++ b/packages/webview_flutter/webview_flutter_wkwebview/example/integration_test/webview_flutter_test.dart @@ -829,7 +829,7 @@ Future main() async { unawaited(delegate.setOnPageFinished((_) => pageLoaded.complete())); unawaited( delegate.setOnNavigationRequest((NavigationRequest navigationRequest) { - return (navigationRequest.url.contains('youtube.com')) + return navigationRequest.url.contains('youtube.com') ? NavigationDecision.prevent : NavigationDecision.navigate; }), @@ -1086,7 +1086,7 @@ Future main() async { unawaited(delegate.setOnPageFinished((_) => pageLoaded.complete())); unawaited(delegate .setOnNavigationRequest((NavigationRequest navigationRequest) { - return (navigationRequest.url.contains('youtube.com')) + return navigationRequest.url.contains('youtube.com') ? NavigationDecision.prevent : NavigationDecision.navigate; })); From eeaf2b816fb8d6c2d09d987b84357f4e75b15248 Mon Sep 17 00:00:00 2001 From: FMorschel <52160996+FMorschel@users.noreply.github.com> Date: Wed, 16 Oct 2024 14:57:57 -0300 Subject: [PATCH 2/5] fixing patch version for pigeon --- packages/pigeon/CHANGELOG.md | 4 ++++ packages/pigeon/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md index ec8daa80804..c992d7a0b8d 100644 --- a/packages/pigeon/CHANGELOG.md +++ b/packages/pigeon/CHANGELOG.md @@ -1,3 +1,7 @@ +## 22.5.1 + +* Removes unnecessary parenthesis. + ## 22.5.0 * [swift] Adds implementation for `@ProxyApi`. diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml index df2a2009fec..a21aae6d61c 100644 --- a/packages/pigeon/pubspec.yaml +++ b/packages/pigeon/pubspec.yaml @@ -2,7 +2,7 @@ name: pigeon description: Code generator tool to make communication between Flutter and the host platform type-safe and easier. repository: https://github.com/flutter/packages/tree/main/packages/pigeon issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+pigeon%22 -version: 22.5.0 # This must match the version in lib/generator_tools.dart +version: 22.5.1 # This must match the version in lib/generator_tools.dart environment: sdk: ^3.3.0 From 7194ce5253cbbaca499652d1da35b5ab95c51e2c Mon Sep 17 00:00:00 2001 From: FMorschel <52160996+FMorschel@users.noreply.github.com> Date: Wed, 16 Oct 2024 15:01:03 -0300 Subject: [PATCH 3/5] fixing english mistake for plural --- packages/pigeon/CHANGELOG.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md index c992d7a0b8d..502972522aa 100644 --- a/packages/pigeon/CHANGELOG.md +++ b/packages/pigeon/CHANGELOG.md @@ -1,6 +1,6 @@ ## 22.5.1 -* Removes unnecessary parenthesis. +* Removes unnecessary parentheses. ## 22.5.0 @@ -222,8 +222,6 @@ `YES`. Any data class or Flutter API interactions involving `bool`s should be carefully audited by hand when updating. - - ## 12.0.1 * [swift] Adds protocol for Flutter APIs. From 1a099bba4aac6aac5cd2a6e39a7a4ddb13fa2016 Mon Sep 17 00:00:00 2001 From: FMorschel <52160996+FMorschel@users.noreply.github.com> Date: Wed, 16 Oct 2024 16:07:54 -0300 Subject: [PATCH 4/5] pigeon version updated for generator_tools --- packages/pigeon/lib/generator_tools.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pigeon/lib/generator_tools.dart b/packages/pigeon/lib/generator_tools.dart index 37bce3f6402..88456415667 100644 --- a/packages/pigeon/lib/generator_tools.dart +++ b/packages/pigeon/lib/generator_tools.dart @@ -14,7 +14,7 @@ import 'ast.dart'; /// The current version of pigeon. /// /// This must match the version in pubspec.yaml. -const String pigeonVersion = '22.5.0'; +const String pigeonVersion = '22.5.1'; /// Read all the content from [stdin] to a String. String readStdin() { From 052097c988c0a59cac45903452ee63cb8144416c Mon Sep 17 00:00:00 2001 From: FMorschel <52160996+FMorschel@users.noreply.github.com> Date: Thu, 17 Oct 2024 02:32:20 -0300 Subject: [PATCH 5/5] removing version changes --- packages/pigeon/CHANGELOG.md | 4 ---- packages/pigeon/lib/generator_tools.dart | 2 +- packages/pigeon/pubspec.yaml | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md index 502972522aa..dea1af96901 100644 --- a/packages/pigeon/CHANGELOG.md +++ b/packages/pigeon/CHANGELOG.md @@ -1,7 +1,3 @@ -## 22.5.1 - -* Removes unnecessary parentheses. - ## 22.5.0 * [swift] Adds implementation for `@ProxyApi`. diff --git a/packages/pigeon/lib/generator_tools.dart b/packages/pigeon/lib/generator_tools.dart index 88456415667..37bce3f6402 100644 --- a/packages/pigeon/lib/generator_tools.dart +++ b/packages/pigeon/lib/generator_tools.dart @@ -14,7 +14,7 @@ import 'ast.dart'; /// The current version of pigeon. /// /// This must match the version in pubspec.yaml. -const String pigeonVersion = '22.5.1'; +const String pigeonVersion = '22.5.0'; /// Read all the content from [stdin] to a String. String readStdin() { diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml index a21aae6d61c..df2a2009fec 100644 --- a/packages/pigeon/pubspec.yaml +++ b/packages/pigeon/pubspec.yaml @@ -2,7 +2,7 @@ name: pigeon description: Code generator tool to make communication between Flutter and the host platform type-safe and easier. repository: https://github.com/flutter/packages/tree/main/packages/pigeon issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+pigeon%22 -version: 22.5.1 # This must match the version in lib/generator_tools.dart +version: 22.5.0 # This must match the version in lib/generator_tools.dart environment: sdk: ^3.3.0