Null-safety in Example

Author: danvick

example/lib/code_page.dart

@@ -1,16 +1,16 @@
 import 'package:flutter/material.dart';
-import 'package:widget_with_codeview/widget_with_codeview.dart';
+// import 'package:widget_with_codeview/widget_with_codeview.dart';
 
 class CodePage extends StatefulWidget {
  final String title;
  final Widget child;
  final String sourceFilePath;
 
  const CodePage({
- Key key,
- @required this.title,
- @required this.child,
- @required this.sourceFilePath,
+ Key? key,
+ required this.title,
+ required this.child,
+ required this.sourceFilePath,
  }) : super(key: key);
 
  @override
@@ -25,13 +25,15 @@ class _CodePageState extends State<CodePage> {
  title: Text(widget.title),
  elevation: 0,
  ),
- body: WidgetWithCodeView(
+ /*body: WidgetWithCodeView(
  child: widget.child,
  sourceFilePath: widget.sourceFilePath,
  // 1codeLinkPrefix` is optional. When it's specified, two more buttons
  // (open-code-in-browser, copy-code-link) will be added in the code view.
  // codeLinkPrefix: 'https://github.com/danvick/flutter_form_builder/blob/version_4/example/',
- ),
+ ),*/
+ body: widget.child,
  );
  }
 }
+

example/lib/home_page.dart

@@ -18,7 +18,7 @@ class HomePage extends StatelessWidget {
  title: const Text('Complete Form'),
  trailing: const Icon(CupertinoIcons.right_chevron),
  onTap: () {
- return Navigator.of(context).push(
+ Navigator.of(context).push(
  MaterialPageRoute(
  builder: (context) {
  return CodePage(
@@ -36,14 +36,15 @@ class HomePage extends StatelessWidget {
  title: const Text('Signup Form'),
  trailing: const Icon(CupertinoIcons.right_chevron),
  onTap: () {
- return Navigator.of(context).push(
+ Navigator.of(context).push(
  MaterialPageRoute(
  builder: (context) {
  return CodePage(
  title: 'Signup Form',
  child: SignupForm(),
  sourceFilePath: 'lib/sources/signup_form.dart',
  );
+ return SignupForm();
  },
  ),
  );

example/lib/sources/complete_form.dart

@@ -117,7 +117,7 @@ class CompleteFormState extends State<CompleteForm> {
  onChanged: (val) {
  setState(() {
  _ageHasError =
- !_formKey.currentState.fields['age'].validate();
+ !(_formKey.currentState?.fields['age']?.validate() ?? false);
  });
  },
  // valueTransformer: (text) => num.tryParse(text),
@@ -154,7 +154,7 @@ class CompleteFormState extends State<CompleteForm> {
  print(val);
  setState(() {
  _genderHasError =
- !_formKey.currentState.fields['gender'].validate();
+ !(_formKey.currentState?.fields['gender']?.validate() ?? false);
  });
  },
  ),
@@ -231,10 +231,10 @@ class CompleteFormState extends State<CompleteForm> {
  style: TextStyle(color: Colors.white),
  ),
  onPressed: () {
- if (_formKey.currentState.saveAndValidate()) {
- print(_formKey.currentState.value);
+ if (_formKey.currentState?.saveAndValidate() ?? false) {
+ print(_formKey.currentState?.value);
  } else {
- print(_formKey.currentState.value);
+ print(_formKey.currentState?.value);
  print('validation failed');
  }
  },
@@ -249,7 +249,7 @@ class CompleteFormState extends State<CompleteForm> {
  style: TextStyle(color: Theme.of(context).accentColor),
  ),
  onPressed: () {
- _formKey.currentState.reset();
+ _formKey.currentState?.reset();
  },
  ),
  ),

example/lib/sources/signup_form.dart

@@ -54,8 +54,8 @@ class _SignupFormState extends State<SignupForm> {
  decoration: InputDecoration(
  labelText: 'Confirm Password',
  suffixIcon: (_formKey.currentState != null &&
- !_formKey.currentState.fields['confirm_password']
- .isValid)
+ !(_formKey.currentState?.fields['confirm_password']
+ ?.isValid ?? false))
  ? const Icon(Icons.error, color: Colors.red)
  : const Icon(Icons.check, color: Colors.green),
  ),
@@ -68,7 +68,7 @@ class _SignupFormState extends State<SignupForm> {
  : null),*/
  (val) {
  if (val !=
- _formKey.currentState.fields['password'].value) {
+ _formKey.currentState?.fields['password']?.value) {
  return 'Passwords do not match';
  }
  return null;
@@ -84,7 +84,7 @@ class _SignupFormState extends State<SignupForm> {
  ]),
  // initialValue: true,
  decoration: InputDecoration(labelText: 'Accept Terms?'),
- builder: (FormFieldState<bool> field) {
+ builder: (FormFieldState<bool?> field) {
  return InputDecorator(
  decoration: InputDecoration(
  errorText: field.errorText,
@@ -108,12 +108,12 @@ class _SignupFormState extends State<SignupForm> {
  style: TextStyle(color: Colors.white),
  ),
  onPressed: () {
- if (_formKey.currentState.saveAndValidate()) {
+ if (_formKey.currentState?.saveAndValidate() ?? false) {
  print('Valid');
  } else {
  print('Invalid');
  }
- print(_formKey.currentState.value);
+ print(_formKey.currentState?.value);
  },
  )
  ],

example/pubspec.yaml

@@ -11,7 +11,7 @@ dependencies:
  sdk: flutter
  flutter_form_builder:
  path: ../
- widget_with_codeview: ^1.0.3
+ # widget_with_codeview: ^1.0.5
  cupertino_icons: any
 
 dependency_overrides: