Skip to content

GitLab

Commits (2)
  • Sai Srinivas's avatar
    Responsive and ui correction · 558ac0d8
    Sai Srinivas authored
    558ac0d8
  • Sai Srinivas's avatar
    Merge remote-tracking branch 'origin/main' · e6241d05
    Sai Srinivas authored 
    # Conflicts:
#	lib/Screens/BillScreens/BillDetailScreen.dart
#	lib/Screens/DashboardScreen.dart
#	lib/Screens/HelpScreens/OrderHelpScreen.dart
#	lib/Screens/ProductsDetailScreen.dart
#	lib/Screens/ProfileScreen.dart
#	lib/Screens/TransactionScreens/BillStatusToast.dart
#	lib/Screens/authScreen/LoginScreen.dart
#	lib/Screens/authScreen/OTP_Screen.dart
    e6241d05
Show whitespace changes
Inline Side-by-side
android/app/build.gradle.kts
View file @ e6241d05
...@@ -32,7 +32,7 @@ android { ...@@ -32,7 +32,7 @@ android {
applicationId = "in.webgrid.genrentals" applicationId = "in.webgrid.genrentals"
// You can update the following values to match your application needs. // You can update the following values to match your application needs.
// For more information, see: https://flutter.dev/to/review-gradle-config. // For more information, see: https://flutter.dev/to/review-gradle-config.
minSdk = 23 minSdk = flutter.minSdkVersion
targetSdk = 36 targetSdk = 36
versionCode = flutter.versionCode versionCode = flutter.versionCode
versionName = flutter.versionName versionName = flutter.versionName
......
lib/Screens/BillScreens/BillDetailScreen.dart
View file @ e6241d05
...@@ -111,8 +111,8 @@ class _BillDetailScreenState extends State<BillDetailScreen> { ...@@ -111,8 +111,8 @@ class _BillDetailScreenState extends State<BillDetailScreen> {
"Bill Details", "Bill Details",
style: TextStyle( style: TextStyle(
fontSize: getResponsiveTextSize(context, 16), fontSize: getResponsiveTextSize(context, 16),
fontFamily: "Plus Jakarta Sans", fontFamily: "Poppins",
fontWeight: FontWeight.w600, fontWeight: FontWeight.w500,
color: Colors.black87, color: Colors.black87,
), ),
), ),
...@@ -276,7 +276,7 @@ class _BillDetailScreenState extends State<BillDetailScreen> { ...@@ -276,7 +276,7 @@ class _BillDetailScreenState extends State<BillDetailScreen> {
"Pay Now", "Pay Now",
style: TextStyle( style: TextStyle(
fontSize: getResponsiveTextSize(context, 14), fontSize: getResponsiveTextSize(context, 14),
fontFamily: "Plus Jakarta Sans", fontFamily: "Poppins",
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
), ),
...@@ -537,6 +537,7 @@ class _BillDetailScreenState extends State<BillDetailScreen> { ...@@ -537,6 +537,7 @@ class _BillDetailScreenState extends State<BillDetailScreen> {
title, title,
maxLines: 2, maxLines: 2,
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
fontSize: getResponsiveTextSize(context, 14), fontSize: getResponsiveTextSize(context, 14),
color: AppColors.subtitleText, color: AppColors.subtitleText,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
...@@ -546,6 +547,7 @@ class _BillDetailScreenState extends State<BillDetailScreen> { ...@@ -546,6 +547,7 @@ class _BillDetailScreenState extends State<BillDetailScreen> {
Text( Text(
value, value,
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
fontSize: getResponsiveTextSize(context, 14), fontSize: getResponsiveTextSize(context, 14),
fontWeight: isBold ? FontWeight.w700 : FontWeight.w400, fontWeight: isBold ? FontWeight.w700 : FontWeight.w400,
color: highlight color: highlight
......
lib/Screens/DashboardScreen.dart
View file @ e6241d05
...@@ -243,10 +243,10 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -243,10 +243,10 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
); );
}, },
child: CircleAvatar( child: CircleAvatar(
radius: getResponsiveIconSize(context, 24), radius: getResponsiveIconSize(context, 20),
backgroundColor: Color(0xDDE0F4FF), backgroundColor: Color(0xDDE0F4FF),
child: SvgPicture.asset( child: SvgPicture.asset(
height: getResponsiveIconSize(context, 24), height: getResponsiveIconSize(context, 20),
"assets/svg/person_ic.svg", "assets/svg/person_ic.svg",
fit: BoxFit.contain, fit: BoxFit.contain,
), ),
...@@ -298,10 +298,10 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -298,10 +298,10 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
// Balance Amount Card // Balance Amount Card
Container( Container(
width: double.infinity, width: double.infinity,
padding: EdgeInsets.all(screenWidth * 0.05), padding: EdgeInsets.all(screenWidth * 0.048),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(screenWidth * 0.04), borderRadius: BorderRadius.circular(screenWidth * 0.038),
), ),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
...@@ -323,7 +323,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -323,7 +323,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
style: TextStyle( style: TextStyle(
fontFamily: "Poppins", fontFamily: "Poppins",
color: Color(0xFFF00000), color: Color(0xFFF00000),
fontSize: getResponsiveTextSize(context, 14), fontSize: getResponsiveTextSize(context, 13.5),
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
), ),
), ),
...@@ -331,8 +331,8 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -331,8 +331,8 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
SvgPicture.asset( SvgPicture.asset(
"assets/svg/continue_ic.svg", "assets/svg/continue_ic.svg",
color: const Color(0xFFF00000), color: const Color(0xFFF00000),
height: getResponsiveIconSize(context, 18), height: getResponsiveIconSize(context, 16),
width: getResponsiveIconSize(context, 18), width: getResponsiveIconSize(context, 16),
), ),
], ],
), ),
...@@ -347,7 +347,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -347,7 +347,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
Text( Text(
"₹", "₹",
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
color: Colors.black, color: Colors.black,
fontSize: getResponsiveTextSize(context, 20), fontSize: getResponsiveTextSize(context, 20),
height: 2, height: 2,
...@@ -357,7 +357,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -357,7 +357,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
Text( Text(
dashboardData?.balanceAmount?.toString() ?? "0", dashboardData?.balanceAmount?.toString() ?? "0",
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
color: Colors.black, color: Colors.black,
fontSize: getResponsiveTextSize(context, 34), fontSize: getResponsiveTextSize(context, 34),
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
...@@ -373,7 +373,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -373,7 +373,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
style: TextStyle( style: TextStyle(
fontFamily: "Poppins", fontFamily: "Poppins",
color: Colors.grey.shade500, color: Colors.grey.shade500,
fontSize: getResponsiveTextSize(context, 12), fontSize: getResponsiveTextSize(context, 11),
fontStyle: FontStyle.normal, fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
), ),
...@@ -396,7 +396,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -396,7 +396,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
textStyle: TextStyle( textStyle: TextStyle(
fontFamily: "Poppins", fontFamily: "Poppins",
color: Colors.grey.shade800, color: Colors.grey.shade800,
fontSize: getResponsiveTextSize(context, 16), fontSize: getResponsiveTextSize(context, 14),
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
), ),
...@@ -469,7 +469,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -469,7 +469,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(screenWidth * 0.04), borderRadius: BorderRadius.circular(screenWidth * 0.05),
border: Border.all( border: Border.all(
color: Colors.grey.shade200, color: Colors.grey.shade200,
width: 1, width: 1,
...@@ -488,30 +488,30 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -488,30 +488,30 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
style: TextStyle( style: TextStyle(
fontFamily: "Poppins", fontFamily: "Poppins",
color: Color(0xFF008CDE), color: Color(0xFF008CDE),
fontSize: getResponsiveTextSize(context, 14), fontSize: getResponsiveTextSize(context, 13),
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
), ),
), ),
SizedBox(height: screenHeight * 0.008), SizedBox(height: screenHeight * 0.0075),
Text( Text(
"Submit your enquiry for requirement", "Submit your enquiry for requirement",
style: TextStyle( style: TextStyle(
fontFamily: "Poppins", fontFamily: "Poppins",
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: Colors.grey.shade600, color: Colors.grey.shade600,
fontSize: getResponsiveTextSize(context, 12), fontSize: getResponsiveTextSize(context, 11),
), ),
), ),
], ],
), ),
SizedBox(height: screenHeight * 0.035), SizedBox(height: screenHeight * 0.031),
Row( Row(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: [ children: [
SvgPicture.asset( SvgPicture.asset(
"assets/svg/requirements.svg", "assets/svg/requirements.svg",
height: getResponsiveIconSize(context, 60), height: getResponsiveIconSize(context, 55),
width: getResponsiveIconSize(context, 60), width: getResponsiveIconSize(context, 55),
), ),
], ],
), ),
...@@ -532,12 +532,12 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -532,12 +532,12 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
Container( Container(
width: double.infinity, width: double.infinity,
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
horizontal: screenWidth * 0.025, horizontal: screenWidth * 0.026,
vertical: screenHeight * 0.012, vertical: screenHeight * 0.015,
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(screenWidth * 0.04), borderRadius: BorderRadius.circular(screenWidth * 0.05),
border: Border.all( border: Border.all(
color: Colors.grey.shade200, color: Colors.grey.shade200,
width: 1, width: 1,
...@@ -569,9 +569,10 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -569,9 +569,10 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
child: Text( child: Text(
"Need Help?", "Need Help?",
style: TextStyle( style: TextStyle(
fontFamily: "PoppinsBold", fontFamily: "Poppins",
color: Color(0xFF008CDE), color: Color(0xFF008CDE),
fontSize: getResponsiveTextSize(context, 14), height: 1,
fontSize: getResponsiveTextSize(context, 13),
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
), ),
), ),
...@@ -580,8 +581,8 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -580,8 +581,8 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
flex: 2, flex: 2,
child: SvgPicture.asset( child: SvgPicture.asset(
"assets/svg/have_compaints.svg", "assets/svg/have_compaints.svg",
height: getResponsiveIconSize(context, 35), height: getResponsiveIconSize(context, 34),
width: getResponsiveIconSize(context, 35), width: getResponsiveIconSize(context, 34),
), ),
), ),
], ],
...@@ -591,11 +592,13 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -591,11 +592,13 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
"Raise a ticket to \nresolve your issues.", "Raise a ticket to \nresolve your issues.",
style: TextStyle( style: TextStyle(
fontFamily: "Poppins", fontFamily: "Poppins",
height: 1,
color: Colors.grey.shade600, color: Colors.grey.shade600,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
fontSize: getResponsiveTextSize(context, 12), fontSize: getResponsiveTextSize(context, 11),
), ),
), ),
SizedBox(height: 1,)
], ],
), ),
), ),
...@@ -625,7 +628,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -625,7 +628,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(screenWidth * 0.04), borderRadius: BorderRadius.circular(screenWidth * 0.05),
border: Border.all( border: Border.all(
color: Colors.grey.shade200, color: Colors.grey.shade200,
width: 1, width: 1,
...@@ -649,7 +652,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -649,7 +652,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
style: TextStyle( style: TextStyle(
fontFamily: "Poppins", fontFamily: "Poppins",
color: Color(0xFF008CDE), color: Color(0xFF008CDE),
fontSize: getResponsiveTextSize(context, 14), fontSize: getResponsiveTextSize(context, 13),
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
), ),
), ),
...@@ -664,16 +667,17 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -664,16 +667,17 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
), ),
], ],
), ),
SizedBox(height: screenHeight * 0.001), SizedBox(height: screenHeight * 0.0001),
Text( Text(
"View your all \ntransactions with us.", "View your all \ntransactions with us.",
style: TextStyle( style: TextStyle(
fontFamily: "Poppins", fontFamily: "Poppins",
color: Colors.grey.shade600, color: Colors.grey.shade600,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
fontSize: getResponsiveTextSize(context, 12), fontSize: getResponsiveTextSize(context, 11),
), ),
), ),
SizedBox(height: 1,)
], ],
), ),
), ),
...@@ -729,7 +733,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -729,7 +733,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xFFFFE2E0), color: Color(0xFFFFE2E0),
borderRadius: BorderRadius.circular(screenWidth * 0.045), borderRadius: BorderRadius.circular(screenWidth * 0.06),
), ),
padding: EdgeInsets.symmetric(horizontal: 0, vertical: 0), padding: EdgeInsets.symmetric(horizontal: 0, vertical: 0),
child: Column( child: Column(
...@@ -799,6 +803,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -799,6 +803,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
child: Text( child: Text(
product.expiringText!, product.expiringText!,
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
color: Colors.black87, color: Colors.black87,
fontSize: getResponsiveTextSize(context, 12), fontSize: getResponsiveTextSize(context, 12),
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
...@@ -835,16 +840,18 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -835,16 +840,18 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
Text( Text(
"• ", "• ",
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
color: Colors.black, color: Colors.black,
fontSize: getResponsiveTextSize(context, 16) fontSize: getResponsiveTextSize(context, 14)
), ),
), ),
Expanded( Expanded(
child: Text( child: Text(
visibleItems[i], visibleItems[i],
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
color: Colors.black, color: Colors.black,
fontSize: getResponsiveTextSize(context, 16), fontSize: getResponsiveTextSize(context, 14),
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
), ),
), ),
...@@ -877,23 +884,23 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -877,23 +884,23 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
); );
}, },
), ),
SizedBox(height: screenHeight * 0.025), SizedBox(height: screenHeight * 0.030),
// Stripe // Stripe
Container( Container(
padding: EdgeInsets.symmetric(vertical: 0, horizontal: screenWidth * 0.02), padding: EdgeInsets.symmetric(vertical: 0, horizontal: screenWidth * 0.01),
height: screenHeight * 0.06, height: screenHeight * 0.05,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0x22FFE2E0), color: Color(0x22FFE2E0),
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
bottomLeft: Radius.circular(screenWidth * 0.045), bottomLeft: Radius.circular(screenWidth * 0.05),
bottomRight: Radius.circular(screenWidth * 0.045), bottomRight: Radius.circular(screenWidth * 0.05),
), ),
), ),
child: Row( child: Row(
children: [ children: [
SizedBox(width: screenWidth * 0.03), SizedBox(width: screenWidth * 0.03),
Icon(Icons.info_outline, color: Colors.red, size: getResponsiveIconSize(context, 18)), Icon(Icons.info_outline, color: Colors.red, size: getResponsiveIconSize(context, 15)),
SizedBox(width: screenWidth * 0.015), SizedBox(width: screenWidth * 0.01),
Expanded( Expanded(
child: Text( child: Text(
product.pendingPaymentText ?? product.pendingPaymentText ??
...@@ -901,7 +908,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -901,7 +908,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
style: TextStyle( style: TextStyle(
fontFamily: "Poppins", fontFamily: "Poppins",
color: Colors.red, color: Colors.red,
fontSize: getResponsiveTextSize(context, 12), fontSize: getResponsiveTextSize(context, 11),
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
), ),
), ),
...@@ -959,7 +966,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -959,7 +966,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
style: TextStyle( style: TextStyle(
fontFamily: "Poppins", fontFamily: "Poppins",
color: Color(0xFF008CDE), color: Color(0xFF008CDE),
fontSize: getResponsiveTextSize(context, 14), fontSize: getResponsiveTextSize(context, 13),
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
height: 1.2, height: 1.2,
), ),
...@@ -970,7 +977,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -970,7 +977,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
fontFamily: "Poppins", fontFamily: "Poppins",
color: Colors.grey.shade600, color: Colors.grey.shade600,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
fontSize: getResponsiveTextSize(context, 14), fontSize: getResponsiveTextSize(context, 13),
), ),
), ),
], ],
...@@ -992,8 +999,9 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -992,8 +999,9 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
child: Text( child: Text(
product.expiringText!, product.expiringText!,
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
color: Colors.black87, color: Colors.black87,
fontSize: getResponsiveTextSize(context, 12), fontSize: getResponsiveTextSize(context, 11),
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
), ),
), ),
...@@ -1037,8 +1045,9 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -1037,8 +1045,9 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
child: Text( child: Text(
visibleItems[i], visibleItems[i],
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
color: Colors.black, color: Colors.black,
fontSize: getResponsiveTextSize(context, 14), fontSize: getResponsiveTextSize(context, 13),
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
), ),
), ),
...@@ -1061,7 +1070,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb ...@@ -1061,7 +1070,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
style: TextStyle( style: TextStyle(
fontFamily: "Poppins", fontFamily: "Poppins",
color: Color(0xFF008CDE), color: Color(0xFF008CDE),
fontSize: getResponsiveTextSize(context, 14), fontSize: getResponsiveTextSize(context, 13),
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
), ),
...@@ -1279,6 +1288,7 @@ class _PaymentBottomSheetContentState extends State<PaymentBottomSheetContent> { ...@@ -1279,6 +1288,7 @@ class _PaymentBottomSheetContentState extends State<PaymentBottomSheetContent> {
Text( Text(
"Balance Amount Bill", "Balance Amount Bill",
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: AppColors.normalText, color: AppColors.normalText,
...@@ -1310,6 +1320,7 @@ class _PaymentBottomSheetContentState extends State<PaymentBottomSheetContent> { ...@@ -1310,6 +1320,7 @@ class _PaymentBottomSheetContentState extends State<PaymentBottomSheetContent> {
const Text( const Text(
"Pay Total", "Pay Total",
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: Colors.black87, color: Colors.black87,
...@@ -1318,6 +1329,7 @@ class _PaymentBottomSheetContentState extends State<PaymentBottomSheetContent> { ...@@ -1318,6 +1329,7 @@ class _PaymentBottomSheetContentState extends State<PaymentBottomSheetContent> {
Text( Text(
"Avoid late payment fees.", "Avoid late payment fees.",
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
fontSize: 13, fontSize: 13,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: Colors.green.shade600, color: Colors.green.shade600,
...@@ -1330,6 +1342,7 @@ class _PaymentBottomSheetContentState extends State<PaymentBottomSheetContent> { ...@@ -1330,6 +1342,7 @@ class _PaymentBottomSheetContentState extends State<PaymentBottomSheetContent> {
Text( Text(
"₹${widget.payTotal}", "₹${widget.payTotal}",
style: const TextStyle( style: const TextStyle(
fontFamily: "Poppins",
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Colors.black, color: Colors.black,
...@@ -1354,6 +1367,7 @@ class _PaymentBottomSheetContentState extends State<PaymentBottomSheetContent> { ...@@ -1354,6 +1367,7 @@ class _PaymentBottomSheetContentState extends State<PaymentBottomSheetContent> {
const Text( const Text(
"Pay Bill", "Pay Bill",
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: Colors.black87, color: Colors.black87,
...@@ -1389,6 +1403,7 @@ class _PaymentBottomSheetContentState extends State<PaymentBottomSheetContent> { ...@@ -1389,6 +1403,7 @@ class _PaymentBottomSheetContentState extends State<PaymentBottomSheetContent> {
const Text( const Text(
"Part Payment", "Part Payment",
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: Colors.black87, color: Colors.black87,
...@@ -1417,6 +1432,7 @@ class _PaymentBottomSheetContentState extends State<PaymentBottomSheetContent> { ...@@ -1417,6 +1432,7 @@ class _PaymentBottomSheetContentState extends State<PaymentBottomSheetContent> {
decoration: const InputDecoration( decoration: const InputDecoration(
hintText: "Enter amount", hintText: "Enter amount",
hintStyle: TextStyle( hintStyle: TextStyle(
fontFamily: "Poppins",
color: Colors.grey, color: Colors.grey,
fontSize: 14, fontSize: 14,
), ),
...@@ -1424,6 +1440,7 @@ class _PaymentBottomSheetContentState extends State<PaymentBottomSheetContent> { ...@@ -1424,6 +1440,7 @@ class _PaymentBottomSheetContentState extends State<PaymentBottomSheetContent> {
contentPadding: EdgeInsets.symmetric(horizontal: 12, vertical: 8), contentPadding: EdgeInsets.symmetric(horizontal: 12, vertical: 8),
prefixText: "₹", prefixText: "₹",
prefixStyle: TextStyle( prefixStyle: TextStyle(
fontFamily: "Poppins",
color: Colors.black, color: Colors.black,
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
...@@ -1469,6 +1486,7 @@ class _PaymentBottomSheetContentState extends State<PaymentBottomSheetContent> { ...@@ -1469,6 +1486,7 @@ class _PaymentBottomSheetContentState extends State<PaymentBottomSheetContent> {
const Text( const Text(
"Continue Payment", "Continue Payment",
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
color: Colors.white, color: Colors.white,
fontSize: 16, fontSize: 16,
), ),
......
lib/Screens/HelpScreens/EnquiryScreen.dart
View file @ e6241d05
...@@ -54,6 +54,7 @@ class _EnquiryScreenState extends State<EnquiryScreen> { ...@@ -54,6 +54,7 @@ class _EnquiryScreenState extends State<EnquiryScreen> {
"Enquiry", "Enquiry",
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontFamily: "Poppins",
fontStyle: FontStyle.normal, fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: Colors.black87, color: Colors.black87,
...@@ -205,6 +206,7 @@ class _EnquiryScreenState extends State<EnquiryScreen> { ...@@ -205,6 +206,7 @@ class _EnquiryScreenState extends State<EnquiryScreen> {
: const Text( : const Text(
"Submit", "Submit",
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
fontSize: 15, fontSize: 15,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
), ),
...@@ -225,6 +227,7 @@ class _EnquiryScreenState extends State<EnquiryScreen> { ...@@ -225,6 +227,7 @@ class _EnquiryScreenState extends State<EnquiryScreen> {
title, title,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
fontFamily: "Poppins",
fontStyle: FontStyle.normal, fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: Colors.black, color: Colors.black,
...@@ -267,10 +270,17 @@ class _EnquiryScreenState extends State<EnquiryScreen> { ...@@ -267,10 +270,17 @@ class _EnquiryScreenState extends State<EnquiryScreen> {
keyboardType: keyboardType, keyboardType: keyboardType,
maxLines: maxLines, maxLines: maxLines,
onChanged: (_) => field.didChange(controller.text), onChanged: (_) => field.didChange(controller.text),
style: TextStyle(
fontSize: 14,
fontFamily: "Poppins",
color: Colors.black,
fontWeight: FontWeight.w400,
),
decoration: InputDecoration( decoration: InputDecoration(
hintText: hint, hintText: hint,
hintStyle: TextStyle( hintStyle: TextStyle(
fontSize: 14, fontSize: 14,
fontFamily: "Poppins",
color: Colors.grey[400], color: Colors.grey[400],
fontStyle: FontStyle.normal, fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
...@@ -287,6 +297,7 @@ class _EnquiryScreenState extends State<EnquiryScreen> { ...@@ -287,6 +297,7 @@ class _EnquiryScreenState extends State<EnquiryScreen> {
child: Text( child: Text(
field.errorText ?? '', field.errorText ?? '',
style: const TextStyle( style: const TextStyle(
fontFamily: "Poppins",
color: Colors.red, color: Colors.red,
fontSize: 12, fontSize: 12,
), ),
......
lib/Screens/HelpScreens/HelpScreen.dart
View file @ e6241d05
...@@ -368,6 +368,7 @@ class CommonListItem extends StatelessWidget { ...@@ -368,6 +368,7 @@ class CommonListItem extends StatelessWidget {
"#${orderId}", "#${orderId}",
style: TextStyle( style: TextStyle(
fontSize: 12, fontSize: 12,
fontFamily: "Poppins",
fontStyle: FontStyle.normal, fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: AppColors.subtitleText, color: AppColors.subtitleText,
...@@ -377,6 +378,7 @@ class CommonListItem extends StatelessWidget { ...@@ -377,6 +378,7 @@ class CommonListItem extends StatelessWidget {
title, title,
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
fontFamily: "Poppins",
fontStyle: FontStyle.normal, fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: Colors.black87, color: Colors.black87,
...@@ -408,6 +410,7 @@ class CommonListItem extends StatelessWidget { ...@@ -408,6 +410,7 @@ class CommonListItem extends StatelessWidget {
status, status,
style: TextStyle( style: TextStyle(
fontSize: 12, fontSize: 12,
fontFamily: "Poppins",
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
fontStyle: FontStyle.normal, fontStyle: FontStyle.normal,
color: Colors.black87, color: Colors.black87,
......
lib/Screens/HelpScreens/TicketChatScreen.dart
View file @ e6241d05
...@@ -93,6 +93,7 @@ class _TicketChatScreenState extends State<TicketChatScreen> { ...@@ -93,6 +93,7 @@ class _TicketChatScreenState extends State<TicketChatScreen> {
child: Text( child: Text(
widget.status, widget.status,
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
fontSize: 12, fontSize: 12,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: status ? Colors.black87 : Colors.red, color: status ? Colors.black87 : Colors.red,
...@@ -155,6 +156,7 @@ class _TicketChatScreenState extends State<TicketChatScreen> { ...@@ -155,6 +156,7 @@ class _TicketChatScreenState extends State<TicketChatScreen> {
child: const Text( child: const Text(
"Send a Message", "Send a Message",
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
fontSize: 14, fontSize: 14,
fontStyle: FontStyle.normal, fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
...@@ -230,6 +232,7 @@ class _TicketChatScreenState extends State<TicketChatScreen> { ...@@ -230,6 +232,7 @@ class _TicketChatScreenState extends State<TicketChatScreen> {
name, name,
style: const TextStyle( style: const TextStyle(
fontSize: 16, fontSize: 16,
fontFamily: "Poppins",
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Colors.black87, color: Colors.black87,
), ),
...@@ -239,6 +242,7 @@ class _TicketChatScreenState extends State<TicketChatScreen> { ...@@ -239,6 +242,7 @@ class _TicketChatScreenState extends State<TicketChatScreen> {
date, date,
style: TextStyle( style: TextStyle(
fontSize: 12, fontSize: 12,
fontFamily: "Poppins",
fontStyle: FontStyle.normal, fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: Colors.grey[600], color: Colors.grey[600],
...@@ -314,6 +318,7 @@ class _TicketChatScreenState extends State<TicketChatScreen> { ...@@ -314,6 +318,7 @@ class _TicketChatScreenState extends State<TicketChatScreen> {
message, message,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
fontFamily: "Poppins",
fontStyle: FontStyle.normal, fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: Colors.black87, color: Colors.black87,
...@@ -411,6 +416,7 @@ class _TicketChatScreenState extends State<TicketChatScreen> { ...@@ -411,6 +416,7 @@ class _TicketChatScreenState extends State<TicketChatScreen> {
hintText: "Write your message", hintText: "Write your message",
hintStyle: TextStyle( hintStyle: TextStyle(
fontSize: 14, fontSize: 14,
fontFamily: "Poppins",
color: Colors.grey[400], color: Colors.grey[400],
fontWeight: FontWeight.w400 fontWeight: FontWeight.w400
), ),
...@@ -628,6 +634,7 @@ class _TicketChatScreenState extends State<TicketChatScreen> { ...@@ -628,6 +634,7 @@ class _TicketChatScreenState extends State<TicketChatScreen> {
"Send Message", "Send Message",
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
fontFamily: "Poppins",
fontStyle: FontStyle.normal, fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
), ),
......
lib/Screens/ProductsDetailScreen.dart
View file @ e6241d05
...@@ -807,6 +807,7 @@ class _ProductsDetailScreenState extends State<ProductsDetailScreen> { ...@@ -807,6 +807,7 @@ class _ProductsDetailScreenState extends State<ProductsDetailScreen> {
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: AppColors.nearDarkText, color: AppColors.nearDarkText,
fontFamily: "Poppins",
fontSize: isSmallScreen ? 11 : 13, // Slightly smaller font fontSize: isSmallScreen ? 11 : 13, // Slightly smaller font
fontStyle: FontStyle.normal, fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
......
lib/Screens/ProfileScreen.dart
View file @ e6241d05
...@@ -84,7 +84,7 @@ class _ProfileScreenState extends State<ProfileScreen> { ...@@ -84,7 +84,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
Text( Text(
"Logout", "Logout",
style: TextStyle( style: TextStyle(
fontFamily: "Plus Jakarta Sans", fontFamily: "Poppins",
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: 20, fontSize: 20,
color: Colors.black87, color: Colors.black87,
...@@ -97,7 +97,7 @@ class _ProfileScreenState extends State<ProfileScreen> { ...@@ -97,7 +97,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
"Are you sure you want to logout?", "Are you sure you want to logout?",
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
fontFamily: "Plus Jakarta Sans", fontFamily: "Poppins",
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: Colors.grey[600], color: Colors.grey[600],
...@@ -129,7 +129,7 @@ class _ProfileScreenState extends State<ProfileScreen> { ...@@ -129,7 +129,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
child: Text( child: Text(
"Cancel", "Cancel",
style: TextStyle( style: TextStyle(
fontFamily: "Plus Jakarta Sans", fontFamily: "Poppins",
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 14, fontSize: 14,
color: Colors.grey[700], color: Colors.grey[700],
...@@ -159,7 +159,7 @@ class _ProfileScreenState extends State<ProfileScreen> { ...@@ -159,7 +159,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
Text( Text(
"Logout", "Logout",
style: TextStyle( style: TextStyle(
fontFamily: "Plus Jakarta Sans", fontFamily: "Poppins",
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 14, fontSize: 14,
color: Colors.white, color: Colors.white,
...@@ -206,7 +206,7 @@ class _ProfileScreenState extends State<ProfileScreen> { ...@@ -206,7 +206,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
Text( Text(
"Logging out...", "Logging out...",
style: TextStyle( style: TextStyle(
fontFamily: "Plus Jakarta Sans", fontFamily: "Poppins",
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 16, fontSize: 16,
color: Colors.grey[800], color: Colors.grey[800],
...@@ -254,7 +254,7 @@ class _ProfileScreenState extends State<ProfileScreen> { ...@@ -254,7 +254,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
Text( Text(
"Logged out successfully", "Logged out successfully",
style: TextStyle( style: TextStyle(
fontFamily: "Plus Jakarta Sans", fontFamily: "Poppins",
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
), ),
...@@ -295,7 +295,7 @@ class _ProfileScreenState extends State<ProfileScreen> { ...@@ -295,7 +295,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
Text( Text(
"Logout failed. Please try again.", "Logout failed. Please try again.",
style: TextStyle( style: TextStyle(
fontFamily: "Plus Jakarta Sans", fontFamily: "Poppins",
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
), ),
...@@ -506,7 +506,7 @@ class _ProfileScreenState extends State<ProfileScreen> { ...@@ -506,7 +506,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
"Logout", "Logout",
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontFamily: "Plus Jakarta Sans", fontFamily: "Poppins",
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Colors.white, color: Colors.white,
), ),
...@@ -537,12 +537,12 @@ class _ProfileScreenState extends State<ProfileScreen> { ...@@ -537,12 +537,12 @@ class _ProfileScreenState extends State<ProfileScreen> {
const SizedBox(height: 6), const SizedBox(height: 6),
Text(title, Text(title,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontWeight: FontWeight.w400, fontFamily: "Plus Jakarta Sans", color: Colors.black87)), fontSize: 14, fontWeight: FontWeight.w400, fontFamily: "Poppins", color: Colors.black87)),
const SizedBox(height: 2), const SizedBox(height: 2),
Text(value, Text(value,
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontWeight: FontWeight.w400, fontFamily: "Plus Jakarta Sans", color: Colors.black54)), fontSize: 14, fontWeight: FontWeight.w400, fontFamily: "Poppins", color: Colors.black54)),
], ],
); );
} }
...@@ -552,11 +552,11 @@ class _ProfileScreenState extends State<ProfileScreen> { ...@@ -552,11 +552,11 @@ class _ProfileScreenState extends State<ProfileScreen> {
children: [ children: [
Text(title, Text(title,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontWeight: FontWeight.w400, fontFamily: "Plus Jakarta Sans", color: Colors.black87)), fontSize: 14, fontWeight: FontWeight.w400, fontFamily: "Poppins", color: Colors.black87)),
const SizedBox(height: 4), const SizedBox(height: 4),
Text(value, Text(value,
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontWeight: FontWeight.w400, fontFamily: "Plus Jakarta Sans", color: Colors.black54)), fontSize: 14, fontWeight: FontWeight.w400, fontFamily: "Poppins", color: Colors.black54)),
], ],
); );
} }
......
lib/Screens/TransactionScreens/BillStatusToast.dart
View file @ e6241d05
...@@ -247,10 +247,11 @@ class _BillStatusToastState extends State<BillStatusToast> { ...@@ -247,10 +247,11 @@ class _BillStatusToastState extends State<BillStatusToast> {
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Expanded( Expanded(
flex: 5, flex: 4,
child: Text( child: Text(
title, title,
style: const TextStyle( maxLines: 2,
style: TextStyle(
fontSize: 14, fontSize: 14,
fontFamily: "Poppins", fontFamily: "Poppins",
color: Colors.black54, color: Colors.black54,
......
lib/Screens/authScreen/LoginScreen.dart
View file @ e6241d05
...@@ -135,6 +135,7 @@ class _LoginScreenState extends State<LoginScreen> { ...@@ -135,6 +135,7 @@ class _LoginScreenState extends State<LoginScreen> {
"Rental Power,\nManaged in a Tap", "Rental Power,\nManaged in a Tap",
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
color: Colors.white, color: Colors.white,
fontSize: 35, fontSize: 35,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
...@@ -151,6 +152,7 @@ class _LoginScreenState extends State<LoginScreen> { ...@@ -151,6 +152,7 @@ class _LoginScreenState extends State<LoginScreen> {
child: Text( child: Text(
"Enter Registered Mobile No.", "Enter Registered Mobile No.",
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
color: Colors.white, color: Colors.white,
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
...@@ -169,7 +171,7 @@ class _LoginScreenState extends State<LoginScreen> { ...@@ -169,7 +171,7 @@ class _LoginScreenState extends State<LoginScreen> {
style: const TextStyle(color: Colors.black), style: const TextStyle(color: Colors.black),
decoration: InputDecoration( decoration: InputDecoration(
hintText: "Enter Mobile No.", hintText: "Enter Mobile No.",
hintStyle: const TextStyle(color: Colors.grey), hintStyle: const TextStyle(color: Colors.grey,fontFamily: "Poppins",),
filled: true, filled: true,
fillColor: Colors.white, fillColor: Colors.white,
counterText: "", // Remove character counter counterText: "", // Remove character counter
...@@ -201,6 +203,7 @@ class _LoginScreenState extends State<LoginScreen> { ...@@ -201,6 +203,7 @@ class _LoginScreenState extends State<LoginScreen> {
child: Text( child: Text(
"*Invalid number. Enter your registered number.", "*Invalid number. Enter your registered number.",
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
color: Colors.redAccent, color: Colors.redAccent,
fontSize: 12, fontSize: 12,
), ),
...@@ -246,6 +249,7 @@ class _LoginScreenState extends State<LoginScreen> { ...@@ -246,6 +249,7 @@ class _LoginScreenState extends State<LoginScreen> {
Text( Text(
"Continue", "Continue",
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
color: _isValid color: _isValid
? const Color(0xFFFFFFFF) ? const Color(0xFFFFFFFF)
: const Color(0xFF03456C), : const Color(0xFF03456C),
......
lib/Screens/authScreen/OTP_Screen.dart
View file @ e6241d05
...@@ -284,6 +284,7 @@ class _OtpScreenState extends State<OtpScreen> { ...@@ -284,6 +284,7 @@ class _OtpScreenState extends State<OtpScreen> {
"Rental Power,\nManaged in a Tap", "Rental Power,\nManaged in a Tap",
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
color: Colors.white, color: Colors.white,
fontSize: 32, fontSize: 32,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
...@@ -298,6 +299,7 @@ class _OtpScreenState extends State<OtpScreen> { ...@@ -298,6 +299,7 @@ class _OtpScreenState extends State<OtpScreen> {
"Enter the OTP sent to +91 ${widget.mob}", "Enter the OTP sent to +91 ${widget.mob}",
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: const TextStyle( style: const TextStyle(
fontFamily: "Poppins",
color: Colors.white70, color: Colors.white70,
fontSize: 14, fontSize: 14,
), ),
...@@ -381,6 +383,7 @@ class _OtpScreenState extends State<OtpScreen> { ...@@ -381,6 +383,7 @@ class _OtpScreenState extends State<OtpScreen> {
Text( Text(
"Continue", "Continue",
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
color: _isValid color: _isValid
? Colors.white ? Colors.white
: const Color(0xFF03456C), : const Color(0xFF03456C),
......
lib/Utility/AdvancedSnackbar.dart
View file @ e6241d05
...@@ -293,6 +293,7 @@ class _AnimatedSnackBarContentState extends State<_AnimatedSnackBarContent> ...@@ -293,6 +293,7 @@ class _AnimatedSnackBarContentState extends State<_AnimatedSnackBarContent>
Text( Text(
widget.title!, widget.title!,
style: const TextStyle( style: const TextStyle(
fontFamily: "Poppins",
color: Colors.white, color: Colors.white,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: 16, fontSize: 16,
...@@ -305,6 +306,7 @@ class _AnimatedSnackBarContentState extends State<_AnimatedSnackBarContent> ...@@ -305,6 +306,7 @@ class _AnimatedSnackBarContentState extends State<_AnimatedSnackBarContent>
Text( Text(
widget.message, widget.message,
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
color: Colors.white.withOpacity(0.9), color: Colors.white.withOpacity(0.9),
fontSize: 14, fontSize: 14,
height: 1.4, height: 1.4,
......
lib/Utility/CustomSnackbar.dart
View file @ e6241d05
...@@ -98,6 +98,7 @@ class CustomSnackBar { ...@@ -98,6 +98,7 @@ class CustomSnackBar {
title, title,
style: const TextStyle( style: const TextStyle(
color: Colors.white, color: Colors.white,
fontFamily: "Poppins",
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: 15, fontSize: 15,
letterSpacing: -0.2, letterSpacing: -0.2,
...@@ -108,6 +109,7 @@ class CustomSnackBar { ...@@ -108,6 +109,7 @@ class CustomSnackBar {
Text( Text(
message, message,
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
color: Colors.white.withOpacity(0.9), color: Colors.white.withOpacity(0.9),
fontSize: 14, fontSize: 14,
height: 1.3, height: 1.3,
...@@ -142,6 +144,7 @@ class CustomSnackBar { ...@@ -142,6 +144,7 @@ class CustomSnackBar {
child: Text( child: Text(
action.label, action.label,
style: TextStyle( style: TextStyle(
fontFamily: "Poppins",
color: Colors.white, color: Colors.white,
fontSize: 12, fontSize: 12,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
......
pubspec.lock
View file @ e6241d05
...@@ -157,10 +157,10 @@ packages: ...@@ -157,10 +157,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: fake_async name: fake_async
sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.3.2" version: "1.3.3"
ffi: ffi:
dependency: transitive dependency: transitive
description: description:
...@@ -396,26 +396,26 @@ packages: ...@@ -396,26 +396,26 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker name: leak_tracker
sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "10.0.8" version: "11.0.2"
leak_tracker_flutter_testing: leak_tracker_flutter_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_flutter_testing name: leak_tracker_flutter_testing
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.9" version: "3.0.10"
leak_tracker_testing: leak_tracker_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_testing name: leak_tracker_testing
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.1" version: "3.0.2"
lints: lints:
dependency: transitive dependency: transitive
description: description:
...@@ -841,10 +841,10 @@ packages: ...@@ -841,10 +841,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.7.4" version: "0.7.6"
typed_data: typed_data:
dependency: transitive dependency: transitive
description: description:
...@@ -889,10 +889,10 @@ packages: ...@@ -889,10 +889,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: vector_math name: vector_math
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.1.4" version: "2.2.0"
vm_service: vm_service:
dependency: transitive dependency: transitive
description: description:
...@@ -942,5 +942,5 @@ packages: ...@@ -942,5 +942,5 @@ packages:
source: hosted source: hosted
version: "6.5.0" version: "6.5.0"
sdks: sdks:
dart: ">=3.7.2 <4.0.0" dart: ">=3.8.0-0 <4.0.0"
flutter: ">=3.29.0" flutter: ">=3.29.0"