Skip to content

Commit 8a35b16

Browse files
authored
[material_ui] Migrate M3 buttons template to use new gen_defaults (#12744)
Work towards flutter/flutter#187899 Fixes flutter/flutter#188405 ## Pre-Review Checklist
1 parent 44a1f67 commit 8a35b16

12 files changed

Lines changed: 451 additions & 683 deletions

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

Lines changed: 2 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ import 'material_state.dart';
2525
import 'theme.dart';
2626
import 'theme_data.dart';
2727

28+
part 'generated/elevated_button_defaults_m3.g.dart';
29+
2830
/// A Material Design "elevated button".
2931
///
3032
/// Use elevated buttons to add dimension to otherwise mostly flat
@@ -507,144 +509,3 @@ class _ElevatedButtonWithIconChild extends StatelessWidget {
507509
);
508510
}
509511
}
510-
511-
// BEGIN GENERATED TOKEN PROPERTIES - ElevatedButton
512-
513-
// Do not edit by hand. The code between the "BEGIN GENERATED" and
514-
// "END GENERATED" comments are generated from data in the Material
515-
// Design token database by the script:
516-
// dev/tools/gen_defaults/bin/gen_defaults.dart.
517-
518-
// dart format off
519-
class _ElevatedButtonDefaultsM3 extends ButtonStyle {
520-
_ElevatedButtonDefaultsM3(this.context)
521-
: super(
522-
animationDuration: kThemeChangeDuration,
523-
enableFeedback: true,
524-
alignment: Alignment.center,
525-
);
526-
527-
final BuildContext context;
528-
late final ColorScheme _colors = Theme.of(context).colorScheme;
529-
530-
@override
531-
WidgetStateProperty<TextStyle?> get textStyle =>
532-
MaterialStatePropertyAll<TextStyle?>(Theme.of(context).textTheme.labelLarge);
533-
534-
@override
535-
WidgetStateProperty<Color?>? get backgroundColor =>
536-
WidgetStateProperty.resolveWith((Set<WidgetState> states) {
537-
if (states.contains(WidgetState.disabled)) {
538-
return _colors.onSurface.withOpacity(0.12);
539-
}
540-
return _colors.surfaceContainerLow;
541-
});
542-
543-
@override
544-
WidgetStateProperty<Color?>? get foregroundColor =>
545-
WidgetStateProperty.resolveWith((Set<WidgetState> states) {
546-
if (states.contains(WidgetState.disabled)) {
547-
return _colors.onSurface.withOpacity(0.38);
548-
}
549-
return _colors.primary;
550-
});
551-
552-
@override
553-
WidgetStateProperty<Color?>? get overlayColor =>
554-
WidgetStateProperty.resolveWith((Set<WidgetState> states) {
555-
if (states.contains(WidgetState.pressed)) {
556-
return _colors.primary.withOpacity(0.1);
557-
}
558-
if (states.contains(WidgetState.hovered)) {
559-
return _colors.primary.withOpacity(0.08);
560-
}
561-
if (states.contains(WidgetState.focused)) {
562-
return _colors.primary.withOpacity(0.1);
563-
}
564-
return null;
565-
});
566-
567-
@override
568-
WidgetStateProperty<Color>? get shadowColor =>
569-
MaterialStatePropertyAll<Color>(_colors.shadow);
570-
571-
@override
572-
WidgetStateProperty<Color>? get surfaceTintColor =>
573-
const MaterialStatePropertyAll<Color>(Colors.transparent);
574-
575-
@override
576-
WidgetStateProperty<double>? get elevation =>
577-
WidgetStateProperty.resolveWith((Set<WidgetState> states) {
578-
if (states.contains(WidgetState.disabled)) {
579-
return 0.0;
580-
}
581-
if (states.contains(WidgetState.pressed)) {
582-
return 1.0;
583-
}
584-
if (states.contains(WidgetState.hovered)) {
585-
return 3.0;
586-
}
587-
if (states.contains(WidgetState.focused)) {
588-
return 1.0;
589-
}
590-
return 1.0;
591-
});
592-
593-
@override
594-
WidgetStateProperty<EdgeInsetsGeometry>? get padding =>
595-
MaterialStatePropertyAll<EdgeInsetsGeometry>(_scaledPadding(context));
596-
597-
@override
598-
WidgetStateProperty<Size>? get minimumSize =>
599-
const MaterialStatePropertyAll<Size>(Size(64.0, 40.0));
600-
601-
// No default fixedSize
602-
603-
@override
604-
WidgetStateProperty<double>? get iconSize =>
605-
const MaterialStatePropertyAll<double>(18.0);
606-
607-
@override
608-
WidgetStateProperty<Color>? get iconColor {
609-
return WidgetStateProperty.resolveWith((Set<WidgetState> states) {
610-
if (states.contains(WidgetState.disabled)) {
611-
return _colors.onSurface.withOpacity(0.38);
612-
}
613-
if (states.contains(WidgetState.pressed)) {
614-
return _colors.primary;
615-
}
616-
if (states.contains(WidgetState.hovered)) {
617-
return _colors.primary;
618-
}
619-
if (states.contains(WidgetState.focused)) {
620-
return _colors.primary;
621-
}
622-
return _colors.primary;
623-
});
624-
}
625-
626-
@override
627-
WidgetStateProperty<Size>? get maximumSize =>
628-
const MaterialStatePropertyAll<Size>(Size.infinite);
629-
630-
// No default side
631-
632-
@override
633-
WidgetStateProperty<OutlinedBorder>? get shape =>
634-
const MaterialStatePropertyAll<OutlinedBorder>(StadiumBorder());
635-
636-
@override
637-
WidgetStateProperty<MouseCursor?>? get mouseCursor => WidgetStateMouseCursor.adaptiveClickable;
638-
639-
@override
640-
VisualDensity? get visualDensity => Theme.of(context).visualDensity;
641-
642-
@override
643-
MaterialTapTargetSize? get tapTargetSize => Theme.of(context).materialTapTargetSize;
644-
645-
@override
646-
InteractiveInkFeatureFactory? get splashFactory => Theme.of(context).splashFactory;
647-
}
648-
// dart format on
649-
650-
// END GENERATED TOKEN PROPERTIES - ElevatedButton

0 commit comments

Comments
 (0)