@@ -27,7 +27,7 @@ class _${blockName}DefaultsM3 extends SliderThemeData {
27
27
Color? get inactiveTrackColor => ${componentColor ('$tokenGroup .inactive.track' )};
28
28
29
29
@override
30
- Color? get secondaryActiveTrackColor => _colors.primary .withOpacity(0.54);
30
+ Color? get secondaryActiveTrackColor => ${ componentColor ( '$ tokenGroup .active.track' )} .withOpacity(0.54);
31
31
32
32
@override
33
33
Color? get disabledActiveTrackColor => ${componentColor ('$tokenGroup .disabled.active.track' )};
@@ -36,49 +36,85 @@ class _${blockName}DefaultsM3 extends SliderThemeData {
36
36
Color? get disabledInactiveTrackColor => ${componentColor ('$tokenGroup .disabled.inactive.track' )};
37
37
38
38
@override
39
- Color? get disabledSecondaryActiveTrackColor => _colors.onSurface.withOpacity(0.12) ;
39
+ Color? get disabledSecondaryActiveTrackColor => ${ componentColor ( '$ tokenGroup .disabled.active.track' )} ;
40
40
41
41
@override
42
- Color? get activeTickMarkColor => ${componentColor ('$tokenGroup .with-tick-marks. active.container' )};
42
+ Color? get activeTickMarkColor => ${componentColor ('$tokenGroup .active.stop-indicator .container' )};
43
43
44
44
@override
45
- Color? get inactiveTickMarkColor => ${componentColor ('$tokenGroup .with-tick-marks. inactive.container' )};
45
+ Color? get inactiveTickMarkColor => ${componentColor ('$tokenGroup .inactive.stop-indicator .container' )};
46
46
47
47
@override
48
- Color? get disabledActiveTickMarkColor => ${componentColor ('$tokenGroup .with-tick-marks. disabled.container' )};
48
+ Color? get disabledActiveTickMarkColor => ${componentColor ('$tokenGroup .disabled.active.stop-indicator .container' )};
49
49
50
50
@override
51
- Color? get disabledInactiveTickMarkColor => ${componentColor ('$tokenGroup .with-tick-marks. disabled.container' )};
51
+ Color? get disabledInactiveTickMarkColor => ${componentColor ('$tokenGroup .disabled.inactive.stop-indicator .container' )};
52
52
53
53
@override
54
54
Color? get thumbColor => ${componentColor ('$tokenGroup .handle' )};
55
55
56
56
@override
57
- Color? get disabledThumbColor => Color.alphaBlend( ${componentColor ('$tokenGroup .disabled.handle' )}, _colors.surface) ;
57
+ Color? get disabledThumbColor => ${componentColor ('$tokenGroup .disabled.handle' )};
58
58
59
59
@override
60
60
Color? get overlayColor => MaterialStateColor.resolveWith((Set<MaterialState> states) {
61
61
if (states.contains(MaterialState.dragged)) {
62
- return ${ componentColor ( '$ tokenGroup .pressed.state-layer' )} ;
62
+ return _colors.primary.withOpacity(0.1) ;
63
63
}
64
64
if (states.contains(MaterialState.hovered)) {
65
- return ${ componentColor ( '$ tokenGroup .hover.state-layer' )} ;
65
+ return _colors.primary.withOpacity(0.08) ;
66
66
}
67
67
if (states.contains(MaterialState.focused)) {
68
- return ${ componentColor ( '$ tokenGroup .focus.state-layer' )} ;
68
+ return _colors.primary.withOpacity(0.1) ;
69
69
}
70
70
71
71
return Colors.transparent;
72
72
});
73
73
74
74
@override
75
- TextStyle? get valueIndicatorTextStyle => ${textStyle ('$tokenGroup .label.label-text' )}!.copyWith(
76
- color: ${componentColor ('$tokenGroup .label.label-text' )},
75
+ TextStyle? get valueIndicatorTextStyle => ${textStyle ('$tokenGroup .value-indicator. label.label-text' )}!.copyWith(
76
+ color: ${componentColor ('$tokenGroup .value-indicator. label.label-text' )},
77
77
);
78
78
79
79
@override
80
- SliderComponentShape? get valueIndicatorShape => const DropSliderValueIndicatorShape();
80
+ Color? get valueIndicatorColor => ${componentColor ('$tokenGroup .value-indicator.container' )};
81
+
82
+ @override
83
+ SliderComponentShape? get valueIndicatorShape => const RoundedRectSliderValueIndicatorShape();
84
+
85
+ @override
86
+ SliderComponentShape? get thumbShape => const HandleThumbShape();
87
+
88
+ @override
89
+ SliderTrackShape? get trackShape => const GappedSliderTrackShape();
90
+
91
+ @override
92
+ SliderComponentShape? get overlayShape => const RoundSliderOverlayShape();
93
+
94
+ @override
95
+ SliderTickMarkShape? get tickMarkShape => const RoundSliderTickMarkShape(tickMarkRadius: ${getToken ("$tokenGroup .stop-indicator.size" )} / 2);
96
+
97
+ @override
98
+ MaterialStateProperty<Size?>? get thumbSize {
99
+ return MaterialStateProperty.resolveWith((Set<MaterialState> states) {
100
+ if (states.contains(MaterialState.disabled)) {
101
+ return const Size(${getToken ("$tokenGroup .disabled.handle.width" )}, ${getToken ("$tokenGroup .handle.height" )});
102
+ }
103
+ if (states.contains(MaterialState.hovered)) {
104
+ return const Size(${getToken ("$tokenGroup .hover.handle.width" )}, ${getToken ("$tokenGroup .handle.height" )});
105
+ }
106
+ if (states.contains(MaterialState.focused)) {
107
+ return const Size(${getToken ("$tokenGroup .focus.handle.width" )}, ${getToken ("$tokenGroup .handle.height" )});
108
+ }
109
+ if (states.contains(MaterialState.pressed)) {
110
+ return const Size(${getToken ("$tokenGroup .pressed.handle.width" )}, ${getToken ("$tokenGroup .handle.height" )});
111
+ }
112
+ return const Size(${getToken ("$tokenGroup .handle.width" )}, ${getToken ("$tokenGroup .handle.height" )});
113
+ });
114
+ }
115
+
116
+ @override
117
+ double? get trackGap => ${getToken ("$tokenGroup .active.handle.padding" )};
81
118
}
82
119
''' ;
83
-
84
120
}
0 commit comments