Unverified Commit 82bd7cf8 authored by Michael Goderbauer's avatar Michael Goderbauer Committed by GitHub

Make CupertinoThemeData properties non-nullable (#66274)

parent 19062180
...@@ -271,7 +271,7 @@ class ThemeData with Diagnosticable { ...@@ -271,7 +271,7 @@ class ThemeData with Diagnosticable {
FloatingActionButtonThemeData floatingActionButtonTheme, FloatingActionButtonThemeData floatingActionButtonTheme,
NavigationRailThemeData navigationRailTheme, NavigationRailThemeData navigationRailTheme,
Typography typography, Typography typography,
CupertinoThemeData cupertinoOverrideTheme, NoDefaultCupertinoThemeData cupertinoOverrideTheme,
SnackBarThemeData snackBarTheme, SnackBarThemeData snackBarTheme,
BottomSheetThemeData bottomSheetTheme, BottomSheetThemeData bottomSheetTheme,
PopupMenuThemeData popupMenuTheme, PopupMenuThemeData popupMenuTheme,
...@@ -1080,7 +1080,7 @@ class ThemeData with Diagnosticable { ...@@ -1080,7 +1080,7 @@ class ThemeData with Diagnosticable {
/// ///
/// This cascading effect for individual attributes of the [CupertinoThemeData] /// This cascading effect for individual attributes of the [CupertinoThemeData]
/// can be overridden using attributes of this [cupertinoOverrideTheme]. /// can be overridden using attributes of this [cupertinoOverrideTheme].
final CupertinoThemeData cupertinoOverrideTheme; final NoDefaultCupertinoThemeData cupertinoOverrideTheme;
/// A theme for customizing the color, elevation, and shape of a bottom sheet. /// A theme for customizing the color, elevation, and shape of a bottom sheet.
final BottomSheetThemeData bottomSheetTheme; final BottomSheetThemeData bottomSheetTheme;
...@@ -1211,7 +1211,7 @@ class ThemeData with Diagnosticable { ...@@ -1211,7 +1211,7 @@ class ThemeData with Diagnosticable {
FloatingActionButtonThemeData floatingActionButtonTheme, FloatingActionButtonThemeData floatingActionButtonTheme,
NavigationRailThemeData navigationRailTheme, NavigationRailThemeData navigationRailTheme,
Typography typography, Typography typography,
CupertinoThemeData cupertinoOverrideTheme, NoDefaultCupertinoThemeData cupertinoOverrideTheme,
SnackBarThemeData snackBarTheme, SnackBarThemeData snackBarTheme,
BottomSheetThemeData bottomSheetTheme, BottomSheetThemeData bottomSheetTheme,
PopupMenuThemeData popupMenuTheme, PopupMenuThemeData popupMenuTheme,
...@@ -1682,7 +1682,7 @@ class ThemeData with Diagnosticable { ...@@ -1682,7 +1682,7 @@ class ThemeData with Diagnosticable {
properties.add(DiagnosticsProperty<FloatingActionButtonThemeData>('floatingActionButtonThemeData', floatingActionButtonTheme, defaultValue: defaultData.floatingActionButtonTheme, level: DiagnosticLevel.debug)); properties.add(DiagnosticsProperty<FloatingActionButtonThemeData>('floatingActionButtonThemeData', floatingActionButtonTheme, defaultValue: defaultData.floatingActionButtonTheme, level: DiagnosticLevel.debug));
properties.add(DiagnosticsProperty<NavigationRailThemeData>('navigationRailThemeData', navigationRailTheme, defaultValue: defaultData.navigationRailTheme, level: DiagnosticLevel.debug)); properties.add(DiagnosticsProperty<NavigationRailThemeData>('navigationRailThemeData', navigationRailTheme, defaultValue: defaultData.navigationRailTheme, level: DiagnosticLevel.debug));
properties.add(DiagnosticsProperty<Typography>('typography', typography, defaultValue: defaultData.typography, level: DiagnosticLevel.debug)); properties.add(DiagnosticsProperty<Typography>('typography', typography, defaultValue: defaultData.typography, level: DiagnosticLevel.debug));
properties.add(DiagnosticsProperty<CupertinoThemeData>('cupertinoOverrideTheme', cupertinoOverrideTheme, defaultValue: defaultData.cupertinoOverrideTheme, level: DiagnosticLevel.debug)); properties.add(DiagnosticsProperty<NoDefaultCupertinoThemeData>('cupertinoOverrideTheme', cupertinoOverrideTheme, defaultValue: defaultData.cupertinoOverrideTheme, level: DiagnosticLevel.debug));
properties.add(DiagnosticsProperty<SnackBarThemeData>('snackBarTheme', snackBarTheme, defaultValue: defaultData.snackBarTheme, level: DiagnosticLevel.debug)); properties.add(DiagnosticsProperty<SnackBarThemeData>('snackBarTheme', snackBarTheme, defaultValue: defaultData.snackBarTheme, level: DiagnosticLevel.debug));
properties.add(DiagnosticsProperty<BottomSheetThemeData>('bottomSheetTheme', bottomSheetTheme, defaultValue: defaultData.bottomSheetTheme, level: DiagnosticLevel.debug)); properties.add(DiagnosticsProperty<BottomSheetThemeData>('bottomSheetTheme', bottomSheetTheme, defaultValue: defaultData.bottomSheetTheme, level: DiagnosticLevel.debug));
properties.add(DiagnosticsProperty<PopupMenuThemeData>('popupMenuTheme', popupMenuTheme, defaultValue: defaultData.popupMenuTheme, level: DiagnosticLevel.debug)); properties.add(DiagnosticsProperty<PopupMenuThemeData>('popupMenuTheme', popupMenuTheme, defaultValue: defaultData.popupMenuTheme, level: DiagnosticLevel.debug));
...@@ -1759,7 +1759,7 @@ class MaterialBasedCupertinoThemeData extends CupertinoThemeData { ...@@ -1759,7 +1759,7 @@ class MaterialBasedCupertinoThemeData extends CupertinoThemeData {
); );
final ThemeData _materialTheme; final ThemeData _materialTheme;
final CupertinoThemeData _cupertinoOverrideTheme; final NoDefaultCupertinoThemeData _cupertinoOverrideTheme;
@override @override
Brightness get brightness => _cupertinoOverrideTheme.brightness ?? _materialTheme.brightness; Brightness get brightness => _cupertinoOverrideTheme.brightness ?? _materialTheme.brightness;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment