Skip to content

Commit efaf24e

Browse files
Merge branch 'main' into CaoGiaHieu-dev/main
* main: (24 commits) Roll Flutter from 0a2906b81d5e to b3fb4c786d80 (5 revisions) (flutter#9840) Update repo for 3.35 stable release (flutter#9816) Roll Flutter from 52af7a504025 to 0a2906b81d5e (16 revisions) (flutter#9836) [image_picker] Updates min SDK to 3.29 (flutter#9830) [image_picker] Add the ability to pick multiple videos (flutter#9775) [image_picker] Add the ability to pick multiple videos - platform implementations (flutter#9818) [various] Updates min SDK for third_party/packages to 3.29 (flutter#9819) [vector_graphics] Updates min SDK to 3.29 (flutter#9820) [google_maps_flutter] Updates min SDK to 3.29 (flutter#9821) [video_player] Updates min SDK to 3.29 (flutter#9826) [shared_preferences] Updates min SDK to 3.29 (flutter#9829) [image_picker_ios] Add photo to simulator Photos library during test (flutter#9759) [interactive_media_ads] Updates `README` with information about enabling desugaring on Android (flutter#9790) [in_app_purchase] Updates min SDK to 3.29 (flutter#9825) Roll Flutter from f4334d27934b to 52af7a504025 (29 revisions) (flutter#9832) [go_router] Update generated output format (flutter#9817) [video_player] Move Android buffer updates to Dart (flutter#9771) [webview_flutter] Add support for payment requests on Android (flutter#9679) [vector_graphics_compiler] Set the m4_10 (Z scale) value to 1 when constructing an AffineMatrix from an SVG matrix (flutter#9813) [url_launcher_ios] Fix test button text to work on iOS 26 (flutter#9766) ... # Conflicts: # packages/go_router_builder/CHANGELOG.md # packages/go_router_builder/example/lib/all_types.g.dart # packages/go_router_builder/example/lib/main.g.dart # packages/go_router_builder/example/lib/shell_route_with_keys_example.g.dart # packages/go_router_builder/example/lib/shell_route_with_observers_example.g.dart
2 parents 2d4a5cc + 7d24ea3 commit efaf24e

File tree

1,813 files changed

+158832
-127834
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,813 files changed

+158832
-127834
lines changed

.ci.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -325,21 +325,21 @@ targets:
325325
timeout: 30
326326
properties:
327327
target_file: analyze_legacy.yaml
328-
channel: "3.29.3"
328+
channel: "3.32.8"
329329
env_variables: >-
330330
{
331-
"CHANNEL": "3.29.3"
331+
"CHANNEL": "3.32.8"
332332
}
333333
334334
- name: Linux analyze_legacy N-2
335335
recipe: packages/packages
336336
timeout: 30
337337
properties:
338338
target_file: analyze_legacy.yaml
339-
channel: "3.27.4"
339+
channel: "3.29.3"
340340
env_variables: >-
341341
{
342-
"CHANNEL": "3.27.4"
342+
"CHANNEL": "3.29.3"
343343
}
344344
345345
- name: Linux_android custom_package_tests master

.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
34c2a3b158b2b395cd31351c1e8a94ed4d9892b4
1+
b3fb4c786d80b4c6de9aba5534209561de20ecea

.ci/flutter_stable.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
edada7c56edf4a183c1735310e123c7f923584f1
1+
b8962555571d8c170cff8e76023ea7bf60e5ec4b

.gemini/styleguide.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,13 @@ auto-formatter, for each language, as described in
2121
- PR descriptions should include the Pre-Review Checklist from
2222
[the PR template](https://github.com/flutter/packages/blob/main/.github/PULL_REQUEST_TEMPLATE.md),
2323
with all of the steps completed.
24+
25+
## Review Agent Guidelines
26+
27+
When providing a summary, the review agent must adhere to the following principles:
28+
- **Be Objective:** Focus on a neutral, descriptive summary of the changes. Avoid subjective value judgments
29+
like "good," "bad," "positive," or "negative." The goal is to report what the code does, not to evaluate it.
30+
- **Use Code as the Source of Truth:** Base all summaries on the code diff. Do not trust or rephrase the PR
31+
description, which may be outdated or inaccurate. A summary must reflect the actual changes in the code.
32+
- **Be Concise:** Generate summaries that are brief and to the point. Focus on the most significant changes,
33+
and avoid unnecessary details or verbose explanations. This ensures the feedback is easy to scan and understand.

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
# the change if it doesn't.
3232
run: |
3333
cd $HOME
34-
git clone https://github.com/flutter/flutter.git --depth 1 -b 3.32.0 _flutter
34+
git clone https://github.com/flutter/flutter.git --depth 1 -b 3.35.0 _flutter
3535
echo "$HOME/_flutter/bin" >> $GITHUB_PATH
3636
cd $GITHUB_WORKSPACE
3737
# Checks out a copy of the repo.

packages/animations/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## NEXT
22

3-
* Updates minimum supported SDK version to Flutter 3.27/Dart 3.6.
3+
* Updates minimum supported SDK version to Flutter 3.29/Dart 3.7.
44

55
## 2.0.11
66

packages/animations/example/lib/container_transition.dart

Lines changed: 35 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ class _OpenContainerTransformDemoState
5555

5656
void _showMarkedAsDoneSnackbar(bool? isMarkedAsDone) {
5757
if (isMarkedAsDone ?? false) {
58-
ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
59-
content: Text('Marked as done!'),
60-
));
58+
ScaffoldMessenger.of(
59+
context,
60+
).showSnackBar(const SnackBar(content: Text('Marked as done!')));
6161
}
6262
}
6363

@@ -84,9 +84,10 @@ class _OpenContainerTransformDemoState
8484
onPressed: (int index) {
8585
setModalState(() {
8686
setState(() {
87-
_transitionType = index == 0
88-
? ContainerTransitionType.fade
89-
: ContainerTransitionType.fadeThrough;
87+
_transitionType =
88+
index == 0
89+
? ContainerTransitionType.fade
90+
: ContainerTransitionType.fadeThrough;
9091
});
9192
});
9293
},
@@ -229,10 +230,7 @@ class _OpenContainerTransformDemoState
229230
closedElevation: 0.0,
230231
closedBuilder: (BuildContext _, VoidCallback openContainer) {
231232
return ListTile(
232-
leading: Image.asset(
233-
'assets/avatar_logo.png',
234-
width: 40,
235-
),
233+
leading: Image.asset('assets/avatar_logo.png', width: 40),
236234
onTap: openContainer,
237235
title: Text('List item ${index + 1}'),
238236
subtitle: const Text('Secondary text'),
@@ -245,15 +243,11 @@ class _OpenContainerTransformDemoState
245243
floatingActionButton: OpenContainer(
246244
transitionType: _transitionType,
247245
openBuilder: (BuildContext context, VoidCallback _) {
248-
return const _DetailsPage(
249-
includeMarkAsDoneButton: false,
250-
);
246+
return const _DetailsPage(includeMarkAsDoneButton: false);
251247
},
252248
closedElevation: 6.0,
253249
closedShape: const RoundedRectangleBorder(
254-
borderRadius: BorderRadius.all(
255-
Radius.circular(_fabDimension / 2),
256-
),
250+
borderRadius: BorderRadius.all(Radius.circular(_fabDimension / 2)),
257251
),
258252
closedColor: Theme.of(context).colorScheme.secondary,
259253
closedBuilder: (BuildContext context, VoidCallback openContainer) {
@@ -315,10 +309,7 @@ class _ExampleCard extends StatelessWidget {
315309
child: ColoredBox(
316310
color: Colors.black38,
317311
child: Center(
318-
child: Image.asset(
319-
'assets/placeholder_image.png',
320-
width: 100,
321-
),
312+
child: Image.asset('assets/placeholder_image.png', width: 100),
322313
),
323314
),
324315
),
@@ -335,10 +326,9 @@ class _ExampleCard extends StatelessWidget {
335326
child: Text(
336327
'Lorem ipsum dolor sit amet, consectetur '
337328
'adipiscing elit, sed do eiusmod tempor.',
338-
style: Theme.of(context)
339-
.textTheme
340-
.bodyMedium!
341-
.copyWith(color: Colors.black54),
329+
style: Theme.of(
330+
context,
331+
).textTheme.bodyMedium!.copyWith(color: Colors.black54),
342332
),
343333
),
344334
],
@@ -348,10 +338,7 @@ class _ExampleCard extends StatelessWidget {
348338
}
349339

350340
class _SmallerCard extends StatelessWidget {
351-
const _SmallerCard({
352-
required this.openContainer,
353-
required this.subtitle,
354-
});
341+
const _SmallerCard({required this.openContainer, required this.subtitle});
355342

356343
final VoidCallback openContainer;
357344
final String subtitle;
@@ -368,10 +355,7 @@ class _SmallerCard extends StatelessWidget {
368355
color: Colors.black38,
369356
height: 150,
370357
child: Center(
371-
child: Image.asset(
372-
'assets/placeholder_image.png',
373-
width: 80,
374-
),
358+
child: Image.asset('assets/placeholder_image.png', width: 80),
375359
),
376360
),
377361
Expanded(
@@ -381,15 +365,9 @@ class _SmallerCard extends StatelessWidget {
381365
mainAxisAlignment: MainAxisAlignment.center,
382366
crossAxisAlignment: CrossAxisAlignment.start,
383367
children: <Widget>[
384-
Text(
385-
'Title',
386-
style: Theme.of(context).textTheme.titleLarge,
387-
),
368+
Text('Title', style: Theme.of(context).textTheme.titleLarge),
388369
const SizedBox(height: 4),
389-
Text(
390-
subtitle,
391-
style: Theme.of(context).textTheme.bodySmall,
392-
),
370+
Text(subtitle, style: Theme.of(context).textTheme.bodySmall),
393371
],
394372
),
395373
),
@@ -419,10 +397,7 @@ class _ExampleSingleTile extends StatelessWidget {
419397
height: height,
420398
width: height,
421399
child: Center(
422-
child: Image.asset(
423-
'assets/placeholder_image.png',
424-
width: 60,
425-
),
400+
child: Image.asset('assets/placeholder_image.png', width: 60),
426401
),
427402
),
428403
Expanded(
@@ -431,15 +406,13 @@ class _ExampleSingleTile extends StatelessWidget {
431406
child: Column(
432407
crossAxisAlignment: CrossAxisAlignment.start,
433408
children: <Widget>[
434-
Text(
435-
'Title',
436-
style: Theme.of(context).textTheme.titleMedium,
437-
),
409+
Text('Title', style: Theme.of(context).textTheme.titleMedium),
438410
const SizedBox(height: 8),
439411
Text(
440-
'Lorem ipsum dolor sit amet, consectetur '
441-
'adipiscing elit,',
442-
style: Theme.of(context).textTheme.bodySmall),
412+
'Lorem ipsum dolor sit amet, consectetur '
413+
'adipiscing elit,',
414+
style: Theme.of(context).textTheme.bodySmall,
415+
),
443416
],
444417
),
445418
),
@@ -451,11 +424,7 @@ class _ExampleSingleTile extends StatelessWidget {
451424
}
452425

453426
class _InkWellOverlay extends StatelessWidget {
454-
const _InkWellOverlay({
455-
this.openContainer,
456-
this.height,
457-
this.child,
458-
});
427+
const _InkWellOverlay({this.openContainer, this.height, this.child});
459428

460429
final VoidCallback? openContainer;
461430
final double? height;
@@ -465,10 +434,7 @@ class _InkWellOverlay extends StatelessWidget {
465434
Widget build(BuildContext context) {
466435
return SizedBox(
467436
height: height,
468-
child: InkWell(
469-
onTap: openContainer,
470-
child: child,
471-
),
437+
child: InkWell(onTap: openContainer, child: child),
472438
);
473439
}
474440
}
@@ -489,7 +455,7 @@ class _DetailsPage extends StatelessWidget {
489455
icon: const Icon(Icons.done),
490456
onPressed: () => Navigator.pop(context, true),
491457
tooltip: 'Mark as done',
492-
)
458+
),
493459
],
494460
),
495461
body: ListView(
@@ -499,9 +465,7 @@ class _DetailsPage extends StatelessWidget {
499465
height: 250,
500466
child: Padding(
501467
padding: const EdgeInsets.all(70.0),
502-
child: Image.asset(
503-
'assets/placeholder_image.png',
504-
),
468+
child: Image.asset('assets/placeholder_image.png'),
505469
),
506470
),
507471
Padding(
@@ -512,18 +476,18 @@ class _DetailsPage extends StatelessWidget {
512476
Text(
513477
'Title',
514478
style: Theme.of(context).textTheme.headlineSmall!.copyWith(
515-
color: Colors.black54,
516-
fontSize: 30.0,
517-
),
479+
color: Colors.black54,
480+
fontSize: 30.0,
481+
),
518482
),
519483
const SizedBox(height: 10),
520484
Text(
521485
_loremIpsumParagraph,
522486
style: Theme.of(context).textTheme.bodyMedium!.copyWith(
523-
color: Colors.black54,
524-
height: 1.5,
525-
fontSize: 16.0,
526-
),
487+
color: Colors.black54,
488+
height: 1.5,
489+
fontSize: 16.0,
490+
),
527491
),
528492
],
529493
),

packages/animations/example/lib/fade_scale_transition.dart

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ class _FadeScaleTransitionDemoState extends State<FadeScaleTransitionDemo>
2727
reverseDuration: const Duration(milliseconds: 75),
2828
vsync: this,
2929
)..addStatusListener((AnimationStatus status) {
30-
setState(() {
31-
// setState needs to be called to trigger a rebuild because
32-
// the 'HIDE FAB'/'SHOW FAB' button needs to be updated based
33-
// the latest value of [_controller.status].
34-
});
30+
setState(() {
31+
// setState needs to be called to trigger a rebuild because
32+
// the 'HIDE FAB'/'SHOW FAB' button needs to be updated based
33+
// the latest value of [_controller.status].
3534
});
35+
});
3636
super.initState();
3737
}
3838

@@ -60,10 +60,7 @@ class _FadeScaleTransitionDemoState extends State<FadeScaleTransitionDemo>
6060
floatingActionButton: AnimatedBuilder(
6161
animation: _controller,
6262
builder: (BuildContext context, Widget? child) {
63-
return FadeScaleTransition(
64-
animation: _controller,
65-
child: child,
66-
);
63+
return FadeScaleTransition(animation: _controller, child: child);
6764
},
6865
child: Visibility(
6966
visible: _controller.status != AnimationStatus.dismissed,
@@ -102,9 +99,10 @@ class _FadeScaleTransitionDemoState extends State<FadeScaleTransitionDemo>
10299
_controller.forward();
103100
}
104101
},
105-
child: _isAnimationRunningForwardsOrComplete
106-
? const Text('HIDE FAB')
107-
: const Text('SHOW FAB'),
102+
child:
103+
_isAnimationRunningForwardsOrComplete
104+
? const Text('HIDE FAB')
105+
: const Text('SHOW FAB'),
108106
),
109107
],
110108
),

0 commit comments

Comments
 (0)