Skip to content

F
Front-End
Unverified Commit d8cdaba0 authored by nt4f04uNd's avatar nt4f04uNd Committed by GitHub
Browse files
Options

init (#82348)

parent 4ab29de6
Show whitespace changes
Inline Side-by-side
Showing with 549 additions and 710 deletions
packages/flutter/test/material/chip_theme_test.dart
View file @ d8cdaba0
......@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:ui' show window;
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
......@@ -90,8 +88,6 @@ void main() {
locale: const Locale('en', 'us'),
home: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
child: Center(
child: Theme(
......@@ -112,7 +108,6 @@ void main() {
),
),
),
),
);
}
......@@ -141,8 +136,6 @@ void main() {
return MaterialApp(
home: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
child: Center(
child: Theme(
......@@ -166,7 +159,6 @@ void main() {
),
),
),
),
);
}
......
packages/flutter/test/material/range_slider_test.dart
View file @ d8cdaba0
......@@ -22,9 +22,7 @@ void main() {
textDirection: TextDirection.ltr,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: RangeSlider(
values: values,
......@@ -35,7 +33,6 @@ void main() {
},
),
),
),
);
},
),
......@@ -79,9 +76,7 @@ void main() {
textDirection: TextDirection.rtl,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: RangeSlider(
values: values,
......@@ -92,7 +87,6 @@ void main() {
},
),
),
),
);
},
),
......@@ -136,9 +130,7 @@ void main() {
textDirection: TextDirection.ltr,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: RangeSlider(
values: values,
......@@ -152,7 +144,6 @@ void main() {
},
),
),
),
);
},
),
......@@ -198,9 +189,7 @@ void main() {
textDirection: TextDirection.rtl,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: RangeSlider(
values: values,
......@@ -214,7 +203,6 @@ void main() {
},
),
),
),
);
},
),
......@@ -260,9 +248,7 @@ void main() {
textDirection: TextDirection.ltr,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: RangeSlider(
values: values,
......@@ -273,7 +259,6 @@ void main() {
},
),
),
),
);
},
),
......@@ -307,9 +292,7 @@ void main() {
textDirection: TextDirection.rtl,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: RangeSlider(
values: values,
......@@ -320,7 +303,6 @@ void main() {
},
),
),
),
);
},
),
......@@ -354,9 +336,7 @@ void main() {
textDirection: TextDirection.ltr,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: RangeSlider(
values: values,
......@@ -370,7 +350,6 @@ void main() {
},
),
),
),
);
},
),
......@@ -404,9 +383,7 @@ void main() {
textDirection: TextDirection.rtl,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: RangeSlider(
values: values,
......@@ -420,7 +397,6 @@ void main() {
},
),
),
),
);
},
),
......@@ -454,9 +430,7 @@ void main() {
textDirection: TextDirection.ltr,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: RangeSlider(
values: values,
......@@ -467,7 +441,6 @@ void main() {
},
),
),
),
);
},
),
......@@ -507,9 +480,7 @@ void main() {
textDirection: TextDirection.rtl,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: RangeSlider(
values: values,
......@@ -520,7 +491,6 @@ void main() {
},
),
),
),
);
},
),
......@@ -560,9 +530,7 @@ void main() {
textDirection: TextDirection.ltr,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: RangeSlider(
values: values,
......@@ -576,7 +544,6 @@ void main() {
},
),
),
),
);
},
),
......@@ -616,9 +583,7 @@ void main() {
textDirection: TextDirection.rtl,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: RangeSlider(
values: values,
......@@ -632,7 +597,6 @@ void main() {
},
),
),
),
);
},
),
......@@ -672,9 +636,7 @@ void main() {
textDirection: TextDirection.ltr,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: RangeSlider(
values: values,
......@@ -685,7 +647,6 @@ void main() {
},
),
),
),
);
},
),
......@@ -725,9 +686,7 @@ void main() {
textDirection: TextDirection.rtl,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: RangeSlider(
values: values,
......@@ -738,7 +697,6 @@ void main() {
},
),
),
),
);
},
),
......@@ -778,9 +736,7 @@ void main() {
textDirection: TextDirection.ltr,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: RangeSlider(
values: values,
......@@ -794,7 +750,6 @@ void main() {
},
),
),
),
);
},
),
......@@ -834,9 +789,7 @@ void main() {
textDirection: TextDirection.rtl,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: RangeSlider(
values: values,
......@@ -850,7 +803,6 @@ void main() {
},
),
),
),
);
},
),
......@@ -892,9 +844,7 @@ void main() {
textDirection: TextDirection.ltr,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: RangeSlider(
values: values,
......@@ -913,7 +863,6 @@ void main() {
},
),
),
),
);
},
),
......@@ -950,9 +899,7 @@ void main() {
textDirection: TextDirection.ltr,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: RangeSlider(
values: values,
......@@ -971,7 +918,6 @@ void main() {
},
),
),
),
);
},
),
......@@ -1039,8 +985,6 @@ void main() {
return MaterialApp(
home: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
child: Center(
child: Theme(
......@@ -1057,7 +1001,6 @@ void main() {
),
),
),
),
);
}
......@@ -1313,8 +1256,6 @@ void main() {
return MaterialApp(
home: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
child: Center(
child: Theme(
......@@ -1331,7 +1272,6 @@ void main() {
),
),
),
),
);
}
......@@ -1477,9 +1417,7 @@ void main() {
textDirection: TextDirection.ltr,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: Theme(
data: theme,
......@@ -1493,7 +1431,6 @@ void main() {
),
),
),
),
);
},
),
......@@ -1548,9 +1485,7 @@ void main() {
textDirection: TextDirection.ltr,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: Theme(
data: theme,
......@@ -1565,7 +1500,6 @@ void main() {
),
),
),
),
);
},
),
......@@ -1765,8 +1699,6 @@ void main() {
data: ThemeData.light(),
child: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
child: RangeSlider(
values: const RangeValues(10.0, 12.0),
......@@ -1778,7 +1710,6 @@ void main() {
),
),
),
),
);
await tester.pumpAndSettle();
......
packages/flutter/test/material/slider_test.dart
View file @ d8cdaba0
......@@ -83,9 +83,7 @@ void main() {
textDirection: TextDirection.ltr,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: Slider(
key: sliderKey,
......@@ -103,7 +101,6 @@ void main() {
},
),
),
),
);
},
),
......@@ -143,9 +140,7 @@ void main() {
textDirection: TextDirection.rtl,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: Slider(
key: sliderKey,
......@@ -157,7 +152,6 @@ void main() {
},
),
),
),
);
},
),
......@@ -197,9 +191,7 @@ void main() {
textDirection: TextDirection.ltr,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: Slider(
key: sliderKey,
......@@ -220,7 +212,6 @@ void main() {
},
),
),
),
);
},
),
......@@ -252,9 +243,7 @@ void main() {
textDirection: TextDirection.ltr,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: Slider(
key: sliderKey,
......@@ -267,7 +256,6 @@ void main() {
},
),
),
),
);
},
),
......@@ -307,9 +295,7 @@ void main() {
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
final SliderThemeData sliderTheme = SliderTheme.of(context).copyWith(thumbShape: loggingThumb);
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: SliderTheme(
data: sliderTheme,
......@@ -325,7 +311,6 @@ void main() {
),
),
),
),
);
},
),
......@@ -377,9 +362,7 @@ void main() {
textDirection: TextDirection.ltr,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: Slider(
key: sliderKey,
......@@ -392,7 +375,6 @@ void main() {
},
),
),
),
);
},
),
......@@ -422,9 +404,7 @@ void main() {
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
final SliderThemeData sliderTheme = SliderTheme.of(context).copyWith(thumbShape: loggingThumb);
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: SliderTheme(
data: sliderTheme,
......@@ -440,7 +420,6 @@ void main() {
),
),
),
),
);
},
),
......@@ -491,9 +470,7 @@ void main() {
textDirection: TextDirection.ltr,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: SizedBox(
width: 144.0 + 2 * 16.0, // _kPreferredTotalWidth
......@@ -511,7 +488,6 @@ void main() {
),
),
),
),
);
},
),
......@@ -543,8 +519,6 @@ void main() {
MaterialApp(
home: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
child: Slider(
value: 0.0,
......@@ -557,7 +531,6 @@ void main() {
),
),
),
),
);
await tester.tap(find.byType(Slider));
......@@ -568,8 +541,6 @@ void main() {
MaterialApp(
home: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
child: Slider(
value: 0.0,
......@@ -582,7 +553,6 @@ void main() {
),
),
),
),
);
await tester.tap(find.byType(Slider));
......@@ -627,8 +597,6 @@ void main() {
return MaterialApp(
home: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
child: Center(
child: Theme(
......@@ -645,7 +613,6 @@ void main() {
),
),
),
),
);
}
......@@ -812,8 +779,6 @@ void main() {
MaterialApp(
home: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
child: ListView(
children: <Widget>[
......@@ -831,7 +796,6 @@ void main() {
),
),
),
),
);
await tester.tap(find.byType(Slider));
......@@ -844,8 +808,6 @@ void main() {
MaterialApp(
home: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
child: Center(
child: Slider(
......@@ -858,7 +820,6 @@ void main() {
),
),
),
),
);
final Offset center = tester.getCenter(find.byType(Slider));
......@@ -879,8 +840,6 @@ void main() {
MaterialApp(
home: Directionality(
textDirection: TextDirection.rtl,
child: MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
child: Center(
child: Slider(
......@@ -893,7 +852,6 @@ void main() {
),
),
),
),
);
final Offset center = tester.getCenter(find.byType(Slider));
......@@ -950,12 +908,10 @@ void main() {
testWidgets('Slider sizing', (WidgetTester tester) async {
await tester.pumpWidget(
MaterialApp(
const MaterialApp(
home: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: MediaQueryData.fromWindow(window),
child: const Material(
child: Material(
child: Center(
child: Slider(
value: 0.5,
......@@ -965,17 +921,14 @@ void main() {
),
),
),
),
);
expect(tester.renderObject<RenderBox>(find.byType(Slider)).size, const Size(800.0, 600.0));
await tester.pumpWidget(
MaterialApp(
const MaterialApp(
home: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: MediaQueryData.fromWindow(window),
child: const Material(
child: Material(
child: Center(
child: IntrinsicWidth(
child: Slider(
......@@ -987,17 +940,14 @@ void main() {
),
),
),
),
);
expect(tester.renderObject<RenderBox>(find.byType(Slider)).size, const Size(144.0 + 2.0 * 24.0, 600.0));
await tester.pumpWidget(
MaterialApp(
const MaterialApp(
home: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: MediaQueryData.fromWindow(window),
child: const Material(
child: Material(
child: Center(
child: OverflowBox(
maxWidth: double.infinity,
......@@ -1011,7 +961,6 @@ void main() {
),
),
),
),
);
expect(tester.renderObject<RenderBox>(find.byType(Slider)).size, const Size(144.0 + 2.0 * 24.0, 48.0));
});
......@@ -1173,8 +1122,6 @@ void main() {
return MaterialApp(
home: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
child: Center(
child: Slider(
......@@ -1187,7 +1134,6 @@ void main() {
),
),
),
),
);
}
......@@ -1245,11 +1191,8 @@ void main() {
textDirection: TextDirection.ltr,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: createParents(parents, setState),
),
);
},
),
......@@ -1356,8 +1299,6 @@ void main() {
await tester.pumpWidget(MaterialApp(
home: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
child: Slider(
value: 0.5,
......@@ -1365,7 +1306,6 @@ void main() {
),
),
),
),
));
await tester.pumpAndSettle();
......@@ -1409,19 +1349,16 @@ void main() {
);
// Disable slider
await tester.pumpWidget(MaterialApp(
await tester.pumpWidget(const MaterialApp(
home: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: MediaQueryData.fromWindow(window),
child: const Material(
child: Material(
child: Slider(
value: 0.5,
onChanged: null,
),
),
),
),
));
expect(
......@@ -1519,8 +1456,6 @@ void main() {
data: ThemeData.light(),
child: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
child: Slider(
value: 100.0,
......@@ -1532,7 +1467,6 @@ void main() {
),
),
),
),
);
expect(
......@@ -1574,19 +1508,16 @@ void main() {
);
// Disable slider
await tester.pumpWidget(MaterialApp(
await tester.pumpWidget(const MaterialApp(
home: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: MediaQueryData.fromWindow(window),
child: const Material(
child: Material(
child: Slider(
value: 0.5,
onChanged: null,
),
),
),
),
));
expect(
......@@ -1634,8 +1565,6 @@ void main() {
await tester.pumpWidget(MaterialApp(
home: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
child: Slider(
value: 40.0,
......@@ -1647,7 +1576,6 @@ void main() {
),
),
),
),
));
expect(
......@@ -1979,8 +1907,6 @@ void main() {
return MaterialApp(
home: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
child: Center(
child: Theme(
......@@ -1998,7 +1924,6 @@ void main() {
),
),
),
),
);
}
......@@ -2063,9 +1988,7 @@ void main() {
textDirection: TextDirection.ltr,
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: Slider(
key: sliderKey,
......@@ -2078,7 +2001,6 @@ void main() {
},
),
),
),
);
},
),
......@@ -2259,9 +2181,7 @@ void main() {
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
final SliderThemeData sliderTheme = SliderTheme.of(context).copyWith(tickMarkShape: TallSliderTickMarkShape());
return MediaQuery(
data: MediaQueryData.fromWindow(window),
child: Material(
return Material(
child: Center(
child: IntrinsicHeight(
child: SliderTheme(
......@@ -2279,7 +2199,6 @@ void main() {
),
),
),
),
);
},
),
......@@ -2408,11 +2327,9 @@ void main() {
trackShape: RectangularSliderTrackShape(),
),
),
home: Directionality(
home: const Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: MediaQueryData.fromWindow(window),
child: const Material(
child: Material(
child: Center(
child: Slider(
value: 0.5,
......@@ -2422,7 +2339,6 @@ void main() {
),
),
),
),
);
// _RenderSlider is the last render object in the tree.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab