Merge branch 'dev' of https://git.empatnusabangsa.com/nugrohob825/cims_apps into bayu/dev

lib/application/component/goal_investing_view.dart

@@ -1,4 +1,6 @@
 import 'package:cims_apps/application/assets/path_assets.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 GoalInvest {
@@ -20,27 +22,38 @@ class GoalInvestingView extends StatelessWidget {
       GoalInvest(PathAssets.iconCreatePlan, 'Create Plan'),
     ];
 
-
-
     return Column(
-      children: [
-        Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            Text('Your Goal in Investing'),
-            GestureDetector(
-              child: Icon(Icons.close_rounded),
+      children:
+        listGoalInvest.asMap().entries.map((e) {
+          return Padding(
+            padding: EdgeInsets.only(top: e.key != 0 ? 16 : 0),
+            child: ListTile(
+              shape: RoundedRectangleBorder(
+                side: BorderSide(color: ColorPalette.slate200),
+                borderRadius: BorderRadius.circular(14)
+              ),
+              leading: Container(
+                padding: EdgeInsets.all(4),
+                decoration: BoxDecoration(
+                  color: ColorPalette.blue200.withOpacity(0.5),
+                  borderRadius: BorderRadius.circular(8)
+                ),
+                child: Image.asset(
+                  e.value.icon,
+                  width: SizeConfig.width * 0.07
+                )
+              ),
+              contentPadding: EdgeInsets.symmetric(horizontal: 16, vertical: 4),
+              title: Text(e.value.title,
+                style: TextStyle(
+                  fontWeight: FontWeight.w600,
+                  fontSize: 16
                 ),
-          ],
               ),
-        ...listGoalInvest.asMap().entries.map((e) {
-          return ListTile(
-            leading: Image.asset(e.value.icon),
-            title: Text(e.value.title),
               trailing: Icon(Icons.chevron_right_rounded),
+            ),
           );
-        })
-      ],
+        }).toList()
     );
   }
 }

lib/features/auth/login/view/login_view.dart

@@ -90,7 +90,7 @@ class _LoginViewState extends State<LoginView> {
       currentPage++;
       pageController.jumpToPage(1);
     } else {
-      routePush(context, page: RiskProfileView());
+      routePush(context, page: BottomNavigationView());
     }
   }
 }

lib/features/auth/login/view/phone_number_view.dart

@@ -111,10 +111,6 @@ class PhoneNumberView extends StatelessWidget {
               )
             ],
           ),
-          NumericPad(
-            onNumberSelected: (p0) {
-            },
-          )
         ],
       ),
     );

lib/features/auth/registration/view/submission_data/terms_and_condition/terms_and_condition_view.dart

@@ -0,0 +1,90 @@
+import 'package:cims_apps/application/component/custom_app_bar/custom_app_bar.dart';
+import 'package:cims_apps/application/component/button/button_view.dart';
+import 'package:cims_apps/application/theme/color_palette.dart';
+import 'package:flutter/material.dart';
+
+class TermsAndConditionView extends StatelessWidget {
+  const TermsAndConditionView({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    List<String> listRules = [
+      'I have never committed nor been involved in any breach or violations of laws, especially that in financial terms such as corruption, manipulation, money laundering or terrorism',
+      'I have received comprehensive description from mutual marketing officers and fully understood Mutual Fund’s characteristics and therefore is ready for any risks occurring from investing in mutual fund',
+      'I have read and understood the content of prospectus, monthly report of mutual fun performance, products and other information related to the Mutual Fund that I am about to purchase',
+      'I fully understand that the Mutual Fund is the investment product of PT Gemilang Indonesia Manajemen Investasi and not the product of any selling agent',
+      'I fully understand that Investment Product is not included in Government Warranty or Deposit Warranty Institution and therefore such product is not guaranteed by government',
+      'I agree to relieve PT Gemilang Indonesia Manajemen Investasi any claims, cost and expenses related to or occurred due to PT Gemilang Indonesia Manajemen Investasi’s actions with regards to its instructions of my mutual fun unit transactions',
+      'I fully understand, consider and I am fully responsible for all the investment decision I have made without any influence of PT Gemilang Indonesia Manajemen Investasi or its employees, and;',
+      'I declare that all data I have presented are true',
+      'I am willing to comply with the provisions set forth in laws in the financial services sectors',
+      'PT Gemilang Indonesia Manajemen Investasi may refuse and close business relationship, refuse to transac with prospective customers and/or customers under UJK regulation No. 12/POJK. 01/2017 on the Implementation of Anti Money Laundering and Terrorism Funding Prevention Program in Financial Service Sector',
+      'I am willing to provide my data and information from PT Gemilang  Indonesia Manajemen Investasi to groups'
+    ];
+
+    return Scaffold(
+      appBar: CustomAppBar(
+          height: 70,
+          title: 'Terms And Condition'
+      ),
+      body: SingleChildScrollView(
+        padding: EdgeInsets.all(24),
+        child: Column(
+          children: [
+            Text(
+              'In relevance with the data that i have submitted and in relation to the purchase of Mutual Fund Products, I hereby declare that:',
+              style: TextStyle(
+                  fontWeight: FontWeight.w600,
+                  color: ColorPalette.slate800
+              ),
+            ),
+            SizedBox(height: 12),
+            ...listRules.asMap().entries.map((e) {
+              return Padding(
+                padding: EdgeInsets.only(top: e.key != 0 ? 12 : 0),
+                child: Row(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text('${e.key + 1}', style: TextStyle(color: ColorPalette.slate500)),
+                    SizedBox(width: 12),
+                    Expanded(
+                        child: Text(e.value, style: TextStyle(color: ColorPalette.slate500))
+                    )
+                  ],
+                ),
+              );
+            })
+          ],
+        ),
+      ),
+      bottomNavigationBar: Container(
+        height: 84,
+        padding: EdgeInsets.symmetric(horizontal: 24),
+        color: Colors.red,
+        child: Row(
+          children: [
+            Expanded(
+                child: ButtonView(
+                  name: 'Decline',
+                  onPressed: () {},
+                  marginVertical: 16,
+                  backgroundColor: ColorPalette.white,
+                  textColor: ColorPalette.primary,
+                  isOutlined: true,
+                  borderColor: ColorPalette.primary,
+                )
+            ),
+            SizedBox(width: 16),
+            Expanded(
+                child: ButtonView(
+                    name: 'Accept',
+                    onPressed: () {},
+                    marginVertical: 16
+                )
+            )
+          ],
+        ),
+      ),
+    );
+  }
+}