Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f8fbd11
Updated analysis_options from flutter/flutter
justinmc May 11, 2026
ea315a2
Fixed some absolute URLs I missed.
justinmc May 11, 2026
baccf03
Stuart's review
justinmc May 12, 2026
4210b40
dart format
justinmc May 12, 2026
ff79746
Revert "dart format"
justinmc Jun 2, 2026
d8cdc5f
Merge branch 'main' into analysis_options_update
justinmc Jun 2, 2026
bf53eb3
dart format
justinmc Jun 2, 2026
4e9672d
Revert "dart format"
justinmc Jun 2, 2026
b1fb557
Revert all analysis options changes except line width
justinmc Jun 2, 2026
e6f6c51
Merge branch 'main' into analysis_options_update
justinmc Jun 2, 2026
8cc0a71
dart format .
justinmc Jun 2, 2026
e6617ff
Fix autoformatting mistake.
justinmc Jun 2, 2026
c420322
Skip generated files faling ci?
justinmc Jun 2, 2026
b4d0844
Revert "Skip generated files faling ci?"
justinmc Jun 2, 2026
a58f21e
Revert "dart format ."
justinmc Jun 2, 2026
9e0a69c
dart format ., but unstage the generated files.
justinmc Jun 2, 2026
de73da9
Format with CI version of master
stuartmorgan-g Jun 3, 2026
bf90ae5
Fix rewrapped ignore in rfw
stuartmorgan-g Jun 3, 2026
e1d245b
Update README excerpts
stuartmorgan-g Jun 3, 2026
9ad0179
Revert changes to rfw files that opted out of formatting, to avoid co…
stuartmorgan-g Jun 3, 2026
eb3ee6c
Update expected go_router_builder build output for new formatter
stuartmorgan-g Jun 3, 2026
6626e04
Revert all changes in go_router_builder_exmaple
stuartmorgan-g Jun 3, 2026
a61d1ed
Explicitly use 80 chars in go_router_builder/example
stuartmorgan-g Jun 3, 2026
dacfe87
Undo excerpt changes in go_router_builder
stuartmorgan-g Jun 3, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ analyzer:
- '**/*.g.dart'
- '**/*.mocks.dart' # Mockito @GenerateMocks

formatter:
page_width: 100

linter:
rules:
# This list is derived from the list of all available lints located at
Expand Down
91 changes: 20 additions & 71 deletions packages/animations/example/lib/container_transition.dart
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,12 @@ class OpenContainerTransformDemo extends StatefulWidget {
}
}

class _OpenContainerTransformDemoState
extends State<OpenContainerTransformDemo> {
class _OpenContainerTransformDemoState extends State<OpenContainerTransformDemo> {
ContainerTransitionType _transitionType = ContainerTransitionType.fade;

void _showMarkedAsDoneSnackbar(bool? isMarkedAsDone) {
if (isMarkedAsDone ?? false) {
ScaffoldMessenger.of(
context,
).showSnackBar(const SnackBar(content: Text('Marked as done!')));
ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Marked as done!')));
}
}

Expand All @@ -73,10 +70,7 @@ class _OpenContainerTransformDemoState
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
'Fade mode',
style: Theme.of(context).textTheme.bodySmall,
),
Text('Fade mode', style: Theme.of(context).textTheme.bodySmall),
const SizedBox(height: 12),
ToggleButtons(
borderRadius: BorderRadius.circular(2.0),
Expand Down Expand Up @@ -152,10 +146,7 @@ class _OpenContainerTransformDemoState
child: _OpenContainerWrapper(
transitionType: _transitionType,
closedBuilder: (BuildContext _, VoidCallback openContainer) {
return _SmallerCard(
openContainer: openContainer,
subtitle: 'Secondary text',
);
return _SmallerCard(openContainer: openContainer, subtitle: 'Secondary text');
},
onClosed: _showMarkedAsDoneSnackbar,
),
Expand All @@ -165,10 +156,7 @@ class _OpenContainerTransformDemoState
child: _OpenContainerWrapper(
transitionType: _transitionType,
closedBuilder: (BuildContext _, VoidCallback openContainer) {
return _SmallerCard(
openContainer: openContainer,
subtitle: 'Secondary text',
);
return _SmallerCard(openContainer: openContainer, subtitle: 'Secondary text');
},
onClosed: _showMarkedAsDoneSnackbar,
),
Expand All @@ -182,10 +170,7 @@ class _OpenContainerTransformDemoState
child: _OpenContainerWrapper(
transitionType: _transitionType,
closedBuilder: (BuildContext _, VoidCallback openContainer) {
return _SmallerCard(
openContainer: openContainer,
subtitle: 'Secondary',
);
return _SmallerCard(openContainer: openContainer, subtitle: 'Secondary');
},
onClosed: _showMarkedAsDoneSnackbar,
),
Expand All @@ -195,10 +180,7 @@ class _OpenContainerTransformDemoState
child: _OpenContainerWrapper(
transitionType: _transitionType,
closedBuilder: (BuildContext _, VoidCallback openContainer) {
return _SmallerCard(
openContainer: openContainer,
subtitle: 'Secondary',
);
return _SmallerCard(openContainer: openContainer, subtitle: 'Secondary');
},
onClosed: _showMarkedAsDoneSnackbar,
),
Expand All @@ -208,10 +190,7 @@ class _OpenContainerTransformDemoState
child: _OpenContainerWrapper(
transitionType: _transitionType,
closedBuilder: (BuildContext _, VoidCallback openContainer) {
return _SmallerCard(
openContainer: openContainer,
subtitle: 'Secondary',
);
return _SmallerCard(openContainer: openContainer, subtitle: 'Secondary');
},
onClosed: _showMarkedAsDoneSnackbar,
),
Expand Down Expand Up @@ -255,12 +234,7 @@ class _OpenContainerTransformDemoState
return SizedBox(
height: _fabDimension,
width: _fabDimension,
child: Center(
child: Icon(
Icons.add,
color: Theme.of(context).colorScheme.onSecondary,
),
),
child: Center(child: Icon(Icons.add, color: Theme.of(context).colorScheme.onSecondary)),
);
},
),
Expand Down Expand Up @@ -309,27 +283,16 @@ class _ExampleCard extends StatelessWidget {
Expanded(
child: ColoredBox(
color: Colors.black38,
child: Center(
child: Image.asset('assets/placeholder_image.png', width: 100),
),
child: Center(child: Image.asset('assets/placeholder_image.png', width: 100)),
),
),
const ListTile(
title: Text('Title'),
subtitle: Text('Secondary text'),
),
const ListTile(title: Text('Title'), subtitle: Text('Secondary text')),
Padding(
padding: const EdgeInsets.only(
left: 16.0,
right: 16.0,
bottom: 16.0,
),
padding: const EdgeInsets.only(left: 16.0, right: 16.0, bottom: 16.0),
child: Text(
'Lorem ipsum dolor sit amet, consectetur '
'adipiscing elit, sed do eiusmod tempor.',
style: Theme.of(
context,
).textTheme.bodyMedium!.copyWith(color: Colors.black54),
style: Theme.of(context).textTheme.bodyMedium!.copyWith(color: Colors.black54),
),
),
],
Expand All @@ -355,9 +318,7 @@ class _SmallerCard extends StatelessWidget {
Container(
color: Colors.black38,
height: 150,
child: Center(
child: Image.asset('assets/placeholder_image.png', width: 80),
),
child: Center(child: Image.asset('assets/placeholder_image.png', width: 80)),
),
Expanded(
child: Padding(
Expand Down Expand Up @@ -397,9 +358,7 @@ class _ExampleSingleTile extends StatelessWidget {
color: Colors.black38,
height: height,
width: height,
child: Center(
child: Image.asset('assets/placeholder_image.png', width: 60),
),
child: Center(child: Image.asset('assets/placeholder_image.png', width: 60)),
),
Expanded(
child: Padding(
Expand All @@ -425,12 +384,7 @@ class _ExampleSingleTile extends StatelessWidget {
}

class _InkWellOverlay extends StatelessWidget {
const _InkWellOverlay({
this.openContainer,
this.height,
this.constraints,
this.child,
});
const _InkWellOverlay({this.openContainer, this.height, this.constraints, this.child});

final VoidCallback? openContainer;
final double? height;
Expand Down Expand Up @@ -461,11 +415,7 @@ class _CustomShadowExampleCard extends StatelessWidget {
},
closedElevation: 0.0,
closedShadows: const <BoxShadow>[
BoxShadow(
color: Colors.blue,
blurRadius: 15.0,
offset: Offset(0.0, 5.0),
),
BoxShadow(color: Colors.blue, blurRadius: 15.0, offset: Offset(0.0, 5.0)),
],
openShadows: const <BoxShadow>[
BoxShadow(
Expand Down Expand Up @@ -528,10 +478,9 @@ class _DetailsPage extends StatelessWidget {
children: <Widget>[
Text(
'Title',
style: Theme.of(context).textTheme.headlineSmall!.copyWith(
color: Colors.black54,
fontSize: 30.0,
),
style: Theme.of(
context,
).textTheme.headlineSmall!.copyWith(color: Colors.black54, fontSize: 30.0),
),
const SizedBox(height: 10),
Text(
Expand Down
8 changes: 2 additions & 6 deletions packages/animations/example/lib/fade_scale_transition.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ class FadeScaleTransitionDemo extends StatefulWidget {
const FadeScaleTransitionDemo({super.key});

@override
State<FadeScaleTransitionDemo> createState() =>
_FadeScaleTransitionDemoState();
State<FadeScaleTransitionDemo> createState() => _FadeScaleTransitionDemoState();
}

class _FadeScaleTransitionDemoState extends State<FadeScaleTransitionDemo>
Expand Down Expand Up @@ -65,10 +64,7 @@ class _FadeScaleTransitionDemoState extends State<FadeScaleTransitionDemo>
},
child: Visibility(
visible: _controller.status != AnimationStatus.dismissed,
child: FloatingActionButton(
child: const Icon(Icons.add),
onPressed: () {},
),
child: FloatingActionButton(child: const Icon(Icons.add), onPressed: () {}),
),
),
bottomNavigationBar: Column(
Expand Down
28 changes: 6 additions & 22 deletions packages/animations/example/lib/fade_through_transition.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ class FadeThroughTransitionDemo extends StatefulWidget {
const FadeThroughTransitionDemo({super.key});

@override
State<FadeThroughTransitionDemo> createState() =>
_FadeThroughTransitionDemoState();
State<FadeThroughTransitionDemo> createState() => _FadeThroughTransitionDemoState();
}

class _FadeThroughTransitionDemoState extends State<FadeThroughTransitionDemo> {
Expand All @@ -26,11 +25,7 @@ class _FadeThroughTransitionDemoState extends State<FadeThroughTransitionDemo> {
appBar: AppBar(title: const Text('Fade through')),
body: PageTransitionSwitcher(
transitionBuilder:
(
Widget child,
Animation<double> animation,
Animation<double> secondaryAnimation,
) {
(Widget child, Animation<double> animation, Animation<double> secondaryAnimation) {
return FadeThroughTransition(
animation: animation,
secondaryAnimation: secondaryAnimation,
Expand All @@ -47,10 +42,7 @@ class _FadeThroughTransitionDemoState extends State<FadeThroughTransitionDemo> {
});
},
items: const <BottomNavigationBarItem>[
BottomNavigationBarItem(
icon: Icon(Icons.photo_library),
label: 'Albums',
),
BottomNavigationBarItem(icon: Icon(Icons.photo_library), label: 'Albums'),
BottomNavigationBarItem(icon: Icon(Icons.photo), label: 'Photos'),
BottomNavigationBarItem(icon: Icon(Icons.search), label: 'Search'),
],
Expand All @@ -74,9 +66,7 @@ class _ExampleCard extends StatelessWidget {
color: Colors.black26,
child: Padding(
padding: const EdgeInsets.all(30.0),
child: Ink.image(
image: const AssetImage('assets/placeholder_image.png'),
),
child: Ink.image(image: const AssetImage('assets/placeholder_image.png')),
),
),
),
Expand All @@ -85,14 +75,8 @@ class _ExampleCard extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
'123 photos',
style: Theme.of(context).textTheme.bodyLarge,
),
Text(
'123 photos',
style: Theme.of(context).textTheme.bodySmall,
),
Text('123 photos', style: Theme.of(context).textTheme.bodyLarge),
Text('123 photos', style: Theme.of(context).textTheme.bodySmall),
],
),
),
Expand Down
6 changes: 1 addition & 5 deletions packages/animations/example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,7 @@ class _TransitionsHomePageState extends State<_TransitionsHomePage> {
}

class _TransitionListTile extends StatelessWidget {
const _TransitionListTile({
this.onTap,
required this.title,
required this.subtitle,
});
const _TransitionListTile({this.onTap, required this.title, required this.subtitle});

final GestureTapCallback? onTap;
final String title;
Expand Down
43 changes: 9 additions & 34 deletions packages/animations/example/lib/shared_axis_transition.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ class SharedAxisTransitionDemo extends StatefulWidget {
}

class _SharedAxisTransitionDemoState extends State<SharedAxisTransitionDemo> {
SharedAxisTransitionType? _transitionType =
SharedAxisTransitionType.horizontal;
SharedAxisTransitionType? _transitionType = SharedAxisTransitionType.horizontal;
bool _isLoggedIn = false;

void _updateTransitionType(SharedAxisTransitionType? newType) {
Expand Down Expand Up @@ -85,17 +84,11 @@ class _SharedAxisTransitionDemoState extends State<SharedAxisTransitionDemo> {
child: const Row(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Radio<SharedAxisTransitionType>(
value: SharedAxisTransitionType.horizontal,
),
Radio<SharedAxisTransitionType>(value: SharedAxisTransitionType.horizontal),
Text('X'),
Radio<SharedAxisTransitionType>(
value: SharedAxisTransitionType.vertical,
),
Radio<SharedAxisTransitionType>(value: SharedAxisTransitionType.vertical),
Text('Y'),
Radio<SharedAxisTransitionType>(
value: SharedAxisTransitionType.scaled,
),
Radio<SharedAxisTransitionType>(value: SharedAxisTransitionType.scaled),
Text('Z'),
],
),
Expand Down Expand Up @@ -177,10 +170,7 @@ class _SignInPage extends StatelessWidget {
Padding(padding: EdgeInsets.symmetric(vertical: maxHeight / 20)),
Image.asset('assets/avatar_logo.png', width: 80),
Padding(padding: EdgeInsets.symmetric(vertical: maxHeight / 50)),
Text(
'Hi David Park',
style: Theme.of(context).textTheme.headlineSmall,
),
Text('Hi David Park', style: Theme.of(context).textTheme.headlineSmall),
Padding(padding: EdgeInsets.symmetric(vertical: maxHeight / 50)),
const Text(
'Sign in with your account',
Expand All @@ -190,19 +180,10 @@ class _SignInPage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
const Padding(
padding: EdgeInsets.only(
top: 40.0,
left: 15.0,
right: 15.0,
bottom: 10.0,
),
padding: EdgeInsets.only(top: 40.0, left: 15.0, right: 15.0, bottom: 10.0),
child: TextField(
decoration: InputDecoration(
suffixIcon: Icon(
Icons.visibility,
size: 20,
color: Colors.black54,
),
suffixIcon: Icon(Icons.visibility, size: 20, color: Colors.black54),
isDense: true,
labelText: 'Email or phone number',
border: OutlineInputBorder(),
Expand All @@ -211,17 +192,11 @@ class _SignInPage extends StatelessWidget {
),
Padding(
padding: const EdgeInsets.only(left: 10.0),
child: TextButton(
onPressed: () {},
child: const Text('FORGOT EMAIL?'),
),
child: TextButton(onPressed: () {}, child: const Text('FORGOT EMAIL?')),
),
Padding(
padding: const EdgeInsets.only(left: 10.0),
child: TextButton(
onPressed: () {},
child: const Text('CREATE ACCOUNT'),
),
child: TextButton(onPressed: () {}, child: const Text('CREATE ACCOUNT')),
),
],
),
Expand Down
Loading
Loading