Skip to content

Commit cc839b7

Browse files
authored
[material_ui] Migrate M3 RangeSlider template to use new gen_defaults (#13215)
Work toward flutter/flutter#187899. Fixes flutter/flutter#188429. This PR migrates the M3 RangeSlider defaults template to use the new gen_defaults in material_ui. The generated defaults remain unchanged. ## Pre-Review Checklist **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. [^1]: Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling.
1 parent e872aea commit cc839b7

6 files changed

Lines changed: 138 additions & 227 deletions

File tree

packages/material_ui/tool/gen_defaults/temporarily_excluded/generated/range_slider_defaults.g.dart renamed to packages/material_ui/lib/src/generated/range_slider_defaults_m3.g.dart

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
// Do not edit by hand. The code is generated from data in the Material
6+
// Design token database by the script:
7+
// packages/material_ui/tool/gen_defaults/bin/gen_defaults.dart.
8+
part of '../range_slider.dart';
9+
510
class _RangeSliderDefaultsM3 extends SliderThemeData {
611
_RangeSliderDefaultsM3(this.context) : super(trackHeight: 16.0);
712

‎packages/material_ui/lib/src/range_slider.dart‎

Lines changed: 2 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ import 'slider_theme.dart';
3232
import 'slider_value_indicator_shape.dart';
3333
import 'theme.dart';
3434

35+
part 'generated/range_slider_defaults_m3.g.dart';
36+
3537
// Examples can assume:
3638
// RangeValues _rangeValues = const RangeValues(0.3, 0.7);
3739
// RangeValues _dollarsRange = const RangeValues(50, 100);
@@ -2414,109 +2416,3 @@ enum _SliderAdjustmentType { right, left, up, down }
24142416
class _ToggleRangeSliderEditModeIntent extends Intent {
24152417
const _ToggleRangeSliderEditModeIntent();
24162418
}
2417-
2418-
// BEGIN GENERATED TOKEN PROPERTIES - RangeSlider
2419-
2420-
// Do not edit by hand. The code between the "BEGIN GENERATED" and
2421-
// "END GENERATED" comments are generated from data in the Material
2422-
// Design token database by the script:
2423-
// dev/tools/gen_defaults/bin/gen_defaults.dart.
2424-
2425-
// dart format off
2426-
class _RangeSliderDefaultsM3 extends SliderThemeData {
2427-
_RangeSliderDefaultsM3(this.context)
2428-
: super(trackHeight: 16.0);
2429-
2430-
final BuildContext context;
2431-
late final ColorScheme _colors = Theme.of(context).colorScheme;
2432-
2433-
@override
2434-
Color? get activeTrackColor => _colors.primary;
2435-
2436-
@override
2437-
Color? get inactiveTrackColor => _colors.secondaryContainer;
2438-
2439-
@override
2440-
Color? get disabledActiveTrackColor => _colors.onSurface.withOpacity(0.38);
2441-
2442-
@override
2443-
Color? get disabledInactiveTrackColor => _colors.onSurface.withOpacity(0.12);
2444-
2445-
@override
2446-
Color? get activeTickMarkColor => _colors.onPrimary.withOpacity(1.0);
2447-
2448-
@override
2449-
Color? get inactiveTickMarkColor => _colors.onSecondaryContainer.withOpacity(1.0);
2450-
2451-
@override
2452-
Color? get disabledActiveTickMarkColor => _colors.onInverseSurface;
2453-
2454-
@override
2455-
Color? get disabledInactiveTickMarkColor => _colors.onSurface;
2456-
2457-
@override
2458-
Color? get thumbColor => _colors.primary;
2459-
2460-
@override
2461-
Color? get overlappingShapeStrokeColor => _colors.surface;
2462-
2463-
@override
2464-
Color? get disabledThumbColor => _colors.onSurface.withOpacity(0.38);
2465-
2466-
@override
2467-
Color? get overlayColor => _colors.primary.withOpacity(0.12);
2468-
2469-
@override
2470-
TextStyle? get valueIndicatorTextStyle => Theme.of(context).textTheme.labelLarge!.copyWith(
2471-
color: _colors.onInverseSurface,
2472-
);
2473-
2474-
@override
2475-
Color? get valueIndicatorColor => _colors.inverseSurface;
2476-
2477-
@override
2478-
RangeSliderTrackShape? get rangeTrackShape => const GappedRangeSliderTrackShape();
2479-
2480-
@override
2481-
RangeSliderTickMarkShape? get rangeTickMarkShape => const RoundRangeSliderTickMarkShape(tickMarkRadius: 4.0 / 2);
2482-
2483-
@override
2484-
RangeSliderThumbShape? get rangeThumbShape => const HandleRangeSliderThumbShape();
2485-
2486-
@override
2487-
SliderComponentShape? get overlayShape => const RoundSliderOverlayShape();
2488-
2489-
@override
2490-
RangeSliderValueIndicatorShape? get rangeValueIndicatorShape => const RoundedRectRangeSliderValueIndicatorShape();
2491-
2492-
@override
2493-
ShowValueIndicator? get showValueIndicator => ShowValueIndicator.onlyForDiscrete;
2494-
2495-
@override
2496-
double? get minThumbSeparation => 0;
2497-
2498-
@override
2499-
WidgetStateProperty<Size?>? get thumbSize {
2500-
return WidgetStateProperty.resolveWith((Set<WidgetState> states) {
2501-
if (states.contains(WidgetState.disabled)) {
2502-
return const Size(4.0, 44.0);
2503-
}
2504-
if (states.contains(WidgetState.hovered)) {
2505-
return const Size(4.0, 44.0);
2506-
}
2507-
if (states.contains(WidgetState.focused)) {
2508-
return const Size(2.0, 44.0);
2509-
}
2510-
if (states.contains(WidgetState.pressed)) {
2511-
return const Size(2.0, 44.0);
2512-
}
2513-
return const Size(4.0, 44.0);
2514-
});
2515-
}
2516-
2517-
@override
2518-
double? get trackGap => 6.0;
2519-
}
2520-
// dart format on
2521-
2522-
// END GENERATED TOKEN PROPERTIES - RangeSlider

‎packages/material_ui/tool/gen_defaults/bin/gen_defaults.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import '../templates/navigation_rail_template.dart';
4444
import '../templates/progress_indicator_template.dart';
4545

4646
// import '../templates/radio_template.dart';
47-
// import '../templates/range_slider_template.dart';
47+
import '../templates/range_slider_template.dart';
4848
import '../templates/search_bar_template.dart';
4949
// import '../templates/search_view_template.dart';
5050
// import '../templates/segmented_button_template.dart';
@@ -107,7 +107,7 @@ Future<void> main(List<String> args) async {
107107
// const PopupMenuTemplateM3().generateFile(verbose: verbose);
108108
const ProgressIndicatorTemplateM3().generateFile(verbose: verbose);
109109
// const RadioTemplateM3().generateFile(verbose: verbose);
110-
// const RangeSliderTemplateM3().generateFile(verbose: verbose);
110+
const RangeSliderTemplateM3().generateFile(verbose: verbose);
111111
const SearchBarTemplateM3().generateFile(verbose: verbose);
112112
// const SearchViewTemplateM3().generateFile(verbose: verbose);
113113
// const SegmentedButtonTemplateM3().generateFile(verbose: verbose);
Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
// Copyright 2013 The Flutter Authors
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
import '../data/slider.dart';
6+
import '../data/typescale.dart';
7+
import 'template.dart';
8+
9+
class RangeSliderTemplateM3 extends TokenTemplateM3 {
10+
const RangeSliderTemplateM3();
11+
12+
@override
13+
String get name => 'Range Slider';
14+
15+
@override
16+
String get parentFilePath => 'range_slider.dart';
17+
18+
@override
19+
String generateContents(String className) =>
20+
'''
21+
class $className extends SliderThemeData {
22+
$className(this.context)
23+
: super(trackHeight: ${TokenSlider.activeTrackHeight});
24+
25+
final BuildContext context;
26+
late final ColorScheme _colors = Theme.of(context).colorScheme;
27+
28+
@override
29+
Color? get activeTrackColor => ${color(TokenSlider.activeTrackColor)};
30+
31+
@override
32+
Color? get inactiveTrackColor => ${color(TokenSlider.inactiveTrackColor)};
33+
34+
@override
35+
Color? get disabledActiveTrackColor => ${colorWithOpacity(TokenSlider.disabledActiveTrackColor, TokenSlider.disabledActiveTrackOpacity)};
36+
37+
@override
38+
Color? get disabledInactiveTrackColor => ${colorWithOpacity(TokenSlider.disabledInactiveTrackColor, TokenSlider.disabledInactiveTrackOpacity)};
39+
40+
@override
41+
Color? get activeTickMarkColor => ${color(TokenSlider.activeStopIndicatorContainerColor)}.withOpacity(${TokenSlider.activeStopIndicatorContainerOpacity});
42+
43+
@override
44+
Color? get inactiveTickMarkColor => ${color(TokenSlider.inactiveStopIndicatorContainerColor)}.withOpacity(${TokenSlider.inactiveStopIndicatorContainerOpacity});
45+
46+
@override
47+
Color? get disabledActiveTickMarkColor => ${color(TokenSlider.disabledActiveStopIndicatorContainerColor)};
48+
49+
@override
50+
Color? get disabledInactiveTickMarkColor => ${color(TokenSlider.disabledInactiveStopIndicatorContainerColor)};
51+
52+
@override
53+
Color? get thumbColor => ${color(TokenSlider.handleColor)};
54+
55+
@override
56+
Color? get overlappingShapeStrokeColor => _colors.surface;
57+
58+
@override
59+
Color? get disabledThumbColor => ${colorWithOpacity(TokenSlider.disabledHandleColor, TokenSlider.disabledHandleOpacity)};
60+
61+
@override
62+
Color? get overlayColor => _colors.primary.withOpacity(0.12);
63+
64+
@override
65+
TextStyle? get valueIndicatorTextStyle => ${textStyle(TokenTypescale.labelLarge, 'Theme.of(context).textTheme')}!.copyWith(
66+
color: ${color(TokenSlider.valueIndicatorLabelLabelTextColor)},
67+
);
68+
69+
@override
70+
Color? get valueIndicatorColor => ${color(TokenSlider.valueIndicatorContainerColor)};
71+
72+
@override
73+
RangeSliderTrackShape? get rangeTrackShape => const GappedRangeSliderTrackShape();
74+
75+
@override
76+
RangeSliderTickMarkShape? get rangeTickMarkShape => const RoundRangeSliderTickMarkShape(tickMarkRadius: ${TokenSlider.stopIndicatorSize} / 2);
77+
78+
@override
79+
RangeSliderThumbShape? get rangeThumbShape => const HandleRangeSliderThumbShape();
80+
81+
@override
82+
SliderComponentShape? get overlayShape => const RoundSliderOverlayShape();
83+
84+
@override
85+
RangeSliderValueIndicatorShape? get rangeValueIndicatorShape => const RoundedRectRangeSliderValueIndicatorShape();
86+
87+
@override
88+
ShowValueIndicator? get showValueIndicator => ShowValueIndicator.onlyForDiscrete;
89+
90+
@override
91+
double? get minThumbSeparation => 0;
92+
93+
@override
94+
WidgetStateProperty<Size?>? get thumbSize {
95+
return WidgetStateProperty.resolveWith((Set<WidgetState> states) {
96+
if (states.contains(WidgetState.disabled)) {
97+
return const Size(${TokenSlider.disabledHandleWidth}, ${TokenSlider.handleHeight});
98+
}
99+
if (states.contains(WidgetState.hovered)) {
100+
return const Size(${TokenSlider.hoverHandleWidth}, ${TokenSlider.handleHeight});
101+
}
102+
if (states.contains(WidgetState.focused)) {
103+
return const Size(${TokenSlider.focusHandleWidth}, ${TokenSlider.handleHeight});
104+
}
105+
if (states.contains(WidgetState.pressed)) {
106+
return const Size(${TokenSlider.pressedHandleWidth}, ${TokenSlider.handleHeight});
107+
}
108+
return const Size(${TokenSlider.handleWidth}, ${TokenSlider.handleHeight});
109+
});
110+
}
111+
112+
@override
113+
double? get trackGap => ${TokenSlider.activeHandlePadding};
114+
}
115+
''';
116+
}

‎packages/material_ui/tool/gen_defaults/temporarily_excluded/templates/range_slider_template.dart‎

Lines changed: 0 additions & 116 deletions
This file was deleted.

0 commit comments

Comments
 (0)