diff --git a/assets/images/wallet_screen/1.png b/assets/images/wallet_screen/1.png new file mode 100644 index 0000000..df2fd8d Binary files /dev/null and b/assets/images/wallet_screen/1.png differ diff --git a/assets/images/wallet_screen/2.png b/assets/images/wallet_screen/2.png new file mode 100644 index 0000000..63eddc3 Binary files /dev/null and b/assets/images/wallet_screen/2.png differ diff --git a/assets/images/wallet_screen/3.png b/assets/images/wallet_screen/3.png new file mode 100644 index 0000000..09406b5 Binary files /dev/null and b/assets/images/wallet_screen/3.png differ diff --git a/assets/images/wallet_screen/4.png b/assets/images/wallet_screen/4.png new file mode 100644 index 0000000..e78aef6 Binary files /dev/null and b/assets/images/wallet_screen/4.png differ diff --git a/lib/core/styles/app_images.dart b/lib/core/styles/app_images.dart index 4e8f49c..8802665 100644 --- a/lib/core/styles/app_images.dart +++ b/lib/core/styles/app_images.dart @@ -6,7 +6,7 @@ class AppImages { "assets/images/welcome_screen/svg/Tanami_Capital_Splash_Logo.svg"; //Welcome - static const String weclomeLogo = + static const String welcomeLogo = "assets/images/welcome_screen/svg/Tanami_Capital_Logo.svg"; static const String firstWelcome = "assets/images/welcome_screen/png/First_Onboarding.png"; diff --git a/lib/core/styles/app_text.dart b/lib/core/styles/app_text.dart index 8ffa8ec..98313c2 100644 --- a/lib/core/styles/app_text.dart +++ b/lib/core/styles/app_text.dart @@ -155,6 +155,8 @@ class AppText { static const String info2 = 'Payment can include transfer fee from your bank'; static const String next = 'Next'; static const String submit = 'Submit request'; + static const String cont = 'Continue'; + static const String later = 'Later'; //Settings static const String settingsText = "Settings"; diff --git a/lib/features/MainScreens/Wallet/presentation/pages/kyc.dart b/lib/features/MainScreens/Wallet/presentation/pages/kyc.dart new file mode 100644 index 0000000..e41fd43 --- /dev/null +++ b/lib/features/MainScreens/Wallet/presentation/pages/kyc.dart @@ -0,0 +1,172 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:google_fonts/google_fonts.dart'; +import 'package:tanami_app/core/styles/app_images.dart'; +import 'package:tanami_app/core/styles/app_text.dart'; +import 'package:tanami_app/shared/components/text_widget.dart'; + +class KYCScreen extends StatefulWidget { + const KYCScreen({super.key}); + + @override + State createState() => _KYCScreenState(); +} + +class _KYCScreenState extends State { + List data = [ + 'Verify your identity', + 'Take a selfie', + 'Upload a proof of address', + 'Confirm your risk profile and sign agreement', + ]; + @override + Widget build(BuildContext context) { + return Scaffold( + backgroundColor: Colors.white, + appBar: AppBar( + automaticallyImplyLeading: false, + actions: [ + IconButton( + onPressed: () {}, + icon: const Icon( + Icons.close_sharp, + size: 30.0, + ), + ), + ], + ), + body: Center( + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + SvgPicture.asset( + AppImages.welcomeLogo, + ), + SizedBox( + height: 24.h, + ), + Text( + 'Almost here...', + style: GoogleFonts.dmSans( + color: const Color(0xFF363636), + fontSize: 17.sp, + fontWeight: FontWeight.w700, + ), + ), + SizedBox( + height: 8.h, + ), + SizedBox( + width: 280.w, + child: Text( + 'Complete account profile in 3 minutes to start investing', + textAlign: TextAlign.center, + style: GoogleFonts.dmSans( + color: const Color(0xFF8D8D8D), + fontSize: 14.sp, + fontWeight: FontWeight.w700, + ), + ), + ), + SizedBox( + height: 40.h, + ), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 50.0), + child: ListView.builder( + physics: const NeverScrollableScrollPhysics(), + shrinkWrap: true, + itemCount: data.length, + itemBuilder: (context, index) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 10.0), + child: Row( + children: [ + Image.asset( + 'assets/images/wallet_screen/${index + 1}.png', + height: 45.h, + ), + SizedBox( + width: 12.w, + ), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Step ${index + 1}', + textAlign: TextAlign.center, + style: GoogleFonts.dmSans( + color: const Color(0xFF363636), + fontSize: 14.sp, + fontWeight: FontWeight.w700, + ), + ), + SizedBox( + width: 10.h, + ), + SizedBox( + width: 230.w, + child: Text( + data[index], + style: GoogleFonts.dmSans( + color: const Color(0xFF363636), + fontSize: 14.sp, + fontWeight: FontWeight.w400, + ), + ), + ), + ], + ) + ], + ), + ); + }, + ), + ), + SizedBox( + height: 70.h, + ), + GestureDetector( + onTap: () { + // goRouter.pushNamed(RouteName.otpScreen, pathParameters: { + // "fromScreen": 'withdrawal', + // }); + }, + child: Container( + margin: const EdgeInsets.all(12.0), + height: 56.h, + width: double.infinity, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(22.r), + color: const Color(0xFF004717), + ), + child: Padding( + padding: const EdgeInsets.symmetric(vertical: 20.0), + child: Center( + child: Text( + AppText.cont, + style: GoogleFonts.dmSans( + color: Colors.white, + fontSize: 14.sp, + fontWeight: FontWeight.w700, + ), + ), + ), + ), + ), + ), + SizedBox( + height: 10.h, + ), + TextWidget().text14W700( + AppText.later, + clr: const Color(0xFF363636), + textDecoration: TextDecoration.underline, + ) + ], + ), + ), + ); + } +} diff --git a/lib/features/MainScreens/Wallet/presentation/pages/walletScreen.dart b/lib/features/MainScreens/Wallet/presentation/pages/walletScreen.dart index 7c0ae5d..cb43704 100644 --- a/lib/features/MainScreens/Wallet/presentation/pages/walletScreen.dart +++ b/lib/features/MainScreens/Wallet/presentation/pages/walletScreen.dart @@ -56,6 +56,13 @@ class _WalletScreenState extends State { }, ]; + @override + void initState() { + // TODO: implement initState + // _savebottomsheet(); + super.initState(); + } + @override Widget build(BuildContext context) { return Scaffold( @@ -106,7 +113,6 @@ class _WalletScreenState extends State { child: Padding( padding: const EdgeInsets.symmetric(horizontal: 20.0), child: Container( - // height: 86.h, decoration: BoxDecoration( color: Colors.white.withOpacity(0.8), borderRadius: diff --git a/lib/features/MainScreens/main_screen.dart b/lib/features/MainScreens/main_screen.dart index ddfafcf..584e344 100644 --- a/lib/features/MainScreens/main_screen.dart +++ b/lib/features/MainScreens/main_screen.dart @@ -4,6 +4,7 @@ import 'package:tanami_app/features/MainScreens/Academy/presentation/pages/acade import 'package:tanami_app/features/MainScreens/Invest/presentation/pages/invest_screen.dart'; import 'package:tanami_app/features/MainScreens/Portfolio/presentation/pages/portfolio_screen.dart'; import 'package:tanami_app/features/MainScreens/Settings/presentation/pages/settings_Screen.dart'; +import 'package:tanami_app/features/MainScreens/Wallet/presentation/pages/kyc.dart'; import 'package:tanami_app/features/MainScreens/Wallet/presentation/pages/walletScreen.dart'; import 'package:tanami_app/shared/components/common_bottom_navigation.dart'; @@ -12,7 +13,8 @@ import '../../shared/components/bloc/bottom_nav_bar/bottom_navigation_state.dart import '../../shared/components/exit_app_dialog.dart'; var currentTab = [ - const WalletScreen(), + // const WalletScreen(), + const KYCScreen(), const PortfolioScreen(), const InvestScreen(), const AcademyScreen(), diff --git a/lib/features/changePassword/presentation/pages/change_password_layout.dart b/lib/features/changePassword/presentation/pages/change_password_layout.dart index 2d38df4..7b08d31 100644 --- a/lib/features/changePassword/presentation/pages/change_password_layout.dart +++ b/lib/features/changePassword/presentation/pages/change_password_layout.dart @@ -8,16 +8,10 @@ class ChangePasswordLayout extends StatelessWidget { @override Widget build(BuildContext context) { -<<<<<<< HEAD - return const Scaffold( - bottomNavigationBar: RestorePasswordBottomSection(), - body: RestorePasswordForm()); -======= return const Scaffold( bottomNavigationBar: RestorePasswordBottomSection(), body: RestorePasswordForm()); ->>>>>>> 0521b4ab76ca7b88a179487326f69cededd70e0b } } diff --git a/lib/features/contactAdmin/presentation/widgets/top_section.dart b/lib/features/contactAdmin/presentation/widgets/top_section.dart index 6b051dc..12e9fbf 100644 --- a/lib/features/contactAdmin/presentation/widgets/top_section.dart +++ b/lib/features/contactAdmin/presentation/widgets/top_section.dart @@ -13,7 +13,7 @@ Widget topSection() { const Gap(85), Center( child: SvgPicture.asset( - AppImages.weclomeLogo, + AppImages.welcomeLogo, ), ), const Gap(24), diff --git a/lib/features/deleteAccount/presentation/widgets/top_section.dart b/lib/features/deleteAccount/presentation/widgets/top_section.dart index e89df2d..8fb729b 100644 --- a/lib/features/deleteAccount/presentation/widgets/top_section.dart +++ b/lib/features/deleteAccount/presentation/widgets/top_section.dart @@ -19,7 +19,7 @@ class TopSection extends StatelessWidget { const Gap(85), Center( child: SvgPicture.asset( - AppImages.weclomeLogo, + AppImages.welcomeLogo, ), ), const Gap(30), diff --git a/lib/features/forgotPassword/presentation/widgets/restore_password_phone_verification_top_section.dart b/lib/features/forgotPassword/presentation/widgets/restore_password_phone_verification_top_section.dart index 28c2dfb..c49e16e 100644 --- a/lib/features/forgotPassword/presentation/widgets/restore_password_phone_verification_top_section.dart +++ b/lib/features/forgotPassword/presentation/widgets/restore_password_phone_verification_top_section.dart @@ -19,7 +19,7 @@ class RestorePasswordPhoneVerificationTopSection extends StatelessWidget { const Gap(85), Center( child: SvgPicture.asset( - AppImages.weclomeLogo, + AppImages.welcomeLogo, ), ), const Gap(60), diff --git a/lib/features/forgotPassword/presentation/widgets/restore_password_top_section.dart b/lib/features/forgotPassword/presentation/widgets/restore_password_top_section.dart index 4340449..5c15399 100644 --- a/lib/features/forgotPassword/presentation/widgets/restore_password_top_section.dart +++ b/lib/features/forgotPassword/presentation/widgets/restore_password_top_section.dart @@ -19,7 +19,7 @@ class RestorePasswordTopSection extends StatelessWidget { const Gap(85), Center( child: SvgPicture.asset( - AppImages.weclomeLogo, + AppImages.welcomeLogo, ), ), const Gap(60), diff --git a/lib/features/login/presentation/widgets/top_section.dart b/lib/features/login/presentation/widgets/top_section.dart index 8ca31e8..02e1cde 100644 --- a/lib/features/login/presentation/widgets/top_section.dart +++ b/lib/features/login/presentation/widgets/top_section.dart @@ -21,7 +21,7 @@ class TopSection extends StatelessWidget { const Gap(85), Center( child: SvgPicture.asset( - AppImages.weclomeLogo, + AppImages.welcomeLogo, ), ), const Gap(60), diff --git a/lib/features/otpVerification/presentation/widgets/otp_top_section.dart b/lib/features/otpVerification/presentation/widgets/otp_top_section.dart index c1d85f9..b3f6ad7 100644 --- a/lib/features/otpVerification/presentation/widgets/otp_top_section.dart +++ b/lib/features/otpVerification/presentation/widgets/otp_top_section.dart @@ -18,7 +18,7 @@ class OtpTopSection extends StatelessWidget { const Gap(85), Center( child: SvgPicture.asset( - AppImages.weclomeLogo, + AppImages.welcomeLogo, ), ), const Gap(125), diff --git a/lib/features/register/presentation/widgets/register_step_top_section.dart b/lib/features/register/presentation/widgets/register_step_top_section.dart index fee10b5..86645dd 100644 --- a/lib/features/register/presentation/widgets/register_step_top_section.dart +++ b/lib/features/register/presentation/widgets/register_step_top_section.dart @@ -17,7 +17,7 @@ class RegisterStepTopSection extends StatelessWidget { const Gap(85), Center( child: SvgPicture.asset( - AppImages.weclomeLogo, + AppImages.welcomeLogo, ), ), const Gap(30), diff --git a/lib/features/register/presentation/widgets/register_top_section.dart b/lib/features/register/presentation/widgets/register_top_section.dart index 3917f5f..c82dfd5 100644 --- a/lib/features/register/presentation/widgets/register_top_section.dart +++ b/lib/features/register/presentation/widgets/register_top_section.dart @@ -17,7 +17,7 @@ class RegisterTopSection extends StatelessWidget { const Gap(85), Center( child: SvgPicture.asset( - AppImages.weclomeLogo, + AppImages.welcomeLogo, ), ), const Gap(60), diff --git a/lib/features/register/presentation/widgets/register_user_top_section.dart b/lib/features/register/presentation/widgets/register_user_top_section.dart index 71b8f33..b90091c 100644 --- a/lib/features/register/presentation/widgets/register_user_top_section.dart +++ b/lib/features/register/presentation/widgets/register_user_top_section.dart @@ -17,7 +17,7 @@ class RegisterUserTopSection extends StatelessWidget { const Gap(22), Center( child: SvgPicture.asset( - AppImages.weclomeLogo, + AppImages.welcomeLogo, ), ), const Gap(25), diff --git a/lib/features/securePin/presentation/widgets/confirm_pin_top_section.dart b/lib/features/securePin/presentation/widgets/confirm_pin_top_section.dart index 28d92ea..69828e2 100644 --- a/lib/features/securePin/presentation/widgets/confirm_pin_top_section.dart +++ b/lib/features/securePin/presentation/widgets/confirm_pin_top_section.dart @@ -17,7 +17,7 @@ class ConfirmPinTopSection extends StatelessWidget { const Gap(85), Center( child: SvgPicture.asset( - AppImages.weclomeLogo, + AppImages.welcomeLogo, ), ), const Gap(60), diff --git a/lib/features/securePin/presentation/widgets/pin_top_section.dart b/lib/features/securePin/presentation/widgets/pin_top_section.dart index 187c7e2..a1daf83 100644 --- a/lib/features/securePin/presentation/widgets/pin_top_section.dart +++ b/lib/features/securePin/presentation/widgets/pin_top_section.dart @@ -21,7 +21,7 @@ class PinTopSection extends StatelessWidget { const Gap(70), Center( child: SvgPicture.asset( - AppImages.weclomeLogo, + AppImages.welcomeLogo, ), ), const Gap(40), diff --git a/lib/features/welcome/presentation/widgets/build_onboarding_page_widget.dart b/lib/features/welcome/presentation/widgets/build_onboarding_page_widget.dart index 6f96393..7fd139b 100644 --- a/lib/features/welcome/presentation/widgets/build_onboarding_page_widget.dart +++ b/lib/features/welcome/presentation/widgets/build_onboarding_page_widget.dart @@ -24,7 +24,7 @@ Widget buildOnboardingPage( return Column( children: [ const Gap(80), - SvgPicture.asset(AppImages.weclomeLogo), + SvgPicture.asset(AppImages.welcomeLogo), Image.asset( imageAsset, width: 1.sw,