style: dart format + trailing comma fixes for Dart 3.11

robelator · robelator · commit 11e733f22890 · 2026-06-03T10:44:00.000+10:00
diff --git a/example/lib/example_01_minimal.dart b/example/lib/example_01_minimal.dart
@@ -37,7 +37,8 @@ base class MinimalController extends ScreenController {
   }
 }
 
-base class _MinimalScreenState extends ScreenState<MinimalScreen, MinimalController> {
+base class _MinimalScreenState
+    extends ScreenState<MinimalScreen, MinimalController> {
   @override
   Widget buildWidget(BuildContext context) {
     return Scaffold(
diff --git a/example/lib/example_04_default_adaptive.dart b/example/lib/example_04_default_adaptive.dart
@@ -22,7 +22,8 @@ base class OpinionatedScreen extends Screen {
   State createState() => _State();
 }
 
-base class _State extends DefaultAdaptiveScreenState<OpinionatedScreen, ScreenController> {
+base class _State
+    extends DefaultAdaptiveScreenState<OpinionatedScreen, ScreenController> {
   // Replace the default 28.sc / 112.sc padding without forking the mixin.
   @override
   EdgeInsets get defaultPaddingInsets => const EdgeInsets.symmetric(
@@ -41,7 +42,8 @@ base class _State extends DefaultAdaptiveScreenState<OpinionatedScreen, ScreenCo
           child: ListTile(
             leading: CircleAvatar(child: Text('$i')),
             title: Text('Opinionated item $i'),
-            subtitle: const Text('Scrolls inside the default scrollable mixin.'),
+            subtitle:
+                const Text('Scrolls inside the default scrollable mixin.'),
           ),
         );
       },
diff --git a/example/lib/example_06_controller_state.dart b/example/lib/example_06_controller_state.dart
@@ -81,10 +81,15 @@ base class _CounterScreenState
       child: Column(
         mainAxisSize: MainAxisSize.min,
         children: [
-          Text('Count: ${c.count}',
-              style: Theme.of(context).textTheme.headlineMedium,),
+          Text(
+            'Count: ${c.count}',
+            style: Theme.of(context).textTheme.headlineMedium,
+          ),
           const SizedBox(height: 16),
-          ElevatedButton(onPressed: c.increment, child: const Text('Increment')),
+          ElevatedButton(
+            onPressed: c.increment,
+            child: const Text('Increment'),
+          ),
         ],
       ),
     );
diff --git a/example/lib/example_09_side_modes.dart b/example/lib/example_09_side_modes.dart
@@ -59,7 +59,8 @@ base class _DemoScreen extends Screen {
   State createState() => _DemoScreenState();
 }
 
-base class _DemoScreenState extends AdaptiveScreenState<_DemoScreen, ScreenController> {
+base class _DemoScreenState
+    extends AdaptiveScreenState<_DemoScreen, ScreenController> {
   @override
   AdaptiveScreenSideMode get topSideMode => widget.mode;
 
diff --git a/example/lib/example_3.dart b/example/lib/example_3.dart
@@ -33,9 +33,8 @@ final class OverlayExampleController extends ScreenController {
 }
 
 /// 3. THE STATE (UI & Adaptive Layout)
-final class _OverlayExampleScreenState
-    extends
-        AdaptiveScreenState<OverlayExampleScreen, OverlayExampleController> {
+final class _OverlayExampleScreenState extends AdaptiveScreenState<
+    OverlayExampleScreen, OverlayExampleController> {
   // Use OVERLAY so the body content scrolls behind the header/footer
   @override
   AdaptiveScreenSideMode get topSideMode => AdaptiveScreenSideMode.OVERLAY;
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -24,14 +24,26 @@ class _Index extends StatelessWidget {
 
   static final examples = <_Example>[
     _Example('01 — Minimal screen', (_) => const ex01.MinimalScreen()),
-    _Example('02 — Scrollable header (legacy)', (_) => const ex02.ExampleScreen()),
-    _Example('03 — Overlay layout (legacy)', (_) => const ex03.OverlayExampleScreen()),
-    _Example('04 — DefaultAdaptiveScreenState', (_) => const ex04.OpinionatedScreen()),
+    _Example(
+      '02 — Scrollable header (legacy)',
+      (_) => const ex02.ExampleScreen(),
+    ),
+    _Example(
+      '03 — Overlay layout (legacy)',
+      (_) => const ex03.OverlayExampleScreen(),
+    ),
+    _Example(
+      '04 — DefaultAdaptiveScreenState',
+      (_) => const ex04.OpinionatedScreen(),
+    ),
     _Example('05 — Custom breakpoints', (_) => const ex05.TunedScreen()),
-    _Example('06 — Controller cache + state', (_) => const ex06.CounterScreen(
-          key: ValueKey('counter'),
-          controllerTimeout: Duration(minutes: 5),
-        ),),
+    _Example(
+      '06 — Controller cache + state',
+      (_) => const ex06.CounterScreen(
+        key: ValueKey('counter'),
+        controllerTimeout: Duration(minutes: 5),
+      ),
+    ),
     _Example('07 — Async controller init', (_) => const ex07.AsyncInitScreen()),
     _Example('08 — df_router integration', (_) => const ex08.MyApp()),
     _Example('09 — Side modes showcase', (_) => const ex09.SideModeShowcase()),
diff --git a/lib/src/_src.g.dart b/lib/src/_src.g.dart
@@ -25,4 +25,4 @@ export './screen_states/adaptive_screen_state/mixins/default_padding_screen_mixi
 export './screen_states/adaptive_screen_state/mixins/default_scrollable_align_screen_mixin.dart';
 export './screen_states/adaptive_screen_state/mixins/mobile_frame_wide_layout_screen_mixin.dart';
 export './screen_states/adaptive_screen_state/mixins/never_scrollable_align_screen_mixin.dart';
-export './screen_states/adaptive_screen_state/mixins/rotate_icon_horizontal_mobile_layout_screen_mixin.dart';
+export './screen_states/adaptive_screen_state/mixins/rotate_icon_horizontal_mobile_layout_screen_mixin.dart';
diff --git a/lib/src/_utils/current_platform.dart b/lib/src/_utils/current_platform.dart
@@ -153,6 +153,7 @@ class CurrentPlatform {
     BuildContext context, {
     LayoutBreakpoints? breakpoints,
   }) {
-    return isOsMobile && isWindowSizeMobileFor(context, breakpoints: breakpoints);
+    return isOsMobile &&
+        isWindowSizeMobileFor(context, breakpoints: breakpoints);
   }
 }
diff --git a/lib/src/_utils/surface.dart b/lib/src/_utils/surface.dart
@@ -56,7 +56,7 @@ class Surface extends StatelessWidget {
     final borderRadius1 = decoration?.borderRadius ?? borderRadius;
     final decoration1 =
         decoration?.copyWith(color: color1, borderRadius: borderRadius1) ??
-        BoxDecoration(color: color1, borderRadius: borderRadius1);
+            BoxDecoration(color: color1, borderRadius: borderRadius1);
     return ClipRRect(
       borderRadius: borderRadius1,
       child: Container(
diff --git a/lib/src/app_layout.dart b/lib/src/app_layout.dart
@@ -13,7 +13,8 @@
 
 import 'dart:ui' show Size;
 
-import 'package:flutter/widgets.dart' show BuildContext, MediaQuery, WidgetsBinding;
+import 'package:flutter/widgets.dart'
+    show BuildContext, MediaQuery, WidgetsBinding;
 
 import '_utils/_utils.g.dart';
 import 'layout_breakpoints.dart';
diff --git a/lib/src/layout_breakpoints.dart b/lib/src/layout_breakpoints.dart
@@ -73,6 +73,5 @@ class LayoutBreakpoints {
           other.minMobileAspectRatio == minMobileAspectRatio;
 
   @override
-  int get hashCode =>
-      Object.hash(mobileMaxShortestSide, minMobileAspectRatio);
+  int get hashCode => Object.hash(mobileMaxShortestSide, minMobileAspectRatio);
 }
diff --git a/lib/src/screen_state.dart b/lib/src/screen_state.dart
@@ -98,8 +98,7 @@ abstract base class ScreenState<TScreen extends Screen,
   /// async init is kicked off here (unawaited) and exposed via
   /// [ScreenController.ready] for code that needs to gate on completion.
   TController _createController() {
-    final controller =
-        widget.createController(widget, this) as TController;
+    final controller = widget.createController(widget, this) as TController;
     // ignore: unawaited_futures
     controller.runInit();
     return controller;
diff --git a/lib/src/screen_states/adaptive_screen_state/_adaptive_screen_state_interface.dart b/lib/src/screen_states/adaptive_screen_state/_adaptive_screen_state_interface.dart
@@ -23,7 +23,8 @@ import '/src/_src.g.dart';
 /// default — typical screens only override [body] (and maybe [topSide],
 /// [layout], [align], [padding] as needed).
 abstract base class AdaptiveScreenStateInterface<TScreen extends Screen,
-    TController extends ScreenController> extends ScreenState<TScreen, TController> {
+        TController extends ScreenController>
+    extends ScreenState<TScreen, TController> {
   /// Activates for mobile device screen sizes. Override to customize the
   /// layout for these sizes. The [body] includes the widget returned by
   /// [mobileBody].
diff --git a/test/adaptive_layout_builder_test.dart b/test/adaptive_layout_builder_test.dart
@@ -58,7 +58,8 @@ void main() {
       expect(find.byKey(const Key('fg')), findsOneWidget);
     });
 
-    testWidgets('layout-specific body builders override the default bodyBuilder',
+    testWidgets(
+        'layout-specific body builders override the default bodyBuilder',
         (tester) async {
       await tester.pumpWidget(
         MaterialApp(
diff --git a/test/adaptive_screen_state_test.dart b/test/adaptive_screen_state_test.dart
@@ -36,8 +36,7 @@ void main() {
       expect(find.byKey(const Key('topSide')), findsOneWidget);
     });
 
-    testWidgets('renders all four STATIC sides simultaneously',
-        (tester) async {
+    testWidgets('renders all four STATIC sides simultaneously', (tester) async {
       await pumpAtSize(
         tester,
         const AdaptiveTestScreen(
@@ -64,8 +63,7 @@ void main() {
       expect(find.byKey(const Key('topSide')), findsOneWidget);
     });
 
-    testWidgets('OVERLAY_WITH_PADDING top side reserves space',
-        (tester) async {
+    testWidgets('OVERLAY_WITH_PADDING top side reserves space', (tester) async {
       await pumpAtSize(
         tester,
         const AdaptiveTestScreen(
@@ -76,8 +74,7 @@ void main() {
       expect(find.byKey(const Key('topSide')), findsOneWidget);
     });
 
-    testWidgets('SLIVER top side is rendered and positioned',
-        (tester) async {
+    testWidgets('SLIVER top side is rendered and positioned', (tester) async {
       await pumpAtSize(
         tester,
         const AdaptiveTestScreen(
@@ -117,8 +114,7 @@ void main() {
   });
 
   group('Custom breakpoints', () {
-    testWidgets('per-screen breakpoints affect classification',
-        (tester) async {
+    testWidgets('per-screen breakpoints affect classification', (tester) async {
       // 400x600 default → on a non-mobile host this is WIDE because the
       // aspect bias is 1.5 ≤ 4/3 ... actually 1.5 > 4/3 so NARROW.
       // Use a permissive minMobileAspectRatio of 0.5 to force NARROW even
@@ -138,20 +134,19 @@ void main() {
     testWidgets('exposes a bodyScrollController that lives across rebuilds',
         (tester) async {
       await pumpAtSize(tester, const AdaptiveTestScreen());
-      final state =
-          tester.state<AdaptiveTestScreenState>(find.byType(AdaptiveTestScreen));
+      final state = tester
+          .state<AdaptiveTestScreenState>(find.byType(AdaptiveTestScreen));
       final first = state.bodyScrollController;
 
       // Trigger a rebuild.
       await tester.pump();
       expect(state.bodyScrollController, same(first));
     });
 
-    testWidgets('disposes the bodyScrollController on unmount',
-        (tester) async {
+    testWidgets('disposes the bodyScrollController on unmount', (tester) async {
       await pumpAtSize(tester, const AdaptiveTestScreen());
-      final state =
-          tester.state<AdaptiveTestScreenState>(find.byType(AdaptiveTestScreen));
+      final state = tester
+          .state<AdaptiveTestScreenState>(find.byType(AdaptiveTestScreen));
       final controller = state.bodyScrollController;
 
       await tester.pumpWidget(wrapApp(const SizedBox()));
@@ -183,8 +178,8 @@ final class _OpinionatedScreen extends Screen {
   _OpinionatedScreenState createState() => _OpinionatedScreenState();
 }
 
-base class _OpinionatedScreenState extends DefaultAdaptiveScreenState<
-    _OpinionatedScreen, ScreenController> {
+base class _OpinionatedScreenState
+    extends DefaultAdaptiveScreenState<_OpinionatedScreen, ScreenController> {
   @override
   Widget body(BuildContext context) {
     return const Text(
diff --git a/test/screen_controller_test.dart b/test/screen_controller_test.dart
@@ -40,8 +40,7 @@ void main() {
       expect(c.initCalls, 1, reason: 'second runInit should be a no-op');
     });
 
-    test('ready surfaces an exception thrown inside initController',
-        () async {
+    test('ready surfaces an exception thrown inside initController', () async {
       final c = _ThrowingController();
       await c.runInit();
       expect(c.isReady, isTrue, reason: 'ready completes even on error');
diff --git a/test/screen_state_test.dart b/test/screen_state_test.dart
@@ -51,7 +51,8 @@ void main() {
       expect(TestController.disposeCount, 1);
     });
 
-    testWidgets('does NOT reuse the controller when the cache entry was '
+    testWidgets(
+        'does NOT reuse the controller when the cache entry was '
         'already disposed', (tester) async {
       const key = ValueKey('zero-timeout-reuse');
       await tester.pumpWidget(wrapApp(const TestScreen(key: key)));
@@ -70,7 +71,8 @@ void main() {
   });
 
   group('Keyed controllers with positive controllerTimeout', () {
-    testWidgets('keeps the controller alive across re-entries within the '
+    testWidgets(
+        'keeps the controller alive across re-entries within the '
         'timeout', (tester) async {
       const key = ValueKey('warm-cache');
       const widget = TestScreen(

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,8 @@ base class MinimalController extends ScreenController {`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`		`-base class _MinimalScreenState extends ScreenState<MinimalScreen, MinimalController> {`
	`40`	`+base class _MinimalScreenState`
	`41`	`+ extends ScreenState<MinimalScreen, MinimalController> {`
`41`	`42`	`@override`
`42`	`43`	`Widget buildWidget(BuildContext context) {`
`43`	`44`	`return Scaffold(`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,8 @@ base class _DemoScreen extends Screen {`
`59`	`59`	`State createState() => _DemoScreenState();`
`60`	`60`	`}`
`61`	`61`
`62`		`-base class _DemoScreenState extends AdaptiveScreenState<_DemoScreen, ScreenController> {`
	`62`	`+base class _DemoScreenState`
	`63`	`+ extends AdaptiveScreenState<_DemoScreen, ScreenController> {`
`63`	`64`	`@override`
`64`	`65`	`AdaptiveScreenSideMode get topSideMode => widget.mode;`
`65`	`66`
Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,7 @@ class CurrentPlatform {`
`153`	`153`	`BuildContext context, {`
`154`	`154`	`LayoutBreakpoints? breakpoints,`
`155`	`155`	`}) {`
`156`		`- return isOsMobile && isWindowSizeMobileFor(context, breakpoints: breakpoints);`
	`156`	`+ return isOsMobile &&`
	`157`	`+ isWindowSizeMobileFor(context, breakpoints: breakpoints);`
`157`	`158`	`}`
`158`	`159`	`}`