Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

Commit

Permalink
Time picker precursors (#116450)
Browse files Browse the repository at this point in the history 
* Make some minor changes in preparation for updating the Time Picker to M3

* Revert OutlineInputBorder.borderRadius type change

* Revert more OutlineInputBorder.borderRadius changes.
  • Loading branch information
@gspencergoog
gspencergoog committed Dec 7, 2022
1 parent fb9133b commit 3171994
Show file tree
Hide file tree
Showing 9 changed files with 60 additions and 44 deletions.
8 changes: 4 additions & 4 deletions dev/tools/gen_defaults/lib/input_decorator_template.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class _${blockName}DefaultsM3 extends InputDecorationTheme {
@override
TextStyle? get labelStyle => MaterialStateTextStyle.resolveWith((Set<MaterialState> states) {
final TextStyle textStyle= ${textStyle("md.comp.filled-text-field.label-text")} ?? const TextStyle();
final TextStyle textStyle = ${textStyle("md.comp.filled-text-field.label-text")} ?? const TextStyle();
if(states.contains(MaterialState.error)) {
if (states.contains(MaterialState.focused)) {
return textStyle.copyWith(color:${componentColor('md.comp.filled-text-field.error.focus.label-text')});
Expand All @@ -158,7 +158,7 @@ class _${blockName}DefaultsM3 extends InputDecorationTheme {
@override
TextStyle? get floatingLabelStyle => MaterialStateTextStyle.resolveWith((Set<MaterialState> states) {
final TextStyle textStyle= ${textStyle("md.comp.filled-text-field.label-text")} ?? const TextStyle();
final TextStyle textStyle = ${textStyle("md.comp.filled-text-field.label-text")} ?? const TextStyle();
if(states.contains(MaterialState.error)) {
if (states.contains(MaterialState.focused)) {
return textStyle.copyWith(color:${componentColor('md.comp.filled-text-field.error.focus.label-text')});
Expand All @@ -182,7 +182,7 @@ class _${blockName}DefaultsM3 extends InputDecorationTheme {
@override
TextStyle? get helperStyle => MaterialStateTextStyle.resolveWith((Set<MaterialState> states) {
final TextStyle textStyle= ${textStyle("md.comp.filled-text-field.supporting-text")} ?? const TextStyle();${componentColor('md.comp.filled-text-field.focus.supporting-text') == componentColor('md.comp.filled-text-field.supporting-text') ? '' : '''
final TextStyle textStyle = ${textStyle("md.comp.filled-text-field.supporting-text")} ?? const TextStyle();${componentColor('md.comp.filled-text-field.focus.supporting-text') == componentColor('md.comp.filled-text-field.supporting-text') ? '' : '''
if (states.contains(MaterialState.focused)) {
return textStyle.copyWith(color:${componentColor('md.comp.filled-text-field.focus.supporting-text')});
}'''}${componentColor('md.comp.filled-text-field.hover.supporting-text') == componentColor('md.comp.filled-text-field.supporting-text') ? '' : '''
Expand All @@ -197,7 +197,7 @@ class _${blockName}DefaultsM3 extends InputDecorationTheme {
@override
TextStyle? get errorStyle => MaterialStateTextStyle.resolveWith((Set<MaterialState> states) {
final TextStyle textStyle= ${textStyle("md.comp.filled-text-field.supporting-text")} ?? const TextStyle();${componentColor('md.comp.filled-text-field.error.focus.supporting-text') == componentColor('md.comp.filled-text-field.error.supporting-text') ? '' : '''
final TextStyle textStyle = ${textStyle("md.comp.filled-text-field.supporting-text")} ?? const TextStyle();${componentColor('md.comp.filled-text-field.error.focus.supporting-text') == componentColor('md.comp.filled-text-field.error.supporting-text') ? '' : '''
if (states.contains(MaterialState.focused)) {
return textStyle.copyWith(color:${componentColor('md.comp.filled-text-field.error.focus.supporting-text')});
}'''}${componentColor('md.comp.filled-text-field.error.hover.supporting-text') == componentColor('md.comp.filled-text-field.error.supporting-text') ? '' : '''
Expand Down
6 changes: 1 addition & 5 deletions dev/tools/gen_defaults/lib/snackbar_template.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,6 @@ class _${blockName}DefaultsM3 extends SnackBarThemeData {
@override
bool get showCloseIcon => false;
@override
Color get iconColor => _colors.onInverseSurface;
}
}
''';
}
32 changes: 27 additions & 5 deletions dev/tools/gen_defaults/lib/template.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ abstract class TokenTemplate {
/// Defaults to 'Theme.of(context).colorScheme.'
final String colorSchemePrefix;

/// Optional prefix prepended to text style definitians.
/// Optional prefix prepended to text style definitions.
///
/// Defaults to 'Theme.of(context).textTheme.'
final String textThemePrefix;
Expand Down Expand Up @@ -145,13 +145,17 @@ abstract class TokenTemplate {
}

/// Generate the opacity value for the given token.
String? opacity(String token) {
final dynamic value = tokens[token];
String? opacity(String token) => _numToString(tokens[token]);

String? _numToString(Object? value, [int? digits]) {
if (value == null) {
return null;
}
if (value is double) {
return value.toString();
if (value is num) {
if (value == double.infinity) {
return 'double.infinity';
}
return digits == null ? value.toString() : value.toStringAsFixed(digits);
}
return tokens[value].toString();
}
Expand All @@ -161,6 +165,24 @@ abstract class TokenTemplate {
return tokens[tokens['$componentToken.elevation']!]!.toString();
}

/// Generate a size value for the given component token.
///
/// Non-square sizes are specified as width and height.
String size(String componentToken) {
final String sizeToken = '$componentToken.size';
if (!tokens.containsKey(sizeToken)) {
final String widthToken = '$componentToken.width';
final String heightToken = '$componentToken.height';
if (!tokens.containsKey(widthToken) && !tokens.containsKey(heightToken)) {
throw Exception('Unable to find width, height, or size tokens for $componentToken');
}
final String? width = _numToString(tokens.containsKey(widthToken) ? tokens[widthToken]! as num : double.infinity, 0);
final String? height = _numToString(tokens.containsKey(heightToken) ? tokens[heightToken]! as num : double.infinity, 0);
return 'const Size($width, $height)';
}
return 'const Size.square(${_numToString(tokens[sizeToken])})';
}

/// Generate a shape constant for the given component token.
///
/// Currently supports family:
Expand Down
8 changes: 4 additions & 4 deletions packages/flutter/lib/src/material/input_decorator.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4580,7 +4580,7 @@ class _InputDecoratorDefaultsM3 extends InputDecorationTheme {

@override
TextStyle? get labelStyle => MaterialStateTextStyle.resolveWith((Set<MaterialState> states) {
final TextStyle textStyle= _textTheme.bodyLarge ?? const TextStyle();
final TextStyle textStyle = _textTheme.bodyLarge ?? const TextStyle();
if(states.contains(MaterialState.error)) {
if (states.contains(MaterialState.focused)) {
return textStyle.copyWith(color:_colors.error);
Expand All @@ -4604,7 +4604,7 @@ class _InputDecoratorDefaultsM3 extends InputDecorationTheme {

@override
TextStyle? get floatingLabelStyle => MaterialStateTextStyle.resolveWith((Set<MaterialState> states) {
final TextStyle textStyle= _textTheme.bodyLarge ?? const TextStyle();
final TextStyle textStyle = _textTheme.bodyLarge ?? const TextStyle();
if(states.contains(MaterialState.error)) {
if (states.contains(MaterialState.focused)) {
return textStyle.copyWith(color:_colors.error);
Expand All @@ -4628,7 +4628,7 @@ class _InputDecoratorDefaultsM3 extends InputDecorationTheme {

@override
TextStyle? get helperStyle => MaterialStateTextStyle.resolveWith((Set<MaterialState> states) {
final TextStyle textStyle= _textTheme.bodySmall ?? const TextStyle();
final TextStyle textStyle = _textTheme.bodySmall ?? const TextStyle();
if (states.contains(MaterialState.disabled)) {
return textStyle.copyWith(color:_colors.onSurface.withOpacity(0.38));
}
Expand All @@ -4637,7 +4637,7 @@ class _InputDecoratorDefaultsM3 extends InputDecorationTheme {

@override
TextStyle? get errorStyle => MaterialStateTextStyle.resolveWith((Set<MaterialState> states) {
final TextStyle textStyle= _textTheme.bodySmall ?? const TextStyle();
final TextStyle textStyle = _textTheme.bodySmall ?? const TextStyle();
return textStyle.copyWith(color:_colors.error);
});
}
Expand Down
1 change: 0 additions & 1 deletion packages/flutter/lib/src/material/material_state.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,6 @@ abstract class MaterialStateOutlinedBorder extends OutlinedBorder implements Mat
OutlinedBorder? resolve(Set<MaterialState> states);
}


/// Defines a [TextStyle] that is also a [MaterialStateProperty].
///
/// This class exists to enable widgets with [TextStyle] valued properties
Expand Down
37 changes: 20 additions & 17 deletions packages/flutter/lib/src/material/menu_anchor.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3567,13 +3567,14 @@ bool _platformSupportsAccelerators() {

class _MenuBarDefaultsM3 extends MenuStyle {
_MenuBarDefaultsM3(this.context)
: super(
elevation: const MaterialStatePropertyAll<double?>(3.0),
shape: const MaterialStatePropertyAll<OutlinedBorder>(_defaultMenuBorder),
alignment: AlignmentDirectional.bottomStart,
);
: super(
elevation: const MaterialStatePropertyAll<double?>(3.0),
shape: const MaterialStatePropertyAll<OutlinedBorder>(_defaultMenuBorder),
alignment: AlignmentDirectional.bottomStart,
);

static const RoundedRectangleBorder _defaultMenuBorder =
RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(4.0)));
RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(4.0)));

final BuildContext context;

Expand Down Expand Up @@ -3609,11 +3610,12 @@ class _MenuBarDefaultsM3 extends MenuStyle {

class _MenuButtonDefaultsM3 extends ButtonStyle {
_MenuButtonDefaultsM3(this.context)
: super(
animationDuration: kThemeChangeDuration,
enableFeedback: true,
alignment: AlignmentDirectional.centerStart,
);
: super(
animationDuration: kThemeChangeDuration,
enableFeedback: true,
alignment: AlignmentDirectional.centerStart,
);

final BuildContext context;

late final ColorScheme _colors = Theme.of(context).colorScheme;
Expand Down Expand Up @@ -3751,13 +3753,14 @@ class _MenuButtonDefaultsM3 extends ButtonStyle {

class _MenuDefaultsM3 extends MenuStyle {
_MenuDefaultsM3(this.context)
: super(
elevation: const MaterialStatePropertyAll<double?>(3.0),
shape: const MaterialStatePropertyAll<OutlinedBorder>(_defaultMenuBorder),
alignment: AlignmentDirectional.topEnd,
);
: super(
elevation: const MaterialStatePropertyAll<double?>(3.0),
shape: const MaterialStatePropertyAll<OutlinedBorder>(_defaultMenuBorder),
alignment: AlignmentDirectional.topEnd,
);

static const RoundedRectangleBorder _defaultMenuBorder =
RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(4.0)));
RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(4.0)));

final BuildContext context;

Expand Down
6 changes: 1 addition & 5 deletions packages/flutter/lib/src/material/snack_bar.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -883,10 +883,6 @@ class _SnackbarDefaultsM3 extends SnackBarThemeData {

@override
bool get showCloseIcon => false;

@override
Color get closeIconColor => _colors.onInverseSurface;
}

}

// END GENERATED TOKEN PROPERTIES - Snackbar
2 changes: 1 addition & 1 deletion packages/flutter/lib/src/material/text_field.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1429,6 +1429,6 @@ TextStyle _m2CounterErrorStyle(BuildContext context) =>
TextStyle _m3InputStyle(BuildContext context) => Theme.of(context).textTheme.bodyLarge!;

TextStyle _m3CounterErrorStyle(BuildContext context) =>
Theme.of(context).textTheme.bodySmall!.copyWith(color:Theme.of(context).colorScheme.error);
Theme.of(context).textTheme.bodySmall!.copyWith(color: Theme.of(context).colorScheme.error);

// END GENERATED TOKEN PROPERTIES - TextField
4 changes: 2 additions & 2 deletions packages/flutter/test/painting/system_fonts_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,8 +283,8 @@ void main() {
final RenderObject renderObject = tester.renderObject(
find.descendant(
of: find.byKey(const Key('parent')),
matching: find.byType(CustomPaint),
).first,
matching: find.byKey(const ValueKey<String>('time-picker-dial')),
),
);
expect(renderObject.debugNeedsPaint, isTrue);
});
Expand Down

0 comments on commit 3171994

Please sign in to comment.