From 843740f688cd1f1c1028c27bd4125bab2333c946 Mon Sep 17 00:00:00 2001 From: meet2711 Date: Thu, 20 Jun 2024 17:26:04 +0530 Subject: [PATCH] bugs fixedd --- lib/core/styles/app_text.dart | 6 +- .../presentation/pages/invest_screen.dart | 1 + .../widgets/invest_details_section.dart | 6 +- .../widgets/key_investment_section.dart | 34 ++--- .../presentation/pages/deposit/preview.dart | 129 ++++++++---------- .../pages/withdrawal/confirmation.dart | 2 +- .../pages/withdrawal/preview.dart | 47 +++---- .../pages/delete_account_screen.dart | 14 +- .../presentation/widgets/bottom_section.dart | 21 +-- .../presentation/widgets/form_section.dart | 4 +- 10 files changed, 111 insertions(+), 153 deletions(-) diff --git a/lib/core/styles/app_text.dart b/lib/core/styles/app_text.dart index e9aa39f..9d16c6b 100644 --- a/lib/core/styles/app_text.dart +++ b/lib/core/styles/app_text.dart @@ -154,7 +154,9 @@ class AppText { static const String SWIFTcode = "SWIFT/BIC code"; static const String refid = "Reference ID"; static const String previewTitle = "Withdrawal confirmation"; - static const String info1 = + static const String info = + 'Your withdrawal request has been received and is currently being processed.'; + static const String info1 = 'Please confirm the withdrawal amount and verify the accuracy of your bank details.'; static const String workingDays = 'Processing times vary from 3-7 working days'; @@ -262,7 +264,7 @@ class AppText { static const String holdingPeriodText = "Holding period"; static const String payoutDateText = "Payout Date"; static const String minimumInvestmentText = "Minimum investment"; - static const String keyMeritsIOfnvestmentText = "Key Merits of Investment"; + static const String keyMeritsOfInvestmentText = "Key Merits of Investment"; static const String investmentDetailsText = "Investment details"; static const String enterInvestmentAmountText = "Enter investment amount"; static const String thisIsUsdInvestmentOpportunityText = diff --git a/lib/features/MainScreens/Invest/presentation/pages/invest_screen.dart b/lib/features/MainScreens/Invest/presentation/pages/invest_screen.dart index 3724908..9787a33 100644 --- a/lib/features/MainScreens/Invest/presentation/pages/invest_screen.dart +++ b/lib/features/MainScreens/Invest/presentation/pages/invest_screen.dart @@ -21,6 +21,7 @@ class _InvestScreenState extends State { return Scaffold( backgroundColor: AppColor.plainWhite, appBar: AppBar( + centerTitle: false, backgroundColor: AppColor.plainWhite, elevation: 0, scrolledUnderElevation: 0, diff --git a/lib/features/MainScreens/Invest/presentation/widgets/invest_details_section.dart b/lib/features/MainScreens/Invest/presentation/widgets/invest_details_section.dart index 7616b7c..3a6382e 100644 --- a/lib/features/MainScreens/Invest/presentation/widgets/invest_details_section.dart +++ b/lib/features/MainScreens/Invest/presentation/widgets/invest_details_section.dart @@ -43,7 +43,7 @@ class InvestDetailsSection extends StatelessWidget { borderRadius: BorderRadius.circular(4)), ), child: Center( - child: TextWidget().text12W700( + child: TextWidget().text11W700( "Real estate", clr: AppColor.selectedItemColor, )), @@ -53,7 +53,7 @@ class InvestDetailsSection extends StatelessWidget { Gap(10.h), Container( padding: const EdgeInsets.symmetric( - horizontal: 15.0, vertical: 10.0), + horizontal: 12.0, vertical: 5.0), decoration: BoxDecoration( color: Colors.white, border: Border.all(color: const Color(0xFFE4F5E9)), @@ -65,7 +65,7 @@ class InvestDetailsSection extends StatelessWidget { children: [ Image.asset( AppImages.portfolioClock, - height: 15.h, + height: 20.h, ), Gap( 5.w, diff --git a/lib/features/MainScreens/Invest/presentation/widgets/key_investment_section.dart b/lib/features/MainScreens/Invest/presentation/widgets/key_investment_section.dart index 6a09209..03ab9bf 100644 --- a/lib/features/MainScreens/Invest/presentation/widgets/key_investment_section.dart +++ b/lib/features/MainScreens/Invest/presentation/widgets/key_investment_section.dart @@ -33,7 +33,7 @@ class KeyInvestmentSection extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ TextWidget().text15W700( - AppText.keyMeritsIOfnvestmentText, + AppText.keyMeritsOfInvestmentText, clr: AppColor.plainBlack, ), Gap( @@ -50,7 +50,7 @@ class KeyInvestmentSection extends StatelessWidget { ), child: investmentSectionCardText( imageList[index], - "Nunc vulputate libero et velit interdum", + "Nunc vulputate libero et velit interdumb aenfoao", "ac aliquet odio mattis.", ), ); @@ -79,20 +79,22 @@ Widget investmentSectionCardText( children: [ SvgPicture.asset(icon), const Gap(8), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - TextWidget().text14W700( - title, - clr: AppColor.textLabelColor, - txtAlign: TextAlign.start, - ), - TextWidget().text14W400( - subtitle, - clr: AppColor.textLabelColor, - txtAlign: TextAlign.start, - ), - ], + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + TextWidget().text14W700( + title, + clr: AppColor.textLabelColor, + txtAlign: TextAlign.start, + ), + TextWidget().text14W400( + subtitle, + clr: AppColor.textLabelColor, + txtAlign: TextAlign.start, + ), + ], + ), ) ], ); diff --git a/lib/features/MainScreens/Wallet/presentation/pages/deposit/preview.dart b/lib/features/MainScreens/Wallet/presentation/pages/deposit/preview.dart index 06f0fcd..c86df0f 100644 --- a/lib/features/MainScreens/Wallet/presentation/pages/deposit/preview.dart +++ b/lib/features/MainScreens/Wallet/presentation/pages/deposit/preview.dart @@ -69,40 +69,25 @@ class _DepositPreviewState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Container( - width: 0.55.sw, - decoration: const BoxDecoration( - border: Border( - bottom: BorderSide(width: 1, color: Colors.grey))), - child: Row( + RichText( + text: TextSpan( children: [ - RichText( - text: TextSpan( - children: [ - TextSpan( - text: '${AppText.balance}: ', - style: GoogleFonts.dmSans( - color: Colors.grey, - fontSize: 12.0, - fontWeight: FontWeight.bold, - ), - ), - TextSpan( - text: 'SAR 178,000 ', - style: GoogleFonts.dmSans( - color: Colors.black, - fontSize: 14.0, - fontWeight: FontWeight.bold, - ), - ), - ], + TextSpan( + text: '${AppText.balance}: ', + style: GoogleFonts.dmSans( + color: Colors.grey, + fontSize: 12.sp, + fontWeight: FontWeight.bold, + ), + ), + TextSpan( + text: 'SAR 178,000 ', + style: GoogleFonts.dmSans( + color: Colors.black, + fontSize: 14.sp, + fontWeight: FontWeight.bold, ), ), - const Icon( - Icons.arrow_forward, - color: Colors.grey, - size: 15, - ) ], ), ), @@ -377,54 +362,50 @@ class _DepositPreviewState extends State { ) ], ), - ], - ), - ), - ), - bottomNavigationBar: Column( - mainAxisSize: MainAxisSize.min, - children: [ - GestureDetector( - onTap: () { - goRouter.pop(); - goRouter.pop(); - }, - child: Container( - margin: const EdgeInsets.all(10.0), - height: 65.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.submitDeposit, - style: GoogleFonts.dmSans( - color: Colors.white, - fontSize: 14.sp, - fontWeight: FontWeight.w700, + GestureDetector( + onTap: () { + goRouter.pop(); + goRouter.pop(); + }, + child: Container( + margin: const EdgeInsets.all(10.0), + height: 65.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.submitDeposit, + style: GoogleFonts.dmSans( + color: Colors.white, + fontSize: 14.sp, + fontWeight: FontWeight.w700, + ), + ), ), ), ), ), - ), + const Gap(10), + GestureDetector( + onTap: () { + goRouter.pop(); + }, + child: Center( + child: TextWidget().text14W700( + AppText.back, + clr: const Color(0xFF363636), + textDecoration: TextDecoration.underline, + ), + ), + ), + ], ), - const Gap(10), - GestureDetector( - onTap: () { - goRouter.pop(); - }, - child: TextWidget().text14W700( - AppText.back, - clr: const Color(0xFF363636), - textDecoration: TextDecoration.underline, - ), - ), - const Gap(30), - ], + ), ), ); } diff --git a/lib/features/MainScreens/Wallet/presentation/pages/withdrawal/confirmation.dart b/lib/features/MainScreens/Wallet/presentation/pages/withdrawal/confirmation.dart index e882945..2fc8066 100644 --- a/lib/features/MainScreens/Wallet/presentation/pages/withdrawal/confirmation.dart +++ b/lib/features/MainScreens/Wallet/presentation/pages/withdrawal/confirmation.dart @@ -90,7 +90,7 @@ class _WithdrawalConfirmationState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - AppText.info1, + AppText.info, style: GoogleFonts.dmSans( color: const Color(0xFF015698), fontSize: 14.sp, diff --git a/lib/features/MainScreens/Wallet/presentation/pages/withdrawal/preview.dart b/lib/features/MainScreens/Wallet/presentation/pages/withdrawal/preview.dart index 7f12ee2..08db542 100644 --- a/lib/features/MainScreens/Wallet/presentation/pages/withdrawal/preview.dart +++ b/lib/features/MainScreens/Wallet/presentation/pages/withdrawal/preview.dart @@ -80,40 +80,25 @@ class _WithdrawalPreviewState extends State { SizedBox( height: 20.h, ), - Container( - width: 0.55.sw, - decoration: const BoxDecoration( - border: Border( - bottom: BorderSide(width: 1, color: Colors.grey))), - child: Row( + RichText( + text: TextSpan( children: [ - RichText( - text: TextSpan( - children: [ - TextSpan( - text: '${AppText.balance}: ', - style: GoogleFonts.dmSans( - color: Colors.grey, - fontSize: 12.0, - fontWeight: FontWeight.bold, - ), - ), - TextSpan( - text: 'SAR 178,000', - style: GoogleFonts.dmSans( - color: Colors.black, - fontSize: 14.0, - fontWeight: FontWeight.bold, - ), - ), - ], + TextSpan( + text: '${AppText.balance}: ', + style: GoogleFonts.dmSans( + color: Colors.grey, + fontSize: 12.sp, + fontWeight: FontWeight.bold, + ), + ), + TextSpan( + text: 'SAR 178,000', + style: GoogleFonts.dmSans( + color: Colors.black, + fontSize: 14.sp, + fontWeight: FontWeight.bold, ), ), - const Icon( - Icons.arrow_forward, - color: Colors.grey, - size: 15, - ) ], ), ), diff --git a/lib/features/deleteAccount/presentation/pages/delete_account_screen.dart b/lib/features/deleteAccount/presentation/pages/delete_account_screen.dart index 50c4d3b..72c414d 100644 --- a/lib/features/deleteAccount/presentation/pages/delete_account_screen.dart +++ b/lib/features/deleteAccount/presentation/pages/delete_account_screen.dart @@ -2,10 +2,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:tanami_app/features/deleteAccount/presentation/bloc/text_bloc.dart'; import 'package:tanami_app/features/deleteAccount/presentation/pages/delete_account_layout.dart'; +import 'package:tanami_app/shared/components/text_widget.dart'; import '../../../../core/styles/app_color.dart'; import '../../../../core/styles/app_text.dart'; -import '../../../../shared/components/appbar_widget.dart'; import '../../../../shared/components/bloc/checkbox/checkbox_bloc.dart'; import '../bloc/delete_account_bloc.dart'; @@ -16,9 +16,15 @@ class DeleteAccountScreen extends StatelessWidget { Widget build(BuildContext context) { return Scaffold( backgroundColor: AppColor.plainWhite, - appBar: const AppBarWidget( - height: 75, - titleTxt: AppText.deleteAccountText, + appBar: AppBar( + backgroundColor: AppColor.plainWhite, + elevation: 0, + scrolledUnderElevation: 0, + title: TextWidget().text20W700( + AppText.deleteAccountText, + clr: AppColor.plainBlack, + ), + centerTitle: true, ), body: MultiBlocProvider( providers: [ diff --git a/lib/features/deleteAccount/presentation/widgets/bottom_section.dart b/lib/features/deleteAccount/presentation/widgets/bottom_section.dart index daa4e8f..e69c0f2 100644 --- a/lib/features/deleteAccount/presentation/widgets/bottom_section.dart +++ b/lib/features/deleteAccount/presentation/widgets/bottom_section.dart @@ -62,31 +62,12 @@ Widget bottomSection(BuildContext context) { } }, builder: (context, state) { - // return ButtonWidget().textBtn( - // function: () { - // if (deleteAccountBloc.formKey.currentState!.validate()) { - // context.read().add(ValidateCheckbox()); - // if (context.read().state is CheckboxChecked) { - // context.read().add( - // DeleteAccountSubmitted( - // context - // .read() - // .descriptionTextField - // .text, - // ), - // ); - // } - // } - // }, - // text: TextWidget().text14W700(AppText.deleteAccountText, - // clr: AppColor.hintTextColor, - // textDecoration: TextDecoration.underline)); return Container( width: 1.sw, height: 56.h, child: ButtonWidget().textBorderBtn( borderClr: AppColor.txtBorderColor, - txtClr: AppColor.hintTextColor, + txtClr: AppColor.plainBlack, function: () { if (deleteAccountBloc.formKey.currentState!.validate()) { context.read().add(ValidateCheckbox()); diff --git a/lib/features/deleteAccount/presentation/widgets/form_section.dart b/lib/features/deleteAccount/presentation/widgets/form_section.dart index 6e4d666..ba3d82f 100644 --- a/lib/features/deleteAccount/presentation/widgets/form_section.dart +++ b/lib/features/deleteAccount/presentation/widgets/form_section.dart @@ -35,7 +35,7 @@ class FormSection extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - const Gap(40), + const Gap(70), BlocBuilder( builder: (context, state) { return FormLabelTextField( @@ -80,7 +80,7 @@ class FormSection extends StatelessWidget { left: 45, top: 14, child: SizedBox( - width: 0.75.sw, + width: 0.85.sw, child: TextWidget().text14W500( AppText.iUnderstandAndAgreeThatmyDataWillBeDeleted, clr: AppColor.charcoalColor,