Merge pull request #4 from peterzagoranski/migrate-null-safety

migrating code to null safety

Author: kusarm

example/lib/main.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_router/flutter_router.dart';
+import 'package:flutter_router/flutter_router.dart' as FRouter;
 
 void main() => runApp(MaterialApp(
- onGenerateRoute: Router({
- '/accounts/{id}': (context, match) => Account(match.parameters['id']),
+ onGenerateRoute: FRouter.Router({
+ '/accounts/{id}': (context, match) => Account(match!.parameters['id']!),
  '/': (context, match) => Index(),
  }).get,
 ));

example/pubspec.lock

@@ -1,34 +1,55 @@
 # Generated by pub
-# See https://www.dartlang.org/tools/pub/glossary#lockfile
+# See https://dart.dev/tools/pub/glossary#lockfile
 packages:
  async:
  dependency: transitive
  description:
  name: async
  url: "https://pub.dartlang.org"
  source: hosted
- version: "2.0.8"
+ version: "2.5.0"
  boolean_selector:
  dependency: transitive
  description:
  name: boolean_selector
  url: "https://pub.dartlang.org"
  source: hosted
- version: "1.0.4"
+ version: "2.1.0"
+ characters:
+ dependency: transitive
+ description:
+ name: characters
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "1.1.0"
  charcode:
  dependency: transitive
  description:
  name: charcode
  url: "https://pub.dartlang.org"
  source: hosted
- version: "1.1.2"
+ version: "1.2.0"
+ clock:
+ dependency: transitive
+ description:
+ name: clock
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "1.1.0"
  collection:
  dependency: transitive
  description:
  name: collection
  url: "https://pub.dartlang.org"
  source: hosted
- version: "1.14.11"
+ version: "1.15.0"
+ fake_async:
+ dependency: transitive
+ description:
+ name: fake_async
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "1.2.0"
  flutter:
  dependency: "direct main"
  description: flutter
@@ -52,35 +73,28 @@ packages:
  name: matcher
  url: "https://pub.dartlang.org"
  source: hosted
- version: "0.12.3+1"
+ version: "0.12.10"
  meta:
  dependency: transitive
  description:
  name: meta
  url: "https://pub.dartlang.org"
  source: hosted
- version: "1.1.6"
+ version: "1.3.0"
  path:
  dependency: transitive
  description:
  name: path
  url: "https://pub.dartlang.org"
  source: hosted
- version: "1.6.2"
- pedantic:
- dependency: transitive
- description:
- name: pedantic
- url: "https://pub.dartlang.org"
- source: hosted
- version: "1.4.0"
+ version: "1.8.0"
  quiver:
  dependency: transitive
  description:
  name: quiver
  url: "https://pub.dartlang.org"
  source: hosted
- version: "2.0.1"
+ version: "3.0.1"
  sky_engine:
  dependency: transitive
  description: flutter
@@ -92,69 +106,62 @@ packages:
  name: source_span
  url: "https://pub.dartlang.org"
  source: hosted
- version: "1.5.3"
+ version: "1.8.0"
  stack_trace:
  dependency: transitive
  description:
  name: stack_trace
  url: "https://pub.dartlang.org"
  source: hosted
- version: "1.9.3"
+ version: "1.10.0"
  stream_channel:
  dependency: transitive
  description:
  name: stream_channel
  url: "https://pub.dartlang.org"
  source: hosted
- version: "1.6.8"
+ version: "2.1.0"
  string_scanner:
  dependency: transitive
  description:
  name: string_scanner
  url: "https://pub.dartlang.org"
  source: hosted
- version: "1.0.4"
+ version: "1.1.0"
  term_glyph:
  dependency: transitive
  description:
  name: term_glyph
  url: "https://pub.dartlang.org"
  source: hosted
- version: "1.1.0"
+ version: "1.2.0"
  test_api:
  dependency: transitive
  description:
  name: test_api
  url: "https://pub.dartlang.org"
  source: hosted
- version: "0.2.2"
+ version: "0.2.19"
  typed_data:
  dependency: transitive
  description:
  name: typed_data
  url: "https://pub.dartlang.org"
  source: hosted
- version: "1.1.6"
+ version: "1.3.0"
  uri:
  dependency: transitive
  description:
  name: uri
  url: "https://pub.dartlang.org"
  source: hosted
- version: "0.11.3+1"
- utf:
- dependency: transitive
- description:
- name: utf
- url: "https://pub.dartlang.org"
- source: hosted
- version: "0.9.0+5"
+ version: "1.0.0"
  vector_math:
  dependency: transitive
  description:
  name: vector_math
  url: "https://pub.dartlang.org"
  source: hosted
- version: "2.0.8"
+ version: "2.1.0"
 sdks:
- dart: ">=2.1.0 <3.0.0"
+ dart: ">=2.12.0 <3.0.0"

example/pubspec.yaml

@@ -6,7 +6,7 @@ authors:
 homepage: https://github.com/peterzagoranski/flutter_router
 
 environment:
- sdk: ">=2.0.0-dev.68.0 <3.0.0"
+ sdk: '>=2.12.0 <3.0.0'
 
 dependencies:
  flutter:

lib/flutter_router.dart

@@ -4,44 +4,44 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:uri/uri.dart';
 
-typedef Widget RouterBuilder(BuildContext context, UriMatch match);
+typedef Widget RouterBuilder(BuildContext context, UriMatch? match);
 
 class Router extends _Router {
- Router(final Map<String, RouterBuilder> definitions) : super(definitions, page: <Null>(settings, builder) => new MaterialPageRoute<Null>(builder: builder, settings: settings));
+ Router(final Map<String, RouterBuilder> definitions) : super(definitions, page: (<Null>(settings, builder) => new MaterialPageRoute<Null>(builder: builder, settings: settings)));
 }
 
 class CupertinoRouter extends _Router {
- CupertinoRouter(final Map<String, RouterBuilder> definitions) : super(definitions, page: <Null>(settings, builder) => new CupertinoPageRoute<Null>(settings: settings, builder: builder));
+ CupertinoRouter(final Map<String, RouterBuilder> definitions) : super(definitions, page: (<Null>(settings, builder) => new CupertinoPageRoute<Null>(settings: settings, builder: builder)));
 }
 
 abstract class _Router {
 
- _Router(final Map<String, RouterBuilder> definitions, { this.page }) : assert(null != definitions), assert(null != page), this.definitions = definitions;
+ _Router(final Map<String, RouterBuilder> definitions, { required this.page }) : this.definitions = definitions;
 
- Route<dynamic> get(final RouteSettings settings) {
- final matches = this.definitions.keys.where((route) => UriParser(UriTemplate(route)).matches(Uri.parse(settings.name)));
- final route = null != matches && matches.length > 0 ? matches.first : null;
+ Route<dynamic>? get(final RouteSettings settings) {
+ final matches = this.definitions.keys.where((route) => UriParser(UriTemplate(route)).matches(Uri.parse(settings.name!)));
+ final route = matches.length > 0 ? matches.first : null;
 
- return null != route ? this.page(settings, (context)=> this.definitions[route](context, UriParser(UriTemplate(route)).match(Uri.parse(settings.name)))) : null;
+ return null != route ? this.page(settings, (context)=> this.definitions[route]!(context, UriParser(UriTemplate(route)).match(Uri.parse(settings.name!)))) : null;
  }
 
  final Map<String, RouterBuilder> definitions;
  final PageRouteFactory page;
 }
 
 class Navigators extends _Navigators {
- Navigators(final List<Navigator> navigators) : super(navigators, page: <Null>(settings, builder) => MaterialPageRoute<Null>(settings: settings, builder: builder));
+ Navigators(final List<Navigator> navigators) : super(navigators, page: (<Null>(settings, builder) => MaterialPageRoute<Null>(settings: settings, builder: builder)));
 }
 
 abstract class _Navigators {
- _Navigators(this.navigators, { this.page }) : assert(null != navigators || null != page);
+ _Navigators(this.navigators, { this.page }) : assert( null != page);
 
- Route<dynamic> get(final RouteSettings settings) {
- final matches = this.navigators.where((navigator) => navigator.initialRoute.startsWith(settings.name));
+ Route<dynamic>? get(final RouteSettings settings) {
+ final matches = this.navigators.where((navigator) => navigator.initialRoute!.startsWith(settings.name!));
 
- return null != matches && matches.length > 0 ? this.page(settings, (context) => matches.first) : null;
+ return matches.length > 0 ? this.page!(settings, (context) => matches.first) : null;
  }
 
  final List<Navigator> navigators;
- final PageRouteFactory page;
+ final PageRouteFactory? page;
 }