Skip to content

Migrate 104-complete to NNBD #218

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.

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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions mdc_100_series/analysis_options.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion mdc_100_series/lib/backdrop.dart
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class _BackdropTitle extends AnimatedWidget {
final Animation<double> animation = _listenable;

return DefaultTextStyle(
style: Theme.of(context)!.primaryTextTheme.headline6!,
style: Theme.of(context).primaryTextTheme.headline6!,
softWrap: false,
overflow: TextOverflow.ellipsis,
child: Row(children: <Widget>[
Expand Down
2 changes: 1 addition & 1 deletion mdc_100_series/lib/category_menu_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class CategoryMenuPage extends StatelessWidget {
Widget _buildCategory(Category category, BuildContext context) {
final categoryString =
category.toString().replaceAll('Category.', '').toUpperCase();
final ThemeData theme = Theme.of(context)!;
final ThemeData theme = Theme.of(context);
return GestureDetector(
onTap: () => onCategoryTap(category),
child: category == currentCategory
Expand Down
4 changes: 2 additions & 2 deletions mdc_100_series/lib/login.dart
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class _LoginPageState extends State<LoginPage> {
SizedBox(height: 16.0),
Text(
'SHRINE',
style: Theme.of(context)!.textTheme.headline5,
style: Theme.of(context).textTheme.headline5,
),
],
),
Expand Down Expand Up @@ -106,7 +106,7 @@ class AccentColorOverride extends StatelessWidget {
Widget build(BuildContext context) {
return Theme(
child: child,
data: Theme.of(context)!.copyWith(
data: Theme.of(context).copyWith(
accentColor: color,
brightness: Brightness.dark,
),
Expand Down
2 changes: 1 addition & 1 deletion mdc_100_series/lib/supplemental/asymmetric_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class AsymmetricView extends StatelessWidget {
/// helpers for creating the index of the product list that will correspond
/// to the index of the list of columns.
return List.generate(_listItemCount(products.length), (int index) {
double width = .59 * MediaQuery.of(context)!.size.width;
double width = .59 * MediaQuery.of(context).size.width;
Widget column;
if (index % 2 == 0) {
/// Even cases
Expand Down
4 changes: 2 additions & 2 deletions mdc_100_series/lib/supplemental/product_card.dart
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class ProductCard extends StatelessWidget {
Widget build(BuildContext context) {
final NumberFormat formatter = NumberFormat.simpleCurrency(
decimalDigits: 0, locale: Localizations.localeOf(context).toString());
final ThemeData theme = Theme.of(context)!;
final ThemeData theme = Theme.of(context);

final imageWidget = Image.asset(
product.assetName,
Expand All @@ -47,7 +47,7 @@ class ProductCard extends StatelessWidget {
child: imageWidget,
),
SizedBox(
height: kTextBoxHeight * MediaQuery.of(context)!.textScaleFactor,
height: kTextBoxHeight * MediaQuery.of(context).textScaleFactor,
width: 121.0,
child: Column(
mainAxisAlignment: MainAxisAlignment.end,
Expand Down
4 changes: 2 additions & 2 deletions mdc_100_series/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ name: Shrine
description: Take your design up a notch and learn to use our advanced component backdrop menu.

environment:
sdk: '>=2.10.0-56.0.dev <2.11.0'
sdk: '>=2.12.0-0 <3.0.0'

dependencies:
flutter:
sdk: flutter
intl: ">=0.17.0-nullsafety.1 <1.0.0"
intl: ^0.17.0-nullsafety.2

cupertino_icons: ^0.1.0
shrine_images: 1.1.1
Expand Down