@@ -7,7 +7,6 @@
 <a href="https://codecov.io/gh/slovnicki/beamer">
 <img src="https://codecov.io/gh/slovnicki/beamer/branch/master/graph/badge.svg?token=TO09CQU09C"/>
 </a>
-<a href="https://github.com/google/pedantic"><img src="https://dart-lang.github.io/linter/lints/style-pedantic.svg" alt="style"></a>
 </p>
 
 <p align="center">
 
@@ -7,7 +7,6 @@
 <a href="https://codecov.io/gh/slovnicki/beamer">
 <img src="https://codecov.io/gh/slovnicki/beamer/branch/master/graph/badge.svg?token=TO09CQU09C"/>
 </a>
-<a href="https://github.com/google/pedantic"><img src="https://dart-lang.github.io/linter/lints/style-pedantic.svg" alt="style"></a>
 </p>
 
 <p align="center">
 
@@ -1,56 +1,28 @@
-# Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
-# 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.
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
 #
-# Google internally enforced rules. See README.md for more information,
-# including a list of lints that are intentionally _not_ enforced.
-#
-# https://github.com/google/pedantic
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
 
 linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at
+  # https://dart-lang.github.io/linter/lints/index.html.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
   rules:
-    - always_declare_return_types
-    - always_require_non_null_named_parameters
-    - annotate_overrides
-    - avoid_empty_else
-    - avoid_init_to_null
-    - avoid_null_checks_in_equality_operators
-    - avoid_relative_lib_imports
-    - avoid_return_types_on_setters
-    - avoid_shadowing_type_parameters
-    - avoid_types_as_parameter_names
-    - camel_case_extensions
-    - curly_braces_in_flow_control_structures
-    - empty_catches
-    - empty_constructor_bodies
-    - library_names
-    - library_prefixes
-    - no_duplicate_case_values
-    - null_closures
-    #- omit_local_variable_types
-    - prefer_adjacent_string_concatenation
-    - prefer_collection_literals
-    - prefer_conditional_assignment
-    - prefer_contains
-    - prefer_equal_for_default_values
-    - prefer_final_fields
-    - prefer_for_elements_to_map_fromIterable
-    - prefer_generic_function_type_aliases
-    - prefer_if_null_operators
-    - prefer_is_empty
-    - prefer_is_not_empty
-    - prefer_iterable_whereType
-    - prefer_single_quotes
-    - prefer_spread_collections
-    - recursive_getters
-    - slash_for_doc_comments
-    - type_init_formals
-    - unawaited_futures
-    - unnecessary_const
-    - unnecessary_new
-    - unnecessary_null_in_if_null_operators
-    - unnecessary_this
-    - unrelated_type_equality_checks
-    - use_function_type_syntax_for_parameters
-    - use_rethrow_when_possible
-    - valid_regexps
+    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options
@@ -22,28 +22,32 @@ const List<Map<String, String>> books = [
 
 // SCREENS
 class HomeScreen extends StatelessWidget {
+  const HomeScreen({Key? key}) : super(key: key);
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text('Home Screen'),
+        title: const Text('Home Screen'),
       ),
       body: Center(
         child: ElevatedButton(
           onPressed: () => context.beamToNamed('/books'),
-          child: Text('See books'),
+          child: const Text('See books'),
         ),
       ),
     );
   }
 }
 
 class BooksScreen extends StatelessWidget {
+  const BooksScreen({Key? key}) : super(key: key);
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text('Books'),
+        title: const Text('Books'),
       ),
       body: ListView(
         children: books
@@ -61,7 +65,9 @@ class BooksScreen extends StatelessWidget {
 }
 
 class BookDetailsScreen extends StatelessWidget {
-  const BookDetailsScreen(this.bookDetails);
+  const BookDetailsScreen({Key? key, required this.bookDetails})
+      : super(key: key);
+
   final Map<String, String> bookDetails;
 
   @override
@@ -87,20 +93,20 @@ class BooksLocation extends BeamLocation {
 
   @override
   List<BeamPage> buildPages(BuildContext context, BeamState state) => [
-        BeamPage(
+        const BeamPage(
           key: ValueKey('home'),
           child: HomeScreen(),
         ),
         if (state.uri.pathSegments.contains('books'))
-          BeamPage(
+          const BeamPage(
             key: ValueKey('books'),
             child: BooksScreen(),
           ),
         if (state.pathParameters.containsKey('bookId'))
           BeamPage(
             key: ValueKey('book-${state.pathParameters['bookId']}'),
             child: BookDetailsScreen(
-              books.firstWhere(
+              bookDetails: books.firstWhere(
                   (book) => book['id'] == state.pathParameters['bookId']!),
             ),
           ),
@@ -109,6 +115,8 @@ class BooksLocation extends BeamLocation {
 
 // APP
 class MyApp extends StatelessWidget {
+  MyApp({Key? key}) : super(key: key);
+
   final routerDelegate = BeamerDelegate(
     locationBuilder: (state) => BooksLocation(state),
   );
 
@@ -17,6 +17,7 @@ dependencies:
   cupertino_icons: ^1.0.2
 
 dev_dependencies:
+  flutter_lints: ^1.0.4
   flutter_test:
     sdk: flutter
 
 
@@ -10,7 +10,7 @@ import './beam_page.dart';
 /// If neither [beamTo], [beamToNamed] nor [showPage] is specified,
 /// the guard will just block navigation, i.e. nothing will happen.
 class BeamGuard {
-  BeamGuard({
+  const BeamGuard({
     required this.pathBlueprints,
     required this.check,
     this.onCheckFailed,
@@ -38,39 +38,40 @@ class BeamGuard {
   /// For example, `RegExp('/books/')` will match '/books/1', '/books/2/genres', etc.
   /// but will not match '/books'. To match '/books' and everything after it,
   /// use `RegExp('/books')`
-  List<dynamic> pathBlueprints;
+  final List<dynamic> pathBlueprints;
 
   /// What check should be performed on a given [location],
   /// the one to which beaming has been requested.
   ///
   /// [context] is also injected to fetch data up the tree if necessary.
-  bool Function(BuildContext context, BeamLocation location) check;
+  final bool Function(BuildContext context, BeamLocation location) check;
 
   /// Arbitrary closure to execute when [check] fails.
   ///
   /// This will run before and regardless of [beamTo], [beamToNamed], [showPage].
-  void Function(BuildContext context, BeamLocation location)? onCheckFailed;
+  final void Function(BuildContext context, BeamLocation location)?
+      onCheckFailed;
 
   /// If guard [check] returns `false`, build a [BeamLocation] to be beamed to.
   ///
   /// [showPage] has precedence over this attribute.
-  BeamLocation Function(BuildContext context)? beamTo;
+  final BeamLocation Function(BuildContext context)? beamTo;
 
   /// If guard [check] returns `false`, beam to this URI string.
   ///
   /// [showPage] has precedence over this attribute.
-  String? beamToNamed;
+  final String? beamToNamed;
 
   /// If guard [check] returns `false`, put this page onto navigation stack.
   ///
   /// This has precedence over [beamTo] and [beamToNamed].
-  BeamPage? showPage;
+  final BeamPage? showPage;
 
   /// Whether to [check] all the path blueprints defined in [pathBlueprints]
   /// or [check] all the paths that **are not** in [pathBlueprints].
   ///
   /// `false` meaning former and `true` meaning latter.
-  bool guardNonMatching;
+  final bool guardNonMatching;
 
   /// Whether or not to replace the current [BeamLocation]'s stack of pages.
   final bool replaceCurrentStack;
 
@@ -17,7 +17,7 @@ enum BeamPageType {
 
 /// A wrapper for screens in a navigation stack.
 class BeamPage extends Page {
-  BeamPage({
+  const BeamPage({
     LocalKey? key,
     String? name,
     required this.child,
@@ -148,7 +148,7 @@ class BeamPage extends Page {
           pageBuilder: (_, __, ___) => child,
           transitionsBuilder: (_, animation, __, child) => SlideTransition(
             position: animation.drive(
-                Tween(begin: Offset(0, 1), end: Offset(0, 0))
+                Tween(begin: const Offset(0, 1), end: const Offset(0, 0))
                     .chain(CurveTween(curve: Curves.ease))),
             child: child,
           ),
 
@@ -11,7 +11,7 @@ import 'path_url_strategy_nonweb.dart'
 
 /// A wrapper for [Router].
 class Beamer extends StatefulWidget {
-  Beamer({
+  const Beamer({
     Key? key,
     required this.routerDelegate,
     this.createBackButtonDispatcher = true,
 
@@ -31,9 +31,9 @@ class BeamerDelegate<T extends BeamState> extends RouterDelegate<BeamState>
     this.updateFromParent = true,
     this.updateParent = true,
   }) {
-    notFoundPage ??= BeamPage(
+    notFoundPage ??= const BeamPage(
       title: 'Not found',
-      child: Container(child: Center(child: Text('Not found'))),
+      child: Scaffold(body: Center(child: Text('Not found'))),
     );
 
     createState ??= (BeamState state) => BeamState.fromUri(
@@ -553,7 +553,7 @@ class BeamerDelegate<T extends BeamState> extends RouterDelegate<BeamState>
       if (notFoundRedirect == null && notFoundRedirectNamed == null) {
         // do nothing, pass on NotFound
       } else {
-        var redirectBeamLocation;
+        late BeamLocation redirectBeamLocation;
         if (notFoundRedirect != null) {
           redirectBeamLocation = notFoundRedirect!;
         } else if (notFoundRedirectNamed != null) {
@@ -646,20 +646,20 @@ class BeamerDelegate<T extends BeamState> extends RouterDelegate<BeamState>
   }
 
   @override
-  SynchronousFuture<void> setInitialRoutePath(BeamState beamState) {
+  SynchronousFuture<void> setInitialRoutePath(BeamState configuration) {
     if (_currentBeamLocation is! EmptyBeamLocation) {
-      beamState = _currentBeamLocation.state;
-    } else if (beamState.uri.path == '/') {
-      beamState = BeamState.fromUri(
-        Uri(path: initialPath, queryParameters: beamState.queryParameters),
+      configuration = _currentBeamLocation.state;
+    } else if (configuration.uri.path == '/') {
+      configuration = BeamState.fromUri(
+        Uri(path: initialPath, queryParameters: configuration.queryParameters),
       );
     }
-    return setNewRoutePath(beamState);
+    return setNewRoutePath(configuration);
   }
 
   @override
-  SynchronousFuture<void> setNewRoutePath(BeamState beamState) {
-    update(state: createState!(beamState));
+  SynchronousFuture<void> setNewRoutePath(BeamState configuration) {
+    update(state: createState!(configuration));
     return SynchronousFuture(null);
   }
 
@@ -698,7 +698,7 @@ class BeamerDelegate<T extends BeamState> extends RouterDelegate<BeamState>
       return;
     }
 
-    var redirectLocation;
+    late BeamLocation redirectLocation;
 
     if (guard.beamTo == null && guard.beamToNamed == null) {
       final lastState = removeLastBeamState();
 
@@ -9,7 +9,7 @@ typedef LocationBuilder = BeamLocation Function(BeamState);
 ///
 /// Determines the appropriate [BeamLocation] from the list
 /// and populates it with configured state.
-class BeamerLocationBuilder implements Function {
+class BeamerLocationBuilder {
   BeamerLocationBuilder({required this.beamLocations});
 
   /// List of all [BeamLocation]s that this builder handles.
@@ -24,7 +24,7 @@ class BeamerLocationBuilder implements Function {
 ///
 /// Creates a single [BeamLocation]; [SimpleBeamLocation]
 /// and configures its [BeamLocation.buildPages] with appropriate [routes].
-class SimpleLocationBuilder implements Function {
+class SimpleLocationBuilder {
   SimpleLocationBuilder({required this.routes, this.builder});
 
   /// List of all routes this builder handles.