Skip to content

migrate some material files to nullsafety #67078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
a14n merged 2 commits into from
Oct 2, 2020
Merged

migrate some material files to nullsafety #67078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8bb961
migrate some material files to nullsafety
a14n Oct 1, 2020
ec27174
review
a14n Oct 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
346 changes: 172 additions & 174 deletions packages/flutter/lib/src/material/about.dart
View file
Open in desktop

Large diffs are not rendered by default.

91 changes: 44 additions & 47 deletions packages/flutter/lib/src/material/app.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// @dart = 2.8

import 'dart:ui' as ui;

import 'package:flutter/cupertino.dart';
Expand Down Expand Up @@ -166,7 +164,7 @@ class MaterialApp extends StatefulWidget {
///
/// The boolean arguments, [routes], and [navigatorObservers], must not be null.
const MaterialApp({
Key key,
Key? key,
this.navigatorKey,
this.home,
this.routes = const <String, WidgetBuilder>{},
Expand Down Expand Up @@ -215,10 +213,10 @@ class MaterialApp extends StatefulWidget {

/// Creates a [MaterialApp] that uses the [Router] instead of a [Navigator].
const MaterialApp.router({
Key key,
Key? key,
this.routeInformationProvider,
@required this.routeInformationParser,
@required this.routerDelegate,
required this.routeInformationParser,
required this.routerDelegate,
this.backButtonDispatcher,
this.builder,
this.title = '',
Expand Down Expand Up @@ -263,10 +261,10 @@ class MaterialApp extends StatefulWidget {
super(key: key);

/// {@macro flutter.widgets.widgetsApp.navigatorKey}
final GlobalKey<NavigatorState> navigatorKey;
final GlobalKey<NavigatorState>? navigatorKey;

/// {@macro flutter.widgets.widgetsApp.home}
final Widget home;
final Widget? home;

/// The application's top-level routing table.
///
Expand All @@ -276,41 +274,41 @@ class MaterialApp extends StatefulWidget {
/// an appropriate transition, including [Hero] animations, to the new route.
///
/// {@macro flutter.widgets.widgetsApp.routes}
final Map<String, WidgetBuilder> routes;
final Map<String, WidgetBuilder>? routes;

/// {@macro flutter.widgets.widgetsApp.initialRoute}
final String initialRoute;
final String? initialRoute;

/// {@macro flutter.widgets.widgetsApp.onGenerateRoute}
final RouteFactory onGenerateRoute;
final RouteFactory? onGenerateRoute;

/// {@macro flutter.widgets.widgetsApp.onGenerateInitialRoutes}
final InitialRouteListFactory onGenerateInitialRoutes;
final InitialRouteListFactory? onGenerateInitialRoutes;

/// {@macro flutter.widgets.widgetsApp.onUnknownRoute}
final RouteFactory onUnknownRoute;
final RouteFactory? onUnknownRoute;

/// {@macro flutter.widgets.widgetsApp.navigatorObservers}
final List<NavigatorObserver> navigatorObservers;
final List<NavigatorObserver>? navigatorObservers;

/// {@macro flutter.widgets.widgetsApp.routeInformationProvider}
final RouteInformationProvider routeInformationProvider;
final RouteInformationProvider? routeInformationProvider;

/// {@macro flutter.widgets.widgetsApp.routeInformationParser}
final RouteInformationParser<Object> routeInformationParser;
final RouteInformationParser<Object>? routeInformationParser;

/// {@macro flutter.widgets.widgetsApp.routerDelegate}
final RouterDelegate<Object> routerDelegate;
final RouterDelegate<Object>? routerDelegate;

/// {@macro flutter.widgets.widgetsApp.backButtonDispatcher}
final BackButtonDispatcher backButtonDispatcher;
final BackButtonDispatcher? backButtonDispatcher;

/// {@macro flutter.widgets.widgetsApp.builder}
///
/// Material specific features such as [showDialog] and [showMenu], and widgets
/// such as [Tooltip], [PopupMenuButton], also require a [Navigator] to properly
/// function.
final TransitionBuilder builder;
final TransitionBuilder? builder;

/// {@macro flutter.widgets.widgetsApp.title}
///
Expand All @@ -320,7 +318,7 @@ class MaterialApp extends StatefulWidget {
/// {@macro flutter.widgets.widgetsApp.onGenerateTitle}
///
/// This value is passed unmodified to [WidgetsApp.onGenerateTitle].
final GenerateAppTitle onGenerateTitle;
final GenerateAppTitle? onGenerateTitle;

/// Default visual properties, like colors fonts and shapes, for this app's
/// material widgets.
Expand All @@ -339,7 +337,7 @@ class MaterialApp extends StatefulWidget {
/// and [darkTheme] in [MaterialApp].
/// * [ThemeData.brightness], which indicates the [Brightness] of a theme's
/// colors.
final ThemeData theme;
final ThemeData? theme;

/// The [ThemeData] to use when a 'dark mode' is requested by the system.
///
Expand All @@ -361,7 +359,7 @@ class MaterialApp extends StatefulWidget {
/// and [darkTheme] in [MaterialApp].
/// * [ThemeData.brightness], which is typically set to the value of
/// [MediaQueryData.platformBrightness].
final ThemeData darkTheme;
final ThemeData? darkTheme;

/// The [ThemeData] to use when 'high contrast' is requested by the system.
///
Expand All @@ -374,7 +372,7 @@ class MaterialApp extends StatefulWidget {
///
/// * [MediaQueryData.highContrast], which indicates the platform's
/// desire to increase contrast.
final ThemeData highContrastTheme;
final ThemeData? highContrastTheme;

/// The [ThemeData] to use when a 'dark mode' and 'high contrast' is requested
/// by the system.
Expand All @@ -390,7 +388,7 @@ class MaterialApp extends StatefulWidget {
///
/// * [MediaQueryData.highContrast], which indicates the platform's
/// desire to increase contrast.
final ThemeData highContrastDarkTheme;
final ThemeData? highContrastDarkTheme;

/// Determines which theme will be used by the application if both [theme]
/// and [darkTheme] are provided.
Expand All @@ -416,13 +414,13 @@ class MaterialApp extends StatefulWidget {
/// * [darkTheme], which is used when a dark mode is selected.
/// * [ThemeData.brightness], which indicates to various parts of the
/// system what kind of theme is being used.
final ThemeMode themeMode;
final ThemeMode? themeMode;

/// {@macro flutter.widgets.widgetsApp.color}
final Color color;
final Color? color;

/// {@macro flutter.widgets.widgetsApp.locale}
final Locale locale;
final Locale? locale;

/// {@macro flutter.widgets.widgetsApp.localizationsDelegates}
///
Expand Down Expand Up @@ -515,17 +513,17 @@ class MaterialApp extends StatefulWidget {
/// which provides material localizations for many languages.
/// * The Flutter Internationalization Tutorial,
/// <https://flutter.dev/tutorials/internationalization/>.
final Iterable<LocalizationsDelegate<dynamic>> localizationsDelegates;
final Iterable<LocalizationsDelegate<dynamic>>? localizationsDelegates;

/// {@macro flutter.widgets.widgetsApp.localeListResolutionCallback}
///
/// This callback is passed along to the [WidgetsApp] built by this widget.
final LocaleListResolutionCallback localeListResolutionCallback;
final LocaleListResolutionCallback? localeListResolutionCallback;

/// {@macro flutter.widgets.widgetsApp.localeResolutionCallback}
///
/// This callback is passed along to the [WidgetsApp] built by this widget.
final LocaleResolutionCallback localeResolutionCallback;
final LocaleResolutionCallback? localeResolutionCallback;

/// {@macro flutter.widgets.widgetsApp.supportedLocales}
///
Expand Down Expand Up @@ -587,7 +585,7 @@ class MaterialApp extends StatefulWidget {
/// ```
/// {@end-tool}
/// {@macro flutter.widgets.widgetsApp.shortcuts.seeAlso}
final Map<LogicalKeySet, Intent> shortcuts;
final Map<LogicalKeySet, Intent>? shortcuts;

/// {@macro flutter.widgets.widgetsApp.actions}
/// {@tool snippet}
Expand Down Expand Up @@ -620,10 +618,10 @@ class MaterialApp extends StatefulWidget {
/// ```
/// {@end-tool}
/// {@macro flutter.widgets.widgetsApp.actions.seeAlso}
final Map<Type, Action<Intent>> actions;
final Map<Type, Action<Intent>>? actions;

/// {@macro flutter.widgets.widgetsApp.restorationScopeId}
final String restorationScopeId;
final String? restorationScopeId;

/// Turns on a [GridPaper] overlay that paints a baseline grid
/// Material apps.
Expand All @@ -643,7 +641,7 @@ class MaterialApp extends StatefulWidget {
/// Used by the [MaterialApp].
static HeroController createMaterialHeroController() {
return HeroController(
createRectTween: (Rect begin, Rect end) {
createRectTween: (Rect? begin, Rect? end) {
return MaterialRectArcTween(begin: begin, end: end);
},
);
Expand All @@ -653,7 +651,7 @@ class MaterialApp extends StatefulWidget {
class _MaterialScrollBehavior extends ScrollBehavior {
@override
TargetPlatform getPlatform(BuildContext context) {
return Theme.of(context).platform;
return Theme.of(context)!.platform;
}

@override
Expand All @@ -671,15 +669,14 @@ class _MaterialScrollBehavior extends ScrollBehavior {
return GlowingOverscrollIndicator(
child: child,
axisDirection: axisDirection,
color: Theme.of(context).accentColor,
color: Theme.of(context)!.accentColor,
);
}
return null;
}
}

class _MaterialAppState extends State<MaterialApp> {
HeroController _heroController;
late HeroController _heroController;

bool get _usesRouter => widget.routerDelegate != null;

Expand All @@ -696,7 +693,7 @@ class _MaterialAppState extends State<MaterialApp> {
// _MaterialLocalizationsDelegate.
Iterable<LocalizationsDelegate<dynamic>> get _localizationsDelegates sync* {
if (widget.localizationsDelegates != null)
yield* widget.localizationsDelegates;
yield* widget.localizationsDelegates!;
yield DefaultMaterialLocalizations.delegate;
yield DefaultCupertinoLocalizations.delegate;
}
Expand All @@ -709,14 +706,14 @@ class _MaterialAppState extends State<MaterialApp> {
);
}

Widget _materialBuilder(BuildContext context, Widget child) {
Widget _materialBuilder(BuildContext context, Widget? child) {
// Resolve which theme to use based on brightness and high contrast.
final ThemeMode mode = widget.themeMode ?? ThemeMode.system;
final Brightness platformBrightness = MediaQuery.platformBrightnessOf(context);
final bool useDarkTheme = mode == ThemeMode.dark
|| (mode == ThemeMode.system && platformBrightness == ui.Brightness.dark);
final bool highContrast = MediaQuery.highContrastOf(context);
ThemeData theme;
ThemeData? theme;

if (useDarkTheme && highContrast && widget.highContrastDarkTheme != null) {
theme = widget.highContrastDarkTheme;
Expand Down Expand Up @@ -744,10 +741,10 @@ class _MaterialAppState extends State<MaterialApp> {
// surround widget.builder with yet another builder so that
// a context separates them and Theme.of() correctly
// resolves to the theme we passed to AnimatedTheme.
return widget.builder(context, child);
return widget.builder!(context, child);
},
)
: child,
: child!,
);
}

Expand All @@ -764,8 +761,8 @@ class _MaterialAppState extends State<MaterialApp> {
return WidgetsApp.router(
key: GlobalObjectKey(this),
routeInformationProvider: widget.routeInformationProvider,
routeInformationParser: widget.routeInformationParser,
routerDelegate: widget.routerDelegate,
routeInformationParser: widget.routeInformationParser!,
routerDelegate: widget.routerDelegate!,
backButtonDispatcher: widget.backButtonDispatcher,
builder: _materialBuilder,
title: widget.title,
Expand All @@ -792,12 +789,12 @@ class _MaterialAppState extends State<MaterialApp> {
return WidgetsApp(
key: GlobalObjectKey(this),
navigatorKey: widget.navigatorKey,
navigatorObservers: widget.navigatorObservers,
navigatorObservers: widget.navigatorObservers!,
pageRouteBuilder: <T>(RouteSettings settings, WidgetBuilder builder) {
return MaterialPageRoute<T>(settings: settings, builder: builder);
},
home: widget.home,
routes: widget.routes,
routes: widget.routes!,
initialRoute: widget.initialRoute,
onGenerateRoute: widget.onGenerateRoute,
onGenerateInitialRoutes: widget.onGenerateInitialRoutes,
Expand Down
Loading