Starter/samples
1
0
Fork 0
mirror of https://github.com/flutter/samples.git synced 2025-11-11 15:28:44 +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

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(