Null safety and convert to dart template

Author: dvorapa

.gitignore

@@ -1,11 +1,10 @@
-# Files and directories created by pub
+# Files and directories created by pub.
 .dart_tool/
 .packages
-# Remove the following pattern if you wish to check in your lock file
-pubspec.lock
 
-# Conventional directory for build outputs
+# Conventional directory for build outputs.
 build/
 
-# Directory created by dartdoc
-doc/api/
+# Omit committing pubspec.lock for library packages; see
+# https://dart.dev/guides/libraries/private-files#pubspeclock.
+pubspec.lock

CHANGELOG.md

@@ -1,51 +1,57 @@
+## 0.8.0
+
+- Null safety and convert to dart template
+
 ## 0.7.2
-* Minor Bootstrap fix
+
+- Minor Bootstrap fix
 
 ## 0.7.1
-* Fixed Bootstrap issues
+
+- Fixed Bootstrap issues
 
 ## 0.7.0
 
-* **New** modal dialog
+- **New** modal dialog
 
 ## 0.6.2
 
-* Bootstrap 4 support
+- Bootstrap 4 support
 
 ## 0.6.1
 
-* Apply Bootstrap css only to dialogs
+- Apply Bootstrap css only to dialogs
 
 ## 0.6.0
 
-* Dart 2 support
+- Dart 2 support
 
 ## 0.5.0
 
-* Resolved issues with Bootstrap
-* Fixed removing dialogs when closed
+- Resolved issues with Bootstrap
+- Fixed removing dialogs when closed
 
 ## 0.4.1
 
-* Fixed enter key bug in prompt
+- Fixed enter key bug in prompt
 
 ## 0.4.0
 
-* Resolved bugged order using dart:async
-* Added onKeyDown listeners for Enter or ESC
+- Resolved bugged order using dart:async
+- Added onKeyDown listeners for Enter or ESC
 
 ## 0.3.0
 
-* Formatted by dartfmt
-* Added screenshots to the description
-* Added a few additional Bootstrap styles
+- Formatted by dartfmt
+- Added screenshots to the description
+- Added a few additional Bootstrap styles
 
 ## 0.2.0
 
-* Reworked to work (but still buggy)
+- Reworked to work (but still buggy)
 
 ## 0.1.0
 
-* **New** alert dialog
-* **New** confirm dialog
-* **New** prompt dialog
+- **New** alert dialog
+- **New** confirm dialog
+- **New** prompt dialog

analysis_options.yaml

@@ -1,49 +1,30 @@
-# Defines a default set of lint rules enforced for
-# projects at Google. For details and rationale,
-# see https://github.com/dart-lang/pedantic#enabled-lints.
-# For lint rules and documentation, see http://dart-lang.github.io/linter/lints.
-linter:
-  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
-    - 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_double_quotes
-    - prefer_spread_collections
-    - recursive_getters
-    - slash_for_doc_comments
-    - type_init_formals
-    - 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
+# This file configures the static analysis results for your project (errors,
+# warnings, and lints).
+#
+# This enables the 'recommended' set of lints from `package:lints`.
+# This set helps identify many issues that may lead to problems when running
+# or consuming Dart code, and enforces writing Dart using a single, idiomatic
+# style and format.
+#
+# If you want a smaller set of lints you can change this to specify
+# 'package:lints/core.yaml'. These are just the most critical lints
+# (the recommended set includes the core lints).
+# The core lints are also what is used by pub.dev for scoring packages.
+
+include: package:lints/recommended.yaml
+
+# Uncomment the following section to specify additional rules.
+
+# linter:
+#   rules:
+#     - camel_case_types
+
+# analyzer:
+#   exclude:
+#     - path/to/excluded/files/**
+
+# For more information about the core and recommended set of lints, see
+# https://dart.dev/go/core-lints
+
+# For additional information about configuring this file, see
+# https://dart.dev/guides/language/analysis-options

example/index.dart renamed to example/example.dart

@@ -2,18 +2,18 @@ import "dart:html";
 import "package:dialog/dialog.dart";
 
 void main() {
-  querySelector("#alertButton").onClick.listen((_) {
+  querySelector("#alertButton")!.onClick.listen((_) {
     alert("Alerted?!");
   });
-  querySelector("#confirmButton").onClick.listen((_) async {
+  querySelector("#confirmButton")!.onClick.listen((_) async {
     var myConfirm = await confirm("Confirmed?!");
     alert(myConfirm.toString());
   });
-  querySelector("#promptButton").onClick.listen((_) async {
+  querySelector("#promptButton")!.onClick.listen((_) async {
     var myPrompt = await prompt("Prompted?!", "Yes!");
     alert(myPrompt.toString());
   });
-  querySelector("#modalButton").onClick.listen((_) async {
+  querySelector("#modalButton")!.onClick.listen((_) async {
     var myModal = await modal(
         "Surprise", [Text("Boo!")], "Eek!", "Huh?", "Haha!", "Come on!", true);
     alert(myModal.toString());

example/index.html

@@ -69,6 +69,6 @@ <H2>dialog.dart</H2>
 
 Do you need to use them all at once? Try to import dialog.dart file only!
 
-<Script Defer Src="index.dart.js"></Script>
+<Script Defer Src="example.dart.js"></Script>
 </Body>
 </Html>

lib/dialogs/alert.dart

@@ -1,7 +1,7 @@
 library dialog.alert;
 
 import "dart:html";
-import "../src/dialog_class.dart";
+import "../src/dialog_base.dart";
 
 void alert([String message = ""]) {
   Dialog alertDialog = Dialog("Alert", [Text(message)]);

lib/dialogs/confirm.dart

@@ -2,7 +2,7 @@ library dialog.confirm;
 
 import "dart:async";
 import "dart:html";
-import "../src/dialog_class.dart";
+import "../src/dialog_base.dart";
 
 Future<dynamic> confirm([String message = ""]) async {
   Completer c = Completer();

lib/dialogs/modal.dart

@@ -2,17 +2,17 @@ library dialog.modal;
 
 import "dart:async";
 import "dart:html";
-import "../src/dialog_class.dart";
+import "../src/dialog_base.dart";
 
 Future<dynamic> modal(
     [String title = "Modal",
     List<Node> content = const [],
-    String successText,
-    String cancelText,
+    String? successText,
+    String? cancelText,
     dynamic onSuccess,
     dynamic onCancel,
-    bool cancellable,
-    Element whatToFocus]) async {
+    bool? cancellable,
+    Element? whatToFocus]) async {
   Completer c = Completer();
 
   Dialog modalDialog =

lib/dialogs/prompt.dart

@@ -2,7 +2,7 @@ library dialog.prompt;
 
 import "dart:async";
 import "dart:html";
-import "../src/dialog_class.dart";
+import "../src/dialog_base.dart";
 
 Future<dynamic> prompt([String message = "", String value = ""]) async {
   Completer c = Completer();

lib/src/dialog_class.dart renamed to lib/src/dialog_base.dart

@@ -1,13 +1,13 @@
-library dialog.src.dialog_class;
+library dialog.src.dialog_base;
 
 import "dart:html";
 
 class Dialog {
   String title;
   List<Node> content;
-  String successText;
-  String cancelText;
-  bool cancellable;
+  String? successText;
+  String? cancelText;
+  bool? cancellable;
   final DivElement dialog = DivElement();
   final DivElement dialogBackdrop = DivElement();
   final ButtonElement xButton = ButtonElement();
@@ -18,13 +18,13 @@ class Dialog {
       [this.cancellable = false,
       this.successText = "OK",
       this.cancelText = "Cancel"]) {
-    if (document.querySelector("body").style.color != "rgb(51, 51, 51)" &&
+    if (document.querySelector("body")!.style.color != "rgb(51, 51, 51)" &&
         querySelectorAll("[href*='packages/dialog/bootstrap.css']").isEmpty) {
       LinkElement link = LinkElement()
         ..href = "packages/dialog/bootstrap.css"
         ..rel = "stylesheet"
         ..type = "text/css";
-      document.querySelector("head").insertAdjacentElement("beforeEnd", link);
+      document.querySelector("head")!.insertAdjacentElement("beforeEnd", link);
     }
 
     dialog
@@ -77,17 +77,17 @@ class Dialog {
   }
 
   void showDialog() {
-    if (document.body.classes.contains("modal-open") == false) {
-      document.body.children.add(dialog);
+    if (document.body!.classes.contains("modal-open") == false) {
+      document.body!.children.add(dialog);
       dialogBackdrop.classes.add("show");
       dialog.classes.add("show");
-      document.body.classes.add("modal-open");
+      document.body!.classes.add("modal-open");
     }
   }
 
   void closeDialog() {
-    if (document.body.classes.contains("modal-open") == true) {
-      document.body
+    if (document.body!.classes.contains("modal-open") == true) {
+      document.body!
         ..children.remove(dialog)
         ..children.remove(dialogBackdrop)
         ..classes.remove("modal-open");