Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions .ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -325,21 +325,21 @@ targets:
timeout: 30
properties:
target_file: analyze_legacy.yaml
channel: "3.29.3"
channel: "3.32.8"
env_variables: >-
{
"CHANNEL": "3.29.3"
"CHANNEL": "3.32.8"
}

- name: Linux analyze_legacy N-2
recipe: packages/packages
timeout: 30
properties:
target_file: analyze_legacy.yaml
channel: "3.27.4"
channel: "3.29.3"
env_variables: >-
{
"CHANNEL": "3.27.4"
"CHANNEL": "3.29.3"
}

- name: Linux_android custom_package_tests master
Expand Down
2 changes: 1 addition & 1 deletion .ci/flutter_stable.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
edada7c56edf4a183c1735310e123c7f923584f1
b8962555571d8c170cff8e76023ea7bf60e5ec4b
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
# the change if it doesn't.
run: |
cd $HOME
git clone https://github.com/flutter/flutter.git --depth 1 -b 3.32.0 _flutter
git clone https://github.com/flutter/flutter.git --depth 1 -b 3.35.0 _flutter
echo "$HOME/_flutter/bin" >> $GITHUB_PATH
cd $GITHUB_WORKSPACE
# Checks out a copy of the repo.
Expand Down
2 changes: 1 addition & 1 deletion packages/animations/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## NEXT

* Updates minimum supported SDK version to Flutter 3.27/Dart 3.6.
* Updates minimum supported SDK version to Flutter 3.29/Dart 3.7.

## 2.0.11

Expand Down
106 changes: 35 additions & 71 deletions packages/animations/example/lib/container_transition.dart
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ class _OpenContainerTransformDemoState

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 @@ -84,9 +84,10 @@ class _OpenContainerTransformDemoState
onPressed: (int index) {
setModalState(() {
setState(() {
_transitionType = index == 0
? ContainerTransitionType.fade
: ContainerTransitionType.fadeThrough;
_transitionType =
index == 0
? ContainerTransitionType.fade
: ContainerTransitionType.fadeThrough;
});
});
},
Expand Down Expand Up @@ -229,10 +230,7 @@ class _OpenContainerTransformDemoState
closedElevation: 0.0,
closedBuilder: (BuildContext _, VoidCallback openContainer) {
return ListTile(
leading: Image.asset(
'assets/avatar_logo.png',
width: 40,
),
leading: Image.asset('assets/avatar_logo.png', width: 40),
onTap: openContainer,
title: Text('List item ${index + 1}'),
subtitle: const Text('Secondary text'),
Expand All @@ -245,15 +243,11 @@ class _OpenContainerTransformDemoState
floatingActionButton: OpenContainer(
transitionType: _transitionType,
openBuilder: (BuildContext context, VoidCallback _) {
return const _DetailsPage(
includeMarkAsDoneButton: false,
);
return const _DetailsPage(includeMarkAsDoneButton: false);
},
closedElevation: 6.0,
closedShape: const RoundedRectangleBorder(
borderRadius: BorderRadius.all(
Radius.circular(_fabDimension / 2),
),
borderRadius: BorderRadius.all(Radius.circular(_fabDimension / 2)),
),
closedColor: Theme.of(context).colorScheme.secondary,
closedBuilder: (BuildContext context, VoidCallback openContainer) {
Expand Down Expand Up @@ -315,10 +309,7 @@ class _ExampleCard extends StatelessWidget {
child: ColoredBox(
color: Colors.black38,
child: Center(
child: Image.asset(
'assets/placeholder_image.png',
width: 100,
),
child: Image.asset('assets/placeholder_image.png', width: 100),
),
),
),
Expand All @@ -335,10 +326,9 @@ class _ExampleCard extends StatelessWidget {
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 @@ -348,10 +338,7 @@ class _ExampleCard extends StatelessWidget {
}

class _SmallerCard extends StatelessWidget {
const _SmallerCard({
required this.openContainer,
required this.subtitle,
});
const _SmallerCard({required this.openContainer, required this.subtitle});

final VoidCallback openContainer;
final String subtitle;
Expand All @@ -368,10 +355,7 @@ class _SmallerCard extends StatelessWidget {
color: Colors.black38,
height: 150,
child: Center(
child: Image.asset(
'assets/placeholder_image.png',
width: 80,
),
child: Image.asset('assets/placeholder_image.png', width: 80),
),
),
Expanded(
Expand All @@ -381,15 +365,9 @@ class _SmallerCard extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
'Title',
style: Theme.of(context).textTheme.titleLarge,
),
Text('Title', style: Theme.of(context).textTheme.titleLarge),
const SizedBox(height: 4),
Text(
subtitle,
style: Theme.of(context).textTheme.bodySmall,
),
Text(subtitle, style: Theme.of(context).textTheme.bodySmall),
],
),
),
Expand Down Expand Up @@ -419,10 +397,7 @@ class _ExampleSingleTile extends StatelessWidget {
height: height,
width: height,
child: Center(
child: Image.asset(
'assets/placeholder_image.png',
width: 60,
),
child: Image.asset('assets/placeholder_image.png', width: 60),
),
),
Expanded(
Expand All @@ -431,15 +406,13 @@ class _ExampleSingleTile extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
'Title',
style: Theme.of(context).textTheme.titleMedium,
),
Text('Title', style: Theme.of(context).textTheme.titleMedium),
const SizedBox(height: 8),
Text(
'Lorem ipsum dolor sit amet, consectetur '
'adipiscing elit,',
style: Theme.of(context).textTheme.bodySmall),
'Lorem ipsum dolor sit amet, consectetur '
'adipiscing elit,',
style: Theme.of(context).textTheme.bodySmall,
),
],
),
),
Expand All @@ -451,11 +424,7 @@ class _ExampleSingleTile extends StatelessWidget {
}

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

final VoidCallback? openContainer;
final double? height;
Expand All @@ -465,10 +434,7 @@ class _InkWellOverlay extends StatelessWidget {
Widget build(BuildContext context) {
return SizedBox(
height: height,
child: InkWell(
onTap: openContainer,
child: child,
),
child: InkWell(onTap: openContainer, child: child),
);
}
}
Expand All @@ -489,7 +455,7 @@ class _DetailsPage extends StatelessWidget {
icon: const Icon(Icons.done),
onPressed: () => Navigator.pop(context, true),
tooltip: 'Mark as done',
)
),
],
),
body: ListView(
Expand All @@ -499,9 +465,7 @@ class _DetailsPage extends StatelessWidget {
height: 250,
child: Padding(
padding: const EdgeInsets.all(70.0),
child: Image.asset(
'assets/placeholder_image.png',
),
child: Image.asset('assets/placeholder_image.png'),
),
),
Padding(
Expand All @@ -512,18 +476,18 @@ class _DetailsPage extends StatelessWidget {
Text(
'Title',
style: Theme.of(context).textTheme.headlineSmall!.copyWith(
color: Colors.black54,
fontSize: 30.0,
),
color: Colors.black54,
fontSize: 30.0,
),
),
const SizedBox(height: 10),
Text(
_loremIpsumParagraph,
style: Theme.of(context).textTheme.bodyMedium!.copyWith(
color: Colors.black54,
height: 1.5,
fontSize: 16.0,
),
color: Colors.black54,
height: 1.5,
fontSize: 16.0,
),
),
],
),
Expand Down
22 changes: 10 additions & 12 deletions packages/animations/example/lib/fade_scale_transition.dart
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ class _FadeScaleTransitionDemoState extends State<FadeScaleTransitionDemo>
reverseDuration: const Duration(milliseconds: 75),
vsync: this,
)..addStatusListener((AnimationStatus status) {
setState(() {
// setState needs to be called to trigger a rebuild because
// the 'HIDE FAB'/'SHOW FAB' button needs to be updated based
// the latest value of [_controller.status].
});
setState(() {
// setState needs to be called to trigger a rebuild because
// the 'HIDE FAB'/'SHOW FAB' button needs to be updated based
// the latest value of [_controller.status].
});
});
super.initState();
}

Expand Down Expand Up @@ -60,10 +60,7 @@ class _FadeScaleTransitionDemoState extends State<FadeScaleTransitionDemo>
floatingActionButton: AnimatedBuilder(
animation: _controller,
builder: (BuildContext context, Widget? child) {
return FadeScaleTransition(
animation: _controller,
child: child,
);
return FadeScaleTransition(animation: _controller, child: child);
},
child: Visibility(
visible: _controller.status != AnimationStatus.dismissed,
Expand Down Expand Up @@ -102,9 +99,10 @@ class _FadeScaleTransitionDemoState extends State<FadeScaleTransitionDemo>
_controller.forward();
}
},
child: _isAnimationRunningForwardsOrComplete
? const Text('HIDE FAB')
: const Text('SHOW FAB'),
child:
_isAnimationRunningForwardsOrComplete
? const Text('HIDE FAB')
: const Text('SHOW FAB'),
),
],
),
Expand Down
Loading