Skip to content

Commit e71cf1c

Browse files
authored
[Slider] Rebase. (flutter#52663)
1 parent a2d62df commit e71cf1c

File tree

9 files changed

+3765
-1245
lines changed

9 files changed

+3765
-1245
lines changed

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

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ class _CustomRangeThumbShape extends RangeSliderThumbShape {
6969
@required SliderThemeData sliderTheme,
7070
TextDirection textDirection,
7171
Thumb thumb,
72+
bool isPressed,
7273
}) {
7374
final Canvas canvas = context.canvas;
7475
final ColorTween colorTween = ColorTween(
@@ -130,6 +131,8 @@ class _CustomThumbShape extends SliderComponentShape {
130131
SliderThemeData sliderTheme,
131132
TextDirection textDirection,
132133
double value,
134+
double textScaleFactor,
135+
Size sizeWithOverflow,
133136
}) {
134137
final Canvas canvas = context.canvas;
135138
final ColorTween colorTween = ColorTween(
@@ -169,6 +172,8 @@ class _CustomValueIndicatorShape extends SliderComponentShape {
169172
SliderThemeData sliderTheme,
170173
TextDirection textDirection,
171174
double value,
175+
double textScaleFactor,
176+
Size sizeWithOverflow,
172177
}) {
173178
final Canvas canvas = context.canvas;
174179
final ColorTween enableColor = ColorTween(
@@ -268,15 +273,21 @@ class _SlidersState extends State<_Sliders> {
268273
),
269274
),
270275
),
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-
},
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+
),
280291
),
281292
const Text('Continuous with Editable Numerical Value'),
282293
],
@@ -314,7 +325,7 @@ class _SlidersState extends State<_Sliders> {
314325
activeTrackColor: Colors.deepPurple,
315326
inactiveTrackColor: theme.colorScheme.onSurface.withOpacity(0.5),
316327
activeTickMarkColor: theme.colorScheme.onSurface.withOpacity(0.7),
317-
inactiveTickMarkColor: theme.colorScheme.surface.withOpacity(0.7),
328+
inactiveTickMarkColor: theme.colorScheme.surface.withOpacity(0.7),
318329
overlayColor: theme.colorScheme.onSurface.withOpacity(0.12),
319330
thumbColor: Colors.deepPurple,
320331
valueIndicatorColor: Colors.deepPurpleAccent,

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@ ThemeData _buildDarkTheme() {
2121
final ColorScheme colorScheme = const ColorScheme.dark().copyWith(
2222
primary: primaryColor,
2323
secondary: secondaryColor,
24+
onPrimary: secondaryColor,
2425
);
2526
final ThemeData base = ThemeData(
2627
brightness: Brightness.dark,
2728
accentColorBrightness: Brightness.dark,
29+
colorScheme: colorScheme,
2830
primaryColor: primaryColor,
2931
primaryColorDark: const Color(0xFF0050a0),
3032
primaryColorLight: secondaryColor,

0 commit comments

Comments
 (0)