Merge pull request #56 from WDI-Ideas/meet

gest added
2024-06-18 14:59:14 +05:30
parent e68c0edcfb 5c209a23f3
commit 1a88e099bf
29 changed files with 110 additions and 91 deletions
--- a/lib/features/MainScreens/Academy/presentation/pages/academy_details_layout.dart
+++ b/lib/features/MainScreens/Academy/presentation/pages/academy_details_layout.dart
@@ -10,6 +10,7 @@ class AcademyDetailsLayout extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return Scaffold(
+      backgroundColor: Colors.white,
      body: SingleChildScrollView(
        child: Padding(
          padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 20.0),
--- a/lib/features/MainScreens/Academy/presentation/pages/academy_layout.dart
+++ b/lib/features/MainScreens/Academy/presentation/pages/academy_layout.dart
@@ -7,11 +7,13 @@ class AcademyLayout extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return Scaffold(
+      backgroundColor: Colors.white,
      body: ListView.builder(
-          itemCount: data.length,
-          itemBuilder: (context, index) {
-            return academyCard(data[index]);
-          }),
+        itemCount: data.length,
+        itemBuilder: (context, index) {
+          return academyCard(data[index]);
+        },
+      ),
    );
  }
 }
--- a/lib/features/MainScreens/Invest/presentation/pages/invest_layout.dart
+++ b/lib/features/MainScreens/Invest/presentation/pages/invest_layout.dart
@@ -82,7 +82,7 @@ class AvailableItemsScreen extends StatelessWidget {
                      vertical: 18,
                    ),
                    child: kycCard())
-                : InkWell(
+                : GestureDetector(
                    onTap: () {
                      goRouter.pushNamed(RouteName.investDetailScreen);
                    },
@@ -141,7 +141,7 @@ class ClosedItemsScreen extends StatelessWidget {
                      vertical: 18,
                    ),
                    child: kycCard())
-                : InkWell(
+                : GestureDetector(
                    onTap: () {
                      goRouter.pushNamed(RouteName.investDetailScreen);
                    },
--- a/lib/features/MainScreens/Invest/presentation/pages/payment/confirm_investment_layout.dart
+++ b/lib/features/MainScreens/Invest/presentation/pages/payment/confirm_investment_layout.dart
@@ -9,6 +9,7 @@ class ConfirmInvestmentLayout extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return const Scaffold(
+      backgroundColor: Colors.white,
      bottomNavigationBar: ConfirmInvestBottomSection(),
      body: Padding(
        padding: EdgeInsets.all(16.0),
--- 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));
                  },
--- a/lib/features/MainScreens/Portfolio/presentation/pages/portfolio_layout.dart
+++ b/lib/features/MainScreens/Portfolio/presentation/pages/portfolio_layout.dart
@@ -16,6 +16,7 @@ class PortfolioLayout extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return Scaffold(
+      backgroundColor: Colors.white,
      body: CustomScrollView(
        slivers: [
          SliverAppBar(
--- 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(),
+    );
  }
 }
--- a/lib/features/MainScreens/Settings/presentation/pages/settings_layout.dart
+++ b/lib/features/MainScreens/Settings/presentation/pages/settings_layout.dart
@@ -13,6 +13,7 @@ class SettingsLayout extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return Scaffold(
+      backgroundColor: Colors.white,
      body: Padding(
        padding: const EdgeInsets.symmetric(
          horizontal: 16,
--- 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<DepositScreen> {
              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<DepositScreen> {
                ),
              ),
              const Gap(12),
-              InkWell(
+              GestureDetector(
                onTap: () {
                  radioBloc.add(const RadioSelected(1));
                },
--- 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,
--- a/lib/features/changePassword/presentation/pages/change_password_layout.dart
+++ b/lib/features/changePassword/presentation/pages/change_password_layout.dart
@@ -8,10 +8,10 @@ class ChangePasswordLayout extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-
    return const Scaffold(
-        bottomNavigationBar: RestorePasswordBottomSection(),
-        body: RestorePasswordForm());
-
+      backgroundColor: Colors.white,
+      bottomNavigationBar: RestorePasswordBottomSection(),
+      body: RestorePasswordForm(),
+    );
  }
 }
--- a/lib/features/countrySelection/presentation/pages/choose_country_layout.dart
+++ b/lib/features/countrySelection/presentation/pages/choose_country_layout.dart
@@ -13,7 +13,7 @@ class ChooseCountryLayout extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    return Scaffold(
+    return Scaffold(backgroundColor: Colors.white,
      bottomNavigationBar: Container(
        margin: const EdgeInsets.symmetric(
          horizontal: 16,
--- 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<FAQScreen> {
  @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(
--- a/lib/features/forgotPassword/presentation/pages/restore_password_layout.dart
+++ b/lib/features/forgotPassword/presentation/pages/restore_password_layout.dart
@@ -11,13 +11,15 @@ class RestorePasswordLayout extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return Scaffold(
-        body: ListView(
-      children: const [
-        RestorePasswordTopSection(),
-        RestorePasswordForm(),
-        Gap(150),
-        RestorePasswordBottomSection(),
-      ],
-    ));
+      backgroundColor: Colors.white,
+      body: ListView(
+        children: const [
+          RestorePasswordTopSection(),
+          RestorePasswordForm(),
+          Gap(150),
+          RestorePasswordBottomSection(),
+        ],
+      ),
+    );
  }
 }
--- a/lib/features/forgotPassword/presentation/pages/restore_password_phone_verification_layout.dart
+++ b/lib/features/forgotPassword/presentation/pages/restore_password_phone_verification_layout.dart
@@ -11,13 +11,15 @@ class RestorePasswordPhoneVerificationLayout extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return Scaffold(
-        body: ListView(
-      children: const [
-        RestorePasswordPhoneVerificationTopSection(),
-        RestorePasswordPhoneVerificationForm(),
-        Gap(150),
-        RestorePasswordPhoneVerificationBottomSection(),
-      ],
-    ));
+      backgroundColor: Colors.white,
+      body: ListView(
+        children: const [
+          RestorePasswordPhoneVerificationTopSection(),
+          RestorePasswordPhoneVerificationForm(),
+          Gap(150),
+          RestorePasswordPhoneVerificationBottomSection(),
+        ],
+      ),
+    );
  }
 }
--- a/lib/features/languageChange/presentation/pages/language_change_layout.dart
+++ b/lib/features/languageChange/presentation/pages/language_change_layout.dart
@@ -15,6 +15,7 @@ class LanguageChangeLayout extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return Scaffold(
+      backgroundColor: Colors.white,
      bottomNavigationBar: bottomSection(),
      appBar: const AppBarWidget(
        height: 75,
--- 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 '../widgets/bottom_section.dart';
@@ -14,17 +15,18 @@ class LoginLayout extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return Scaffold(
+        backgroundColor: AppColor.plainWhite,
        body: ListView(
-      //
-      children: [
-        TopSection(
-          fromScreen: fromScreen,
-        ),
-        const LoginForm(),
-        BottomSection(
-          fromScreen: fromScreen,
-        ),
-      ],
-    ));
+          //
+          children: [
+            TopSection(
+              fromScreen: fromScreen,
+            ),
+            const LoginForm(),
+            BottomSection(
+              fromScreen: fromScreen,
+            ),
+          ],
+        ));
  }
 }
--- 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,
+        ),
      ],
    );
  }
--- 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 !");
                },
--- 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(),
+        ],
+      ),
+    );
  }
 }
--- 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);
                },
--- 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,
--- 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<OnboardingBloc, OnboardingState>(
        // Define the listener for the BlocListener
        listener: (context, state) {
--- 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),
--- 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(
--- 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);
--- 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<BottomNavigationBloc>().add(TabChanged(1));
                      await secureStorageService.write('isLoginedIn', "false");
--- 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());
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -620,26 +620,26 @@ packages:
    dependency: transitive
    description:
      name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
      url: "https://pub.dev"
    source: hosted
-    version: "10.0.0"
+    version: "10.0.4"
  leak_tracker_flutter_testing:
    dependency: transitive
    description:
      name: leak_tracker_flutter_testing
-      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.1"
+    version: "3.0.3"
  leak_tracker_testing:
    dependency: transitive
    description:
      name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.1"
+    version: "3.0.1"
  lints:
    dependency: transitive
    description:
@@ -724,10 +724,10 @@ packages:
    dependency: transitive
    description:
      name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
      url: "https://pub.dev"
    source: hosted
-    version: "1.11.0"
+    version: "1.12.0"
  mime:
    dependency: transitive
    description:
@@ -1193,10 +1193,10 @@ packages:
    dependency: transitive
    description:
      name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
      url: "https://pub.dev"
    source: hosted
-    version: "0.6.1"
+    version: "0.7.0"
  ticket_widget:
    dependency: "direct main"
    description:
@@ -1353,10 +1353,10 @@ packages:
    dependency: transitive
    description:
      name: vm_service
-      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
      url: "https://pub.dev"
    source: hosted
-    version: "13.0.0"
+    version: "14.2.1"
  watcher:
    dependency: transitive
    description: