From 291cf2bfc4e9238c2da1c6c454617976a5bfffb9 Mon Sep 17 00:00:00 2001 From: jayesh Date: Wed, 12 Jun 2024 12:49:54 +0530 Subject: [PATCH] bg color updated to white --- .../pages/academy_details_screen.dart | 2 + .../presentation/pages/academy_screen.dart | 1 + .../pages/invest_details_screen.dart | 1 + .../presentation/pages/invest_screen.dart | 1 + .../payment/confirm_investment_screen.dart | 2 + .../pages/payment/invest_payment_screen.dart | 2 + .../pages/portfolio_details_screen.dart | 2 + .../presentation/pages/portfolio_screen.dart | 4 +- .../presentation/pages/settings_screen.dart | 1 + .../presentation/pages/biometric_screen.dart | 2 + .../pages/change_password_screen.dart | 2 + .../pages/contact_admin_screen.dart | 2 + .../pages/choose_country_screen.dart | 3 + .../pages/delete_account_screen.dart | 2 + ...re_password_phone_verification_screen.dart | 2 + .../pages/restore_password_screen.dart | 2 + .../pages/language_change_screen.dart | 2 + .../presentation/pages/login_screen.dart | 2 + .../presentation/pages/otp_screen.dart | 2 + .../presentation/pages/register_screen.dart | 2 + .../pages/register_step_screen.dart | 2 + .../pages/register_user_details_screen.dart | 2 + .../pages/confirm_pin_screen.dart | 2 + .../presentation/pages/pin_screen.dart | 2 + .../presentation/pages/splash_screen.dart | 2 + .../presentation/pages/weclome_screen.dart | 2 + lib/shared/components/error_widget.dart | 3 + lib/shared/components/no_internet.dart | 124 +++++++++--------- 28 files changed, 117 insertions(+), 61 deletions(-) diff --git a/lib/features/MainScreens/Academy/presentation/pages/academy_details_screen.dart b/lib/features/MainScreens/Academy/presentation/pages/academy_details_screen.dart index 095bab3..438b1d8 100644 --- a/lib/features/MainScreens/Academy/presentation/pages/academy_details_screen.dart +++ b/lib/features/MainScreens/Academy/presentation/pages/academy_details_screen.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:tanami_app/features/MainScreens/Academy/presentation/pages/academy_details_layout.dart'; +import '../../../../../core/styles/app_color.dart'; import '../../../../../shared/components/appbar_widget.dart'; class AcademyDetailsScreen extends StatefulWidget { @@ -14,6 +15,7 @@ class _AcademyDetailsScreenState extends State { @override Widget build(BuildContext context) { return const Scaffold( + backgroundColor: AppColor.plainWhite, appBar: AppBarWidget( height: 50, titleTxt: "Article Name", diff --git a/lib/features/MainScreens/Academy/presentation/pages/academy_screen.dart b/lib/features/MainScreens/Academy/presentation/pages/academy_screen.dart index 0ea69d6..5d25487 100644 --- a/lib/features/MainScreens/Academy/presentation/pages/academy_screen.dart +++ b/lib/features/MainScreens/Academy/presentation/pages/academy_screen.dart @@ -16,6 +16,7 @@ class _AcademyScreenState extends State { @override Widget build(BuildContext context) { return Scaffold( + backgroundColor: AppColor.plainWhite, appBar: AppBar( backgroundColor: Colors.white, elevation: 0, diff --git a/lib/features/MainScreens/Invest/presentation/pages/invest_details_screen.dart b/lib/features/MainScreens/Invest/presentation/pages/invest_details_screen.dart index 4ae7e41..7025abc 100644 --- a/lib/features/MainScreens/Invest/presentation/pages/invest_details_screen.dart +++ b/lib/features/MainScreens/Invest/presentation/pages/invest_details_screen.dart @@ -17,6 +17,7 @@ class InvestDetailsScreen extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( + backgroundColor: AppColor.plainWhite, bottomNavigationBar: Container( padding: const EdgeInsets.symmetric(horizontal: 18, vertical: 26), width: 1.sw, diff --git a/lib/features/MainScreens/Invest/presentation/pages/invest_screen.dart b/lib/features/MainScreens/Invest/presentation/pages/invest_screen.dart index 1023769..076515d 100644 --- a/lib/features/MainScreens/Invest/presentation/pages/invest_screen.dart +++ b/lib/features/MainScreens/Invest/presentation/pages/invest_screen.dart @@ -19,6 +19,7 @@ class _InvestScreenState extends State { @override Widget build(BuildContext context) { return Scaffold( + backgroundColor: AppColor.plainWhite, appBar: AppBar( // backgroundColor: Colors.white, elevation: 0, diff --git a/lib/features/MainScreens/Invest/presentation/pages/payment/confirm_investment_screen.dart b/lib/features/MainScreens/Invest/presentation/pages/payment/confirm_investment_screen.dart index 2206315..026f6ef 100644 --- a/lib/features/MainScreens/Invest/presentation/pages/payment/confirm_investment_screen.dart +++ b/lib/features/MainScreens/Invest/presentation/pages/payment/confirm_investment_screen.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:tanami_app/features/MainScreens/Invest/presentation/pages/payment/confirm_investment_layout.dart'; +import '../../../../../../core/styles/app_color.dart'; import '../../../../../../core/styles/app_text.dart'; import '../../../../../../shared/components/appbar_widget.dart'; @@ -10,6 +11,7 @@ class ConfirmInvestmentScreen extends StatelessWidget { @override Widget build(BuildContext context) { return const Scaffold( + backgroundColor: AppColor.plainWhite, appBar: AppBarWidget( height: 75, titleTxt: AppText.confirmInvestmentText, diff --git a/lib/features/MainScreens/Invest/presentation/pages/payment/invest_payment_screen.dart b/lib/features/MainScreens/Invest/presentation/pages/payment/invest_payment_screen.dart index 085ebff..1486209 100644 --- a/lib/features/MainScreens/Invest/presentation/pages/payment/invest_payment_screen.dart +++ b/lib/features/MainScreens/Invest/presentation/pages/payment/invest_payment_screen.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; +import '../../../../../../core/styles/app_color.dart'; import '../../../../../../core/styles/app_text.dart'; import '../../../../../../shared/components/appbar_widget.dart'; import 'invest_payment_layout.dart'; @@ -10,6 +11,7 @@ class InvestPaymentScreen extends StatelessWidget { @override Widget build(BuildContext context) { return const Scaffold( + backgroundColor: AppColor.plainWhite, appBar: AppBarWidget( height: 75, titleTxt: AppText.investmentDetailsText, diff --git a/lib/features/MainScreens/Portfolio/presentation/pages/portfolio_details_screen.dart b/lib/features/MainScreens/Portfolio/presentation/pages/portfolio_details_screen.dart index 4edd012..34f320c 100644 --- a/lib/features/MainScreens/Portfolio/presentation/pages/portfolio_details_screen.dart +++ b/lib/features/MainScreens/Portfolio/presentation/pages/portfolio_details_screen.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:tanami_app/features/MainScreens/Portfolio/presentation/pages/portfolio_details_layout.dart'; +import '../../../../../core/styles/app_color.dart'; import '../../../../../shared/components/appbar_widget.dart'; import '../bloc/carousel/carousel_bloc.dart'; @@ -11,6 +12,7 @@ class DetailsScreen extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( + backgroundColor: AppColor.plainWhite, appBar: const AppBarWidget( height: 45, titleTxt: "", diff --git a/lib/features/MainScreens/Portfolio/presentation/pages/portfolio_screen.dart b/lib/features/MainScreens/Portfolio/presentation/pages/portfolio_screen.dart index 08aae14..2e6cc1e 100644 --- a/lib/features/MainScreens/Portfolio/presentation/pages/portfolio_screen.dart +++ b/lib/features/MainScreens/Portfolio/presentation/pages/portfolio_screen.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; +import '../../../../../core/styles/app_color.dart'; import 'portfolio_layout.dart'; class PortfolioScreen extends StatelessWidget { @@ -7,6 +8,7 @@ class PortfolioScreen extends StatelessWidget { @override Widget build(BuildContext context) { - return const Scaffold(body: PortfolioLayout()); + return const Scaffold( + backgroundColor: AppColor.plainWhite, body: PortfolioLayout()); } } diff --git a/lib/features/MainScreens/Settings/presentation/pages/settings_screen.dart b/lib/features/MainScreens/Settings/presentation/pages/settings_screen.dart index dc4984f..249341a 100644 --- a/lib/features/MainScreens/Settings/presentation/pages/settings_screen.dart +++ b/lib/features/MainScreens/Settings/presentation/pages/settings_screen.dart @@ -16,6 +16,7 @@ class _SettingsScreenState extends State { @override Widget build(BuildContext context) { return Scaffold( + backgroundColor: AppColor.plainWhite, appBar: AppBar( // backgroundColor: Colors.white, elevation: 0, diff --git a/lib/features/biometric/presentation/pages/biometric_screen.dart b/lib/features/biometric/presentation/pages/biometric_screen.dart index f977b6f..b4e10ae 100644 --- a/lib/features/biometric/presentation/pages/biometric_screen.dart +++ b/lib/features/biometric/presentation/pages/biometric_screen.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:tanami_app/core/styles/app_color.dart'; import 'package:tanami_app/features/biometric/presentation/pages/biometric_layout.dart'; class BiometricScreen extends StatelessWidget { @@ -7,6 +8,7 @@ class BiometricScreen extends StatelessWidget { @override Widget build(BuildContext context) { return const Scaffold( + backgroundColor: AppColor.plainWhite, // resizeToAvoidBottomInset: true, body: BiometricLayout(), ); diff --git a/lib/features/changePassword/presentation/pages/change_password_screen.dart b/lib/features/changePassword/presentation/pages/change_password_screen.dart index b6bffdd..5e6ad10 100644 --- a/lib/features/changePassword/presentation/pages/change_password_screen.dart +++ b/lib/features/changePassword/presentation/pages/change_password_screen.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import '../../../../core/styles/app_color.dart'; import '../../../../core/styles/app_text.dart'; import '../../../../shared/components/appbar_widget.dart'; import '../bloc/change_password_bloc.dart'; @@ -12,6 +13,7 @@ class ChangePasswordScreen extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( + backgroundColor: AppColor.plainWhite, appBar: const AppBarWidget( height: 75, titleTxt: AppText.changePasswordText, diff --git a/lib/features/contactAdmin/presentation/pages/contact_admin_screen.dart b/lib/features/contactAdmin/presentation/pages/contact_admin_screen.dart index d681ba1..42e2947 100644 --- a/lib/features/contactAdmin/presentation/pages/contact_admin_screen.dart +++ b/lib/features/contactAdmin/presentation/pages/contact_admin_screen.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:tanami_app/features/contactAdmin/presentation/widgets/bottom_section.dart'; +import '../../../../core/styles/app_color.dart'; import '../../../../core/styles/app_text.dart'; import '../../../../shared/components/appbar_widget.dart'; import '../widgets/top_section.dart'; @@ -11,6 +12,7 @@ class ContactAdminScreen extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( + backgroundColor: AppColor.plainWhite, appBar: const AppBarWidget( height: 75, titleTxt: AppText.contactAdminText, diff --git a/lib/features/countrySelection/presentation/pages/choose_country_screen.dart b/lib/features/countrySelection/presentation/pages/choose_country_screen.dart index 71bfdf8..4898924 100644 --- a/lib/features/countrySelection/presentation/pages/choose_country_screen.dart +++ b/lib/features/countrySelection/presentation/pages/choose_country_screen.dart @@ -1,4 +1,6 @@ import 'package:flutter/material.dart'; + +import '../../../../core/styles/app_color.dart'; import 'choose_country_layout.dart'; class ChooseCountryScreen extends StatelessWidget { @@ -7,6 +9,7 @@ class ChooseCountryScreen extends StatelessWidget { @override Widget build(BuildContext context) { return const Scaffold( + backgroundColor: AppColor.plainWhite, resizeToAvoidBottomInset: true, body: ChooseCountryLayout(), ); diff --git a/lib/features/deleteAccount/presentation/pages/delete_account_screen.dart b/lib/features/deleteAccount/presentation/pages/delete_account_screen.dart index 2975ff0..50c4d3b 100644 --- a/lib/features/deleteAccount/presentation/pages/delete_account_screen.dart +++ b/lib/features/deleteAccount/presentation/pages/delete_account_screen.dart @@ -3,6 +3,7 @@ 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 '../../../../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'; @@ -14,6 +15,7 @@ class DeleteAccountScreen extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( + backgroundColor: AppColor.plainWhite, appBar: const AppBarWidget( height: 75, titleTxt: AppText.deleteAccountText, diff --git a/lib/features/forgotPassword/presentation/pages/restore_password_phone_verification_screen.dart b/lib/features/forgotPassword/presentation/pages/restore_password_phone_verification_screen.dart index 8abd903..f52c7fd 100644 --- a/lib/features/forgotPassword/presentation/pages/restore_password_phone_verification_screen.dart +++ b/lib/features/forgotPassword/presentation/pages/restore_password_phone_verification_screen.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:tanami_app/features/forgotPassword/presentation/pages/restore_password_phone_verification_layout.dart'; +import '../../../../core/styles/app_color.dart'; import '../bloc/restore_password_phone_verification_bloc.dart'; class RestorePasswordPhoneVerificationScreen extends StatelessWidget { @@ -10,6 +11,7 @@ class RestorePasswordPhoneVerificationScreen extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( + backgroundColor: AppColor.plainWhite, resizeToAvoidBottomInset: true, body: MultiBlocProvider( // Define the providers for the OnboardingBloc and other blocs diff --git a/lib/features/forgotPassword/presentation/pages/restore_password_screen.dart b/lib/features/forgotPassword/presentation/pages/restore_password_screen.dart index 8052e8f..079b42d 100644 --- a/lib/features/forgotPassword/presentation/pages/restore_password_screen.dart +++ b/lib/features/forgotPassword/presentation/pages/restore_password_screen.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import '../../../../core/styles/app_color.dart'; import '../bloc/restore_password_bloc.dart'; import 'restore_password_layout.dart'; @@ -10,6 +11,7 @@ class RestorePasswordScreen extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( + backgroundColor: AppColor.plainWhite, resizeToAvoidBottomInset: true, body: MultiBlocProvider( // Define the providers for the OnboardingBloc and other blocs diff --git a/lib/features/languageChange/presentation/pages/language_change_screen.dart b/lib/features/languageChange/presentation/pages/language_change_screen.dart index 6b836c2..ca0c558 100644 --- a/lib/features/languageChange/presentation/pages/language_change_screen.dart +++ b/lib/features/languageChange/presentation/pages/language_change_screen.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:tanami_app/features/languageChange/presentation/bloc/choose_language_bloc.dart'; +import '../../../../core/styles/app_color.dart'; import 'language_change_layout.dart'; class LanguageChaneScreen extends StatelessWidget { @@ -10,6 +11,7 @@ class LanguageChaneScreen extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( + backgroundColor: AppColor.plainWhite, resizeToAvoidBottomInset: true, body: MultiBlocProvider( // Define the providers for the OnboardingBloc and other blocs diff --git a/lib/features/login/presentation/pages/login_screen.dart b/lib/features/login/presentation/pages/login_screen.dart index fe2d6c1..3ff586e 100644 --- a/lib/features/login/presentation/pages/login_screen.dart +++ b/lib/features/login/presentation/pages/login_screen.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import '../../../../core/styles/app_color.dart'; import '../../../../shared/components/exit_app_dialog.dart'; import '../../../countrySelection/presentation/bloc/choose_country_bloc.dart'; import '../bloc/login_bloc.dart'; @@ -26,6 +27,7 @@ class LoginScreen extends StatelessWidget { } }, child: Scaffold( + backgroundColor: AppColor.plainWhite, resizeToAvoidBottomInset: true, body: MultiBlocProvider( // Define the providers for the OnboardingBloc and other blocs diff --git a/lib/features/otpVerification/presentation/pages/otp_screen.dart b/lib/features/otpVerification/presentation/pages/otp_screen.dart index 55f58fd..de03fb2 100644 --- a/lib/features/otpVerification/presentation/pages/otp_screen.dart +++ b/lib/features/otpVerification/presentation/pages/otp_screen.dart @@ -3,6 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:tanami_app/features/otpVerification/presentation/bloc/otp_bloc.dart'; import 'package:tanami_app/features/otpVerification/presentation/pages/otp_layout.dart'; +import '../../../../core/styles/app_color.dart'; import '../bloc/otp_event.dart'; import '../bloc/timer/timer_bloc.dart'; import '../bloc/timer/timer_event.dart'; @@ -17,6 +18,7 @@ class OtpScreen extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( + backgroundColor: AppColor.plainWhite, resizeToAvoidBottomInset: true, body: MultiBlocProvider( providers: [ diff --git a/lib/features/register/presentation/pages/register_screen.dart b/lib/features/register/presentation/pages/register_screen.dart index 6e0a7ad..02bafe3 100644 --- a/lib/features/register/presentation/pages/register_screen.dart +++ b/lib/features/register/presentation/pages/register_screen.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:tanami_app/features/register/presentation/bloc/register_bloc.dart'; +import '../../../../core/styles/app_color.dart'; import '../../../countrySelection/presentation/bloc/choose_country_bloc.dart'; import 'register_layout.dart'; @@ -17,6 +18,7 @@ class RegisterScreen extends StatelessWidget { return true; // Allow the pop to happen }, child: Scaffold( + backgroundColor: AppColor.plainWhite, resizeToAvoidBottomInset: true, body: MultiBlocProvider( providers: [ diff --git a/lib/features/register/presentation/pages/register_step_screen.dart b/lib/features/register/presentation/pages/register_step_screen.dart index e818e9c..8498cfe 100644 --- a/lib/features/register/presentation/pages/register_step_screen.dart +++ b/lib/features/register/presentation/pages/register_step_screen.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; +import '../../../../core/styles/app_color.dart'; import '../../../../shared/components/exit_app_dialog.dart'; import 'register_step_layout.dart'; @@ -22,6 +23,7 @@ class RegisterStepScreen extends StatelessWidget { } }, child: const Scaffold( + backgroundColor: AppColor.plainWhite, resizeToAvoidBottomInset: true, body: RegisterStepLayout(), ), diff --git a/lib/features/register/presentation/pages/register_user_details_screen.dart b/lib/features/register/presentation/pages/register_user_details_screen.dart index 93ae371..036f13a 100644 --- a/lib/features/register/presentation/pages/register_user_details_screen.dart +++ b/lib/features/register/presentation/pages/register_user_details_screen.dart @@ -3,6 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:tanami_app/features/register/presentation/pages/register_user_details_layout.dart'; import 'package:tanami_app/shared/components/bloc/checkbox/checkbox_bloc.dart'; +import '../../../../core/styles/app_color.dart'; import '../bloc/register_user_bloc.dart'; class RegisterUserDetailsScreen extends StatelessWidget { @@ -13,6 +14,7 @@ class RegisterUserDetailsScreen extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( + backgroundColor: AppColor.plainWhite, resizeToAvoidBottomInset: true, body: MultiBlocProvider( providers: [ diff --git a/lib/features/securePin/presentation/pages/confirm_pin_screen.dart b/lib/features/securePin/presentation/pages/confirm_pin_screen.dart index 237de02..c3edded 100644 --- a/lib/features/securePin/presentation/pages/confirm_pin_screen.dart +++ b/lib/features/securePin/presentation/pages/confirm_pin_screen.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import '../../../../core/styles/app_color.dart'; import '../../../../core/styles/app_text.dart'; import '../../../../core/utils/secure/secure_storage_service.dart'; import '../../../../shared/components/appbar_widget.dart'; @@ -14,6 +15,7 @@ class ConfirmPinScreen extends StatelessWidget { Widget build(BuildContext context) { final secureStorageService = SecureStorageService(); return Scaffold( + backgroundColor: AppColor.plainWhite, appBar: const AppBarWidget( height: 75, titleTxt: AppText.createPinCode, diff --git a/lib/features/securePin/presentation/pages/pin_screen.dart b/lib/features/securePin/presentation/pages/pin_screen.dart index 4346baa..0505eec 100644 --- a/lib/features/securePin/presentation/pages/pin_screen.dart +++ b/lib/features/securePin/presentation/pages/pin_screen.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import '../../../../core/styles/app_color.dart'; import '../../../../core/styles/app_text.dart'; import '../../../../core/utils/secure/secure_storage_service.dart'; import '../../../../shared/components/appbar_widget.dart'; @@ -15,6 +16,7 @@ class PinScreen extends StatelessWidget { Widget build(BuildContext context) { final secureStorageService = SecureStorageService(); return Scaffold( + backgroundColor: AppColor.plainWhite, appBar: fromScreen == "register" || fromScreen == "reset-pin" ? AppBarWidget( height: 75, diff --git a/lib/features/splash/presentation/pages/splash_screen.dart b/lib/features/splash/presentation/pages/splash_screen.dart index f93f165..6ba4c6c 100644 --- a/lib/features/splash/presentation/pages/splash_screen.dart +++ b/lib/features/splash/presentation/pages/splash_screen.dart @@ -3,6 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:tanami_app/core/routes/route_name.dart'; import 'package:tanami_app/core/routes/routes.dart'; +import '../../../../core/styles/app_color.dart'; import '../bloc/app_version/app_version_bloc.dart'; import '../bloc/app_version/app_version_event.dart'; import '../bloc/splash/splash_bloc.dart'; @@ -16,6 +17,7 @@ class SplashScreen extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( + backgroundColor: AppColor.plainWhite, body: MultiBlocProvider( providers: [ // Add the LoadAppVersion event. diff --git a/lib/features/welcome/presentation/pages/weclome_screen.dart b/lib/features/welcome/presentation/pages/weclome_screen.dart index b06268b..82aafa3 100644 --- a/lib/features/welcome/presentation/pages/weclome_screen.dart +++ b/lib/features/welcome/presentation/pages/weclome_screen.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:tanami_app/features/welcome/presentation/pages/welcome_layout.dart'; +import '../../../../core/styles/app_color.dart'; import '../bloc/onboarding_bloc.dart'; class WelcomeScreen extends StatelessWidget { @@ -10,6 +11,7 @@ class WelcomeScreen extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( + backgroundColor: AppColor.plainWhite, body: MultiBlocProvider( // Define the providers for the OnboardingBloc and other blocs providers: [ diff --git a/lib/shared/components/error_widget.dart b/lib/shared/components/error_widget.dart index 96eaf38..4f12da8 100644 --- a/lib/shared/components/error_widget.dart +++ b/lib/shared/components/error_widget.dart @@ -1,5 +1,7 @@ import 'package:flutter/material.dart'; +import '../../core/styles/app_color.dart'; + class CustomErrorWidget extends StatelessWidget { final String errorMessage; @@ -8,6 +10,7 @@ class CustomErrorWidget extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( + backgroundColor: AppColor.plainWhite, body: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ diff --git a/lib/shared/components/no_internet.dart b/lib/shared/components/no_internet.dart index 94209b1..5dcfd49 100644 --- a/lib/shared/components/no_internet.dart +++ b/lib/shared/components/no_internet.dart @@ -18,69 +18,73 @@ class NoInternet extends StatelessWidget { return WillPopScope( onWillPop: () => Future.value(false), child: Scaffold( + backgroundColor: AppColor.plainWhite, body: Column(children: [ - Center( - child: Container( - margin: const EdgeInsets.only(top: 100), - height: 180.h, - width: 1.sw, - child: Image.asset(AppImages.noInternetImage), - ), - ), - Center( - child: Padding( - padding: const EdgeInsets.only(top: 100), - child: Center( - child: Column( - children: [ - const SizedBox( - height: 15.0, - ), - Container( - margin: const EdgeInsets.symmetric(horizontal: 20), - child: Text( - "Internet Connection is Down!\n\nEnsure your internet's up and running.", - textAlign: TextAlign.center, - style: GoogleFonts.dmSans( - fontSize: 18.0, - fontWeight: FontWeight.w500, - )), - ), - const SizedBox( - height: 30.0, - ), - InkWell( - onTap: () async { - final connectivityResult = - await (Connectivity().checkConnectivity()); - if (connectivityResult[0] == ConnectivityResult.wifi || - connectivityResult[0] == ConnectivityResult.mobile) { - goRouter.pop(); - } else { - errorToastMessage(context, "Internet is still down"); - } - }, - child: Container( - height: 54.h, - width: 330.w, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(10.h), - color: AppColor.primaryColor2), - child: Center( - child: Text( - "Try Again", - style: GoogleFonts.dmSans( - color: AppColor.plainWhite, fontSize: 20.sp), - ), - ), - ), - ), - ], + Center( + child: Container( + margin: const EdgeInsets.only(top: 100), + height: 180.h, + width: 1.sw, + child: Image.asset(AppImages.noInternetImage), ), ), - ), - ), - ])), + Center( + child: Padding( + padding: const EdgeInsets.only(top: 100), + child: Center( + child: Column( + children: [ + const SizedBox( + height: 15.0, + ), + Container( + margin: const EdgeInsets.symmetric(horizontal: 20), + child: Text( + "Internet Connection is Down!\n\nEnsure your internet's up and running.", + textAlign: TextAlign.center, + style: GoogleFonts.dmSans( + fontSize: 18.0, + fontWeight: FontWeight.w500, + )), + ), + const SizedBox( + height: 30.0, + ), + InkWell( + onTap: () async { + final connectivityResult = + await (Connectivity().checkConnectivity()); + if (connectivityResult[0] == + ConnectivityResult.wifi || + connectivityResult[0] == + ConnectivityResult.mobile) { + goRouter.pop(); + } else { + errorToastMessage( + context, "Internet is still down"); + } + }, + child: Container( + height: 54.h, + width: 330.w, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10.h), + color: AppColor.primaryColor2), + child: Center( + child: Text( + "Try Again", + style: GoogleFonts.dmSans( + color: AppColor.plainWhite, fontSize: 20.sp), + ), + ), + ), + ), + ], + ), + ), + ), + ), + ])), ); } }