null-safety support added

version updated to 1.0.0
fisforfaheem · Apr 27, 2021 · f1300f6 · f1300f6
1 parent 5b36c24
commit f1300f6
Show file tree

Hide file tree

Showing 15 changed files with 92 additions and 60 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [1.0.0]
+
+* Null-safety support added
+
 ## [0.1.1]
 
 * Documentation updated

diff --git a/example/lib/compose_validation_container.dart b/example/lib/compose_validation_container.dart
@@ -27,10 +27,10 @@ class _ComposeValidationContainerState
               Validators.maxLength(10, 'Characters cannot be greater than 10'),
             ]),
           ),
-          RaisedButton(
+          ElevatedButton(
             child: Text('Validate compose Field'),
             onPressed: () {
-              formKey.currentState.validate();
+              formKey.currentState?.validate();
             },
           )
         ],

diff --git a/example/lib/email_validation_container.dart b/example/lib/email_validation_container.dart
@@ -22,10 +22,10 @@ class _EmailValidationContainerState extends State<EmailValidationContainer> {
             ),
             validator: Validators.email('Invalid email address'),
           ),
-          RaisedButton(
+          ElevatedButton(
             child: Text('Validate email Field'),
             onPressed: () {
-              formKey.currentState.validate();
+              formKey.currentState?.validate();
             },
           )
         ],

diff --git a/example/lib/max_length_validation_container.dart b/example/lib/max_length_validation_container.dart
@@ -23,10 +23,10 @@ class _MaxLengthValidationContainerState
             ),
             validator: Validators.maxLength(5, 'Characters are greater than 5'),
           ),
-          RaisedButton(
+          ElevatedButton(
             child: Text('Validate Maximum length 5 Field'),
             onPressed: () {
-              formKey.currentState.validate();
+              formKey.currentState?.validate();
             },
           )
         ],

diff --git a/example/lib/max_validation_container.dart b/example/lib/max_validation_container.dart
@@ -25,10 +25,10 @@ class _MaxValidationContainerState extends State<MaxValidationContainer> {
             ),
             validator: Validators.max(5, 'Value greater than 5 not allowed'),
           ),
-          RaisedButton(
+          ElevatedButton(
             child: Text('Validate Maximum 5 Field'),
             onPressed: () {
-              formKey.currentState.validate();
+              formKey.currentState?.validate();
             },
           )
         ],

diff --git a/example/lib/min_length_validation_container.dart b/example/lib/min_length_validation_container.dart
@@ -23,10 +23,10 @@ class _MinLengthValidationContainerState
             ),
             validator: Validators.minLength(5, 'Characters are less than 5'),
           ),
-          RaisedButton(
+          ElevatedButton(
             child: Text('Validate Minimum length 5 Field'),
             onPressed: () {
-              formKey.currentState.validate();
+              formKey.currentState?.validate();
             },
           )
         ],

diff --git a/example/lib/min_validation_container.dart b/example/lib/min_validation_container.dart
@@ -25,10 +25,10 @@ class _MinValidationContainerState extends State<MinValidationContainer> {
             ),
             validator: Validators.min(5, 'Value less than 5 not allowed'),
           ),
-          RaisedButton(
+          ElevatedButton(
             child: Text('Validate Minimum 5 Field'),
             onPressed: () {
-              formKey.currentState.validate();
+              formKey.currentState?.validate();
             },
           )
         ],

diff --git a/example/lib/pattern_validation_container.dart b/example/lib/pattern_validation_container.dart
@@ -24,10 +24,10 @@ class _PatternValidationContainerState
             validator: Validators.patternRegExp(
                 RegExp(r"^[A-Za-z]+$"), 'Only alphabets are allowed'),
           ),
-          RaisedButton(
+          ElevatedButton(
             child: Text('Validate Pattern Field'),
             onPressed: () {
-              formKey.currentState.validate();
+              formKey.currentState?.validate();
             },
           )
         ],

diff --git a/example/lib/required_validation_container.dart b/example/lib/required_validation_container.dart
@@ -23,10 +23,10 @@ class _RequiredValidationContainerState
             ),
             validator: Validators.required('Field is required'),
           ),
-          RaisedButton(
+          ElevatedButton(
             child: Text('Validate Required Field'),
             onPressed: () {
-              formKey.currentState.validate();
+              formKey.currentState?.validate();
             },
           )
         ],

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -7,14 +7,14 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   charcode:
     dependency: transitive
     description:
@@ -59,28 +59,28 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.6"
+    version: "1.1.7"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.2"
+    version: "1.6.4"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0+1"
   quiver:
     dependency: transitive
     description:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.5"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -113,7 +113,7 @@ packages:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   term_glyph:
     dependency: transitive
     description:
@@ -148,6 +148,6 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.1.0"
+    version: "0.1.1"
 sdks:
   dart: ">=2.2.2 <3.0.0"
diff --git a/example/test/widget_test.dart b/example/test/widget_test.dart
@@ -18,8 +18,8 @@ void main() {
     // Verify that platform version is retrieved.
     expect(
       find.byWidgetPredicate(
-        (Widget widget) => widget is Text &&
-                           widget.data.startsWith('Running on:'),
+        (Widget widget) =>
+            widget is Text && widget.data?.startsWith('Running on:') == true,
       ),
       findsOneWidget,
     );

diff --git a/lib/wc_form_validators.dart b/lib/wc_form_validators.dart
@@ -24,6 +24,9 @@ class Validators {
   ///
   static FormFieldValidator<String> required(String errorMessage) {
     return (value) {
+      if (value == null) {
+        value = '';
+      }
       if (value.isEmpty)
         return errorMessage;
       else
@@ -52,6 +55,9 @@ class Validators {
   ///
   static FormFieldValidator<String> min(double min, String errorMessage) {
     return (value) {
+      if (value == null) {
+        value = '';
+      }
       if (value.trim().isEmpty)
         return null;
       else {
@@ -84,6 +90,9 @@ class Validators {
   ///
   static FormFieldValidator<String> max(double max, String errorMessage) {
     return (value) {
+      if (value == null) {
+        value = '';
+      }
       if (value.trim().isEmpty)
         return null;
       else {
@@ -118,6 +127,9 @@ class Validators {
   ///
   static FormFieldValidator<String> email(String errorMessage) {
     return (value) {
+      if (value == null) {
+        value = '';
+      }
       if (value.isEmpty)
         return null;
       else {
@@ -149,6 +161,9 @@ class Validators {
   static FormFieldValidator<String> minLength(
       int minLength, String errorMessage) {
     return (value) {
+      if (value == null) {
+        value = '';
+      }
       if (value.isEmpty) return null;
 
       if (value.length < minLength)
@@ -176,6 +191,9 @@ class Validators {
   static FormFieldValidator<String> maxLength(
       int maxLength, String errorMessage) {
     return (value) {
+      if (value == null) {
+        value = '';
+      }
       if (value.isEmpty) return null;
 
       if (value.length > maxLength)
@@ -229,6 +247,9 @@ class Validators {
   static FormFieldValidator<String> patternRegExp(
       RegExp pattern, String errorMessage) {
     return (value) {
+      if (value == null) {
+        value = '';
+      }
       if (value.isEmpty) return null;
 
       if (pattern.hasMatch(value))