diff --git a/assets/icons/icon-cake.png b/assets/icons/icon-cake.png new file mode 100644 index 0000000..e23085d Binary files /dev/null and b/assets/icons/icon-cake.png differ diff --git a/assets/icons/icon-create-plan.png b/assets/icons/icon-create-plan.png new file mode 100644 index 0000000..4ce3ef2 Binary files /dev/null and b/assets/icons/icon-create-plan.png differ diff --git a/assets/icons/icon-house.png b/assets/icons/icon-house.png new file mode 100644 index 0000000..c677f7d Binary files /dev/null and b/assets/icons/icon-house.png differ diff --git a/assets/icons/icon-toga.png b/assets/icons/icon-toga.png new file mode 100644 index 0000000..ee42476 Binary files /dev/null and b/assets/icons/icon-toga.png differ diff --git a/lib/application/component/goal_investing_view.dart b/lib/application/component/goal_investing_view.dart index 3b9627f..77f96fd 100644 --- a/lib/application/component/goal_investing_view.dart +++ b/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 + ), + ), + trailing: Icon(Icons.chevron_right_rounded), ), - ], - ), - ...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() ); } } diff --git a/lib/features/auth/login/view/login_view.dart b/lib/features/auth/login/view/login_view.dart index 15ff05a..4903c43 100644 --- a/lib/features/auth/login/view/login_view.dart +++ b/lib/features/auth/login/view/login_view.dart @@ -90,7 +90,7 @@ class _LoginViewState extends State { currentPage++; pageController.jumpToPage(1); } else { - routePush(context, page: RiskProfileView()); + routePush(context, page: BottomNavigationView()); } } } diff --git a/lib/features/auth/login/view/phone_number_view.dart b/lib/features/auth/login/view/phone_number_view.dart index ccb5224..cfd3b32 100644 --- a/lib/features/auth/login/view/phone_number_view.dart +++ b/lib/features/auth/login/view/phone_number_view.dart @@ -111,10 +111,6 @@ class PhoneNumberView extends StatelessWidget { ) ], ), - NumericPad( - onNumberSelected: (p0) { - }, - ) ], ), );