From dc3532f47c94878b179c3da13811e9535e2f50ff Mon Sep 17 00:00:00 2001 From: meet2711 Date: Thu, 20 Jun 2024 17:27:10 +0530 Subject: [PATCH 1/3] title fixedd --- .../MainScreens/Academy/presentation/pages/academy_screen.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/features/MainScreens/Academy/presentation/pages/academy_screen.dart b/lib/features/MainScreens/Academy/presentation/pages/academy_screen.dart index 5d25487..78a9774 100644 --- a/lib/features/MainScreens/Academy/presentation/pages/academy_screen.dart +++ b/lib/features/MainScreens/Academy/presentation/pages/academy_screen.dart @@ -18,6 +18,7 @@ class _AcademyScreenState extends State { return Scaffold( backgroundColor: AppColor.plainWhite, appBar: AppBar( + centerTitle: false, backgroundColor: Colors.white, elevation: 0, scrolledUnderElevation: 0, From fc7bdc9aeb6f40d855fb49ffc1282fdc8215ce33 Mon Sep 17 00:00:00 2001 From: meet2711 Date: Thu, 20 Jun 2024 17:34:19 +0530 Subject: [PATCH 2/3] button fixed --- .../pages/deposit/depositScreen.dart | 2 +- .../presentation/pages/deposit/preview.dart | 89 ++++++++++--------- .../widgets/deposit_pay_method_section.dart | 12 ++- 3 files changed, 54 insertions(+), 49 deletions(-) diff --git a/lib/features/MainScreens/Wallet/presentation/pages/deposit/depositScreen.dart b/lib/features/MainScreens/Wallet/presentation/pages/deposit/depositScreen.dart index 8f0e17e..fed324e 100644 --- a/lib/features/MainScreens/Wallet/presentation/pages/deposit/depositScreen.dart +++ b/lib/features/MainScreens/Wallet/presentation/pages/deposit/depositScreen.dart @@ -22,7 +22,7 @@ class _DepositScreenState extends State { int selectedIndex = 0; @override Widget build(BuildContext context) { - final radioBloc = context.read(); + context.read(); return Scaffold( backgroundColor: Colors.white, appBar: AppBar( diff --git a/lib/features/MainScreens/Wallet/presentation/pages/deposit/preview.dart b/lib/features/MainScreens/Wallet/presentation/pages/deposit/preview.dart index c86df0f..82b2e28 100644 --- a/lib/features/MainScreens/Wallet/presentation/pages/deposit/preview.dart +++ b/lib/features/MainScreens/Wallet/presentation/pages/deposit/preview.dart @@ -362,51 +362,58 @@ class _DepositPreviewState extends State { ) ], ), - 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, - ), - ), - ), ], ), ), ), + bottomNavigationBar: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.center, + 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, + ), + ), + ), + ), + ), + ), + const Gap(10), + GestureDetector( + onTap: () { + goRouter.pop(); + }, + child: Center( + child: TextWidget().text14W700( + AppText.back, + clr: const Color(0xFF363636), + textDecoration: TextDecoration.underline, + ), + ), + ), + const Gap(20), + ], + ), ); } } diff --git a/lib/features/MainScreens/Wallet/presentation/widgets/deposit_pay_method_section.dart b/lib/features/MainScreens/Wallet/presentation/widgets/deposit_pay_method_section.dart index 42dad10..d9286dc 100644 --- a/lib/features/MainScreens/Wallet/presentation/widgets/deposit_pay_method_section.dart +++ b/lib/features/MainScreens/Wallet/presentation/widgets/deposit_pay_method_section.dart @@ -112,11 +112,6 @@ class DepositPayMethodSection extends StatelessWidget { ], ), ), - // const Icon( - // Icons.arrow_forward, - // color: Colors.grey, - // size: 15, - // ) ], ), ], @@ -165,6 +160,7 @@ class DepositPayMethodSection extends StatelessWidget { ], ), child: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( padding: const EdgeInsets.all(12), @@ -201,8 +197,10 @@ class DepositPayMethodSection extends StatelessWidget { Padding( padding: const EdgeInsets.all(12.0), child: TextWidget().text14W500( - AppText.instantTransferFundsApplePayText, - clr: AppColor.textLabelColor), + AppText.instantTransferFundsApplePayText, + clr: AppColor.textLabelColor, + txtAlign: TextAlign.start, + ), ), const Gap(12), ], From 6a02b799df2a83cfff403907448995a1ff047015 Mon Sep 17 00:00:00 2001 From: meet2711 Date: Thu, 20 Jun 2024 19:20:50 +0530 Subject: [PATCH 3/3] text fixed --- lib/core/styles/app_text.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/core/styles/app_text.dart b/lib/core/styles/app_text.dart index 9d16c6b..f527201 100644 --- a/lib/core/styles/app_text.dart +++ b/lib/core/styles/app_text.dart @@ -25,7 +25,7 @@ class AppText { static const String chooseCountry = "Choose country"; static const String phoneNumber = "Phone number"; static const String password = "Password"; - static const String enterPassword = "Enter password"; + static const String enterPassword = "Enter Password"; static const String invalidPhoneNo = "Invalid phone number"; static const String enterPhoneNo = "Enter phone number"; static const String invalidPassword = "Invalid password"; @@ -156,7 +156,7 @@ class AppText { static const String previewTitle = "Withdrawal confirmation"; static const String info = 'Your withdrawal request has been received and is currently being processed.'; - static const String info1 = + 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';