Skip to content

Commit ac3e77c

Browse files
authored
[material_ui, cupertino_ui] Bump Flutter version from to 3.47 (flutter#12944)
Fixes flutter/flutter#192839 ## Pre-Review Checklist **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. [^1]: Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling.
1 parent b8e557d commit ac3e77c

104 files changed

Lines changed: 937 additions & 965 deletions

File tree

Some content is hidden

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

‎.github/workflows/internals/install_flutter/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ runs:
1515
shell: bash
1616
run: |
1717
cd $HOME
18-
git clone https://github.com/flutter/flutter.git --depth 1 -b 3.44.0 _flutter
18+
git clone https://github.com/flutter/flutter.git --depth 1 -b 3.47.0 _flutter
1919
cd $GITHUB_WORKSPACE
2020
2121
# GITHUB_PATH write is safe here as it only appends a hardcoded, trusted path ($HOME/_flutter/bin) with no user-controlled input.

‎packages/cupertino_ui/lib/src/activity_indicator.dart‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,8 @@ class _CupertinoLinearActivityIndicator extends CustomPainter {
297297
// Draw the progress portion of the bar.
298298
if (progress > 0) {
299299
canvas.drawRRect(
300-
BorderRadius.all(
301-
Radius.circular(size.height / 2),
302-
).toRRect(Offset.zero & Size(clampDouble(progress, 0.0, 1.0) * size.width, size.height)),
300+
BorderRadius.all(Radius.circular(size.height / 2))
301+
.toRRect(Offset.zero & Size(clampDouble(progress, 0.0, 1.0) * size.width, size.height)),
303302
_progressPaint,
304303
);
305304
}

‎packages/cupertino_ui/lib/src/context_menu.dart‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,10 @@ typedef _DismissCallback = void Function(BuildContext context, double scale, dou
6464

6565
/// A function that builds the child and handles the transition between the
6666
/// default child and the preview when the CupertinoContextMenu is open.
67-
typedef CupertinoContextMenuBuilder =
68-
Widget Function(BuildContext context, Animation<double> animation);
67+
typedef CupertinoContextMenuBuilder = Widget Function(
68+
BuildContext context,
69+
Animation<double> animation,
70+
);
6971

7072
// Given a GlobalKey, return the Rect of the corresponding RenderBox's
7173
// paintBounds in global coordinates.

‎packages/cupertino_ui/lib/src/context_menu_action.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import 'package:flutter/foundation.dart';
66
import 'package:flutter/widgets.dart';
7+
78
import 'colors.dart';
89
import 'context_menu.dart';
910

‎packages/cupertino_ui/lib/src/cupertino_focus_halo.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
library;
77

88
import 'package:flutter/widgets.dart';
9+
910
import 'colors.dart';
1011
import 'constants.dart';
1112

‎packages/cupertino_ui/lib/src/date_picker.dart‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,11 @@ const Widget _endSelectionOverlay = CupertinoPickerDefaultSelectionOverlay(capSt
7777

7878
/// Defines a function signature for creating a widget that serves as a selection overlay,
7979
/// given the current context, the selected item's index, and the total number of columns.
80-
typedef SelectionOverlayBuilder =
81-
Widget? Function(BuildContext context, {required int columnCount, required int selectedIndex});
80+
typedef SelectionOverlayBuilder = Widget? Function(
81+
BuildContext context, {
82+
required int columnCount,
83+
required int selectedIndex,
84+
});
8285

8386
// Lays out the date picker based on how much space each single column needs.
8487
//
@@ -635,12 +638,11 @@ class CupertinoDatePicker extends StatefulWidget {
635638
}
636639
}
637640

638-
typedef _ColumnBuilder =
639-
Widget Function(
640-
double offAxisFraction,
641-
TransitionBuilder itemPositioningBuilder,
642-
Widget? selectionOverlay,
643-
);
641+
typedef _ColumnBuilder = Widget Function(
642+
double offAxisFraction,
643+
TransitionBuilder itemPositioningBuilder,
644+
Widget? selectionOverlay,
645+
);
644646

645647
class _CupertinoDatePickerDateTimeState extends State<CupertinoDatePicker> {
646648
// Fraction of the farthest column's vanishing point vs its width. Eyeballed

‎packages/cupertino_ui/lib/src/icon_theme_data.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import 'package:flutter/foundation.dart';
66
import 'package:flutter/widgets.dart';
7+
78
import 'colors.dart';
89

910
/// An [IconThemeData] subclass that automatically resolves its [color] when retrieved

‎packages/cupertino_ui/lib/src/menu_anchor.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -911,9 +911,9 @@ class _MenuOverlayState extends State<_MenuOverlay>
911911
// Behavior of reduce motion is based on iOS 18.5 simulator. Because the
912912
// disableAnimations accessibility feature is not present on iOS, all
913913
// animations are disabled when disableAnimations is enabled.
914-
final ui.AccessibilityFeatures accessibilityFeatures = View.of(
915-
context,
916-
).platformDispatcher.accessibilityFeatures;
914+
final ui.AccessibilityFeatures accessibilityFeatures = View.of(context)
915+
.platformDispatcher
916+
.accessibilityFeatures;
917917

918918
switch (accessibilityFeatures) {
919919
case ui.AccessibilityFeatures(disableAnimations: true):

‎packages/cupertino_ui/lib/src/nav_bar.dart‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2239,9 +2239,8 @@ class _NavigationBarStaticComponents {
22392239
}
22402240

22412241
static TextScaler _clampedTextScaler(BuildContext context) {
2242-
return MediaQuery.textScalerOf(
2243-
context,
2244-
).clamp(minScaleFactor: 1.0, maxScaleFactor: _kMaxScaleFactor);
2242+
return MediaQuery.textScalerOf(context)
2243+
.clamp(minScaleFactor: 1.0, maxScaleFactor: _kMaxScaleFactor);
22452244
}
22462245
}
22472246

‎packages/cupertino_ui/lib/src/refresh.dart‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -211,14 +211,13 @@ enum RefreshIndicatorMode {
211211
///
212212
/// The `pulledExtent` parameter is the currently available space either from
213213
/// overscrolling or as held by the sliver during refresh.
214-
typedef RefreshControlIndicatorBuilder =
215-
Widget Function(
216-
BuildContext context,
217-
RefreshIndicatorMode refreshState,
218-
double pulledExtent,
219-
double refreshTriggerPullDistance,
220-
double refreshIndicatorExtent,
221-
);
214+
typedef RefreshControlIndicatorBuilder = Widget Function(
215+
BuildContext context,
216+
RefreshIndicatorMode refreshState,
217+
double pulledExtent,
218+
double refreshTriggerPullDistance,
219+
double refreshIndicatorExtent,
220+
);
222221

223222
/// A callback function that's invoked when the [CupertinoSliverRefreshControl] is
224223
/// pulled a `refreshTriggerPullDistance`. Must return a [Future]. Upon

0 commit comments

Comments
 (0)