bg color updated to white

This commit is contained in:
jayesh
2024-06-12 12:49:54 +05:30
parent 4dfc1bae11
commit 291cf2bfc4
28 changed files with 117 additions and 61 deletions

View File

@@ -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<AcademyDetailsScreen> {
@override
Widget build(BuildContext context) {
return const Scaffold(
backgroundColor: AppColor.plainWhite,
appBar: AppBarWidget(
height: 50,
titleTxt: "Article Name",

View File

@@ -16,6 +16,7 @@ class _AcademyScreenState extends State<AcademyScreen> {
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: AppColor.plainWhite,
appBar: AppBar(
backgroundColor: Colors.white,
elevation: 0,

View File

@@ -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,

View File

@@ -19,6 +19,7 @@ class _InvestScreenState extends State<InvestScreen> {
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: AppColor.plainWhite,
appBar: AppBar(
// backgroundColor: Colors.white,
elevation: 0,

View File

@@ -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,

View File

@@ -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,

View File

@@ -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: "",

View File

@@ -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());
}
}

View File

@@ -16,6 +16,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: AppColor.plainWhite,
appBar: AppBar(
// backgroundColor: Colors.white,
elevation: 0,

View File

@@ -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(),
);

View File

@@ -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,

View File

@@ -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,

View File

@@ -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(),
);

View File

@@ -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,

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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: [

View File

@@ -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: [

View File

@@ -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(),
),

View File

@@ -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: [

View File

@@ -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,

View File

@@ -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,

View File

@@ -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.

View File

@@ -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: [

View File

@@ -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: [

View File

@@ -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: <Widget>[
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: <Widget>[
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),
),
),
),
),
],
),
),
),
),
])),
);
}
}