fix: submission data regis

lib/application/component/text_form/text_form_view.dart

@@ -155,7 +155,7 @@ class TextFormView extends StatelessWidget {
             hintStyle: hintTextStyle ??
                 const TextStyle(
                   fontSize: 14,
-                  color: Colors.grey,
+                  color: ColorPalette.greyFont,
                   fontWeight: FontWeight.normal,
                 ),
             isDense: true,
@@ -167,19 +167,19 @@ class TextFormView extends StatelessWidget {
             disabledBorder: OutlineInputBorder(
               borderRadius: _borderRadius,
               borderSide: BorderSide(
-                color: disabledborderColor ?? ColorPalette.greyFont,
+                color: disabledborderColor ?? ColorPalette.greyBorder,
               ),
             ),
             enabledBorder: OutlineInputBorder(
               borderRadius: _borderRadius,
               borderSide: BorderSide(
-                color: enabledborderColor ?? ColorPalette.greyBase,
+                color: enabledborderColor ?? ColorPalette.greyBorder,
               ),
             ),
             focusedBorder: OutlineInputBorder(
               borderRadius: _borderRadius,
               borderSide: BorderSide(
-                color: focusedBorderColor ?? ColorPalette.greyBase,
+                color: focusedBorderColor ?? ColorPalette.greyBorder,
               ),
             ),
             border: OutlineInputBorder(borderRadius: _borderRadius),

lib/features/auth/registration/view/registration_view.dart

@@ -3,7 +3,6 @@ import 'package:cims_apps/application/component/text_caption/text_caption.dart';
 import 'package:cims_apps/application/component/text_form/text_form_view.dart';
 import 'package:cims_apps/core/route/route.dart';
 import 'package:cims_apps/features/auth/registration/view/initial_registration_step.dart';
-import 'package:cims_apps/features/bottom_navigation_view.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 
@@ -42,7 +41,7 @@ class RegistrationView extends StatelessWidget {
                     text: 'Already have an account? ',
                     style: TextStyle(
                       color: Colors.black,
-                      decoration: TextDecoration.underline,
+                      decoration: TextDecoration.none,
                     ),
                   ),
                   TextSpan(

lib/features/auth/registration/view/submission_data/submission_parent.dart

@@ -1,9 +1,12 @@
 import 'package:cims_apps/application/component/button/button_view.dart';
 import 'package:cims_apps/application/theme/color_palette.dart';
 import 'package:cims_apps/core/utils/size_config.dart';
+import 'package:cims_apps/features/auth/registration/view/submission_data/initial_take_photo.dart';
 import 'package:cims_apps/features/auth/registration/view/submission_data/submit_email.dart';
 import 'package:cims_apps/features/auth/registration/view/submission_data/submit_personal_data.dart';
+import 'package:cims_apps/features/auth/registration/viewmodel/submission_data_viewmodel.dart';
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 
 class SubmissionParent extends StatefulWidget {
   static const routeName = '/SubmissionParent';
@@ -14,29 +17,16 @@ class SubmissionParent extends StatefulWidget {
 }
 
 class _SubmissionParentState extends State<SubmissionParent> {
-  int _currentStep = 1;
-  final int _stepAmount = 9;
   Widget _stepItem({bool isCurrentStep = false, bool isDone = false}) {
-    return GestureDetector(
+    return Container(
-      onTap: () {
+      margin: const EdgeInsets.only(right: 4.0, left: 4.0),
-        setState(() {
+      height: 6,
-          if (_currentStep > 1) {
+      width: SizeConfig.width * .08,
-            _currentStep--;
+      decoration: BoxDecoration(
-          } else if (_currentStep == 1) {
+        color: isCurrentStep || isDone
-            _currentStep++;
+            ? ColorPalette.primary
-          }
+            : ColorPalette.greyBorderNeutrals,
-        });
+        borderRadius: BorderRadius.circular(50),
-      },
-      child: Container(
-        margin: const EdgeInsets.only(right: 4.0, left: 4.0),
-        height: 6,
-        width: SizeConfig.width * .08,
-        decoration: BoxDecoration(
-          color: isCurrentStep || isDone
-              ? ColorPalette.primary
-              : ColorPalette.greyBorderNeutrals,
-          borderRadius: BorderRadius.circular(50),
-        ),
       ),
     );
   }
@@ -48,9 +38,7 @@ class _SubmissionParentState extends State<SubmissionParent> {
       case 2:
         return const SubmitEmail();
       case 3:
-        return Container(
+        return const InitialTakePhoto();
-          child: Text("Step 3"),
-        );
       case 4:
         return Container(
           child: Text("Step 4"),
@@ -80,48 +68,58 @@ class _SubmissionParentState extends State<SubmissionParent> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return ChangeNotifierProvider(
-      appBar: AppBar(
+        create: (context) => SubmissionDataViewModel(),
-        title: const Text('Registration'),
+        builder: (context, child) {
-      ),
+          return Scaffold(
-      body: Stack(
+            appBar: AppBar(
-        children: [
+              title: const Text('Registration'),
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Padding(
-                padding: const EdgeInsets.symmetric(
-                    horizontal: 16.0, vertical: 16.0),
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: List.generate(
-                    _stepAmount,
-                    (index) => _stepItem(
-                      isCurrentStep: _currentStep == index + 1,
-                    ),
-                  ),
-                ),
-              ),
-              Container(
-                padding: const EdgeInsets.symmetric(horizontal: 16.0),
-                child: _content(_currentStep),
-              )
-            ],
-          ),
-          Align(
-            alignment: Alignment.bottomCenter,
-            child: ButtonView(
-              name: 'Next',
-              marginVertical: 16.0,
-              onPressed: () {
-                setState(() {
-                  _currentStep++;
-                });
-              },
             ),
-          )
+            body: Stack(
-        ],
+              children: [
-      ),
+                Consumer<SubmissionDataViewModel>(
-    );
+                    builder: (context, provider, child) {
+                  return Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Padding(
+                        padding: const EdgeInsets.symmetric(
+                            horizontal: 16.0, vertical: 16.0),
+                        child: Row(
+                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          children: List.generate(
+                            provider.stepAmount,
+                            (index) => _stepItem(
+                              isCurrentStep: provider.currentStep == index + 1,
+                            ),
+                          ),
+                        ),
+                      ),
+                      Expanded(
+                        child: Container(
+                          padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                          child: _content(provider.currentStep),
+                        ),
+                      ),
+                      provider.currentStep == 3
+                          ? const SizedBox()
+                          : Align(
+                              alignment: Alignment.bottomCenter,
+                              child: ButtonView(
+                                name: 'Next',
+                                marginVertical: 16.0,
+                                onPressed: () {
+                                  provider.nextSubmission(context);
+                                },
+                              ),
+                            )
+                    ],
+                  );
+                }),
+              ],
+            ),
+          );
+        });
   }
 }

lib/features/auth/registration/view/submission_data/submit_email.dart

@@ -1,21 +1,81 @@
+import 'package:cims_apps/application/assets/path_assets.dart';
+import 'package:cims_apps/application/component/image/image_view.dart';
 import 'package:cims_apps/application/component/text_caption/text_caption.dart';
 import 'package:cims_apps/application/component/text_form/text_form_view.dart';
+import 'package:cims_apps/features/auth/registration/viewmodel/submission_data_viewmodel.dart';
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 
 class SubmitEmail extends StatelessWidget {
   const SubmitEmail({Key? key}) : super(key: key);
 
-  @override
+  Widget _emailVerify() {
-  Widget build(BuildContext context) {
     return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        const TextCaption(title: 'Enter your e-mail'),
+        const ImageView(image: PathAssets.imgEmail),
-        TextFormView(
+        Align(
-          name: 'E-mail Address',
+          alignment: Alignment.center,
-          hintText: 'Input e-mail address',
+          child: RichText(
+            textAlign: TextAlign.center,
+            text: TextSpan(children: [
+              const TextSpan(
+                text:
+                    'We have sent a verification link to your e-mail. \nPlease check your email for ',
+                style: TextStyle(
+                  color: Colors.black,
+                  decoration: TextDecoration.none,
+                ),
+              ),
+              TextSpan(
+                recognizer: TapGestureRecognizer()
+                  ..onTap = () {
+                    print('object');
+                  },
+                text: 'verification',
+                style: const TextStyle(
+                  color: Colors.blue,
+                ),
+              ),
+              const TextSpan(
+                text: ' to \ncontinue registration.',
+                style: TextStyle(
+                  color: Colors.black,
+                  decoration: TextDecoration.none,
+                ),
+              ),
+            ]),
+          ),
         ),
       ],
     );
   }
+
+  @override
+  Widget build(BuildContext context) {
+    return ChangeNotifierProvider(
+        create: (context) => SubmissionDataViewModel(),
+        builder: (context, child) {
+          return Consumer<SubmissionDataViewModel>(
+              builder: (context, provider, child) {
+            return Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                !provider.isEmailVerify
+                    ? const TextCaption(title: 'Enter your e-mail')
+                    : const TextCaption(title: 'Check your e-mail '),
+                !provider.isEmailVerify
+                    ? TextFormView(
+                        name: 'E-mail Address',
+                        hintText: 'Input e-mail address',
+                        onTap: () {
+                          provider.submitEmail();
+                        },
+                      )
+                    : _emailVerify(),
+              ],
+            );
+          });
+        });
+  }
 }

lib/features/auth/registration/view/submission_data/submit_personal_data.dart

@@ -1,16 +1,56 @@
+import 'package:cims_apps/application/component/select_form/select_form_view.dart';
 import 'package:cims_apps/application/component/text_caption/text_caption.dart';
+import 'package:cims_apps/application/theme/color_palette.dart';
+import 'package:cims_apps/features/auth/registration/viewmodel/submission_data_viewmodel.dart';
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 
 class SubmitPersonalData extends StatelessWidget {
   const SubmitPersonalData({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    return Column(
+    List<ItemSelectForm> listForm = [
-      crossAxisAlignment: CrossAxisAlignment.start,
+      ItemSelectForm('key1', 'text'),
-      children: [
+      ItemSelectForm('key2', 'text'),
-        TextCaption(title: 'Your personal details'),
+      ItemSelectForm('key3', 'text'),
-      ],
+      ItemSelectForm('key4', 'text'),
-    );
+      ItemSelectForm('key5', 'text'),
+    ];
+    return ChangeNotifierProvider(
+        create: (context) => SubmissionDataViewModel(),
+        builder: (context, child) {
+          return Consumer<SubmissionDataViewModel>(
+              builder: (context, provider, child) {
+            return SingleChildScrollView(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                // mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  const TextCaption(title: 'Your personal details'),
+                  SelectFormView(
+                    name: 'Occupation',
+                    hintText: 'Select occupation ',
+                    bottomSheetTitle: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        const Text('Occupation'),
+                        IconButton(
+                            onPressed: () => Navigator.pop(context),
+                            icon: const Icon(
+                              Icons.clear,
+                              size: 20,
+                              color: ColorPalette.greyBase,
+                            )),
+                      ],
+                    ),
+                    listItem: listForm,
+                    onSelect: (value) {},
+                  ),
+                ],
+              ),
+            );
+          });
+        });
   }
 }