Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
82bd7cf8
Unverified
Commit
82bd7cf8
authored
Sep 22, 2020
by
Michael Goderbauer
Committed by
GitHub
Sep 22, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make CupertinoThemeData properties non-nullable (#66274)
parent
19062180
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
151 additions
and
136 deletions
+151
-136
theme.dart
packages/flutter/lib/src/cupertino/theme.dart
+146
-131
theme_data.dart
packages/flutter/lib/src/material/theme_data.dart
+5
-5
No files found.
packages/flutter/lib/src/cupertino/theme.dart
View file @
82bd7cf8
This diff is collapsed.
Click to expand it.
packages/flutter/lib/src/material/theme_data.dart
View file @
82bd7cf8
...
@@ -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
,
NoDefault
CupertinoThemeData
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
NoDefault
CupertinoThemeData
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
,
NoDefault
CupertinoThemeData
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
<
NoDefault
CupertinoThemeData
>(
'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
NoDefault
CupertinoThemeData
_cupertinoOverrideTheme
;
@override
@override
Brightness
get
brightness
=>
_cupertinoOverrideTheme
.
brightness
??
_materialTheme
.
brightness
;
Brightness
get
brightness
=>
_cupertinoOverrideTheme
.
brightness
??
_materialTheme
.
brightness
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment