Beta (#1234)

experimental/web_dashboard/lib/src/app.dart

@@ -51,7 +51,7 @@ class DashboardApp extends StatefulWidget {
         super(key: key);
 
   @override
-  _DashboardAppState createState() => _DashboardAppState();
+  State<DashboardApp> createState() => _DashboardAppState();
 }
 
 class _DashboardAppState extends State<DashboardApp> {
@@ -90,7 +90,7 @@ class SignInSwitcher extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _SignInSwitcherState createState() => _SignInSwitcherState();
+  State<SignInSwitcher> createState() => _SignInSwitcherState();
 }
 
 class _SignInSwitcherState extends State<SignInSwitcher> {

experimental/web_dashboard/lib/src/pages/entries.dart

@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'dart:async';
-
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart' as intl;
 import 'package:provider/provider.dart';
@@ -17,7 +15,7 @@ class EntriesPage extends StatefulWidget {
   const EntriesPage({Key? key}) : super(key: key);
 
   @override
-  _EntriesPageState createState() => _EntriesPageState();
+  State<EntriesPage> createState() => _EntriesPageState();
 }
 
 class _EntriesPageState extends State<EntriesPage> {
@@ -54,7 +52,7 @@ class EntriesList extends StatefulWidget {
   }) : super(key: ValueKey(category?.id));
 
   @override
-  _EntriesListState createState() => _EntriesListState();
+  State<EntriesList> createState() => _EntriesListState();
 }
 
 class _EntriesListState extends State<EntriesList> {
@@ -129,7 +127,9 @@ class EntryTile extends StatelessWidget {
           TextButton(
             child: const Text('Delete'),
             onPressed: () async {
-              var shouldDelete = await (showDialog<bool>(
+              final appState = Provider.of<AppState>(context, listen: false);
+              final scaffoldMessenger = ScaffoldMessenger.of(context);
+              final bool? shouldDelete = await showDialog<bool>(
                 context: context,
                 builder: (context) => AlertDialog(
                   title: const Text('Delete entry?'),
@@ -144,14 +144,10 @@ class EntryTile extends StatelessWidget {
                     ),
                   ],
                 ),
-              ) as FutureOr<bool>);
-              if (shouldDelete) {
-                await Provider.of<AppState>(context, listen: false)
-                    .api!
-                    .entries
-                    .delete(category!.id!, entry!.id!);
-
-                ScaffoldMessenger.of(context).showSnackBar(
+              );
+              if (shouldDelete != null && shouldDelete) {
+                await appState.api!.entries.delete(category!.id!, entry!.id!);
+                scaffoldMessenger.showSnackBar(
                   const SnackBar(
                     content: Text('Entry deleted'),
                   ),

experimental/web_dashboard/lib/src/pages/home.dart

@@ -20,7 +20,7 @@ class HomePage extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _HomePageState createState() => _HomePageState();
+  State<HomePage> createState() => _HomePageState();
 }
 
 class _HomePageState extends State<HomePage> {

experimental/web_dashboard/lib/src/pages/sign_in.dart

@@ -37,7 +37,7 @@ class SignInButton extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _SignInButtonState createState() => _SignInButtonState();
+  State<SignInButton> createState() => _SignInButtonState();
 }
 
 class _SignInButtonState extends State<SignInButton> {

experimental/web_dashboard/lib/src/widgets/categories_dropdown.dart

@@ -20,7 +20,7 @@ class CategoryDropdown extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _CategoryDropdownState createState() => _CategoryDropdownState();
+  State<CategoryDropdown> createState() => _CategoryDropdownState();
 }
 
 class _CategoryDropdownState extends State<CategoryDropdown> {
@@ -105,6 +105,6 @@ class _CategoryDropdownState extends State<CategoryDropdown> {
 
   DropdownMenuItem<Category> _buildDropdownItem(Category category) {
     return DropdownMenuItem<Category>(
-        child: Text(category.name), value: category);
+        value: category, child: Text(category.name));
   }
 }

experimental/web_dashboard/lib/src/widgets/category_forms.dart

@@ -11,7 +11,7 @@ class NewCategoryForm extends StatefulWidget {
   const NewCategoryForm({Key? key}) : super(key: key);
 
   @override
-  _NewCategoryFormState createState() => _NewCategoryFormState();
+  State<NewCategoryForm> createState() => _NewCategoryFormState();
 }
 
 class _NewCategoryFormState extends State<NewCategoryForm> {
@@ -43,7 +43,7 @@ class EditCategoryForm extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _EditCategoryFormState createState() => _EditCategoryFormState();
+  State<EditCategoryForm> createState() => _EditCategoryFormState();
 }
 
 class _EditCategoryFormState extends State<EditCategoryForm> {

experimental/web_dashboard/lib/src/widgets/dialogs.dart

@@ -57,7 +57,7 @@ class NewEntryDialog extends StatefulWidget {
   const NewEntryDialog({Key? key}) : super(key: key);
 
   @override
-  _NewEntryDialogState createState() => _NewEntryDialogState();
+  State<NewEntryDialog> createState() => _NewEntryDialogState();
 }
 
 class _NewEntryDialogState extends State<NewEntryDialog> {

experimental/web_dashboard/lib/src/widgets/edit_entry.dart

@@ -14,7 +14,7 @@ class NewEntryForm extends StatefulWidget {
   const NewEntryForm({Key? key}) : super(key: key);
 
   @override
-  _NewEntryFormState createState() => _NewEntryFormState();
+  State<NewEntryForm> createState() => _NewEntryFormState();
 }
 
 class _NewEntryFormState extends State<NewEntryForm> {
@@ -65,7 +65,7 @@ class EditEntryForm extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _EditEntryFormState createState() => _EditEntryFormState();
+  State<EditEntryForm> createState() => _EditEntryFormState();
 }
 
 class _EditEntryFormState extends State<EditEntryForm> {

experimental/web_dashboard/lib/src/widgets/third_party/adaptive_scaffold.dart

@@ -47,7 +47,7 @@ class AdaptiveScaffold extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _AdaptiveScaffoldState createState() => _AdaptiveScaffoldState();
+  State<AdaptiveScaffold> createState() => _AdaptiveScaffoldState();
 }
 
 class _AdaptiveScaffoldState extends State<AdaptiveScaffold> {

experimental/web_dashboard/pubspec.lock

@@ -91,7 +91,7 @@ packages:
       name: built_value
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "8.2.3"
+    version: "8.3.0"
   characters:
     dependency: transitive
     description:
@@ -170,7 +170,7 @@ packages:
     source: hosted
     version: "4.1.0"
   collection:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: collection
       url: "https://pub.dartlang.org"
@@ -278,7 +278,7 @@ packages:
       name: flutter_lints
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "2.0.1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -367,7 +367,7 @@ packages:
     source: hosted
     version: "4.0.0"
   intl:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: intl
       url: "https://pub.dartlang.org"
@@ -407,7 +407,7 @@ packages:
       name: lints
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "2.0.0"
   logging:
     dependency: transitive
     description:
@@ -458,7 +458,7 @@ packages:
     source: hosted
     version: "2.0.2"
   path:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: path
       url: "https://pub.dartlang.org"
@@ -638,5 +638,5 @@ packages:
     source: hosted
     version: "3.1.0"
 sdks:
-  dart: ">=2.16.0 <3.0.0"
+  dart: ">=2.17.0-206.0.dev <3.0.0"
   flutter: ">=2.8.0"

experimental/web_dashboard/pubspec.yaml

@@ -2,26 +2,32 @@ name: web_dashboard
 description: A dashboard app sample
 version: 1.0.0+1
 publish_to: none
+
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: ">=2.17.0-0 <3.0.0"
+
 dependencies:
-  flutter:
-    sdk: flutter
+  charts_flutter: ^0.12.0
   cloud_firestore: ^3.1.14
+  collection: ^1.16.0
   cupertino_icons: ^1.0.0
   firebase_auth: ^3.3.17
   firebase_core: ^1.16.0
+  flutter:
+    sdk: flutter
   google_sign_in: ^5.3.1
+  intl: ^0.17.0
   json_annotation: ^4.5.0
+  path: ^1.8.1
   provider: ^6.0.0
   uuid: ^3.0.0
-  charts_flutter: ^0.12.0
+
 dev_dependencies:
+  build_runner: ^2.1.0
+  flutter_lints: ^2.0.1
   flutter_test:
     sdk: flutter
-  build_runner: ^2.1.0
-  json_serializable: ^6.2.0
   grinder: ^0.9.0
-  flutter_lints: ^1.0.0
+  json_serializable: ^6.2.0
 flutter:
   uses-material-design: true

experimental/web_dashboard/tool/grind.dart

@@ -82,7 +82,7 @@ Future copyright() async {
 Future fixCopyright() async {
   await for (var file in _filesWithoutCopyright()) {
     var contents = await file.readAsString();
-    await file.writeAsString(_copyright + '\n\n' + contents);
+    await file.writeAsString('$_copyright\n\n$contents');
   }
 }
 
@@ -99,7 +99,7 @@ Stream<File> _filesWithoutCopyright() async* {
         .take(3)
         .fold<String>('', (previous, element) {
       if (previous == '') return element;
-      return previous + '\n' + element;
+      return '$previous\n$element';
     });
 
     if (firstThreeLines != _copyright) {