Skip to content

Commit 719fd72

Browse files
ericwindmillericwindmill
authored
Flutter 3.29 beta (#2571)
1 parent d62c784 commit 719fd72

File tree

685 files changed

+76438
-53915
lines changed

Some content is hidden

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

685 files changed

+76438
-53915
lines changed

‎add_to_app/android_view/flutter_module_using_plugin/lib/cell.dart‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,12 @@ class _CellState extends State<Cell> with WidgetsBindingObserver {
6262
Color randomLightColor() {
6363
_random ??= Random(cellNumber);
6464

65-
return Color.fromARGB(255, _random!.nextInt(50) + 205,
66-
_random!.nextInt(50) + 205, _random!.nextInt(50) + 205);
65+
return Color.fromARGB(
66+
255,
67+
_random!.nextInt(50) + 205,
68+
_random!.nextInt(50) + 205,
69+
_random!.nextInt(50) + 205,
70+
);
6771
}
6872

6973
@override
@@ -108,20 +112,25 @@ class _CellState extends State<Cell> with WidgetsBindingObserver {
108112
child: StreamBuilder<AccelerometerEvent>(
109113
// Don't continuously rebuild for nothing when the
110114
// cell isn't visible.
111-
stream: appLifecycleState == AppLifecycleState.resumed
112-
? accelerometerEventStream()
113-
: Stream.value(defaultPosition),
115+
stream:
116+
appLifecycleState == AppLifecycleState.resumed
117+
? accelerometerEventStream()
118+
: Stream.value(defaultPosition),
114119
initialData: defaultPosition,
115120
builder: (context, snapshot) {
116121
return Transform(
117-
// Figure out the phone's orientation relative
118-
// to gravity's direction. Ignore the z vector.
119-
transform: Matrix4.rotationX(
120-
snapshot.data!.y / gravity * pi / 2)
121-
..multiply(Matrix4.rotationY(
122-
snapshot.data!.x / gravity * pi / 2)),
123-
alignment: Alignment.center,
124-
child: const FlutterLogo(size: 72));
122+
// Figure out the phone's orientation relative
123+
// to gravity's direction. Ignore the z vector.
124+
transform: Matrix4.rotationX(
125+
snapshot.data!.y / gravity * pi / 2,
126+
)..multiply(
127+
Matrix4.rotationY(
128+
snapshot.data!.x / gravity * pi / 2,
129+
),
130+
),
131+
alignment: Alignment.center,
132+
child: const FlutterLogo(size: 72),
133+
);
125134
},
126135
),
127136
),

‎add_to_app/android_view/flutter_module_using_plugin/lib/main.dart‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,7 @@ void main() {
1717

1818
final model = CounterModel();
1919

20-
runApp(
21-
ChangeNotifierProvider.value(
22-
value: model,
23-
child: const MyApp(),
24-
),
25-
);
20+
runApp(ChangeNotifierProvider.value(value: model, child: const MyApp()));
2621
}
2722

2823
/// This is on alternate entrypoint for this module to display Flutter UI in
@@ -76,9 +71,7 @@ class MyApp extends StatelessWidget {
7671
Widget build(BuildContext context) {
7772
return MaterialApp(
7873
title: 'Flutter Module Title',
79-
theme: ThemeData(
80-
colorSchemeSeed: Colors.blue,
81-
),
74+
theme: ThemeData(colorSchemeSeed: Colors.blue),
8275
routes: {
8376
'/': (context) => const FullScreenView(),
8477
'/mini': (context) => const Contents(),
@@ -95,9 +88,7 @@ class FullScreenView extends StatelessWidget {
9588
@override
9689
Widget build(BuildContext context) {
9790
return Scaffold(
98-
appBar: AppBar(
99-
title: const Text('Full-screen Flutter with plugin'),
100-
),
91+
appBar: AppBar(title: const Text('Full-screen Flutter with plugin')),
10192
body: const Contents(showExit: true),
10293
);
10394
}
@@ -131,10 +122,7 @@ class Contents extends StatelessWidget {
131122
const Positioned.fill(
132123
child: Opacity(
133124
opacity: .25,
134-
child: FittedBox(
135-
fit: BoxFit.cover,
136-
child: FlutterLogo(),
137-
),
125+
child: FittedBox(fit: BoxFit.cover, child: FlutterLogo()),
138126
),
139127
),
140128
Center(

‎add_to_app/android_view/flutter_module_using_plugin/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: An example Flutter module that uses a plugin.
44
version: 1.0.0+1
55

66
environment:
7-
sdk: ^3.5.0
7+
sdk: ^3.7.0-0
88

99
dependencies:
1010
flutter:

‎add_to_app/books/flutter_module_books/lib/main.dart‎

Lines changed: 48 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ class MyApp extends StatelessWidget {
1313
@override
1414
Widget build(BuildContext context) {
1515
return MaterialApp(
16-
theme: ThemeData(
17-
primaryColor: const Color(0xff6200ee),
18-
),
16+
theme: ThemeData(primaryColor: const Color(0xff6200ee)),
1917
home: const BookDetail(),
2018
);
2119
}
@@ -70,30 +68,33 @@ class _BookDetailState extends State<BookDetail> {
7068
// calls from the platform.
7169
// TODO(gaaclarke): make the setup method an instance method so it's
7270
// injectable https://github.com/flutter/flutter/issues/59119.
73-
FlutterBookApi.setup(FlutterBookApiHandler(
71+
FlutterBookApi.setup(
72+
FlutterBookApiHandler(
7473
// The `FlutterBookApi` just has one method. Just give a closure for that
7574
// method to the handler class.
7675
(book) {
77-
setState(() {
78-
// This book model is what we're going to return to Kotlin eventually.
79-
// Keep it bound to the UI.
80-
this.book = book;
81-
titleTextController.text = book.title ?? '';
82-
titleTextController.addListener(() {
83-
this.book!.title = titleTextController.text;
84-
});
85-
// Subtitle could be null.
86-
// TODO(gaaclarke): https://github.com/flutter/flutter/issues/59118.
87-
subtitleTextController.text = book.subtitle ?? '';
88-
subtitleTextController.addListener(() {
89-
this.book!.subtitle = subtitleTextController.text;
90-
});
91-
authorTextController.text = book.author ?? '';
92-
authorTextController.addListener(() {
93-
this.book!.author = authorTextController.text;
94-
});
95-
});
96-
}));
76+
setState(() {
77+
// This book model is what we're going to return to Kotlin eventually.
78+
// Keep it bound to the UI.
79+
this.book = book;
80+
titleTextController.text = book.title ?? '';
81+
titleTextController.addListener(() {
82+
this.book!.title = titleTextController.text;
83+
});
84+
// Subtitle could be null.
85+
// TODO(gaaclarke): https://github.com/flutter/flutter/issues/59118.
86+
subtitleTextController.text = book.subtitle ?? '';
87+
subtitleTextController.addListener(() {
88+
this.book!.subtitle = subtitleTextController.text;
89+
});
90+
authorTextController.text = book.author ?? '';
91+
authorTextController.addListener(() {
92+
this.book!.author = authorTextController.text;
93+
});
94+
});
95+
},
96+
),
97+
);
9798
}
9899

99100
// Not overriding didUpdateWidget because the Android program can't change
@@ -124,26 +125,28 @@ class _BookDetailState extends State<BookDetail> {
124125
IconButton(
125126
icon: const Icon(Icons.check),
126127
// Pressing save sends the updated book to the platform.
127-
onPressed: book != null
128-
? () {
129-
hostApi.finishEditingBook(book!);
130-
clear();
131-
}
132-
: null,
128+
onPressed:
129+
book != null
130+
? () {
131+
hostApi.finishEditingBook(book!);
132+
clear();
133+
}
134+
: null,
133135
),
134136
],
135137
),
136-
body: book == null
137-
// Draw a spinner until the platform gives us the book to show details
138-
// for.
139-
? const Center(child: CircularProgressIndicator())
140-
: BookForm(
141-
book: book!,
142-
focusNode: textFocusNode,
143-
authorTextController: authorTextController,
144-
subtitleTextController: subtitleTextController,
145-
titleTextController: titleTextController,
146-
),
138+
body:
139+
book == null
140+
// Draw a spinner until the platform gives us the book to show details
141+
// for.
142+
? const Center(child: CircularProgressIndicator())
143+
: BookForm(
144+
book: book!,
145+
focusNode: textFocusNode,
146+
authorTextController: authorTextController,
147+
subtitleTextController: subtitleTextController,
148+
titleTextController: titleTextController,
149+
),
147150
);
148151
}
149152
}
@@ -207,15 +210,14 @@ class BookForm extends StatelessWidget {
207210
child: Padding(
208211
padding: const EdgeInsets.all(8.0),
209212
child: Text(
210-
'${book.pageCount} pages ~ published ${book.publishDate}'),
213+
'${book.pageCount} pages ~ published ${book.publishDate}',
214+
),
211215
),
212216
),
213217
const Divider(),
214218
const SizedBox(height: 32),
215219
if (book.thumbnail?.url != null) ...[
216-
Center(
217-
child: Image.network(book.thumbnail!.url!),
218-
),
220+
Center(child: Image.network(book.thumbnail!.url!)),
219221
const SizedBox(height: 32),
220222
],
221223
if (book.summary != null) ...[
@@ -234,7 +236,7 @@ class BookForm extends StatelessWidget {
234236
book.summary ?? '',
235237
style: TextStyle(color: Colors.grey.shade600, height: 1.24),
236238
),
237-
]
239+
],
238240
],
239241
),
240242
);

‎add_to_app/books/flutter_module_books/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: A Flutter module using the Pigeon package to demonstrate
66
version: 1.0.0+1
77

88
environment:
9-
sdk: ^3.5.0
9+
sdk: ^3.7.0-0
1010

1111
dependencies:
1212
flutter:

‎add_to_app/books/flutter_module_books/test/widget_test.dart‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ void main() {
1212
MockHostBookApi mockHostApi = MockHostBookApi();
1313

1414
await tester.pumpWidget(
15-
MaterialApp(
16-
home: BookDetail(hostApi: mockHostApi),
17-
),
15+
MaterialApp(home: BookDetail(hostApi: mockHostApi)),
1816
);
1917

2018
await tester.tap(find.byIcon(Icons.clear));
@@ -26,9 +24,7 @@ void main() {
2624
MockHostBookApi mockHostApi = MockHostBookApi();
2725

2826
await tester.pumpWidget(
29-
MaterialApp(
30-
home: BookDetail(book: Book(), hostApi: mockHostApi),
31-
),
27+
MaterialApp(home: BookDetail(book: Book(), hostApi: mockHostApi)),
3228
);
3329

3430
await tester.tap(find.byIcon(Icons.check));

‎add_to_app/fullscreen/flutter_module/lib/main.dart‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,7 @@ void main() {
1414

1515
final model = CounterModel();
1616

17-
runApp(
18-
ChangeNotifierProvider.value(
19-
value: model,
20-
child: const MyApp(),
21-
),
22-
);
17+
runApp(ChangeNotifierProvider.value(value: model, child: const MyApp()));
2318
}
2419

2520
/// A simple model that uses a [MethodChannel] as the source of truth for the
@@ -81,9 +76,7 @@ class FullScreenView extends StatelessWidget {
8176
@override
8277
Widget build(BuildContext context) {
8378
return Scaffold(
84-
appBar: AppBar(
85-
title: const Text('Full-screen Flutter'),
86-
),
79+
appBar: AppBar(title: const Text('Full-screen Flutter')),
8780
body: const Contents(showExit: true),
8881
);
8982
}
@@ -116,10 +109,7 @@ class Contents extends StatelessWidget {
116109
const Positioned.fill(
117110
child: Opacity(
118111
opacity: .25,
119-
child: FittedBox(
120-
fit: BoxFit.cover,
121-
child: FlutterLogo(),
122-
),
112+
child: FittedBox(fit: BoxFit.cover, child: FlutterLogo()),
123113
),
124114
),
125115
Center(

‎add_to_app/fullscreen/flutter_module/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: An example Flutter module.
44
version: 1.0.0+1
55

66
environment:
7-
sdk: ^3.5.0
7+
sdk: ^3.7.0-0
88

99
dependencies:
1010
flutter:

‎add_to_app/multiple_flutters/multiple_flutters_module/lib/main.dart‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,24 +72,17 @@ class _MyHomePageState extends State<MyHomePage> {
7272
@override
7373
Widget build(BuildContext context) {
7474
return Scaffold(
75-
appBar: AppBar(
76-
title: Text(widget.title),
77-
),
75+
appBar: AppBar(title: Text(widget.title)),
7876
body: Center(
7977
child: Column(
8078
mainAxisAlignment: MainAxisAlignment.center,
8179
children: [
82-
const Text(
83-
'You have pushed the button this many times:',
84-
),
80+
const Text('You have pushed the button this many times:'),
8581
Text(
8682
'$_counter',
8783
style: Theme.of(context).textTheme.headlineMedium,
8884
),
89-
TextButton(
90-
onPressed: _incrementCounter,
91-
child: const Text('Add'),
92-
),
85+
TextButton(onPressed: _incrementCounter, child: const Text('Add')),
9386
TextButton(
9487
onPressed: () {
9588
_channel.invokeMethod<void>("next", _counter);

‎add_to_app/multiple_flutters/multiple_flutters_module/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: A module that is embedded in the multiple_flutters_ios and multiple
44
version: 1.0.0+1
55

66
environment:
7-
sdk: ^3.5.0
7+
sdk: ^3.7.0-0
88

99
dependencies:
1010
flutter:

0 commit comments

Comments
 (0)