diff --git a/examples/api/lib/material/color_scheme/dynamic_content_color.0.dart b/examples/api/lib/material/color_scheme/dynamic_content_color.0.dart index 5072a2645b..0dad925383 100644 --- a/examples/api/lib/material/color_scheme/dynamic_content_color.0.dart +++ b/examples/api/lib/material/color_scheme/dynamic_content_color.0.dart @@ -366,12 +366,10 @@ class ColorChip extends StatelessWidget { static Color contrastColor(Color color) { final Brightness brightness = ThemeData.estimateBrightnessForColor(color); - switch (brightness) { - case Brightness.dark: - return Colors.white; - case Brightness.light: - return Colors.black; - } + return switch (brightness) { + Brightness.dark => Colors.white, + Brightness.light => Colors.black, + }; } @override diff --git a/examples/api/lib/widgets/slotted_render_object_widget/slotted_multi_child_render_object_widget_mixin.0.dart b/examples/api/lib/widgets/slotted_render_object_widget/slotted_multi_child_render_object_widget_mixin.0.dart index 71058025c6..1d0525e9a8 100644 --- a/examples/api/lib/widgets/slotted_render_object_widget/slotted_multi_child_render_object_widget_mixin.0.dart +++ b/examples/api/lib/widgets/slotted_render_object_widget/slotted_multi_child_render_object_widget_mixin.0.dart @@ -33,12 +33,10 @@ class Diagonal extends SlottedMultiChildRenderObjectWidget topLeft, + DiagonalSlot.bottomRight => bottomRight, + }; } // The [createRenderObject] and [updateRenderObject] methods configure the diff --git a/examples/layers/services/isolate.dart b/examples/layers/services/isolate.dart index ebd956e916..c7cd96782e 100644 --- a/examples/layers/services/isolate.dart +++ b/examples/layers/services/isolate.dart @@ -272,14 +272,11 @@ class IsolateExampleState extends State with SingleTickerProvide } String _getStatus(CalculationState state) { - switch (state) { - case CalculationState.loading: - return 'Loading...'; - case CalculationState.calculating: - return 'In Progress'; - case CalculationState.idle: - return 'Idle'; - } + return switch (state) { + CalculationState.loading => 'Loading...', + CalculationState.calculating => 'In Progress', + CalculationState.idle => 'Idle', + }; } void _updateState(String result, double progress) { diff --git a/examples/platform_view/lib/main.dart b/examples/platform_view/lib/main.dart index 6e0e8904ea..5efefe72ff 100644 --- a/examples/platform_view/lib/main.dart +++ b/examples/platform_view/lib/main.dart @@ -48,20 +48,14 @@ class _MyHomePageState extends State { } static Widget get _buttonText { - switch (defaultTargetPlatform) { - case TargetPlatform.android: - return const Text('Continue in Android view'); - case TargetPlatform.iOS: - return const Text('Continue in iOS view'); - case TargetPlatform.windows: - return const Text('Continue in Windows view'); - case TargetPlatform.macOS: - return const Text('Continue in macOS view'); - case TargetPlatform.linux: - return const Text('Continue in Linux view'); - case TargetPlatform.fuchsia: - throw UnimplementedError('Platform not yet implemented'); - } + return switch (defaultTargetPlatform) { + TargetPlatform.android => const Text('Continue in Android view'), + TargetPlatform.iOS => const Text('Continue in iOS view'), + TargetPlatform.windows => const Text('Continue in Windows view'), + TargetPlatform.macOS => const Text('Continue in macOS view'), + TargetPlatform.linux => const Text('Continue in Linux view'), + TargetPlatform.fuchsia => throw UnimplementedError('Platform not yet implemented'), + }; } Future _launchPlatformCount() async { diff --git a/packages/flutter/lib/src/animation/animation.dart b/packages/flutter/lib/src/animation/animation.dart index becbee63de..d7e9a024fc 100644 --- a/packages/flutter/lib/src/animation/animation.dart +++ b/packages/flutter/lib/src/animation/animation.dart @@ -269,16 +269,12 @@ abstract class Animation extends Listenable implements ValueListenable { /// * "⏭": [AnimationStatus.completed] ([value] == 1.0) /// * "⏮": [AnimationStatus.dismissed] ([value] == 0.0) String toStringDetails() { - switch (status) { - case AnimationStatus.forward: - return '\u25B6'; // > - case AnimationStatus.reverse: - return '\u25C0'; // < - case AnimationStatus.completed: - return '\u23ED'; // >>| - case AnimationStatus.dismissed: - return '\u23EE'; // |<< - } + return switch (status) { + AnimationStatus.forward => '\u25B6', // > + AnimationStatus.reverse => '\u25C0', // < + AnimationStatus.completed => '\u23ED', // >>| + AnimationStatus.dismissed => '\u23EE', // |<< + }; } } diff --git a/packages/flutter/lib/src/animation/animations.dart b/packages/flutter/lib/src/animation/animations.dart index 4fb2d6732f..463240bf5b 100644 --- a/packages/flutter/lib/src/animation/animations.dart +++ b/packages/flutter/lib/src/animation/animations.dart @@ -307,12 +307,12 @@ class ReverseAnimation extends Animation double get value => 1.0 - parent.value; AnimationStatus _reverseStatus(AnimationStatus status) { - switch (status) { - case AnimationStatus.forward: return AnimationStatus.reverse; - case AnimationStatus.reverse: return AnimationStatus.forward; - case AnimationStatus.completed: return AnimationStatus.dismissed; - case AnimationStatus.dismissed: return AnimationStatus.completed; - } + return switch (status) { + AnimationStatus.forward => AnimationStatus.reverse, + AnimationStatus.reverse => AnimationStatus.forward, + AnimationStatus.completed => AnimationStatus.dismissed, + AnimationStatus.dismissed => AnimationStatus.completed, + }; } @override