Starter/samples
1
0
Fork 0
mirror of https://github.com/flutter/samples.git synced 2026-05-13 10:27:09 +00:00
Code Issues Releases Wiki Activity

veggieseasons: Migrate to null safety (#922)

Browse Source
This commit is contained in:
Brett Morgan
2021-10-12 10:27:54 +11:00
committed by GitHub
parent 994cdb4afa
commit ac2bef7d83
21 changed files with 134 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
veggieseasons/lib/screens/details.dart
View File

@@ -13,7 +13,7 @@ import 'package:veggieseasons/widgets/close_button.dart';
import 'package:veggieseasons/widgets/trivia.dart';
class ServingInfoChart extends StatelessWidget {
const ServingInfoChart(this.veggie, this.prefs, {Key key}) : super(key: key);
const ServingInfoChart(this.veggie, this.prefs, {Key? key}) : super(key: key);
final Veggie veggie;
@@ -26,7 +26,7 @@ class ServingInfoChart extends StatelessWidget {
return FutureBuilder<int>(
future: targetCalories,
builder: (context, snapshot) {
final target = snapshot?.data ?? 2000;
final target = snapshot.data ?? 2000;
final percent = standardPercentage * 2000 ~/ target;
return Text(
@@ -141,7 +141,7 @@ class ServingInfoChart extends StatelessWidget {
builder: (context, snapshot) {
return Text(
'Percent daily values based on a diet of '
'${snapshot?.data ?? '2,000'} calories.',
'${snapshot.data ?? '2,000'} calories.',
style: Styles.detailsServingNoteText(themeData),
);
},
@@ -156,9 +156,9 @@ class ServingInfoChart extends StatelessWidget {
}
class InfoView extends StatelessWidget {
final int id;
final int? id;
const InfoView(this.id, {Key key}) : super(key: key);
const InfoView(this.id, {Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
@@ -179,9 +179,9 @@ class InfoView extends StatelessWidget {
future: prefs.preferredCategories,
builder: (context, snapshot) {
return Text(
veggie.categoryName.toUpperCase(),
veggie.categoryName!.toUpperCase(),
style: (snapshot.hasData &&
snapshot.data.contains(veggie.category))
snapshot.data!.contains(veggie.category))
? Styles.detailsPreferredCategoryText(themeData)
: themeData.textTheme.textStyle,
);
@@ -191,7 +191,7 @@ class InfoView extends StatelessWidget {
for (Season season in veggie.seasons) ...[
const SizedBox(width: 12),
Padding(
padding: Styles.seasonIconPadding[season],
padding: Styles.seasonIconPadding[season]!,
child: Icon(
Styles.seasonIconData[season],
semanticLabel: seasonNames[season],
@@ -236,17 +236,18 @@ class InfoView extends StatelessWidget {
}
class DetailsScreen extends StatefulWidget {
final int id;
final String restorationId;
final int? id;
final String? restorationId;
const DetailsScreen({this.id, this.restorationId, Key key}) : super(key: key);
const DetailsScreen({this.id, this.restorationId, Key? key})
: super(key: key);
static String show(NavigatorState navigator, int veggieId) {
return navigator.restorablePush<void>(_routeBuilder, arguments: veggieId);
}
static Route<void> _routeBuilder(BuildContext context, Object arguments) {
final veggieId = arguments as int;
static Route<void> _routeBuilder(BuildContext context, Object? arguments) {
final veggieId = arguments as int?;
return CupertinoPageRoute(
builder: (context) =>
DetailsScreen(id: veggieId, restorationId: 'details'),
@@ -262,10 +263,10 @@ class _DetailsScreenState extends State<DetailsScreen> with RestorationMixin {
final RestorableInt _selectedViewIndex = RestorableInt(0);
@override
String get restorationId => widget.restorationId;
String? get restorationId => widget.restorationId;
@override
void restoreState(RestorationBucket oldBucket, bool initialRestore) {
void restoreState(RestorationBucket? oldBucket, bool initialRestore) {
registerForRestoration(_selectedViewIndex, 'tab');
}

4
veggieseasons/lib/screens/favorites.dart
View File

@@ -10,9 +10,9 @@ import 'package:veggieseasons/data/veggie.dart';
import 'package:veggieseasons/widgets/veggie_headline.dart';
class FavoritesScreen extends StatelessWidget {
const FavoritesScreen({this.restorationId, Key key}) : super(key: key);
const FavoritesScreen({this.restorationId, Key? key}) : super(key: key);
final String restorationId;
final String? restorationId;
@override
Widget build(BuildContext context) {

4
veggieseasons/lib/screens/home.dart
View File

@@ -10,9 +10,9 @@ import 'package:veggieseasons/screens/search.dart';
import 'package:veggieseasons/screens/settings.dart';
class HomeScreen extends StatelessWidget {
const HomeScreen({Key key, this.restorationId}) : super(key: key);
const HomeScreen({Key? key, this.restorationId}) : super(key: key);
final String restorationId;
final String? restorationId;
@override
Widget build(BuildContext context) {

4
veggieseasons/lib/screens/list.dart
View File

@@ -14,9 +14,9 @@ import 'package:veggieseasons/styles.dart';
import 'package:veggieseasons/widgets/veggie_card.dart';
class ListScreen extends StatelessWidget {
const ListScreen({this.restorationId, Key key}) : super(key: key);
const ListScreen({this.restorationId, Key? key}) : super(key: key);
final String restorationId;
final String? restorationId;
Widget _generateVeggieRow(Veggie veggie, Preferences prefs,
{bool inSeason = true}) {

10
veggieseasons/lib/screens/search.dart
View File

@@ -11,9 +11,9 @@ import 'package:veggieseasons/data/veggie.dart';
import 'package:veggieseasons/widgets/veggie_headline.dart';
class SearchScreen extends StatefulWidget {
const SearchScreen({this.restorationId, Key key}) : super(key: key);
const SearchScreen({this.restorationId, Key? key}) : super(key: key);
final String restorationId;
final String? restorationId;
@override
_SearchScreenState createState() => _SearchScreenState();
@@ -22,13 +22,13 @@ class SearchScreen extends StatefulWidget {
class _SearchScreenState extends State<SearchScreen> with RestorationMixin {
final controller = RestorableTextEditingController();
final focusNode = FocusNode();
String terms;
String? terms;
@override
String get restorationId => widget.restorationId;
String? get restorationId => widget.restorationId;
@override
void restoreState(RestorationBucket oldBucket, bool initialRestore) {
void restoreState(RestorationBucket? oldBucket, bool initialRestore) {
registerForRestoration(controller, 'text');
controller.addListener(_onTextChanged);
terms = controller.value.text;

20
veggieseasons/lib/screens/settings.dart
View File

@@ -13,16 +13,16 @@ import 'package:veggieseasons/widgets/settings_group.dart';
import 'package:veggieseasons/widgets/settings_item.dart';
class VeggieCategorySettingsScreen extends StatelessWidget {
const VeggieCategorySettingsScreen({Key key, this.restorationId})
const VeggieCategorySettingsScreen({Key? key, this.restorationId})
: super(key: key);
final String restorationId;
final String? restorationId;
static String show(NavigatorState navigator) {
return navigator.restorablePush(_routeBuilder);
}
static Route<void> _routeBuilder(BuildContext context, Object argument) {
static Route<void> _routeBuilder(BuildContext context, Object? argument) {
return CupertinoPageRoute(
builder: (context) =>
const VeggieCategorySettingsScreen(restorationId: 'category'),
@@ -56,7 +56,7 @@ class VeggieCategorySettingsScreen extends StatelessWidget {
// otherwise.
if (snapshot.hasData) {
toggle = CupertinoSwitch(
value: snapshot.data.contains(category),
value: snapshot.data!.contains(category),
onChanged: (value) {
if (value) {
model.addPreferredCategory(category);
@@ -73,7 +73,7 @@ class VeggieCategorySettingsScreen extends StatelessWidget {
}
items.add(SettingsItem(
label: veggieCategoryNames[category],
label: veggieCategoryNames[category]!,
content: toggle,
));
}
@@ -94,9 +94,9 @@ class VeggieCategorySettingsScreen extends StatelessWidget {
}
class CalorieSettingsScreen extends StatelessWidget {
const CalorieSettingsScreen({Key key, this.restorationId}) : super(key: key);
const CalorieSettingsScreen({Key? key, this.restorationId}) : super(key: key);
final String restorationId;
final String? restorationId;
static const max = 1000;
static const min = 2600;
@@ -106,7 +106,7 @@ class CalorieSettingsScreen extends StatelessWidget {
return navigator.restorablePush(_routeBuilder);
}
static Route<void> _routeBuilder(BuildContext context, Object argument) {
static Route<void> _routeBuilder(BuildContext context, Object? argument) {
return CupertinoPageRoute<void>(
builder: (context) =>
const CalorieSettingsScreen(restorationId: 'calorie'),
@@ -169,9 +169,9 @@ class CalorieSettingsScreen extends StatelessWidget {
}
class SettingsScreen extends StatelessWidget {
const SettingsScreen({this.restorationId, Key key}) : super(key: key);
const SettingsScreen({this.restorationId, Key? key}) : super(key: key);
final String restorationId;
final String? restorationId;
SettingsItem _buildCaloriesItem(BuildContext context, Preferences prefs) {
return SettingsItem(