fix: merge origin dev

lib/application/assets/path_assets.dart

@@ -49,11 +49,16 @@ class PathAssets {
   static const String iconTicket = 'assets/icons/icon-ticket.png';
   static const String iconGadget = 'assets/icons/icon-gadget.png';
   static const String iconCar = 'assets/icons/icon-car.png';
-  static const String iconNavigationHome = 'assets/icons/icon-navigation-home.png';
+  static const String iconNavigationHome =
-  static const String iconNavigationPlan = 'assets/icons/icon-navigation-plan.png';
+      'assets/icons/icon-navigation-home.png';
-  static const String iconNavigationTransaction = 'assets/icons/icon-navigation-transaction.png';
+  static const String iconNavigationPlan =
-  static const String iconNavigationPortfolio = 'assets/icons/icon-navigation-portfolio.png';
+      'assets/icons/icon-navigation-plan.png';
-  static const String iconNavigationProfile = 'assets/icons/icon-navigation-profile.png';
+  static const String iconNavigationTransaction =
+      'assets/icons/icon-navigation-transaction.png';
+  static const String iconNavigationPortfolio =
+      'assets/icons/icon-navigation-portfolio.png';
+  static const String iconNavigationProfile =
+      'assets/icons/icon-navigation-profile.png';
   static const String iconRemove = 'assets/icons/icon-remove.png';
   static const String iconCat = 'assets/icons/icon-cat.png';
   static const String iconProfile = 'assets/icons/icon-profile.png';
@@ -62,6 +67,12 @@ class PathAssets {
   static const String iconSetting = 'assets/icons/icon-setting.png';
   static const String iconFaqs = 'assets/icons/icon-faqs.png';
   static const String iconLogout = 'assets/icons/icon-logout.png';
+  static const String iconEducation = 'assets/icons/icon-education.png';
+  static const String iconFund = 'assets/icons/icon-fund.png';
+  static const String iconHome = 'assets/icons/icon-home.png';
+  static const String iconShop = 'assets/icons/icon-shop.png';
+  static const String iconGadgetOutline =
+      'assets/icons/icon-gadget-outline.png';
 
   /// IMAGE
   static const String imgSplashLogo = 'assets/images/splash-logo.png';
@@ -96,11 +107,14 @@ class PathAssets {
   static const String imgGuide1 = 'assets/images/img-guide1.png';
   static const String imgGuide2 = 'assets/images/img-guide2.png';
   static const String imgOpenShopping = 'assets/images/img-open-shopping.png';
-  static const String imgPaymentSuccess = 'assets/images/img-payment-success.png';
+  static const String imgPaymentSuccess =
+      'assets/images/img-payment-success.png';
   static const String frameSignature = 'assets/images/frame-signature.png';
   static const String imgFinish = 'assets/images/img-finish.png';
   static const String imgDashboardProfile =
       'assets/images/img-dashboard-profile.png';
+  static const String imgEmptyTransaction =
+      'assets/images/img-empty-transaction.png';
 
   static const Map<String, String> goalInvestIcon = {
     'Education': iconToga,

lib/application/component/card_transaction/card_transaction_view.dart

@@ -0,0 +1,100 @@
+import 'package:cims_apps/application/component/image/image_view.dart';
+import 'package:cims_apps/application/theme/color_palette.dart';
+import 'package:cims_apps/core/utils/size_config.dart';
+import 'package:flutter/material.dart';
+
+class CardTransactionView extends StatelessWidget {
+  final VoidCallback onTap;
+  final String iconPath, type, amount, subs, step;
+  final String? timeTransaction;
+  const CardTransactionView({
+    Key? key,
+    required this.step,
+    required this.type,
+    required this.amount,
+    required this.iconPath,
+    required this.subs,
+    required this.onTap,
+    this.timeTransaction,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    TextTheme textTheme = Theme.of(context).textTheme;
+    return GestureDetector(
+      onTap: onTap,
+      child: Container(
+        margin: const EdgeInsets.symmetric(vertical: 16.0),
+        padding: const EdgeInsets.symmetric(vertical: 16.0, horizontal: 16.0),
+        decoration: BoxDecoration(
+          color: Colors.white,
+          border: Border.all(width: 1, color: ColorPalette.slate200),
+          borderRadius: const BorderRadius.all(Radius.circular(12)),
+        ),
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            SizedBox(
+                width: SizeConfig.width * .4,
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      children: [
+                        ImageView(
+                            image: iconPath, width: SizeConfig.width * .12),
+                        Padding(
+                          padding: const EdgeInsets.only(left: 8.0),
+                          child: Text(
+                            type,
+                            style: textTheme.headlineSmall,
+                          ),
+                        ),
+                      ],
+                    ),
+                    Padding(
+                      padding: const EdgeInsets.only(top: 16.0),
+                      child: Text(
+                        amount,
+                        style: textTheme.headlineSmall,
+                      ),
+                    ),
+                  ],
+                )),
+            SizedBox(
+                width: SizeConfig.width * .4,
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.end,
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    SizedBox(
+                        height: SizeConfig.height * .08,
+                        child: Text(
+                          subs,
+                          style: const TextStyle(color: ColorPalette.primary),
+                        )),
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.end,
+                      children: [
+                        step == 'waiting'
+                            ? const Icon(Icons.access_time_sharp,
+                                color: ColorPalette.slate400)
+                            : const SizedBox(),
+                        step == 'waiting'
+                            ? Text(timeTransaction.toString())
+                            : const SizedBox(),
+                        const Padding(
+                          padding: EdgeInsets.only(left: 16.0),
+                          child: Icon(Icons.arrow_forward_ios),
+                        ),
+                      ],
+                    ),
+                  ],
+                )),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/application/component/card_transaction/empty_card_transaction.dart

@@ -0,0 +1,44 @@
+import 'package:cims_apps/application/assets/path_assets.dart';
+import 'package:cims_apps/application/component/button/button_view.dart';
+import 'package:cims_apps/application/component/image/image_view.dart';
+import 'package:cims_apps/core/utils/size_config.dart';
+import 'package:flutter/material.dart';
+
+class EmptyCardTransaction extends StatelessWidget {
+  final VoidCallback onPressedButton;
+  const EmptyCardTransaction({Key? key, required this.onPressedButton})
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    TextTheme textTheme = Theme.of(context).textTheme;
+    return Container(
+      padding: const EdgeInsets.symmetric(vertical: 8.0),
+      child: Center(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.spaceAround,
+          children: [
+            ImageView(
+              image: PathAssets.imgEmptyTransaction,
+              width: SizeConfig.width * .4,
+            ),
+            Text(
+              'No Transaction Yet',
+              style: textTheme.headlineSmall,
+            ),
+            Text(
+              "Let's keep building your investment for even greater financial growth!",
+              style: textTheme.bodyMedium,
+              textAlign: TextAlign.center,
+            ),
+            ButtonView(
+              name: 'Investing Now',
+              width: SizeConfig.width * .5,
+              onPressed: onPressedButton,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/application/component/take_picture_screen/display_picture_screen.dart

@@ -2,6 +2,7 @@ import 'dart:io';
 
 import 'package:cims_apps/application/assets/path_assets.dart';
 import 'package:cims_apps/application/component/button/button_view.dart';
+import 'package:cims_apps/application/component/custom_app_bar/custom_app_bar.dart';
 import 'package:cims_apps/application/component/image/image_view.dart';
 import 'package:cims_apps/application/component/take_picture_screen/take_picture_screen.dart';
 import 'package:cims_apps/application/theme/color_palette.dart';
@@ -94,10 +95,8 @@ class _DisplayPictureScreenState extends State<DisplayPictureScreen> {
           return Consumer<SubmissionDataViewModel>(
               builder: (context, provider, child) {
             return Scaffold(
-              appBar: AppBar(
+              appBar: CustomAppBar(
-                title: const Text('Preview'),
+                  height: SizeConfig.height * .08, title: 'Preview'),
-                automaticallyImplyLeading: false,
-              ),
               body: Container(
                   padding: const EdgeInsets.symmetric(horizontal: 24.0),
                   child: Column(

lib/application/component/take_picture_screen/take_picture_screen.dart

@@ -1,5 +1,6 @@
 import 'package:camera/camera.dart';
 import 'package:cims_apps/application/assets/path_assets.dart';
+import 'package:cims_apps/application/component/custom_app_bar/custom_app_bar.dart';
 import 'package:cims_apps/application/component/image/image_view.dart';
 import 'package:cims_apps/application/component/take_picture_screen/display_picture_screen.dart';
 import 'package:cims_apps/core/route/route.dart';
@@ -27,7 +28,6 @@ class TakePictureScreenState extends State<TakePictureScreen> {
   late String _takeContent;
 
   Future<void> changeFlash() async {
-    await _controller.setFlashMode(FlashMode.auto);
     setState(() {
       isFlash = !isFlash;
     });
@@ -44,6 +44,7 @@ class TakePictureScreenState extends State<TakePictureScreen> {
     // Next, initialize the controller. This returns a Future.
     _initializeControllerFuture = _controller.initialize();
     _takeContent = widget.takeContent;
+    _controller.setFlashMode(isFlash ? FlashMode.torch : FlashMode.off);
   }
 
   @override
@@ -57,9 +58,10 @@ class TakePictureScreenState extends State<TakePictureScreen> {
   Widget build(BuildContext context) {
     // Fill this out in the next steps.
     return Scaffold(
-      appBar: AppBar(
+      appBar: CustomAppBar(
-        title: const Text('Registration'),
+        title: 'Registration',
-        actions: [
+        height: SizeConfig.height * .08,
+        trailing: [
           IconButton(
               onPressed: () {
                 changeFlash();

lib/core/utils/string_utils.dart

@@ -1,3 +1,5 @@
+import 'package:intl/intl.dart';
+
 class StringUtils {
   static bool emailValidation(String email) {
     return RegExp(
@@ -13,4 +15,12 @@ class StringUtils {
     return RegExp(r'^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*?[\W_])(?=.{8,})')
         .hasMatch(password);
   }
+
+  static String formatTime(DateTime? dateTime) {
+    if (dateTime != null) {
+      DateFormat formatter = DateFormat('HH:mm:ss');
+      return formatter.format(dateTime);
+    }
+    return '--:--:--';
+  }
 }

lib/features/auth/registration/view/submission_data/data_bank/confirm_bank_account.dart

@@ -6,19 +6,26 @@ import 'package:cims_apps/application/theme/color_palette.dart';
 import 'package:cims_apps/core/route/route.dart';
 import 'package:cims_apps/core/utils/size_config.dart';
 import 'package:cims_apps/features/auth/registration/view/submission_data/submission_parent.dart';
+import 'package:cims_apps/features/auth/registration/viewmodel/submission_data_viewmodel.dart';
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+class ModelDataBank {
+  final String? title, subtitle;
+  ModelDataBank(this.title, this.subtitle);
+}
 
 class ConfirmBankAccount extends StatelessWidget {
   const ConfirmBankAccount({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    List listData = [
+    final listDataBank =
-      {'title': 'Bank Name', 'subtitle': 'Bank Mandiri'},
+        ModalRoute.of(context)!.settings.arguments as List<ModelDataBank>;
-      {'title': 'Account Number', 'subtitle': '123002212084'},
+
-      {'title': 'Account Owner Name', 'subtitle': 'Muhamad Rosyidin'},
+    return ChangeNotifierProvider(
-      {'title': 'Name on ID card', 'subtitle': 'Muhamad Rosyidin'},
+        create: (context) => SubmissionDataViewModel(),
-    ];
+        builder: (context, child) {
           return Scaffold(
             appBar: AppBar(
               toolbarHeight: 70,
@@ -42,7 +49,9 @@ class ConfirmBankAccount extends StatelessWidget {
               padding: const EdgeInsets.all(16.0),
               child: SizedBox(
                 height: SizeConfig.height * .85,
-          child: Column(
+                child: Consumer<SubmissionDataViewModel>(
+                    builder: (context, provider, child) {
+                  return Column(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
@@ -53,7 +62,7 @@ class ConfirmBankAccount extends StatelessWidget {
                           mainAxisAlignment: MainAxisAlignment.start,
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
-                    ...listData.map((e) {
+                            ...listDataBank.map((e) {
                               return Padding(
                                 padding: const EdgeInsets.only(bottom: 16.0),
                                 child: Column(
@@ -61,12 +70,13 @@ class ConfirmBankAccount extends StatelessWidget {
                                   crossAxisAlignment: CrossAxisAlignment.start,
                                   children: [
                                     Text(
-                              e['title'],
+                                      e.title!,
                                       style: const TextStyle(
-                                  color: ColorPalette.slate400, fontSize: 16),
+                                          color: ColorPalette.slate400,
+                                          fontSize: 16),
                                     ),
                                     Text(
-                              e['subtitle'],
+                                      e.subtitle!,
                                       style: const TextStyle(
                                           fontSize: 16,
                                           color: ColorPalette.slate800,
@@ -98,15 +108,18 @@ class ConfirmBankAccount extends StatelessWidget {
                             name: 'Confirm',
                             width: SizeConfig.width * .42,
                             onPressed: () {
-                      routePush(context, page: const SubmissionParent());
+                              routePush(context,
+                                  page: const SubmissionParent());
                             },
                           ),
                         ],
                       )
                     ],
-          ),
+                  );
+                }),
               ),
             ),
           );
+        });
   }
 }

lib/features/auth/registration/view/submission_data/data_bank/submit_bank_account.dart

@@ -63,9 +63,13 @@ class SubmitBankAccount extends StatelessWidget {
           return SizedBox(
             child: Consumer<SubmissionDataViewModel>(
                 builder: (context, provider, child) {
-              return SingleChildScrollView(
+              return SizedBox(
+                height: SizeConfig.height * .8,
+                child: Form(
+                  key: provider.formKeySubmitDataBank,
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
                       const TextCaption(title: 'Input your bank account data'),
                       TextFormView(
@@ -79,11 +83,24 @@ class SubmitBankAccount extends StatelessWidget {
                         suffixIcon: const Icon(
                           Icons.keyboard_arrow_down_outlined,
                         ),
+                        validator: (value) {
+                          if (value!.isEmpty) {
+                            return 'Field must be filled';
+                          }
+                          return null;
+                        },
                       ),
                       TextFormView(
                         name: 'Account Number',
                         hintText: 'Input Account Number',
+                        ctrl: provider.ctrlNoAccountBank,
                         keyboardType: TextInputType.number,
+                        validator: (value) {
+                          if (value!.isEmpty) {
+                            return 'Field must be filled';
+                          }
+                          return null;
+                        },
                         trailingTitleWidget: SizedBox(
                           width: 24,
                           child: GestureDetector(
@@ -98,6 +115,13 @@ class SubmitBankAccount extends StatelessWidget {
                       TextFormView(
                         name: 'Account Owner Name',
                         hintText: 'Input Account Name',
+                        ctrl: provider.ctrlNameAccountBank,
+                        validator: (value) {
+                          if (value!.isEmpty) {
+                            return 'Field must be filled';
+                          }
+                          return null;
+                        },
                       ),
                       const Text(
                         "Make sure the account you use is in your name, not someone else's",
@@ -109,16 +133,29 @@ class SubmitBankAccount extends StatelessWidget {
                       ButtonView(
                         name: 'Next',
                         onPressed: () {
+                          if (provider.formKeySubmitDataBank.currentState!
+                              .validate()) {
+                            provider
+                                .submitDataBank(
+                              bankName: provider.ctrlBankName.text,
+                              accountNumber: provider.ctrlNoAccountBank.text,
+                              accountName: provider.ctrlNameAccountBank.text,
+                            )
+                                .then((values) {
                               provider.next(context).then((value) {
                                 if (value) {
                                   routePush(context,
-                                page: const ConfirmBankAccount());
+                                      page: const ConfirmBankAccount(),
+                                      arguments: values);
                                 }
                               });
+                            });
+                          }
                         },
                       )
                     ],
                   ),
+                ),
               );
             }),
           );

lib/features/auth/registration/view/submission_data/risk_profile/risk_profile_view.dart

@@ -14,12 +14,12 @@ class RiskProfileView extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       width: SizeConfig.width,
-      height: SizeConfig.height,
+      height: SizeConfig.height * .8,
-      padding: EdgeInsets.all(24),
+      padding: const EdgeInsets.all(24),
       child: Column(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
-          Column(
+          const Column(
             children: [
               ImageView(image: PathAssets.imgDataReport),
               SizedBox(
@@ -48,7 +48,7 @@ class RiskProfileView extends StatelessWidget {
           ),
           Column(
             children: [
-              Row(
+              const Row(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
                   ImageView(
@@ -68,7 +68,7 @@ class RiskProfileView extends StatelessWidget {
                   )
                 ],
               ),
-              SizedBox(
+              const SizedBox(
                 height: 24,
               ),
               ButtonView(

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

@@ -1,3 +1,4 @@
+import 'package:cims_apps/application/component/button/back_button_view.dart';
 import 'package:cims_apps/application/component/custom_app_bar/custom_app_bar.dart';
 import 'package:cims_apps/application/theme/color_palette.dart';
 import 'package:cims_apps/core/route/route.dart';
@@ -66,21 +67,33 @@ class _SubmissionParentState extends State<SubmissionParent> {
     return ChangeNotifierProvider(
         create: (context) => SubmissionDataViewModel(),
         builder: (context, child) {
-          return WillPopScope(
+          return PopScope(
-            onWillPop: () async {
+            canPop: false,
+            onPopInvoked: (didPop) async {
+              if (didPop) {
+                return;
+              }
               await routePush(context,
                   page: const BottomNavigationView(),
                   routeType: RouteType.pushReplace);
-              return false;
             },
             child: Consumer<SubmissionDataViewModel>(
                 builder: (context, provider, child) {
               return Scaffold(
                 appBar: CustomAppBar(
-                    height: SizeConfig.height * .1, title: 'Registration'),
+                  height: SizeConfig.height * .1,
-                body: Stack(
+                  title: 'Registration',
-                  children: [
+                  leading: BackButtonView(
-                    Column(
+                    onPress: () {
+                      routePush(
+                        context,
+                        page: const BottomNavigationView(),
+                        routeType: RouteType.pushReplace,
+                      );
+                    },
+                  ),
+                ),
+                body: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
@@ -89,8 +102,7 @@ class _SubmissionParentState extends State<SubmissionParent> {
                           horizontal: 16.0, vertical: 16.0),
                       child: Row(
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                            children:
+                        children: List.generate(provider.stepAmount, (index) {
-                                List.generate(provider.stepAmount, (index) {
                           return _stepItem(
                             isCurrentStep:
                                 provider.getCurrentStep == index + 1 ||
@@ -100,16 +112,13 @@ class _SubmissionParentState extends State<SubmissionParent> {
                       ),
                     ),
                     Expanded(
-                          child: Container(
+                      child: SingleChildScrollView(
-                            padding:
+                        padding: const EdgeInsets.symmetric(horizontal: 16.0),
-                                const EdgeInsets.symmetric(horizontal: 16.0),
                         child: _content(provider.getCurrentStep),
                       ),
                     ),
                   ],
                 ),
-                  ],
-                ),
               );
             }),
           );

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

@@ -176,7 +176,9 @@ class SubmitDataIdCard extends StatelessWidget {
           return SingleChildScrollView(
             child: Consumer<SubmissionDataViewModel>(
                 builder: (context, provider, child) {
-              return Column(
+              return Form(
+                key: provider.formKeySubmitIdCard,
+                child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
                     const TextCaption(
@@ -184,14 +186,35 @@ class SubmitDataIdCard extends StatelessWidget {
                     TextFormView(
                       name: 'NIK',
                       keyboardType: TextInputType.number,
+                      validator: (value) {
+                        if (value!.isEmpty) {
+                          return 'Field must be filled';
+                        }
+                        return null;
+                      },
+                    ),
+                    TextFormView(
+                      name: 'Full Name',
+                      validator: (value) {
+                        if (value!.isEmpty) {
+                          return 'Field must be filled';
+                        }
+                        return null;
+                      },
                     ),
-                  TextFormView(name: 'Full Name'),
                     DatePickerView(
                       name: 'Birth Date',
                       ctrl: provider.ctrlBirthDate,
                       maxDate: DateTime.now(),
                       isMultipleSelection: false,
-                      enabled: true),
+                      enabled: true,
+                      validatorDate: (value) {
+                        if (value!.isEmpty) {
+                          return 'Field must be filled';
+                        }
+                        return null;
+                      },
+                    ),
                     photoDocument(provider),
                     Container(
                       width: SizeConfig.width,
@@ -241,14 +264,19 @@ class SubmitDataIdCard extends StatelessWidget {
                     ButtonView(
                       name: 'Next',
                       onPressed: () async {
+                        if (provider.formKeySubmitIdCard.currentState!
+                            .validate()) {
                           await provider.next(context).then((value) {
                             if (value) {
-                          routePush(context, page: const SubmissionParent());
+                              routePush(context,
+                                  page: const SubmissionParent());
                             }
                           });
+                        }
                       },
                     )
                   ],
+                ),
               );
             }),
           );

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

@@ -15,41 +15,70 @@ import 'package:provider/provider.dart';
 class SubmitEmail extends StatelessWidget {
   const SubmitEmail({Key? key}) : super(key: key);
 
-  Widget _emailVerify() {
+  Widget _emailVerify(BuildContext context, SubmissionDataViewModel provider) {
-    return Column(
+    var textTheme = Theme.of(context).textTheme;
+    return Padding(
+      padding: const EdgeInsets.all(24.0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
         children: [
+          const TextCaption(title: 'Check your e-mail'),
           const ImageView(image: PathAssets.imgEmail),
           Align(
             alignment: Alignment.center,
             child: RichText(
               textAlign: TextAlign.center,
               text: TextSpan(children: [
-              const TextSpan(
+                TextSpan(
                   text:
                       'We have sent a verification link to your e-mail. \nPlease check your email for ',
-                style: TextStyle(
+                  style: textTheme.displayMedium,
-                  color: Colors.black,
-                  decoration: TextDecoration.none,
-                ),
                 ),
                 TextSpan(
-                recognizer: TapGestureRecognizer()..onTap = () {},
+                  recognizer: TapGestureRecognizer()
+                    ..onTap = () async {
+                      await provider.next(context).then((value) {
+                        if (value) {
+                          routePush(context, page: const SubmissionParent());
+                        }
+                      });
+                    },
                   text: 'verification',
                   style: const TextStyle(
                     color: Colors.blue,
                   ),
                 ),
-              const TextSpan(
+                TextSpan(
                   text: ' to \ncontinue registration.',
-                style: TextStyle(
+                  style: textTheme.displayMedium,
-                  color: Colors.black,
-                  decoration: TextDecoration.none,
-                ),
                 ),
               ]),
             ),
           ),
         ],
+      ),
+    );
+  }
+
+  showEmailVerify(BuildContext context, SubmissionDataViewModel provider) {
+    showModalBottomSheet(
+      context: context,
+      isScrollControlled: true,
+      enableDrag: false,
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.vertical(
+          top: Radius.zero,
+        ),
+      ),
+      builder: (context) {
+        var flutterView = View.of(context);
+        return Padding(
+          padding: EdgeInsets.only(
+            top: MediaQueryData.fromView(flutterView).padding.top,
+          ),
+          child: _emailVerify(context, provider),
+        );
+      },
     );
   }
 
@@ -60,16 +89,16 @@ class SubmitEmail extends StatelessWidget {
         builder: (context, child) {
           return Consumer<SubmissionDataViewModel>(
               builder: (context, provider, child) {
-            return SingleChildScrollView(
+            return SizedBox(
+              height: SizeConfig.height * .78,
+              child: Form(
+                key: provider.formKeySubmitEmail,
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
-                // mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  mainAxisAlignment: MainAxisAlignment.spaceAround,
                   children: [
-                  !provider.isEmailVerify
+                    const TextCaption(title: 'Enter your e-mail'),
-                      ? const TextCaption(title: 'Enter your e-mail')
+                    TextFormView(
-                      : const TextCaption(title: 'Check your e-mail '),
-                  !provider.isEmailVerify
-                      ? TextFormView(
                       name: 'E-mail Address',
                       hintText: 'Input e-mail address',
                       keyboardType: TextInputType.emailAddress,
@@ -82,24 +111,20 @@ class SubmitEmail extends StatelessWidget {
                           return null;
                         }
                       },
-                          // onTap: () {
+                    ),
-                          //   provider.submitEmail();
+                    SizedBox(height: SizeConfig.height * .43),
-                          // },
-                        )
-                      : _emailVerify(),
-                  SizedBox(height: SizeConfig.height * .42),
                     ButtonView(
                       name: 'Next',
                       onPressed: () async {
-                      await provider.next(context).then((value) {
+                        if (provider.formKeySubmitEmail.currentState!
-                        if (value) {
+                            .validate()) {
-                          routePush(context, page: const SubmissionParent());
+                          showEmailVerify(context, provider);
                         }
-                      });
                       },
                     )
                   ],
                 ),
+              ),
             );
           });
         });

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

@@ -2,6 +2,7 @@ import 'package:cims_apps/application/component/button/button_view.dart';
 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/core/route/route.dart';
+import 'package:cims_apps/core/utils/size_config.dart';
 import 'package:cims_apps/features/auth/registration/view/submission_data/submission_parent.dart';
 import 'package:cims_apps/features/auth/registration/viewmodel/submission_data_viewmodel.dart';
 import 'package:flutter/material.dart';
@@ -17,12 +18,13 @@ class SubmitPersonalData extends StatelessWidget {
         builder: (context, child) {
           return Consumer<SubmissionDataViewModel>(
               builder: (context, provider, child) {
-            return SingleChildScrollView(
+            return SizedBox(
+              height: SizeConfig.height * .78,
               child: Form(
                 key: provider.formKeyPersonalData,
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  mainAxisAlignment: MainAxisAlignment.spaceAround,
                   children: [
                     const TextCaption(title: 'Your personal details'),
                     SelectFormView(
@@ -31,6 +33,12 @@ class SubmitPersonalData extends StatelessWidget {
                       ctrl: provider.ctrlOccupation,
                       listItem: provider.listOccupation,
                       onSelect: (value) {},
+                      validator: (value) {
+                        if (value!.isEmpty) {
+                          return 'Field must be filled';
+                        }
+                        return null;
+                      },
                     ),
                     SelectFormView(
                       name: 'Income Level (IDR)',
@@ -38,6 +46,12 @@ class SubmitPersonalData extends StatelessWidget {
                       ctrl: provider.ctrlIncome,
                       listItem: provider.listIncome,
                       onSelect: (value) {},
+                      validator: (value) {
+                        if (value!.isEmpty) {
+                          return 'Field must be filled';
+                        }
+                        return null;
+                      },
                     ),
                     SelectFormView(
                       name: 'Marital Status',
@@ -45,6 +59,12 @@ class SubmitPersonalData extends StatelessWidget {
                       ctrl: provider.ctrlMarital,
                       listItem: provider.listMarital,
                       onSelect: (value) {},
+                      validator: (value) {
+                        if (value!.isEmpty) {
+                          return 'Field must be filled';
+                        }
+                        return null;
+                      },
                     ),
                     SelectFormView(
                       name: 'Source of Fund',
@@ -52,20 +72,28 @@ class SubmitPersonalData extends StatelessWidget {
                       ctrl: provider.ctrlSourceFund,
                       listItem: provider.listSourceFund,
                       onSelect: (value) {},
+                      validator: (value) {
+                        if (value!.isEmpty) {
+                          return 'Field must be filled';
+                        }
+                        return null;
+                      },
                     ),
-                    Align(
+                    // SizedBox(height: SizeConfig.height * .18),
-                      alignment: Alignment.bottomCenter,
+                    ButtonView(
-                      child: ButtonView(
+                      marginVertical: 0,
                       name: 'Next',
                       onPressed: () async {
+                        if (provider.formKeyPersonalData.currentState!
+                            .validate()) {
                           await provider.next(context).then((value) {
                             if (value) {
                               routePush(context,
                                   page: const SubmissionParent());
                             }
                           });
+                        }
                       },
-                      ),
                     )
                   ],
                 ),

lib/features/auth/registration/view/submission_data/submit_signature/initial_signature.dart

@@ -24,15 +24,18 @@ class InitialSignature extends StatelessWidget {
         builder: (context, child) {
           return Consumer<SubmissionDataViewModel>(
               builder: (context, provider, child) {
-            return Column(
+            return SizedBox(
+              height: SizeConfig.height * .8,
+              child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
                   const TextCaption(title: 'Draw your digital sign'),
                   const ImageView(image: PathAssets.frameSignature),
                   const ListTileView(
                       title:
                           'Make sure the sign you draw is match with your ID Card'),
-                SizedBox(height: SizeConfig.height * .07),
+                  SizedBox(height: SizeConfig.height * .1),
                   ButtonView(
                     name: 'Next',
                     onPressed: () {
@@ -44,6 +47,7 @@ class InitialSignature extends StatelessWidget {
                     },
                   )
                 ],
+              ),
             );
           });
         });

lib/features/auth/registration/viewmodel/submission_data_viewmodel.dart

@@ -1,5 +1,6 @@
 import 'package:camera/camera.dart';
 import 'package:cims_apps/application/component/select_form/select_form_view.dart';
+import 'package:cims_apps/features/auth/registration/view/submission_data/data_bank/confirm_bank_account.dart';
 import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
@@ -14,11 +15,16 @@ class SubmissionDataViewModel extends ChangeNotifier {
   bool _isEmailVerify = false;
   bool get isEmailVerify => _isEmailVerify;
   var formKeyPersonalData = GlobalKey<FormState>();
+  var formKeySubmitEmail = GlobalKey<FormState>();
+  var formKeySubmitIdCard = GlobalKey<FormState>();
+  var formKeySubmitDataBank = GlobalKey<FormState>();
   TextEditingController ctrlOccupation = TextEditingController();
   TextEditingController ctrlIncome = TextEditingController();
   TextEditingController ctrlMarital = TextEditingController();
   TextEditingController ctrlSourceFund = TextEditingController();
   TextEditingController ctrlBankName = TextEditingController();
+  TextEditingController ctrlNameAccountBank = TextEditingController();
+  TextEditingController ctrlNoAccountBank = TextEditingController();
   TextEditingController ctrlBankNameSearch = TextEditingController();
   TextEditingController ctrlBirthDate = TextEditingController();
   int step = 1;
@@ -120,4 +126,21 @@ class SubmissionDataViewModel extends ChangeNotifier {
     valueBank = value;
     notifyListeners();
   }
+
+  List<ModelDataBank> listDataBank = [];
+
+  Future<List<ModelDataBank>?> submitDataBank(
+      {required String bankName, accountNumber, accountName}) async {
+    List<ModelDataBank> listResponse = [
+      ModelDataBank('Bank Name', bankName),
+      ModelDataBank('Account Number', accountNumber),
+      ModelDataBank('Account Owner Name', accountName),
+      ModelDataBank('Name on ID card', accountName),
+    ];
+    if (listResponse.first.subtitle != null) {
+      // listDataBank = listResponse;
+      return listResponse;
+    }
+    return null;
+  }
 }

lib/features/transaction/view/cancel_view.dart

@@ -0,0 +1,35 @@
+import 'package:cims_apps/application/component/card_transaction/card_transaction_view.dart';
+import 'package:cims_apps/application/component/card_transaction/empty_card_transaction.dart';
+import 'package:cims_apps/features/transaction/viewmodel/transaction_viewmodel.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+class CancelView extends StatelessWidget {
+  const CancelView({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return SingleChildScrollView(
+      child: Consumer<TransactionViewModel>(
+        builder: (context, provider, child) => Column(
+          children: [
+            if (provider.listOnProcessTransaction.isEmpty)
+              EmptyCardTransaction(
+                onPressedButton: () {},
+              ),
+            ...provider.listOnProcessTransaction.map((e) {
+              return CardTransactionView(
+                step: 'cancel',
+                type: 'type',
+                amount: 'amount',
+                iconPath: 'iconPath',
+                subs: 'subs',
+                onTap: () {},
+              );
+            }),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/features/transaction/view/done_view.dart

@@ -0,0 +1,37 @@
+import 'package:cims_apps/application/component/card_transaction/card_transaction_view.dart';
+import 'package:cims_apps/application/component/card_transaction/empty_card_transaction.dart';
+import 'package:cims_apps/features/transaction/viewmodel/transaction_viewmodel.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+class DoneView extends StatelessWidget {
+  const DoneView({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return SingleChildScrollView(
+      child: Consumer<TransactionViewModel>(
+        builder: (context, provider, child) {
+          return Column(
+            children: [
+              if (provider.listOnProcessTransaction.isEmpty)
+                EmptyCardTransaction(
+                  onPressedButton: () {},
+                ),
+              ...provider.listOnProcessTransaction.map((e) {
+                return CardTransactionView(
+                  step: 'done',
+                  type: 'type',
+                  amount: 'amount',
+                  iconPath: 'iconPath',
+                  subs: 'subs',
+                  onTap: () {},
+                );
+              }),
+            ],
+          );
+        },
+      ),
+    );
+  }
+}

lib/features/transaction/view/onprocess_view.dart

@@ -0,0 +1,34 @@
+import 'package:cims_apps/application/component/card_transaction/card_transaction_view.dart';
+import 'package:cims_apps/application/component/card_transaction/empty_card_transaction.dart';
+import 'package:cims_apps/features/transaction/viewmodel/transaction_viewmodel.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+class OnProcessView extends StatelessWidget {
+  const OnProcessView({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return SingleChildScrollView(
+      child:
+          Consumer<TransactionViewModel>(builder: (context, provider, child) {
+        return Column(children: [
+          if (provider.listOnProcessTransaction.isEmpty)
+            EmptyCardTransaction(
+              onPressedButton: () {},
+            ),
+          ...provider.listOnProcessTransaction.map((e) {
+            return CardTransactionView(
+              step: 'on process',
+              type: 'type',
+              amount: 'amount',
+              iconPath: 'iconPath',
+              subs: 'subs',
+              onTap: () {},
+            );
+          }),
+        ]);
+      }),
+    );
+  }
+}

lib/features/transaction/view/transaction_view.dart

@@ -1,14 +1,124 @@
-import 'package:cims_apps/application/component/custom_app_bar/custom_app_bar.dart';
+import 'package:cims_apps/application/assets/path_assets.dart';
+import 'package:cims_apps/application/component/image/image_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/transaction/view/cancel_view.dart';
+import 'package:cims_apps/features/transaction/view/done_view.dart';
+import 'package:cims_apps/features/transaction/view/onprocess_view.dart';
+import 'package:cims_apps/features/transaction/view/waiting_view.dart';
+import 'package:cims_apps/features/transaction/viewmodel/transaction_viewmodel.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_toggle_tab/flutter_toggle_tab.dart';
+import 'package:provider/provider.dart';
 
 class TransactionView extends StatelessWidget {
   const TransactionView({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
+    List<Tab> textTabs = const [
+      Tab(text: 'Waiting'),
+      Tab(text: 'On process'),
+      Tab(text: 'Done'),
+      Tab(text: 'Cancel'),
+    ];
+    List<Widget> listTabBarView = const [
+      WaitingView(),
+      OnProcessView(),
+      DoneView(),
+      CancelView(),
+    ];
+
+    return ChangeNotifierProvider(
+        create: (context) => TransactionViewModel(),
+        builder: (context, child) {
           return Scaffold(
-      appBar: CustomAppBar(height: SizeConfig.height * 0.08, title: 'Transaction'),
+            backgroundColor: ColorPalette.primary,
+            body: SizedBox(
+              child: Stack(
+                children: [
+                  const ImageView(image: PathAssets.imgDashboardAccount),
+                  Column(
+                    children: [
+                      SizedBox(
+                        height: SizeConfig.height * .05,
+                      ),
+                      const Center(
+                        child: Text(
+                          'Transaction',
+                          style: TextStyle(
+                              fontSize: 20,
+                              fontWeight: FontWeight.w700,
+                              color: Colors.white),
+                        ),
+                      ),
+                      SizedBox(
+                        height: SizeConfig.height * .04,
+                      ),
+                      Container(
+                        margin: const EdgeInsets.symmetric(horizontal: 24),
+                        child: FlutterToggleTab(
+                          height: SizeConfig.height * .065,
+                          width: SizeConfig.width * .2,
+                          marginSelected: const EdgeInsets.all(8.0),
+                          isScroll: false,
+                          selectedTextStyle: const TextStyle(
+                            color: ColorPalette.primary,
+                            fontWeight: FontWeight.w700,
+                          ),
+                          unSelectedTextStyle: const TextStyle(
+                            color: ColorPalette.blackFont,
+                            fontWeight: FontWeight.w700,
+                          ),
+                          unSelectedBackgroundColors: const [
+                            ColorPalette.blue50
+                          ],
+                          selectedBackgroundColors: const [ColorPalette.white],
+                          labels: const ['Subscribe', 'Reedem'],
+                          selectedLabelIndex: (p0) {},
+                          selectedIndex: 0,
+                        ),
+                      ),
+                      Expanded(
+                          child: DefaultTabController(
+                        length: textTabs.length,
+                        child: Container(
+                          color: Colors.transparent,
+                          padding: const EdgeInsets.only(top: 32.0),
+                          child: Container(
+                            margin: const EdgeInsets.only(top: 24),
+                            padding: const EdgeInsets.only(top: 16.0),
+                            decoration: const BoxDecoration(
+                              color: Colors.white,
+                              borderRadius: BorderRadius.only(
+                                  topLeft: Radius.circular(24),
+                                  topRight: Radius.circular(24)),
+                            ),
+                            child: Column(
+                              children: [
+                                TabBar(
+                                  tabs: textTabs,
+                                  indicatorColor: Colors.blueAccent,
+                                ),
+                                Expanded(
+                                    child: Padding(
+                                  padding: const EdgeInsets.symmetric(
+                                    horizontal: 16.0,
+                                    vertical: 4.0,
+                                  ),
+                                  child: TabBarView(children: listTabBarView),
+                                ))
+                              ],
+                            ),
+                          ),
+                        ),
+                      )),
+                    ],
+                  )
+                ],
+              ),
+            ),
           );
+        });
   }
 }

lib/features/transaction/view/waiting_view.dart

@@ -0,0 +1,42 @@
+import 'package:cims_apps/application/assets/path_assets.dart';
+import 'package:cims_apps/application/component/card_transaction/card_transaction_view.dart';
+import 'package:cims_apps/application/component/card_transaction/empty_card_transaction.dart';
+import 'package:cims_apps/core/utils/number_formatter.dart';
+import 'package:cims_apps/core/utils/string_utils.dart';
+import 'package:cims_apps/features/transaction/viewmodel/transaction_viewmodel.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+class WaitingView extends StatelessWidget {
+  const WaitingView({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return SingleChildScrollView(
+      child:
+          Consumer<TransactionViewModel>(builder: (context, provider, child) {
+        return Column(
+          children: [
+            provider.listWaitingTransaction.isNotEmpty
+                ? CardTransactionView(
+                    onTap: () {},
+                    iconPath: PathAssets.iconEducation,
+                    type: 'Education',
+                    amount: NumberFormatter.numberCurrency(
+                      6000000,
+                      'Rp ',
+                      'id_ID',
+                      decimalDigits: 0,
+                    ),
+                    timeTransaction: StringUtils.formatTime(DateTime.now()),
+                    subs: '3 Subscription',
+                    step: 'waiting')
+                : EmptyCardTransaction(
+                    onPressedButton: () {},
+                  ),
+          ],
+        );
+      }),
+    );
+  }
+}

lib/features/transaction/viewmodel/transaction_viewmodel.dart

@@ -0,0 +1,8 @@
+import 'package:flutter/material.dart';
+
+class TransactionViewModel extends ChangeNotifier {
+  List listWaitingTransaction = [1];
+  List listOnProcessTransaction = [];
+  List listDoneTransaction = [];
+  List listCancelTransaction = [];
+}

lib/main.dart

@@ -76,10 +76,8 @@ class MyApp extends StatelessWidget {
             secondary: const Color(0xFFFECDA6),
             onBackground: const Color(0xFFA9A9A9),
           ),
-        bottomSheetTheme: BottomSheetThemeData(
+          bottomSheetTheme: const BottomSheetThemeData(
-          backgroundColor: Colors.white,
+              backgroundColor: Colors.white, surfaceTintColor: Colors.white)
-          surfaceTintColor: Colors.white
-        )
           // useMaterial3: true,
           ),
       initialRoute: initialRoute,

pubspec.lock

@@ -259,6 +259,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_toggle_tab:
+    dependency: "direct main"
+    description:
+      name: flutter_toggle_tab
+      sha256: "90ad0d050f656df677998825f985637d010117a1793828cd7e6dadada4ecd2c5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.1"
   flutter_web_plugins:
     dependency: transitive
     description: flutter

pubspec.yaml

@@ -53,6 +53,7 @@ dependencies:
   shared_preferences: ^2.2.2
   calendar_date_picker2: ^0.5.3
   google_sign_in: ^6.2.1
+  flutter_toggle_tab: ^1.4.1