diff --git a/lib/features/MainScreens/Academy/presentation/pages/academy_layout.dart b/lib/features/MainScreens/Academy/presentation/pages/academy_layout.dart index 36404ae..5ec213f 100644 --- a/lib/features/MainScreens/Academy/presentation/pages/academy_layout.dart +++ b/lib/features/MainScreens/Academy/presentation/pages/academy_layout.dart @@ -11,10 +11,11 @@ class AcademyLayout extends StatelessWidget { return Scaffold( backgroundColor: AppColor.plainWhite, body: ListView.builder( - itemCount: data.length, - itemBuilder: (context, index) { - return academyCard(data[index]); - }), + itemCount: data.length, + itemBuilder: (context, index) { + return academyCard(data[index]); + }, + ), ); } } diff --git a/lib/features/MainScreens/Invest/presentation/pages/invest_layout.dart b/lib/features/MainScreens/Invest/presentation/pages/invest_layout.dart index 60f1d82..98097c3 100644 --- a/lib/features/MainScreens/Invest/presentation/pages/invest_layout.dart +++ b/lib/features/MainScreens/Invest/presentation/pages/invest_layout.dart @@ -83,7 +83,7 @@ class AvailableItemsScreen extends StatelessWidget { vertical: 18, ), child: kycCard()) - : InkWell( + : GestureDetector( onTap: () { goRouter.pushNamed(RouteName.investDetailScreen, pathParameters: {"type": "available"}); @@ -143,7 +143,7 @@ class ClosedItemsScreen extends StatelessWidget { vertical: 18, ), child: kycCard()) - : InkWell( + : GestureDetector( onTap: () { goRouter.pushNamed(RouteName.investDetailScreen, pathParameters: {"type": "closed"}); diff --git a/lib/features/MainScreens/Invest/presentation/widgets/payment/invest_pay_method_section.dart b/lib/features/MainScreens/Invest/presentation/widgets/payment/invest_pay_method_section.dart index 6229359..2df6696 100644 --- a/lib/features/MainScreens/Invest/presentation/widgets/payment/invest_pay_method_section.dart +++ b/lib/features/MainScreens/Invest/presentation/widgets/payment/invest_pay_method_section.dart @@ -33,7 +33,7 @@ class InvestPayMethodSection extends StatelessWidget { TextWidget().text15W700(AppText.choosePaymentMethodText, clr: AppColor.plainBlack), const Gap(16), - InkWell( + GestureDetector( onTap: () { radioBloc.add(const RadioSelected(0)); }, @@ -146,7 +146,7 @@ class InvestPayMethodSection extends StatelessWidget { ), ), const Gap(12), - InkWell( + GestureDetector( onTap: () { radioBloc.add(const RadioSelected(1)); }, diff --git a/lib/features/MainScreens/Portfolio/presentation/pages/portfolio_screen.dart b/lib/features/MainScreens/Portfolio/presentation/pages/portfolio_screen.dart index 2e6cc1e..77c095d 100644 --- a/lib/features/MainScreens/Portfolio/presentation/pages/portfolio_screen.dart +++ b/lib/features/MainScreens/Portfolio/presentation/pages/portfolio_screen.dart @@ -9,6 +9,8 @@ class PortfolioScreen extends StatelessWidget { @override Widget build(BuildContext context) { return const Scaffold( - backgroundColor: AppColor.plainWhite, body: PortfolioLayout()); + backgroundColor: AppColor.plainWhite, + body: PortfolioLayout(), + ); } } diff --git a/lib/features/MainScreens/Wallet/presentation/pages/deposit/depositScreen.dart b/lib/features/MainScreens/Wallet/presentation/pages/deposit/depositScreen.dart index a7d0c5e..b4ebfca 100644 --- a/lib/features/MainScreens/Wallet/presentation/pages/deposit/depositScreen.dart +++ b/lib/features/MainScreens/Wallet/presentation/pages/deposit/depositScreen.dart @@ -291,7 +291,7 @@ class _DepositScreenState extends State { TextWidget().text15W700(AppText.choosePaymentMethodText, clr: AppColor.plainBlack), const Gap(16), - InkWell( + GestureDetector( onTap: () { radioBloc.add(const RadioSelected(0)); }, @@ -350,7 +350,7 @@ class _DepositScreenState extends State { ), ), const Gap(12), - InkWell( + GestureDetector( onTap: () { radioBloc.add(const RadioSelected(1)); }, diff --git a/lib/features/biometric/presentation/pages/biometric_layout.dart b/lib/features/biometric/presentation/pages/biometric_layout.dart index c738d53..e664e84 100644 --- a/lib/features/biometric/presentation/pages/biometric_layout.dart +++ b/lib/features/biometric/presentation/pages/biometric_layout.dart @@ -18,6 +18,7 @@ class BiometricLayout extends StatelessWidget { biometricImage = AppImages.biometricFingerprint; } return Scaffold( + backgroundColor: Colors.white, body: SizedBox( width: 1.sw, height: 1.sh, diff --git a/lib/features/faq/presentation/pages/faq_screen.dart b/lib/features/faq/presentation/pages/faq_screen.dart index c4841bf..01265b1 100644 --- a/lib/features/faq/presentation/pages/faq_screen.dart +++ b/lib/features/faq/presentation/pages/faq_screen.dart @@ -21,11 +21,11 @@ class _AccountappState extends State { @override Widget build(BuildContext context) { return Scaffold( + backgroundColor: AppColor.plainWhite, appBar: const AppBarWidget( height: 75, titleTxt: AppText.faqText, ), - backgroundColor: AppColor.plainWhite, body: SafeArea( child: SingleChildScrollView( child: Column( diff --git a/lib/features/login/presentation/pages/login_layout.dart b/lib/features/login/presentation/pages/login_layout.dart index 388f47c..e1bed9a 100644 --- a/lib/features/login/presentation/pages/login_layout.dart +++ b/lib/features/login/presentation/pages/login_layout.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:tanami_app/core/styles/app_color.dart'; import 'package:tanami_app/features/login/presentation/widgets/login_form.dart'; import '../../../../core/styles/app_color.dart'; diff --git a/lib/features/login/presentation/widgets/bottom_section.dart b/lib/features/login/presentation/widgets/bottom_section.dart index 4087117..303c18f 100644 --- a/lib/features/login/presentation/widgets/bottom_section.dart +++ b/lib/features/login/presentation/widgets/bottom_section.dart @@ -106,23 +106,23 @@ class BottomSection extends StatelessWidget { ); }, ), - const Gap(5), - ButtonWidget().textBtn( - function: () { - radioBloc.resetSelection(); - fromScreen == "forgot-pin" - ? goRouter.pop() - : goRouter - .pushNamed(RouteName.registerStepScreen, pathParameters: { - "fromScreentype": "login", - }); - }, - text: TextWidget().text14W700( - fromScreen == "forgot-pin" - ? AppText.backText - : AppText.signUpText, - clr: AppColor.textLabelColor, - textDecoration: TextDecoration.underline)), + const Gap(10), + ButtonWidget().textBorderBtn( + function: () { + radioBloc.resetSelection(); + fromScreen == "forgot-pin" + ? goRouter.pop() + : goRouter + .pushNamed(RouteName.registerStepScreen, pathParameters: { + "fromScreentype": "login", + }); + }, + clr: AppColor.plainWhite, + borderClr: AppColor.txtBorderColor, + text: fromScreen == "forgot-pin" + ? AppText.backText + : AppText.signUpText, + ), ], ); } diff --git a/lib/features/otpVerification/presentation/widgets/resend_otp_section.dart b/lib/features/otpVerification/presentation/widgets/resend_otp_section.dart index 20204a0..56e9dcf 100644 --- a/lib/features/otpVerification/presentation/widgets/resend_otp_section.dart +++ b/lib/features/otpVerification/presentation/widgets/resend_otp_section.dart @@ -24,7 +24,7 @@ class ResendOtpSection extends StatelessWidget { state.formattedDuration, clr: AppColor.plainBlack, ), - InkWell( + GestureDetector( onTap: () { successToastMessage(context, "OTP Resend Sucessfully !"); }, diff --git a/lib/features/register/presentation/pages/register_layout.dart b/lib/features/register/presentation/pages/register_layout.dart index ed226ff..34ec3dd 100644 --- a/lib/features/register/presentation/pages/register_layout.dart +++ b/lib/features/register/presentation/pages/register_layout.dart @@ -10,14 +10,15 @@ class RegisterLayout extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( - backgroundColor: AppColor.plainWhite, - body: ListView( - // - children: const [ - RegisterTopSection(), - RegisterForm(), - RegisterBottomSection(), - ], - )); + backgroundColor: AppColor.plainWhite, + body: ListView( + // + children: const [ + RegisterTopSection(), + RegisterForm(), + RegisterBottomSection(), + ], + ), + ); } } diff --git a/lib/features/securePin/presentation/widgets/pin_keypad_section.dart b/lib/features/securePin/presentation/widgets/pin_keypad_section.dart index 3fb8179..692e5f8 100644 --- a/lib/features/securePin/presentation/widgets/pin_keypad_section.dart +++ b/lib/features/securePin/presentation/widgets/pin_keypad_section.dart @@ -72,7 +72,7 @@ class PinKey extends StatelessWidget { ? const Gap(20) : const Gap(0), (fromScreen == "login") - ? InkWell( + ? GestureDetector( onTap: () { forgotPinDialog(context); }, diff --git a/lib/features/splash/presentation/pages/splash_layout.dart b/lib/features/splash/presentation/pages/splash_layout.dart index 4ef372b..3b7dd46 100644 --- a/lib/features/splash/presentation/pages/splash_layout.dart +++ b/lib/features/splash/presentation/pages/splash_layout.dart @@ -11,6 +11,7 @@ class SplashLayout extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( + backgroundColor: Colors.white, body: SizedBox( width: 1.sw, height: 1.sh, diff --git a/lib/features/welcome/presentation/pages/welcome_layout.dart b/lib/features/welcome/presentation/pages/welcome_layout.dart index 006837c..ef4178c 100644 --- a/lib/features/welcome/presentation/pages/welcome_layout.dart +++ b/lib/features/welcome/presentation/pages/welcome_layout.dart @@ -13,6 +13,7 @@ class WelcomeLayout extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( + backgroundColor: Colors.white, body: BlocListener( // Define the listener for the BlocListener listener: (context, state) { diff --git a/lib/shared/components/appbar_widget.dart b/lib/shared/components/appbar_widget.dart index 43d854e..d034264 100644 --- a/lib/shared/components/appbar_widget.dart +++ b/lib/shared/components/appbar_widget.dart @@ -65,7 +65,7 @@ class AppBarWidget extends StatelessWidget implements PreferredSizeWidget { ), actions: [ if (customActionWidget != null) - InkWell( + GestureDetector( onTap: onCustomActionPressed, child: Padding( padding: EdgeInsets.only(right: 14.w), diff --git a/lib/shared/components/button_widget.dart b/lib/shared/components/button_widget.dart index 68bf0e6..dc463d5 100644 --- a/lib/shared/components/button_widget.dart +++ b/lib/shared/components/button_widget.dart @@ -23,7 +23,7 @@ class ButtonWidget { Color? borderClr, required VoidCallback function, }) { - return InkWell( + return GestureDetector( onTap: function, child: Container( margin: const EdgeInsets.symmetric( diff --git a/lib/shared/components/exit_app_dialog.dart b/lib/shared/components/exit_app_dialog.dart index 94de24b..bd68334 100644 --- a/lib/shared/components/exit_app_dialog.dart +++ b/lib/shared/components/exit_app_dialog.dart @@ -64,7 +64,7 @@ exitAppDialog( Row( mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ - InkWell( + GestureDetector( onTap: () { goRouter.pop(); }, @@ -87,7 +87,7 @@ exitAppDialog( ), ), Gap(15.w), - InkWell( + GestureDetector( onTap: () { SystemNavigator.pop(); Navigator.pop(context); diff --git a/lib/shared/components/log_out_dialog.dart b/lib/shared/components/log_out_dialog.dart index f442906..a06e02d 100644 --- a/lib/shared/components/log_out_dialog.dart +++ b/lib/shared/components/log_out_dialog.dart @@ -61,7 +61,7 @@ buildprofilelogoutdialog(context) { Row( mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ - InkWell( + GestureDetector( onTap: () { goRouter.pop(); }, @@ -83,7 +83,7 @@ buildprofilelogoutdialog(context) { ), ), Gap(28.w), - InkWell( + GestureDetector( onTap: () async { context.read().add(TabChanged(1)); await secureStorageService.write('isLoginedIn', "false"); diff --git a/lib/shared/components/no_internet.dart b/lib/shared/components/no_internet.dart index 5dcfd49..0922e39 100644 --- a/lib/shared/components/no_internet.dart +++ b/lib/shared/components/no_internet.dart @@ -50,7 +50,7 @@ class NoInternet extends StatelessWidget { const SizedBox( height: 30.0, ), - InkWell( + GestureDetector( onTap: () async { final connectivityResult = await (Connectivity().checkConnectivity());