Skip to content

Commit 3adcdc9

Browse files
ericwindmillericwindmill
authored
3.38 / 3.10 (#2742)
This PR makes samples pass CI when 3.10 is released. ## Pre-launch Checklist - [x] I read the [Flutter Style Guide] _recently_, and have followed its advice. - [x] I signed the [CLA]. - [x] I read the [Contributors Guide]. - [x] I have added sample code updates to the [changelog]. - [x] I updated/added relevant documentation (doc comments with `///`).
1 parent 744a265 commit 3adcdc9

File tree

13 files changed

+79
-101
lines changed

13 files changed

+79
-101
lines changed

‎place_tracker/lib/place_map.dart‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,9 @@ class _PlaceMapState extends State<PlaceMap> {
273273
newConfiguration.selectedCategory) {
274274
// If the configuration change is only a category change, just update
275275
// the marker visibilities.
276-
await _showPlacesForSelectedCategory(newConfiguration.selectedCategory);
276+
await _showPlacesForSelectedCategory(
277+
newConfiguration.selectedCategory,
278+
);
277279
} else {
278280
// At this point, we know the places have been updated from the list
279281
// view. We need to reconfigure the map to respect the updates.
@@ -343,7 +345,10 @@ class _PlaceMapState extends State<PlaceMap> {
343345
}
344346

345347
Future<void> _switchSelectedCategory(PlaceCategory category) async {
346-
Provider.of<AppState>(context, listen: false).setSelectedCategory(category);
348+
Provider.of<AppState>(
349+
context,
350+
listen: false,
351+
).setSelectedCategory(category);
347352
await _showPlacesForSelectedCategory(category);
348353
}
349354

@@ -361,7 +366,11 @@ class _PlaceMapState extends State<PlaceMap> {
361366
: null,
362367
),
363368
);
364-
_updateMarker(marker: marker, updatedMarker: updatedMarker, place: place);
369+
_updateMarker(
370+
marker: marker,
371+
updatedMarker: updatedMarker,
372+
place: place,
373+
);
365374
});
366375
}
367376

‎platform_channels/lib/src/image_basic_message_channel.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ class PlatformImageFetcher {
1515

1616
/// Method responsible for providing the platform image.
1717
static Future<Uint8List> getImage() async {
18-
final reply =
19-
await _basicMessageChannel.send('getImage') as Uint8List?;
18+
final reply = await _basicMessageChannel.send('getImage') as Uint8List?;
2019
if (reply == null) {
2120
throw PlatformException(
2221
code: 'Error',

‎platform_design/lib/main.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ class PlatformAdaptingHomePage extends StatefulWidget {
5656
_PlatformAdaptingHomePageState();
5757
}
5858

59-
class _PlatformAdaptingHomePageState
60-
extends State<PlatformAdaptingHomePage> {
59+
class _PlatformAdaptingHomePageState extends State<PlatformAdaptingHomePage> {
6160
// This app keeps a global key for the songs tab because it owns a bunch of
6261
// data. Since changing platform re-parents those tabs into different
6362
// scaffolds, keeping a global key to it lets this app keep that tab's data as

‎platform_design/lib/news_tab.dart‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@ class _NewsTabState extends State<NewsTab> {
5555
child: InkWell(
5656
// Make it splash on Android. It would happen automatically if this
5757
// was a real card but this is just a demo. Skip the splash on iOS.
58-
onTap: defaultTargetPlatform == TargetPlatform.iOS
59-
? null
60-
: () {},
58+
onTap: defaultTargetPlatform == TargetPlatform.iOS ? null : () {},
6159
child: Padding(
6260
padding: const EdgeInsets.all(12.0),
6361
child: Row(

‎platform_design/lib/utils.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ String generateRandomHeadline() {
3939
2 => '$artist releases ${capitalizePair(wordPairIterator.first)}',
4040
3 => '$artist talks about his ${nouns[_random.nextInt(nouns.length)]}',
4141
4 => '$artist talks about her ${nouns[_random.nextInt(nouns.length)]}',
42-
5 =>
43-
'$artist talks about their ${nouns[_random.nextInt(nouns.length)]}',
42+
5 => '$artist talks about their ${nouns[_random.nextInt(nouns.length)]}',
4443
6 =>
4544
'$artist says their music is inspired by ${wordPairIterator.first.join(' ')}',
4645
7 =>

‎provider_shopper/lib/models/cart.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ class CartModel extends ChangeNotifier {
2424
}
2525

2626
/// List of items in the cart.
27-
List<Item> get items =>
28-
_itemIds.map((id) => _catalog.getById(id)).toList();
27+
List<Item> get items => _itemIds.map((id) => _catalog.getById(id)).toList();
2928

3029
/// The current total price of all items.
3130
int get totalPrice =>

‎simplistic_editor/lib/basic_text_field.dart‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,7 @@ class _BasicTextFieldState extends State<BasicTextField> {
135135
_textSelectionControls = cupertinoTextSelectionHandleControls;
136136
case TargetPlatform.macOS:
137137
// ignore: deprecated_member_use
138-
_textSelectionControls =
139-
cupertinoDesktopTextSelectionHandleControls;
138+
_textSelectionControls = cupertinoDesktopTextSelectionHandleControls;
140139
case TargetPlatform.android:
141140
case TargetPlatform.fuchsia:
142141
// ignore: deprecated_member_use
@@ -153,8 +152,7 @@ class _BasicTextFieldState extends State<BasicTextField> {
153152
child: GestureDetector(
154153
behavior: HitTestBehavior.translucent,
155154
onPanStart: (dragStartDetails) => _onDragStart(dragStartDetails),
156-
onPanUpdate: (dragUpdateDetails) =>
157-
_onDragUpdate(dragUpdateDetails),
155+
onPanUpdate: (dragUpdateDetails) => _onDragUpdate(dragUpdateDetails),
158156
onSecondaryTapDown: (secondaryTapDownDetails) {
159157
_renderEditable.selectWordsInRange(
160158
from: secondaryTapDownDetails.globalPosition,

‎simplistic_editor/lib/basic_text_input_client.dart‎

Lines changed: 45 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -342,40 +342,40 @@ class BasicTextInputClientState extends State<BasicTextInputClient>
342342
}
343343

344344
// These actions have yet to be implemented for this sample.
345-
static final Map<Type, Action<Intent>>
346-
_unsupportedActions = <Type, Action<Intent>>{
347-
DeleteToNextWordBoundaryIntent: DoNothingAction(consumesKey: false),
348-
DeleteToLineBreakIntent: DoNothingAction(consumesKey: false),
349-
ExtendSelectionToNextWordBoundaryIntent: DoNothingAction(
350-
consumesKey: false,
351-
),
352-
ExtendSelectionToNextParagraphBoundaryOrCaretLocationIntent:
353-
DoNothingAction(consumesKey: false),
354-
ExtendSelectionToLineBreakIntent: DoNothingAction(consumesKey: false),
355-
ExtendSelectionVerticallyToAdjacentLineIntent: DoNothingAction(
356-
consumesKey: false,
357-
),
358-
ExtendSelectionVerticallyToAdjacentPageIntent: DoNothingAction(
359-
consumesKey: false,
360-
),
361-
ExtendSelectionToNextParagraphBoundaryIntent: DoNothingAction(
362-
consumesKey: false,
363-
),
364-
ExtendSelectionToDocumentBoundaryIntent: DoNothingAction(
365-
consumesKey: false,
366-
),
367-
ExtendSelectionByPageIntent: DoNothingAction(consumesKey: false),
368-
ExpandSelectionToDocumentBoundaryIntent: DoNothingAction(
369-
consumesKey: false,
370-
),
371-
ExpandSelectionToLineBreakIntent: DoNothingAction(consumesKey: false),
372-
ScrollToDocumentBoundaryIntent: DoNothingAction(consumesKey: false),
373-
RedoTextIntent: DoNothingAction(consumesKey: false),
374-
ReplaceTextIntent: DoNothingAction(consumesKey: false),
375-
UndoTextIntent: DoNothingAction(consumesKey: false),
376-
UpdateSelectionIntent: DoNothingAction(consumesKey: false),
377-
TransposeCharactersIntent: DoNothingAction(consumesKey: false),
378-
};
345+
static final Map<Type, Action<Intent>> _unsupportedActions =
346+
<Type, Action<Intent>>{
347+
DeleteToNextWordBoundaryIntent: DoNothingAction(consumesKey: false),
348+
DeleteToLineBreakIntent: DoNothingAction(consumesKey: false),
349+
ExtendSelectionToNextWordBoundaryIntent: DoNothingAction(
350+
consumesKey: false,
351+
),
352+
ExtendSelectionToNextParagraphBoundaryOrCaretLocationIntent:
353+
DoNothingAction(consumesKey: false),
354+
ExtendSelectionToLineBreakIntent: DoNothingAction(consumesKey: false),
355+
ExtendSelectionVerticallyToAdjacentLineIntent: DoNothingAction(
356+
consumesKey: false,
357+
),
358+
ExtendSelectionVerticallyToAdjacentPageIntent: DoNothingAction(
359+
consumesKey: false,
360+
),
361+
ExtendSelectionToNextParagraphBoundaryIntent: DoNothingAction(
362+
consumesKey: false,
363+
),
364+
ExtendSelectionToDocumentBoundaryIntent: DoNothingAction(
365+
consumesKey: false,
366+
),
367+
ExtendSelectionByPageIntent: DoNothingAction(consumesKey: false),
368+
ExpandSelectionToDocumentBoundaryIntent: DoNothingAction(
369+
consumesKey: false,
370+
),
371+
ExpandSelectionToLineBreakIntent: DoNothingAction(consumesKey: false),
372+
ScrollToDocumentBoundaryIntent: DoNothingAction(consumesKey: false),
373+
RedoTextIntent: DoNothingAction(consumesKey: false),
374+
ReplaceTextIntent: DoNothingAction(consumesKey: false),
375+
UndoTextIntent: DoNothingAction(consumesKey: false),
376+
UpdateSelectionIntent: DoNothingAction(consumesKey: false),
377+
TransposeCharactersIntent: DoNothingAction(consumesKey: false),
378+
};
379379

380380
/// Keyboard text editing actions.
381381
// The Handling of the default text editing shortcuts with deltas
@@ -582,9 +582,7 @@ class BasicTextInputClientState extends State<BasicTextInputClient>
582582

583583
void _updateCaretRectIfNeeded() {
584584
final TextSelection? selection = renderEditable.selection;
585-
if (selection == null ||
586-
!selection.isValid ||
587-
!selection.isCollapsed) {
585+
if (selection == null || !selection.isValid || !selection.isCollapsed) {
588586
return;
589587
}
590588
final TextPosition currentTextPosition = TextPosition(
@@ -982,9 +980,7 @@ class BasicTextInputClientState extends State<BasicTextInputClient>
982980
final InlineSpan span = renderEditable.text!;
983981
final String prevText = span.toPlainText();
984982
final String currText = textEditingValue.text;
985-
if (prevText != currText ||
986-
!selection.isValid ||
987-
selection.isCollapsed) {
983+
if (prevText != currText || !selection.isValid || selection.isCollapsed) {
988984
return _GlyphHeights(
989985
start: renderEditable.preferredLineHeight,
990986
end: renderEditable.preferredLineHeight,
@@ -994,13 +990,12 @@ class BasicTextInputClientState extends State<BasicTextInputClient>
994990
final String selectedGraphemes = selection.textInside(currText);
995991
final int firstSelectedGraphemeExtent =
996992
selectedGraphemes.characters.first.length;
997-
final Rect? startCharacterRect = renderEditable
998-
.getRectForComposingRange(
999-
TextRange(
1000-
start: selection.start,
1001-
end: selection.start + firstSelectedGraphemeExtent,
1002-
),
1003-
);
993+
final Rect? startCharacterRect = renderEditable.getRectForComposingRange(
994+
TextRange(
995+
start: selection.start,
996+
end: selection.start + firstSelectedGraphemeExtent,
997+
),
998+
);
1004999
final int lastSelectedGraphemeExtent =
10051000
selectedGraphemes.characters.last.length;
10061001
final Rect? endCharacterRect = renderEditable.getRectForComposingRange(
@@ -1010,8 +1005,7 @@ class BasicTextInputClientState extends State<BasicTextInputClient>
10101005
),
10111006
);
10121007
return _GlyphHeights(
1013-
start:
1014-
startCharacterRect?.height ?? renderEditable.preferredLineHeight,
1008+
start: startCharacterRect?.height ?? renderEditable.preferredLineHeight,
10151009
end: endCharacterRect?.height ?? renderEditable.preferredLineHeight,
10161010
);
10171011
}
@@ -1095,9 +1089,7 @@ class BasicTextInputClientState extends State<BasicTextInputClient>
10951089
}
10961090

10971091
return !textEditingValue.selection.isCollapsed &&
1098-
textEditingValue.selection
1099-
.textInside(textEditingValue.text)
1100-
.trim() !=
1092+
textEditingValue.selection.textInside(textEditingValue.text).trim() !=
11011093
'';
11021094
}
11031095

@@ -1160,8 +1152,7 @@ class BasicTextInputClientState extends State<BasicTextInputClient>
11601152
startHandleLayerLink: _startHandleLayerLink,
11611153
endHandleLayerLink: _endHandleLayerLink,
11621154
inlineSpan: _buildTextSpan(),
1163-
value:
1164-
_value, // We pass value.selection to RenderEditable.
1155+
value: _value, // We pass value.selection to RenderEditable.
11651156
cursorColor: Colors.blue,
11661157
backgroundCursorColor: Colors.grey[100],
11671158
showCursor: ValueNotifier<bool>(_hasFocus),

‎simplistic_editor/lib/replacements.dart‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -131,16 +131,14 @@ class TextEditingInlineSpanReplacement {
131131
return copy(
132132
range: TextRange(start: range.start, end: range.end),
133133
);
134-
} else if (range.start >= insertionOffset &&
135-
range.end > insertionOffset) {
134+
} else if (range.start >= insertionOffset && range.end > insertionOffset) {
136135
return copy(
137136
range: TextRange(
138137
start: range.start + insertedLength,
139138
end: range.end + insertedLength,
140139
),
141140
);
142-
} else if (range.start < insertionOffset &&
143-
range.end > insertionOffset) {
141+
} else if (range.start < insertionOffset && range.end > insertionOffset) {
144142
return copy(
145143
range: TextRange(
146144
start: range.start,
@@ -167,8 +165,7 @@ class TextEditingInlineSpanReplacement {
167165
: delta.replacementText.length - delta.textReplaced.length;
168166

169167
if (range.start >= replacedRange.start &&
170-
(range.start < replacedRange.end &&
171-
range.end > replacedRange.end)) {
168+
(range.start < replacedRange.end && range.end > replacedRange.end)) {
172169
if (replacementShortenedText) {
173170
return [
174171
copy(
@@ -327,8 +324,7 @@ class TextEditingInlineSpanReplacement {
327324
} else if (range.end <= removalRange.start &&
328325
range.end < removalRange.end) {
329326
return [this];
330-
} else if (removalRange.isCollapsed &&
331-
range.end == removalRange.start) {
327+
} else if (removalRange.isCollapsed && range.end == removalRange.start) {
332328
return [this];
333329
}
334330

@@ -728,8 +724,7 @@ class ReplacementTextEditingController extends TextEditingController {
728724
final List<TextEditingInlineSpanReplacement> toRemove = [];
729725
final List<TextEditingInlineSpanReplacement> toAdd = [];
730726

731-
for (final TextEditingInlineSpanReplacement replacement
732-
in replacements!) {
727+
for (final TextEditingInlineSpanReplacement replacement in replacements!) {
733728
if (replacement.range.end == selection.start) {
734729
TextStyle? replacementStyle =
735730
(replacement.generator('', const TextRange.collapsed(0))
@@ -747,8 +742,7 @@ class ReplacementTextEditingController extends TextEditingController {
747742
replacements!.remove(replacementToRemove);
748743
}
749744

750-
for (final TextEditingInlineSpanReplacement
751-
replacementWithExpandDisabled
745+
for (final TextEditingInlineSpanReplacement replacementWithExpandDisabled
752746
in toAdd) {
753747
replacements!.add(replacementWithExpandDisabled);
754748
}
@@ -763,8 +757,7 @@ class ReplacementTextEditingController extends TextEditingController {
763757
// should be enabled.
764758
final List<TextStyle> stylesAtSelection = <TextStyle>[];
765759

766-
for (final TextEditingInlineSpanReplacement replacement
767-
in replacements!) {
760+
for (final TextEditingInlineSpanReplacement replacement in replacements!) {
768761
if (selection.isCollapsed) {
769762
if (math.max(replacement.range.start, selection.start) <=
770763
math.min(replacement.range.end, selection.end)) {
@@ -818,8 +811,8 @@ class ReplacementTextEditingController extends TextEditingController {
818811
math.min(replacement.range.end, removalRange.end)) &&
819812
replacementStyle != null) {
820813
if (replacementStyle == attribute!) {
821-
List<TextEditingInlineSpanReplacement>? newReplacements =
822-
replacement.removeRange(removalRange);
814+
List<TextEditingInlineSpanReplacement>? newReplacements = replacement
815+
.removeRange(removalRange);
823816

824817
if (newReplacements != null) {
825818
if (newReplacements.length == 1) {
@@ -845,8 +838,7 @@ class ReplacementTextEditingController extends TextEditingController {
845838
replacements!.add(replacementToAdd);
846839
}
847840

848-
for (TextEditingInlineSpanReplacement replacementToRemove
849-
in toRemove) {
841+
for (TextEditingInlineSpanReplacement replacementToRemove in toRemove) {
850842
replacements!.remove(replacementToRemove);
851843
}
852844
}

‎testing_app/integration_test/perf_test.dart‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@ import 'package:testing_app/main.dart';
99

1010
void main() {
1111
group('Testing App Performance Tests', () {
12-
final binding =
13-
IntegrationTestWidgetsFlutterBinding.ensureInitialized();
12+
final binding = IntegrationTestWidgetsFlutterBinding.ensureInitialized();
1413

1514
// The fullyLive frame policy simulates
1615
// the way Flutter responds to animations.
17-
binding.framePolicy =
18-
LiveTestWidgetsFlutterBindingFramePolicy.fullyLive;
16+
binding.framePolicy = LiveTestWidgetsFlutterBindingFramePolicy.fullyLive;
1917

2018
testWidgets('Scrolling test', (tester) async {
2119
await tester.pumpWidget(const TestingApp());

0 commit comments

Comments
 (0)