flutter/packages
1
0
Fork 0
mirror of https://github.com/flutter/packages.git synced 2025-06-18 04:33:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

[various] Sync lints with flutter/flutter (#5717)

Browse Source 
Applying the latest analysis_options.yaml from flutter/flutter to this
repo. Most fixes were auto-generated by `dart fix`.
This commit is contained in:
Michael Goderbauer
2024-01-03 15:16:49 -08:00
committed by GitHub
parent 6b2249f152
commit bb97da8ec6
282 changed files with 527 additions and 947 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
analysis_options.yaml
View File

@ -1,13 +1,14 @@
# Specify analysis options.
#
# This file is a copy of analysis_options.yaml from flutter repo
# as of 2022-07-27, but with some modifications marked with
# as of 2023-12-18, but with some modifications marked with
# "DIFFERENT FROM FLUTTER/FLUTTER" below. The file is expected to
# be kept in sync with the master file from the flutter repo.
analyzer:
language:
strict-casts: true
strict-inference: true
strict-raw-types: true
errors:
# allow self-reference to deprecated members (we do this because otherwise we have
@ -21,11 +22,10 @@ analyzer:
linter:
rules:
# This list is derived from the list of all available lints located at
# https://github.com/dart-lang/linter/blob/master/example/all.yaml
# https://github.com/dart-lang/linter/blob/main/example/all.yaml
- always_declare_return_types
- always_put_control_body_on_new_line
# - always_put_required_named_parameters_first # we prefer having parameters in the same order as fields https://github.com/flutter/flutter/issues/10219
- always_require_non_null_named_parameters
- always_specify_types
# - always_use_package_imports # we do this commonly
- annotate_overrides
@ -33,7 +33,7 @@ linter:
- avoid_bool_literals_in_conditional_expressions
# - avoid_catches_without_on_clauses # blocked on https://github.com/dart-lang/linter/issues/3023
# - avoid_catching_errors # blocked on https://github.com/dart-lang/linter/issues/3023
- avoid_classes_with_only_static_members
# - avoid_classes_with_only_static_members # we do this commonly for `abstract final class`es
- avoid_double_and_int_checks
- avoid_dynamic_calls
- avoid_empty_else
@ -42,7 +42,7 @@ linter:
- avoid_field_initializers_in_const_classes
# - avoid_final_parameters # incompatible with prefer_final_parameters
- avoid_function_literals_in_foreach_calls
- avoid_implementing_value_types
# - avoid_implementing_value_types # see https://github.com/dart-lang/linter/issues/4558
- avoid_init_to_null
- avoid_js_rounded_ints
# - avoid_multiple_declarations_per_line # seems to be a stylistic choice we don't subscribe to
@ -54,8 +54,6 @@ linter:
- avoid_relative_lib_imports
- avoid_renaming_method_parameters
- avoid_return_types_on_setters
- avoid_returning_null
- avoid_returning_null_for_future
- avoid_returning_null_for_void
# - avoid_returning_this # there are enough valid reasons to return `this` that this lint ends up with too many false positives
- avoid_setters_without_getters
@ -77,17 +75,19 @@ linter:
- cast_nullable_to_non_nullable
# - close_sinks # not reliable enough
- collection_methods_unrelated_type
# - combinators_ordering # DIFFERENT FROM FLUTTER/FLUTTER: This isn't available on stable yet.
- combinators_ordering
# - comment_references # blocked on https://github.com/dart-lang/linter/issues/1142
- conditional_uri_does_not_exist
# - constant_identifier_names # needs an opt-out https://github.com/dart-lang/linter/issues/204
- control_flow_in_finally
- curly_braces_in_flow_control_structures
- dangling_library_doc_comments
- depend_on_referenced_packages
- deprecated_consistency
# - deprecated_member_use_from_same_package # we allow self-references to deprecated members
# - diagnostic_describe_all_properties # enabled only at the framework level (packages/flutter/lib)
- directives_ordering
# - discarded_futures # not yet tested
# - discarded_futures # too many false positives, similar to unawaited_futures
# - do_not_use_environment # there are appropriate times to use the environment, especially in our tests and build logic
- empty_catches
- empty_constructor_bodies
@ -98,21 +98,29 @@ linter:
- flutter_style_todos
- hash_and_equals
- implementation_imports
- implicit_call_tearoffs
- implicit_reopen
- invalid_case_patterns
# - join_return_with_assignment # not required by flutter style
- leading_newlines_in_multiline_strings
- library_annotations
- library_names
- library_prefixes
- library_private_types_in_public_api
# - lines_longer_than_80_chars # not required by flutter style
# - literal_only_boolean_expressions # too many false positives: https://github.com/dart-lang/linter/issues/453
- literal_only_boolean_expressions
# - matching_super_parameters # blocked on https://github.com/dart-lang/language/issues/2509
- missing_whitespace_between_adjacent_strings
- no_adjacent_strings_in_list
- no_default_cases
- no_duplicate_case_values
- no_leading_underscores_for_library_prefixes
- no_leading_underscores_for_local_identifiers
- no_literal_bool_comparisons
- no_logic_in_create_state
- no_runtimeType_toString # DIFFERENT FROM FLUTTER/FLUTTER
- no_self_assignments
- no_wildcard_variable_uses
- non_constant_identifier_names
- noop_primitive_operations
- null_check_on_nullable_type_parameter
@ -137,12 +145,11 @@ linter:
# - prefer_constructors_over_static_methods # far too many false positives
- prefer_contains
# - prefer_double_quotes # opposite of prefer_single_quotes
- prefer_equal_for_default_values
# - prefer_expression_function_bodies # conflicts with https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#consider-using--for-short-functions-and-methods
- prefer_final_fields
- prefer_final_in_for_each
- prefer_final_locals
# - prefer_final_parameters # we should enable this one day when it can be auto-fixed (https://github.com/dart-lang/linter/issues/3104), see also parameter_assignments
# - prefer_final_parameters # adds too much verbosity
- prefer_for_elements_to_map_fromIterable
- prefer_foreach
- prefer_function_declarations_over_variables
@ -157,7 +164,7 @@ linter:
- prefer_is_not_empty
- prefer_is_not_operator
- prefer_iterable_whereType
# - prefer_mixin # Has false positives, see https://github.com/dart-lang/linter/issues/3018
# - prefer_mixin # DIFFERENT FROM FLUTTER/FLUTTER: enable when v2.1.7 of plugin_platform_interface is the oldest supported version (which makes MockPlatformInterfaceMixin a mixin class)
# - prefer_null_aware_method_calls # "call()" is confusing to people new to the language since it's not documented anywhere
- prefer_null_aware_operators
- prefer_relative_imports
@ -168,10 +175,10 @@ linter:
- provide_deprecation_message
- public_member_api_docs # DIFFERENT FROM FLUTTER/FLUTTER
- recursive_getters
# - require_trailing_commas # blocked on https://github.com/dart-lang/sdk/issues/47441
# - require_trailing_commas # would be nice, but requires a lot of manual work: 10,000+ code locations would need to be reformatted by hand after bulk fix is applied
- secure_pubspec_urls
- sized_box_for_whitespace
# - sized_box_shrink_expand # not yet tested
- sized_box_shrink_expand
- slash_for_doc_comments
- sort_child_properties_last
- sort_constructors_first
@ -182,15 +189,18 @@ linter:
- tighten_type_of_initializing_formals
# - type_annotate_public_apis # subset of always_specify_types
- type_init_formals
- type_literal_in_constant_pattern
- unawaited_futures # DIFFERENT FROM FLUTTER/FLUTTER: It's disabled there for "too many false positives"; that's not an issue here, and missing awaits have caused production issues in plugins.
- unnecessary_await_in_return
- unnecessary_brace_in_string_interps
- unnecessary_breaks
- unnecessary_const
- unnecessary_constructor_name
# - unnecessary_final # conflicts with prefer_final_locals
- unnecessary_getters_setters
# - unnecessary_lambdas # has false positives: https://github.com/dart-lang/linter/issues/498
- unnecessary_late
- unnecessary_library_directive
- unnecessary_new
- unnecessary_null_aware_assignments
- unnecessary_null_aware_operator_on_extension_on_nullable
@ -205,12 +215,13 @@ linter:
- unnecessary_string_interpolations
- unnecessary_this
- unnecessary_to_list_in_spreads
- unreachable_from_main
- unrelated_type_equality_checks
- unsafe_html
- use_build_context_synchronously
# - use_colored_box # not yet tested
# - use_decorated_box # not yet tested
# - use_enums # not yet tested
- use_colored_box
# - use_decorated_box # leads to bugs: DecoratedBox and Container are not equivalent (Container inserts extra padding)
- use_enums
- use_full_hex_values_for_flutter_colors
- use_function_type_syntax_for_parameters
- use_if_null_to_convert_nulls_to_bools
@ -222,6 +233,7 @@ linter:
- use_rethrow_when_possible
- use_setters_to_change_properties
# - use_string_buffers # has false positives: https://github.com/dart-lang/sdk/issues/34182
- use_string_in_part_of_directives
- use_super_parameters
- use_test_throws_matchers
# - use_to_and_as_if_applicable # has false positives, so we prefer to catch this by code-review

4
packages/animations/CHANGELOG.md
View File

@ -1,3 +1,7 @@
## 2.0.11
* Fixes new lint warnings.
## 2.0.10
* Updates minimum supported SDK version to Flutter 3.16/Dart 3.2.

2
packages/animations/example/lib/container_transition.dart
View File

@ -312,7 +312,7 @@ class _ExampleCard extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[
Expanded(
child: Container(
child: ColoredBox(
color: Colors.black38,
child: Center(
child: Image.asset(

2
packages/animations/example/lib/fade_through_transition.dart
View File

@ -79,7 +79,7 @@ class _ExampleCard extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[
Expanded(
child: Container(
child: ColoredBox(
color: Colors.black26,
child: Padding(
padding: const EdgeInsets.all(30.0),

2
packages/animations/lib/src/fade_through_transition.dart
View File

@ -201,7 +201,7 @@ class FadeThroughTransition extends StatelessWidget {
Widget build(BuildContext context) {
return _ZoomedFadeInFadeOut(
animation: animation,
child: Container(
child: ColoredBox(
color: fillColor ?? Theme.of(context).canvasColor,
child: _ZoomedFadeInFadeOut(
animation: ReverseAnimation(secondaryAnimation),

9
packages/animations/lib/src/open_container.dart
View File

@ -604,10 +604,8 @@ class _OpenContainerRoute<T> extends ModalRoute<T> {
switch (status) {
case AnimationStatus.dismissed:
_toggleHideable(hide: false);
break;
case AnimationStatus.completed:
_toggleHideable(hide: true);
break;
case AnimationStatus.forward:
case AnimationStatus.reverse:
break;
@ -699,11 +697,9 @@ class _OpenContainerRoute<T> extends ModalRoute<T> {
case AnimationStatus.completed:
case AnimationStatus.dismissed:
isInProgress = false;
break;
case AnimationStatus.forward:
case AnimationStatus.reverse:
isInProgress = true;
break;
case null:
break;
}
@ -711,11 +707,9 @@ class _OpenContainerRoute<T> extends ModalRoute<T> {
case AnimationStatus.completed:
case AnimationStatus.dismissed:
wasInProgress = false;
break;
case AnimationStatus.forward:
case AnimationStatus.reverse:
wasInProgress = true;
break;
case null:
break;
}
@ -769,7 +763,6 @@ class _OpenContainerRoute<T> extends ModalRoute<T> {
openOpacityTween = _openOpacityTween;
colorTween = _colorTween;
scrimTween = _scrimFadeInTween;
break;
case AnimationStatus.reverse:
if (_transitionWasInterrupted) {
closedOpacityTween = _closedOpacityTween;
@ -782,10 +775,8 @@ class _OpenContainerRoute<T> extends ModalRoute<T> {
openOpacityTween = _openOpacityTween.flipped;
colorTween = _colorTween.flipped;
scrimTween = _scrimFadeOutTween;
break;
case AnimationStatus.completed:
assert(false); // Unreachable.
break;
}
assert(colorTween != null);
assert(closedOpacityTween != null);

6
packages/animations/lib/src/shared_axis_transition.dart
View File

@ -410,7 +410,7 @@ class _ExitTransition extends StatelessWidget {
return FadeTransition(
opacity: _fadeOutTransition.animate(animation),
child: Container(
child: ColoredBox(
color: fillColor,
child: AnimatedBuilder(
animation: animation,
@ -432,7 +432,7 @@ class _ExitTransition extends StatelessWidget {
return FadeTransition(
opacity: _fadeOutTransition.animate(animation),
child: Container(
child: ColoredBox(
color: fillColor,
child: AnimatedBuilder(
animation: animation,
@ -449,7 +449,7 @@ class _ExitTransition extends StatelessWidget {
case SharedAxisTransitionType.scaled:
return FadeTransition(
opacity: _fadeOutTransition.animate(animation),
child: Container(
child: ColoredBox(
color: fillColor,
child: ScaleTransition(
scale: (!reverse ? _scaleUpTransition : _scaleDownTransition)

2
packages/animations/pubspec.yaml
View File

@ -2,7 +2,7 @@ name: animations
description: Fancy pre-built animations that can easily be integrated into any Flutter application.
repository: https://github.com/flutter/packages/tree/main/packages/animations
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+animations%22
version: 2.0.10
version: 2.0.11
environment:
sdk: ">=3.2.0 <4.0.0"

54
packages/animations/test/shared_axis_transition_test.dart
View File

@ -522,12 +522,12 @@ void main() {
expect(find.text(bottomRoute), findsOneWidget);
Finder fillContainerFinder = find
.ancestor(
matching: find.byType(Container),
matching: find.byType(ColoredBox),
of: find.byKey(const ValueKey<String?>('/')),
)
.last;
expect(fillContainerFinder, findsOneWidget);
expect(tester.widget<Container>(fillContainerFinder).color,
expect(tester.widget<ColoredBox>(fillContainerFinder).color,
defaultFillColor);
navigator.currentState!.pushNamed(topRoute);
@ -536,12 +536,12 @@ void main() {
fillContainerFinder = find
.ancestor(
matching: find.byType(Container),
matching: find.byType(ColoredBox),
of: find.byKey(const ValueKey<String?>('/a')),
)
.last;
expect(fillContainerFinder, findsOneWidget);
expect(tester.widget<Container>(fillContainerFinder).color,
expect(tester.widget<ColoredBox>(fillContainerFinder).color,
defaultFillColor);
});
@ -561,12 +561,13 @@ void main() {
expect(find.text(bottomRoute), findsOneWidget);
Finder fillContainerFinder = find
.ancestor(
matching: find.byType(Container),
matching: find.byType(ColoredBox),
of: find.byKey(const ValueKey<String?>('/')),
)
.last;
expect(fillContainerFinder, findsOneWidget);
expect(tester.widget<Container>(fillContainerFinder).color, Colors.green);
expect(
tester.widget<ColoredBox>(fillContainerFinder).color, Colors.green);
navigator.currentState!.pushNamed(topRoute);
await tester.pump();
@ -574,12 +575,13 @@ void main() {
fillContainerFinder = find
.ancestor(
matching: find.byType(Container),
matching: find.byType(ColoredBox),
of: find.byKey(const ValueKey<String?>('/a')),
)
.last;
expect(fillContainerFinder, findsOneWidget);
expect(tester.widget<Container>(fillContainerFinder).color, Colors.green);
expect(
tester.widget<ColoredBox>(fillContainerFinder).color, Colors.green);
});
testWidgets('should keep state', (WidgetTester tester) async {
@ -1165,12 +1167,12 @@ void main() {
expect(find.text(bottomRoute), findsOneWidget);
Finder fillContainerFinder = find
.ancestor(
matching: find.byType(Container),
matching: find.byType(ColoredBox),
of: find.byKey(const ValueKey<String?>('/')),
)
.last;
expect(fillContainerFinder, findsOneWidget);
expect(tester.widget<Container>(fillContainerFinder).color,
expect(tester.widget<ColoredBox>(fillContainerFinder).color,
defaultFillColor);
navigator.currentState!.pushNamed(topRoute);
@ -1179,12 +1181,12 @@ void main() {
fillContainerFinder = find
.ancestor(
matching: find.byType(Container),
matching: find.byType(ColoredBox),
of: find.byKey(const ValueKey<String?>('/a')),
)
.last;
expect(fillContainerFinder, findsOneWidget);
expect(tester.widget<Container>(fillContainerFinder).color,
expect(tester.widget<ColoredBox>(fillContainerFinder).color,
defaultFillColor);
});
@ -1204,12 +1206,13 @@ void main() {
expect(find.text(bottomRoute), findsOneWidget);
Finder fillContainerFinder = find
.ancestor(
matching: find.byType(Container),
matching: find.byType(ColoredBox),
of: find.byKey(const ValueKey<String?>('/')),
)
.last;
expect(fillContainerFinder, findsOneWidget);
expect(tester.widget<Container>(fillContainerFinder).color, Colors.green);
expect(
tester.widget<ColoredBox>(fillContainerFinder).color, Colors.green);
navigator.currentState!.pushNamed(topRoute);
await tester.pump();
@ -1217,12 +1220,13 @@ void main() {
fillContainerFinder = find
.ancestor(
matching: find.byType(Container),
matching: find.byType(ColoredBox),
of: find.byKey(const ValueKey<String?>('/a')),
)
.last;
expect(fillContainerFinder, findsOneWidget);
expect(tester.widget<Container>(fillContainerFinder).color, Colors.green);
expect(
tester.widget<ColoredBox>(fillContainerFinder).color, Colors.green);
});
testWidgets('should keep state', (WidgetTester tester) async {
@ -1701,12 +1705,12 @@ void main() {
expect(find.text(bottomRoute), findsOneWidget);
Finder fillContainerFinder = find
.ancestor(
matching: find.byType(Container),
matching: find.byType(ColoredBox),
of: find.byKey(const ValueKey<String?>('/')),
)
.last;
expect(fillContainerFinder, findsOneWidget);
expect(tester.widget<Container>(fillContainerFinder).color,
expect(tester.widget<ColoredBox>(fillContainerFinder).color,
defaultFillColor);
navigator.currentState!.pushNamed(topRoute);
@ -1715,12 +1719,12 @@ void main() {
fillContainerFinder = find
.ancestor(
matching: find.byType(Container),
matching: find.byType(ColoredBox),
of: find.byKey(const ValueKey<String?>('/a')),
)
.last;
expect(fillContainerFinder, findsOneWidget);
expect(tester.widget<Container>(fillContainerFinder).color,
expect(tester.widget<ColoredBox>(fillContainerFinder).color,
defaultFillColor);
});
@ -1740,12 +1744,13 @@ void main() {
expect(find.text(bottomRoute), findsOneWidget);
Finder fillContainerFinder = find
.ancestor(
matching: find.byType(Container),
matching: find.byType(ColoredBox),
of: find.byKey(const ValueKey<String?>('/')),
)
.last;
expect(fillContainerFinder, findsOneWidget);
expect(tester.widget<Container>(fillContainerFinder).color, Colors.green);
expect(
tester.widget<ColoredBox>(fillContainerFinder).color, Colors.green);
navigator.currentState!.pushNamed(topRoute);
await tester.pump();
@ -1753,12 +1758,13 @@ void main() {
fillContainerFinder = find
.ancestor(
matching: find.byType(Container),
matching: find.byType(ColoredBox),
of: find.byKey(const ValueKey<String?>('/a')),
)
.last;
expect(fillContainerFinder, findsOneWidget);
expect(tester.widget<Container>(fillContainerFinder).color, Colors.green);
expect(
tester.widget<ColoredBox>(fillContainerFinder).color, Colors.green);
});
testWidgets('should keep state', (WidgetTester tester) async {

4
packages/camera/camera/CHANGELOG.md
View File

@ -1,3 +1,7 @@
## 0.10.5+8
* Fixes new lint warnings.
## 0.10.5+7
* Updates example app to use non-deprecated video_player method.

10
packages/camera/camera/example/lib/main.dart
View File

@ -378,7 +378,7 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
return SizeTransition(
sizeFactor: _exposureModeControlRowAnimation,
child: ClipRect(
child: Container(
child: ColoredBox(
color: Colors.grey.shade50,
child: Column(
children: <Widget>[
@ -461,7 +461,7 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
return SizeTransition(
sizeFactor: _focusModeControlRowAnimation,
child: ClipRect(
child: Container(
child: ColoredBox(
color: Colors.grey.shade50,
child: Column(
children: <Widget>[
@ -673,26 +673,20 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
switch (e.code) {
case 'CameraAccessDenied':
showInSnackBar('You have denied camera access.');
break;
case 'CameraAccessDeniedWithoutPrompt':
// iOS only
showInSnackBar('Please go to Settings app to enable camera access.');
break;
case 'CameraAccessRestricted':
// iOS only
showInSnackBar('Camera access is restricted.');
break;
case 'AudioAccessDenied':
showInSnackBar('You have denied audio access.');
break;
case 'AudioAccessDeniedWithoutPrompt':
// iOS only
showInSnackBar('Please go to Settings app to enable audio access.');
break;
case 'AudioAccessRestricted':
// iOS only
showInSnackBar('Audio access is restricted.');
break;
default:
_showCameraException(e);
break;

6
packages/camera/camera/lib/camera.dart
View File

@ -7,12 +7,12 @@ export 'package:camera_platform_interface/camera_platform_interface.dart'
CameraDescription,
CameraException,
CameraLensDirection,
FlashMode,
ExposureMode,
FlashMode,
FocusMode,
ImageFormatGroup,
ResolutionPreset,
XFile,
ImageFormatGroup;
XFile;
export 'src/camera_controller.dart';
export 'src/camera_image.dart';

4
packages/camera/camera/lib/src/camera_controller.dart
View File

@ -19,7 +19,7 @@ import '../camera.dart';
// TODO(stuartmorgan): Fix this naming the next time there's a breaking change
// to this package.
// ignore: camel_case_types
typedef onLatestImageAvailable = Function(CameraImage image);
typedef onLatestImageAvailable = void Function(CameraImage image);
/// Completes with a list of available cameras.
///
@ -530,7 +530,7 @@ class CameraController extends ValueNotifier<CameraValue> {
);
}
Function(CameraImageData image)? streamCallback;
void Function(CameraImageData image)? streamCallback;
if (onAvailable != null) {
streamCallback = (CameraImageData imageData) {
onAvailable(CameraImage.fromPlatformInterface(imageData));

2
packages/camera/camera/pubspec.yaml
View File

@ -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+7
version: 0.10.5+8
environment:
sdk: ">=3.0.0 <4.0.0"

12
packages/camera/camera/test/camera_image_stream_test.dart
View File

@ -28,7 +28,7 @@ void main() {
ResolutionPreset.max);
expect(
() => cameraController.startImageStream((CameraImage image) => null),
() => cameraController.startImageStream((CameraImage image) {}),
throwsA(
isA<CameraException>()
.having(
@ -60,7 +60,7 @@ void main() {
cameraController.value.copyWith(isRecordingVideo: true);
expect(
() => cameraController.startImageStream((CameraImage image) => null),
() => cameraController.startImageStream((CameraImage image) {}),
throwsA(isA<CameraException>().having(
(CameraException error) => error.description,
'A video recording is already started.',
@ -81,7 +81,7 @@ void main() {
cameraController.value =
cameraController.value.copyWith(isStreamingImages: true);
expect(
() => cameraController.startImageStream((CameraImage image) => null),
() => cameraController.startImageStream((CameraImage image) {}),
throwsA(isA<CameraException>().having(
(CameraException error) => error.description,
'A camera has started streaming images.',
@ -98,7 +98,7 @@ void main() {
ResolutionPreset.max);
await cameraController.initialize();
await cameraController.startImageStream((CameraImage image) => null);
await cameraController.startImageStream((CameraImage image) {});
expect(mockPlatform.streamCallLog,
<String>['onStreamedFrameAvailable', 'listen']);
@ -157,7 +157,7 @@ void main() {
sensorOrientation: 90),
ResolutionPreset.max);
await cameraController.initialize();
await cameraController.startImageStream((CameraImage image) => null);
await cameraController.startImageStream((CameraImage image) {});
await cameraController.stopImageStream();
expect(mockPlatform.streamCallLog,
@ -175,7 +175,7 @@ void main() {
await cameraController.initialize();
await cameraController.startVideoRecording(
onAvailable: (CameraImage image) => null);
onAvailable: (CameraImage image) {});
expect(
mockPlatform.streamCallLog.contains('startVideoCapturing with stream'),

4
packages/camera/camera_android/CHANGELOG.md
View File

@ -1,3 +1,7 @@
## 0.10.8+16
* Fixes new lint warnings.
## 0.10.8+15
* Updates example app to use non-deprecated video_player method.

4
packages/camera/camera_android/example/lib/camera_controller.dart
View File

@ -306,7 +306,7 @@ class CameraController extends ValueNotifier<CameraValue> {
/// Start streaming images from platform camera.
Future<void> startImageStream(
Function(CameraImageData image) onAvailable) async {
void Function(CameraImageData image) onAvailable) async {
_imageStreamSubscription = CameraPlatform.instance
.onStreamedFrameAvailable(_cameraId)
.listen((CameraImageData imageData) {
@ -327,7 +327,7 @@ class CameraController extends ValueNotifier<CameraValue> {
/// The video is returned as a [XFile] after calling [stopVideoRecording].
/// Throws a [CameraException] if the capture fails.
Future<void> startVideoRecording(
{Function(CameraImageData image)? streamCallback}) async {
{void Function(CameraImageData image)? streamCallback}) async {
await CameraPlatform.instance.startVideoCapturing(
VideoCaptureOptions(_cameraId, streamCallback: streamCallback));
value = value.copyWith(

11
packages/camera/camera_android/example/lib/main.dart
View File

@ -381,7 +381,7 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
return SizeTransition(
sizeFactor: _exposureModeControlRowAnimation,
child: ClipRect(
child: Container(
child: ColoredBox(
color: Colors.grey.shade50,
child: Column(
children: <Widget>[
@ -465,7 +465,7 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
return SizeTransition(
sizeFactor: _focusModeControlRowAnimation,
child: ClipRect(
child: Container(
child: ColoredBox(
color: Colors.grey.shade50,
child: Column(
children: <Widget>[
@ -677,30 +677,23 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
switch (e.code) {
case 'CameraAccessDenied':
showInSnackBar('You have denied camera access.');
break;
case 'CameraAccessDeniedWithoutPrompt':
// iOS only
showInSnackBar('Please go to Settings app to enable camera access.');
break;
case 'CameraAccessRestricted':
// iOS only
showInSnackBar('Camera access is restricted.');
break;
case 'AudioAccessDenied':
showInSnackBar('You have denied audio access.');
break;
case 'AudioAccessDeniedWithoutPrompt':
// iOS only
showInSnackBar('Please go to Settings app to enable audio access.');
break;
case 'AudioAccessRestricted':
// iOS only
showInSnackBar('Audio access is restricted.');
break;
case 'cameraPermission':
// Android & web only
showInSnackBar('Unknown permission error.');
break;
default:
_showCameraException(e);
break;

8
packages/camera/camera_android/lib/src/android_camera.dart
View File

@ -308,7 +308,7 @@ class AndroidCamera extends CameraPlatform {
}
StreamController<CameraImageData> _installStreamController(
{Function()? onListen}) {
{void Function()? onListen}) {
_frameStreamController = StreamController<CameraImageData>(
onListen: onListen ?? () {},
onPause: _onFrameStreamPauseResume,
@ -574,7 +574,6 @@ class AndroidCamera extends CameraPlatform {
final Map<String, Object?> arguments = _getArgumentDictionary(call);
_deviceEventStreamController.add(DeviceOrientationChangedEvent(
deserializeDeviceOrientation(arguments['orientation']! as String)));
break;
default:
throw MissingPluginException();
}
@ -598,7 +597,6 @@ class AndroidCamera extends CameraPlatform {
deserializeFocusMode(arguments['focusMode']! as String),
arguments['focusPointSupported']! as bool,
));
break;
case 'resolution_changed':
final Map<String, Object?> arguments = _getArgumentDictionary(call);
cameraEventStreamController.add(CameraResolutionChangedEvent(
@ -606,12 +604,10 @@ class AndroidCamera extends CameraPlatform {
arguments['captureWidth']! as double,
arguments['captureHeight']! as double,
));
break;
case 'camera_closing':
cameraEventStreamController.add(CameraClosingEvent(
cameraId,
));
break;
case 'video_recorded':
final Map<String, Object?> arguments = _getArgumentDictionary(call);
cameraEventStreamController.add(VideoRecordedEvent(
@ -621,14 +617,12 @@ class AndroidCamera extends CameraPlatform {
? Duration(milliseconds: arguments['maxVideoDuration']! as int)
: null,
));
break;
case 'error':
final Map<String, Object?> arguments = _getArgumentDictionary(call);
cameraEventStreamController.add(CameraErrorEvent(
cameraId,
arguments['description']! as String,
));
break;
default:
throw MissingPluginException();
}

2
packages/camera/camera_android/pubspec.yaml
View File

@ -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+15
version: 0.10.8+16
environment:
sdk: ">=3.0.0 <4.0.0"

4
packages/camera/camera_android_camerax/CHANGELOG.md
View File

@ -1,3 +1,7 @@
## 0.5.0+26
* Fixes new lint warnings.
## 0.5.0+25
* Implements `lockCaptureOrientation` and `unlockCaptureOrientation`.

4
packages/camera/camera_android_camerax/example/lib/camera_controller.dart
View File

@ -19,7 +19,7 @@ import 'camera_image.dart';
// TODO(stuartmorgan): Fix this naming the next time there's a breaking change
// to this package.
// ignore: camel_case_types
typedef onLatestImageAvailable = Function(CameraImage image);
typedef onLatestImageAvailable = void Function(CameraImage image);
/// Completes with a list of available cameras.
///
@ -492,7 +492,7 @@ class CameraController extends ValueNotifier<CameraValue> {
);
}
Function(CameraImageData image)? streamCallback;
void Function(CameraImageData image)? streamCallback;
if (onAvailable != null) {
streamCallback = (CameraImageData imageData) {
onAvailable(CameraImage.fromPlatformInterface(imageData));

10
packages/camera/camera_android_camerax/example/lib/main.dart
View File

@ -380,7 +380,7 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
return SizeTransition(
sizeFactor: _exposureModeControlRowAnimation,
child: ClipRect(
child: Container(
child: ColoredBox(
color: Colors.grey.shade50,
child: Column(
children: <Widget>[
@ -454,7 +454,7 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
return SizeTransition(
sizeFactor: _focusModeControlRowAnimation,
child: ClipRect(
child: Container(
child: ColoredBox(
color: Colors.grey.shade50,
child: Column(
children: <Widget>[
@ -660,26 +660,20 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
switch (e.code) {
case 'CameraAccessDenied':
showInSnackBar('You have denied camera access.');
break;
case 'CameraAccessDeniedWithoutPrompt':
// iOS only
showInSnackBar('Please go to Settings app to enable camera access.');
break;
case 'CameraAccessRestricted':
// iOS only
showInSnackBar('Camera access is restricted.');
break;
case 'AudioAccessDenied':
showInSnackBar('You have denied audio access.');
break;
case 'AudioAccessDeniedWithoutPrompt':
// iOS only
showInSnackBar('Please go to Settings app to enable audio access.');
break;
case 'AudioAccessRestricted':
// iOS only
showInSnackBar('Audio access is restricted.');
break;
default:
_showCameraException(e);
break;

14
packages/camera/camera_android_camerax/lib/src/android_camera_camerax.dart
View File

@ -587,13 +587,10 @@ class AndroidCameraCameraX extends CameraPlatform {
switch (mode) {
case FlashMode.off:
_currentFlashMode = ImageCapture.flashModeOff;
break;
case FlashMode.auto:
_currentFlashMode = ImageCapture.flashModeAuto;
break;
case FlashMode.always:
_currentFlashMode = ImageCapture.flashModeOn;
break;
case FlashMode.torch:
_currentFlashMode = null;
if (torchEnabled) {
@ -603,7 +600,6 @@ class AndroidCameraCameraX extends CameraPlatform {
cameraControl = await camera!.getCameraControl();
await cameraControl.enableTorch(true);
torchEnabled = true;
break;
}
}
@ -913,19 +909,14 @@ class AndroidCameraCameraX extends CameraPlatform {
switch (preset) {
case ResolutionPreset.low:
boundSize = const Size(320, 240);
break;
case ResolutionPreset.medium:
boundSize = const Size(720, 480);
break;
case ResolutionPreset.high:
boundSize = const Size(1280, 720);
break;
case ResolutionPreset.veryHigh:
boundSize = const Size(1920, 1080);
break;
case ResolutionPreset.ultraHigh:
boundSize = const Size(3840, 2160);
break;
case ResolutionPreset.max:
// Automatically set strategy to choose highest available.
resolutionStrategy =
@ -954,19 +945,14 @@ class AndroidCameraCameraX extends CameraPlatform {
// 240p is not supported by CameraX.
case ResolutionPreset.medium:
videoQuality = VideoQuality.SD;
break;
case ResolutionPreset.high:
videoQuality = VideoQuality.HD;
break;
case ResolutionPreset.veryHigh:
videoQuality = VideoQuality.FHD;
break;
case ResolutionPreset.ultraHigh:
videoQuality = VideoQuality.UHD;
break;
case ResolutionPreset.max:
videoQuality = VideoQuality.highest;
break;
case null:
// If no preset is specified, default to CameraX's default behavior
// for each UseCase.

7
packages/camera/camera_android_camerax/lib/src/camera_state_error.dart
View File

@ -39,30 +39,23 @@ class CameraStateError extends JavaObject {
case CameraState.errorCameraInUse:
description =
'The camera was already in use, possibly by a higher-priority camera client.';
break;
case CameraState.errorMaxCamerasInUse:
description =
'The limit number of open cameras has been reached, and more cameras cannot be opened until other instances are closed.';
break;
case CameraState.errorOtherRecoverableError:
description =
'The camera device has encountered a recoverable error. CameraX will attempt to recover from the error.';
break;
case CameraState.errorStreamConfig:
description = 'Configuring the camera has failed.';
break;
case CameraState.errorCameraDisabled:
description =
'The camera device could not be opened due to a device policy. Thia may be caused by a client from a background process attempting to open the camera.';
break;
case CameraState.errorCameraFatalError:
description =
'The camera was closed due to a fatal error. This may require the Android device be shut down and restarted to restore camera function or may indicate a persistent camera hardware problem.';
break;
case CameraState.errorDoNotDisturbModeEnabled:
description =
'The camera could not be opened because "Do Not Disturb" mode is enabled. Please disable this mode, and try opening the camera again.';
break;
default:
description =
'There was an unspecified issue with the current camera state.';

6
packages/camera/camera_android_camerax/lib/src/live_data.dart
View File

@ -104,14 +104,12 @@ class _LiveDataHostApiImpl extends LiveDataHostApi {
LiveData<T> instance) async {
LiveDataSupportedTypeData? typeData;
switch (T) {
case CameraState:
case const (CameraState):
typeData =
LiveDataSupportedTypeData(value: LiveDataSupportedType.cameraState);
break;
case ZoomState:
case const (ZoomState):
typeData =
LiveDataSupportedTypeData(value: LiveDataSupportedType.zoomState);
break;
default:
throw ArgumentError(LiveData.unsupportedLiveDataTypeErrorMessage);
}

2
packages/camera/camera_android_camerax/pubspec.yaml
View File

@ -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+25
version: 0.5.0+26
environment:
sdk: ">=3.0.0 <4.0.0"

17
packages/camera/camera_android_camerax/test/android_camera_camerax_test.dart
View File

@ -487,23 +487,17 @@ void main() {
switch (resolutionPreset) {
case ResolutionPreset.low:
expectedBoundSize = const Size(320, 240);
break;
case ResolutionPreset.medium:
expectedBoundSize = const Size(720, 480);
break;
case ResolutionPreset.high:
expectedBoundSize = const Size(1280, 720);
break;
case ResolutionPreset.veryHigh:
expectedBoundSize = const Size(1920, 1080);
break;
case ResolutionPreset.ultraHigh:
expectedBoundSize = const Size(3840, 2160);
break;
case ResolutionPreset.max:
expectedResolutionStrategy =
ResolutionStrategy.detachedHighestAvailableStrategy();
break;
}
// We expect the strategy to be the highest available or correspond to the
@ -629,19 +623,14 @@ void main() {
// 240p is not supported by CameraX.
case ResolutionPreset.medium:
expectedVideoQuality = VideoQuality.SD;
break;
case ResolutionPreset.high:
expectedVideoQuality = VideoQuality.HD;
break;
case ResolutionPreset.veryHigh:
expectedVideoQuality = VideoQuality.FHD;
break;
case ResolutionPreset.ultraHigh:
expectedVideoQuality = VideoQuality.UHD;
break;
case ResolutionPreset.max:
expectedVideoQuality = VideoQuality.highest;
break;
}
const VideoResolutionFallbackRule expectedFallbackRule =
@ -1494,16 +1483,12 @@ void main() {
switch (flashMode) {
case FlashMode.off:
expectedFlashMode = ImageCapture.flashModeOff;
break;
case FlashMode.auto:
expectedFlashMode = ImageCapture.flashModeAuto;
break;
case FlashMode.always:
expectedFlashMode = ImageCapture.flashModeOn;
break;
case FlashMode.torch:
expectedFlashMode = null;
break;
}
if (expectedFlashMode == null) {
@ -1557,11 +1542,9 @@ void main() {
case FlashMode.always:
verify(mockCameraControl.enableTorch(false));
expect(camera.torchEnabled, isFalse);
break;
case FlashMode.torch:
verifyNever(mockCameraControl.enableTorch(true));
expect(camera.torchEnabled, true);
break;
}
}
});

4
packages/camera/camera_avfoundation/CHANGELOG.md
View File

@ -1,3 +1,7 @@
## 0.9.13+9
* Fixes new lint warnings.
## 0.9.13+8
* Updates example app to use non-deprecated video_player method.

4
packages/camera/camera_avfoundation/example/lib/camera_controller.dart
View File

@ -306,7 +306,7 @@ class CameraController extends ValueNotifier<CameraValue> {
/// Start streaming images from platform camera.
Future<void> startImageStream(
Function(CameraImageData image) onAvailable) async {
void Function(CameraImageData image) onAvailable) async {
_imageStreamSubscription = CameraPlatform.instance
.onStreamedFrameAvailable(_cameraId)
.listen((CameraImageData imageData) {
@ -327,7 +327,7 @@ class CameraController extends ValueNotifier<CameraValue> {
/// The video is returned as a [XFile] after calling [stopVideoRecording].
/// Throws a [CameraException] if the capture fails.
Future<void> startVideoRecording(
{Function(CameraImageData image)? streamCallback}) async {
{void Function(CameraImageData image)? streamCallback}) async {
await CameraPlatform.instance.startVideoCapturing(
VideoCaptureOptions(_cameraId, streamCallback: streamCallback));
value = value.copyWith(

11
packages/camera/camera_avfoundation/example/lib/main.dart
View File

@ -381,7 +381,7 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
return SizeTransition(
sizeFactor: _exposureModeControlRowAnimation,
child: ClipRect(
child: Container(
child: ColoredBox(
color: Colors.grey.shade50,
child: Column(
children: <Widget>[
@ -465,7 +465,7 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
return SizeTransition(
sizeFactor: _focusModeControlRowAnimation,
child: ClipRect(
child: Container(
child: ColoredBox(
color: Colors.grey.shade50,
child: Column(
children: <Widget>[
@ -677,30 +677,23 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
switch (e.code) {
case 'CameraAccessDenied':
showInSnackBar('You have denied camera access.');
break;
case 'CameraAccessDeniedWithoutPrompt':
// iOS only
showInSnackBar('Please go to Settings app to enable camera access.');
break;
case 'CameraAccessRestricted':
// iOS only
showInSnackBar('Camera access is restricted.');
break;
case 'AudioAccessDenied':
showInSnackBar('You have denied audio access.');
break;
case 'AudioAccessDeniedWithoutPrompt':
// iOS only
showInSnackBar('Please go to Settings app to enable audio access.');
break;
case 'AudioAccessRestricted':
// iOS only
showInSnackBar('Audio access is restricted.');
break;
case 'cameraPermission':
// Android & web only
showInSnackBar('Unknown permission error.');
break;
default:
_showCameraException(e);
break;

8
packages/camera/camera_avfoundation/lib/src/avfoundation_camera.dart
View File

@ -310,7 +310,7 @@ class AVFoundationCamera extends CameraPlatform {
}
StreamController<CameraImageData> _createStreamController(
{Function()? onListen}) {
{void Function()? onListen}) {
return StreamController<CameraImageData>(
onListen: onListen ?? () {},
onPause: _onFrameStreamPauseResume,
@ -580,7 +580,6 @@ class AVFoundationCamera extends CameraPlatform {
final Map<String, Object?> arguments = _getArgumentDictionary(call);
_deviceEventStreamController.add(DeviceOrientationChangedEvent(
deserializeDeviceOrientation(arguments['orientation']! as String)));
break;
default:
throw MissingPluginException();
}
@ -604,7 +603,6 @@ class AVFoundationCamera extends CameraPlatform {
deserializeFocusMode(arguments['focusMode']! as String),
arguments['focusPointSupported']! as bool,
));
break;
case 'resolution_changed':
final Map<String, Object?> arguments = _getArgumentDictionary(call);
cameraEventStreamController.add(CameraResolutionChangedEvent(
@ -612,12 +610,10 @@ class AVFoundationCamera extends CameraPlatform {
arguments['captureWidth']! as double,
arguments['captureHeight']! as double,
));
break;
case 'camera_closing':
cameraEventStreamController.add(CameraClosingEvent(
cameraId,
));
break;
case 'video_recorded':
final Map<String, Object?> arguments = _getArgumentDictionary(call);
cameraEventStreamController.add(VideoRecordedEvent(
@ -627,14 +623,12 @@ class AVFoundationCamera extends CameraPlatform {
? Duration(milliseconds: arguments['maxVideoDuration']! as int)
: null,
));
break;
case 'error':
final Map<String, Object?> arguments = _getArgumentDictionary(call);
cameraEventStreamController.add(CameraErrorEvent(
cameraId,
arguments['description']! as String,
));
break;
default:
throw MissingPluginException();
}

2
packages/camera/camera_avfoundation/pubspec.yaml
View File

@ -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+8
version: 0.9.13+9
environment:
sdk: ">=3.0.0 <4.0.0"

4
packages/camera/camera_platform_interface/CHANGELOG.md
View File

@ -1,3 +1,7 @@
## 2.7.1
* Fixes new lint warnings.
## 2.7.0
* Adds support for setting the image file format. See `CameraPlatform.setImageFileFormat`.

2
packages/camera/camera_platform_interface/lib/camera_platform_interface.dart
View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
/// Expose XFile
// Expose XFile
export 'package:cross_file/cross_file.dart';
export 'src/events/camera_event.dart';

8
packages/camera/camera_platform_interface/lib/src/method_channel/method_channel_camera.dart
View File

@ -314,7 +314,7 @@ class MethodChannelCamera extends CameraPlatform {
}
StreamController<CameraImageData> _installStreamController(
{Function()? onListen}) {
{void Function()? onListen}) {
_frameStreamController = StreamController<CameraImageData>(
onListen: onListen ?? () {},
onPause: _onFrameStreamPauseResume,
@ -587,7 +587,6 @@ class MethodChannelCamera extends CameraPlatform {
final Map<String, Object?> arguments = _getArgumentDictionary(call);
deviceEventStreamController.add(DeviceOrientationChangedEvent(
deserializeDeviceOrientation(arguments['orientation']! as String)));
break;
default:
throw MissingPluginException();
}
@ -611,7 +610,6 @@ class MethodChannelCamera extends CameraPlatform {
deserializeFocusMode(arguments['focusMode']! as String),
arguments['focusPointSupported']! as bool,
));
break;
case 'resolution_changed':
final Map<String, Object?> arguments = _getArgumentDictionary(call);
cameraEventStreamController.add(CameraResolutionChangedEvent(
@ -619,12 +617,10 @@ class MethodChannelCamera extends CameraPlatform {
arguments['captureWidth']! as double,
arguments['captureHeight']! as double,
));
break;
case 'camera_closing':
cameraEventStreamController.add(CameraClosingEvent(
cameraId,
));
break;
case 'video_recorded':
final Map<String, Object?> arguments = _getArgumentDictionary(call);
cameraEventStreamController.add(VideoRecordedEvent(
@ -634,14 +630,12 @@ class MethodChannelCamera extends CameraPlatform {
? Duration(milliseconds: arguments['maxVideoDuration']! as int)
: null,
));
break;
case 'error':
final Map<String, Object?> arguments = _getArgumentDictionary(call);
cameraEventStreamController.add(CameraErrorEvent(
cameraId,
arguments['description']! as String,
));
break;
default:
throw MissingPluginException();
}

2
packages/camera/camera_platform_interface/lib/src/types/video_capture_options.dart
View File

@ -32,7 +32,7 @@ class VideoCaptureOptions {
///
/// If set, then each image captured by the camera will be
/// passed to this callback.
final Function(CameraImageData image)? streamCallback;
final void Function(CameraImageData image)? streamCallback;
/// Configuration options for streaming.
///

2
packages/camera/camera_platform_interface/pubspec.yaml
View File

@ -4,7 +4,7 @@ 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
# NOTE: We strongly prefer non-breaking changes, even at the expense of a
# less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes
version: 2.7.0
version: 2.7.1
environment:
sdk: ">=3.0.0 <4.0.0"

3
packages/camera/camera_web/CHANGELOG.md
View File

@ -1,6 +1,7 @@
## NEXT
## 0.3.2+4
* Updates minimum supported SDK version to Flutter 3.10/Dart 3.0.
* Fixes new lint warnings.
## 0.3.2+3

2
packages/camera/camera_web/example/integration_test/camera_service_test.dart
View File

@ -913,5 +913,3 @@ void main() {
});
});
}
class JSNoSuchMethodError implements Exception {}

2
packages/camera/camera_web/lib/camera_web.dart
View File

@ -2,6 +2,4 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
library camera_web;
export 'src/camera_web.dart';

18
packages/camera/camera_web/lib/src/types/camera_options.dart
View File

@ -145,21 +145,21 @@ class VideoConstraints {
///
/// Specifies whether the requested camera should be facing away
/// or toward the user.
class CameraType {
enum CameraType {
/// The camera is facing away from the user, viewing their environment.
/// This includes the back camera on a smartphone.
environment._('environment'),
/// The camera is facing toward the user.
/// This includes the front camera on a smartphone.
user._('user');
const CameraType._(this._type);
final String _type;
@override
String toString() => _type;
/// The camera is facing away from the user, viewing their environment.
/// This includes the back camera on a smartphone.
static const CameraType environment = CameraType._('environment');
/// The camera is facing toward the user.
/// This includes the front camera on a smartphone.
static const CameraType user = CameraType._('user');
}
/// Indicates the direction in which the desired camera should be pointing.

2
packages/camera/camera_web/pubspec.yaml
View File

@ -2,7 +2,7 @@ name: camera_web
description: A Flutter plugin for getting information about and controlling the camera on Web.
repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_web
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
version: 0.3.2+3
version: 0.3.2+4
environment:
sdk: ">=3.1.0 <4.0.0"

3
packages/camera/camera_windows/CHANGELOG.md
View File

@ -1,6 +1,7 @@
## NEXT
## 0.2.1+9
* Updates minimum supported SDK version to Flutter 3.10/Dart 3.0.
* Fixes new lint warnings.
## 0.2.1+8

3
packages/camera/camera_windows/lib/camera_windows.dart
View File

@ -397,7 +397,6 @@ class CameraWindows extends CameraPlatform {
cameraId,
),
);
break;
case 'video_recorded':
final Map<String, Object?> arguments =
(call.arguments as Map<Object?, Object?>).cast<String, Object?>();
@ -410,7 +409,6 @@ class CameraWindows extends CameraPlatform {
maxDuration != null ? Duration(milliseconds: maxDuration) : null,
),
);
break;
case 'error':
final Map<String, Object?> arguments =
(call.arguments as Map<Object?, Object?>).cast<String, Object?>();
@ -420,7 +418,6 @@ class CameraWindows extends CameraPlatform {
arguments['description']! as String,
),
);
break;
default:
throw UnimplementedError();
}

2
packages/camera/camera_windows/pubspec.yaml
View File

@ -2,7 +2,7 @@ name: camera_windows
description: A Flutter plugin for getting information about and controlling the camera on Windows.
repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_windows
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
version: 0.2.1+8
version: 0.2.1+9
environment:
sdk: ">=3.0.0 <4.0.0"

1
packages/cross_file/test/x_file_html_test.dart
View File

@ -3,6 +3,7 @@
// found in the LICENSE file.
@TestOn('chrome') // Uses web-only Flutter SDK
library;
import 'dart:convert';
import 'dart:js_interop';

1
packages/cross_file/test/x_file_io_test.dart
View File

@ -3,6 +3,7 @@
// found in the LICENSE file.
@TestOn('vm') // Uses dart:io
library;
import 'dart:convert';
import 'dart:io';

6
packages/dynamic_layouts/lib/src/wrap_layout.dart
View File

@ -113,10 +113,8 @@ class SliverGridWrappingTileLayout extends DynamicSliverGridLayout {
switch (scrollDirection) {
case Axis.vertical:
addedSize = currentSizeUsed + childSize.width + crossAxisSpacing;
break;
case Axis.horizontal:
addedSize = currentSizeUsed + childSize.height + mainAxisSpacing;
break;
}
if (addedSize > crossAxisExtent && _model.last.currentSizeUsed > 0.0) {
@ -130,7 +128,6 @@ class SliverGridWrappingTileLayout extends DynamicSliverGridLayout {
scrollOffset + _model.last.maxSliver + mainAxisSpacing,
),
);
break;
case Axis.horizontal:
_model.add(
_RunMetrics(
@ -140,7 +137,6 @@ class SliverGridWrappingTileLayout extends DynamicSliverGridLayout {
scrollOffset + _model.last.maxSliver + crossAxisSpacing,
),
);
break;
}
return DynamicSliverGridGeometry(
@ -158,12 +154,10 @@ class SliverGridWrappingTileLayout extends DynamicSliverGridLayout {
if (childSize.height + mainAxisSpacing > _model.last.maxSliver) {
_model.last.maxSliver = childSize.height + mainAxisSpacing;
}
break;
case Axis.horizontal:
if (childSize.width + crossAxisSpacing > _model.last.maxSliver) {
_model.last.maxSliver = childSize.width + crossAxisSpacing;
}
break;
}
return DynamicSliverGridGeometry(

3
packages/file_selector/file_selector_android/CHANGELOG.md
View File

@ -1,6 +1,7 @@
## NEXT
## 0.5.0+5
* Updates minimum supported SDK version to Flutter 3.10/Dart 3.0.
* Fixes new lint warnings.
## 0.5.0+4

1
packages/file_selector/file_selector_android/example/integration_test/file_selector_android_test.dart
View File

@ -8,6 +8,7 @@ import 'package:flutter_test/flutter_test.dart';
import 'package:integration_test/integration_test.dart';
/// Entry point for integration tests that require espresso.
@pragma('vm:entry-point')
void integrationTestMain() {
enableFlutterDriverExtension();
app.main();

1
packages/file_selector/file_selector_android/example/lib/main.dart
View File

@ -13,6 +13,7 @@ import 'open_multiple_images_page.dart';
import 'open_text_page.dart';
/// Entry point for integration tests that require espresso.
@pragma('vm:entry-point')
void integrationTestMain() {
enableFlutterDriverExtension();
main();

2
packages/file_selector/file_selector_android/pubspec.yaml
View File

@ -2,7 +2,7 @@ name: file_selector_android
description: Android implementation of the file_selector package.
repository: https://github.com/flutter/packages/tree/main/packages/file_selector/file_selector_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22
version: 0.5.0+4
version: 0.5.0+5
environment:
sdk: ">=3.0.0 <4.0.0"

1
packages/file_selector/file_selector_web/test/utils_test.dart
View File

@ -3,6 +3,7 @@
// found in the LICENSE file.
@TestOn('chrome') // web-only package.
library;
import 'package:file_selector_platform_interface/file_selector_platform_interface.dart';
import 'package:file_selector_web/src/utils.dart';

4
packages/flutter_adaptive_scaffold/CHANGELOG.md
View File

@ -1,3 +1,7 @@
## 0.1.7+2
* Fixes new lint warnings.
## 0.1.7+1
* Adds pub topics to package metadata.

6
packages/flutter_adaptive_scaffold/README.md
View File

@ -156,7 +156,8 @@ return AdaptiveLayout(
},
leading: const Icon(Icons.menu),
destinations: destinations
.map((_) => AdaptiveScaffold.toRailDestination(_))
.map((NavigationDestination destination) =>
AdaptiveScaffold.toRailDestination(destination))
.toList(),
backgroundColor: navRailTheme.backgroundColor,
selectedIconTheme: navRailTheme.selectedIconTheme,
@ -187,7 +188,8 @@ return AdaptiveLayout(
],
),
destinations: destinations
.map((_) => AdaptiveScaffold.toRailDestination(_))
.map((NavigationDestination destination) =>
AdaptiveScaffold.toRailDestination(destination))
.toList(),
trailing: trailingNavRail,
backgroundColor: navRailTheme.backgroundColor,

6
packages/flutter_adaptive_scaffold/example/lib/adaptive_layout_demo.dart
View File

@ -175,7 +175,8 @@ class _MyHomePageState extends State<MyHomePage> {
},
leading: const Icon(Icons.menu),
destinations: destinations
.map((_) => AdaptiveScaffold.toRailDestination(_))
.map((NavigationDestination destination) =>
AdaptiveScaffold.toRailDestination(destination))
.toList(),
backgroundColor: navRailTheme.backgroundColor,
selectedIconTheme: navRailTheme.selectedIconTheme,
@ -206,7 +207,8 @@ class _MyHomePageState extends State<MyHomePage> {
],
),
destinations: destinations
.map((_) => AdaptiveScaffold.toRailDestination(_))
.map((NavigationDestination destination) =>
AdaptiveScaffold.toRailDestination(destination))
.toList(),
trailing: trailingNavRail,
backgroundColor: navRailTheme.backgroundColor,

5
packages/flutter_adaptive_scaffold/example/lib/main.dart
View File

@ -313,8 +313,9 @@ class _MyHomePageState extends State<MyHomePage>
selectedIndex: _navigationIndex,
trailing: trailingNavRail,
extended: true,
destinations: destinations.map((_) {
return AdaptiveScaffold.toRailDestination(_);
destinations:
destinations.map((NavigationDestination destination) {
return AdaptiveScaffold.toRailDestination(destination);
}).toList(),
),
),

13
packages/flutter_adaptive_scaffold/lib/src/adaptive_scaffold.dart
View File

@ -228,7 +228,7 @@ class AdaptiveScaffold extends StatefulWidget {
final PreferredSizeWidget? appBar;
/// Callback function for when the index of a [NavigationRail] changes.
final Function(int)? onSelectedIndexChange;
final void Function(int)? onSelectedIndexChange;
/// The width used for the internal [NavigationRail] at the medium [Breakpoint].
final double navigationRailWidth;
@ -267,7 +267,7 @@ class AdaptiveScaffold extends StatefulWidget {
EdgeInsetsGeometry padding = const EdgeInsets.all(8.0),
Widget? leading,
Widget? trailing,
Function(int)? onDestinationSelected,
void Function(int)? onDestinationSelected,
double? groupAlignment,
IconThemeData? selectedIconTheme,
IconThemeData? unselectedIconTheme,
@ -514,7 +514,8 @@ class _AdaptiveScaffoldState extends State<AdaptiveScaffold> {
trailing: widget.trailingNavRail,
selectedIndex: widget.selectedIndex,
destinations: widget.destinations
.map((_) => AdaptiveScaffold.toRailDestination(_))
.map((NavigationDestination destination) =>
AdaptiveScaffold.toRailDestination(destination))
.toList(),
onDestinationSelected: widget.onSelectedIndexChange,
),
@ -534,7 +535,8 @@ class _AdaptiveScaffoldState extends State<AdaptiveScaffold> {
trailing: widget.trailingNavRail,
selectedIndex: widget.selectedIndex,
destinations: widget.destinations
.map((_) => AdaptiveScaffold.toRailDestination(_))
.map((NavigationDestination destination) =>
AdaptiveScaffold.toRailDestination(destination))
.toList(),
onDestinationSelected: widget.onSelectedIndexChange,
backgroundColor: navRailTheme.backgroundColor,
@ -553,7 +555,8 @@ class _AdaptiveScaffoldState extends State<AdaptiveScaffold> {
trailing: widget.trailingNavRail,
selectedIndex: widget.selectedIndex,
destinations: widget.destinations
.map((_) => AdaptiveScaffold.toRailDestination(_))
.map((NavigationDestination destination) =>
AdaptiveScaffold.toRailDestination(destination))
.toList(),
onDestinationSelected: widget.onSelectedIndexChange,
backgroundColor: navRailTheme.backgroundColor,

2
packages/flutter_adaptive_scaffold/pubspec.yaml
View File

@ -1,6 +1,6 @@
name: flutter_adaptive_scaffold
description: Widgets to easily build adaptive layouts, including navigation elements.
version: 0.1.7+1
version: 0.1.7+2
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+flutter_adaptive_scaffold%22
repository: https://github.com/flutter/packages/tree/main/packages/flutter_adaptive_scaffold

3
packages/flutter_adaptive_scaffold/test/adaptive_scaffold_test.dart
View File

@ -374,7 +374,8 @@ void main() {
home: MediaQuery(
data: const MediaQueryData(size: Size(700, 900)),
child: StatefulBuilder(
builder: (BuildContext context, Function(Function()) setState) {
builder: (BuildContext context,
void Function(void Function()) setState) {
return AdaptiveScaffold(
destinations: destinations,
selectedIndex: selectedDestination,

2
packages/flutter_markdown/CHANGELOG.md
View File

@ -1,4 +1,4 @@
## NEXT
## 0.6.18+3
* Updates minimum supported SDK version to Flutter 3.10/Dart 3.0.
* Fixes lint warnings.

1
packages/flutter_markdown/example/lib/main.dart
View File

@ -54,6 +54,7 @@
/// parsing of Markdown syntax and building of the formatted output. The demos
/// in this example app illustrate some of the potentials of the
/// flutter_markdown package.
library;
import 'package:flutter/material.dart';
import 'screens/demo_screen.dart';

2
packages/flutter_markdown/example/lib/screens/home_screen.dart
View File

@ -40,7 +40,7 @@ class HomeScreen extends StatelessWidget {
title: const Text('Markdown Demos'),
),
body: SafeArea(
child: Container(
child: ColoredBox(
color: Colors.black12,
child: ListView(
children: <Widget>[

2
packages/flutter_markdown/lib/src/_functions_io.dart
View File

@ -54,11 +54,9 @@ final MarkdownStyleSheet Function(BuildContext, MarkdownStyleSheetBaseTheme?)
result = (Platform.isIOS || Platform.isMacOS)
? MarkdownStyleSheet.fromCupertinoTheme(CupertinoTheme.of(context))
: MarkdownStyleSheet.fromTheme(Theme.of(context));
break;
case MarkdownStyleSheetBaseTheme.cupertino:
result =
MarkdownStyleSheet.fromCupertinoTheme(CupertinoTheme.of(context));
break;
case MarkdownStyleSheetBaseTheme.material:
// ignore: no_default_cases
default:

2
packages/flutter_markdown/lib/src/_functions_web.dart
View File

@ -57,11 +57,9 @@ final MarkdownStyleSheet Function(BuildContext, MarkdownStyleSheetBaseTheme?)
result = userAgent.contains('Mac OS X')
? MarkdownStyleSheet.fromCupertinoTheme(CupertinoTheme.of(context))
: MarkdownStyleSheet.fromTheme(Theme.of(context));
break;
case MarkdownStyleSheetBaseTheme.cupertino:
result =
MarkdownStyleSheet.fromCupertinoTheme(CupertinoTheme.of(context));
break;
case MarkdownStyleSheetBaseTheme.material:
default: // ignore: no_default_cases
result = MarkdownStyleSheet.fromTheme(Theme.of(context));

3
packages/flutter_markdown/lib/src/builder.dart
View File

@ -501,13 +501,10 @@ class MarkdownBuilder implements md.NodeVisitor {
switch (alignAttribute) {
case 'left':
align = TextAlign.left;
break;
case 'center':
align = TextAlign.center;
break;
case 'right':
align = TextAlign.right;
break;
}
}
final Widget child = _buildTableCell(

2
packages/flutter_markdown/pubspec.yaml
View File

@ -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.18+2
version: 0.6.18+3
environment:
sdk: ">=3.0.0 <4.0.0"

2
packages/flutter_markdown/test/all.dart
View File

@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
library flutter_markdown.all_test;
import 'blockquote_test.dart' as blockquote_test;
import 'custom_syntax_test.dart' as custome_syntax_test;
import 'emphasis_test.dart' as emphasis_test;

8
packages/flutter_markdown/test/image_test_mocks.dart
View File

@ -44,11 +44,11 @@ MockHttpClient createMockImageHttpClient(SecurityContext? _) {
// image tests that request an image.
StreamSubscription<List<int>> imageStream(Invocation invocation) {
final void Function(List<int>)? onData =
invocation.positionalArguments[0] as Function(List<int>)?;
invocation.positionalArguments[0] as void Function(List<int>)?;
final void Function()? onDone =
invocation.namedArguments[#onDone] as Function()?;
final void Function(Object, [StackTrace?])? onError =
invocation.namedArguments[#onError] as Function(Object, [StackTrace?])?;
invocation.namedArguments[#onDone] as void Function()?;
final void Function(Object, [StackTrace?])? onError = invocation
.namedArguments[#onError] as void Function(Object, [StackTrace?])?;
final bool? cancelOnError =
invocation.namedArguments[#cancelOnError] as bool?;

46
packages/flutter_migrate/lib/src/base/io.dart
View File

@ -2,29 +2,29 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
/// This file serves as the single point of entry into the `dart:io` APIs
/// within Flutter tools.
///
/// In order to make Flutter tools more testable, we use the `FileSystem` APIs
/// in `package:file` rather than using the `dart:io` file APIs directly (see
/// `file_system.dart`). Doing so allows us to swap out local file system
/// access with mockable (or in-memory) file systems, making our tests hermetic
/// vis-a-vis file system access.
///
/// We also use `package:platform` to provide an abstraction away from the
/// static methods in the `dart:io` `Platform` class (see `platform.dart`). As
/// such, do not export Platform from this file!
///
/// To ensure that all file system and platform API access within Flutter tools
/// goes through the proper APIs, we forbid direct imports of `dart:io` (via a
/// test), forcing all callers to instead import this file, which exports the
/// blessed subset of `dart:io` that is legal to use in Flutter tools.
///
/// Because of the nature of this file, it is important that **platform and file
/// APIs not be exported from `dart:io` in this file**! Moreover, be careful
/// about any additional exports that you add to this file, as doing so will
/// increase the API surface that we have to test in Flutter tools, and the APIs
/// in `dart:io` can sometimes be hard to use in tests.
// This file serves as the single point of entry into the `dart:io` APIs
// within Flutter tools.
//
// In order to make Flutter tools more testable, we use the `FileSystem` APIs
// in `package:file` rather than using the `dart:io` file APIs directly (see
// `file_system.dart`). Doing so allows us to swap out local file system
// access with mockable (or in-memory) file systems, making our tests hermetic
// vis-a-vis file system access.
//
// We also use `package:platform` to provide an abstraction away from the
// static methods in the `dart:io` `Platform` class (see `platform.dart`). As
// such, do not export Platform from this file!
//
// To ensure that all file system and platform API access within Flutter tools
// goes through the proper APIs, we forbid direct imports of `dart:io` (via a
// test), forcing all callers to instead import this file, which exports the
// blessed subset of `dart:io` that is legal to use in Flutter tools.
//
// Because of the nature of this file, it is important that **platform and file
// APIs not be exported from `dart:io` in this file**! Moreover, be careful
// about any additional exports that you add to this file, as doing so will
// increase the API surface that we have to test in Flutter tools, and the APIs
// in `dart:io` can sometimes be hard to use in tests.
// We allow `print()` in this file as a fallback for writing to the terminal via
// regular stdout/stderr/stdio paths. Everything else in the flutter_tools

24
packages/flutter_migrate/test/base/file_system_test.dart
View File

@ -278,30 +278,6 @@ class FileSystemUtils {
i += 1;
}
}
/// Escapes [path].
///
/// On Windows it replaces all '\' with '\\'. On other platforms, it returns the
/// path unchanged.
String escapePath(String path) =>
isWindows ? path.replaceAll(r'\', r'\\') : path;
/// Returns true if the file system [entity] has not been modified since the
/// latest modification to [referenceFile].
///
/// Returns true, if [entity] does not exist.
///
/// Returns false, if [entity] exists, but [referenceFile] does not.
bool isOlderThanReference({
required FileSystemEntity entity,
required File referenceFile,
}) {
if (!entity.existsSync()) {
return true;
}
return referenceFile.existsSync() &&
referenceFile.statSync().modified.isAfter(entity.statSync().modified);
}
}
/// Creates `destDir` if needed, then recursively copies `srcDir` to

13
packages/flutter_migrate/test/base/logger_test.dart
View File

@ -12,12 +12,6 @@ import 'package:test/fake.dart';
import '../src/common.dart';
import '../src/fakes.dart';
// final Platform _kNoAnsiPlatform = FakePlatform();
final String red = RegExp.escape(AnsiTerminal.red);
final String bold = RegExp.escape(AnsiTerminal.bold);
final String resetBold = RegExp.escape(AnsiTerminal.resetBold);
final String resetColor = RegExp.escape(AnsiTerminal.resetColor);
void main() {
testWithoutContext('correct logger instance is created', () {
final LoggerFactory loggerFactory = LoggerFactory(
@ -645,13 +639,6 @@ void main() {
});
}
/// A fake [Logger] that throws the [Invocation] for any method call.
class FakeLogger implements Logger {
@override
dynamic noSuchMethod(Invocation invocation) =>
throw invocation; // ignore: only_throw_errors
}
class FakeStdout extends Fake implements Stdout {
FakeStdout({required this.syncError, this.completeWithError = false});

2
packages/flutter_migrate/test/src/common.dart
View File

@ -58,7 +58,6 @@ String getFlutterRoot() {
switch (io.Platform.script.scheme) {
case 'file':
scriptUri = io.Platform.script;
break;
case 'data':
final RegExp flutterTools = RegExp(
r'(file://[^"]*[/\\]flutter_tools[/\\][^"]+\.dart)',
@ -69,7 +68,6 @@ String getFlutterRoot() {
throw invalidScript();
}
scriptUri = Uri.parse(match.group(1)!);
break;
default:
throw invalidScript();
}

1
packages/flutter_migrate/test/test_data/migrate_project.dart
View File

@ -3,6 +3,7 @@
// found in the LICENSE file.
@Timeout(Duration(seconds: 600))
library;
import 'dart:io';
import 'package:file/file.dart';

4
packages/go_router/CHANGELOG.md
View File

@ -1,3 +1,7 @@
## 13.0.1
* Fixes new lint warnings.
## 13.0.0
- Refactors `RouteMatchList` and imperative APIs.

5
packages/go_router/example/lib/books/src/screens/books.dart
View File

@ -37,15 +37,12 @@ class _BooksScreenState extends State<BooksScreen>
switch (widget.kind) {
case 'popular':
_tabController.index = 0;
break;
case 'new':
_tabController.index = 1;
break;
case 'all':
_tabController.index = 2;
break;
}
}
@ -105,10 +102,8 @@ class _BooksScreenState extends State<BooksScreen>
switch (index) {
case 1:
context.go('/books/new');
break;
case 2:
context.go('/books/all');
break;
case 0:
default:
context.go('/books/popular');

3
packages/go_router/example/lib/books/src/screens/scaffold.dart
View File

@ -43,13 +43,10 @@ class BookstoreScaffold extends StatelessWidget {
switch (ScaffoldTab.values[idx]) {
case ScaffoldTab.books:
context.go('/books');
break;
case ScaffoldTab.authors:
context.go('/authors');
break;
case ScaffoldTab.settings:
context.go('/settings');
break;
}
},
destinations: const <AdaptiveScaffoldDestination>[

10
packages/go_router/example/lib/extra_codec.dart
View File

@ -127,11 +127,11 @@ class _MyExtraEncoder extends Converter<Object?, Object?> {
if (input == null) {
return null;
}
switch (input.runtimeType) {
case ComplexData1:
return <Object?>['ComplexData1', (input as ComplexData1).data];
case ComplexData2:
return <Object?>['ComplexData2', (input as ComplexData2).data];
switch (input) {
case ComplexData1 _:
return <Object?>['ComplexData1', input.data];
case ComplexData2 _:
return <Object?>['ComplexData2', input.data];
default:
throw FormatException('Cannot encode type ${input.runtimeType}');
}

2
packages/go_router/example/lib/others/custom_stateful_shell_route.dart
View File

@ -329,7 +329,7 @@ class DetailsScreenState extends State<DetailsScreen> {
body: _build(context),
);
} else {
return Container(
return ColoredBox(
color: Theme.of(context).scaffoldBackgroundColor,
child: _build(context),
);

13
packages/go_router/example/lib/others/extra_param.dart
View File

@ -20,28 +20,25 @@ class Family {
/// Person data class.
class Person {
/// Creates a person.
const Person({required this.name, required this.age});
const Person({required this.name});
/// The first name of the person.
final String name;
/// The age of the person.
final int age;
}
const Map<String, Family> _families = <String, Family>{
'f1': Family(
name: 'Doe',
people: <String, Person>{
'p1': Person(name: 'Jane', age: 23),
'p2': Person(name: 'John', age: 6),
'p1': Person(name: 'Jane'),
'p2': Person(name: 'John'),
},
),
'f2': Family(
name: 'Wong',
people: <String, Person>{
'p1': Person(name: 'June', age: 51),
'p2': Person(name: 'Xin', age: 44),
'p1': Person(name: 'June'),
'p2': Person(name: 'Xin'),
},
),
};

2
packages/go_router/example/lib/others/transitions.dart
View File

@ -141,7 +141,7 @@ class ExampleTransitionsScreen extends StatelessWidget {
@override
Widget build(BuildContext context) => Scaffold(
appBar: AppBar(title: Text('${App.title}: $kind')),
body: Container(
body: ColoredBox(
color: color,
child: Center(
child: Column(

13
packages/go_router/example/lib/path_and_query_parameters.dart
View File

@ -28,28 +28,25 @@ class Family {
/// Person data class.
class Person {
/// Creates a person.
const Person({required this.name, required this.age});
const Person({required this.name});
/// The first name of the person.
final String name;
/// The age of the person.
final int age;
}
const Map<String, Family> _families = <String, Family>{
'f1': Family(
name: 'Doe',
people: <String, Person>{
'p1': Person(name: 'Jane', age: 23),
'p2': Person(name: 'John', age: 6),
'p1': Person(name: 'Jane'),
'p2': Person(name: 'John'),
},
),
'f2': Family(
name: 'Wong',
people: <String, Person>{
'p1': Person(name: 'June', age: 51),
'p2': Person(name: 'Xin', age: 44),
'p1': Person(name: 'June'),
'p2': Person(name: 'Xin'),
},
),
};

3
packages/go_router/example/lib/shell_route.dart
View File

@ -169,13 +169,10 @@ class ScaffoldWithNavBar extends StatelessWidget {
switch (index) {
case 0:
GoRouter.of(context).go('/a');
break;
case 1:
GoRouter.of(context).go('/b');
break;
case 2:
GoRouter.of(context).go('/c');
break;
}
}
}

2
packages/go_router/example/lib/stateful_shell_route.dart
View File

@ -276,7 +276,7 @@ class DetailsScreenState extends State<DetailsScreen> {
body: _build(context),
);
} else {
return Container(
return ColoredBox(
color: Theme.of(context).scaffoldBackgroundColor,
child: _build(context),
);

3
packages/go_router/lib/src/information_provider.dart
View File

@ -115,13 +115,10 @@ class GoRouteInformationProvider extends RouteInformationProvider
return;
}
replace = _valueInEngine == _kEmptyRouteInformation;
break;
case RouteInformationReportingType.neglect:
replace = true;
break;
case RouteInformationReportingType.navigate:
replace = false;
break;
}
SystemNavigator.selectMultiEntryHistory();
SystemNavigator.routeInformationUpdated(

4
packages/go_router/lib/src/misc/extensions.dart
View File

@ -113,7 +113,7 @@ extension GoRouterHelper on BuildContext {
/// * [pushReplacement] which replaces the top-most page of the page stack but
/// always uses a new page key.
void replace(String location, {Object? extra}) =>
GoRouter.of(this).replace(location, extra: extra);
GoRouter.of(this).replace<Object?>(location, extra: extra);
/// Replaces the top-most page with the named route and optional parameters,
/// preserving the page key.
@ -132,7 +132,7 @@ extension GoRouterHelper on BuildContext {
Map<String, dynamic> queryParameters = const <String, dynamic>{},
Object? extra,
}) =>
GoRouter.of(this).replaceNamed(name,
GoRouter.of(this).replaceNamed<Object?>(name,
pathParameters: pathParameters,
queryParameters: queryParameters,
extra: extra);

2
packages/go_router/pubspec.yaml
View File

@ -1,7 +1,7 @@
name: go_router
description: A declarative router for Flutter based on Navigation 2 supporting
deep linking, data-driven routes and more
version: 13.0.0
version: 13.0.1
repository: https://github.com/flutter/packages/tree/main/packages/go_router
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+go_router%22

12
packages/go_router/test/delegate_test.dart
View File

@ -430,7 +430,7 @@ void main() {
final RouteMatchBase first =
goRouter.routerDelegate.currentConfiguration.matches.first;
final RouteMatch last = goRouter.routerDelegate.currentConfiguration.last;
goRouter.replace('/page-1');
goRouter.replace<void>('/page-1');
expect(goRouter.routerDelegate.currentConfiguration.matches.length, 2);
expect(
goRouter.routerDelegate.currentConfiguration.matches.first,
@ -470,7 +470,7 @@ void main() {
final ValueKey<String> prev =
goRouter.routerDelegate.currentConfiguration.matches.last.pageKey;
goRouter.replace('/a');
goRouter.replace<void>('/a');
await tester.pumpAndSettle();
expect(goRouter.routerDelegate.currentConfiguration.matches.length, 2);
@ -498,7 +498,7 @@ void main() {
final ValueKey<String> prev =
goRouter.routerDelegate.currentConfiguration.matches.last.pageKey;
goRouter.replace('/');
goRouter.replace<void>('/');
await tester.pumpAndSettle();
expect(goRouter.routerDelegate.currentConfiguration.matches.length, 2);
@ -551,7 +551,7 @@ void main() {
final RouteMatchBase first =
goRouter.routerDelegate.currentConfiguration.matches.first;
final RouteMatch last = goRouter.routerDelegate.currentConfiguration.last;
goRouter.replaceNamed('page1');
goRouter.replaceNamed<void>('page1');
expect(goRouter.routerDelegate.currentConfiguration.matches.length, 2);
expect(
goRouter.routerDelegate.currentConfiguration.matches.first,
@ -591,7 +591,7 @@ void main() {
final ValueKey<String> prev =
goRouter.routerDelegate.currentConfiguration.matches.last.pageKey;
goRouter.replaceNamed('page0');
goRouter.replaceNamed<void>('page0');
await tester.pumpAndSettle();
expect(goRouter.routerDelegate.currentConfiguration.matches.length, 2);
@ -619,7 +619,7 @@ void main() {
final ValueKey<String> prev =
goRouter.routerDelegate.currentConfiguration.matches.last.pageKey;
goRouter.replaceNamed('home');
goRouter.replaceNamed<void>('home');
await tester.pumpAndSettle();
expect(goRouter.routerDelegate.currentConfiguration.matches.length, 2);

12
packages/go_router/test/error_page_test.dart
View File

@ -51,15 +51,3 @@ Widget widgetsAppBuilder({required Widget home}) {
color: Colors.white,
);
}
class DummyStatefulWidget extends StatefulWidget {
const DummyStatefulWidget({super.key});
@override
State<DummyStatefulWidget> createState() => _DummyStatefulWidgetState();
}
class _DummyStatefulWidgetState extends State<DummyStatefulWidget> {
@override
Widget build(BuildContext context) => Container();
}

6
packages/go_router/test/go_router_test.dart
View File

@ -284,7 +284,7 @@ void main() {
expect(find.byKey(home), findsNothing);
expect(find.byKey(settings), findsOneWidget);
showDialog(
showDialog<void>(
context: navKey.currentContext!,
builder: (_) => DummyScreen(key: dialog),
);
@ -296,7 +296,7 @@ void main() {
expect(find.byKey(dialog), findsNothing);
expect(find.byKey(settings), findsOneWidget);
showDialog(
showDialog<void>(
context: navKey.currentContext!,
builder: (_) => DummyScreen(key: dialog),
);
@ -4427,7 +4427,7 @@ void main() {
expect(router.canPop(), isFalse);
expect(find.text('A Screen'), findsOneWidget);
expect(find.text('Shell'), findsOneWidget);
showDialog(
showDialog<void>(
context: root.currentContext!,
builder: (_) => const Text('A dialog'));
await tester.pumpAndSettle();

2
packages/go_router/test/imperative_api_test.dart
View File

@ -39,7 +39,7 @@ void main() {
expect(find.text('shell'), findsOneWidget);
expect(find.byKey(a), findsOneWidget);
router.replace('/b');
router.replace<void>('/b');
await tester.pumpAndSettle();
expect(find.text('shell'), findsOneWidget);
expect(find.byKey(a), findsNothing);

4
packages/go_router_builder/CHANGELOG.md
View File

@ -1,3 +1,7 @@
## 2.4.1
* Fixes new lint warnings.
## 2.4.0
* Adds support for passing observers to the ShellRoute for the nested Navigator.

2
packages/go_router_builder/example/lib/all_types.dart
View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// ignore_for_file: public_member_api_docs
// ignore_for_file: public_member_api_docs, unreachable_from_main
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';

2
packages/go_router_builder/example/lib/extra_example.dart
View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// ignore_for_file: public_member_api_docs
// ignore_for_file: public_member_api_docs, unreachable_from_main
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';

4
packages/go_router_builder/example/lib/main.dart
View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// ignore_for_file: public_member_api_docs
// ignore_for_file: public_member_api_docs, unreachable_from_main
import 'dart:async';
@ -179,7 +179,7 @@ class HomeScreen extends StatelessWidget {
PopupMenuItem<String>(
value: '1',
child: const Text('Push w/o return value'),
onTap: () => const PersonRoute('f1', 1).push(context),
onTap: () => const PersonRoute('f1', 1).push<void>(context),
),
PopupMenuItem<String>(
value: '2',

4
packages/go_router_builder/example/lib/shell_route_example.dart
View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// ignore_for_file: public_member_api_docs
// ignore_for_file: public_member_api_docs, unreachable_from_main
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
@ -105,10 +105,8 @@ class MyShellRouteScreen extends StatelessWidget {
switch (index) {
case 0:
const FooRouteData().go(context);
break;
case 1:
const BarRouteData().go(context);
break;
}
},
),

4
packages/go_router_builder/example/lib/shell_route_with_keys_example.dart
View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// ignore_for_file: public_member_api_docs
// ignore_for_file: public_member_api_docs, unreachable_from_main
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
@ -87,10 +87,8 @@ class MyShellRouteScreen extends StatelessWidget {
switch (index) {
case 0:
const HomeRouteData().go(context);
break;
case 1:
const UsersRouteData().go(context);
break;
}
},
),

4
packages/go_router_builder/example/lib/shell_route_with_observers_example.dart
View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// ignore_for_file: public_member_api_docs
// ignore_for_file: public_member_api_docs, unreachable_from_main
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
@ -90,10 +90,8 @@ class MyShellRouteScreen extends StatelessWidget {
switch (index) {
case 0:
const HomeRouteData().go(context);
break;
case 1:
const UsersRouteData().go(context);
break;
}
},
),

2
packages/go_router_builder/example/lib/simple_example.dart
View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// ignore_for_file: public_member_api_docs
// ignore_for_file: public_member_api_docs, unreachable_from_main
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';

Some files were not shown because too many files have changed in this diff Show More