|
8 | 8 | /// @docImport 'text_button.dart'; |
9 | 9 | /// @docImport 'theme.dart'; |
10 | 10 | /// @docImport 'theme_data.dart'; |
| 11 | +/// @docImport 'typography.dart'; |
11 | 12 | library; |
12 | 13 |
|
13 | 14 | import 'package:flutter/foundation.dart'; |
14 | 15 | import 'package:flutter/widgets.dart'; |
15 | 16 |
|
16 | 17 | import 'theme.dart'; |
17 | | -import 'typography.dart'; |
18 | 18 |
|
19 | 19 | /// Material design text theme. |
20 | 20 | /// |
@@ -800,103 +800,33 @@ class TextTheme with Diagnosticable { |
800 | 800 | @override |
801 | 801 | void debugFillProperties(DiagnosticPropertiesBuilder properties) { |
802 | 802 | super.debugFillProperties(properties); |
803 | | - final TextTheme defaultTheme = Typography.material2018(platform: defaultTargetPlatform).black; |
804 | | - properties.add( |
805 | | - DiagnosticsProperty<TextStyle>( |
806 | | - 'displayLarge', |
807 | | - displayLarge, |
808 | | - defaultValue: defaultTheme.displayLarge, |
809 | | - ), |
810 | | - ); |
811 | | - properties.add( |
812 | | - DiagnosticsProperty<TextStyle>( |
813 | | - 'displayMedium', |
814 | | - displayMedium, |
815 | | - defaultValue: defaultTheme.displayMedium, |
816 | | - ), |
817 | | - ); |
818 | | - properties.add( |
819 | | - DiagnosticsProperty<TextStyle>( |
820 | | - 'displaySmall', |
821 | | - displaySmall, |
822 | | - defaultValue: defaultTheme.displaySmall, |
823 | | - ), |
824 | | - ); |
825 | | - properties.add( |
826 | | - DiagnosticsProperty<TextStyle>( |
827 | | - 'headlineLarge', |
828 | | - headlineLarge, |
829 | | - defaultValue: defaultTheme.headlineLarge, |
830 | | - ), |
831 | | - ); |
832 | | - properties.add( |
833 | | - DiagnosticsProperty<TextStyle>( |
834 | | - 'headlineMedium', |
835 | | - headlineMedium, |
836 | | - defaultValue: defaultTheme.headlineMedium, |
837 | | - ), |
838 | | - ); |
839 | | - properties.add( |
840 | | - DiagnosticsProperty<TextStyle>( |
841 | | - 'headlineSmall', |
842 | | - headlineSmall, |
843 | | - defaultValue: defaultTheme.headlineSmall, |
844 | | - ), |
845 | | - ); |
846 | | - properties.add( |
847 | | - DiagnosticsProperty<TextStyle>( |
848 | | - 'titleLarge', |
849 | | - titleLarge, |
850 | | - defaultValue: defaultTheme.titleLarge, |
851 | | - ), |
852 | | - ); |
853 | | - properties.add( |
854 | | - DiagnosticsProperty<TextStyle>( |
855 | | - 'titleMedium', |
856 | | - titleMedium, |
857 | | - defaultValue: defaultTheme.titleMedium, |
858 | | - ), |
859 | | - ); |
860 | | - properties.add( |
861 | | - DiagnosticsProperty<TextStyle>( |
862 | | - 'titleSmall', |
863 | | - titleSmall, |
864 | | - defaultValue: defaultTheme.titleSmall, |
865 | | - ), |
866 | | - ); |
867 | | - properties.add( |
868 | | - DiagnosticsProperty<TextStyle>('bodyLarge', bodyLarge, defaultValue: defaultTheme.bodyLarge), |
869 | | - ); |
870 | | - properties.add( |
871 | | - DiagnosticsProperty<TextStyle>( |
872 | | - 'bodyMedium', |
873 | | - bodyMedium, |
874 | | - defaultValue: defaultTheme.bodyMedium, |
875 | | - ), |
876 | | - ); |
877 | | - properties.add( |
878 | | - DiagnosticsProperty<TextStyle>('bodySmall', bodySmall, defaultValue: defaultTheme.bodySmall), |
879 | | - ); |
880 | | - properties.add( |
881 | | - DiagnosticsProperty<TextStyle>( |
882 | | - 'labelLarge', |
883 | | - labelLarge, |
884 | | - defaultValue: defaultTheme.labelLarge, |
885 | | - ), |
886 | | - ); |
887 | | - properties.add( |
888 | | - DiagnosticsProperty<TextStyle>( |
889 | | - 'labelMedium', |
890 | | - labelMedium, |
891 | | - defaultValue: defaultTheme.labelMedium, |
892 | | - ), |
893 | | - ); |
894 | | - properties.add( |
895 | | - DiagnosticsProperty<TextStyle>( |
896 | | - 'labelSmall', |
897 | | - labelSmall, |
898 | | - defaultValue: defaultTheme.labelSmall, |
899 | | - ), |
900 | | - ); |
| 803 | + final TextTheme defaultTheme = ThemeData.fallback().textTheme; |
| 804 | + // A null style falls back to the default style when merged into a |
| 805 | + // ThemeData, so it is not reported as differing from the default. |
| 806 | + void add(String name, TextStyle? style, TextStyle? defaultStyle) { |
| 807 | + properties.add( |
| 808 | + DiagnosticsProperty<TextStyle>( |
| 809 | + name, |
| 810 | + style, |
| 811 | + defaultValue: style == null ? null : defaultStyle, |
| 812 | + ), |
| 813 | + ); |
| 814 | + } |
| 815 | + |
| 816 | + add('displayLarge', displayLarge, defaultTheme.displayLarge); |
| 817 | + add('displayMedium', displayMedium, defaultTheme.displayMedium); |
| 818 | + add('displaySmall', displaySmall, defaultTheme.displaySmall); |
| 819 | + add('headlineLarge', headlineLarge, defaultTheme.headlineLarge); |
| 820 | + add('headlineMedium', headlineMedium, defaultTheme.headlineMedium); |
| 821 | + add('headlineSmall', headlineSmall, defaultTheme.headlineSmall); |
| 822 | + add('titleLarge', titleLarge, defaultTheme.titleLarge); |
| 823 | + add('titleMedium', titleMedium, defaultTheme.titleMedium); |
| 824 | + add('titleSmall', titleSmall, defaultTheme.titleSmall); |
| 825 | + add('bodyLarge', bodyLarge, defaultTheme.bodyLarge); |
| 826 | + add('bodyMedium', bodyMedium, defaultTheme.bodyMedium); |
| 827 | + add('bodySmall', bodySmall, defaultTheme.bodySmall); |
| 828 | + add('labelLarge', labelLarge, defaultTheme.labelLarge); |
| 829 | + add('labelMedium', labelMedium, defaultTheme.labelMedium); |
| 830 | + add('labelSmall', labelSmall, defaultTheme.labelSmall); |
901 | 831 | } |
902 | 832 | } |
0 commit comments