feat: profile page

lib/application/assets/path_assets.dart

@@ -49,28 +49,19 @@ 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 =
+  static const String iconNavigationHome = 'assets/icons/icon-navigation-home.png';
-      'assets/icons/icon-navigation-home.png';
+  static const String iconNavigationPlan = 'assets/icons/icon-navigation-plan.png';
-  static const String iconNavigationPlan =
+  static const String iconNavigationTransaction = 'assets/icons/icon-navigation-transaction.png';
-      'assets/icons/icon-navigation-plan.png';
+  static const String iconNavigationPortfolio = 'assets/icons/icon-navigation-portfolio.png';
-  static const String iconNavigationTransaction =
+  static const String iconNavigationProfile = 'assets/icons/icon-navigation-profile.png';
-      '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 iconEducation = 'assets/icons/icon-education.png';
+  static const String iconCat = 'assets/icons/icon-cat.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 iconCard = 'assets/icons/icon-card.png';
-  static const String iconChat = 'assets/icons/icon-chat.png';
-  static const String iconLogout = 'assets/icons/icon-logout.png';
   static const String iconProfile = 'assets/icons/icon-profile.png';
+  static const String iconPadlock = 'assets/icons/icon-padlock.png';
+  static const String iconCard = 'assets/icons/icon-card.png';
   static const String iconSetting = 'assets/icons/icon-setting.png';
-  static const String iconGadgetOutline =
+  static const String iconFaqs = 'assets/icons/icon-faqs.png';
-      'assets/icons/icon-gadget-outline.png';
+  static const String iconLogout = 'assets/icons/icon-logout.png';
 
   /// IMAGE
   static const String imgSplashLogo = 'assets/images/splash-logo.png';
@@ -99,22 +90,17 @@ class PathAssets {
   static const String imgMoneyIncome = 'assets/images/img-money-income.png';
   static const String imgGrowing = 'assets/images/img-growing.png';
   static const String imgCat = 'assets/images/img-cat.png';
-  static const String imgCatOutlined = 'assets/images/img-cat-outlined.png';
   static const String imgDeer = 'assets/images/img-deer.png';
   static const String imgLion = 'assets/images/img-lion.png';
   static const String imgGuideBank = 'assets/images/img-guide-bank.png';
   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 =
+  static const String imgPaymentSuccess = 'assets/images/img-payment-success.png';
-      '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 imgExpandPurchase =
+  static const String imgDashboardProfile =
-      'assets/images/img-expand-purchase.png';
+      'assets/images/img-dashboard-profile.png';
-  static const String imgEmptyTransaction =
-      'assets/images/img-empty-transaction.png';
-  static const String bgProfile = 'assets/images/bg-profile.png';
 
   static const Map<String, String> goalInvestIcon = {
     'Education': iconToga,

lib/application/component/card_transaction/card_transaction_view.dart

@@ -1,100 +0,0 @@
-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

@@ -1,44 +0,0 @@
-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/list_tile/list_tile_view.dart

@@ -8,26 +8,22 @@ class ListTileView extends StatelessWidget {
   final String title;
   final VoidCallback? onPressed;
   final Widget? prefixIcon, suffixIcon;
-  final EdgeInsetsGeometry? padding, margin;
+  final Color? colorTitle;
-  final TextStyle? textStyle;
   const ListTileView(
       {Key? key,
       required this.title,
       this.onPressed,
       this.prefixIcon,
       this.suffixIcon,
-      this.padding,
+      this.colorTitle})
-      this.textStyle,
-      this.margin})
       : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     return Container(
       width: SizeConfig.width,
-      padding: padding ??
+      padding: const EdgeInsets.symmetric(vertical: 16.0, horizontal: 8.0),
-          const EdgeInsets.symmetric(vertical: 16.0, horizontal: 8.0),
+      margin: const EdgeInsets.symmetric(vertical: 16.0),
-      margin: margin ?? const EdgeInsets.symmetric(vertical: 16.0),
       decoration: BoxDecoration(
         color: ColorPalette.blue50,
         borderRadius: BorderRadius.circular(10),
@@ -51,23 +47,22 @@ class ListTileView extends StatelessWidget {
           Expanded(
             child: Text(
               title,
-              style: textStyle ??
+              style: TextStyle(
-                  const TextStyle(
+                fontWeight: FontWeight.w600,
-                    fontWeight: FontWeight.w600,
+                color: colorTitle ?? ColorPalette.slate500,
-                    color: ColorPalette.slate500,
+              ),
-                  ),
             ),
           ),
-          suffixIcon ??
+          suffixIcon != null
-              IconButton(
+              ? IconButton(
-                onPressed: onPressed,
+                  onPressed: onPressed,
-                icon: const Icon(
+                  icon: const Icon(
-                  Icons.arrow_forward_ios,
+                    Icons.arrow_forward_ios,
-                  color: ColorPalette.primary,
+                    color: ColorPalette.primary,
-                  size: 20,
+                    size: 20,
-                ),
+                  ),
-              ),
+                )
-          // : const SizedBox(),
+              : const SizedBox(),
         ],
       ),
     );

lib/application/component/numeric_pad/numeric_pad.dart

@@ -1,5 +1,3 @@
-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:flutter/material.dart';
@@ -86,7 +84,7 @@ class NumericPad extends StatelessWidget {
   }
 
   Widget spaceWidget() {
-    return Expanded(
+    return const Expanded(
         child: SizedBox()
     );
   }
@@ -98,11 +96,12 @@ class NumericPad extends StatelessWidget {
             onNumberSelected(number);
           },
           child: Container(
+            color: Colors.transparent,
             padding: EdgeInsets.symmetric(vertical: SizeConfig.height * .028),
             child: Text(
               number,
               textAlign: TextAlign.center,
-              style: TextStyle(
+              style: const TextStyle(
                 fontSize: 28,
                 fontWeight: FontWeight.bold,
                 color: ColorPalette.slate800
@@ -119,10 +118,14 @@ class NumericPad extends StatelessWidget {
           onTap: () {
             onNumberSelected('');
           },
-          child: Icon(
+          child: Container(
-            Icons.backspace_outlined,
+            color: Colors.transparent,
-            size: 28,
+            padding: EdgeInsets.symmetric(vertical: SizeConfig.height * .028),
-            color: ColorPalette.slate800,
+            child: const Icon(
+              Icons.backspace_outlined,
+              size: 28,
+              color: ColorPalette.slate800,
+            ),
           ),
         )
     );

lib/application/component/take_picture_screen/display_picture_screen.dart

@@ -2,7 +2,6 @@ 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';
@@ -95,8 +94,10 @@ class _DisplayPictureScreenState extends State<DisplayPictureScreen> {
           return Consumer<SubmissionDataViewModel>(
               builder: (context, provider, child) {
             return Scaffold(
-              appBar: CustomAppBar(
+              appBar: AppBar(
-                  height: SizeConfig.height * .08, title: 'Preview'),
+                title: const Text('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,6 +1,5 @@
 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';
@@ -28,6 +27,7 @@ class TakePictureScreenState extends State<TakePictureScreen> {
   late String _takeContent;
 
   Future<void> changeFlash() async {
+    await _controller.setFlashMode(FlashMode.auto);
     setState(() {
       isFlash = !isFlash;
     });
@@ -44,7 +44,6 @@ 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
@@ -58,10 +57,9 @@ class TakePictureScreenState extends State<TakePictureScreen> {
   Widget build(BuildContext context) {
     // Fill this out in the next steps.
     return Scaffold(
-      appBar: CustomAppBar(
+      appBar: AppBar(
-        title: 'Registration',
+        title: const Text('Registration'),
-        height: SizeConfig.height * .08,
+        actions: [
-        trailing: [
           IconButton(
               onPressed: () {
                 changeFlash();

lib/application/component/text_title/text_title.dart

@@ -5,17 +5,20 @@ class TextTitle extends StatelessWidget {
   final String title;
   final Color? color;
   final double? fontSize;
+  final TextAlign? textAlign;
   const TextTitle({
     Key? key,
     required this.title,
     this.color,
     this.fontSize,
+    this.textAlign,
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     return Text(
       title,
+      textAlign: textAlign,
       style: TextStyle(
         fontSize: fontSize ?? 20,
         fontWeight: FontWeight.w700,

lib/application/theme/color_palette.dart

@@ -75,6 +75,7 @@ class ColorPalette {
   static const Color backgroundBlueLight = Color(0xFFEBF3FD);
   static const Color blue50 = Color(0xFFEFF6FF);
   static const Color blue200 = Color(0xFFBFDBFE);
+  static const Color blue600 = Color(0xFF2563EB);
   static const Color blue900 = Color(0xFF1E3A8A);
   static const Color slate50 = Color(0xFFF8FAFC);
   static const Color slate200 = Color(0xFFE2E8F0);
@@ -90,9 +91,11 @@ class ColorPalette {
   static const Color cyan100 = Color(0xFFCFFAFE);
   static const Color cyan500 = Color(0xFF06B6D4);
   static const Color green100 = Color(0xFFDCFCE7);
+  static const Color green300 = Color(0xFF86EFAC);
   static const Color green400 = Color(0xFF4ADE80);
   static const Color green500 = Color(0xFF16A34A);
-  static const Color red600 = Color(0xffDC2626);
+  static const Color red600 = Color(0xFFDC2626);
+  static const Color red50 = Color(0xFFFEF2F2);
 
   static const Map<String, Color> investTypeColor = {
     'Money Market': purple500,
@@ -107,4 +110,16 @@ class ColorPalette {
     'Sharia': green100,
     'Bonds': cyan100
   };
+
+  static const Map<String, Color> riskColor = {
+    'Moderate': orange500,
+    'Conservative': green500,
+    'Aggressive': cyan500
+  };
+
+  static const Map<String, Color> textRiskColor = {
+    'Moderate': orange500,
+    'Conservative': green300,
+    'Aggressive': cyan500
+  };
 }

lib/core/utils/string_utils.dart

@@ -1,8 +1,3 @@
-import 'package:cims_apps/application/theme/color_palette.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:intl/intl.dart';
-
 class StringUtils {
   static bool emailValidation(String email) {
     return RegExp(
@@ -18,24 +13,4 @@ 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 '--:--:--';
-  }
-
-  static void iCopyToClipboard(BuildContext context,
-      {String? desc, required String text}) {
-    Clipboard.setData(ClipboardData(text: text));
-    ScaffoldMessenger.of(context)
-        .showSnackBar(SnackBar(
-          backgroundColor: ColorPalette.primary,
-          content: Text(desc ?? "Text copied to clipboard"),
-        ))
-        .closed
-        .then((value) => ScaffoldMessenger.of(context).removeCurrentSnackBar());
-  }
 }

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

@@ -6,120 +6,107 @@ 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) {
-    final listDataBank =
+    List listData = [
-        ModalRoute.of(context)!.settings.arguments as List<ModelDataBank>;
+      {'title': 'Bank Name', 'subtitle': 'Bank Mandiri'},
-
+      {'title': 'Account Number', 'subtitle': '123002212084'},
-    return ChangeNotifierProvider(
+      {'title': 'Account Owner Name', 'subtitle': 'Muhamad Rosyidin'},
-        create: (context) => SubmissionDataViewModel(),
+      {'title': 'Name on ID card', 'subtitle': 'Muhamad Rosyidin'},
-        builder: (context, child) {
+    ];
-          return Scaffold(
+    return Scaffold(
-            appBar: AppBar(
+      appBar: AppBar(
-              toolbarHeight: 70,
+        toolbarHeight: 70,
-              backgroundColor: Colors.white,
+        backgroundColor: Colors.white,
-              surfaceTintColor: Colors.white,
+        surfaceTintColor: Colors.white,
-              automaticallyImplyLeading: false,
+        automaticallyImplyLeading: false,
-              title: Row(
+        title: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
+          children: [
-                  const BackButtonView(),
+            const BackButtonView(),
-                  const Text('Registration'),
+            const Text('Registration'),
-                  SizedBox(
+            SizedBox(
-                    width: SizeConfig.width * 0.1,
+              width: SizeConfig.width * 0.1,
-                  )
+            )
-                ],
+          ],
-              ),
+        ),
-              shape: const RoundedRectangleBorder(
+        shape: const RoundedRectangleBorder(
-                  side: BorderSide(color: ColorPalette.slate200)),
+            side: BorderSide(color: ColorPalette.slate200)),
-            ),
+      ),
-            body: SingleChildScrollView(
+      body: SingleChildScrollView(
-              padding: const EdgeInsets.all(16.0),
+        padding: const EdgeInsets.all(16.0),
-              child: SizedBox(
+        child: SizedBox(
-                height: SizeConfig.height * .85,
+          height: SizeConfig.height * .85,
-                child: Consumer<SubmissionDataViewModel>(
+          child: Column(
-                    builder: (context, provider, child) {
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  return Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
-                    crossAxisAlignment: CrossAxisAlignment.start,
+              const TextCaption(title: 'Bank account confirmation'),
-                    children: [
+              SizedBox(
-                      const TextCaption(title: 'Bank account confirmation'),
+                height: SizeConfig.height * .6,
-                      SizedBox(
+                child: Column(
-                        height: SizeConfig.height * .6,
+                  mainAxisAlignment: MainAxisAlignment.start,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    ...listData.map((e) {
+                      return Padding(
+                        padding: const EdgeInsets.only(bottom: 16.0),
                         child: Column(
                           mainAxisAlignment: MainAxisAlignment.start,
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
-                            ...listDataBank.map((e) {
+                            Text(
-                              return Padding(
+                              e['title'],
-                                padding: const EdgeInsets.only(bottom: 16.0),
+                              style: const TextStyle(
-                                child: Column(
+                                  color: ColorPalette.slate400, fontSize: 16),
-                                  mainAxisAlignment: MainAxisAlignment.start,
+                            ),
-                                  crossAxisAlignment: CrossAxisAlignment.start,
+                            Text(
-                                  children: [
+                              e['subtitle'],
-                                    Text(
+                              style: const TextStyle(
-                                      e.title!,
+                                  fontSize: 16,
-                                      style: const TextStyle(
+                                  color: ColorPalette.slate800,
-                                          color: ColorPalette.slate400,
+                                  fontWeight: FontWeight.w600),
-                                          fontSize: 16),
-                                    ),
-                                    Text(
-                                      e.subtitle!,
-                                      style: const TextStyle(
-                                          fontSize: 16,
-                                          color: ColorPalette.slate800,
-                                          fontWeight: FontWeight.w600),
-                                    ),
-                                  ],
-                                ),
-                              );
-                            }).toList(),
-                            const ListTileView(
-                              title:
-                                  'Make sure your data is correct as it will affect the disbursement process',
                             ),
                           ],
                         ),
-                      ),
+                      );
-                      Row(
+                    }).toList(),
-                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    const ListTileView(
-                        children: [
+                      title:
-                          ButtonView(
+                          'Make sure your data is correct as it will affect the disbursement process',
-                            name: 'Recheck',
+                    ),
-                            isOutlined: true,
+                  ],
-                            width: SizeConfig.width * .42,
+                ),
-                            onPressed: () {
-                              Navigator.pop(context);
-                            },
-                          ),
-                          ButtonView(
-                            name: 'Confirm',
-                            width: SizeConfig.width * .42,
-                            onPressed: () {
-                              routePush(context,
-                                  page: const SubmissionParent());
-                            },
-                          ),
-                        ],
-                      )
-                    ],
-                  );
-                }),
               ),
-            ),
+              Row(
-          );
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        });
+                children: [
+                  ButtonView(
+                    name: 'Recheck',
+                    isOutlined: true,
+                    width: SizeConfig.width * .42,
+                    onPressed: () {
+                      Navigator.pop(context);
+                    },
+                  ),
+                  ButtonView(
+                    name: 'Confirm',
+                    width: SizeConfig.width * .42,
+                    onPressed: () {
+                      routePush(context, page: const SubmissionParent());
+                    },
+                  ),
+                ],
+              )
+            ],
+          ),
+        ),
+      ),
+    );
   }
 }

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

@@ -63,98 +63,61 @@ class SubmitBankAccount extends StatelessWidget {
           return SizedBox(
             child: Consumer<SubmissionDataViewModel>(
                 builder: (context, provider, child) {
-              return SizedBox(
+              return SingleChildScrollView(
-                height: SizeConfig.height * .8,
+                child: Column(
-                child: Form(
+                  crossAxisAlignment: CrossAxisAlignment.start,
-                  key: provider.formKeySubmitDataBank,
+                  children: [
-                  child: Column(
+                    const TextCaption(title: 'Input your bank account data'),
-                    crossAxisAlignment: CrossAxisAlignment.start,
+                    TextFormView(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      name: 'Bank Name',
-                    children: [
+                      hintText: 'Select bank',
-                      const TextCaption(title: 'Input your bank account data'),
+                      readOnly: true,
-                      TextFormView(
+                      ctrl: provider.ctrlBankName,
-                        name: 'Bank Name',
+                      onTap: () {
-                        hintText: 'Select bank',
+                        showSearchBank(provider.ctrlBankName);
-                        readOnly: true,
+                      },
-                        ctrl: provider.ctrlBankName,
+                      suffixIcon: const Icon(
-                        onTap: () {
+                        Icons.keyboard_arrow_down_outlined,
-                          showSearchBank(provider.ctrlBankName);
-                        },
-                        suffixIcon: const Icon(
-                          Icons.keyboard_arrow_down_outlined,
-                        ),
-                        validator: (value) {
-                          if (value!.isEmpty) {
-                            return 'Field must be filled';
-                          }
-                          return null;
-                        },
                       ),
-                      TextFormView(
+                    ),
-                        name: 'Account Number',
+                    TextFormView(
-                        hintText: 'Input Account Number',
+                      name: 'Account Number',
-                        ctrl: provider.ctrlNoAccountBank,
+                      hintText: 'Input Account Number',
-                        keyboardType: TextInputType.number,
+                      keyboardType: TextInputType.number,
-                        validator: (value) {
+                      trailingTitleWidget: SizedBox(
-                          if (value!.isEmpty) {
+                        width: 24,
-                            return 'Field must be filled';
+                        child: GestureDetector(
-                          }
+                          onTap: () {
-                          return null;
+                            routePush(context, page: const GuideScreen());
-                        },
+                          },
-                        trailingTitleWidget: SizedBox(
+                          child:
-                          width: 24,
+                              const ImageView(image: PathAssets.iconQuestion),
-                          child: GestureDetector(
-                            onTap: () {
-                              routePush(context, page: const GuideScreen());
-                            },
-                            child:
-                                const ImageView(image: PathAssets.iconQuestion),
-                          ),
                         ),
                       ),
-                      TextFormView(
+                    ),
-                        name: 'Account Owner Name',
+                    TextFormView(
-                        hintText: 'Input Account Name',
+                      name: 'Account Owner Name',
-                        ctrl: provider.ctrlNameAccountBank,
+                      hintText: 'Input Account Name',
-                        validator: (value) {
+                    ),
-                          if (value!.isEmpty) {
+                    const Text(
-                            return 'Field must be filled';
+                      "Make sure the account you use is in your name, not someone else's",
-                          }
+                      style: TextStyle(
-                          return null;
+                        color: ColorPalette.slate400,
-                        },
                       ),
-                      const Text(
+                    ),
-                        "Make sure the account you use is in your name, not someone else's",
+                    SizedBox(height: SizeConfig.height * .08),
-                        style: TextStyle(
+                    ButtonView(
-                          color: ColorPalette.slate400,
+                      name: 'Next',
-                        ),
+                      onPressed: () {
-                      ),
+                        provider.next(context).then((value) {
-                      SizedBox(height: SizeConfig.height * .08),
+                          if (value) {
-                      ButtonView(
+                            routePush(context,
-                        name: 'Next',
+                                page: const ConfirmBankAccount());
-                        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(),
-                                      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 * .8,
+      height: SizeConfig.height,
-      padding: const EdgeInsets.all(24),
+      padding: EdgeInsets.all(24),
       child: Column(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
-          const Column(
+          Column(
             children: [
               ImageView(image: PathAssets.imgDataReport),
               SizedBox(
@@ -48,7 +48,7 @@ class RiskProfileView extends StatelessWidget {
           ),
           Column(
             children: [
-              const Row(
+              Row(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
                   ImageView(
@@ -68,7 +68,7 @@ class RiskProfileView extends StatelessWidget {
                   )
                 ],
               ),
-              const SizedBox(
+              SizedBox(
                 height: 24,
               ),
               ButtonView(

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

@@ -1,4 +1,3 @@
-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';
@@ -67,55 +66,47 @@ class _SubmissionParentState extends State<SubmissionParent> {
     return ChangeNotifierProvider(
         create: (context) => SubmissionDataViewModel(),
         builder: (context, child) {
-          return PopScope(
+          return WillPopScope(
-            canPop: false,
+            onWillPop: () async {
-            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,
+                    height: SizeConfig.height * .1, title: 'Registration'),
-                  title: 'Registration',
+                body: Stack(
-                  leading: BackButtonView(
-                    onPress: () {
-                      routePush(
-                        context,
-                        page: const BottomNavigationView(),
-                        routeType: RouteType.pushReplace,
-                      );
-                    },
-                  ),
-                ),
-                body: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
-                    Padding(
+                    Column(
-                      padding: const EdgeInsets.symmetric(
+                      crossAxisAlignment: CrossAxisAlignment.start,
-                          horizontal: 16.0, vertical: 16.0),
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      child: Row(
+                      children: [
-                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        Padding(
-                        children: List.generate(provider.stepAmount, (index) {
+                          padding: const EdgeInsets.symmetric(
-                          return _stepItem(
+                              horizontal: 16.0, vertical: 16.0),
-                            isCurrentStep:
+                          child: Row(
-                                provider.getCurrentStep == index + 1 ||
+                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                    provider.getCurrentStep - 1 > index,
+                            children:
-                          );
+                                List.generate(provider.stepAmount, (index) {
-                        }),
+                              return _stepItem(
-                      ),
+                                isCurrentStep:
-                    ),
+                                    provider.getCurrentStep == index + 1 ||
-                    Expanded(
+                                        provider.getCurrentStep - 1 > index,
-                      child: SingleChildScrollView(
+                              );
-                        padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                            }),
-                        child: _content(provider.getCurrentStep),
+                          ),
-                      ),
+                        ),
+                        Expanded(
+                          child: Container(
+                            padding:
+                                const EdgeInsets.symmetric(horizontal: 16.0),
+                            child: _content(provider.getCurrentStep),
+                          ),
+                        ),
+                      ],
                     ),
                   ],
                 ),

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

@@ -176,107 +176,79 @@ class SubmitDataIdCard extends StatelessWidget {
           return SingleChildScrollView(
             child: Consumer<SubmissionDataViewModel>(
                 builder: (context, provider, child) {
-              return Form(
+              return Column(
-                key: provider.formKeySubmitIdCard,
+                crossAxisAlignment: CrossAxisAlignment.start,
-                child: Column(
+                children: [
-                  crossAxisAlignment: CrossAxisAlignment.start,
+                  const TextCaption(
-                  children: [
+                      title: 'Check your ID card data for accuracy'),
-                    const TextCaption(
+                  TextFormView(
-                        title: 'Check your ID card data for accuracy'),
+                    name: 'NIK',
-                    TextFormView(
+                    keyboardType: TextInputType.number,
-                      name: 'NIK',
+                  ),
-                      keyboardType: TextInputType.number,
+                  TextFormView(name: 'Full Name'),
-                      validator: (value) {
+                  DatePickerView(
-                        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;
-                      },
-                    ),
-                    DatePickerView(
                       name: 'Birth Date',
                       ctrl: provider.ctrlBirthDate,
                       maxDate: DateTime.now(),
                       isMultipleSelection: false,
-                      enabled: true,
+                      enabled: true),
-                      validatorDate: (value) {
+                  photoDocument(provider),
-                        if (value!.isEmpty) {
+                  Container(
-                          return 'Field must be filled';
+                    width: SizeConfig.width,
-                        }
+                    padding: const EdgeInsets.symmetric(horizontal: 16.0),
-                        return null;
+                    margin: const EdgeInsets.symmetric(vertical: 16.0),
-                      },
+                    decoration: BoxDecoration(
+                      color: ColorPalette.blue50,
+                      borderRadius: BorderRadius.circular(10),
+                      border: Border.all(
+                        color: ColorPalette.greyLights,
+                        width: 1,
+                      ),
                     ),
-                    photoDocument(provider),
+                    child: Row(
-                    Container(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      width: SizeConfig.width,
+                      children: [
-                      padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                        const ImageView(
-                      margin: const EdgeInsets.symmetric(vertical: 16.0),
+                          image: PathAssets.iconShield,
-                      decoration: BoxDecoration(
+                          width: 20,
-                        color: ColorPalette.blue50,
+                          height: 22,
-                        borderRadius: BorderRadius.circular(10),
-                        border: Border.all(
-                          color: ColorPalette.greyLights,
-                          width: 1,
                         ),
-                      ),
+                        const SizedBox(
-                      child: Row(
+                          width: 8,
-                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        ),
-                        children: [
+                        const Expanded(
-                          const ImageView(
+                          child: Text(
-                            image: PathAssets.iconShield,
+                            'Will my data be safe?',
-                            width: 20,
+                            style: TextStyle(
-                            height: 22,
+                              fontWeight: FontWeight.w600,
-                          ),
-                          const SizedBox(
-                            width: 8,
-                          ),
-                          const Expanded(
-                            child: Text(
-                              'Will my data be safe?',
-                              style: TextStyle(
-                                fontWeight: FontWeight.w600,
-                                color: ColorPalette.primary,
-                              ),
-                            ),
-                          ),
-                          IconButton(
-                            onPressed: () {
-                              bottomSheet();
-                            },
-                            icon: const Icon(
-                              Icons.arrow_forward_ios,
                               color: ColorPalette.primary,
-                              size: 20,
                             ),
-                          )
+                          ),
-                        ],
+                        ),
-                      ),
+                        IconButton(
+                          onPressed: () {
+                            bottomSheet();
+                          },
+                          icon: const Icon(
+                            Icons.arrow_forward_ios,
+                            color: ColorPalette.primary,
+                            size: 20,
+                          ),
+                        )
+                      ],
                     ),
-                    ButtonView(
+                  ),
-                      name: 'Next',
+                  ButtonView(
-                      onPressed: () async {
+                    name: 'Next',
-                        if (provider.formKeySubmitIdCard.currentState!
+                    onPressed: () async {
-                            .validate()) {
+                      await provider.next(context).then((value) {
-                          await provider.next(context).then((value) {
+                        if (value) {
-                            if (value) {
+                          routePush(context, page: const SubmissionParent());
-                              routePush(context,
-                                  page: const SubmissionParent());
-                            }
-                          });
                         }
-                      },
+                      });
-                    )
+                    },
-                  ],
+                  )
-                ),
+                ],
               );
             }),
           );

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

@@ -15,70 +15,41 @@ import 'package:provider/provider.dart';
 class SubmitEmail extends StatelessWidget {
   const SubmitEmail({Key? key}) : super(key: key);
 
-  Widget _emailVerify(BuildContext context, SubmissionDataViewModel provider) {
+  Widget _emailVerify() {
-    var textTheme = Theme.of(context).textTheme;
+    return Column(
-    return Padding(
+      children: [
-      padding: const EdgeInsets.all(24.0),
+        const ImageView(image: PathAssets.imgEmail),
-      child: Column(
+        Align(
-        crossAxisAlignment: CrossAxisAlignment.start,
+          alignment: Alignment.center,
-        children: [
+          child: RichText(
-          const TextCaption(title: 'Check your e-mail'),
+            textAlign: TextAlign.center,
-          const ImageView(image: PathAssets.imgEmail),
+            text: TextSpan(children: [
-          Align(
+              const TextSpan(
-            alignment: Alignment.center,
+                text:
-            child: RichText(
+                    'We have sent a verification link to your e-mail. \nPlease check your email for ',
-              textAlign: TextAlign.center,
+                style: TextStyle(
-              text: TextSpan(children: [
+                  color: Colors.black,
-                TextSpan(
+                  decoration: TextDecoration.none,
-                  text:
-                      'We have sent a verification link to your e-mail. \nPlease check your email for ',
-                  style: textTheme.displayMedium,
                 ),
-                TextSpan(
+              ),
-                  recognizer: TapGestureRecognizer()
+              TextSpan(
-                    ..onTap = () async {
+                recognizer: TapGestureRecognizer()..onTap = () {},
-                      await provider.next(context).then((value) {
+                text: 'verification',
-                        if (value) {
+                style: const TextStyle(
-                          routePush(context, page: const SubmissionParent());
+                  color: Colors.blue,
-                        }
-                      });
-                    },
-                  text: 'verification',
-                  style: const TextStyle(
-                    color: Colors.blue,
-                  ),
                 ),
-                TextSpan(
+              ),
-                  text: ' to \ncontinue registration.',
+              const TextSpan(
-                  style: textTheme.displayMedium,
+                text: ' to \ncontinue registration.',
+                style: TextStyle(
+                  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),
-        );
-      },
     );
   }
 
@@ -89,41 +60,45 @@ class SubmitEmail extends StatelessWidget {
         builder: (context, child) {
           return Consumer<SubmissionDataViewModel>(
               builder: (context, provider, child) {
-            return SizedBox(
+            return SingleChildScrollView(
-              height: SizeConfig.height * .78,
+              child: Column(
-              child: Form(
+                crossAxisAlignment: CrossAxisAlignment.start,
-                key: provider.formKeySubmitEmail,
+                // mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                child: Column(
+                children: [
-                  crossAxisAlignment: CrossAxisAlignment.start,
+                  !provider.isEmailVerify
-                  mainAxisAlignment: MainAxisAlignment.spaceAround,
+                      ? const TextCaption(title: 'Enter your e-mail')
-                  children: [
+                      : const TextCaption(title: 'Check your e-mail '),
-                    const TextCaption(title: 'Enter your e-mail'),
+                  !provider.isEmailVerify
-                    TextFormView(
+                      ? TextFormView(
-                      name: 'E-mail Address',
+                          name: 'E-mail Address',
-                      hintText: 'Input e-mail address',
+                          hintText: 'Input e-mail address',
-                      keyboardType: TextInputType.emailAddress,
+                          keyboardType: TextInputType.emailAddress,
-                      validator: (value) {
+                          validator: (value) {
-                        if (value!.isEmpty) {
+                            if (value!.isEmpty) {
-                          return 'Filled cannot be empty';
+                              return 'Filled cannot be empty';
-                        } else if (!StringUtils.emailValidation(value)) {
+                            } else if (!StringUtils.emailValidation(value)) {
-                          return 'Format email wrong';
+                              return 'Format email wrong';
-                        } else {
+                            } else {
-                          return null;
+                              return null;
+                            }
+                          },
+                          // onTap: () {
+                          //   provider.submitEmail();
+                          // },
+                        )
+                      : _emailVerify(),
+                  SizedBox(height: SizeConfig.height * .42),
+                  ButtonView(
+                    name: 'Next',
+                    onPressed: () async {
+                      await provider.next(context).then((value) {
+                        if (value) {
+                          routePush(context, page: const SubmissionParent());
                         }
-                      },
+                      });
-                    ),
+                    },
-                    SizedBox(height: SizeConfig.height * .43),
+                  )
-                    ButtonView(
+                ],
-                      name: 'Next',
-                      onPressed: () async {
-                        if (provider.formKeySubmitEmail.currentState!
-                            .validate()) {
-                          showEmailVerify(context, provider);
-                        }
-                      },
-                    )
-                  ],
-                ),
               ),
             );
           });

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

@@ -2,7 +2,6 @@ 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';
@@ -18,13 +17,12 @@ class SubmitPersonalData extends StatelessWidget {
         builder: (context, child) {
           return Consumer<SubmissionDataViewModel>(
               builder: (context, provider, child) {
-            return SizedBox(
+            return SingleChildScrollView(
-              height: SizeConfig.height * .78,
               child: Form(
                 key: provider.formKeyPersonalData,
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
-                  mainAxisAlignment: MainAxisAlignment.spaceAround,
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
                     const TextCaption(title: 'Your personal details'),
                     SelectFormView(
@@ -33,12 +31,6 @@ 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)',
@@ -46,12 +38,6 @@ 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',
@@ -59,12 +45,6 @@ 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',
@@ -72,28 +52,20 @@ class SubmitPersonalData extends StatelessWidget {
                       ctrl: provider.ctrlSourceFund,
                       listItem: provider.listSourceFund,
                       onSelect: (value) {},
-                      validator: (value) {
-                        if (value!.isEmpty) {
-                          return 'Field must be filled';
-                        }
-                        return null;
-                      },
                     ),
-                    // SizedBox(height: SizeConfig.height * .18),
+                    Align(
-                    ButtonView(
+                      alignment: Alignment.bottomCenter,
-                      marginVertical: 0,
+                      child: ButtonView(
-                      name: 'Next',
+                        name: 'Next',
-                      onPressed: () async {
+                        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,30 +24,26 @@ class InitialSignature extends StatelessWidget {
         builder: (context, child) {
           return Consumer<SubmissionDataViewModel>(
               builder: (context, provider, child) {
-            return SizedBox(
+            return Column(
-              height: SizeConfig.height * .8,
+              crossAxisAlignment: CrossAxisAlignment.start,
-              child: Column(
+              children: [
-                crossAxisAlignment: CrossAxisAlignment.start,
+                const TextCaption(title: 'Draw your digital sign'),
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                const ImageView(image: PathAssets.frameSignature),
-                children: [
+                const ListTileView(
-                  const TextCaption(title: 'Draw your digital sign'),
+                    title:
-                  const ImageView(image: PathAssets.frameSignature),
+                        'Make sure the sign you draw is match with your ID Card'),
-                  const ListTileView(
+                SizedBox(height: SizeConfig.height * .07),
-                      title:
+                ButtonView(
-                          'Make sure the sign you draw is match with your ID Card'),
+                  name: 'Next',
-                  SizedBox(height: SizeConfig.height * .1),
+                  onPressed: () {
-                  ButtonView(
+                    provider.next(context).then((value) {
-                    name: 'Next',
+                      if (value) {
-                    onPressed: () {
+                        routePush(context, page: const SubmitSignature());
-                      provider.next(context).then((value) {
+                      }
-                        if (value) {
+                    });
-                          routePush(context, page: const SubmitSignature());
+                  },
-                        }
+                )
-                      });
+              ],
-                    },
-                  )
-                ],
-              ),
             );
           });
         });

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

@@ -1,6 +1,5 @@
 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';
 
@@ -15,16 +14,11 @@ 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;
@@ -126,21 +120,4 @@ 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/bottom_navigation_view.dart

@@ -4,7 +4,7 @@ import 'package:cims_apps/core/utils/size_config.dart';
 import 'package:cims_apps/features/dashboard/dashboard_account/view/homepage/homepage_view.dart';
 import 'package:cims_apps/features/dashboard/dashboard_account/view/plan/view/plan_view.dart';
 import 'package:cims_apps/features/dashboard/dashboard_account/view/portfolio/portfolio_view.dart';
-import 'package:cims_apps/features/profile/view/profile_view.dart';
+import 'package:cims_apps/features/dashboard/dashboard_account/view/profile/view/profile_view.dart';
 import 'package:cims_apps/features/transaction/view/transaction_view.dart';
 import 'package:flutter/material.dart';
 

lib/features/dashboard/dashboard_account/view/portfolio/portfolio_view.dart

@@ -388,7 +388,7 @@ class _PortofolioViewState extends State<PortofolioView> {
   Widget cardPortfolio() {
     return GestureDetector(
       onTap: () {
-        routePush(context, page: const PortfolioDetailView());
+        // routePush(context, page: const PortfolioDetailView());
       },
       child: Container(
         margin: const EdgeInsets.symmetric(horizontal: 24),

lib/features/dashboard/dashboard_account/view/profile/view/profile_view.dart

@@ -0,0 +1,165 @@
+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_title/text_title.dart';
+import 'package:cims_apps/application/theme/color_palette.dart';
+import 'package:cims_apps/core/utils/size_config.dart';
+import 'package:cims_apps/features/dashboard/dashboard_account/view/profile/view_model/profile_view_model.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+class RouteNavigation {
+  String icon;
+  String title;
+  Widget destination;
+
+  RouteNavigation(this.icon, this.title, this.destination);
+}
+
+class ProfileView extends StatelessWidget {
+  const ProfileView({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    List<RouteNavigation> listGeneral = [
+      RouteNavigation(PathAssets.iconProfile, 'Personal Data', Container()),
+      RouteNavigation(PathAssets.iconPadlock, 'Change Password', Container()),
+      RouteNavigation(PathAssets.iconCard, 'Add Card', Container()),
+      RouteNavigation(PathAssets.iconSetting, 'Settings', Container())
+    ];
+
+    List<RouteNavigation> listPreferences = [
+      RouteNavigation(PathAssets.iconFaqs, 'FAQs', Container()),
+      RouteNavigation(PathAssets.iconLogout, 'Log Out', Container())
+    ];
+
+    return Provider(
+      create: (context) => ProfileViewModel(),
+      child: Scaffold(
+        body: SizedBox(
+          width: SizeConfig.width,
+          height: SizeConfig.height,
+          child: Stack(
+            children: [
+              const Positioned(
+                left: 0,
+                right: 0,
+                top: 0,
+                bottom: 0,
+                child: ImageView(image: PathAssets.imgDashboardProfile)
+              ),
+              Consumer<ProfileViewModel>(
+                builder: (context, provider, child) {
+                  return ListView(
+                    padding: const EdgeInsets.all(0),
+                    children: [
+                      const SizedBox(
+                        height: 50,
+                      ),
+                      const Center(
+                        child: TextTitle(title: 'Profile', color: Colors.white, fontSize: 20,)
+                      ),
+                      SizedBox(
+                        height: SizeConfig.height * 0.05,
+                      ),
+                      Container(
+                        alignment: Alignment.center,
+                        decoration: BoxDecoration(
+                          shape: BoxShape.circle,
+                          color: Colors.white,
+                          border: Border.all(color: ColorPalette.slate200, width: 1.5)
+                        ),
+                        padding: const EdgeInsets.all(8),
+                        child: ImageView(image: PathAssets.iconCat, width: SizeConfig.width * 0.14,),
+                      ),
+                      const SizedBox(height: 16),
+                      Center(
+                        child: TextTitle(title: provider.getUser.name ?? '', color: Colors.white, fontSize: 24,)),
+                      Text('Investor ${provider.getUser.risk}',
+                        textAlign: TextAlign.center,
+                        style: TextStyle(
+                          fontSize: 16,
+                          color: ColorPalette.textRiskColor[provider.getUser.risk]
+                        ),
+                      ),
+                      const SizedBox(height: 24),
+                      boxNavigation('General', listGeneral),
+                      const SizedBox(height: 24),
+                      boxNavigation('Preferences', listPreferences)
+                    ],
+                  );
+                }
+              )
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget boxNavigation(String title, List<RouteNavigation> list) {
+    return Container(
+      padding: const EdgeInsets.all(16),
+      margin: const EdgeInsets.symmetric(horizontal: 24),
+      decoration: BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.circular(12),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(title,
+            style: const TextStyle(
+                fontWeight: FontWeight.w700,
+                color: ColorPalette.slate400
+            ),
+          ),
+          const SizedBox(height: 16),
+          Wrap(
+            runSpacing: 16,
+            children: list.map((e) {
+              return rowNavigation(
+                  e.icon,
+                  e.title,
+                  e.destination
+              );
+            }).toList(),
+          )
+        ],
+      ),
+    );
+  }
+
+  Widget rowNavigation(String icon, String text, Widget destination) {
+    bool isLogout = text == 'Log Out';
+    Color textColor = isLogout ? ColorPalette.red600 : ColorPalette.slate800;
+    Color bgLeadingColor = isLogout ? ColorPalette.red50 : ColorPalette.blue50;
+    Color iconColor = isLogout ? ColorPalette.red600 : ColorPalette.blue600;
+
+    return Row(
+      children: [
+        Container(
+          alignment: Alignment.center,
+          padding: const EdgeInsets.all(4),
+          decoration: BoxDecoration(
+            shape: BoxShape.circle,
+            color: bgLeadingColor
+          ),
+          child: Image.asset(icon, width: SizeConfig.width * 0.05, color: iconColor)
+        ),
+        Expanded(
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 16),
+            child: Text(text,
+              style: TextStyle(
+                fontWeight: FontWeight.w600,
+                fontSize: 16,
+                color: textColor
+              ),
+            ),
+          ),
+        ),
+        const Icon(Icons.chevron_right_outlined, size: 28, color: ColorPalette.slate400)
+      ],
+    );
+  }
+}

lib/features/dashboard/dashboard_account/view/profile/view_model/profile_view_model.dart

@@ -0,0 +1,11 @@
+class User {
+  String? name, risk;
+
+  User({this.name, this.risk});
+}
+
+class ProfileViewModel {
+  static final User _user = User(name: 'Muhammad Rosyidin', risk: 'Conservative');
+
+  User get getUser => _user;
+}

lib/features/dashboard/dashboard_public/view/dashboard_public_view.dart

@@ -44,7 +44,7 @@ class DashboardPublicView extends StatelessWidget {
           return Scaffold(
             body: SingleChildScrollView(
               padding: const EdgeInsets.only(
-                bottom: 8.0,
+                bottom: 24.0,
                 left: 24.0,
                 right: 24.0,
               ),
@@ -59,6 +59,7 @@ class DashboardPublicView extends StatelessWidget {
                       image: PathAssets.icon1,
                       width: SizeConfig.width * .35,
                     ),
+                    SizedBox(height: SizeConfig.height * .02),
                     Align(
                         alignment: Alignment.center,
                         heightFactor: 1,
@@ -105,7 +106,7 @@ class DashboardPublicView extends StatelessWidget {
                         provider.loginGoogle(context);
                       },
                     ),
-                    SizedBox(height: SizeConfig.height * .1),
+                    SizedBox(height: SizeConfig.height * .07),
                     Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [

lib/features/profile/model/list_menu_model.dart

@@ -1,8 +0,0 @@
-import 'package:flutter/material.dart';
-
-class ListMenuModel {
-  final String title, pathAsset;
-  final Widget page;
-  ListMenuModel(
-      {required this.title, required this.pathAsset, required this.page});
-}

lib/features/profile/view/profile_view.dart

@@ -1,119 +0,0 @@
-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/profile/model/list_menu_model.dart';
-import 'package:flutter/material.dart';
-
-class ProfileView extends StatelessWidget {
-  const ProfileView({Key? key}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    List<ListMenuModel> listMenuGeneral = [
-      ListMenuModel(
-          title: 'Personal Data',
-          pathAsset: PathAssets.iconProfile,
-          page: Container()),
-      ListMenuModel(
-          title: 'Change Password',
-          pathAsset: PathAssets.iconLock,
-          page: Container()),
-      ListMenuModel(
-          title: 'Add Card', pathAsset: PathAssets.iconCard, page: Container()),
-      ListMenuModel(
-          title: 'Settings',
-          pathAsset: PathAssets.iconSetting,
-          page: Container()),
-    ];
-
-    List<ListMenuModel> listMenuPreferences = [
-      ListMenuModel(
-          title: 'FAQs', pathAsset: PathAssets.iconChat, page: Container()),
-      ListMenuModel(
-          title: 'Log Out',
-          pathAsset: PathAssets.iconLogout,
-          page: Container()),
-    ];
-    TextStyle textStyle = const TextStyle(
-      fontSize: 20,
-      fontWeight: FontWeight.bold,
-      color: Colors.white,
-    );
-
-    Widget cardContent(
-        {required String title, required List<ListMenuModel> listMenu}) {
-      return Container(
-        width: SizeConfig.width,
-        padding: const EdgeInsets.all(16.0),
-        decoration: const BoxDecoration(
-            color: Colors.white,
-            borderRadius: BorderRadius.all(Radius.circular(12))),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text(title),
-            ...listMenu.map((e) {
-              return Padding(
-                padding: const EdgeInsets.only(top: 8.0),
-                child: ListTile(
-                  title: Text(e.title),
-                  contentPadding: EdgeInsets.zero,
-                  leading: ImageView(
-                      image: e.pathAsset, width: SizeConfig.width * .08),
-                  trailing: const Icon(Icons.arrow_forward_ios,
-                      color: ColorPalette.slate400),
-                  onTap: () {
-                    // routePush(context, page: e.page);
-                  },
-                ),
-              );
-            }),
-          ],
-        ),
-      );
-    }
-
-    return Scaffold(
-      appBar: null,
-      body: Stack(
-        children: [
-          ImageView(image: PathAssets.bgProfile, width: SizeConfig.width),
-          Container(
-            width: SizeConfig.width,
-            padding: const EdgeInsets.only(top: 40.0, left: 16.0, right: 16.0),
-            child: SingleChildScrollView(
-              padding: const EdgeInsets.only(bottom: 60.0),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: [
-                  Text('Profile', style: textStyle),
-                  Padding(
-                    padding: const EdgeInsets.only(top: 40.0, bottom: 8.0),
-                    child: ImageView(
-                      image: PathAssets.imgCatOutlined,
-                      width: SizeConfig.width * .28,
-                    ),
-                  ),
-                  Text('Muhamad Rosyidin',
-                      style: textStyle.copyWith(fontSize: 24)),
-                  Text('Investor Conservative',
-                      style: textStyle.copyWith(
-                        fontSize: 16,
-                        fontWeight: FontWeight.normal,
-                        color: ColorPalette.green400,
-                      )),
-                  SizedBox(height: SizeConfig.height * .02),
-                  cardContent(title: 'General', listMenu: listMenuGeneral),
-                  SizedBox(height: SizeConfig.height * .03),
-                  cardContent(
-                      title: 'Preference', listMenu: listMenuPreferences),
-                ],
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

lib/features/transaction/view/cancel_view.dart

@@ -1,51 +0,0 @@
-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/route/route.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/view/subscribe_detail_view.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.listCancelTransaction.isEmpty)
-              EmptyCardTransaction(
-                onPressedButton: () {},
-              ),
-            ...provider.listCancelTransaction.map((e) {
-              return CardTransactionView(
-                onTap: () {
-                  routePush(context,
-                      page: const SubscribeDetailView(
-                        type: 'virtual',
-                      ));
-                },
-                iconPath: PathAssets.iconEducation,
-                type: 'Education',
-                amount: NumberFormatter.numberCurrency(
-                  6000000,
-                  'Rp ',
-                  'id_ID',
-                  decimalDigits: 0,
-                ),
-                timeTransaction: StringUtils.formatTime(DateTime.now()),
-                subs: '3 Subscription',
-                step: 'cancel',
-              );
-            }),
-          ],
-        ),
-      ),
-    );
-  }
-}

lib/features/transaction/view/done_view.dart

@@ -1,53 +0,0 @@
-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/route/route.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/view/subscribe_detail_view.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.listDoneTransaction.isEmpty)
-                EmptyCardTransaction(
-                  onPressedButton: () {},
-                ),
-              ...provider.listDoneTransaction.map((e) {
-                return CardTransactionView(
-                  onTap: () {
-                    routePush(context,
-                        page: const SubscribeDetailView(
-                          type: 'virtual',
-                        ));
-                  },
-                  iconPath: PathAssets.iconEducation,
-                  type: 'Education',
-                  amount: NumberFormatter.numberCurrency(
-                    6000000,
-                    'Rp ',
-                    'id_ID',
-                    decimalDigits: 0,
-                  ),
-                  timeTransaction: StringUtils.formatTime(DateTime.now()),
-                  subs: '3 Subscription',
-                  step: 'done',
-                );
-              }),
-            ],
-          );
-        },
-      ),
-    );
-  }
-}

lib/features/transaction/view/onprocess_view.dart

@@ -1,50 +0,0 @@
-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/route/route.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/view/subscribe_detail_view.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(
-              onTap: () {
-                routePush(context,
-                    page: const SubscribeDetailView(
-                      type: 'virtual',
-                    ));
-              },
-              iconPath: PathAssets.iconHome,
-              type: 'Home',
-              amount: NumberFormatter.numberCurrency(
-                6000000,
-                'Rp ',
-                'id_ID',
-                decimalDigits: 0,
-              ),
-              timeTransaction: StringUtils.formatTime(DateTime.now()),
-              subs: '3 Subscription',
-              step: 'on process',
-            );
-          }),
-        ]);
-      }),
-    );
-  }
-}

lib/features/transaction/view/subscribe_detail_view.dart

@@ -1,516 +0,0 @@
-import 'package:cims_apps/application/assets/path_assets.dart';
-import 'package:cims_apps/application/component/button/back_button_view.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/application/component/list_tile/list_tile_view.dart';
-import 'package:cims_apps/application/theme/color_palette.dart';
-import 'package:cims_apps/core/utils/size_config.dart';
-import 'package:cims_apps/core/utils/string_utils.dart';
-import 'package:flutter/material.dart';
-
-class SubscribeDetailView extends StatelessWidget {
-  final String type;
-  const SubscribeDetailView({Key? key, required this.type}) : super(key: key);
-
-  Widget _stepper(
-    TextTheme textTheme, {
-    required String description,
-    String? date,
-    time,
-    bool isActive = false,
-    bool isDone = false,
-    bool isLast = false,
-  }) {
-    return Container(
-      padding: const EdgeInsets.only(top: 8.0, left: 16.0),
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Column(
-            children: [
-              Padding(
-                padding: const EdgeInsets.only(left: 2.0, top: 8.0),
-                child: Icon(
-                  Icons.circle_rounded,
-                  size: 10,
-                  color: isDone
-                      ? ColorPalette.primary
-                      : isActive
-                          ? ColorPalette.primary
-                          : ColorPalette.slate400,
-                ),
-              ),
-              if (!isLast)
-                ConstrainedBox(
-                  constraints: BoxConstraints.expand(
-                      height: SizeConfig.width * .2, width: 0.0),
-                  child: Padding(
-                    padding: const EdgeInsets.symmetric(vertical: 4.0),
-                    child: VerticalDivider(
-                      color:
-                          isDone ? ColorPalette.primary : ColorPalette.slate400,
-                      thickness: 2.0,
-                    ),
-                  ),
-                ),
-            ],
-          ),
-          Padding(
-            padding: const EdgeInsets.only(left: 16.0),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Padding(
-                  padding: const EdgeInsets.only(bottom: 8.0),
-                  child: Text(
-                    description,
-                    style: TextStyle(
-                      fontSize: 16,
-                      fontWeight: FontWeight.w600,
-                      color: isDone
-                          ? Colors.black87
-                          : isActive
-                              ? ColorPalette.primary
-                              : ColorPalette.slate400,
-                    ),
-                  ),
-                ),
-                isDone
-                    ? Row(
-                        children: [
-                          Text(date ?? ''),
-                          const Padding(
-                            padding: EdgeInsets.symmetric(horizontal: 4.0),
-                            child: Icon(
-                              Icons.circle,
-                              size: 6,
-                              color: ColorPalette.slate400,
-                            ),
-                          ),
-                          Text(time ?? ''),
-                        ],
-                      )
-                    : const SizedBox(),
-              ],
-            ),
-          )
-        ],
-      ),
-    );
-  }
-
-  Widget _listProduct(BuildContext context) {
-    TextTheme textTheme = Theme.of(context).textTheme;
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
-      child: Column(
-        children: [
-          Row(
-            children: [
-              ImageView(
-                image: PathAssets.imgProduct,
-                width: SizeConfig.width * .1,
-              ),
-              Padding(
-                padding: const EdgeInsets.only(left: 8.0),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Text(
-                      'Gemilang Dana Kas Maxima',
-                      style: textTheme.headlineSmall,
-                    ),
-                    Container(
-                        padding: const EdgeInsets.symmetric(
-                            horizontal: 8.0, vertical: 2.0),
-                        decoration: BoxDecoration(
-                          color: ColorPalette.purple100,
-                          border: Border.all(
-                            width: 1,
-                            color: ColorPalette.purple,
-                          ),
-                          borderRadius:
-                              const BorderRadius.all(Radius.circular(24)),
-                        ),
-                        child: const Text(
-                          'Money Market',
-                          style: TextStyle(
-                            color: ColorPalette.purple500,
-                          ),
-                        )),
-                  ],
-                ),
-              ),
-            ],
-          ),
-          Padding(
-            padding: const EdgeInsets.symmetric(vertical: 8.0),
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                const Text('Investment Amount'),
-                Text(
-                  'Rp 2.000.000',
-                  style: textTheme.headlineSmall,
-                ),
-              ],
-            ),
-          ),
-          const Divider(
-            color: ColorPalette.slate200,
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _cardVA(BuildContext context) {
-    return Container(
-      margin: const EdgeInsets.only(top: 16.0, bottom: 8.0),
-      padding: const EdgeInsets.only(bottom: 16.0),
-      decoration: BoxDecoration(
-        color: Colors.white,
-        border: Border.all(width: 1, color: ColorPalette.slate200),
-        borderRadius: const BorderRadius.all(Radius.circular(12)),
-      ),
-      child: Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 16.0),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            SizedBox(height: SizeConfig.height * .02),
-            RichText(
-                text: const TextSpan(children: [
-              TextSpan(
-                text: 'Transfer to  ',
-                style: TextStyle(
-                  color: ColorPalette.slate400,
-                  fontWeight: FontWeight.normal,
-                ),
-              ),
-              TextSpan(
-                text: 'ABC Virtual Account',
-                style: TextStyle(
-                  color: ColorPalette.slate800,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-            ])),
-            SizedBox(height: SizeConfig.height * .01),
-            const Text(
-              'Ferdy Maulana',
-              style: TextStyle(
-                color: Colors.black87,
-                fontSize: 16,
-              ),
-            ),
-            ListTileView(
-              title: '8785 0000 3165 5512',
-              prefixIcon: const SizedBox(),
-              padding: const EdgeInsets.only(right: 16.0),
-              margin: const EdgeInsets.only(top: 8.0, bottom: 8.0),
-              textStyle: const TextStyle(
-                  fontWeight: FontWeight.bold, color: ColorPalette.primary),
-              suffixIcon: ButtonView(
-                name: 'Copy',
-                width: SizeConfig.width * .3,
-                height: SizeConfig.height * .052,
-                sizeBorderRadius: 8.0,
-                widthPrefix: 8.0,
-                marginVertical: 10.0,
-                prefixIcon: const Icon(
-                  Icons.file_copy_outlined,
-                  color: Colors.white,
-                  size: 20,
-                ),
-                onPressed: () {
-                  StringUtils.iCopyToClipboard(
-                    context,
-                    text: '8785 0000 3165 5512',
-                  );
-                },
-              ),
-            ),
-            const Divider(color: ColorPalette.slate200),
-            const Text(
-              'Amount to be transferred',
-              style: TextStyle(
-                color: Colors.black87,
-                fontSize: 16,
-              ),
-            ),
-            ListTileView(
-              title: 'Rp 10.000.000',
-              prefixIcon: const SizedBox(),
-              padding: const EdgeInsets.only(right: 16.0),
-              margin: const EdgeInsets.only(top: 8.0),
-              textStyle: const TextStyle(
-                  fontWeight: FontWeight.bold, color: ColorPalette.primary),
-              suffixIcon: ButtonView(
-                name: 'Copy',
-                width: SizeConfig.width * .3,
-                height: SizeConfig.height * .052,
-                sizeBorderRadius: 8.0,
-                widthPrefix: 8.0,
-                marginVertical: 10.0,
-                prefixIcon: const Icon(
-                  Icons.file_copy_outlined,
-                  color: Colors.white,
-                  size: 20,
-                ),
-                onPressed: () {
-                  StringUtils.iCopyToClipboard(
-                    context,
-                    text: '10.000.000',
-                  );
-                },
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _cardContent(BuildContext context) {
-    TextTheme textTheme = Theme.of(context).textTheme;
-    List mySteps = const [
-      {
-        'desc': 'Payment Being Verified',
-        'date': '07 Feb 2024 ',
-        'time': '21:01',
-        'isActive': false,
-        'isDone': true,
-        'isLast': false,
-      },
-      {
-        'desc': 'Successful Payment',
-        'date': '07 Feb 2024 ',
-        'time': '21:01',
-        'isActive': true,
-        'isDone': false,
-        'isLast': false,
-      },
-      {
-        'desc': 'Investment Manager Verification',
-        'date': '07 Feb 2024 ',
-        'time': '21:01',
-        'isActive': false,
-        'isDone': false,
-        'isLast': false,
-      },
-      {
-        'desc': 'Successful Purchase',
-        'date': '07 Feb 2024 ',
-        'time': '21:01',
-        'isActive': false,
-        'isDone': false,
-        'isLast': true,
-      },
-    ];
-
-    return SingleChildScrollView(
-      padding: const EdgeInsets.symmetric(horizontal: 16.0),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              const Icon(Icons.access_time, color: ColorPalette.slate400),
-              const Padding(
-                padding: EdgeInsets.symmetric(horizontal: 8.0),
-                child: Text('Waiting for Payment'),
-              ),
-              Text('23:56:42', style: textTheme.headlineSmall),
-            ],
-          ),
-          type == 'virtual' ? _cardVA(context) : const SizedBox(),
-          Padding(
-            padding: const EdgeInsets.symmetric(vertical: 16.0),
-            child: Text('Purchase Details', style: textTheme.headlineSmall),
-          ),
-          Container(
-            margin: const EdgeInsets.symmetric(vertical: 8.0),
-            padding: const EdgeInsets.only(bottom: 16.0),
-            decoration: BoxDecoration(
-              color: Colors.white,
-              border: Border.all(width: 1, color: ColorPalette.slate200),
-              borderRadius: const BorderRadius.all(Radius.circular(12)),
-            ),
-            child: ExpansionTile(
-              shape: ShapeBorder.lerp(
-                  const StadiumBorder(side: BorderSide.none),
-                  InputBorder.none,
-                  0),
-              title: Row(
-                children: [
-                  ImageView(
-                    image: PathAssets.iconEducation,
-                    width: SizeConfig.width * .08,
-                  ),
-                  const Padding(
-                    padding: EdgeInsets.only(left: 8.0),
-                    child: Text('Education'),
-                  ),
-                ],
-              ),
-              subtitle: Padding(
-                padding: const EdgeInsets.only(left: 40.0),
-                child: Text('3 Subscriptions', style: textTheme.bodyMedium),
-              ),
-              children: [
-                _listProduct(context),
-                _listProduct(context),
-              ],
-            ),
-          ),
-          ...mySteps.map((e) {
-            return _stepper(
-              textTheme,
-              description: '${e['desc']}',
-              date: e['date'],
-              time: e['time'],
-              isActive: e['isActive'],
-              isDone: e['isDone'],
-              isLast: e['isLast'],
-            );
-          }),
-          Container(
-              margin: const EdgeInsets.symmetric(vertical: 8.0),
-              // padding: const EdgeInsets.only(bottom: 16.0),
-              decoration: BoxDecoration(
-                color: Colors.white,
-                border: Border.all(width: 1, color: ColorPalette.slate200),
-                borderRadius: const BorderRadius.all(Radius.circular(12)),
-              ),
-              child: ExpansionTile(
-                  shape: ShapeBorder.lerp(
-                      const StadiumBorder(side: BorderSide.none),
-                      InputBorder.none,
-                      0),
-                  title: Row(
-                    children: [
-                      const Expanded(
-                          child: Text('When Is My Purchase Complete?')),
-                      ImageView(
-                        image: PathAssets.imgExpandPurchase,
-                        width: SizeConfig.width * .15,
-                      ),
-                    ],
-                  ))),
-        ],
-      ),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: SizedBox(
-        child: Stack(
-          children: [
-            const ImageView(image: PathAssets.imgDashboardAccount),
-            Column(
-              children: [
-                SizedBox(height: SizeConfig.height * .05),
-                Padding(
-                  padding: const EdgeInsets.all(16.0),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.start,
-                    children: [
-                      BackButtonView(
-                        onPress: () => Navigator.pop(context),
-                      ),
-                      const Padding(
-                        padding: EdgeInsets.symmetric(horizontal: 80.0),
-                        child: Text(
-                          'Subscribe Detail',
-                          style: TextStyle(
-                            fontSize: 18,
-                            color: Colors.white,
-                            fontWeight: FontWeight.bold,
-                          ),
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-                type == 'virtual'
-                    ? const Padding(
-                        padding: EdgeInsets.only(bottom: 8.0),
-                        child: Text(
-                          'Virtual Account',
-                          style: TextStyle(
-                            color: Colors.white,
-                            fontSize: 16,
-                          ),
-                        ),
-                      )
-                    : const SizedBox(),
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    ImageView(
-                      image: PathAssets.imgProduct,
-                      width: SizeConfig.width * .08,
-                    ),
-                    Padding(
-                      padding: const EdgeInsets.only(left: 8.0),
-                      child: Text(
-                        type == 'virtual' ? 'ABC' : 'Shopping Pay',
-                        style: const TextStyle(
-                          fontWeight: FontWeight.bold,
-                          color: Colors.white,
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-                const Padding(
-                  padding: EdgeInsets.only(top: 8.0),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      Text(
-                        'No.Subscribe : ',
-                        style: TextStyle(
-                          fontWeight: FontWeight.normal,
-                          color: Colors.white,
-                        ),
-                      ),
-                      Text(
-                        'PI9393084SDMI1',
-                        style: TextStyle(
-                          fontWeight: FontWeight.bold,
-                          color: Colors.white,
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-                Expanded(
-                  child: Container(
-                    color: Colors.transparent,
-                    width: SizeConfig.width,
-                    padding: const EdgeInsets.only(top: 16.0),
-                    child: Container(
-                        margin: const EdgeInsets.only(top: 32.0),
-                        padding: const EdgeInsets.only(top: 32.0),
-                        decoration: const BoxDecoration(
-                          color: Colors.white,
-                          borderRadius: BorderRadius.only(
-                              topLeft: Radius.circular(24),
-                              topRight: Radius.circular(24)),
-                        ),
-                        child: _cardContent(context)),
-                  ),
-                ),
-              ],
-            )
-          ],
-        ),
-      ),
-    );
-  }
-}

lib/features/transaction/view/transaction_view.dart

@@ -1,124 +1,14 @@
-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/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 [
+    return Scaffold(
-      Tab(text: 'Waiting'),
+      appBar: CustomAppBar(height: SizeConfig.height * 0.08, title: 'Transaction'),
-      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(
-            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

@@ -1,49 +0,0 @@
-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/route/route.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/view/subscribe_detail_view.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: () {
-                      routePush(context,
-                          page: const SubscribeDetailView(
-                            type: 'normal',
-                          ));
-                    },
-                    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

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

lib/main.dart

@@ -20,66 +20,68 @@ class MyApp extends StatelessWidget {
       title: 'CIMS',
       debugShowCheckedModeBanner: false,
       theme: ThemeData(
-          appBarTheme: const AppBarTheme(
+        appBarTheme: const AppBarTheme(
-              centerTitle: true,
+            centerTitle: true,
-              backgroundColor: Colors.white,
+            backgroundColor: Colors.white,
-              elevation: 1,
+            elevation: 1,
-              foregroundColor: Colors.black,
+            foregroundColor: Colors.black,
-              titleTextStyle: TextStyle(
+            titleTextStyle: TextStyle(
-                fontSize: 20,
+              fontSize: 20,
-                fontWeight: FontWeight.w700,
+              fontWeight: FontWeight.w700,
-                fontFamily: 'Manrope',
+              fontFamily: 'Manrope',
-                color: ColorPalette.slate800,
-              )),
-          fontFamily: 'Manrope',
-          scaffoldBackgroundColor: Colors.white,
-          textTheme: const TextTheme(
-            displaySmall: TextStyle(
-              fontSize: 14,
-              fontWeight: FontWeight.w500,
               color: ColorPalette.slate800,
-            ),
+            )),
-            displayMedium: TextStyle(
+        fontFamily: 'Manrope',
-              fontSize: 16,
+        scaffoldBackgroundColor: Colors.white,
-              fontWeight: FontWeight.w600,
+        textTheme: const TextTheme(
-              color: ColorPalette.slate800,
+          displaySmall: TextStyle(
-            ),
+            fontSize: 14,
-            displayLarge: TextStyle(
+            fontWeight: FontWeight.w500,
-              fontSize: 16,
+            color: ColorPalette.slate800,
-              fontWeight: FontWeight.bold,
-              color: ColorPalette.slate800,
-            ),
-            bodyMedium: TextStyle(
-              fontSize: 14,
-              fontWeight: FontWeight.w600,
-              color: ColorPalette.slate500,
-            ),
-            bodyLarge: TextStyle(
-              fontSize: 16,
-              fontWeight: FontWeight.bold,
-              color: ColorPalette.slate500,
-            ),
-            headlineSmall: TextStyle(
-              fontSize: 16,
-              fontWeight: FontWeight.bold,
-              color: ColorPalette.slate800,
-            ),
-            headlineLarge: TextStyle(
-              fontSize: 28,
-              fontWeight: FontWeight.bold,
-              color: ColorPalette.slate800,
-            ),
           ),
-          colorScheme: const ColorScheme.light().copyWith(
+          displayMedium: TextStyle(
-            primary: const Color(0xff2563EB),
+            fontSize: 16,
-            onPrimary: const Color(0xFFFF9130),
+            fontWeight: FontWeight.w600,
-            secondary: const Color(0xFFFECDA6),
+            color: ColorPalette.slate800,
-            onBackground: const Color(0xFFA9A9A9),
           ),
-          bottomSheetTheme: const BottomSheetThemeData(
+          displayLarge: TextStyle(
-              backgroundColor: Colors.white, surfaceTintColor: Colors.white)
+            fontSize: 16,
-          // useMaterial3: true,
+            fontWeight: FontWeight.bold,
+            color: ColorPalette.slate800,
           ),
+          bodyMedium: TextStyle(
+            fontSize: 14,
+            fontWeight: FontWeight.w600,
+            color: ColorPalette.slate500,
+          ),
+          bodyLarge: TextStyle(
+            fontSize: 16,
+            fontWeight: FontWeight.bold,
+            color: ColorPalette.slate500,
+          ),
+          headlineSmall: TextStyle(
+            fontSize: 16,
+            fontWeight: FontWeight.bold,
+            color: ColorPalette.slate800,
+          ),
+          headlineLarge: TextStyle(
+            fontSize: 28,
+            fontWeight: FontWeight.bold,
+            color: ColorPalette.slate800,
+          ),
+        ),
+        colorScheme: const ColorScheme.light().copyWith(
+          primary: const Color(0xff2563EB),
+          onPrimary: const Color(0xFFFF9130),
+          secondary: const Color(0xFFFECDA6),
+          onBackground: const Color(0xFFA9A9A9),
+        ),
+        bottomSheetTheme: BottomSheetThemeData(
+          backgroundColor: Colors.white,
+          surfaceTintColor: Colors.white
+        )
+        // useMaterial3: true,
+      ),
       initialRoute: initialRoute,
       onGenerateRoute: generateRoutes,
       navigatorObservers: [

pubspec.lock

@@ -259,14 +259,6 @@ 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,7 +53,6 @@ dependencies:
   shared_preferences: ^2.2.2
   calendar_date_picker2: ^0.5.3
   google_sign_in: ^6.2.1
-  flutter_toggle_tab: ^1.4.1