fix add card scan bug

fix cancel button in scanner
add new fields

Frontend/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart

@@ -1,19 +1,17 @@
 import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_apis/mih_mzansi_wallet_apis.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_number_input.dart';
+import 'package:mzansi_innovation_hub/mih_apis/mih_validation_services.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_delete_message.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
 import 'package:mzansi_innovation_hub/mih_objects/app_user.dart';
 import 'package:mzansi_innovation_hub/mih_objects/loyalty_card.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_wallet/components/mih_card_display.dart';
 import 'package:flutter/material.dart';
-
-// import 'package:syncfusion_flutter_barcodes/barcodes.dart';
 import 'package:barcode_widget/barcode_widget.dart';
 
 class BuildLoyaltyCardList extends StatefulWidget {
@@ -36,6 +34,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
   final TextEditingController _nicknameController = TextEditingController();
   final TextEditingController _cardNumberController = TextEditingController();
   late int _noFavourites;
+  final _formKey = GlobalKey<FormState>();
 
   void openscanner() async {
     Navigator.of(context).pushNamed(
@@ -58,41 +57,58 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
         },
         windowBody: Column(
           children: [
-            const SizedBox(height: 10),
+            MihForm(
-            MIHTextField(
+              formKey: _formKey,
+              formFields: [
+                MihTextFormField(
+                  fillColor:
+                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                  inputColor:
+                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
                   controller: _nicknameController,
+                  multiLineInput: false,
+                  requiredText: false,
                   hintText: "Card Title",
-              editable: true,
-              required: false,
                 ),
                 const SizedBox(height: 10),
                 Row(
                   mainAxisAlignment: MainAxisAlignment.center,
-              crossAxisAlignment: CrossAxisAlignment.center,
+                  crossAxisAlignment: CrossAxisAlignment.end,
                   mainAxisSize: MainAxisSize.max,
                   children: [
                     Flexible(
-                  child: MIHNumberField(
+                      child: MihTextFormField(
+                        fillColor: MzanziInnovationHub.of(context)!
+                            .theme
+                            .secondaryColor(),
+                        inputColor: MzanziInnovationHub.of(context)!
+                            .theme
+                            .primaryColor(),
                         controller: _cardNumberController,
+                        multiLineInput: false,
+                        requiredText: true,
                         hintText: "Card Number",
-                    editable: true,
+                        numberMode: true,
-                    required: true,
+                        validator: (value) {
-                    enableDecimal: false,
+                          return MihValidationServices().isEmpty(value);
+                        },
                       ),
                     ),
-                const SizedBox(width: 10),
+                    const SizedBox(width: 20),
                     MihButton(
                       onPressed: () {
                         openscanner();
                       },
-                  buttonColor:
+                      buttonColor: MzanziInnovationHub.of(context)!
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                          .theme
+                          .secondaryColor(),
                       width: 100,
                       child: Text(
                         "Scan",
                         style: TextStyle(
-                      color:
+                          color: MzanziInnovationHub.of(context)!
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                              .theme
+                              .primaryColor(),
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                         ),
@@ -103,14 +119,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                 const SizedBox(height: 15),
                 MihButton(
                   onPressed: () {
-                if (_cardNumberController.text == "") {
+                    if (_formKey.currentState!.validate()) {
-                  showDialog(
-                    context: context,
-                    builder: (context) {
-                      return const MIHErrorMessage(errorType: "Input Error");
-                    },
-                  );
-                } else {
                       MIHMzansiWalletApis.updateLoyaltyCardAPICall(
                         widget.signedInUser,
                         widget.cardList[index].idloyalty_cards,
@@ -129,7 +138,8 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                   child: Text(
                     "Update",
                     style: TextStyle(
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      color:
+                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                     ),
@@ -137,6 +147,8 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                 ),
               ],
             ),
+          ],
+        ),
       ),
     );
   }

Frontend/lib/mih_packages/mzansi_wallet/components/mih_barcode_scanner.dart

@@ -129,6 +129,7 @@ class _MihBarcodeScannerState extends State<MihBarcodeScanner>
                           .theme
                           .secondaryColor(),
                       width: 100,
+                      height: 50,
                       child: Text(
                         "Cancel",
                         style: TextStyle(

Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart

@@ -1,15 +1,16 @@
 import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_apis/mih_mzansi_wallet_apis.dart';
+import 'package:mzansi_innovation_hub/mih_apis/mih_validation_services.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_number_input.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_search_bar.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
 import 'package:mzansi_innovation_hub/mih_objects/app_user.dart';
@@ -36,6 +37,7 @@ class _MihCardsState extends State<MihCards> {
   final TextEditingController cardNumberController = TextEditingController();
   final TextEditingController cardSearchController = TextEditingController();
   final FocusNode searchFocusNode = FocusNode();
+  final _formKey = GlobalKey<FormState>();
   late Future<List<MIHLoyaltyCard>> cardList;
   List<MIHLoyaltyCard> listOfCards = [];
   //bool showSelectedCardType = false;
@@ -97,6 +99,9 @@ class _MihCardsState extends State<MihCards> {
         },
         windowBody: Column(
           children: [
+            MihForm(
+              formKey: _formKey,
+              formFields: [
                 MIHDropdownField(
                   controller: shopController,
                   hintText: "Shop Name",
@@ -159,45 +164,64 @@ class _MihCardsState extends State<MihCards> {
                         children: [
                           const SizedBox(height: 10),
                           MihCardDisplay(
-                          shopName: shopName.value, nickname: "", height: 200),
+                              shopName: shopName.value,
+                              nickname: "",
+                              height: 200),
                         ],
                       ),
                     );
                   },
                 ),
                 const SizedBox(height: 10),
-            MIHTextField(
+                MihTextFormField(
+                  fillColor:
+                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                  inputColor:
+                      MzanziInnovationHub.of(context)!.theme.primaryColor(),
                   controller: _nicknameController,
+                  multiLineInput: false,
+                  requiredText: false,
                   hintText: "Card Title",
-              editable: true,
-              required: false,
                 ),
                 const SizedBox(height: 10),
                 Row(
                   mainAxisAlignment: MainAxisAlignment.center,
-              crossAxisAlignment: CrossAxisAlignment.center,
+                  crossAxisAlignment: CrossAxisAlignment.end,
                   mainAxisSize: MainAxisSize.max,
                   children: [
                     Flexible(
-                  child: MIHNumberField(
+                      child: MihTextFormField(
+                        fillColor: MzanziInnovationHub.of(context)!
+                            .theme
+                            .secondaryColor(),
+                        inputColor: MzanziInnovationHub.of(context)!
+                            .theme
+                            .primaryColor(),
                         controller: cardNumberController,
+                        multiLineInput: false,
+                        requiredText: true,
                         hintText: "Card Number",
-                    editable: true,
+                        numberMode: true,
-                    required: true,
+                        validator: (value) {
-                    enableDecimal: false,
+                          return MihValidationServices().isEmpty(value);
+                        },
                       ),
                     ),
-                const SizedBox(width: 10),
+                    const SizedBox(width: 20),
                     MihButton(
-                  onPressed: () {},
+                      onPressed: () {
-                  buttonColor:
+                        openscanner();
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      },
+                      buttonColor: MzanziInnovationHub.of(context)!
+                          .theme
+                          .secondaryColor(),
                       width: 100,
                       child: Text(
                         "Scan",
                         style: TextStyle(
-                      color:
+                          color: MzanziInnovationHub.of(context)!
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                              .theme
+                              .primaryColor(),
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                         ),
@@ -208,12 +232,13 @@ class _MihCardsState extends State<MihCards> {
                 const SizedBox(height: 15),
                 MihButton(
                   onPressed: () {
-                if (shopController.text == "" ||
+                    if (_formKey.currentState!.validate()) {
-                    cardNumberController.text == "") {
+                      if (shopController.text == "") {
                         showDialog(
                           context: context,
                           builder: (context) {
-                      return const MIHErrorMessage(errorType: "Input Error");
+                            return const MIHErrorMessage(
+                                errorType: "Input Error");
                           },
                         );
                       } else {
@@ -229,6 +254,7 @@ class _MihCardsState extends State<MihCards> {
                           context,
                         );
                       }
+                    }
                   },
                   buttonColor:
                       MzanziInnovationHub.of(context)!.theme.secondaryColor(),
@@ -236,7 +262,8 @@ class _MihCardsState extends State<MihCards> {
                   child: Text(
                     "Add",
                     style: TextStyle(
-                  color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      color:
+                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                     ),
@@ -244,6 +271,8 @@ class _MihCardsState extends State<MihCards> {
                 ),
               ],
             ),
+          ],
+        ),
       ),
     );
   }