From b3a68b4436af1faf37fb3e9d819de093126749ae Mon Sep 17 00:00:00 2001 From: Prajna Prayoga Date: Thu, 15 Feb 2024 20:00:15 +0700 Subject: [PATCH 1/2] feat: terms and condition view --- .../terms_and_condition_view.dart | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 lib/features/auth/registration/view/submission_data/terms_and_condition/terms_and_condition_view.dart diff --git a/lib/features/auth/registration/view/submission_data/terms_and_condition/terms_and_condition_view.dart b/lib/features/auth/registration/view/submission_data/terms_and_condition/terms_and_condition_view.dart new file mode 100644 index 0000000..5d0e5d1 --- /dev/null +++ b/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 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 + ) + ) + ], + ), + ), + ); + } +} From 3c1f7e210a9a34a7ff43053c996ec3c66ed8bdb0 Mon Sep 17 00:00:00 2001 From: Prajna Prayoga Date: Thu, 15 Feb 2024 20:24:19 +0700 Subject: [PATCH 2/2] fix: assets local history --- assets/icons/icon-cake.png | Bin 0 -> 1524 bytes assets/icons/icon-create-plan.png | Bin 0 -> 1554 bytes assets/icons/icon-house.png | Bin 0 -> 1175 bytes assets/icons/icon-toga.png | Bin 0 -> 2073 bytes .../component/goal_investing_view.dart | 49 +++++++++++------- lib/features/auth/login/view/login_view.dart | 2 +- .../auth/login/view/phone_number_view.dart | 4 -- 7 files changed, 32 insertions(+), 23 deletions(-) create mode 100644 assets/icons/icon-cake.png create mode 100644 assets/icons/icon-create-plan.png create mode 100644 assets/icons/icon-house.png create mode 100644 assets/icons/icon-toga.png diff --git a/assets/icons/icon-cake.png b/assets/icons/icon-cake.png new file mode 100644 index 0000000000000000000000000000000000000000..e23085d90a6a0dcbb5d4488999589e15e3a6b7b4 GIT binary patch literal 1524 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 Ef^cZkTmS$7 literal 0 HcmV?d00001 diff --git a/assets/icons/icon-house.png b/assets/icons/icon-house.png new file mode 100644 index 0000000000000000000000000000000000000000..c677f7df37864c8de97b59bbed5472c77624ccb6 GIT binary patch literal 1175 zcmeAS@N?(olHy`uVBq!ia0vp^5g^RL1|$oo8khhn&H|6fVg?2sZxCi&YCCNuP>``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eBu8yaRV@L(#+c}Oww+%$v=I30>J?s;GOEfJi zYT6ezJ0^1v4e7E*VFq)K-FXRTcptF%=3jVcr8>9j`b;Apo|nsRTwCqa(3UV+<6F1x z=Y2B;gr+dWKZ&2DD%p@I(FQ_t@=PX`+ske_P0(YyGWmW$#r^N|WE&DKq|?8uizj;j zWj@XE$Y#Y&>wm{1<&74p{&?GdSy!Z}I>gdt=jFTer6bp6B(2;!FNfiT=+_Ifzdlw9 zoYnbp?~P?jg4^;9lXe^WSt_oXw(EA=q)*E#A8|=bU+A6^v1Yl*>hlrxvtRAwmAoLt zqq%Xy!aG+wmM-em7K`ZJcjdDem2rNTK*>s|$L9dv!3_2>8BZ#i3~b{aj&sz1RKopoZ*8o6^! zjKShDCF}0V8^!O}77P{yviV#Bg0EJ%TQ?awsO{j{IZLytsL7{bt@u3A`Ku#-MD7jx zqU3WrRF+FPr)b?PgV=+jCqrf3xa4MSzqGt*=PKt_50-v4R_AJ3EBHBVWr$^XsfWm& z>C$yUpTo{2zg!uMBL3rtmH4|4StkYXJcU#k}(kaK2COZnf?!Fwd z^%P(Ip$lJr=dN?Be3td{#gWyM^|HUEUz%#`eKy`N<@RlkM=Q0yny!ywT`VxKXVGH$ zdv}gp{;tw#p5!^H^M_X`yRyxTs;Y@IRzJ8M!#^bH&RI;4w74z`Om>|m?_&IZa#&IpXWwok(NkBgW!~HFFDkscBYN9vsqfPQo^L!} zYn!y?=H2?6a&>W=<#mj8pPDr0|NWW~S5v+B+wNS=i;wpPsT^C(>Z8R}_$Dt?W9jrS zHr(@CEY^oIU;l3>cQxsi*BP(%{L3Cy{BLFdD%m?bH1iS<9@&7!8i;V0u+CC$NdYmd1cp}5KK;hmYvx-TFn-*| z`jss@f#K!t9eLlhnhV(Gl_}O+S+!mbDUme^o0tB_dd}X?at z#lI|x)3r8KdbIb{fuhnKJEOkY?htqMDdL@G>VH?#P&bZCZb#HNi|VP*8$DeaemRP~ meNwnJ2b_x~+E#M?XQ=R-Vg4=SR}ZipVeoYIb6Mw<&;$U9x(HGL literal 0 HcmV?d00001 diff --git a/assets/icons/icon-toga.png b/assets/icons/icon-toga.png new file mode 100644 index 0000000000000000000000000000000000000000..ee42476924005dad4c26b17b612328b2bf306876 GIT binary patch literal 2073 zcmV+!2RP)@~0drDELIAGL9O(c600d`2O+f$vv5yP{2xYm=gp}5ORXBoC-;y ztfnT;6jU5Gwxpi-WDA6mrEdLmE75O-?Y1m`Zhigwy(a)lN=iyfN=iyfN=iyfiUorL zP+dQtoBe97ae&6~jM?#EM&B}D&6}V&N(=n3(KR$3NZ4BN2-Z=<`9FqZSzu&!k0E(c5z$pkjjxs_|Rp61Z`}k)SvSI2%PetGi zW^5Ew6FOIcry%S&CN74}JQu@U1Xe)UaWIaqH1i1WG8OpIALmtjFlgh))ImwIkE1gY z_-g0H*g6281I1w++I^?;((KG%K+2>p@bdG|xSiFuiy-V6nJk2<39O*c#>GT`UQNq3 z5(`XrF!R;g#3QZ4cSSn>oJinbTK}y%z}p4115py&Ml6AsUz|S%$3mYiyd8)V+cu;G zzK#x{4L=|hZM@%G*phmW=)fHE21UUHjXyj6bMZuEaHPQMEMlzV030#KFBs>Isc&8w z>jf@u2mk zrU8Eq3J~Vaw*($V2z26Amlg^FMgd`nQJSzJn=<%c-u$VD)tOZZk?; zLI+SSfmEFtSZ5D^?;8FmEB*%>Xlsx&BrIM>TVX!t$J>%~;07oN+6AQxj=je>1jcV$ z%`FAbx#=*z@p1Rwp~&#UA|8Uk#N$y z^*_EfUmvu(I~qrSV~|09fflgd#`h?!H*wJF+Ww~}8UmR$=e))^d%_qzhD0CEPq@Z5 zM0|Ew1+gghHb8Yakj>%dhaFnhx09fWBjmV`8vj&nO*gPYQD>509J6gNKkhC@#?wVf zd(xuJKsy}F^pDI}(b10dk|rZIXAVXO_u64&icns<64m~CAYyNR62%OmVq=tWy0^F# z_I{NUNJ&KXlUh*bimlH+1#YhcV^vI4Hzp;jmGxQlR9vVI&`)=gi0UVksFxN<%d*U% z9oh2p?zU1si>p5_R0p(BiEege$hEU)SaD|ipa5xEKok|p@leIfy9k}-f#7V#ANY{t zjEyr}t7wBFc@jTzC8Gw0Qo41HCwhXH)J}g!e=93Cd9_v1Ys`T)@@mKfZ}%9(TYY6R z10Na#yD~4+pduyk@{7-y%4F}xp2ka!b^3SoBXdWtGsd+H+L~u1G}(Yg=VtegWQ28N z@}7g)I)@VahX1vJZ7s>nVkv<~Vbzb-&k&S>zMWL^k*vvQDTpTUUjX*fo(6V7e`pv272x; zGuM2Fl)x;Vibs_?gRp+pUT%F6YOos#`5Q$s1Kqw5$zr)5LnjS^BF8n%rnD^4G&(czsfxjV}53 zy9>`~qjK{VSLibodY^n6VnV_$w?20;k#v?-=MUq2US_i))#`f`DG$j z6mdGthjxO}igYqT8Gmkr!II}O@*`pW&LdHn=1(iSLUVYcF|89c7Prt(p$J@cf2PwL zk?NeHv?AlIKAyN4HJY4($|NX^hLP$kj@IyO(}{L~7rAa#IQA zC)_H40VHIr` zZ`K<;@!L(>DCoekSG}lW*mP29jBXUkmz-woIEe+u8XNUV7{Lb*?y!`t8Yf5W-n&db z84?iIh$7P2?#}3ts&P`1Y!K2SQ53;6TD$^&BeVwFxok(h->Vv@-a;jLi&&N*(&`@TR-VmG*W~TN;+B%DmYO%T1Y9LRaIP~5c#cJvl)G!YpglV=s=Xh zBoM2OvpHSAV^D|Zz_~nBWf3bWDJdx_DJdx_DY?!6QjB;16v4r*00000NkvXXu0mjf D(TvRw literal 0 HcmV?d00001 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) { - }, - ) ], ), );