@@ -49,7 +49,7 @@ class _${blockName}DefaultsM3 extends DatePickerThemeData {
4949 shape: ${shape ("md.comp.date-picker.modal.container" )},
5050 // TODO(tahatesser): Update this to use token when gen_defaults
5151 // supports `CircleBorder` for fully rounded corners.
52- dayShape: const MaterialStatePropertyAll <OutlinedBorder>(CircleBorder()),
52+ dayShape: const WidgetStatePropertyAll <OutlinedBorder>(CircleBorder()),
5353 rangePickerElevation: ${elevation ("md.comp.date-picker.modal.range-selection.container" )},
5454 rangePickerShape: ${shape ("md.comp.date-picker.modal.range-selection.container" )},
5555 );
@@ -99,65 +99,65 @@ class _${blockName}DefaultsM3 extends DatePickerThemeData {
9999 TextStyle? get dayStyle => ${textStyle ("md.comp.date-picker.modal.date.label-text" )};
100100
101101 @override
102- MaterialStateProperty <Color?>? get dayForegroundColor =>
103- MaterialStateProperty .resolveWith((Set<MaterialState > states) {
104- if (states.contains(MaterialState .selected)) {
102+ WidgetStateProperty <Color?>? get dayForegroundColor =>
103+ WidgetStateProperty .resolveWith((Set<WidgetState > states) {
104+ if (states.contains(WidgetState .selected)) {
105105 return ${componentColor ('md.comp.date-picker.modal.date.selected.label-text' )};
106- } else if (states.contains(MaterialState .disabled)) {
106+ } else if (states.contains(WidgetState .disabled)) {
107107 return ${componentColor ('md.comp.date-picker.modal.date.unselected.label-text' )}.withOpacity(0.38);
108108 }
109109 return ${componentColor ('md.comp.date-picker.modal.date.unselected.label-text' )};
110110 });
111111
112112 @override
113- MaterialStateProperty <Color?>? get dayBackgroundColor =>
114- MaterialStateProperty .resolveWith((Set<MaterialState > states) {
115- if (states.contains(MaterialState .selected)) {
113+ WidgetStateProperty <Color?>? get dayBackgroundColor =>
114+ WidgetStateProperty .resolveWith((Set<WidgetState > states) {
115+ if (states.contains(WidgetState .selected)) {
116116 return ${componentColor ('md.comp.date-picker.modal.date.selected.container' )};
117117 }
118118 return ${componentColor ('md.comp.date-picker.modal.date.unselected.container' )};
119119 });
120120
121121 @override
122- MaterialStateProperty <Color?>? get dayOverlayColor =>
123- MaterialStateProperty .resolveWith((Set<MaterialState > states) {
124- if (states.contains(MaterialState .selected)) {
125- if (states.contains(MaterialState .pressed)) {
122+ WidgetStateProperty <Color?>? get dayOverlayColor =>
123+ WidgetStateProperty .resolveWith((Set<WidgetState > states) {
124+ if (states.contains(WidgetState .selected)) {
125+ if (states.contains(WidgetState .pressed)) {
126126 return ${_stateColor ('md.comp.date-picker.modal.date' , 'selected' , 'pressed' )};
127127 }
128- if (states.contains(MaterialState .hovered)) {
128+ if (states.contains(WidgetState .hovered)) {
129129 return ${_stateColor ('md.comp.date-picker.modal.date' , 'selected' , 'hover' )};
130130 }
131- if (states.contains(MaterialState .focused)) {
131+ if (states.contains(WidgetState .focused)) {
132132 return ${_stateColor ('md.comp.date-picker.modal.date' , 'selected' , 'focus' )};
133133 }
134134 } else {
135- if (states.contains(MaterialState .pressed)) {
135+ if (states.contains(WidgetState .pressed)) {
136136 return ${_stateColor ('md.comp.date-picker.modal.date' , 'unselected' , 'pressed' )};
137137 }
138- if (states.contains(MaterialState .hovered)) {
138+ if (states.contains(WidgetState .hovered)) {
139139 return ${_stateColor ('md.comp.date-picker.modal.date' , 'unselected' , 'hover' )};
140140 }
141- if (states.contains(MaterialState .focused)) {
141+ if (states.contains(WidgetState .focused)) {
142142 return ${_stateColor ('md.comp.date-picker.modal.date' , 'unselected' , 'focus' )};
143143 }
144144 }
145145 return null;
146146 });
147147
148148 @override
149- MaterialStateProperty <Color?>? get todayForegroundColor =>
150- MaterialStateProperty .resolveWith((Set<MaterialState > states) {
151- if (states.contains(MaterialState .selected)) {
149+ WidgetStateProperty <Color?>? get todayForegroundColor =>
150+ WidgetStateProperty .resolveWith((Set<WidgetState > states) {
151+ if (states.contains(WidgetState .selected)) {
152152 return ${componentColor ('md.comp.date-picker.modal.date.selected.label-text' )};
153- } else if (states.contains(MaterialState .disabled)) {
153+ } else if (states.contains(WidgetState .disabled)) {
154154 return ${componentColor ('md.comp.date-picker.modal.date.today.label-text' )}.withOpacity(0.38);
155155 }
156156 return ${componentColor ('md.comp.date-picker.modal.date.today.label-text' )};
157157 });
158158
159159 @override
160- MaterialStateProperty <Color?>? get todayBackgroundColor => dayBackgroundColor;
160+ WidgetStateProperty <Color?>? get todayBackgroundColor => dayBackgroundColor;
161161
162162 @override
163163 BorderSide? get todayBorder => ${border ('md.comp.date-picker.modal.date.today.container.outline' )};
@@ -166,46 +166,46 @@ class _${blockName}DefaultsM3 extends DatePickerThemeData {
166166 TextStyle? get yearStyle => ${textStyle ("md.comp.date-picker.modal.year-selection.year.label-text" )};
167167
168168 @override
169- MaterialStateProperty <Color?>? get yearForegroundColor =>
170- MaterialStateProperty .resolveWith((Set<MaterialState > states) {
171- if (states.contains(MaterialState .selected)) {
169+ WidgetStateProperty <Color?>? get yearForegroundColor =>
170+ WidgetStateProperty .resolveWith((Set<WidgetState > states) {
171+ if (states.contains(WidgetState .selected)) {
172172 return ${componentColor ('md.comp.date-picker.modal.year-selection.year.selected.label-text' )};
173- } else if (states.contains(MaterialState .disabled)) {
173+ } else if (states.contains(WidgetState .disabled)) {
174174 return ${componentColor ('md.comp.date-picker.modal.year-selection.year.unselected.label-text' )}.withOpacity(0.38);
175175 }
176176 return ${componentColor ('md.comp.date-picker.modal.year-selection.year.unselected.label-text' )};
177177 });
178178
179179 @override
180- MaterialStateProperty <Color?>? get yearBackgroundColor =>
181- MaterialStateProperty .resolveWith((Set<MaterialState > states) {
182- if (states.contains(MaterialState .selected)) {
180+ WidgetStateProperty <Color?>? get yearBackgroundColor =>
181+ WidgetStateProperty .resolveWith((Set<WidgetState > states) {
182+ if (states.contains(WidgetState .selected)) {
183183 return ${componentColor ('md.comp.date-picker.modal.year-selection.year.selected.container' )};
184184 }
185185 return ${componentColor ('md.comp.date-picker.modal.year-selection.year.unselected.container' )};
186186 });
187187
188188 @override
189- MaterialStateProperty <Color?>? get yearOverlayColor =>
190- MaterialStateProperty .resolveWith((Set<MaterialState > states) {
191- if (states.contains(MaterialState .selected)) {
192- if (states.contains(MaterialState .pressed)) {
189+ WidgetStateProperty <Color?>? get yearOverlayColor =>
190+ WidgetStateProperty .resolveWith((Set<WidgetState > states) {
191+ if (states.contains(WidgetState .selected)) {
192+ if (states.contains(WidgetState .pressed)) {
193193 return ${_stateColor ('md.comp.date-picker.modal.year-selection.year' , 'selected' , 'pressed' )};
194194 }
195- if (states.contains(MaterialState .hovered)) {
195+ if (states.contains(WidgetState .hovered)) {
196196 return ${_stateColor ('md.comp.date-picker.modal.year-selection.year' , 'selected' , 'hover' )};
197197 }
198- if (states.contains(MaterialState .focused)) {
198+ if (states.contains(WidgetState .focused)) {
199199 return ${_stateColor ('md.comp.date-picker.modal.year-selection.year' , 'selected' , 'focus' )};
200200 }
201201 } else {
202- if (states.contains(MaterialState .pressed)) {
202+ if (states.contains(WidgetState .pressed)) {
203203 return ${_stateColor ('md.comp.date-picker.modal.year-selection.year' , 'unselected' , 'pressed' )};
204204 }
205- if (states.contains(MaterialState .hovered)) {
205+ if (states.contains(WidgetState .hovered)) {
206206 return ${_stateColor ('md.comp.date-picker.modal.year-selection.year' , 'unselected' , 'hover' )};
207207 }
208- if (states.contains(MaterialState .focused)) {
208+ if (states.contains(WidgetState .focused)) {
209209 return ${_stateColor ('md.comp.date-picker.modal.year-selection.year' , 'unselected' , 'focus' )};
210210 }
211211 }
@@ -222,15 +222,15 @@ class _${blockName}DefaultsM3 extends DatePickerThemeData {
222222 Color? get rangeSelectionBackgroundColor => ${colorOrTransparent ("md.comp.date-picker.modal.range-selection.active-indicator.container.color" )};
223223
224224 @override
225- MaterialStateProperty <Color?>? get rangeSelectionOverlayColor =>
226- MaterialStateProperty .resolveWith((Set<MaterialState > states) {
227- if (states.contains(MaterialState .pressed)) {
225+ WidgetStateProperty <Color?>? get rangeSelectionOverlayColor =>
226+ WidgetStateProperty .resolveWith((Set<WidgetState > states) {
227+ if (states.contains(WidgetState .pressed)) {
228228 return ${_stateColor ('md.comp.date-picker.modal.range-selection.date.in-range' , null , 'pressed' )};
229229 }
230- if (states.contains(MaterialState .hovered)) {
230+ if (states.contains(WidgetState .hovered)) {
231231 return ${_stateColor ('md.comp.date-picker.modal.range-selection.date.in-range' , null , 'hover' )};
232232 }
233- if (states.contains(MaterialState .focused)) {
233+ if (states.contains(WidgetState .focused)) {
234234 return ${_stateColor ('md.comp.date-picker.modal.range-selection.date.in-range' , null , 'focus' )};
235235 }
236236 return null;
0 commit comments