Revert plant_forms to previous implementation w/ minimal changes required to support nbbd

 - planning on refactoring this from scratch in the future
Add windows platform support for easier testing

Author: esDotDev

vignettes/plant_forms/.metadata

@@ -15,7 +15,7 @@ migration:
     - platform: root
       create_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
       base_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
-    - platform: android
+    - platform: windows
       create_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
       base_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
 

vignettes/plant_forms/lib/components/section_separator.dart

@@ -4,9 +4,11 @@ import '../styles.dart';
 
 class Separator extends StatelessWidget {
   @override
-  Widget build(BuildContext context) => Container(
-        margin: EdgeInsets.symmetric(vertical: 24.0),
-        color: Styles.lightGrayColor,
-        height: 1,
-      );
+  Widget build(BuildContext context) {
+    return Container(
+      margin: EdgeInsets.symmetric(vertical: 24.0),
+      color: Styles.lightGrayColor,
+      height: 1,
+    );
+  }
 }

vignettes/plant_forms/lib/components/section_title.dart

@@ -9,8 +9,10 @@ class FormSectionTitle extends StatelessWidget {
   const FormSectionTitle(this.title, {this.padding = const EdgeInsets.all(0), Key? key}) : super(key: key);
 
   @override
-  Widget build(BuildContext context) => Padding(
-        padding: const EdgeInsets.only(bottom: 10.0).add(padding),
-        child: Text(title.toUpperCase(), style: Styles.formSection),
-      );
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 10.0).add(padding),
+      child: Text(title.toUpperCase(), style: Styles.formSection),
+    );
+  }
 }

vignettes/plant_forms/lib/components/submit_button.dart

@@ -5,7 +5,7 @@ import '../styles.dart';
 class SubmitButton extends StatelessWidget {
   final double percentage;
   final Widget child;
-  final VoidCallback? onPressed;
+  final void Function()? onPressed;
   final bool isErrorVisible;
   final EdgeInsets padding;
 

vignettes/plant_forms/lib/demo.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
+import 'package:plant_forms/form_pages/plant_form_payment.dart';
 import 'package:provider/provider.dart';
 
 import 'components/header.dart';
 import 'components/stack_pages_route.dart';
-import 'plant_form_summary.dart';
 
 class PlantFormsDemo extends StatefulWidget {
   @override
@@ -35,7 +35,11 @@ class _PlantFormsDemoState extends State<PlantFormsDemo> {
             child: Navigator(
               key: navKey,
               onGenerateRoute: (route) {
-                return StackPagesRoute(previousPages: [], enterPage: PlantFormSummary());
+                return StackPagesRoute(
+                  previousPages: [],
+                  //enterPage: PlantFormSummary(),
+                  enterPage: PlantFormPayment(),
+                );
               },
             ),
           ),
@@ -45,10 +49,8 @@ class _PlantFormsDemoState extends State<PlantFormsDemo> {
   }
 
   Future<bool> _handleBackPop() async {
-    if (navKey.currentState?.canPop() ?? false) {
-      //If the pop worked, return false, preventing any pops in the MaterialApp's navigator
+    if (navKey.currentState?.canPop() == true) {
       navKey.currentState?.pop();
-      return false;
     }
     return true;
   }

vignettes/plant_forms/lib/demo_data.dart

@@ -1,4 +1,3 @@
-
 class FormKeys {
   static String instructions = "instructions";
   static String firstName = "first_name";
@@ -137,7 +136,7 @@ class CountryData {
     'Wyoming'
   ];
 
-  static String getSubdivisionTitle(String country) {
+  static String getSubdivisionTitle(String? country) {
     String subdivision = '';
     switch (country) {
       case 'Canada':
@@ -171,5 +170,7 @@ class CountryData {
 }
 
 enum InputType { text, email, number, telephone }
+
 enum CreditCardInputType { number, expirationDate, securityCode }
+
 enum CreditCardNetwork { visa, mastercard, amex }

vignettes/plant_forms/lib/form_inputs/checkbox_input.dart

@@ -4,10 +4,9 @@ import '../styles.dart';
 
 class CheckBoxInput extends StatefulWidget {
   final String label;
+  final Function? onChange;
 
-  final void Function(bool? value) onChange;
-
-  const CheckBoxInput({Key? key, required this.label, required this.onChange}) : super(key: key);
+  const CheckBoxInput({Key? key, required this.label, this.onChange}) : super(key: key);
 
   @override
   _CheckBoxInputState createState() => _CheckBoxInputState();
@@ -38,7 +37,8 @@ class _CheckBoxInputState extends State<CheckBoxInput> {
   }
 
   void _handleChange(bool? value) {
-    setState(() => _value = value ?? false);
-    widget.onChange.call(_value);
+    setState(() {
+      _value = value ?? false;
+    });
   }
 }

vignettes/plant_forms/lib/form_inputs/credit_card_input.dart

@@ -3,15 +3,16 @@ import 'package:flutter_masked_text2/flutter_masked_text2.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
 import '../demo_data.dart';
+import 'input_validator.dart';
 import '../styles.dart';
 
 class CreditCardInfoInput extends StatefulWidget {
   final String label;
   final String helper;
   final CreditCardInputType inputType;
   final CreditCardNetwork? cardNetwork;
-  final void Function(String key, String value, bool isValid) onValidate;
-  final void Function(CreditCardNetwork? cardNetwork)? onChange;
+  final Function onValidate;
+  final Function? onChange;
   final String initialValue;
 
   const CreditCardInfoInput({
@@ -48,7 +49,7 @@ class _CreditCardInfoInputState extends State<CreditCardInfoInput> {
   set isValid(bool isValid) {
     if (isValid != _isValid) {
       _isValid = isValid;
-      widget.onValidate(_keyValue, _value, isValid);
+      widget.onValidate(_keyValue, _isValid, value: _value);
     }
   }
 
@@ -73,8 +74,7 @@ class _CreditCardInfoInputState extends State<CreditCardInfoInput> {
             style: Styles.orderTotalLabel,
             onChanged: _handleChange,
             keyboardType: TextInputType.number,
-            autovalidateMode: _isAutoValidating ? AutovalidateMode.always : AutovalidateMode.disabled,
-            validator: _validateField,
+            autovalidateMode: AutovalidateMode.onUserInteraction,
             decoration: Styles.getInputDecoration(helper: widget.helper),
           ),
           Positioned(
@@ -125,56 +125,24 @@ class _CreditCardInfoInputState extends State<CreditCardInfoInput> {
     }
   }
 
-  // TODO: Consolidate the code here and in TextInput
-  String? _validateField(String? value) {
+  String? _validateField(String value) {
     // if is required
-    if (value == null) {
+    if (value.isEmpty) {
       isValid = false;
       _errorText = 'Required';
       return _errorText;
     }
     // validate when the input has a value
-    else if (value.isNotEmpty) {
-      if (switch (widget.inputType) {
-        CreditCardInputType.number => _validateCreditCardNumber(value, _creditCardType),
-        CreditCardInputType.expirationDate => _validateCreditCardExpirationDate(value),
-        CreditCardInputType.securityCode => _validateCreditCardSecurityCode(value, _creditCardType),
-      }) {
-        _errorText = '';
-        return null;
-      }
-    }
-    isValid = false;
-    _errorText = 'Not Valid';
-    return _errorText;
-  }
-
-  bool _validateCreditCardNumber(String value, CreditCardNetwork? cardNetwork) {
-    // remove empty spaces
-    String cardNumber = value.replaceAll(' ', '');
-    if (cardNetwork == CreditCardNetwork.amex) {
-      return cardNumber.length == 15;
-    } else {
-      return cardNumber.length == 16;
+    else if (value.isNotEmpty && InputValidator.validate(widget.inputType, value, cardNetwork: widget.cardNetwork)) {
+      isValid = true;
+      _errorText = '';
+      return null;
     }
-  }
-
-  bool _validateCreditCardSecurityCode(String value, CreditCardNetwork? cardNetwork) {
-    if (cardNetwork == CreditCardNetwork.amex) {
-      return value.length == 4;
-    } else {
-      return value.length == 3;
-    }
-  }
-
-  bool _validateCreditCardExpirationDate(String value) {
-    if (value.length > 3) {
-      int month = int.parse(value.split('/').first);
-      int year = int.parse(value.split('/').last);
-      year += 2000;
-      return month <= 12 && year >= DateTime.now().year;
-    } else {
-      return false;
+    // the value is not valid
+    else {
+      isValid = false;
+      _errorText = 'Not Valid';
+      return _errorText;
     }
   }
 

vignettes/plant_forms/lib/form_inputs/dropdown_menu.dart

@@ -2,44 +2,39 @@ import 'package:flutter/material.dart';
 
 import '../styles.dart';
 
-class FormDropdownMenu extends StatefulWidget {
-  final void Function(String key, String value, bool isValid) onValidate;
+class AppDropdownMenu extends StatefulWidget {
+  final Function onValidate;
   final String label;
-  final String defaultOption;
+  final String? defaultOption;
   final List<String> options;
 
-  const FormDropdownMenu({
-    Key? key,
-    required this.options,
-    required this.label,
-    required this.onValidate,
-    required this.defaultOption,
-  }) : super(key: key);
+  const AppDropdownMenu(
+      {Key? key, required this.options, required this.label, required this.onValidate, this.defaultOption})
+      : super(key: key);
 
   @override
-  _FormDropdownMenuState createState() => _FormDropdownMenuState();
+  _AppDropdownMenuState createState() => _AppDropdownMenuState();
 }
 
-class _FormDropdownMenuState extends State<FormDropdownMenu> {
-  String _selectedOption = '';
-  bool _isValid = false;
+class _AppDropdownMenuState extends State<AppDropdownMenu> {
+  String? _selectedOption = '';
+  bool? _isValid;
   String get _keyValue => (widget.key as ValueKey).value as String;
 
-  set isValid(bool value) {
-    if (_isValid == value) return;
-    _isValid = value;
-    widget.onValidate(_keyValue, _selectedOption, _isValid);
+  set isValid(bool isValid) {
+    _isValid = isValid;
+    widget.onValidate(_keyValue, _isValid, value: _selectedOption);
   }
 
   @override
   initState() {
     super.initState();
-    _selectedOption = widget.defaultOption;
+    _selectedOption = widget.defaultOption ?? "";
   }
 
   @override
   Widget build(BuildContext context) {
-    if (_isValid && _selectedOption.isNotEmpty) {
+    if (_isValid == null && _selectedOption!.isNotEmpty) {
       isValid = true;
     }
     var items = _buildMenuItems();
@@ -102,27 +97,27 @@ class _FormDropdownMenuState extends State<FormDropdownMenu> {
 
   _showOptions() async {
     _selectedOption = await Navigator.push(
-            context,
-            MaterialPageRoute(
-              builder: (context) => DropdownOptions(
-                title: widget.label,
-                selectedOption: _selectedOption,
-                options: widget.options,
-              ),
-            )) ??
-        _selectedOption;
-    if (_selectedOption.isNotEmpty) isValid = true;
+        context,
+        MaterialPageRoute(
+          builder: (context) => DropdownOptions(
+            title: widget.label,
+            selectedOption: _selectedOption ?? '',
+            options: widget.options,
+          ),
+        ));
+    if (_selectedOption != null && _selectedOption!.isNotEmpty) {
+      isValid = true;
+    }
     setState(() {});
   }
 }
 
 class DropdownOptions extends StatefulWidget {
   final String title;
   final List<String> options;
-  final String selectedOption;
+  final String? selectedOption;
 
-  const DropdownOptions({Key? key, required this.title, required this.options, required this.selectedOption})
-      : super(key: key);
+  const DropdownOptions({Key? key, required this.title, required this.options, this.selectedOption}) : super(key: key);
 
   @override
   _DropdownOptionsState createState() => _DropdownOptionsState();
@@ -133,7 +128,7 @@ class _DropdownOptionsState extends State<DropdownOptions> {
   String _selectedOption = '';
   @override
   void initState() {
-    _selectedOption = widget.selectedOption;
+    _selectedOption = widget.selectedOption ?? '';
     super.initState();
   }
 
@@ -149,7 +144,7 @@ class _DropdownOptionsState extends State<DropdownOptions> {
           TextButton(
             child: Text('Done', style: Styles.textButton),
             onPressed: _sendSelectedOption,
-          ),
+          )
         ],
       ),
       backgroundColor: Color(0xfff4f4f4),