Skip to content

Commit d14a301

Browse files
authored
Revert "[Slider] Rebase. (flutter#52663)" (flutter#53698)
This reverts commit e71cf1c.
1 parent ad07c40 commit d14a301

File tree

9 files changed

+1238
-3758
lines changed

9 files changed

+1238
-3758
lines changed

dev/integration_tests/flutter_gallery/lib/demo/material/slider_demo.dart

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ class _CustomRangeThumbShape extends RangeSliderThumbShape {
6969
@required SliderThemeData sliderTheme,
7070
TextDirection textDirection,
7171
Thumb thumb,
72-
bool isPressed,
7372
}) {
7473
final Canvas canvas = context.canvas;
7574
final ColorTween colorTween = ColorTween(
@@ -131,8 +130,6 @@ class _CustomThumbShape extends SliderComponentShape {
131130
SliderThemeData sliderTheme,
132131
TextDirection textDirection,
133132
double value,
134-
double textScaleFactor,
135-
Size sizeWithOverflow,
136133
}) {
137134
final Canvas canvas = context.canvas;
138135
final ColorTween colorTween = ColorTween(
@@ -172,8 +169,6 @@ class _CustomValueIndicatorShape extends SliderComponentShape {
172169
SliderThemeData sliderTheme,
173170
TextDirection textDirection,
174171
double value,
175-
double textScaleFactor,
176-
Size sizeWithOverflow,
177172
}) {
178173
final Canvas canvas = context.canvas;
179174
final ColorTween enableColor = ColorTween(
@@ -273,21 +268,15 @@ class _SlidersState extends State<_Sliders> {
273268
),
274269
),
275270
),
276-
SliderTheme(
277-
data: const SliderThemeData(
278-
showValueIndicator: ShowValueIndicator.always,
279-
),
280-
child: Slider.adaptive(
281-
label: _continuousValue.toStringAsFixed(6).toString(),
282-
value: _continuousValue,
283-
min: 0.0,
284-
max: 100.0,
285-
onChanged: (double value) {
286-
setState(() {
287-
_continuousValue = value;
288-
});
289-
},
290-
),
271+
Slider.adaptive(
272+
value: _continuousValue,
273+
min: 0.0,
274+
max: 100.0,
275+
onChanged: (double value) {
276+
setState(() {
277+
_continuousValue = value;
278+
});
279+
},
291280
),
292281
const Text('Continuous with Editable Numerical Value'),
293282
],
@@ -325,7 +314,7 @@ class _SlidersState extends State<_Sliders> {
325314
activeTrackColor: Colors.deepPurple,
326315
inactiveTrackColor: theme.colorScheme.onSurface.withOpacity(0.5),
327316
activeTickMarkColor: theme.colorScheme.onSurface.withOpacity(0.7),
328-
inactiveTickMarkColor: theme.colorScheme.surface.withOpacity(0.7),
317+
inactiveTickMarkColor: theme.colorScheme.surface.withOpacity(0.7),
329318
overlayColor: theme.colorScheme.onSurface.withOpacity(0.12),
330319
thumbColor: Colors.deepPurple,
331320
valueIndicatorColor: Colors.deepPurpleAccent,

dev/integration_tests/flutter_gallery/lib/gallery/themes.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,10 @@ ThemeData _buildDarkTheme() {
2121
final ColorScheme colorScheme = const ColorScheme.dark().copyWith(
2222
primary: primaryColor,
2323
secondary: secondaryColor,
24-
onPrimary: secondaryColor,
2524
);
2625
final ThemeData base = ThemeData(
2726
brightness: Brightness.dark,
2827
accentColorBrightness: Brightness.dark,
29-
colorScheme: colorScheme,
3028
primaryColor: primaryColor,
3129
primaryColorDark: const Color(0xFF0050a0),
3230
primaryColorLight: secondaryColor,

0 commit comments

Comments
 (0)