Beta (#1234)

veggieseasons/lib/screens/details.dart

@@ -255,7 +255,7 @@ class DetailsScreen extends StatefulWidget {
   }
 
   @override
-  _DetailsScreenState createState() => _DetailsScreenState();
+  State<DetailsScreen> createState() => _DetailsScreenState();
 }
 
 class _DetailsScreenState extends State<DetailsScreen> with RestorationMixin {

veggieseasons/lib/screens/search.dart

@@ -15,7 +15,7 @@ class SearchScreen extends StatefulWidget {
   final String? restorationId;
 
   @override
-  _SearchScreenState createState() => _SearchScreenState();
+  State<SearchScreen> createState() => _SearchScreenState();
 }
 
 class _SearchScreenState extends State<SearchScreen> with RestorationMixin {
@@ -76,11 +76,14 @@ class _SearchScreenState extends State<SearchScreen> with RestorationMixin {
             // This invisible and otherwise unnecessary search box is used to
             // pad the list entries downward, so none will be underneath the
             // real search box when the list is at its top scroll position.
-            child: _createSearchBox(focus: false),
             visible: false,
             maintainSize: true,
             maintainAnimation: true,
             maintainState: true,
+            // This invisible and otherwise unnecessary search box is used to
+            // pad the list entries downward, so none will be underneath the
+            // real search box when the list is at its top scroll position.
+            child: _createSearchBox(focus: false),
           );
         } else {
           return Padding(

veggieseasons/lib/screens/settings.dart

@@ -166,11 +166,16 @@ class CalorieSettingsScreen extends StatelessWidget {
   }
 }
 
-class SettingsScreen extends StatelessWidget {
+class SettingsScreen extends StatefulWidget {
   const SettingsScreen({this.restorationId, Key? key}) : super(key: key);
 
   final String? restorationId;
 
+  @override
+  State<SettingsScreen> createState() => _SettingsScreenState();
+}
+
+class _SettingsScreenState extends State<SettingsScreen> {
   SettingsItem _buildCaloriesItem(BuildContext context, Preferences prefs) {
     return SettingsItem(
       label: 'Calorie Target',
@@ -237,6 +242,7 @@ class SettingsScreen extends StatelessWidget {
                 child: const Text('Yes'),
                 onPressed: () async {
                   await prefs.restoreDefaults();
+                  if (!mounted) return;
                   Navigator.pop(context);
                 },
               ),
@@ -257,7 +263,7 @@ class SettingsScreen extends StatelessWidget {
     final prefs = Provider.of<Preferences>(context);
 
     return RestorationScope(
-      restorationId: restorationId,
+      restorationId: widget.restorationId,
       child: CupertinoPageScaffold(
         child: Container(
           color:

veggieseasons/lib/widgets/close_button.dart

@@ -47,7 +47,8 @@ class ColorChangingIcon extends ImplicitlyAnimatedWidget {
   final double? size;
 
   @override
-  _ColorChangingIconState createState() => _ColorChangingIconState();
+  AnimatedWidgetBaseState<ColorChangingIcon> createState() =>
+      _ColorChangingIconState();
 }
 
 class _ColorChangingIconState
@@ -81,12 +82,10 @@ class CloseButton extends StatefulWidget {
   final VoidCallback onPressed;
 
   @override
-  CloseButtonState createState() {
-    return CloseButtonState();
-  }
+  State<CloseButton> createState() => _CloseButtonState();
 }
 
-class CloseButtonState extends State<CloseButton> {
+class _CloseButtonState extends State<CloseButton> {
   bool tapInProgress = false;
 
   @override

veggieseasons/lib/widgets/settings_item.dart

@@ -75,10 +75,10 @@ class SettingsItem extends StatefulWidget {
   final SettingsItemCallback? onPress;
 
   @override
-  State<StatefulWidget> createState() => SettingsItemState();
+  State<SettingsItem> createState() => _SettingsItemState();
 }
 
-class SettingsItemState extends State<SettingsItem> {
+class _SettingsItemState extends State<SettingsItem> {
   bool pressed = false;
 
   @override

veggieseasons/lib/widgets/trivia.dart

@@ -13,7 +13,7 @@ class TriviaView extends StatefulWidget {
   const TriviaView({this.id, this.restorationId, Key? key}) : super(key: key);
 
   @override
-  _TriviaViewState createState() => _TriviaViewState();
+  State<TriviaView> createState() => _TriviaViewState();
 }
 
 /// Possible states of the game.

veggieseasons/lib/widgets/veggie_card.dart

@@ -66,7 +66,7 @@ class PressableCard extends StatefulWidget {
   final Duration duration;
 
   @override
-  _PressableCardState createState() => _PressableCardState();
+  State<PressableCard> createState() => _PressableCardState();
 }
 
 class _PressableCardState extends State<PressableCard> {