Skip to content

Commit e8940ab

Browse files
authored
Merge branch 'main' into feat/3-27-build
2 parents 51125ef + 31da761 commit e8940ab

File tree

15 files changed

+41
-31
lines changed

15 files changed

+41
-31
lines changed

examples/accessibility/test/a11y_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import 'package:your_accessible_app/main.dart';
44
void main() {
55
testWidgets('Follows a11y guidelines', (tester) async {
66
final SemanticsHandle handle = tester.ensureSemantics();
7-
await tester.pumpWidget(AccessibleApp());
7+
await tester.pumpWidget(const AccessibleApp());
88

99
// Checks that tappable nodes have a minimum size of 48 by 48 pixels
1010
// for Android.

examples/cookbook/animation/page_route_animation/lib/starter.dart

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,12 @@ Route step2() {
8787
);
8888
}
8989

90-
// #docregion step3
91-
var curve = Curves.ease;
92-
var curveTween = CurveTween(curve: curve);
93-
// #enddocregion step3
90+
void createCurves() {
91+
// #docregion step3
92+
var curve = Curves.ease;
93+
var curveTween = CurveTween(curve: curve);
94+
// #enddocregion step3
95+
}
9496

9597
Route step4() {
9698
return PageRouteBuilder(

examples/cookbook/games/firestore_multiplayer/lib/firebase_options.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// ignore_for_file: lines_longer_than_80_chars, avoid_classes_with_only_static_members
33
import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
44
import 'package:flutter/foundation.dart'
5-
show defaultTargetPlatform, kIsWeb, TargetPlatform;
5+
show TargetPlatform, defaultTargetPlatform, kIsWeb;
66

77
/// Default [FirebaseOptions] for use with your Firebase apps.
88
///

examples/example_utils/lib/analysis.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,27 @@ linter:
1212
- avoid_types_on_closure_parameters
1313
- avoid_void_async
1414
- cancel_subscriptions
15-
- comment_references
1615
- close_sinks
16+
- combinators_ordering
17+
- comment_references
1718
- directives_ordering
1819
- invalid_case_patterns
19-
- library_annotations
2020
- matching_super_parameters
2121
- no_self_assignments
2222
- no_wildcard_variable_uses
2323
- one_member_abstracts
24-
- package_api_docs
24+
- only_throw_errors
25+
- prefer_const_constructors
26+
- prefer_const_declarations
27+
- prefer_const_literals_to_create_immutables
2528
- prefer_relative_imports
2629
- prefer_single_quotes
27-
- only_throw_errors
2830
- sort_unnamed_constructors_first
2931
- test_types_in_equals
3032
- throw_in_finally
33+
- type_annotate_public_apis
3134
- unawaited_futures
3235
- unnecessary_breaks
3336
- unnecessary_library_directive
3437
- unnecessary_statements
38+
- use_is_even_rather_than_modulo

examples/get-started/codelab_web/lib/main.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ class _AnimatedProgressIndicatorState extends State<AnimatedProgressIndicator>
188188
}
189189

190190
@override
191-
void didUpdateWidget(oldWidget) {
191+
void didUpdateWidget(AnimatedProgressIndicator oldWidget) {
192192
super.didUpdateWidget(oldWidget);
193193
_controller.animateTo(widget.value);
194194
}

examples/get-started/codelab_web/lib/step3.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ class _AnimatedProgressIndicatorState extends State<AnimatedProgressIndicator>
192192
}
193193

194194
@override
195-
void didUpdateWidget(oldWidget) {
195+
void didUpdateWidget(AnimatedProgressIndicator oldWidget) {
196196
super.didUpdateWidget(oldWidget);
197197
_controller.animateTo(widget.value);
198198
}

examples/get-started/flutter-for/android_devs/lib/isolates.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ class _SampleAppPageState extends State<SampleAppPage> {
8787
// The 'echo' isolate sends its SendPort as the first message.
8888
SendPort sendPort = await receivePort.first;
8989

90-
List msg = await sendReceive(
90+
final msg = await sendReceive(
9191
sendPort,
9292
'https://jsonplaceholder.typicode.com/posts',
93-
);
93+
) as List<Object?>;
9494

9595
setState(() {
9696
widgets = msg;
@@ -116,7 +116,7 @@ class _SampleAppPageState extends State<SampleAppPage> {
116116
}
117117
}
118118

119-
Future sendReceive(SendPort port, msg) {
119+
Future<Object?> sendReceive(SendPort port, Object? msg) {
120120
ReceivePort response = ReceivePort();
121121
port.send([msg, response.sendPort]);
122122
return response.first;

examples/get-started/flutter-for/ios_devs/lib/list.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class Person {
2626
Person(this.name);
2727
}
2828

29-
var items = [
29+
final List<Person> items = [
3030
Person('Person 1'),
3131
Person('Person 2'),
3232
Person('Person 3'),

examples/ui/adaptive_app_demos/lib/pages/adaptive_data_table_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class AdaptiveDataTablePage extends StatelessWidget {
2929
child: Column(
3030
children: items.map((i) {
3131
return Container(
32-
color: i % 2 == 0 ? Colors.grey.shade300 : null,
32+
color: i.isEven ? Colors.grey.shade300 : null,
3333
child: Row(
3434
children: [
3535
_TableRowItem('Item $i, Column 1'),

src/_data/sidenav.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,8 @@
452452
permalink: /platform-integration/android/c-interop
453453
- title: Host a native Android view
454454
permalink: /platform-integration/android/platform-views
455+
- title: Launch a Jetpack Compose activity
456+
permalink: /platform-integration/android/compose-activity
455457
- title: Restore state on Android
456458
permalink: /platform-integration/android/restore-state-android
457459
- title: Target ChromeOS with Android

0 commit comments

Comments
 (0)